common EGIZ code-style refactoring

1 files changed, 102 insertions, 104 deletions

diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/MetadataAction.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/MetadataAction.java
index 6b957522..a1e8b5ba 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/MetadataAction.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/MetadataAction.java
@@ -1,123 +1,121 @@
-/*******************************************************************************
- * 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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
-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.slo.SLOInformationInterface;
+import at.gv.egiz.eaaf.core.api.idp.slo.SloInformationInterface;
 import at.gv.egiz.eaaf.core.api.logging.IRevisionLogger;
-import at.gv.egiz.eaaf.modules.pvp2.PVPEventConstants;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPVPMetadataConfigurationFactory;
-import at.gv.egiz.eaaf.modules.pvp2.exception.PVP2MetadataException;
-import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PVPMetadataBuilder;
+import at.gv.egiz.eaaf.modules.pvp2.PvpEventConstants;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataConfigurationFactory;
+import at.gv.egiz.eaaf.modules.pvp2.exception.Pvp2MetadataException;
+import at.gv.egiz.eaaf.modules.pvp2.impl.builder.PvpMetadataBuilder;
 import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Service;
 
 @Service("pvpMetadataService")
 public class MetadataAction implements IAction {
 
-	private static final Logger log = LoggerFactory.getLogger(MetadataAction.class);
-
-	@Autowired private IRevisionLogger revisionsLogger; 
-	@Autowired private PVPMetadataBuilder metadatabuilder;
-	@Autowired private IPVPMetadataConfigurationFactory configFactory;
-	
-	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;
-		
-	} 
-	
-	public SLOInformationInterface processRequest(IRequest req, HttpServletRequest httpReq,
-			HttpServletResponse httpResp, IAuthData authData) throws PVP2MetadataException {
-		try {
-			revisionsLogger.logEvent(req, PVPEventConstants.AUTHPROTOCOL_PVP_METADATA);
-			
-			//build metadata
-			IPVPMetadataBuilderConfiguration metadataConfig = 
-					configFactory.generateMetadataBuilderConfiguration(
-							req.getAuthURLWithOutSlash(), 
-							pvpIDPCredentials);
-								
-			;
-			
-			String metadataXML = metadatabuilder.buildPVPMetadata(metadataConfig);			
-			log.debug("METADATA: " + metadataXML);
-					
-			byte[] content = metadataXML.getBytes("UTF-8");
-			httpResp.setStatus(HttpServletResponse.SC_OK);
-			httpResp.setContentLength(content.length);
-			httpResp.setContentType(MediaType.APPLICATION_XML_VALUE);
-			httpResp.getOutputStream().write(content);			
-			return null;
-			
-		} catch (Exception e) {
-			log.error("Failed to generate metadata", e);
-			throw new PVP2MetadataException("pvp2.27", null);
-		} 
-	}
-
-	public boolean needAuthentication(IRequest req, HttpServletRequest httpReq,
-			HttpServletResponse httpResp) {
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.moduls.IAction#getDefaultActionName()
-	 */
-	@Override
-	public String getDefaultActionName() {
-		return "IDP - PVP Metadata action";
-	}
-	
-	@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(MetadataAction.class);
+
+  @Autowired
+  private IRevisionLogger revisionsLogger;
+  @Autowired
+  private PvpMetadataBuilder metadatabuilder;
+  @Autowired
+  private IPvpMetadataConfigurationFactory configFactory;
+
+  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 Pvp2MetadataException {
+    try {
+      revisionsLogger.logEvent(req, PvpEventConstants.AUTHPROTOCOL_PVP_METADATA);
+
+      // build metadata
+      final IPvpMetadataBuilderConfiguration metadataConfig = configFactory
+          .generateMetadataBuilderConfiguration(req.getAuthUrlWithOutSlash(), pvpIdpCredentials);
+
+
+
+      final String metadataXml = metadatabuilder.buildPvpMetadata(metadataConfig);
+      log.trace("METADATA: " + metadataXml);
+
+      final byte[] content = metadataXml.getBytes("UTF-8");
+      httpResp.setStatus(HttpServletResponse.SC_OK);
+      httpResp.setContentLength(content.length);
+      httpResp.setContentType(MediaType.APPLICATION_XML_VALUE);
+      httpResp.getOutputStream().write(content);
+      return null;
+
+    } catch (final Exception e) {
+      log.error("Failed to generate metadata", e);
+      throw new Pvp2MetadataException("pvp2.27", null);
+    }
+  }
+
+  @Override
+  public boolean needAuthentication(final IRequest req, final HttpServletRequest httpReq,
+      final HttpServletResponse httpResp) {
+    return false;
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see at.gv.egovernment.moa.id.moduls.IAction#getDefaultActionName()
+   */
+  @Override
+  public String getDefaultActionName() {
+    return "IDP - PVP Metadata action";
+  }
+
+  @PostConstruct
+  private void verifyInitialization() {
+    if (pvpIdpCredentials == null) {
+      log.error("No SAML2 credentialProvider injected!");
+      throw new RuntimeException("No SAML2 credentialProvider injected!");
+
+    }
+  }
+
 
 }