Added new checkstyle guide and fixed issues.

build.gradle

@@ -52,6 +52,7 @@ dependencies {
 }
 
 checkstyle {
+	toolVersion = "8.7"
 	configFile = new File(rootDir, "checkstyle.xml")
 }
 

src/main/java/org/aitesting/microservices/authentication/InspectHeaderFilter.java

@@ -1,16 +1,14 @@
 package org.aitesting.microservices.authentication;
 
-import org.springframework.stereotype.Component;
-
+import java.io.IOException;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-
-import java.io.IOException;
+import org.springframework.stereotype.Component;
 
 @Component
 public class InspectHeaderFilter implements Filter {

src/main/java/org/aitesting/microservices/authentication/MicroserviceUserServiceApplication.java

@@ -1,5 +1,7 @@
 package org.aitesting.microservices.authentication;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.security.core.authority.AuthorityUtils;
@@ -9,9 +11,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @SpringBootApplication
 @RestController
 @EnableResourceServer

src/main/java/org/aitesting/microservices/authentication/model/User.java

@@ -1,22 +1,21 @@
 package org.aitesting.microservices.authentication.model;
 
+import java.io.Serializable;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Table;
 
-import java.io.Serializable;
-
 @Entity
 @Table(name = "user")
 public class User implements Serializable {
 
     @Id
     @Column(name = "user_id", nullable = false)
-    Long userId;
+    private Long userId;
 
     @Column(name = "username", nullable = false)
-    String userName;
+    private String userName;
 
     public String getUserName() {
         return userName;

src/main/java/org/aitesting/microservices/authentication/security/OAuth2Config.java

@@ -28,8 +28,8 @@ public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
 
     @Override
     public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
-      endpoints
-        .authenticationManager(authenticationManager)
-        .userDetailsService(userDetailsService);
+        endpoints
+            .authenticationManager(authenticationManager)
+            .userDetailsService(userDetailsService);
     }
 }

src/main/java/org/aitesting/microservices/authentication/security/WebSecurityConfigurer.java

@@ -1,5 +1,6 @@
 package org.aitesting.microservices.authentication.security;
 
+import javax.sql.DataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -8,8 +9,6 @@
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-import javax.sql.DataSource;
-
 @Configuration
 public class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
 
@@ -31,7 +30,8 @@ public UserDetailsService userDetailsServiceBean() throws Exception {
     @Override
     protected void configure(AuthenticationManagerBuilder auth) throws Exception {
         auth.jdbcAuthentication().dataSource(dataSource)
-          .usersByUsernameQuery("select username, password, enabled from user where username=?")
-          .authoritiesByUsernameQuery("SELECT u.username, r.description FROM user u, user_role ur, role r WHERE r.role_id=ur.role_id AND ur.user_id=u.user_id AND u.username=?");
+            .usersByUsernameQuery("select username, password, enabled from user where username=?")
+            .authoritiesByUsernameQuery("SELECT u.username, r.description FROM user u, user_role ur, role r "
+                    + "WHERE r.role_id=ur.role_id AND ur.user_id=u.user_id AND u.username=?");
     }
 }

src/main/java/org/aitesting/microservices/authentication/utils/UserContext.java

@@ -14,18 +14,35 @@ public class UserContext {
     private static final ThreadLocal<String> userId = new ThreadLocal<String>();
     private static final ThreadLocal<String> orgId = new ThreadLocal<String>();
 
+    public static String getCorrelationId() {
+        return correlationId.get();
+    }
 
-    public static String getCorrelationId() { return correlationId.get(); }
-    public static void setCorrelationId(String cid) {correlationId.set(cid); }
+    public static void setCorrelationId(String cid) {
+        correlationId.set(cid);
+    }
 
-    public static String getAuthToken() { return authToken.get(); }
-    public static void setAuthToken(String aToken) {authToken.set(aToken); }
+    public static String getAuthToken() {
+        return authToken.get();
+    }
 
-    public static String getUserId() { return userId.get(); }
-    public static void setUserId(String aUser) {userId.set(aUser); }
+    public static void setAuthToken(String authToken) {
+        UserContext.authToken.set(authToken);
+    }
 
-    public static String getOrgId() { return orgId.get(); }
-    public static void setOrgId(String aOrg) {orgId.set(aOrg); }
+    public static String getUserId() {
+        return userId.get();
+    }
 
+    public static void setUserId(String userId) {
+        UserContext.userId.set(userId);
+    }
 
+    public static String getOrgId() {
+        return orgId.get();
+    }
+
+    public static void setOrgId(String orgId) {
+        UserContext.orgId.set(orgId);
+    }
 }

src/main/java/org/aitesting/microservices/authentication/utils/UserContextFilter.java

@@ -1,15 +1,14 @@
 package org.aitesting.microservices.authentication.utils;
 
-import org.springframework.stereotype.Component;
-
+import java.io.IOException;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
+import org.springframework.stereotype.Component;
 
 @Component
 public class UserContextFilter implements Filter {
@@ -20,8 +19,8 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 
         HttpServletRequest httpServletRequest = (HttpServletRequest) servletRequest;
 
-        System.out.println("****** I am entering the licensing service id with auth token: " + httpServletRequest.getHeader("Authorization"));
-
+        System.out.println("****** I am entering the licensing service id with auth token: "
+                + httpServletRequest.getHeader("Authorization"));
 
         UserContextHolder.getContext().setCorrelationId(httpServletRequest.getHeader(UserContext.CORRELATION_ID));
         UserContextHolder.getContext().setUserId(httpServletRequest.getHeader(UserContext.USER_ID));

src/main/java/org/aitesting/microservices/authentication/utils/UserContextHolder.java

@@ -5,7 +5,7 @@
 public class UserContextHolder {
     private static final ThreadLocal<UserContext> userContext = new ThreadLocal<UserContext>();
 
-    public static final UserContext getContext(){
+    public static final UserContext getContext() {
         UserContext context = userContext.get();
 
         if (context == null) {
@@ -21,7 +21,7 @@ public static final void setContext(UserContext context) {
         userContext.set(context);
     }
 
-    public static final UserContext createEmptyContext(){
+    public static final UserContext createEmptyContext() {
         return new UserContext();
     }
 }

src/main/java/org/aitesting/microservices/authentication/utils/UserContextInterceptor.java

@@ -1,13 +1,12 @@
 package org.aitesting.microservices.authentication.utils;
 
+import java.io.IOException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.http.client.ClientHttpResponse;
 
-import java.io.IOException;
-
 public class UserContextInterceptor implements ClientHttpRequestInterceptor {
 
     @Override