Merge pull request #141 from TAMULib/2.x-minor_cleanups

Fix line endings and remove redundant line in DataConfig.
TAMULib · Apr 18, 2022 · c25fd74 · c25fd74
2 parents c986df5 + ee69c8e
commit c25fd74
Show file tree

Hide file tree

Showing 43 changed files with 667 additions and 668 deletions.
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java b/auth/src/main/java/edu/tamu/weaver/auth/AuthConstants.java
@@ -64,4 +64,4 @@ public class AuthConstants {
         }
     }
 
-}
+}
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/config/AuthWebSecurityConfig.java b/auth/src/main/java/edu/tamu/weaver/auth/config/AuthWebSecurityConfig.java
@@ -60,4 +60,4 @@ protected SecurityExpressionHandler<FilterInvocation> webExpressionHandler() {
 
     protected abstract String buildRoleHierarchy();
 
-}
+}
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/controller/WeaverAuthController.java b/auth/src/main/java/edu/tamu/weaver/auth/controller/WeaverAuthController.java
@@ -24,7 +24,7 @@ public abstract class WeaverAuthController {
 
     @Autowired
     protected TokenService tokenService;
-    
+
     @Autowired
     protected CryptoService cryptoService;
 

diff --git a/auth/src/main/java/edu/tamu/weaver/auth/model/Credentials.java b/auth/src/main/java/edu/tamu/weaver/auth/model/Credentials.java
@@ -8,7 +8,7 @@
 /**
  * Credentials object.
  *
- * 
+ *
  * @author <a href="mailto:jmicah@library.tamu.edu">Micah Cooper</a>
  * @author <a href="mailto:jcreel@library.tamu.edu">James Creel</a>
  * @author <a href="mailto:huff@library.tamu.edu">Jeremy Huff</a>
@@ -34,10 +34,10 @@ public Credentials() {
 
     /**
      * Constructor
-     * 
+     *
      * @param claims
      *            Claims
-     * 
+     *
      */
     public Credentials(Claims claims) {
         this();
@@ -56,10 +56,10 @@ public Credentials(Claims claims) {
 
     /**
      * Constructor
-     * 
+     *
      * @param claims
      *            Map<String, Object>
-     * 
+     *
      */
     public Credentials(Map<String, Object> claims) {
         this();
@@ -78,41 +78,41 @@ public Credentials(Map<String, Object> claims) {
 
     /**
      * Gets last name.
-     * 
+     *
      * @return String
-     * 
+     *
      */
     public String getLastName() {
         return this.lastName;
     }
 
     /**
      * Sets last name.
-     * 
+     *
      * @param lastName
      *            String
-     * 
+     *
      */
     public void setLastName(String lastName) {
         this.lastName = lastName;
     }
 
     /**
      * Gets first name.
-     * 
+     *
      * @return String
-     * 
+     *
      */
     public String getFirstName() {
         return this.firstName;
     }
 
     /**
      * Sets first name.
-     * 
+     *
      * @param firstName
      *            String
-     * 
+     *
      */
     public void setFirstName(String firstName) {
         this.firstName = firstName;
@@ -135,83 +135,83 @@ public void setNetid(String netid) {
 
     /**
      * Gets UIN.
-     * 
+     *
      * @return String
-     * 
+     *
      */
     public String getUin() {
         return this.uin;
     }
 
     /**
      * Sets UIN.
-     * 
+     *
      * @param uin
      *            String
-     * 
+     *
      */
     public void setUin(String uin) {
         this.uin = uin;
     }
 
     /**
      * Gets expiration.
-     * 
+     *
      * @return String
-     * 
+     *
      */
     public String getExp() {
         return this.exp;
     }
 
     /**
      * Sets expiration.
-     * 
+     *
      * @param exp
      *            String
-     * 
+     *
      */
     public void setExp(String exp) {
         this.exp = exp;
     }
 
     /**
      * Gets email.
-     * 
+     *
      * @return String
-     * 
+     *
      */
     public String getEmail() {
         return this.email;
     }
 
     /**
      * Sets email.
-     * 
+     *
      * @param email
      *            String
-     * 
+     *
      */
     public void setEmail(String email) {
         this.email = email;
     }
 
     /**
      * Gets role.
-     * 
+     *
      * @return String
-     * 
+     *
      */
     public String getRole() {
         return this.role;
     }
 
     /**
      * Sets role.
-     * 
+     *
      * @param role
      *            String
-     * 
+     *
      */
     public void setRole(String role) {
         this.role = role;

diff --git a/auth/src/main/java/edu/tamu/weaver/auth/proxy/SecurityInterceptorProxy.java b/auth/src/main/java/edu/tamu/weaver/auth/proxy/SecurityInterceptorProxy.java
@@ -16,7 +16,7 @@ public interface SecurityInterceptorProxy {
     public SecurityMetadataSource getSecurityMetadataSource();
 
     public Collection<ConfigAttribute> getAttributes(Object object);
-    
+
     public Collection<ConfigAttribute> getAllAttributes();
 
     public AccessDecision decide(Authentication authentication, Object object, Collection<ConfigAttribute> attributes);

diff --git a/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java b/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverCredentialsArgumentResolver.java
@@ -32,4 +32,4 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
         return authentication.getCredentials();
     }
 
-}
+}
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java b/auth/src/main/java/edu/tamu/weaver/auth/resolver/WeaverUserArgumentResolver.java
@@ -42,4 +42,4 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
         return user.get();
     }
 
-}
+}
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/service/AbstractWeaverUserDetailsService.java b/auth/src/main/java/edu/tamu/weaver/auth/service/AbstractWeaverUserDetailsService.java
@@ -26,4 +26,4 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
 
     public abstract UserDetails buildUserDetails(U user);
 
-}
+}
diff --git a/auth/src/main/java/edu/tamu/weaver/auth/service/CryptoService.java b/auth/src/main/java/edu/tamu/weaver/auth/service/CryptoService.java
@@ -55,4 +55,4 @@ public boolean validatePassword(String password, String encodedPassword) {
         return passwordEncoder.matches(password, encodedPassword);
     }
 
-}
+}
diff --git a/core/pom.xml b/core/pom.xml
@@ -1,51 +1,51 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>core</artifactId>
-
-  <name>Weaver Core</name>
-
-  <description>Core for Weaver</description>
-
-  <parent>
-    <groupId>edu.tamu.weaver</groupId>
-    <artifactId>webservice-parent</artifactId>
-    <version>2.1.1-RC7</version>
-  </parent>
-
-  <dependencies>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>3.0-alpha-1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-json</artifactId>
-    </dependency>
-
-
-  </dependencies>
-
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>core</artifactId>
+
+  <name>Weaver Core</name>
+
+  <description>Core for Weaver</description>
+
+  <parent>
+    <groupId>edu.tamu.weaver</groupId>
+    <artifactId>webservice-parent</artifactId>
+    <version>2.1.1-RC7</version>
+  </parent>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>3.0-alpha-1</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-beans</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-json</artifactId>
+    </dependency>
+
+
+  </dependencies>
+
+</project>
diff --git a/core/src/main/java/edu/tamu/weaver/response/ApiAction.java b/core/src/main/java/edu/tamu/weaver/response/ApiAction.java
@@ -1,7 +1,7 @@
 package edu.tamu.weaver.response;
 
 /**
- * 
+ *
  * @author <a href="mailto:jmicah@library.tamu.edu">Micah Cooper</a>
  * @author <a href="mailto:jcreel@library.tamu.edu">James Creel</a>
  * @author <a href="mailto:huff@library.tamu.edu">Jeremy Huff</a>

diff --git a/core/src/main/java/edu/tamu/weaver/response/ApiResponse.java b/core/src/main/java/edu/tamu/weaver/response/ApiResponse.java
@@ -8,13 +8,13 @@
 
 /**
  * Abstract class for an API response.
- * 
+ *
  * @author <a href="mailto:jmicah@library.tamu.edu">Micah Cooper</a>
  * @author <a href="mailto:jcreel@library.tamu.edu">James Creel</a>
  * @author <a href="mailto:huff@library.tamu.edu">Jeremy Huff</a>
  * @author <a href="mailto:jsavell@library.tamu.edu">Jason Savell</a>
  * @author <a href="mailto:wwelling@library.tamu.edu">William Welling</a>
- * 
+ *
  */
 @JsonSerialize(using = ApiResponseSerializer.class)
 public class ApiResponse {
@@ -95,7 +95,7 @@ public ApiResponse(String id, ApiStatus status, ApiAction action, Object... payl
 
     /**
      * Gets meta.
-     * 
+     *
      * @return Meta
      */
     public Meta getMeta() {
@@ -104,7 +104,7 @@ public Meta getMeta() {
 
     /**
      * Gets payload.
-     * 
+     *
      * @return HashMap<String, Object>
      */
     public HashMap<String, Object> getPayload() {