chore(core): minory style, test and validation fixes

5 files changed, 25 insertions, 9 deletions

diff --git a/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/config/ServiceProviderConfiguration.java b/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/config/ServiceProviderConfiguration.java
index 2ecbf7d0..d2177323 100644
--- a/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/config/ServiceProviderConfiguration.java
+++ b/modules/core_common_lib/src/main/java/at/asitplus/eidas/specific/core/config/ServiceProviderConfiguration.java
@@ -55,7 +55,7 @@ public class ServiceProviderConfiguration extends SpConfigurationImpl {
   private List<String> mandateProfiles;  
     
   /**
-   * IDA specific requested attributes
+   * IDA specific requested attributes.
    */
   @Getter
   @Setter
diff --git a/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java b/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
index 673b8ef5..5a8992b5 100644
--- a/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
+++ b/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
@@ -102,7 +102,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
       buildNatPersonInfos((EidAuthenticationData) authData, authProcessData);
 
       // handle mandate informations
-      buildMandateInformation((EidAuthenticationData) authData, pendingReq, authProcessData);
+      buildMandateInformation((EidAuthenticationData) authData, authProcessData);
 
     } else {
       throw new RuntimeException("Can not inject PiiTransactionId because AuthData is of unknown type: "
@@ -172,7 +172,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
     }
   }
 
-  private void buildMandateInformation(EidAuthenticationData authData, IRequest pendingReq,
+  private void buildMandateInformation(EidAuthenticationData authData,
       EidAuthProcessDataWrapper authProcessData) throws EaafAuthenticationException, EaafBuilderException,
       EaafStorageException {
     authData.setUseMandate(authProcessData.isMandateUsed());
@@ -182,7 +182,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
         buildMandateInformationForEidasIncoming();
 
       } else {
-        buildMandateInformationForEidasOutgoing(authData, pendingReq, authProcessData);
+        buildMandateInformationForEidasOutgoing(authData, authProcessData);
 
       }
     }
@@ -204,7 +204,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 
   }
 
-  private void buildMandateInformationForEidasOutgoing(EidAuthenticationData authData, IRequest pendingReq,
+  private void buildMandateInformationForEidasOutgoing(EidAuthenticationData authData,
       EidAuthProcessDataWrapper authProcessData) throws EaafAuthenticationException, EaafBuilderException,
       EaafStorageException {
     log.debug("Find eIDAS outgoing process. Generated mandate-information for other country ... ");
diff --git a/modules/eidas_proxy-sevice/checks/spotbugs-exclude.xml b/modules/eidas_proxy-sevice/checks/spotbugs-exclude.xml
index cdc9fa95..22dbaa13 100644
--- a/modules/eidas_proxy-sevice/checks/spotbugs-exclude.xml
+++ b/modules/eidas_proxy-sevice/checks/spotbugs-exclude.xml
@@ -16,5 +16,16 @@
       <OR>
         <Bug pattern="UNVALIDATED_REDIRECT" />                
       </OR>
+    </Match>
+    <Match>
+      <!-- That elements are accessible by design -->
+      <OR>
+        <Class name="at.asitplus.eidas.specific.modules.msproxyservice.dto.attributes.AttrMappingElement" />
+        <Class name="at.asitplus.eidas.specific.modules.msproxyservice.service.ProxyEidasAttributeRegistry" />
+      </OR>
+      <OR>
+        <Bug pattern="EI_EXPOSE_REP" />
+        <Bug pattern="EI_EXPOSE_REP2" />
+      </OR>
     </Match>    
 </FindBugsFilter>
diff --git a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java
index f66bb799..6a06a5b5 100644
--- a/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java
+++ b/modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/dto/attributes/Type.java
@@ -22,8 +22,7 @@ import lombok.Data;
 public class Type {
 
   /**
-   * <code>true</code> if this attribute is part of MDS, otherwise
-   * <code>false</code>
+   * <code>true</code> if this attribute is part of MDS, otherwise <code>false</code>.
    */
   @JsonProperty("mds")
   private Boolean mds;
@@ -50,7 +49,7 @@ public class Type {
     NONE("none");
 
     private final String value;
-    private final static Map<String, Type.Mandator> CONSTANTS = new HashMap<>();
+    private static final Map<String, Type.Mandator> CONSTANTS = new HashMap<>();
 
     static {
       for (final Type.Mandator c : values()) {
@@ -72,6 +71,12 @@ public class Type {
       return this.value;
     }
 
+    /**
+     * Build {@link Mandator} from textual representation.
+     * 
+     * @param value textual representation
+     * @return Type of the mandator
+     */
     @JsonCreator
     public static Type.Mandator fromValue(String value) {
       final Type.Mandator constant = CONSTANTS.get(value);
diff --git a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/protocol/EidasProxyServiceControllerTest.java b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/protocol/EidasProxyServiceControllerTest.java
index ef1abbcd..b491c2bf 100644
--- a/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/protocol/EidasProxyServiceControllerTest.java
+++ b/modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/msproxyservice/test/protocol/EidasProxyServiceControllerTest.java
@@ -329,7 +329,7 @@ public class EidasProxyServiceControllerTest {
     assertTrue("mandateprofiles not empty", spConfig.getMandateProfiles().isEmpty());
     assertEquals("MandateMode", SpMandateModes.NONE, spConfig.getMandateMode());
         
-    assertEquals("requested IDA attributes", 3, spConfig.getRequestedAttributes().size());
+    assertEquals("requested IDA attributes", 4, spConfig.getRequestedAttributes().size());
     
     
   }