Changeset 229

Timestamp:

03/15/10 18:41:40 (14 years ago)

Author:

oschonef

Message:

• rename VirtualCollecion? property pid to uuid

HEADS UP: database layout changed

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main

Files:

• java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistry.java (modified) (2 diffs)
• java/eu/clarin/cmdi/virtualcollectionregistry/model/ClarinVirtualCollection.java (modified) (1 diff)
• java/eu/clarin/cmdi/virtualcollectionregistry/model/VirtualCollection.java (modified) (3 diffs)
• resources/META-INF/VirtualCollection.xsd (modified) (1 diff)

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

@@ -104 +104 @@
                         // store virtual collection
                         vc.setOwner(user);
-                        vc.setPid(Handle.createPid());
+                        String uuid = vc.createUUID();
                         em.persist(vc);                 
                         em.getTransaction().commit();
@@ -110 +110 @@
                         // XXX: for test PID service
                         em.getTransaction().begin();
-                        em.persist(new Handle(vc.getPid(), Handle.Type.COLLECTION, vc.getId()));
+                        em.persist(new Handle(uuid, Handle.Type.COLLECTION, vc.getId()));
                         em.getTransaction().commit();
                         return vc.getId();

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

@@ -49 +49 @@
                 @XmlElement(name = "MdSelfLink")
                 public URI getSelfLink() {
-                        return cvc.createHandleURI(cvc.getVirtualCollection().getPid());
+                        // FIXME: wrong link
+                        return cvc.createHandleURI(cvc.getVirtualCollection().getUUID());
                 }
 

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

@@ -5 +5 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
+import java.util.UUID;
 
 import javax.persistence.CascadeType;
@@ -89 +90 @@
         @JoinColumn(name = "owner_id", nullable = false)
         private User owner;
-        @Column(name = "pid", nullable = false)
-        private String pid;
+        @Column(name = "uuid", unique = true, nullable = false,
+                           updatable = false, length = 36)
+        private String uuid;
         @Column(name = "name", nullable = false)
         private String name;
@@ -138 +140 @@
         }
 
-        public void setPid(String pid) {
-                if (name == null) {
-                        throw new NullPointerException("name == null");
-                }
-                pid = pid.trim();
-                if (pid.length() < 1) {
-                        throw new IllegalArgumentException("empty pid is not allowed");
-                }
-                this.pid = pid;
-        }
-        
-        @XmlAttribute(name = "persistentId")
-        public String getPid() {
-                return pid;
+        public String createUUID() {
+                if (this.uuid == null) {
+                        this.uuid = UUID.randomUUID().toString();
+                }
+                return this.uuid;
+        }
+
+        @XmlAttribute(name = "uuid")
+        public String getUUID() {
+                return this.uuid;
         }
 

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/resources/META-INF/VirtualCollection.xsd

@@ -34 +34 @@
                 </xs:sequence>
                 <xs:attribute name="id" type="xs:long" use="optional" />
+                <xs:attribute name="uuid" type="xs:string" use="optional" />
                 <xs:attribute name="persistentId" type="xs:string" use="optional" />
         </xs:complexType>