common EGIZ code-style refactoring

1 files changed, 154 insertions, 158 deletions

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 cbbed659..9378b579 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
@@ -1,35 +1,47 @@
-/*******************************************************************************
- * Copyright 2017 Graz University of Technology
- * EAAF-Core Components has been developed in a cooperation between EGIZ,  
- * A-SIT Plus, A-SIT, and Graz University of Technology.
+/*
+ * Copyright 2017 Graz University of Technology EAAF-Core Components has been developed in a
+ * cooperation between EGIZ, A-SIT Plus, A-SIT, and Graz University of Technology.
  *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "Licence");
- * You may not use this work except in compliance with the Licence.
- * You may obtain a copy of the Licence at:
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by the European
+ * Commission - subsequent versions of the EUPL (the "Licence"); You may not use this work except in
+ * compliance with the Licence. You may obtain a copy of the Licence at:
  * https://joinup.ec.europa.eu/news/understanding-eupl-v12
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the Licence is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the Licence for the specific language governing permissions and
- * limitations under the Licence.
- *  
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
+ * Unless required by applicable law or agreed to in writing, software distributed under the Licence
+ * is distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the Licence for the specific language governing permissions and limitations under
+ * the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text file for details on the
+ * various modules and licenses. The "NOTICE" text file is part of the distribution. Any derivative
+ * works that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
 package at.gv.egiz.eaaf.modules.pvp2.idp.impl;
 
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.api.idp.IAction;
+import at.gv.egiz.eaaf.core.api.idp.IAuthData;
+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.modules.pvp2.api.IPvo2BasicConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.binding.IEncoder;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataProvider;
+import at.gv.egiz.eaaf.modules.pvp2.exception.BindingNotSupportedException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.exception.ResponderErrorException;
+import at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder.AuthResponseBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder.Pvp2AssertionBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.impl.binding.PostBinding;
+import at.gv.egiz.eaaf.modules.pvp2.impl.binding.RedirectBinding;
+import at.gv.egiz.eaaf.modules.pvp2.impl.message.PvpSProfileRequest;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
 import org.joda.time.DateTime;
 import org.opensaml.common.xml.SAMLConstants;
 import org.opensaml.saml2.core.Assertion;
@@ -45,141 +57,125 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.idp.IAction;
-import at.gv.egiz.eaaf.core.api.idp.IAuthData;
-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.modules.pvp2.api.IPVP2BasicConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.binding.IEncoder;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataProvider;
-import at.gv.egiz.eaaf.modules.pvp2.exception.BindingNotSupportedException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.exception.ResponderErrorException;
-import at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder.AuthResponseBuilder;
-import at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder.PVP2AssertionBuilder;
-import at.gv.egiz.eaaf.modules.pvp2.impl.binding.PostBinding;
-import at.gv.egiz.eaaf.modules.pvp2.impl.binding.RedirectBinding;
-import at.gv.egiz.eaaf.modules.pvp2.impl.message.PVPSProfileRequest;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.SAML2Utils;
-
 @Service("PVPAuthenticationRequestAction")
 public class AuthenticationAction implements IAction {
-	private static final Logger log = LoggerFactory.getLogger(AuthenticationAction.class);
-	
-	private static final String CONFIG_PROPERTY_PVP2_ENABLE_ENCRYPTION = "protocols.pvp2.assertion.encryption.active";
-	
-	@Autowired(required=true) private IPVPMetadataProvider metadataProvider;
-	@Autowired(required=true) ApplicationContext springContext;
-	@Autowired(required=true) IConfiguration authConfig;
-	@Autowired(required=true) PVP2AssertionBuilder assertionBuilder;
-	@Autowired(required=true) IPVP2BasicConfiguration pvpBasicConfiguration;
-	@Autowired(required=true) IRevisionLogger revisionsLogger;
-	
-	private AbstractCredentialProvider pvpIDPCredentials;
-	
-	/**
-	 * Sets a specific credential provider for PVP S-Profile IDP component.
-	 * @param pvpIDPCredentials credential provider
-	 */
-	public void setPvpIDPCredentials(AbstractCredentialProvider pvpIDPCredentials) {
-		this.pvpIDPCredentials = pvpIDPCredentials;
-		
-	}
-		
-	@Override
-	public SLOInformationInterface processRequest(IRequest req, HttpServletRequest httpReq,
-			HttpServletResponse httpResp, IAuthData authData) throws ResponderErrorException {		
-		final PVPSProfilePendingRequest pvpRequest = (PVPSProfilePendingRequest) req;
-		try {
-			//get basic information 
-			final PVPSProfileRequest moaRequest = (PVPSProfileRequest) pvpRequest.getRequest();
-			final AuthnRequest authnRequest = (AuthnRequest) moaRequest.getSamlRequest();
-			final EntityDescriptor peerEntity = moaRequest.getEntityMetadata(metadataProvider);		
-		
-			final AssertionConsumerService consumerService = 
-					SAML2Utils.createSAMLObject(AssertionConsumerService.class);
-			consumerService.setBinding(pvpRequest.getBinding());
-			consumerService.setLocation(pvpRequest.getConsumerURL());
-				
-			final DateTime date = new DateTime();		 
-			final SLOInformationImpl sloInformation = new SLOInformationImpl();
-			final String issuerEntityID = pvpBasicConfiguration.getIDPEntityId(pvpRequest.getAuthURL());
-		
-			//build Assertion
-			final Assertion assertion = assertionBuilder.buildAssertion(issuerEntityID, pvpRequest, authnRequest, authData, 
-					peerEntity, date, consumerService, sloInformation);
-		
-			final Response authResponse = AuthResponseBuilder.buildResponse(
-					metadataProvider, issuerEntityID, authnRequest, 
-					date, assertion, authConfig.getBasicConfigurationBoolean(
-							CONFIG_PROPERTY_PVP2_ENABLE_ENCRYPTION, true));
-							
-			IEncoder binding = null;
-
-			if (consumerService.getBinding().equals(
-					SAMLConstants.SAML2_REDIRECT_BINDING_URI)) {
-				binding = springContext.getBean("PVPRedirectBinding", RedirectBinding.class);
-						
-			} else if (consumerService.getBinding().equals(
-					SAMLConstants.SAML2_POST_BINDING_URI)) {
-				binding = springContext.getBean("PVPPOSTBinding", PostBinding.class);
-			
-			}
-
-			if (binding == null) {
-				throw new BindingNotSupportedException(consumerService.getBinding());
-			}
-				
-			binding.encodeRespone(httpReq, httpResp, authResponse, 
-					consumerService.getLocation(), moaRequest.getRelayState(),
-					pvpIDPCredentials.getIDPAssertionSigningCredential(), req);
-
-			revisionsLogger.logEvent(req, 3105, authResponse.getID());
-			
-			//set protocol type
-			sloInformation.setProtocolType(req.requestedModule());
-			sloInformation.setSpEntityID(req.getServiceProviderConfiguration().getUniqueIdentifier());
-			return sloInformation;
-						
-		} catch (MessageEncodingException  | SecurityException e) {
-			 log.warn("Message Encoding exception", e);
-			throw new ResponderErrorException("pvp2.01", null, e);
-			
-		} catch (final EAAFException e) {
-			 log.info("Response generation error: Msg: ", e.getMessage());
-			throw new ResponderErrorException(e.getErrorId(), e.getParams(), e);
-					
-		} catch (final Exception e) {
-			 log.warn("Response generation error", e);
-			throw new ResponderErrorException("pvp2.01", null, e);
-			
-		}
-		
-	}
-
-	@Override
-	public boolean needAuthentication(IRequest req, HttpServletRequest httpReq,
-			HttpServletResponse httpResp) {
-		return true;
-	}
-
-	@Override
-	public String getDefaultActionName() {
-		return "PVPAuthenticationRequestAction";
-		
-	}
-	
-	@PostConstruct
-	private void verifyInitialization() {
-		if (pvpIDPCredentials == null) {
-			log.error("No SAML2 credentialProvider injected!");
-			throw new RuntimeException("No SAML2 credentialProvider injected!");
-			
-		}		
-	}
+  private static final Logger log = LoggerFactory.getLogger(AuthenticationAction.class);
+
+  private static final String CONFIG_PROPERTY_PVP2_ENABLE_ENCRYPTION =
+      "protocols.pvp2.assertion.encryption.active";
+
+  @Autowired(required = true)
+  private IPvpMetadataProvider metadataProvider;
+  @Autowired(required = true)
+  ApplicationContext springContext;
+  @Autowired(required = true)
+  IConfiguration authConfig;
+  @Autowired(required = true)
+  Pvp2AssertionBuilder assertionBuilder;
+  @Autowired(required = true)
+  IPvo2BasicConfiguration pvpBasicConfiguration;
+  @Autowired(required = true)
+  IRevisionLogger revisionsLogger;
+
+  private AbstractCredentialProvider pvpIdpCredentials;
+
+  /**
+   * Sets a specific credential provider for PVP S-Profile IDP component.
+   *
+   * @param pvpIdpCredentials credential provider
+   */
+  public void setPvpIdpCredentials(final AbstractCredentialProvider pvpIdpCredentials) {
+    this.pvpIdpCredentials = pvpIdpCredentials;
+
+  }
+
+  @Override
+  public SloInformationInterface processRequest(final IRequest req,
+      final HttpServletRequest httpReq, final HttpServletResponse httpResp,
+      final IAuthData authData) throws ResponderErrorException {
+    final PvpSProfilePendingRequest pvpRequest = (PvpSProfilePendingRequest) req;
+    try {
+      // get basic information
+      final PvpSProfileRequest moaRequest = (PvpSProfileRequest) pvpRequest.getRequest();
+      final AuthnRequest authnRequest = (AuthnRequest) moaRequest.getSamlRequest();
+      final EntityDescriptor peerEntity = moaRequest.getEntityMetadata(metadataProvider);
+
+      final AssertionConsumerService consumerService =
+          Saml2Utils.createSamlObject(AssertionConsumerService.class);
+      consumerService.setBinding(pvpRequest.getBinding());
+      consumerService.setLocation(pvpRequest.getConsumerUrl());
+
+      final DateTime date = new DateTime();
+      final SLOInformationImpl sloInformation = new SLOInformationImpl();
+      final String issuerEntityID = pvpBasicConfiguration.getIdpEntityId(pvpRequest.getAuthUrl());
+
+      // build Assertion
+      final Assertion assertion = assertionBuilder.buildAssertion(issuerEntityID, pvpRequest,
+          authnRequest, authData, peerEntity, date, consumerService, sloInformation);
+
+      final Response authResponse = AuthResponseBuilder.buildResponse(metadataProvider,
+          issuerEntityID, authnRequest, date, assertion,
+          authConfig.getBasicConfigurationBoolean(CONFIG_PROPERTY_PVP2_ENABLE_ENCRYPTION, true));
+
+      IEncoder binding = null;
+
+      if (consumerService.getBinding().equals(SAMLConstants.SAML2_REDIRECT_BINDING_URI)) {
+        binding = springContext.getBean("PVPRedirectBinding", RedirectBinding.class);
+
+      } else if (consumerService.getBinding().equals(SAMLConstants.SAML2_POST_BINDING_URI)) {
+        binding = springContext.getBean("PVPPOSTBinding", PostBinding.class);
+
+      }
+
+      if (binding == null) {
+        throw new BindingNotSupportedException(consumerService.getBinding());
+      }
+
+      binding.encodeRespone(httpReq, httpResp, authResponse, consumerService.getLocation(),
+          moaRequest.getRelayState(), pvpIdpCredentials.getIdpAssertionSigningCredential(), req);
+
+      revisionsLogger.logEvent(req, 3105, authResponse.getID());
+
+      // set protocol type
+      sloInformation.setProtocolType(req.requestedModule());
+      sloInformation.setSpEntityID(req.getServiceProviderConfiguration().getUniqueIdentifier());
+      return sloInformation;
+
+    } catch (MessageEncodingException | SecurityException e) {
+      log.warn("Message Encoding exception", e);
+      throw new ResponderErrorException("pvp2.01", null, e);
+
+    } catch (final EaafException e) {
+      log.info("Response generation error: Msg: ", e.getMessage());
+      throw new ResponderErrorException(e.getErrorId(), e.getParams(), e);
+
+    } catch (final Exception e) {
+      log.warn("Response generation error", e);
+      throw new ResponderErrorException("pvp2.01", null, e);
+
+    }
+
+  }
+
+  @Override
+  public boolean needAuthentication(final IRequest req, final HttpServletRequest httpReq,
+      final HttpServletResponse httpResp) {
+    return true;
+  }
+
+  @Override
+  public String getDefaultActionName() {
+    return "PVPAuthenticationRequestAction";
+
+  }
+
+  @PostConstruct
+  private void verifyInitialization() {
+    if (pvpIdpCredentials == null) {
+      log.error("No SAML2 credentialProvider injected!");
+      throw new RuntimeException("No SAML2 credentialProvider injected!");
+
+    }
+  }
 
 }