some code code-style modifications

active code-quality checks!

4 files changed, 12 insertions, 12 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/api/builder/ISubjectNameIdGenerator.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/api/builder/ISubjectNameIdGenerator.java
index e1c21ae7..fd04e38f 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/api/builder/ISubjectNameIdGenerator.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/api/builder/ISubjectNameIdGenerator.java
@@ -20,7 +20,7 @@
 package at.gv.egiz.eaaf.modules.pvp2.idp.api.builder;
 
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-import at.gv.egiz.eaaf.core.api.idp.IspConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
 import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2Exception;
 
@@ -34,6 +34,6 @@ public interface ISubjectNameIdGenerator {
    * @return Pair of subjectNameId and NameIdFormat
    * @throws Pvp2Exception In case of an error
    */
-  Pair<String, String> generateSubjectNameId(IAuthData authData, IspConfiguration spConfig)
+  Pair<String, String> generateSubjectNameId(IAuthData authData, ISpConfiguration spConfig)
       throws Pvp2Exception;
 }
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
index 8c74c3fb..7ff2fe6a 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AbstractPvp2XProtocol.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import at.gv.egiz.components.eventlog.api.EventConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.IModulInfo;
 import at.gv.egiz.eaaf.core.api.logging.IRevisionLogger;
 import at.gv.egiz.eaaf.core.exceptions.AuthnRequestValidatorException;
@@ -459,7 +459,7 @@ public abstract class AbstractPvp2XProtocol extends AbstractController implement
 
     }
 
-    if (authnRequest.getIssueInstant().minusMinutes(EAAFConstants.ALLOWED_TIME_JITTER)
+    if (authnRequest.getIssueInstant().minusMinutes(EaafConstants.ALLOWED_TIME_JITTER)
         .isAfterNow()) {
       log.warn("Unsupported request: No IssueInstant DateTime is not valid anymore.");
       throw new AuthnRequestValidatorException("pvp2.22",
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AuthenticationAction.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AuthenticationAction.java
index 9378b579..189e6128 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AuthenticationAction.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/AuthenticationAction.java
@@ -29,7 +29,7 @@ import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.slo.SloInformationInterface;
 import at.gv.egiz.eaaf.core.api.logging.IRevisionLogger;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.impl.data.SLOInformationImpl;
+import at.gv.egiz.eaaf.core.impl.data.SloInformationImpl;
 import at.gv.egiz.eaaf.modules.pvp2.api.IPvo2BasicConfiguration;
 import at.gv.egiz.eaaf.modules.pvp2.api.binding.IEncoder;
 import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
@@ -106,7 +106,7 @@ public class AuthenticationAction implements IAction {
       consumerService.setLocation(pvpRequest.getConsumerUrl());
 
       final DateTime date = new DateTime();
-      final SLOInformationImpl sloInformation = new SLOInformationImpl();
+      final SloInformationImpl sloInformation = new SloInformationImpl();
       final String issuerEntityID = pvpBasicConfiguration.getIdpEntityId(pvpRequest.getAuthUrl());
 
       // build Assertion
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
index 79de4567..f57f9db0 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
@@ -23,10 +23,10 @@ import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper;
 import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-import at.gv.egiz.eaaf.core.api.idp.IspConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
 import at.gv.egiz.eaaf.core.api.idp.slo.SloInformationInterface;
 import at.gv.egiz.eaaf.core.exceptions.UnavailableAttributeException;
 import at.gv.egiz.eaaf.core.impl.data.Pair;
@@ -138,7 +138,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
       final AssertionConsumerService assertionConsumerService,
       final SloInformationInterface sloInformation) throws Pvp2Exception {
 
-    final IspConfiguration oaParam = pendingReq.getServiceProviderConfiguration();
+    final ISpConfiguration oaParam = pendingReq.getServiceProviderConfiguration();
     final AuthnContextClassRef authnContextClassRef =
         Saml2Utils.createSamlObject(AuthnContextClassRef.class);
 
@@ -153,7 +153,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
           reqAuthnContext.getAuthnContextClassRefs();
 
       // get matching mode from authn. request
-      String loaMatchingMode = EAAFConstants.EIDAS_LOA_MATCHING_MINIMUM;
+      String loaMatchingMode = EaafConstants.EIDAS_LOA_MATCHING_MINIMUM;
       if (reqAuthnContext.getComparison() != null
           && StringUtils.isNotEmpty(reqAuthnContext.getComparison().toString())) {
         loaMatchingMode = reqAuthnContext.getComparison().toString();
@@ -170,10 +170,10 @@ public class Pvp2AssertionBuilder implements PvpConstants {
         for (final AuthnContextClassRef authnClassRef : reqAuthnContextClassRefIt) {
           final String qaa_uri = authnClassRef.getAuthnContextClassRef();
 
-          if (!qaa_uri.trim().startsWith(EAAFConstants.EIDAS_LOA_PREFIX)) {
+          if (!qaa_uri.trim().startsWith(EaafConstants.EIDAS_LOA_PREFIX)) {
             if (loaLevelMapper != null) {
               log.debug("Find no eIDAS LoA in AuthnReq. Start mapping process ... ");
-              eidasLoaFromRequest.add(loaLevelMapper.mapToeIDASLoA(qaa_uri.trim()));
+              eidasLoaFromRequest.add(loaLevelMapper.mapToEidasLoa(qaa_uri.trim()));
 
             } else {
               log.debug("AuthnRequest contains no eIDAS LoA. NO LoA mapper FOUND, ignore " + "'"