Apply suggestions from code review

Co-authored-by: Felix Dittrich <31076102+f11h@users.noreply.github.com>
WorldHealthOrganization · Oct 6, 2023 · add4ac2 · add4ac2
1 parent 4b2052f
commit add4ac2
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/int_/who/tng/dataimport/job/importJobStepImpl/AddCertificateStep.java b/src/main/java/int_/who/tng/dataimport/job/importJobStepImpl/AddCertificateStep.java
@@ -52,7 +52,8 @@ public void exec(ImportJobContext context, String... args) throws ImportJobStepE
                 certificateUtils.getCertThumbprint(x509CertificateHolder),
                 null,
                 countryCode,
-                certificateType, null));//TODO: domain null?
+                certificateType,
+                null));
 
         } catch (Exception e) {
             throw new ImportJobStepException(true,

diff --git a/src/main/java/int_/who/tng/dataimport/job/importJobStepImpl/ParseCertificatesStep.java b/src/main/java/int_/who/tng/dataimport/job/importJobStepImpl/ParseCertificatesStep.java
@@ -53,8 +53,7 @@ public void exec(ImportJobContext context, String... args) throws ImportJobStepE
                 String domain = null;
                 try {
                     domain = matcher.group("DOMAIN");
-                } catch (IllegalArgumentException e) {
-                    //ignore
+                } catch (IllegalArgumentException ignored) {
                 }
 
 
@@ -101,7 +100,7 @@ private ImportJobContext.CertificateEntry parsePem(byte[] file, ImportJobContext
                     null,
                     countryCode,
                     certificateType,
-                        domain);
+                    domain);
             } else {
                 throw new ImportJobStepException(true, "Failed to parse Certificate as X509Certificate");
             }
@@ -137,7 +136,7 @@ private ImportJobContext.CertificateEntry parseJson(byte[] file, ImportJobContex
                 json.trustAnchorSignature,
                 countryCode,
                 certificateType,
-                    domain);
+                domain);
 
         } catch (DatabindException e) {
             throw new ImportJobStepException(true, "Failed to parse JSON: " + e.getMessage());

diff --git a/src/test/java/int_/who/tng/dataimport/job/importJobStepImpl/MapPrivateKeyStepTest.java b/src/test/java/int_/who/tng/dataimport/job/importJobStepImpl/MapPrivateKeyStepTest.java
@@ -208,7 +208,8 @@ private void addCertificate(ImportJobContext context, X509Certificate certificat
             certificateUtils.getCertThumbprint(certificate),
             null,
             TEST_COUNTRY_CODE,
-            certificateType, null));
+            certificateType,
+            null));
     }
 
 }
diff --git a/..._/who/tng/dataimport/job/importJobStepImpl/RemoveExistingCertificatesFromContextTest.java b/..._/who/tng/dataimport/job/importJobStepImpl/RemoveExistingCertificatesFromContextTest.java
@@ -130,6 +130,7 @@ private void addCertificate(ImportJobContext context, X509Certificate certificat
             certificateUtils.getCertThumbprint(certificate),
             null,
             TEST_COUNTRY_CODE,
-            certificateType, null));
+            certificateType,
+            null));
     }
 }
diff --git a/.../int_/who/tng/dataimport/job/importJobStepImpl/RemoveIgnoredCountriesFromContextTest.java b/.../int_/who/tng/dataimport/job/importJobStepImpl/RemoveIgnoredCountriesFromContextTest.java
@@ -61,6 +61,7 @@ private void addCertificate(ImportJobContext context, X509Certificate certificat
             certificateUtils.getCertThumbprint(certificate),
             null,
             countryCode,
-            certificateType, null));
+            certificateType,
+            null));
     }
 }
diff --git a/...test/java/int_/who/tng/dataimport/job/importJobStepImpl/SaveCertificatesInDbStepTest.java b/...test/java/int_/who/tng/dataimport/job/importJobStepImpl/SaveCertificatesInDbStepTest.java
@@ -177,7 +177,7 @@ void testSaveTrustedPartyWithNonDefaultDomain(String type) throws Exception {
                 CertificateTestUtils.generateCertificate(keyPair, TEST_COUNTRY_CODE, "Testcert 1");
 
         ImportJobContext context = new ImportJobContext();
-        addCertificateForDomain(context, certificate1, ImportJobContext.CertificateType.valueOf(type), TEST_DUMMY_SIGNATURE,
+        addCertificateToContext(context, certificate1, ImportJobContext.CertificateType.valueOf(type), TEST_DUMMY_SIGNATURE,
                 TEST_COUNTRY_CODE, TEST_RACSEL_DDVC_DOMAIN);
 
         ArgumentCaptor<TrustedPartyEntity> trustedPartyEntityArgumentCaptor =
@@ -364,7 +364,7 @@ private void addCertificate(ImportJobContext context, X509Certificate certificat
             certificateType, null));
     }
 
-    private void addCertificateForDomain(ImportJobContext context, X509Certificate certificate,
+    private void addCertificateToContext(ImportJobContext context, X509Certificate certificate,
                                 ImportJobContext.CertificateType certificateType, String signature, String countryCode, String domain)
             throws CertificateEncodingException, IOException {
         context.getParsedCertificates().add(new ImportJobContext.CertificateEntry(
@@ -375,6 +375,7 @@ private void addCertificateForDomain(ImportJobContext context, X509Certificate c
                 certificateUtils.getCertThumbprint(certificate),
                 signature,
                 countryCode,
-                certificateType, domain));
+                certificateType,
+                domain));
     }
 }
diff --git a/src/test/java/int_/who/tng/dataimport/job/importJobStepImpl/SignCertificatesStepTest.java b/src/test/java/int_/who/tng/dataimport/job/importJobStepImpl/SignCertificatesStepTest.java
@@ -179,6 +179,7 @@ private void addCertificate(ImportJobContext context, X509Certificate certificat
             certificateUtils.getCertThumbprint(certificate),
             signature,
             countryCode,
-            certificateType, null));
+            certificateType,
+            null));
     }
 }