From f220f54579f5975586b4dcd7634668815c208eda Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Wed, 8 Apr 2020 16:23:51 +0200
Subject: refactor to OpenSAML 4.x

---
 .../impl/validation/metadata/SchemaValidationFilter.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java')

diff --git a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
index b9e0c37f..2c7892f9 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
+++ b/eaaf_modules/eaaf_module_pvp2_core/src/main/java/at/gv/egiz/eaaf/modules/pvp2/impl/validation/metadata/SchemaValidationFilter.java
@@ -19,20 +19,23 @@
 
 package at.gv.egiz.eaaf.modules.pvp2.impl.validation.metadata;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.validation.Schema;
 import javax.xml.validation.Validator;
 
-import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
-
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.saml.common.xml.SAMLSchemaBuilder;
 import org.opensaml.saml.common.xml.SAMLSchemaBuilder.SAML1Version;
 import org.opensaml.saml.metadata.resolver.filter.FilterException;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
+import org.opensaml.saml.metadata.resolver.filter.MetadataFilterContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import at.gv.egiz.eaaf.modules.pvp2.exception.SchemaValidationException;
+
 public class SchemaValidationFilter implements MetadataFilter {
   private static final Logger log = LoggerFactory.getLogger(SchemaValidationFilter.class);
   private boolean isActive = true;
@@ -64,13 +67,14 @@ public class SchemaValidationFilter implements MetadataFilter {
    * .XMLObject)
    */
   @Override
-  public XMLObject filter(final XMLObject arg0) throws FilterException {
+  public XMLObject filter(@Nullable final XMLObject metadata, 
+      @Nonnull final MetadataFilterContext context)  throws FilterException {
 
     if (isActive) {
       try {
         final Schema test = schemaBuilder.getSAMLSchema();
         final Validator val = test.newValidator();
-        final DOMSource source = new DOMSource(arg0.getDOM());
+        final DOMSource source = new DOMSource(metadata.getDOM());
         val.validate(source);
         log.info("Metadata Schema validation check done OK");
 
@@ -90,7 +94,7 @@ public class SchemaValidationFilter implements MetadataFilter {
 
     }
 
-    return arg0;
+    return metadata;
   }
 
 }
-- 
cgit v1.2.3