Add getInstance method to DTOReader/Writer so instances are factories

Author: cwilper

.gitignore

@@ -2,6 +2,7 @@ target
 .idea
 *.log
 *.iml
+*.swp
 .DS_Store
 .settings
 .project

fcrepo-dto/fcrepo-dto-core/src/main/java/com/github/cwilper/fcrepo/dto/core/io/ContentHandlingDTOReader.java

@@ -8,7 +8,7 @@
  */
 public abstract class ContentHandlingDTOReader implements DTOReader {
 
-    private final ContentHandler defaultContentHandler =
+    protected final ContentHandler defaultContentHandler =
             new DefaultContentHandler();
 
     protected ContentHandler contentHandler;

fcrepo-dto/fcrepo-dto-core/src/main/java/com/github/cwilper/fcrepo/dto/core/io/ContentResolvingDTOWriter.java

@@ -9,7 +9,7 @@
  */
 public abstract class ContentResolvingDTOWriter implements DTOWriter {
 
-    private final ContentResolver defaultContentResolver =
+    protected final ContentResolver defaultContentResolver =
             new DefaultContentResolver();
 
     protected ContentResolver contentResolver;

fcrepo-dto/fcrepo-dto-core/src/main/java/com/github/cwilper/fcrepo/dto/core/io/DTOReader.java

@@ -9,6 +9,12 @@
  * Interface for reading a {@link FedoraObject} from a stream.
  */
 public interface DTOReader {
+    /**
+     * Gets a new instance configured like this one.
+     *
+     * @return a new instance.
+     */
+    DTOReader getInstance();
 
     /**
      * Deserializes the given stream into a <code>FedoraObject</code>.

fcrepo-dto/fcrepo-dto-core/src/main/java/com/github/cwilper/fcrepo/dto/core/io/DTOWriter.java

@@ -9,6 +9,12 @@
  * Interface for writing a {@link FedoraObject} to a stream.
  */
 public interface DTOWriter {
+    /**
+     * Gets a new instance configured like this one.
+     *
+     * @return the instance.
+     */
+    DTOWriter getInstance();
 
     /**
      * Serializes a <code>FedoraObject</code> to the given stream.

fcrepo-dto/fcrepo-dto-foxml/src/main/java/com/github/cwilper/fcrepo/dto/foxml/FOXMLReader.java

@@ -9,6 +9,7 @@
 import com.github.cwilper.fcrepo.dto.core.State;
 import com.github.cwilper.fcrepo.dto.core.io.ContentHandlingDTOReader;
 import com.github.cwilper.fcrepo.dto.core.io.DateUtil;
+import com.github.cwilper.fcrepo.dto.core.io.DTOReader;
 import com.github.cwilper.fcrepo.dto.core.io.XMLUtil;
 import org.apache.commons.codec.binary.Base64OutputStream;
 import org.apache.commons.io.IOUtils;
@@ -30,8 +31,7 @@
 import java.util.Set;
 
 /**
- * A {@link com.github.cwilper.fcrepo.dto.core.io.DTOReader} that reads
- * Fedora Object XML.
+ * A {@link DTOReader} that reads Fedora Object XML.
  * <p>
  * <b>NOTE:</b> Only FOXML version 1.1 is supported.
  *
@@ -52,6 +52,15 @@ public class FOXMLReader extends ContentHandlingDTOReader {
     public FOXMLReader() {
     }
 
+    @Override
+    public DTOReader getInstance() {
+        FOXMLReader reader = new FOXMLReader();
+        if (contentHandler != defaultContentHandler) {
+            reader.setContentHandler(contentHandler);
+        }
+        return reader;
+    }
+
     @Override
     public FedoraObject readObject(InputStream source) throws IOException {
         obj = new FedoraObject();

fcrepo-dto/fcrepo-dto-foxml/src/main/java/com/github/cwilper/fcrepo/dto/foxml/FOXMLWriter.java

@@ -22,11 +22,11 @@
 import com.github.cwilper.fcrepo.dto.core.State;
 import com.github.cwilper.fcrepo.dto.core.io.ContentResolvingDTOWriter;
 import com.github.cwilper.fcrepo.dto.core.io.DateUtil;
+import com.github.cwilper.fcrepo.dto.core.io.DTOWriter;
 import com.github.cwilper.fcrepo.dto.core.io.XMLUtil;
 
 /**
- * A {@link com.github.cwilper.fcrepo.dto.core.io.DTOWriter} that writes
- * Fedora Object XML.
+ * A {@link DTOWriter} that writes Fedora Object XML.
  * <p>
  * <b>NOTE:</b> Only FOXML version 1.1 is supported.
  *
@@ -49,6 +49,18 @@ public void setManagedDatastreamsToEmbed(
         this.managedDatastreamsToEmbed = managedDatastreamsToEmbed;
     }
 
+    @Override
+    public DTOWriter getInstance() {
+        FOXMLWriter writer = new FOXMLWriter();
+        if (contentResolver != defaultContentResolver) {
+            writer.setContentResolver(contentResolver);
+        }
+        writer.setManagedDatastreamsToEmbed(
+                new HashSet<String>(managedDatastreamsToEmbed));
+        return writer;
+    }
+
+    @Override
     public void writeObject(FedoraObject obj, OutputStream sink)
             throws IOException {
         this.obj = obj;

pom.xml

@@ -272,7 +272,6 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.1</version>
         <configuration>
-          <debug>true</debug>
           <source>1.6</source>
           <target>1.6</target>
         </configuration>