to some more code quality tasks

15 files changed, 87 insertions, 88 deletions

diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/EaafAuthProcessDataConstants.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/EaafAuthProcessDataConstants.java
index e4763ddc..5963dc5f 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/EaafAuthProcessDataConstants.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/EaafAuthProcessDataConstants.java
@@ -21,21 +21,21 @@ package at.gv.egiz.eaaf.core.api.idp;
 
 public interface EaafAuthProcessDataConstants {
 
-  public static final String GENERIC_PREFIX = "generic_";
+  String GENERIC_PREFIX = "generic_";
 
-  public static final String VALUE_ISSUEINSTANT = "direct_issueInstant";
+  String VALUE_ISSUEINSTANT = "direct_issueInstant";
 
-  public static final String FLAG_IS_AUTHENTICATED = "direct_flagIsAuth";
-  public static final String FLAG_IS_FOREIGNER = "direct_flagIsForeigner";
-  public static final String FLAG_USE_MANDATE = "direct_flagUseMandate";
-  public static final String FLAG_IS_ORGANWALTER = "direct_flagOrganwalter";
-  public static final String FLAG_IS_NEW_EID_PROCESS = "direct_flagIsNewEID";
+  String FLAG_IS_AUTHENTICATED = "direct_flagIsAuth";
+  String FLAG_IS_FOREIGNER = "direct_flagIsForeigner";
+  String FLAG_USE_MANDATE = "direct_flagUseMandate";
+  String FLAG_IS_ORGANWALTER = "direct_flagOrganwalter";
+  String FLAG_IS_NEW_EID_PROCESS = "direct_flagIsNewEID";
 
   @Deprecated
-  public static final String VALUE_IDENTITYLINK = "direct_idl";
-  public static final String VALUE_QAALEVEL = "direct_qaaLevel";
+  String VALUE_IDENTITYLINK = "direct_idl";
+  String VALUE_QAALEVEL = "direct_qaaLevel";
   @Deprecated
-  public static final String VALUE_MISMANDATE = "direct_MIS_Mandate";
+  String VALUE_MISMANDATE = "direct_MIS_Mandate";
 
 
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAction.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAction.java
index 50a76007..e2d553fb 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAction.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAction.java
@@ -34,11 +34,11 @@ import at.gv.egiz.eaaf.core.exceptions.EaafException;
  *
  */
 public interface IAction {
-  public SloInformationInterface processRequest(IRequest req, HttpServletRequest httpReq,
+  SloInformationInterface processRequest(IRequest req, HttpServletRequest httpReq,
       HttpServletResponse httpResp, IAuthData authData) throws EaafException;
 
-  public boolean needAuthentication(IRequest req, HttpServletRequest httpReq,
+  boolean needAuthentication(IRequest req, HttpServletRequest httpReq,
       HttpServletResponse httpResp);
 
-  public String getDefaultActionName();
+  String getDefaultActionName();
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeBuilder.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeBuilder.java
index d3736a17..86739725 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeBuilder.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeBuilder.java
@@ -22,10 +22,10 @@ package at.gv.egiz.eaaf.core.api.idp;
 import at.gv.egiz.eaaf.core.exceptions.AttributeBuilderException;
 
 public interface IAttributeBuilder {
-  public String getName();
+  String getName();
 
-  public <ATT> ATT build(final IspConfiguration oaParam, final IAuthData authData,
+  <ATT> ATT build(final IspConfiguration oaParam, final IAuthData authData,
       final IAttributeGenerator<ATT> g) throws AttributeBuilderException;
 
-  public <ATT> ATT buildEmpty(final IAttributeGenerator<ATT> g);
+  <ATT> ATT buildEmpty(final IAttributeGenerator<ATT> g);
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeGenerator.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeGenerator.java
index 0f50bada..34f1f73f 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeGenerator.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAttributeGenerator.java
@@ -28,14 +28,14 @@ public interface IAttributeGenerator<ATT> {
    * @param value value
    * @return
    */
-  public abstract ATT buildStringAttribute(final String friendlyName, final String name,
+  ATT buildStringAttribute(final String friendlyName, final String name,
       final String value);
 
-  public abstract ATT buildIntegerAttribute(final String friendlyName, final String name,
+  ATT buildIntegerAttribute(final String friendlyName, final String name,
       final int value);
 
-  public abstract ATT buildLongAttribute(final String friendlyName, final String name,
+  ATT buildLongAttribute(final String friendlyName, final String name,
       final long value);
 
-  public abstract ATT buildEmptyAttribute(final String friendlyName, final String name);
+  ATT buildEmptyAttribute(final String friendlyName, final String name);
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
index 68106549..de18319b 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IAuthData.java
@@ -109,7 +109,7 @@ public interface IAuthData {
    *
    * @return eIDAS LoA URI
    */
-  public String getEidasQaaLevel();
+  String getEidasQaaLevel();
 
 
   /**
@@ -171,7 +171,7 @@ public interface IAuthData {
    * @param clazz Type of the generic data
    * @return return the generic data of specific type, otherwise null
    */
-  public <T> T getGenericData(String key, final Class<T> clazz);
+  <T> T getGenericData(String key, final Class<T> clazz);
 
 
   /**
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
index e41f099b..5bb750ed 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfiguration.java
@@ -29,7 +29,7 @@ public interface IConfiguration {
    * @param key configuration key
    * @return configuration value or null if it is not found
    */
-  public String getBasicConfiguration(final String key);
+  String getBasicConfiguration(final String key);
 
 
   /**
@@ -39,7 +39,7 @@ public interface IConfiguration {
    * @param defaultValue Default value if no value with this key is found
    * @return configuration value
    */
-  public String getBasicConfiguration(final String key, final String defaultValue);
+  String getBasicConfiguration(final String key, final String defaultValue);
 
 
   /**
@@ -49,7 +49,7 @@ public interface IConfiguration {
    * @return configuration value as {@link Boolean} or <code>false</code> if key
    *         does not exist
    */
-  public boolean getBasicConfigurationBoolean(final String key);
+  boolean getBasicConfigurationBoolean(final String key);
 
   /**
    * Get a configuration value from file based configuration.
@@ -59,7 +59,7 @@ public interface IConfiguration {
    * @return configuration value as {@link Boolean} or <code>defaultValue</code>
    *         if key does not exist
    */
-  public boolean getBasicConfigurationBoolean(final String key, final boolean defaultValue);
+  boolean getBasicConfigurationBoolean(final String key, final boolean defaultValue);
 
 
   /**
@@ -67,7 +67,7 @@ public interface IConfiguration {
    *
    * @return
    */
-  public URI getConfigurationRootDirectory();
+  URI getConfigurationRootDirectory();
 
 
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java
index 1c065c94..9e5786b6 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java
@@ -8,7 +8,7 @@ import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
 public interface IConfigurationWithSP extends IConfiguration {
 
-  public static final String CONFIG_PROPS_AUTH_DEFAULT_COUNTRYCODE =
+  String CONFIG_PROPS_AUTH_DEFAULT_COUNTRYCODE =
       "configuration.auth.default.countrycode";
 
 
@@ -20,7 +20,7 @@ public interface IConfigurationWithSP extends IConfiguration {
    * @throws EaafConfigurationException In case of a Service-Provider loading error
    */
   @Nullable
-  public IspConfiguration getServiceProviderConfiguration(final String uniqueID)
+  IspConfiguration getServiceProviderConfiguration(final String uniqueID)
       throws EaafConfigurationException;
 
 
@@ -34,7 +34,7 @@ public interface IConfigurationWithSP extends IConfiguration {
    * @throws EaafConfigurationException In case of a Service-Provider loading error
    */
   @Nullable
-  public <T> T getServiceProviderConfiguration(String spIdentifier, final Class<T> decorator)
+  <T> T getServiceProviderConfiguration(String spIdentifier, final Class<T> decorator)
       throws EaafConfigurationException;
 
 
@@ -47,7 +47,7 @@ public interface IConfigurationWithSP extends IConfiguration {
    * @param prefix Prefix of the configuration key
    * @return Map String/String without prefix, but never null
    */
-  public Map<String, String> getBasicConfigurationWithPrefix(final String prefix);
+  Map<String, String> getBasicConfigurationWithPrefix(final String prefix);
 
   /**
    * Validate a URL if it it is allowed by configuration.
@@ -55,5 +55,5 @@ public interface IConfigurationWithSP extends IConfiguration {
    * @param authReqUrl URL for validation
    * @return URL of the application context if the authReqUrl was valid, otherwise null
    */
-  public String validateIdpUrl(URL authReqUrl) throws EaafException;
+  String validateIdpUrl(URL authReqUrl) throws EaafException;
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
index 61bce96d..ec09995d 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
@@ -11,7 +11,7 @@ public interface IExtendedConfiguration extends IConfigurationWithSP {
    * @return
    */
   @Deprecated
-  public Properties getFullConfigurationProperties();
+  Properties getFullConfigurationProperties();
 
   /**
    * Get the path to EAAFCore configuration that is internally used.
@@ -19,6 +19,6 @@ public interface IExtendedConfiguration extends IConfigurationWithSP {
    * @return
    */
   @Deprecated
-  public URI getConfigurationFilePath();
+  URI getConfigurationFilePath();
 
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IModulInfo.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IModulInfo.java
index 3625de86..8dc30568 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IModulInfo.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IModulInfo.java
@@ -36,14 +36,14 @@ public interface IModulInfo {
    *
    * @return
    */
-  public String getName();
+  String getName();
 
   /**
    * Authentication protocol identifier for this module.
    *
    * @return
    */
-  public String getAuthProtocolIdentifier();
+  String getAuthProtocolIdentifier();
 
   /**
    * Generates a protocol specific error message.
@@ -57,7 +57,7 @@ public interface IModulInfo {
    *         <i>false</i>
    * @throws Throwable In case of an internal error during error message generation
    */
-  public boolean generateErrorMessage(Throwable e, HttpServletRequest request,
+  boolean generateErrorMessage(Throwable e, HttpServletRequest request,
       HttpServletResponse response, IRequest protocolRequest) throws Throwable;
 
   /**
@@ -68,6 +68,6 @@ public interface IModulInfo {
    * @param pending incoming protocol request
    * @return return <i>true</i> if the incoming request is valid, otherwise <i>false</i>
    */
-  public boolean validate(HttpServletRequest request, HttpServletResponse response,
+  boolean validate(HttpServletRequest request, HttpServletResponse response,
       IRequest pending);
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IspConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IspConfiguration.java
index 37ca4779..ab3ab87c 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IspConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IspConfiguration.java
@@ -22,16 +22,15 @@ package at.gv.egiz.eaaf.core.api.idp;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 
 public interface IspConfiguration extends Serializable {
 
-  public static final String CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL =
+  String CONFIG_KEY_RESTRICTIONS_BASEID_INTERNAL =
       "configuration.restrictions.baseID.idpProcessing";
-  public static final String CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION =
+  String CONFIG_KEY_RESTRICTIONS_BASEID_TRANSMISSION =
       "configuration.restrictions.baseID.spTransmission";
 
-  public static final String CONFIG_KEY_RESTRICTIONS_EID_DEMO_MODE =
+  String CONFIG_KEY_RESTRICTIONS_EID_DEMO_MODE =
       "configuration.restrictions.eIDTestMode";
 
   /**
@@ -39,7 +38,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return an unmodifiable map of key/value pairs
    */
-  public Map<String, String> getFullConfiguration();
+  Map<String, String> getFullConfiguration();
 
   /**
    * Get a configuration value from Service Provider key/value configuration.
@@ -47,7 +46,7 @@ public interface IspConfiguration extends Serializable {
    * @param key The key identifier of a configuration value
    * @return The configuration value {String} or null if the key does not exist
    */
-  public String getConfigurationValue(String key);
+  String getConfigurationValue(String key);
 
   /**
    * Get a configuration value from Service Provider key/value configuration.
@@ -56,7 +55,7 @@ public interface IspConfiguration extends Serializable {
    * @param defaultValue Default value if key does not exist
    * @return The configuration value {String} or defaultValue if the key does not exist
    */
-  public String getConfigurationValue(String key, String defaultValue);
+  String getConfigurationValue(String key, String defaultValue);
 
   /**
    * Get a boolean configuration value from Service Provider key/value configuration.
@@ -64,7 +63,7 @@ public interface IspConfiguration extends Serializable {
    * @param key The key identifier of a configuration value
    * @return true / false, or false if the key does not exist
    */
-  public boolean isConfigurationValue(String key);
+  boolean isConfigurationValue(String key);
 
 
   /**
@@ -74,7 +73,7 @@ public interface IspConfiguration extends Serializable {
    * @param defaultValue Default value if key does not exist
    * @return true / false, or defaultValue if the key does not exist
    */
-  public boolean isConfigurationValue(String key, boolean defaultValue);
+  boolean isConfigurationValue(String key, boolean defaultValue);
 
   /**
    * Check if a configuration key is available in this Service Provider configuration.
@@ -89,14 +88,14 @@ public interface IspConfiguration extends Serializable {
    *
    * @return
    */
-  public String getUniqueIdentifier();
+  String getUniqueIdentifier();
 
   /**
    * Return the unique identifier of this Service Provider.
    *
    * @return
    */
-  public String getFriendlyName();
+  String getFriendlyName();
 
   /**
    * Indicates if this service provider has private area restrictions that disallow baseId.
@@ -104,7 +103,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return true if there is a restriction, otherwise false
    */
-  public boolean hasBaseIdInternalProcessingRestriction();
+  boolean hasBaseIdInternalProcessingRestriction();
 
 
   /**
@@ -113,7 +112,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return true if there is a restriction, otherwise false
    */
-  public boolean hasBaseIdTransferRestriction();
+  boolean hasBaseIdTransferRestriction();
 
   /**
    * Get the {@link List} of identifier's that indicates no baseID processing restriction
@@ -122,7 +121,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return
    */
-  public List<String> getTargetsWithNoBaseIdInternalProcessingRestriction();
+  List<String> getTargetsWithNoBaseIdInternalProcessingRestriction();
 
   /**
    * Get the {@link List} of identifier's that indicates no baseID transfer restriction exists.<br>
@@ -130,7 +129,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return
    */
-  public List<String> getTargetsWithNoBaseIdTransferRestriction();
+  List<String> getTargetsWithNoBaseIdTransferRestriction();
 
   /**
    * Get the List eIDAS LoA that are required by this service provider.
@@ -140,7 +139,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return return List of eIDAS LoAs
    */
-  public List<String> getRequiredLoA();
+  List<String> getRequiredLoA();
 
   /**
    * Get required matching mode for LoAs {@link EIDAS_LOA_MATCHING_MINIMUM}.
@@ -148,7 +147,7 @@ public interface IspConfiguration extends Serializable {
    *
    * @return
    */
-  public String getLoAMatchingMode();
+  String getLoAMatchingMode();
 
 
   /**
@@ -158,6 +157,6 @@ public interface IspConfiguration extends Serializable {
    *
    * @return area identifier with prefix
    */
-  public String getAreaSpecificTargetIdentifier();
+  String getAreaSpecificTargetIdentifier();
 
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java
index 1f95bd57..7c100d1d 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/IAuthenticationManager.java
@@ -28,10 +28,10 @@ import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
 public interface IAuthenticationManager {
 
-  public static int EVENT_AUTHENTICATION_PROCESS_FOR_SP = 4003;
-  public static int EVENT_AUTHENTICATION_PROCESS_STARTED = 4000;
-  public static int EVENT_AUTHENTICATION_PROCESS_FINISHED = 4001;
-  public static int EVENT_AUTHENTICATION_PROCESS_ERROR = 4002;
+  int EVENT_AUTHENTICATION_PROCESS_FOR_SP = 4003;
+  int EVENT_AUTHENTICATION_PROCESS_STARTED = 4000;
+  int EVENT_AUTHENTICATION_PROCESS_FINISHED = 4001;
+  int EVENT_AUTHENTICATION_PROCESS_ERROR = 4002;
 
 
   /**
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/ISsoManager.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/ISsoManager.java
index a0734684..65c388e8 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/ISsoManager.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/ISsoManager.java
@@ -28,12 +28,12 @@ import at.gv.egiz.eaaf.core.exceptions.EaafSsoException;
 public interface ISsoManager {
 
   // TODO
-  public static int EVENT_SSO_SESSION_INVALID = -1;
-  public static int EVENT_SSO_SESSION_VALID = -1;
+  int EVENT_SSO_SESSION_INVALID = -1;
+  int EVENT_SSO_SESSION_VALID = -1;
 
 
-  public static final String PROCESS_ENGINE_SSO_CONSENTS_EVALUATION = "ssoconsentsevaluation";
-  public static final String AUTH_DATA_SSO_SESSIONID = "eaaf_authdata_sso_sessionId";
+  String PROCESS_ENGINE_SSO_CONSENTS_EVALUATION = "ssoconsentsevaluation";
+  String AUTH_DATA_SSO_SESSIONID = "eaaf_authdata_sso_sessionId";
 
 
   /**
@@ -47,7 +47,7 @@ public interface ISsoManager {
    * @return true if there is a valid SSO session, otherwise false
    * @throws EaafSsoException In case of an internal error
    */
-  public boolean checkAndValidateSsoSession(IRequest pendingReq, HttpServletRequest httpReq,
+  boolean checkAndValidateSsoSession(IRequest pendingReq, HttpServletRequest httpReq,
       HttpServletResponse httpResp) throws EaafSsoException;
 
   /**
@@ -61,7 +61,7 @@ public interface ISsoManager {
    * @param pendingReq Current incoming pending request
    * @param httpReq http Servlet request
    */
-  public void isSsoAllowedForSp(IRequest pendingReq, HttpServletRequest httpReq);
+  void isSsoAllowedForSp(IRequest pendingReq, HttpServletRequest httpReq);
 
 
   /**
@@ -70,7 +70,7 @@ public interface ISsoManager {
    * @param pendingReq pending request that should be populated by SSO session
    * @throws EaafSsoException if pending request contains no SSO information or population failed
    */
-  public void populatePendingRequestWithSsoInformation(IRequest pendingReq) throws EaafSsoException;
+  void populatePendingRequestWithSsoInformation(IRequest pendingReq) throws EaafSsoException;
 
 
   /**
@@ -82,7 +82,7 @@ public interface ISsoManager {
    * @return true if a SSO session was closed successfully, otherwise false
    * @throws EaafSsoException in case of an internal processing error
    */
-  public boolean destroySsoSessionOnIdpOnly(HttpServletRequest httpReq,
+  boolean destroySsoSessionOnIdpOnly(HttpServletRequest httpReq,
       HttpServletResponse httpResp, IRequest pendingReq) throws EaafSsoException;
 
 
@@ -96,7 +96,7 @@ public interface ISsoManager {
    * @return new created SSO identifier
    * @throws EaafSsoException In case of an internal error
    */
-  public String createNewSsoSessionCookie(HttpServletRequest req, HttpServletResponse resp,
+  String createNewSsoSessionCookie(HttpServletRequest req, HttpServletResponse resp,
       IRequest pendingReq) throws EaafSsoException;
 
 
@@ -107,7 +107,7 @@ public interface ISsoManager {
    * @param newSsoSessionId new SSO sessionId
    * @throws EaafSsoException In case of an internal error
    */
-  public void createNewSsoSession(IRequest pendingReq, String newSsoSessionId)
+  void createNewSsoSession(IRequest pendingReq, String newSsoSessionId)
       throws EaafSsoException;
 
 
@@ -119,7 +119,7 @@ public interface ISsoManager {
    * @param sloInformation SLO information container
    * @throws EaafSsoException In case of an internal error
    */
-  public void updateSsoSession(IRequest pendingReq, String newSsoSessionId,
+  void updateSsoSession(IRequest pendingReq, String newSsoSessionId,
       SloInformationInterface sloInformation) throws EaafSsoException;
 
 
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/services/IProtocolAuthenticationService.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/services/IProtocolAuthenticationService.java
index 14ce0989..e817720b 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/services/IProtocolAuthenticationService.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/auth/services/IProtocolAuthenticationService.java
@@ -28,10 +28,10 @@ import at.gv.egiz.eaaf.core.exceptions.EaafException;
 
 public interface IProtocolAuthenticationService {
 
-  public String PARAM_GUI_ERROMSG = "errorMsg";
-  public String PARAM_GUI_ERRORCODE = "errorCode";
-  public String PARAM_GUI_ERRORCODEPARAMS = "errorParams";
-  public String PARAM_GUI_ERRORSTACKTRACE = "stacktrace";
+  String PARAM_GUI_ERROMSG = "errorMsg";
+  String PARAM_GUI_ERRORCODE = "errorCode";
+  String PARAM_GUI_ERRORCODEPARAMS = "errorParams";
+  String PARAM_GUI_ERRORSTACKTRACE = "stacktrace";
 
 
   /**
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/ISloInformationContainer.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/ISloInformationContainer.java
index 154d64d3..9d72d877 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/ISloInformationContainer.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/ISloInformationContainer.java
@@ -69,7 +69,7 @@ public interface ISloInformationContainer extends Serializable {
 
   void putFailedOA(String oaID);
 
-  public String getTransactionID();
+  String getTransactionID();
 
-  public String getSessionID();
+  String getSessionID();
 }
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/SloInformationInterface.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/SloInformationInterface.java
index fd4f9e12..e956c07f 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/SloInformationInterface.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/slo/SloInformationInterface.java
@@ -33,14 +33,14 @@ public interface SloInformationInterface {
    *
    * @return SessionID (SessionIndex in case of SAML2)
    */
-  public String getSessionIndex();
+  String getSessionIndex();
 
   /**
    * get user identifier which was used.
    *
    * @return bPK / wbPK (nameID in case of SAML2)
    */
-  public String getUserNameIdentifier();
+  String getUserNameIdentifier();
 
 
   /**
@@ -48,33 +48,33 @@ public interface SloInformationInterface {
    *
    * @return return authentication protocol type
    */
-  public String getProtocolType();
+  String getProtocolType();
 
   /**
    * Format of the User NameId.
    *
    * @return
    */
-  public String getUserNameIdFormat();
+  String getUserNameIdFormat();
 
   /**
    * Get the unique entityID of this Service-Provider.
    *
    * @return unique identifier, but never null
    */
-  public String getSpEntityID();
+  String getSpEntityID();
 
-  public String getAuthUrl();
+  String getAuthUrl();
 
-  public String getServiceUrl();
+  String getServiceUrl();
 
-  public String getBinding();
+  String getBinding();
 
-  public void setUserNameIdentifier(String subjectNameId);
+  void setUserNameIdentifier(String subjectNameId);
 
-  public void setNameIdFormat(String format);
+  void setNameIdFormat(String format);
 
-  public void setSessionIndex(String sessionIndex);
+  void setSessionIndex(String sessionIndex);
 
 
 }