Rename variables in test for better readability

1 files changed, 94 insertions, 83 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
index 99764aad..9f58ba71 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
@@ -28,7 +28,6 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.RegisterResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.ernp.IErnpClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.ManualFixNecessaryException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.DeSpecificDetailSearchProcessor;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.CountrySpecificDetailSearchProcessor;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.ItSpecificDetailSearchProcessor;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.InitialSearchTask;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.zmr.IZmrClient;
@@ -68,7 +67,6 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Random;
 
 import static org.junit.Assert.assertThrows;
@@ -78,6 +76,9 @@ import static org.junit.Assert.assertThrows;
 @DirtiesContext(classMode = ClassMode.BEFORE_CLASS)
 public class InitialSearchTaskFirstTest {
 
+  private static final String DE_ST = "de/st/";
+  private static final String IT_ST = "it/st/";
+
   private InitialSearchTask task;
   @Mock
   private IZmrClient zmrClient;
@@ -86,14 +87,14 @@ public class InitialSearchTaskFirstTest {
 
   final ExecutionContext executionContext = new ExecutionContextImpl();
   private TestRequestImpl pendingReq;
+  private final String randomBpk = RandomStringUtils.randomNumeric(6);
   private final String randomIdentifier = RandomStringUtils.randomNumeric(10);
+  private final String randomPseudonym = DE_ST + randomIdentifier;
   private final String randomFamilyName = RandomStringUtils.randomAlphabetic(10);
   private final String randomGivenName = RandomStringUtils.randomAlphabetic(10);
   private final String randomPlaceOfBirth = RandomStringUtils.randomAlphabetic(10);
   private final String randomBirthName = RandomStringUtils.randomAlphabetic(10);
-  private final String randomDate = "2011-01-"+ (10 + new Random().nextInt(18));
-  private final String DE_ST = "de/st/";
-  private final String IT_ST = "it/st/";
+  private final String randomDate = "2011-01-" + (10 + new Random().nextInt(18));
 
   /**
    * jUnit class initializer.
@@ -132,17 +133,15 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode100_UserIdentifiedUpdateNecessary_a() throws Exception {
-    ArrayList<RegisterResult> zmrResult = new ArrayList<>();
-    String randomBpk = RandomStringUtils.randomNumeric(6);
-    String newFirstName = RandomStringUtils.randomAlphabetic(5);
-    String randomPseudonym = DE_ST + randomIdentifier;
+    String newFirstName = RandomStringUtils.randomAlphabetic(10);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.singletonList(
-            new RegisterResult(randomBpk, randomPseudonym, newFirstName, randomFamilyName, randomDate)));
+        new RegisterResult(randomBpk, randomPseudonym, newFirstName, randomFamilyName, randomDate)));
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
 
     task.execute(pendingReq, executionContext);
     String bPk = (String)
-        pendingReq.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+        pendingReq.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
 
     Assert.assertEquals("Wrong bpk", bPk, randomBpk);
   }
@@ -154,14 +153,14 @@ public class InitialSearchTaskFirstTest {
   @DirtiesContext
   public void testNode100_UserIdentifiedUpdateNecessary_b() throws TaskExecutionException {
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
-    String randomBpk = RandomStringUtils.randomNumeric(6);
     String newRandomGivenName = RandomStringUtils.randomAlphabetic(10);
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.singletonList(
-            new RegisterResult(randomBpk, DE_ST+randomIdentifier, newRandomGivenName, randomFamilyName, randomDate)));
+        new RegisterResult(randomBpk, randomPseudonym, newRandomGivenName, randomFamilyName, randomDate)));
 
     task.execute(pendingReq, executionContext);
     String bPk = (String)
-        pendingReq.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+        pendingReq.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
 
     Assert.assertEquals("Wrong bpk", bPk, randomBpk);
   }
@@ -173,14 +172,14 @@ public class InitialSearchTaskFirstTest {
   @DirtiesContext
   public void testNode101_ManualFixNecessary_a() {
     ArrayList<RegisterResult> zmrResult = new ArrayList<>();
-    zmrResult.add(new RegisterResult("bpkMax", DE_ST+randomIdentifier, randomGivenName, randomFamilyName, randomDate));
+    zmrResult.add(new RegisterResult(randomBpk, randomPseudonym, randomGivenName, randomFamilyName, randomDate));
     String newRandomGivenName = randomGivenName + RandomStringUtils.randomAlphabetic(2);
-    zmrResult.add(new RegisterResult("bpkMax", DE_ST+randomIdentifier, newRandomGivenName, randomFamilyName, randomDate));
+    zmrResult.add(new RegisterResult(randomBpk, randomPseudonym, newRandomGivenName, randomFamilyName, randomDate));
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(zmrResult);
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
 
     TaskExecutionException exception = assertThrows(TaskExecutionException.class,
-            () -> task.execute(pendingReq, executionContext));
+        () -> task.execute(pendingReq, executionContext));
 
     Throwable origE = exception.getOriginalException();
     Assert.assertTrue("Wrong exception", (origE.getCause() instanceof ManualFixNecessaryException));
@@ -193,16 +192,16 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode101_ManualFixNecessary_b() {
-    String randombpk = RandomStringUtils.randomNumeric(5);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
     ArrayList<RegisterResult> ernpResult = new ArrayList<>();
-    ernpResult.add(new RegisterResult(randombpk, DE_ST+randomIdentifier, randomGivenName, randomFamilyName, randomDate));
+    ernpResult.add(new RegisterResult(randomBpk, randomPseudonym, randomGivenName, randomFamilyName, randomDate));
     String newRandomGivenName = randomGivenName + RandomStringUtils.randomAlphabetic(2);
-    ernpResult.add(new RegisterResult(randombpk, DE_ST+randomIdentifier, newRandomGivenName, randomFamilyName, randomDate));
+    ernpResult.add(
+        new RegisterResult(randomBpk, randomPseudonym, newRandomGivenName, randomFamilyName, randomDate));
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(ernpResult);
 
     TaskExecutionException exception = assertThrows(TaskExecutionException.class,
-            () -> task.execute(pendingReq, executionContext));
+        () -> task.execute(pendingReq, executionContext));
 
     Throwable origE = exception.getOriginalException();
     Assert.assertTrue("Wrong exception", (origE.getCause() instanceof ManualFixNecessaryException));
@@ -214,14 +213,14 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode102_UserIdentified_a() throws Exception {
-    String randomBpk = RandomStringUtils.randomNumeric(12);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.singletonList(
-            new RegisterResult(randomBpk, DE_ST+randomIdentifier, randomGivenName, randomFamilyName, randomDate)));
+        new RegisterResult(randomBpk, randomPseudonym, randomGivenName, randomFamilyName, randomDate)));
 
     task.execute(pendingReq, executionContext);
     String bPk = (String)
-        pendingReq.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+        pendingReq.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
     Assert.assertEquals("Wrong bpk", bPk, randomBpk);
   }
 
@@ -231,15 +230,15 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode102_UserIdentified_b() throws Exception {
-    String randomBpk = RandomStringUtils.randomNumeric(14);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.singletonList(
-            new RegisterResult(randomBpk, DE_ST+randomIdentifier, randomGivenName, randomFamilyName, randomDate)));
+        new RegisterResult(randomBpk, randomPseudonym, randomGivenName, randomFamilyName, randomDate)));
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
 
     task.execute(pendingReq, executionContext);
 
     String bPk = (String)
-        pendingReq.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+        pendingReq.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
     Assert.assertEquals("Wrong bpk", bPk, randomBpk);
   }
 
@@ -249,7 +248,6 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode103_UserIdentified_IT() throws Exception {
-    String bpkRegister = RandomStringUtils.randomNumeric(14);
     String taxNumber = RandomStringUtils.randomNumeric(14);
     final AuthenticationResponse response = buildDummyAuthResponseRandomPersonIT_Tax(taxNumber);
     TestRequestImpl pendingReq1 = new TestRequestImpl();
@@ -258,17 +256,19 @@ public class InitialSearchTaskFirstTest {
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
     String newRandomPseudonym = IT_ST + randomIdentifier + RandomStringUtils.randomNumeric(2);
     Mockito.when(zmrClient.searchItSpecific(taxNumber)).thenReturn(Collections.singletonList(
-            new RegisterResult(bpkRegister, newRandomPseudonym, randomGivenName, randomFamilyName,
-                    randomDate, null, null, taxNumber, null)));
+        new RegisterResult(randomBpk, newRandomPseudonym, randomGivenName, randomFamilyName,
+            randomDate, null, null, taxNumber, null)));
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
-    task = new InitialSearchTask(Collections.singletonList(new ItSpecificDetailSearchProcessor(ernpClient, zmrClient)),
-            ernpClient, zmrClient);
+    task = new InitialSearchTask(
+        Collections.singletonList(new ItSpecificDetailSearchProcessor(ernpClient, zmrClient)),
+        ernpClient, zmrClient);
 
     task.execute(pendingReq1, executionContext);
 
     String bPk = (String)
-        pendingReq1.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
-    Assert.assertEquals("Wrong bpk", bPk, bpkRegister);
+        pendingReq1.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+    Assert.assertEquals("Wrong bpk", bPk, randomBpk);
   }
 
   /**
@@ -277,26 +277,27 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode103_UserIdentified_DE() throws Exception {
-    String randomPseudonym = DE_ST + RandomStringUtils.randomNumeric(5);
-    String randomBpk = RandomStringUtils.randomNumeric(5);
-    final AuthenticationResponse response = buildDummyAuthResponseDE(randomGivenName, randomFamilyName, randomPseudonym,
-            randomDate, randomPlaceOfBirth, randomBirthName);
+    final AuthenticationResponse response = buildDummyAuthResponseDE(randomGivenName, randomFamilyName,
+        randomPseudonym,
+        randomDate, randomPlaceOfBirth, randomBirthName);
     TestRequestImpl pendingReq1 = new TestRequestImpl();
     pendingReq1.getSessionData(AuthProcessDataWrapper.class)
         .setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, response);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
     Mockito.when(zmrClient.searchDeSpecific(randomGivenName, randomFamilyName, randomDate, randomPlaceOfBirth,
-            randomBirthName))
-            .thenReturn(Collections.singletonList(new RegisterResult(randomBpk, randomPseudonym, randomGivenName,
-                    randomFamilyName, randomDate, randomPlaceOfBirth, randomBirthName,null, null)));
+        randomBirthName))
+        .thenReturn(Collections.singletonList(new RegisterResult(randomBpk, randomPseudonym, randomGivenName,
+            randomFamilyName, randomDate, randomPlaceOfBirth, randomBirthName, null, null)));
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
-    task = new InitialSearchTask(Collections.singletonList(new DeSpecificDetailSearchProcessor(ernpClient, zmrClient)),
-            ernpClient, zmrClient);
+    task = new InitialSearchTask(
+        Collections.singletonList(new DeSpecificDetailSearchProcessor(ernpClient, zmrClient)),
+        ernpClient, zmrClient);
 
     task.execute(pendingReq1, executionContext);
 
     String resultBpk = (String)
-        pendingReq1.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+        pendingReq1.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
     Assert.assertEquals("Wrong bpk", resultBpk, randomBpk);
   }
 
@@ -306,29 +307,30 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode104_ManualFixNecessary_DE() throws Exception {
-    String pseudonym1 = DE_ST + RandomStringUtils.randomNumeric(5);
-    String pseudonym2 = pseudonym1 + RandomStringUtils.randomNumeric(2);
-    String bpk1 = RandomStringUtils.randomNumeric(5);
-    String bpk2 = bpk1 + RandomStringUtils.randomNumeric(2);
-    final AuthenticationResponse response = buildDummyAuthResponseDE(randomGivenName, randomFamilyName, pseudonym1,
-            randomDate, randomPlaceOfBirth, randomBirthName);
+    String newRandomPseudonym = randomPseudonym + RandomStringUtils.randomNumeric(2);
+    String newRandomBpk = randomBpk + RandomStringUtils.randomNumeric(6);
+    final AuthenticationResponse response = buildDummyAuthResponseDE(randomGivenName, randomFamilyName,
+        randomPseudonym,
+        randomDate, randomPlaceOfBirth, randomBirthName);
     TestRequestImpl pendingReq1 = new TestRequestImpl();
     pendingReq1.getSessionData(AuthProcessDataWrapper.class)
         .setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, response);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
     ArrayList<RegisterResult> zmrResultSpecific = new ArrayList<>();
-    zmrResultSpecific.add(new RegisterResult(bpk1, pseudonym1, randomGivenName, randomFamilyName, randomDate,
-            randomPlaceOfBirth, randomBirthName,null, null));
-    zmrResultSpecific.add(new RegisterResult(bpk2, pseudonym2, randomGivenName, randomFamilyName, randomDate,
-            randomPlaceOfBirth, randomBirthName,null, null));
+    zmrResultSpecific.add(
+        new RegisterResult(randomBpk, randomPseudonym, randomGivenName, randomFamilyName, randomDate,
+            randomPlaceOfBirth, randomBirthName, null, null));
+    zmrResultSpecific.add(new RegisterResult(newRandomBpk, newRandomPseudonym, randomGivenName, randomFamilyName, randomDate,
+        randomPlaceOfBirth, randomBirthName, null, null));
     Mockito.when(zmrClient.searchDeSpecific(randomGivenName, randomFamilyName, randomDate, randomPlaceOfBirth,
-            randomBirthName)).thenReturn(zmrResultSpecific);
+        randomBirthName)).thenReturn(zmrResultSpecific);
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
-    task = new InitialSearchTask(Collections.singletonList(new DeSpecificDetailSearchProcessor(ernpClient, zmrClient)),
-            ernpClient, zmrClient);
+    task = new InitialSearchTask(
+        Collections.singletonList(new DeSpecificDetailSearchProcessor(ernpClient, zmrClient)),
+        ernpClient, zmrClient);
 
     TaskExecutionException exception = assertThrows(TaskExecutionException.class,
-            () -> task.execute(pendingReq1, executionContext));
+        () -> task.execute(pendingReq1, executionContext));
 
     Throwable origE = exception.getOriginalException();
     Assert.assertTrue("Wrong exception", (origE.getCause() instanceof ManualFixNecessaryException));
@@ -340,24 +342,28 @@ public class InitialSearchTaskFirstTest {
   @Test
   @DirtiesContext
   public void testNode104_ManualFixNecessary_IT() throws Exception {
-    String fakeTaxNumber = RandomStringUtils.randomNumeric(14);
-    final AuthenticationResponse response = buildDummyAuthResponseRandomPersonIT_Tax(fakeTaxNumber);
+    String randomTaxNumber = RandomStringUtils.randomNumeric(14);
+    final AuthenticationResponse response = buildDummyAuthResponseRandomPersonIT_Tax(randomTaxNumber);
     TestRequestImpl pendingReq1 = new TestRequestImpl();
     pendingReq1.getSessionData(AuthProcessDataWrapper.class)
         .setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, response);
     Mockito.when(zmrClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
     ArrayList<RegisterResult> zmrResultSpecific = new ArrayList<>();
-    zmrResultSpecific.add(new RegisterResult("bpkMax", IT_ST+randomIdentifier+"4", randomGivenName,
-            randomFamilyName, randomDate, null, null, fakeTaxNumber, null));
-    zmrResultSpecific.add(new RegisterResult("bpkMax1", IT_ST+randomIdentifier+"5", randomGivenName,
-            randomFamilyName, randomDate, null, null, fakeTaxNumber, null));
-    Mockito.when(zmrClient.searchItSpecific(fakeTaxNumber)).thenReturn(zmrResultSpecific);
+    String randomPseudonym = IT_ST + randomIdentifier + "4";
+    zmrResultSpecific.add(new RegisterResult(randomBpk, randomPseudonym, randomGivenName,
+        randomFamilyName, randomDate, null, null, randomTaxNumber, null));
+    String newRandomPseudonym = IT_ST + randomIdentifier + "5";
+    String newRandomBpk = RandomStringUtils.randomNumeric(6);
+    zmrResultSpecific.add(new RegisterResult(newRandomBpk, newRandomPseudonym, randomGivenName,
+        randomFamilyName, randomDate, null, null, randomTaxNumber, null));
+    Mockito.when(zmrClient.searchItSpecific(randomTaxNumber)).thenReturn(zmrResultSpecific);
     Mockito.when(ernpClient.searchWithPersonIdentifier(randomIdentifier)).thenReturn(Collections.emptyList());
-    task = new InitialSearchTask(Collections.singletonList(new ItSpecificDetailSearchProcessor(ernpClient, zmrClient)),
-            ernpClient, zmrClient);
+    task = new InitialSearchTask(
+        Collections.singletonList(new ItSpecificDetailSearchProcessor(ernpClient, zmrClient)),
+        ernpClient, zmrClient);
 
     TaskExecutionException exception = assertThrows(TaskExecutionException.class,
-            () -> task.execute(pendingReq1, executionContext));
+        () -> task.execute(pendingReq1, executionContext));
 
     Throwable origE = exception.getOriginalException();
     Assert.assertTrue("Wrong exception", (origE.getCause() instanceof ManualFixNecessaryException));
@@ -375,19 +381,21 @@ public class InitialSearchTaskFirstTest {
     task.execute(pendingReq, executionContext);
 
     String bPk = (String)
-        pendingReq.getSessionData(AuthProcessDataWrapper.class).getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
+        pendingReq.getSessionData(AuthProcessDataWrapper.class)
+            .getGenericDataFromSession(Constants.DATA_RESULT_MATCHING_BPK);
     Assert.assertEquals("Wrong bpk", "TODO-Temporary-Endnode-105", bPk);
   }
 
 
   @NotNull
   private AuthenticationResponse buildDummyAuthResponseRandomPerson() throws URISyntaxException {
-    return buildDummyAuthResponse(randomGivenName, randomFamilyName, DE_ST+randomIdentifier, randomDate);
+    return buildDummyAuthResponse(randomGivenName, randomFamilyName, DE_ST + randomIdentifier, randomDate);
   }
 
-  private AuthenticationResponse buildDummyAuthResponseRandomPersonIT_Tax(String taxNumber) throws URISyntaxException {
-    return buildDummyAuthResponse(randomGivenName, randomFamilyName, IT_ST+randomIdentifier, randomDate,
-            taxNumber, null, null);
+  private AuthenticationResponse buildDummyAuthResponseRandomPersonIT_Tax(String taxNumber)
+      throws URISyntaxException {
+    return buildDummyAuthResponse(randomGivenName, randomFamilyName, IT_ST + randomIdentifier, randomDate,
+        taxNumber, null, null);
   }
 
   @NotNull
@@ -408,18 +416,19 @@ public class InitialSearchTaskFirstTest {
                                                         String dateOfBirth, String taxNumber, String placeOfBirth,
                                                         String birthName) throws URISyntaxException {
     ImmutableAttributeMap.Builder builder = ImmutableAttributeMap.builder()
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_PERSONALIDENTIFIER,"ff","af"), identifier)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTFAMILYNAME,"fff","aff"), familyName)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTGIVENNAME,"ffff","afff"), givenName)
-        .put(generateDateTimeAttribute(Constants.eIDAS_ATTR_DATEOFBIRTH,"fffff","affff"), dateOfBirth);
+        .put(generateStringAttribute(Constants.eIDAS_ATTR_PERSONALIDENTIFIER, "ff", "af"), identifier)
+        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTFAMILYNAME, "fff", "aff"), familyName)
+        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTGIVENNAME, "ffff", "afff"), givenName)
+        .put(generateDateTimeAttribute(Constants.eIDAS_ATTR_DATEOFBIRTH, "fffff", "affff"), dateOfBirth);
     if (taxNumber != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_TAXREFERENCE,"ffffff","afffff"), taxNumber);
+      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_TAXREFERENCE, "ffffff", "afffff"), taxNumber);
     }
     if (birthName != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_BIRTHNAME,"fffffff","affffff"), birthName);
+      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_BIRTHNAME, "fffffff", "affffff"), birthName);
     }
     if (placeOfBirth != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_PLACEOFBIRTH,"ffffffff","afffffff"), placeOfBirth);
+      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_PLACEOFBIRTH, "ffffffff", "afffffff"),
+          placeOfBirth);
     }
     final ImmutableAttributeMap attributeMap = builder.build();
 
@@ -428,18 +437,20 @@ public class InitialSearchTaskFirstTest {
         "afaf").attributes(attributeMap).build();
   }
 
-  private AttributeDefinition<Object> generateStringAttribute(String friendlyName, String fragment, String prefix) throws URISyntaxException {
+  private AttributeDefinition<Object> generateStringAttribute(String friendlyName, String fragment, String prefix)
+      throws URISyntaxException {
     return generateAttribute(friendlyName, fragment, prefix, "eu.eidas.auth.commons.attribute.impl" +
         ".LiteralStringAttributeValueMarshaller");
   }
 
-  private AttributeDefinition<Object> generateDateTimeAttribute(String friendlyName, String fragment, String prefix) throws URISyntaxException {
+  private AttributeDefinition<Object> generateDateTimeAttribute(String friendlyName, String fragment, String prefix)
+      throws URISyntaxException {
     return generateAttribute(friendlyName, fragment, prefix, "eu.eidas.auth.commons.attribute.impl" +
         ".DateTimeAttributeValueMarshaller");
   }
 
   private AttributeDefinition<Object> generateAttribute(String friendlyName, String fragment, String prefix,
-                                                String marshaller) throws URISyntaxException {
+                                                        String marshaller) throws URISyntaxException {
     return AttributeDefinition.builder()
         .friendlyName(friendlyName).nameUri(new URI("ad", "sd", fragment))
         .personType(PersonType.LEGAL_PERSON).xmlType(new QName("http://saf", "as", prefix))