Changeset 5591

Timestamp:

08/21/14 15:24:24 (10 years ago)

Author:

Twan Goosen

Message:

Newly created collection are always private. Updated protocol description to reflect this.

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• Protocol.txt (modified) (1 diff)
• src/assembly/distribution.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java (modified) (3 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/Protocol.txt

@@ -39 +39 @@
                  description: A virtual collection will be created based on the
                               representation of the virtual collection sent in
-                              the request body.
+                              the request body. ID and state, if provided, will be 
+                              ignored so this will always result in a private collection
+                              with a new identifier.
                  HTTP method: POST
                          URI: $BASE/service/virtualcollections

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/assembly/distribution.xml

@@ -15 +15 @@
                 <include>LICENSE*</include>
                 <include>NOTICE*</include>
+                <include>Protocol.txt</include>
             </includes>
         </fileSet>

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

@@ -102 +102 @@
     }
 
+    /**
+     * Will store the specified collection; it will also set the owner according
+     * to the specified principal and set its state to
+     * {@link VirtualCollection.State#PRIVATE}
+     *
+     * @param principal owner principal
+     * @param vc collection to store
+     * @return identifier of the persisted collection
+     * @throws VirtualCollectionRegistryException
+     */
     public long createVirtualCollection(Principal principal,
             VirtualCollection vc) throws VirtualCollectionRegistryException {
@@ -124 +134 @@
                 em.persist(user);
             }
+            vc.setOwner(user);
+
+            // force new collection to be private
+            vc.setState(VirtualCollection.State.PRIVATE);
 
             // store virtual collection
-            vc.setOwner(user);
             logger.debug("persisting new virtual collection", vc.getId());
             em.persist(vc);
@@ -685 +698 @@
         });
     }
-    
+
     private boolean isAllowedToModify(Principal principal, VirtualCollection c) {
         // admin and owner are allowed to modify collections