Broke pid minting out into a separate interface with default UUID-bas…

…ed implementation
fcrepo4-archive · Jan 20, 2013 · 980cda9 · 980cda9
1 parent a85eaa2
commit 980cda9
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 31 deletions.
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/AbstractResource.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/AbstractResource.java
@@ -16,6 +16,8 @@
 import javax.ws.rs.core.Response;
 
 import org.codehaus.jackson.map.ObjectMapper;
+import org.fcrepo.ffmodeshapeprototype.identifiers.PidMinter;
+import org.fcrepo.ffmodeshapeprototype.identifiers.UUIDPidMinter;
 import org.infinispan.schematic.document.ParsingException;
 import org.modeshape.common.SystemFailureException;
 import org.modeshape.common.collection.Problems;
@@ -41,6 +43,8 @@ public abstract class AbstractResource {
 
 	static protected Configuration freemarker = null;
 	static protected Workspace ws = null;
+
+	protected static PidMinter pidMinter = new UUIDPidMinter();;
 
 	public AbstractResource() throws ConfigurationException,
 			RepositoryException, IOException {
@@ -125,7 +129,5 @@ protected InputStream renderTemplate(final String templatename,
 		return in;
 	}
 
-    protected String mintPid() {
-    		return java.util.UUID.randomUUID().toString();
-    }
+
 }
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraIdentifiers.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraIdentifiers.java
@@ -26,20 +26,20 @@ public FedoraIdentifiers() throws ConfigurationException,
 		super();
 	}
 
-    @POST
-    @Path("/nextPID")
-    @Produces("text/xml")
-    public Response getNextPid(@QueryParam("numPids") @DefaultValue("1") Integer numPids) throws RepositoryException,
-            IOException, TemplateException {
-
-        ImmutableSet.Builder<String> b = new Builder<String>();
-        for(int i = 0; i < numPids; i++) {
-            b.add(mintPid());
-        }
-        return Response
-                .ok()
-                .entity(renderTemplate("nextPid.ftl",
-                        ImmutableMap.of("pids", (Object) b.build())))
-                .build();
-    }
+	@POST
+	@Path("/nextPID")
+	@Produces("text/xml")
+	public Response getNextPid(
+			@QueryParam("numPids") @DefaultValue("1") Integer numPids)
+			throws RepositoryException, IOException, TemplateException {
+
+		ImmutableSet.Builder<String> b = new Builder<String>();
+		for (int i = 0; i < numPids; i++) {
+			b.add(pidMinter.mintPid());
+		}
+		return Response
+				.ok()
+				.entity(renderTemplate("nextPid.ftl",
+						ImmutableMap.of("pids", (Object) b.build()))).build();
+	}
 }
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraObjects.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/FedoraObjects.java
@@ -32,14 +32,12 @@ public FedoraObjects() throws ConfigurationException, RepositoryException,
 			IOException {
 		super();
 	}
-    @POST
-    @Path("/new")
-    public Response ingestAndMint()
-            throws RepositoryException {
-        final String pid = mintPid();
 
-        return ingest(pid);
-    }
+	@POST
+	@Path("/new")
+	public Response ingestAndMint() throws RepositoryException {
+		return ingest(pidMinter.mintPid());
+	}
 
 	@POST
 	@Path("/{pid}")
@@ -51,9 +49,9 @@ public Response ingest(@PathParam("pid") final String pid)
 		if (session.hasPermission("/" + pid, "add_node")) {
 			final Node obj = root.addNode(pid, "fedora:object");
 			obj.addMixin("fedora:owned");
-            obj.addMixin("fedora:created");
+			obj.addMixin("fedora:created");
 			obj.setProperty("fedora:ownerId", "Fedo Radmin");
-            obj.setProperty("jcr:lastModified", Calendar.getInstance());
+			obj.setProperty("jcr:lastModified", Calendar.getInstance());
 			session.save();
 			return Response.status(Response.Status.CREATED).entity(pid).build();
 		} else {
@@ -86,8 +84,5 @@ public Response deleteObject(@PathParam("pid") final String pid)
 			throws RepositoryException {
 		return deleteResource(pid);
 	}
-
-
-
 
 }
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/identifiers/PidMinter.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/identifiers/PidMinter.java
@@ -0,0 +1,7 @@
+package org.fcrepo.ffmodeshapeprototype.identifiers;
+
+public interface PidMinter {
+
+    public String mintPid() ;
+
+}
diff --git a/src/main/java/org/fcrepo/ffmodeshapeprototype/identifiers/UUIDPidMinter.java b/src/main/java/org/fcrepo/ffmodeshapeprototype/identifiers/UUIDPidMinter.java
@@ -0,0 +1,10 @@
+package org.fcrepo.ffmodeshapeprototype.identifiers;
+
+public class UUIDPidMinter implements PidMinter {
+
+	@Override
+	public String mintPid() {
+		return java.util.UUID.randomUUID().toString();
+	}
+
+}