Even more JAXB goodness

fcrepo4-archive · Feb 5, 2013 · 2bd5b0e · 2bd5b0e
1 parent f6e84b1
commit 2bd5b0e
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 31 deletions.
diff --git a/src/main/java/org/fcrepo/modeshape/FedoraDatastreams.java b/src/main/java/org/fcrepo/modeshape/FedoraDatastreams.java
@@ -25,11 +25,9 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
 
 import org.fcrepo.modeshape.jaxb.responses.ObjectDatastreams;
 import org.fcrepo.modeshape.jaxb.responses.ObjectDatastreams.Datastream;
@@ -127,19 +125,16 @@ public Response addDatastream(@PathParam("pid") final String pid,
 
 		if (session.hasPermission(dspath, "add_node")) {
 			if (!session.nodeExists(dspath)) {
-				final UriBuilder ub = uriInfo.getAbsolutePathBuilder();
 				return Response.created(
-						ub.path(addDatastreamNode(dspath, contentType,
-								requestBodyStream, session)).build()).build();
+						addDatastreamNode(dspath, contentType,
+								requestBodyStream, session)).build();
 			} else {
 				if (session.hasPermission(dspath, "remove")) {
 					session.getNode(dspath).remove();
 					session.save();
-					final UriBuilder ub = uriInfo.getAbsolutePathBuilder();
 					return Response.created(
-							ub.path(addDatastreamNode(dspath, contentType,
-									requestBodyStream, session)).build())
-							.build();
+							addDatastreamNode(dspath, contentType,
+									requestBodyStream, session)).build();
 
 				} else {
 					session.logout();
@@ -181,19 +176,16 @@ public Response modifyDatastream(@PathParam("pid") final String pid,
 		String dspath = "/" + pid + "/" + dsid;
 
 		if (session.hasPermission(dspath, "add_node")) {
-
-			return Response
-					.status(Response.Status.CREATED)
-					.entity(addDatastreamNode(dspath, contentType,
-							requestBodyStream, session).toString()).build();
-
+			return Response.created(
+					addDatastreamNode(dspath, contentType, requestBodyStream,
+							session)).build();
 		} else {
 			session.logout();
 			return four01;
 		}
 	}
 
-	private String addDatastreamNode(final String dsPath,
+	private URI addDatastreamNode(final String dsPath,
 			final MediaType contentType, final InputStream requestBodyStream,
 			final Session session) throws RepositoryException, IOException {
 
@@ -244,8 +236,8 @@ private String addDatastreamNode(final String dsPath,
 		session.save();
 		session.logout();
 		logger.debug("Finished adding datastream node at path: " + dsPath);
-
-		return dsId;
+		final UriBuilder ub = uriInfo.getAbsolutePathBuilder();
+		return ub.path(dsId).build();
 	}
 
 	/**

diff --git a/src/main/java/org/fcrepo/modeshape/FedoraIdentifiers.java b/src/main/java/org/fcrepo/modeshape/FedoraIdentifiers.java
@@ -13,19 +13,18 @@
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.Response;
+
+import org.fcrepo.modeshape.jaxb.responses.NextPid;
 
 import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 
 import freemarker.template.TemplateException;
 
 /**
  * JAX-RS Resource offering PID creation.
  * 
  * @author ajs6f
- *
+ * 
  */
 @Path("nextPID")
 public class FedoraIdentifiers extends AbstractResource {
@@ -39,17 +38,13 @@ public class FedoraIdentifiers extends AbstractResource {
 	 */
 	@POST
 	@Produces("text/xml")
-	public Response getNextPid(
+	public NextPid getNextPid(
 			@QueryParam("numPids") @DefaultValue("1") Integer numPids)
 			throws RepositoryException, IOException, TemplateException {
 
-		ImmutableSet<String> pids = copyOf(transform(
-				closed(1, numPids).asSet(integers()), makePid));
+		return new NextPid(copyOf(transform(closed(1, numPids)
+				.asSet(integers()), makePid)));
 
-		return Response
-				.ok()
-				.entity(renderTemplate("nextPid.ftl",
-						ImmutableMap.of("pids", (Object) pids))).build();
 	}
 
 	private Function<Integer, String> makePid = new Function<Integer, String>() {

diff --git a/src/main/java/org/fcrepo/modeshape/FedoraObjects.java b/src/main/java/org/fcrepo/modeshape/FedoraObjects.java
@@ -70,7 +70,8 @@ public Response ingest(@PathParam("pid") final String pid)
 			session.save();
 			session.logout();
 			logger.debug("Finished ingest with pid: " + pid);
-			return Response.status(Response.Status.CREATED).entity(pid).build();
+			final UriBuilder ub = uriInfo.getAbsolutePathBuilder();
+			return Response.created(ub.path(pid).build()).build();
 		} else {
 			session.logout();
 			return four01;

diff --git a/src/main/java/org/fcrepo/modeshape/jaxb/responses/NextPid.java b/src/main/java/org/fcrepo/modeshape/jaxb/responses/NextPid.java
@@ -0,0 +1,21 @@
+package org.fcrepo.modeshape.jaxb.responses;
+
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "pids", namespace = "")
+public class NextPid {
+
+	@XmlElement(name = "pid")
+	Set<String> pids;
+
+	public NextPid(Set<String> pids) {
+		this.pids = pids;
+	}
+
+	public NextPid() {
+	}
+
+}
diff --git a/src/main/java/org/fcrepo/modeshape/jaxb/responses/ObjectDatastreams.java b/src/main/java/org/fcrepo/modeshape/jaxb/responses/ObjectDatastreams.java
@@ -30,7 +30,6 @@ public Datastream(String dsid, String label, String mimeType) {
 		public String mimeType;
 
 		public Datastream() {
-			super();
 		}
 	}
 }