DSND-3300: Upgrade deps & format code (#219)

* DSND-3300: Upgrade deps

* DSND-3300: Format code

* DSND-3300: Remove unused imports

* DSND-3300: Upgrade vulnerable dep

Author: sthompsonCH

pom.xml

@@ -1,6 +1,5 @@
 package uk.gov.companieshouse.pscdataapi.config;
 
-import java.util.Arrays;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -33,7 +32,7 @@ public class WebSecurityConfig implements WebMvcConfigurer {
     public static final String PATTERN_IDENTITY_VERIFICATION_DETAILS =
             "/company/{company_number}/persons-with-significant-control/individual/{notification_id}/identity-verification-details";
 
-    List<String> otherAllowedAuthMethods = Arrays.asList("oauth2");
+    List<String> otherAllowedAuthMethods = List.of("oauth2");
 
     @Override
     public void addInterceptors(final InterceptorRegistry registry) {
@@ -88,6 +87,6 @@ public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws E
 
     @Bean
     public List<String> externalMethods() {
-        return Arrays.asList(HttpMethod.GET.name());
+        return List.of(HttpMethod.GET.name());
     }
 }

src/main/java/uk/gov/companieshouse/pscdataapi/config/WebSecurityConfig.java

@@ -9,7 +9,7 @@ public enum CorporatePscRoles {
     LEGAL_PSC("legal-person-person-with-significant-control"),
     LEGAL_BO("legal-person-beneficial-owner");
 
-    private String role;
+    private final String role;
 
     CorporatePscRoles(String role) {
         this.role = role;

src/main/java/uk/gov/companieshouse/pscdataapi/data/CorporatePscRoles.java

@@ -7,7 +7,7 @@ public enum IndividualPscRoles {
     INDIVIDUAL_PSC("individual-person-with-significant-control"),
     INDIVIDUAL_BO("individual-beneficial-owner");
 
-    private String role;
+    private final String role;
 
     IndividualPscRoles(String role) {
         this.role = role;

src/main/java/uk/gov/companieshouse/pscdataapi/data/IndividualPscRoles.java

@@ -13,7 +13,7 @@ public enum PscRoles {
     LEGAL_BO("legal-person-beneficial-owner"),
     SUPER_SECURE_BO("super-secure-beneficial-owner");
 
-    private String role;
+    private final String role;
 
     PscRoles(String role) {
         this.role = role;

src/main/java/uk/gov/companieshouse/pscdataapi/data/PscRoles.java

@@ -7,7 +7,7 @@ public enum SecurePscRoles {
     SUPER_SECURE_PSC("super-secure-person-with-significant-control"),
     SUPER_SECURE_BO("super-secure-beneficial-owner");
 
-    private String role;
+    private final String role;
 
     SecurePscRoles(String role) {
 

src/main/java/uk/gov/companieshouse/pscdataapi/data/SecurePscRoles.java

@@ -1,8 +1,6 @@
 package uk.gov.companieshouse.pscdataapi.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.Map;
 
 /**
  * Helper class for authenticating users

src/main/java/uk/gov/companieshouse/pscdataapi/interceptor/AuthenticationHelper.java

@@ -1,10 +1,6 @@
 package uk.gov.companieshouse.pscdataapi.interceptor;
 
 import jakarta.servlet.http.HttpServletRequest;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.stereotype.Component;

src/main/java/uk/gov/companieshouse/pscdataapi/interceptor/AuthenticationHelperImpl.java

@@ -1,13 +1,12 @@
 package uk.gov.companieshouse.pscdataapi.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.lang.Nullable;
-import uk.gov.companieshouse.api.psc.IdentityVerificationDetails;
-
 import java.time.LocalDate;
 import java.util.List;
 import java.util.Objects;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.lang.Nullable;
+import uk.gov.companieshouse.api.psc.IdentityVerificationDetails;
 
 public class PscIdentityVerificationDetails {
 
@@ -48,14 +47,15 @@ public class PscIdentityVerificationDetails {
     @Nullable
     private String preferredName;
 
-    public PscIdentityVerificationDetails(){}
+    public PscIdentityVerificationDetails() {
+    }
 
     /**
      * Constructor using SDK IdentityVerificationDetails.
      *
      * @param identityVerificationDetails API Address object.
      */
-    public PscIdentityVerificationDetails(IdentityVerificationDetails identityVerificationDetails){
+    public PscIdentityVerificationDetails(IdentityVerificationDetails identityVerificationDetails) {
         if (identityVerificationDetails == null) {
             return;
         }

src/main/java/uk/gov/companieshouse/pscdataapi/models/PscIdentityVerificationDetails.java

@@ -74,7 +74,8 @@ public Individual transformPscDocToIndividual(PscDocument pscDocument, boolean s
             if (Objects.equals(pscData.getIdentityVerificationDetails(), new PscIdentityVerificationDetails(null))) {
                 individual.setIdentityVerificationDetails(null);
             } else {
-                individual.setIdentityVerificationDetails(mapIdentityVerificationDetails(pscData.getIdentityVerificationDetails()));
+                individual.setIdentityVerificationDetails(
+                        mapIdentityVerificationDetails(pscData.getIdentityVerificationDetails()));
             }
         }
         if (pscDocument.getSensitiveData() != null) {
@@ -106,7 +107,8 @@ public IndividualFullRecord transformPscDocToIndividualFullRecord(final PscDocum
         individualFullRecord.setLinks(mapLinksToPscLinks(pscData.getLinks()));
         individualFullRecord.serviceAddress(mapAddress(pscData.getAddress()));
         individualFullRecord.setEtag(pscData.getEtag());
-        individualFullRecord.setIdentityVerificationDetails(mapIdentityVerificationDetails(pscData.getIdentityVerificationDetails()));
+        individualFullRecord.setIdentityVerificationDetails(
+                mapIdentityVerificationDetails(pscData.getIdentityVerificationDetails()));
 
         final PscSensitiveData sensitivePscData = pscDocument.getSensitiveData();
         individualFullRecord.setResidentialAddressSameAsServiceAddress(
@@ -666,13 +668,17 @@ private static PscLinks mapLinksToPscLinks(final Links links) {
     }
 
     private IdentityVerificationDetails mapIdentityVerificationDetails(final PscIdentityVerificationDetails details) {
-        if (details == null) return null;
+        if (details == null) {
+            return null;
+        }
 
         IdentityVerificationDetails ivd = new IdentityVerificationDetails();
 
         Optional<LocalDate> appointmentVerificationEndOn = Optional.ofNullable(details.getAppointmentVerificationEndOn());
-        Optional<LocalDate> appointmentVerificationStatementDate = Optional.ofNullable(details.getAppointmentVerificationStatementDate());
-        Optional<LocalDate> appointmentVerificationStatementDueOn = Optional.ofNullable(details.getAppointmentVerificationStatementDueOn());
+        Optional<LocalDate> appointmentVerificationStatementDate = Optional.ofNullable(
+                details.getAppointmentVerificationStatementDate());
+        Optional<LocalDate> appointmentVerificationStatementDueOn = Optional.ofNullable(
+                details.getAppointmentVerificationStatementDueOn());
         Optional<LocalDate> appointmentVerificationStartOn = Optional.ofNullable(details.getAppointmentVerificationStartOn());
         Optional<LocalDate> identityVerifiedOn = Optional.ofNullable(details.getIdentityVerifiedOn());