1 files changed, 18 insertions, 22 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java
index 1efa8745..b543a5dc 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/builder/PvpMetadataBuilder.java
@@ -23,6 +23,7 @@ import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collection;
 import java.util.List;
+
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -32,11 +33,7 @@ import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.TransformerFactoryConfigurationError;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
-import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafDefaultSaml2Bootstrap;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
-import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
+
 import org.apache.commons.httpclient.auth.CredentialsNotAvailableException;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -73,6 +70,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.w3c.dom.Document;
 
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.modules.pvp2.api.metadata.IPvpMetadataBuilderConfiguration;
+import at.gv.egiz.eaaf.modules.pvp2.impl.opensaml.initialize.EaafDefaultSaml2Bootstrap;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.AbstractCredentialProvider;
+import at.gv.egiz.eaaf.modules.pvp2.impl.utils.Saml2Utils;
+
 /**
  * PVP metadata builder implementation.
  *
@@ -98,21 +101,20 @@ public class PvpMetadataBuilder {
 
   }
 
-
   /**
    * Build PVP 2.1 conform SAML2 metadata.
    *
    * @param config PVPMetadataBuilder configuration*
    * @return PVP metadata as XML String
-   * @throws SecurityException In case of an error
-   * @throws ConfigurationException In case of an error
-   * @throws CredentialsNotAvailableException In case of an error
+   * @throws SecurityException                    In case of an error
+   * @throws ConfigurationException               In case of an error
+   * @throws CredentialsNotAvailableException     In case of an error
    * @throws TransformerFactoryConfigurationError In case of an error
-   * @throws MarshallingException In case of an error
-   * @throws TransformerException In case of an error
-   * @throws ParserConfigurationException In case of an error
-   * @throws IOException In case of an error
-   * @throws SignatureException In case of an error
+   * @throws MarshallingException                 In case of an error
+   * @throws TransformerException                 In case of an error
+   * @throws ParserConfigurationException         In case of an error
+   * @throws IOException                          In case of an error
+   * @throws SignatureException                   In case of an error
    */
   public String buildPvpMetadata(final IPvpMetadataBuilderConfiguration config)
       throws CredentialsNotAvailableException, EaafException, SecurityException,
@@ -165,7 +167,6 @@ public class PvpMetadataBuilder {
     builder = factory.newDocumentBuilder();
     final Document document = builder.newDocument();
 
-
     // build entities descriptor
     if (config.buildEntitiesDescriptorAsRootElement()) {
       final EntitiesDescriptor entitiesDescriptor =
@@ -179,7 +180,6 @@ public class PvpMetadataBuilder {
       EaafDefaultSaml2Bootstrap.initializeDefaultPvpConfiguration();
       entitiesDescriptor.setSignature(signature);
 
-
       // marshall document
       final Marshaller out =
           org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(entitiesDescriptor);
@@ -191,8 +191,6 @@ public class PvpMetadataBuilder {
 
       entityDescriptor.setSignature(signature);
 
-
-
       // marshall document
       final Marshaller out =
           org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(entityDescriptor);
@@ -215,7 +213,6 @@ public class PvpMetadataBuilder {
     return sw.toString();
   }
 
-
   private RoleDescriptor generateSpMetadata(final IPvpMetadataBuilderConfiguration config)
       throws CredentialsNotAvailableException, SecurityException, EaafException {
     final SPSSODescriptor spSsoDescriptor = Saml2Utils.createSamlObject(SPSSODescriptor.class);
@@ -268,7 +265,6 @@ public class PvpMetadataBuilder {
       }
     }
 
-
     // add POST-Binding assertion consumer services
     if (StringUtils.isNotEmpty(config.getSpAssertionConsumerServicePostBindingUrl())) {
       final AssertionConsumerService postassertionConsumerService =
@@ -332,7 +328,6 @@ public class PvpMetadataBuilder {
 
     }
 
-
     // add required attributes
     final Collection<RequestedAttribute> reqSpAttr = config.getSpRequiredAttributes();
     final AttributeConsumingService attributeService =
@@ -382,7 +377,8 @@ public class PvpMetadataBuilder {
 
     idpSsoDescriptor.addSupportedProtocol(SAMLConstants.SAML20P_NS);
 
-    // set ass default value, because PVP 2.x specification defines this feature as MUST
+    // set ass default value, because PVP 2.x specification defines this feature as
+    // MUST
     idpSsoDescriptor.setWantAuthnRequestsSigned(config.wantAuthnRequestSigned());
 
     // add WebSSO descriptor for POST-Binding