[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/MetadataP...

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Aug  8 19:10:13 2013
New Revision: 3421

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3421&view=rev
Log:
Make protected field in base metadata provider private with accessor.
Adjust boolean method name to is- to match Java bean convention.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/MetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/ChainingMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/DOMMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/FilesystemMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/HTTPMetadataProvider.java
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/ResourceBackedMetadataProvider.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/MetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/MetadataProvider.java?rev=3421&r1=3420&r2=3421&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/MetadataProvider.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/metadata/provider/MetadataProvider.java Thu Aug  8 19:10:13 2013
@@ -44,7 +44,7 @@
      * 
      * @return whether the metadata returned by queries must be valid
      */
-    public boolean requireValidMetadata();
+    public boolean isRequireValidMetadata();
 
     /**
      * Sets whether the metadata returned by queries must be valid.

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java?rev=3421&r1=3420&r2=3421&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/AbstractMetadataProvider.java Thu Aug  8 19:10:13 2013
@@ -465,7 +465,7 @@
             Document mdDocument = parser.parse(metadataInput);
 
             log.trace("Unmarshalling and caching metdata DOM");
-            Unmarshaller unmarshaller = unmarshallerFactory.getUnmarshaller(mdDocument.getDocumentElement());
+            Unmarshaller unmarshaller = getUnmarshallerFactory().getUnmarshaller(mdDocument.getDocumentElement());
             if (unmarshaller == null) {
                 String msg ="No unmarshaller registered for document element " + QNameSupport
                         .getNodeQName(mdDocument.getDocumentElement());
@@ -642,7 +642,7 @@
             return false;
         }
 
-        if (!requireValidMetadata()) {
+        if (!isRequireValidMetadata()) {
             return true;
         }
 

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java?rev=3421&r1=3420&r2=3421&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/metadata/provider/BaseMetadataProvider.java Thu Aug  8 19:10:13 2013
@@ -26,7 +26,7 @@
 public abstract class BaseMetadataProvider implements MetadataProvider {
 
     /** Unmarshaller factory used to get an unmarshaller for the metadata DOM. */
-    protected UnmarshallerFactory unmarshallerFactory;
+    private UnmarshallerFactory unmarshallerFactory;
 
     /** Whether metadata is required to be valid. */
     private boolean requireValidMetadata;
@@ -39,9 +39,9 @@
         requireValidMetadata = false;
         unmarshallerFactory = XMLObjectProviderRegistrySupport.getUnmarshallerFactory();
     }
-
+    
     /** {@inheritDoc} */
-    public boolean requireValidMetadata() {
+    public boolean isRequireValidMetadata() {
         return requireValidMetadata;
     }
 
@@ -64,4 +64,14 @@
     public synchronized void destroy(){
 
     }
+    
+    /**
+     * Get the XMLObject unmarshaller factory to use. 
+     * 
+     * @return the unmarshaller factory instance to use
+     */

[... 102 lines stripped ...]