From 0436de6184c1a95d463da52929e3bf60923d6e04 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Mon, 13 Dec 2021 09:23:09 +0100
Subject: update third-party libs and resolve API issues

---
 .../moa/id/configuration/utils/SAML2Utils.java     | 97 +++++++++++-----------
 1 file changed, 47 insertions(+), 50 deletions(-)

(limited to 'id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/SAML2Utils.java')

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/SAML2Utils.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/SAML2Utils.java
index eca4c05ef..c4a9894ca 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/SAML2Utils.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/utils/SAML2Utils.java
@@ -32,7 +32,6 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 
-import org.opensaml.Configuration;
 import org.opensaml.xml.XMLObject;
 import org.opensaml.xml.XMLObjectBuilder;
 import org.opensaml.xml.XMLObjectBuilderFactory;
@@ -41,59 +40,59 @@ import org.opensaml.xml.io.MarshallingException;
 
 public class SAML2Utils {
 
-	static {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-		factory.setValidating(false);
-		try {
-			builder = factory.newDocumentBuilder();
-		} catch (ParserConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-	}
+  static {
+    final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+    factory.setNamespaceAware(true);
+    factory.setValidating(false);
+    try {
+      builder = factory.newDocumentBuilder();
+    } catch (final ParserConfigurationException e) {
+      // TODO Auto-generated catch block
+      e.printStackTrace();
+    }
+  }
 
-	private static DocumentBuilder builder;
+  private static DocumentBuilder builder;
 
-	public static <T> T createSAMLObject(final Class<T> clazz) {
-		try {
+  public static <T> T createSAMLObject(final Class<T> clazz) {
+    try {
 
-			XMLObjectBuilderFactory builderFactory = Configuration
-					.getBuilderFactory();
+      final XMLObjectBuilderFactory builderFactory = org.opensaml.xml.Configuration
+          .getBuilderFactory();
 
-			QName defaultElementName = (QName) clazz.getDeclaredField(
-					"DEFAULT_ELEMENT_NAME").get(null);
-			Map<QName, XMLObjectBuilder> builder = builderFactory.getBuilders();
-			Iterator<QName> it = builder.keySet().iterator();
+      final QName defaultElementName = (QName) clazz.getDeclaredField(
+          "DEFAULT_ELEMENT_NAME").get(null);
+      final Map<QName, XMLObjectBuilder> builder = builderFactory.getBuilders();
+      final Iterator<QName> it = builder.keySet().iterator();
 
-			while (it.hasNext()) {
-				QName qname = it.next();
-				if (qname.equals(defaultElementName)) {
-					System.out.printf("Builder for: %s\n", qname.toString());
-				}
-			}
-			XMLObjectBuilder xmlBuilder = builderFactory
-					.getBuilder(defaultElementName);
-			
-			T object = (T) xmlBuilder.buildObject(defaultElementName);
-			return object;
-		} catch (Throwable e) {
-			System.out.printf("Failed to create object for: %s\n",
-					clazz.toString());
-			e.printStackTrace();
-			return null;
-		}
-	}
+      while (it.hasNext()) {
+        final QName qname = it.next();
+        if (qname.equals(defaultElementName)) {
+          System.out.printf("Builder for: %s\n", qname.toString());
+        }
+      }
+      final XMLObjectBuilder xmlBuilder = builderFactory
+          .getBuilder(defaultElementName);
+
+      final T object = (T) xmlBuilder.buildObject(defaultElementName);
+      return object;
+    } catch (final Throwable e) {
+      System.out.printf("Failed to create object for: %s\n",
+          clazz.toString());
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  public static org.w3c.dom.Document asDOMDocument(XMLObject object) throws IOException,
+      MarshallingException, TransformerException {
+    final org.w3c.dom.Document document = builder.newDocument();
+    final Marshaller out = org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(
+        object);
+    out.marshall(object, document);
+    return document;
+  }
 
-	public static org.w3c.dom.Document asDOMDocument(XMLObject object) throws IOException,
-			MarshallingException, TransformerException {
-		org.w3c.dom.Document document = builder.newDocument();
-		Marshaller out = Configuration.getMarshallerFactory().getMarshaller(
-				object);
-		out.marshall(object, document);
-		return document;
-	}
-	
 //	public static SignatureTrustEngine getSignatureKnownKeysTrustEngine() throws ConfigurationException {
 //		MetadataCredentialResolver resolver;
 //
@@ -113,7 +112,5 @@ public class SAML2Utils {
 //		return engine;
 //
 //	}
-	
 
-	
 }
-- 
cgit v1.2.3