Changeset 5508

Timestamp:

08/01/14 08:50:14 (10 years ago)

Author:

Twan Goosen

Message:

All representations of a VC are retrieved at the same URL that provides internal XML, JSON, CMDI, or a web UI redirect determined through content negotiation. Added a filter that allows for 'content negotation' through URL extension
Refs #604

TODO: Default to CMDI
TODO: PID reference

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionMediaTypeFilter.java (added)
• java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionResource.java (modified) (6 diffs)
• webapp/WEB-INF/web-dev.xml (modified) (1 diff)
• webapp/WEB-INF/web-shib.xml (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionResource.java

@@ -11 +11 @@
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.URI;
 import java.security.Principal;
 import javax.ws.rs.Consumes;
@@ -27 +28 @@
 import javax.ws.rs.core.SecurityContext;
 import javax.ws.rs.core.StreamingOutput;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
 
 /**
@@ -36 +39 @@
  * with it.
  *
+ * FIXME: make this default to {@link #getVirtualCollectionCmdi() } instead
+ * of XML.
+ * 
  * @author twagoo
  */
+@Produces(VirtualCollectionResource.MediaTypes.CMDI) 
 public final class VirtualCollectionResource {
 
+    public static class MediaTypes {
+        public static final String CMDI = "application/x-cmdi+xml";
+        public static final MediaType CMDI_TYPE = new MediaType("application", "x-cmdi+xml");
+    }
+    
     @InjectParam
     private VirtualCollectionRegistry registry;
@@ -48 +60 @@
     @Context
     private HttpHeaders headers;
+    @Context
+    private UriInfo uriInfo;
 
     private Long id;
@@ -71 +85 @@
         }
         this.id = id;
+    }
+    
+    /**
+     * The virtual collection referenced by the URI will be retrieved in CMDI
+     * format.
+     *
+     * @return A response containing the virtual collection in CMDI format. If
+     * the virtual collection is not found the appropriate HTTP status code is
+     * issued and an error message is returned.
+     * @throws VirtualCollectionRegistryException
+     */
+    @GET
+    public Response getVirtualCollectionCmdi()
+            throws VirtualCollectionRegistryException {
+        final VirtualCollection vc = registry.retrieveVirtualCollection(id);
+        if (!vc.isPublic() || (vc.getPersistentIdentifier() == null)) {
+            throw new VirtualCollectionNotFoundException(id);
+        }
+        StreamingOutput writer = new StreamingOutput() {
+            @Override
+            public void write(OutputStream output) throws IOException,
+                    WebApplicationException {
+                marshaller.marshalAsCMDI(output, VirtualCollectionMarshaller.Format.XML, vc);
+                output.close();
+            }
+        };
+        return Response.ok(writer).build();
     }
 
@@ -167 +208 @@
 
     /**
-     * The virtual collection referenced by the URI will be retrieved in CMDI
-     * format.
-     *
-     * @return A response containing the virtual collection in CMDI format. If
-     * the virtual collection is not found the appropriate HTTP status code is
-     * issued and an error message is returned.
-     * @throws VirtualCollectionRegistryException
-     */
-    @GET
-    @Path("/cmdi")
-    @Produces({MediaType.TEXT_XML,
-        MediaType.APPLICATION_XML})
-    public Response getVirtualCollectionCmdi()
-            throws VirtualCollectionRegistryException {
-        final VirtualCollection vc = registry.retrieveVirtualCollection(id);
-        if (!vc.isPublic() || (vc.getPersistentIdentifier() == null)) {
-            throw new VirtualCollectionNotFoundException(id);
-        }
-        StreamingOutput writer = new StreamingOutput() {
-            @Override
-            public void write(OutputStream output) throws IOException,
-                    WebApplicationException {
-                marshaller.marshalAsCMDI(output, VirtualCollectionMarshaller.Format.XML, vc);
-                output.close();
-            }
-        };
-        return Response.ok(writer).build();
+     * Redirects the client to the VC's details page in the Wicket frontend
+     * @return
+     * @throws VirtualCollectionRegistryException 
+     */
+    @GET
+    @Produces({MediaType.TEXT_HTML})
+    public Response getVirtualCollectionDetailsRedirect()
+            throws VirtualCollectionRegistryException {
+        final UriBuilder pathBuilder = uriInfo.getBaseUriBuilder().path("../app/details/{arg1}");
+        final URI detailsUri = pathBuilder.build(id);
+        return Response.seeOther(detailsUri).build();
     }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/web-dev.xml

@@ -72 +72 @@
             <param-name>com.sun.jersey.config.property.packages</param-name>
             <param-value>eu.clarin.cmdi.virtualcollectionregistry.rest</param-value>
+        </init-param>
+        <init-param>
+            <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
+            <param-value>eu.clarin.cmdi.virtualcollectionregistry.rest.VirtualCollectionMediaTypeFilter</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/webapp/WEB-INF/web-shib.xml

@@ -93 +93 @@
             <param-value>eu.clarin.cmdi.virtualcollectionregistry.rest</param-value>
         </init-param>
+        <init-param>
+            <param-name>com.sun.jersey.spi.container.ContainerRequestFilters</param-name>
+            <param-value>eu.clarin.cmdi.virtualcollectionregistry.rest.VirtualCollectionMediaTypeFilter</param-value>
+        </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>