Merge pull request #60 from companieshouse/feature/address-sonar

Feature/address sonar comments
companieshouse · Sep 27, 2019 · f5446eb · f5446eb
2 parents 7d7b4be + 4dd5034
commit f5446eb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/uk/gov/companieshouse/web/lfp/controller/lfp/ConfirmationController.java b/src/main/java/uk/gov/companieshouse/web/lfp/controller/lfp/ConfirmationController.java
@@ -31,7 +31,7 @@ public class ConfirmationController extends BaseController {
     }
 
     @Autowired
-    private PayableLateFilingPenaltyService PayableLateFilingPenaltyService;
+    private PayableLateFilingPenaltyService payableLateFilingPenaltyService;
 
     @Autowired
     private SessionService sessionService;
@@ -69,7 +69,8 @@ public String getConfirmation(@PathVariable String companyNumber,
 
             PayableLateFilingPenalty payableLateFilingPenalty;
             try {
-                payableLateFilingPenalty = PayableLateFilingPenaltyService.getPayableLateFilingPenalty(companyNumber, penaltyId);
+                payableLateFilingPenalty = payableLateFilingPenaltyService
+                        .getPayableLateFilingPenalty(companyNumber, penaltyId);
             } catch (ServiceException ex) {
                 LOGGER.errorRequest(request, ex.getMessage(), ex);
                 return ERROR_VIEW;

diff --git a/src/main/java/uk/gov/companieshouse/web/lfp/controller/lfp/EnterLFPDetailsController.java b/src/main/java/uk/gov/companieshouse/web/lfp/controller/lfp/EnterLFPDetailsController.java
@@ -31,7 +31,7 @@ public class EnterLFPDetailsController extends BaseController {
     private static String LFP_ENTER_DETAILS = "lfp/details";
 
     @Autowired
-    private LateFilingPenaltyService LateFilingPenaltyService;
+    private LateFilingPenaltyService lateFilingPenaltyService;
 
     @Autowired
     private CompanyService companyService;
@@ -72,10 +72,11 @@ public String postLFPEnterDetails(@ModelAttribute("enterLFPDetails") @Valid Ente
         String penaltyNumber = enterLFPDetails.getPenaltyNumber();
 
         try {
-            List<LateFilingPenalty> payableLateFilingPenalties = LateFilingPenaltyService.getLateFilingPenalties(companyNumber, penaltyNumber);
+            List<LateFilingPenalty> payableLateFilingPenalties = lateFilingPenaltyService
+                    .getLateFilingPenalties(companyNumber, penaltyNumber);
 
             // If there are no payable late filing penalties either the company does not exist or has no penalties.
-            if (payableLateFilingPenalties.size() == 0) {
+            if (payableLateFilingPenalties.isEmpty()) {
                 return UrlBasedViewResolver.REDIRECT_URL_PREFIX + urlGenerator(companyNumber, penaltyNumber) + LFP_NO_PENALTY_FOUND;
             }
 

diff --git a/src/main/java/uk/gov/companieshouse/web/lfp/controller/lfp/ViewPenaltiesController.java b/src/main/java/uk/gov/companieshouse/web/lfp/controller/lfp/ViewPenaltiesController.java
@@ -42,7 +42,7 @@ public class ViewPenaltiesController extends BaseController {
     private CompanyService companyService;
 
     @Autowired
-    private LateFilingPenaltyService LateFilingPenaltyService;
+    private LateFilingPenaltyService lateFilingPenaltyService;
 
     @Autowired
     private PayableLateFilingPenaltyService payableLateFilingPenaltyService;
@@ -64,7 +64,7 @@ public String getViewPenalties(@PathVariable String companyNumber,
 
         try {
             companyProfileApi = companyService.getCompanyProfile(companyNumber);
-            lateFilingPenalties = LateFilingPenaltyService.getLateFilingPenalties(companyNumber, penaltyNumber);
+            lateFilingPenalties = lateFilingPenaltyService.getLateFilingPenalties(companyNumber, penaltyNumber);
             lateFilingPenalty = lateFilingPenalties.get(0);
         } catch (ServiceException ex) {
             LOGGER.errorRequest(request, ex.getMessage(), ex);
@@ -108,7 +108,7 @@ public String postViewPenalties(@PathVariable String companyNumber,
 
         try {
             // Call penalty details for create request
-            LateFilingPenalty lateFilingPenalty = LateFilingPenaltyService.getLateFilingPenalties(companyNumber, penaltyNumber).get(0);
+            LateFilingPenalty lateFilingPenalty = lateFilingPenaltyService.getLateFilingPenalties(companyNumber, penaltyNumber).get(0);
 
             // Create payable session
             payableLateFilingPenaltySession = payableLateFilingPenaltyService.createLateFilingPenaltySession(

diff --git a/src/main/java/uk/gov/companieshouse/web/lfp/validation/PenaltyValidator.java b/src/main/java/uk/gov/companieshouse/web/lfp/validation/PenaltyValidator.java
@@ -8,13 +8,11 @@
 
 public class PenaltyValidator implements ConstraintValidator<Penalty, String> {
 
-    private int stringSize;
     private String message;
     private String messageNotLongEnough;
 
     @Override
     public void initialize(Penalty penalty) {
-        stringSize = penalty.stringSize();
         message = penalty.message();
         messageNotLongEnough = penalty.messageNotLongEnough();
     }

diff --git a/src/test/java/uk/gov/companieshouse/web/lfp/service/company/impl/CompanyServiceImplTest.java b/src/test/java/uk/gov/companieshouse/web/lfp/service/company/impl/CompanyServiceImplTest.java
@@ -62,23 +62,23 @@ public class CompanyServiceImplTest {
     void validateCompanyNumberWithLettersNotAppended() throws Exception {
 
         String companyNumber = mockCompanyService.appendToCompanyNumber(COMPANY_NUMBER_WITH_LETTERS);
-        assertEquals(companyNumber, COMPANY_NUMBER_WITH_LETTERS);
+        assertEquals(COMPANY_NUMBER_WITH_LETTERS, companyNumber);
     }
 
     @Test
     @DisplayName("Append - Eight Digit company number returned the same")
     void validationEightDigitCompanyNumberReturnedTheSame() throws Exception {
 
         String companyNumber = mockCompanyService.appendToCompanyNumber(COMPANY_NUMBER_WITH_EIGHT_DIGITS);
-        assertEquals(companyNumber, COMPANY_NUMBER_WITH_EIGHT_DIGITS);
+        assertEquals(COMPANY_NUMBER_WITH_EIGHT_DIGITS, companyNumber);
     }
 
     @Test
     @DisplayName("Append - Six Digit company number should have 0's appended to beginning")
     void validationSixDigitCompanyNumberReturnedWithAppendedZeros() throws Exception {
 
         String companyNumber = mockCompanyService.appendToCompanyNumber(COMPANY_NUMBER_WITH_SIX_DIGITS);
-        assertEquals(companyNumber, APPENDED_SIX_DIGIT_COMPANY_NUMBER);
+        assertEquals(APPENDED_SIX_DIGIT_COMPANY_NUMBER, companyNumber);
     }
 
     private void initGetCompany() {