Merge pull request overture-stack#7 from overture-stack/hotfix/codacy-issues

Codacy recommended changes

Author: andricDu

DockerFile

@@ -15,10 +15,10 @@ RUN apk add --no-cache curl tar bash \
 WORKDIR /usr/src/app
 
 # copy just the pom.xml and install dependencies for caching
-ADD pom.xml .
+COPY pom.xml .
 RUN mvn verify clean --fail-never
 
-ADD . .
+COPY . .
 
 RUN mvn install -DskipTests
 

src/main/java/bio/overture/microservicetemplate/controller/TestController.java

@@ -16,7 +16,6 @@
 
 package bio.overture.microservicetemplate.controller;
 
-import bio.overture.microservicetemplate.jwt.JWTUser;
 import bio.overture.microservicetemplate.jwt.JWTFacadeInterface;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
@@ -26,15 +25,14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Optional;
 
 @Slf4j
 @RestController
 @RequestMapping("/test")
 public class TestController {
 
   @Autowired
-  JWTFacadeInterface jwtFacade;
+  private JWTFacadeInterface jwtFacade;
 
   @GetMapping
   public String testGet() {

src/main/java/bio/overture/microservicetemplate/jwt/JWTAuthorizationFilter.java

@@ -19,7 +19,6 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
-import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.provider.authentication.OAuth2AuthenticationDetails;
 import org.springframework.web.filter.GenericFilterBean;
@@ -44,7 +43,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
       val user = (JWTUser) details.getDecodedDetails();
 
       boolean hasCorrectRole = user.getRoles().contains(REQUIRED_ROLE);
-      boolean hasCorrectStatus = user.getStatus().toLowerCase().equals(REQUIRED_STATUS.toLowerCase());
+      boolean hasCorrectStatus = user.getStatus().equalsIgnoreCase(REQUIRED_STATUS);
 
       if(!hasCorrectRole || !hasCorrectStatus) {
         SecurityContextHolder.clearContext();

src/main/java/bio/overture/microservicetemplate/jwt/JWTUser.java

@@ -23,14 +23,14 @@
 @Data
 public class JWTUser {
 
-  String name;
-  String firstName;
-  String lastName;
-  String email;
-  String status;
-  String createdAt;
-  String lastLogin;
-  String preferredLanguage;
-  List<String> roles;
+  private String name;
+  private String firstName;
+  private String lastName;
+  private String email;
+  private String status;
+  private String createdAt;
+  private String lastLogin;
+  private String preferredLanguage;
+  private List<String> roles;
 
 }

src/test/java/bio/overture/microservicetemplate/MicroserviceTemplateApplicationTests.java

@@ -27,6 +27,8 @@ public class MicroserviceTemplateApplicationTests {
 
   @Test
   public void contextLoads() {
+    // Passes if application starts
+    assert(true);
   }
 
 }