[java-opensaml COMMIT] in /trunk: opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaVal...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 20 11:27:41 2014
New Revision: 3562

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3562&view=rev
Log:
Eliminate vararg and File-based schema adding methods.

Modified:
    trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java

Modified: trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java?rev=3562&r1=3561&r2=3562&view=diff
==============================================================================
--- trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java (original)
+++ trunk/opensaml-messaging-impl/src/test/java/org/opensaml/messaging/handler/impl/SchemaValidateXmlMessageTest.java Mon Jan 20 11:27:41 2014
@@ -61,7 +61,7 @@
 
         Resource r = new ClassPathResource(SCHEMA_FILE);
         final SchemaBuilder schemaBuilder = new SchemaBuilder();
-        schemaBuilder.addSchemas(r.getInputStream());
+        schemaBuilder.addSchema(r.getInputStream());
         schema = schemaBuilder.buildSchema();
     }
 

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java?rev=3562&r1=3561&r2=3562&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java Mon Jan 20 11:27:41 2014
@@ -195,35 +195,35 @@
         for (final String source : baseXMLSchemas) {
             final InputStream stream = clazz.getResourceAsStream(source);
             if (stream != null) {
-                schemaBuilder.addSchemas(stream);
+                schemaBuilder.addSchema(stream);
             }
         }
 
         for (final String source : soapSchemas) {
             final InputStream stream = clazz.getResourceAsStream(source);
             if (stream != null) {
-                schemaBuilder.addSchemas(stream);
+                schemaBuilder.addSchema(stream);
             }
         }
 
         for (final String source : saml1xSchemas) {
             final InputStream stream = clazz.getResourceAsStream(source);
             if (stream != null) {
-                schemaBuilder.addSchemas(stream);
+                schemaBuilder.addSchema(stream);
             }
         }
 
         for (final String source : saml20Schemas) {
             final InputStream stream = clazz.getResourceAsStream(source);
             if (stream != null) {
-                schemaBuilder.addSchemas(stream);
+                schemaBuilder.addSchema(stream);
             }
         }
 
         for (final String source : baseExtSchemas) {
             final InputStream stream = clazz.getResourceAsStream(source);
             if (stream != null) {
-                schemaBuilder.addSchemas(stream);
+                schemaBuilder.addSchema(stream);
             }
         }
     }

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java?rev=3562&r1=3561&r2=3562&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/SchemaValidationFilter.java Mon Jan 20 11:27:41 2014
@@ -91,7 +91,7 @@
                 if (trimmed != null) {
                     final InputStream stream = clazz.getResourceAsStream(trimmed);
                     if (stream != null) {
-                        overriddenSchemaBuilder.addSchemas(stream);
+                        overriddenSchemaBuilder.addSchema(stream);
                     }
                 }
             }