formattingand autowired constructors (#2557)

# Description
This pull request includes several changes aimed at improving the code
structure and removing redundant code. The most significant changes
involve reordering methods, removing unnecessary annotations, and
refactoring constructors to use dependency injection.
Autowired now comes via constructor (which also doesn't need autowired
annotation as its done by default for configuration)



## Checklist

- [ ] I have read the [Contribution
Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md)
- [ ] I have performed a self-review of my own code
- [ ] I have attached images of the change if it is UI based
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] If my code has heavily changed functionality I have updated
relevant docs on [Stirling-PDFs doc
repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/)
- [ ] My changes generate no new warnings
- [ ] I have read the section [Add New Translation
Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags)
(for new translation tags only)

src/main/java/stirling/software/SPDF/model/ApplicationProperties.java

@@ -79,6 +79,23 @@ public class ApplicationProperties {
             return saml2.getEnabled() || oauth2.getEnabled();
         }
 
+        public boolean isUserPass() {
+            return (loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString())
+                    || loginMethod.equalsIgnoreCase(LoginMethods.ALL.toString()));
+        }
+
+        public boolean isOauth2Activ() {
+            return (oauth2 != null
+                    && oauth2.getEnabled()
+                    && !loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString()));
+        }
+
+        public boolean isSaml2Activ() {
+            return (saml2 != null
+                    && saml2.getEnabled()
+                    && !loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString()));
+        }
+
         public enum LoginMethods {
             ALL("all"),
             NORMAL("normal"),
@@ -97,23 +114,6 @@ public class ApplicationProperties {
             }
         }
 
-        public boolean isUserPass() {
-            return (loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString())
-                    || loginMethod.equalsIgnoreCase(LoginMethods.ALL.toString()));
-        }
-
-        public boolean isOauth2Activ() {
-            return (oauth2 != null
-                    && oauth2.getEnabled()
-                    && !loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString()));
-        }
-
-        public boolean isSaml2Activ() {
-            return (saml2 != null
-                    && saml2.getEnabled()
-                    && !loginMethod.equalsIgnoreCase(LoginMethods.NORMAL.toString()));
-        }
-
         @Data
         public static class InitialLogin {
             private String username;

src/main/java/stirling/software/SPDF/model/Authority.java

@@ -2,14 +2,7 @@ package stirling.software.SPDF.model;
 
 import java.io.Serializable;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 
 @Entity
 @Table(name = "authorities")
@@ -17,14 +10,6 @@ public class Authority implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    public Authority() {}
-
-    public Authority(String authority, User user) {
-        this.authority = authority;
-        this.user = user;
-        user.getAuthorities().add(this);
-    }
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -36,6 +21,14 @@ public class Authority implements Serializable {
     @JoinColumn(name = "user_id")
     private User user;
 
+    public Authority() {}
+
+    public Authority(String authority, User user) {
+        this.authority = authority;
+        this.user = user;
+        user.getAuthorities().add(this);
+    }
+
     public Long getId() {
         return id;
     }

src/main/java/stirling/software/SPDF/model/Role.java

@@ -40,22 +40,6 @@ public enum Role {
         this.roleName = roleName;
     }
 
-    public String getRoleId() {
-        return roleId;
-    }
-
-    public int getApiCallsPerDay() {
-        return apiCallsPerDay;
-    }
-
-    public int getWebCallsPerDay() {
-        return webCallsPerDay;
-    }
-
-    public String getRoleName() {
-        return roleName;
-    }
-
     public static String getRoleNameByRoleId(String roleId) {
         // Using the fromString method to get the Role enum based on the roleId
         Role role = fromString(roleId);
@@ -81,4 +65,20 @@ public enum Role {
         }
         throw new IllegalArgumentException("No Role defined for id: " + roleId);
     }
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public int getApiCallsPerDay() {
+        return apiCallsPerDay;
+    }
+
+    public int getWebCallsPerDay() {
+        return webCallsPerDay;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
 }

src/main/java/stirling/software/SPDF/model/User.java

@@ -111,14 +111,14 @@ public class User implements Serializable {
         this.enabled = enabled;
     }
 
-    public void setAuthenticationType(AuthenticationType authenticationType) {
-        this.authenticationType = authenticationType.toString().toLowerCase();
-    }
-
     public String getAuthenticationType() {
         return authenticationType;
     }
 
+    public void setAuthenticationType(AuthenticationType authenticationType) {
+        this.authenticationType = authenticationType.toString().toLowerCase();
+    }
+
     public Set<Authority> getAuthorities() {
         return authorities;
     }

src/main/java/stirling/software/SPDF/model/provider/GithubProvider.java

@@ -12,6 +12,10 @@ public class GithubProvider extends Provider {
     private static final String authorizationUri = "https://github.com/login/oauth/authorize";
     private static final String tokenUri = "https://github.com/login/oauth/access_token";
     private static final String userInfoUri = "https://api.github.com/user";
+    private String clientId;
+    private String clientSecret;
+    private Collection<String> scopes = new ArrayList<>();
+    private String useAsUsername = "login";
 
     public String getAuthorizationuri() {
         return authorizationUri;
@@ -25,11 +29,6 @@ public class GithubProvider extends Provider {
         return userInfoUri;
     }
 
-    private String clientId;
-    private String clientSecret;
-    private Collection<String> scopes = new ArrayList<>();
-    private String useAsUsername = "login";
-
     @Override
     public String getIssuer() {
         return new String();

src/main/java/stirling/software/SPDF/model/provider/GoogleProvider.java

@@ -13,6 +13,10 @@ public class GoogleProvider extends Provider {
     private static final String tokenUri = "https://www.googleapis.com/oauth2/v4/token";
     private static final String userInfoUri =
             "https://www.googleapis.com/oauth2/v3/userinfo?alt=json";
+    private String clientId;
+    private String clientSecret;
+    private Collection<String> scopes = new ArrayList<>();
+    private String useAsUsername = "email";
 
     public String getAuthorizationuri() {
         return authorizationUri;
@@ -26,11 +30,6 @@ public class GoogleProvider extends Provider {
         return userInfoUri;
     }
 
-    private String clientId;
-    private String clientSecret;
-    private Collection<String> scopes = new ArrayList<>();
-    private String useAsUsername = "email";
-
     @Override
     public String getIssuer() {
         return new String();