Changeset 235

Timestamp:

03/17/10 10:15:52 (14 years ago)

Author:

oschonef

Message:

• enable fetching virtual collections im CMDI format also by uuid
• fix error when no virtual collection was found

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry

Files:

• VirtualCollectionNotFoundException.java (modified) (1 diff)
• VirtualCollectionRegistry.java (modified) (1 diff)
• model/VirtualCollection.java (modified) (1 diff)
• rest/VirtualCollectionRegistryRestService.java (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionNotFoundException.java

@@ -9 +9 @@
         }
 
+        public VirtualCollectionNotFoundException(String uuid) {
+                super("virtual collection with UUID " + uuid + " was not found");
+        }
+
 } // class VirtualCollectionNotFoundException

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

@@ -214 +214 @@
                                         new Long(id));
                         em.getTransaction().commit();
-                        if (vc == null) {
-                                throw new VirtualCollectionNotFoundException(id);
-                        }
                         return vc;
-                } catch (VirtualCollectionRegistryException e) {
-                        throw e;
+                } catch (NoResultException e) {
+                        throw new VirtualCollectionNotFoundException(id);
+                } catch (Exception e) {
+                        logger.log(Level.SEVERE,
+                                           "error while retrieving virtual collection", e);
+                        throw new VirtualCollectionRegistryException(
+                                        "error while retrieving virtual collection", e);
+                }
+        }
+
+        public VirtualCollection retrieveVirtualCollection(String uuid)
+                        throws VirtualCollectionRegistryException {
+                if (uuid == null) {
+                        throw new NullPointerException("uuid == null");
+                }
+                uuid = uuid.trim();
+                if (uuid.isEmpty()) {
+                        throw new IllegalArgumentException("uuid is empty");
+                }
+
+                try {
+                        EntityManager em = datastore.getEntityManager();
+                        em.getTransaction().begin();
+                        TypedQuery<VirtualCollection> q =
+                                em.createNamedQuery("VirtualCollection.byUUID",
+                                                                        VirtualCollection.class);
+                        q.setParameter("uuid", uuid);
+                        VirtualCollection vc = q.getSingleResult();
+                        em.getTransaction().commit();
+                        return vc;
+                } catch (NoResultException e) {
+                        throw new VirtualCollectionNotFoundException(uuid);
                 } catch (Exception e) {
                         logger.log(Level.SEVERE,

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java

@@ -46 +46 @@
 @Table(name = "virtual_collection")
 @NamedQueries({
+        @NamedQuery(name = "VirtualCollection.byUUID",
+                                query = "SELECT c FROM VirtualCollection c " +
+                                            "WHERE c.uuid = :uuid"),
         @NamedQuery(name = "VirtualCollection.findAll",
                                 query = "SELECT c FROM VirtualCollection c"),

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

@@ -6 +6 @@
 import java.net.URI;
 import java.security.Principal;
+import java.util.UUID;
 
 import javax.ws.rs.Consumes;
@@ -210 +211 @@
         @Path("/clarin-virtualcollection/{id}")
         @Produces({ MediaType.TEXT_XML, MediaType.APPLICATION_XML })
-        public Response getClarinVirtualCollection(
-                        @PathParam("id") long id) throws VirtualCollectionRegistryException {
-                VirtualCollection vc = registry.retrieveVirtualCollection(id);
+        public Response getClarinVirtualCollection(@PathParam("id") String id)
+                        throws VirtualCollectionRegistryException {
+                if (id == null) {
+                        /*
+                         * null indicated client error, so use IllegalArgumentException
+             * here, so we will signal bad request error to client
+                         */
+                        throw new IllegalArgumentException("id path argument is missing");
+                }
+                VirtualCollection vc = null;
+                try {
+                        UUID vc_id = UUID.fromString(id.trim());
+                        vc = registry.retrieveVirtualCollection(vc_id.toString());
+                } catch (IllegalArgumentException e) {
+                        try {
+                                long vc_id = Long.parseLong(id);
+                                vc = registry.retrieveVirtualCollection(vc_id);
+                        } catch (NumberFormatException e1) {
+                                throw new IllegalArgumentException("invalid id: " +
+                                                "not nor a number or a uuid");
+                        }
+                }
+
+                // sanity check
+                if (vc == null) {
+                        throw new AssertionError("vc == null");
+                }
+
                 final ClarinVirtualCollection cvc = new ClarinVirtualCollection(vc);
                 StreamingOutput writer = new StreamingOutput() {