[utilities COMMIT] in /spring-extensions/trunk/src: main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBea...

[noreply at shibboleth.net]

Author: iay
Date: Thu Jun  5 05:42:47 2014
New Revision: 584

URL: http://svn.shibboleth.net/view/utilities?rev=584&view=rev
Log:
JSE-4: DomDocumentFactoryBean should be renamed

Added:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java
      - copied, changed from r583, spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java
      - copied, changed from r583, spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java
Modified:
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java

Copied: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java (from r583, spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java)
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java?p2=spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java&p1=spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java&r1=583&r2=584&rev=584&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBean.java Thu Jun  5 05:42:47 2014
@@ -31,10 +31,10 @@
 import org.w3c.dom.Document;
 
 /** Spring bean factory for producing a {@link Document} from a resource. */
-public class DomDocumentFactoryBean implements FactoryBean<Document> {
+public class DOMDocumentFactoryBean implements FactoryBean<Document> {
 
     /** Resource to load the document from. */
-    @Nullable private Resource documentResource;
+    @Nullable private Resource resource;
 
     /** Parser pool to use when parsing the document. */
     @Nullable private ParserPool parserPool;
@@ -45,10 +45,10 @@
     /**
      * Sets the resource containing the document to be parsed.
      *
-     * @param resource resource, never null
+     * @param domResource resource, never null
      */
-    public void setDocumentResource(@Nonnull final Resource resource) {
-        documentResource = Constraint.isNotNull(resource, "XML Resource cannot be null");
+    public void setResource(@Nonnull final Resource domResource) {
+        resource = Constraint.isNotNull(domResource, "resource cannot be null");
     }
 
     /**
@@ -64,7 +64,7 @@
     @Override
     @Nonnull public synchronized Document getObject() throws Exception {
         if (document == null) {
-            if (documentResource == null){
+            if (resource == null){
                 throw new BeanCreationException("Document resource must be provided in order to use this factory.");
             }
             
@@ -72,7 +72,7 @@
                 throw new BeanCreationException("ParserPool must be provided in order to use this factory.");
             }
             
-            try (InputStream is = documentResource.getInputStream()) {
+            try (InputStream is = resource.getInputStream()) {
                 document = parserPool.parse(is);
             }
         }

Copied: spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java (from r583, spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java)
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java?p2=spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java&p1=spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java&r1=583&r2=584&rev=584&view=diff
==============================================================================
--- spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DomDocumentFactoryBeanTest.java (original)
+++ spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/DOMDocumentFactoryBeanTest.java Thu Jun  5 05:42:47 2014
@@ -26,8 +26,8 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
-/** {@link DomDocumentFactoryBean} unit tests. */
-public class DomDocumentFactoryBeanTest {
+/** {@link DOMDocumentFactoryBean} unit tests. */
+public class DOMDocumentFactoryBeanTest {
 
     /**
      * Test normal use of the factory.
@@ -36,11 +36,11 @@
      */
     @Test
     public void getObject() throws Exception {
-        DomDocumentFactoryBean factory = new DomDocumentFactoryBean();

[... 19 lines stripped ...]