Changeset 5463

Timestamp:

07/09/14 07:46:46 (10 years ago)

Author:

Twan Goosen

Message:

Fixed CMDI marshalling issues with missing optional fields in VC

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java (modified) (5 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionCMDICreatorImpl.java

@@ -145 +145 @@
         virtualCollection.setCreationDate(getCreationDate(vc));
         virtualCollection.setStatus(getStatus(vc));
-        virtualCollection.setReproducability(getReproducability(vc));
         virtualCollection.setPurpose(getPurpose(vc));
         virtualCollection.getCreator().add(getCreator(vc));
         virtualCollection.setGeneratedBy(new CMD.Components.VirtualCollection.GeneratedBy());
+        virtualCollection.setReproducability(getReproducability(vc));
 
         if (vc.getReproducibilityNotice() != null) {
@@ -167 +167 @@
 
     private ComplextypeStatus1 getStatus(VirtualCollection vc) {
+        // status is a mandatory field
         final ComplextypeStatus1 status = new ComplextypeStatus1();
         switch (vc.getState()) {
@@ -185 +186 @@
 
     private ComplextypeReproducability1 getReproducability(VirtualCollection vc) {
-        final ComplextypeReproducability1 reproducability = new ComplextypeReproducability1();
-        if (vc.getReproducibility() != null) {
+        if (vc.getReproducibility() == null) {
+            return null;
+        } else {
+            final ComplextypeReproducability1 reproducability = new ComplextypeReproducability1();
             switch (vc.getReproducibility()) {
                 //TODO: better mapping
@@ -199 +202 @@
                     break;
             }
-        }
-        return reproducability;
+            return reproducability;
+        }
     }
 
     private ComplextypePurpose1 getPurpose(VirtualCollection vc) {
-        final ComplextypePurpose1 purpose = new ComplextypePurpose1();
-        if (vc.getPurpose() != null) {
+        if (vc.getPurpose() == null) {
+            return null;
+        } else {
+            final ComplextypePurpose1 purpose = new ComplextypePurpose1();
             switch (vc.getPurpose()) {
                 case FUTURE_USE:
@@ -220 +225 @@
                     break;
             }
-        }
-        return purpose;
+            return purpose;
+        }
     }
 
     private CMD.Components.VirtualCollection.Creator getCreator(VirtualCollection vc) {
-        final CMD.Components.VirtualCollection.Creator creator = new CMD.Components.VirtualCollection.Creator();
-        if (vc.getCreators().size() > 0) {
+        if (vc.getCreators().isEmpty()) {
+            return null;
+        } else {
+            final CMD.Components.VirtualCollection.Creator creator = new CMD.Components.VirtualCollection.Creator();
             final Creator vcCreator = vc.getCreators().get(0);
 
+            // name/creator is a mandatory field
             final CMD.Components.VirtualCollection.Creator.Name name = new CMD.Components.VirtualCollection.Creator.Name();
             name.setValue(vcCreator.getPerson());
             creator.setName(name);
 
-            final Email email = new Email();
-            email.setValue(vcCreator.getEMail());
-            creator.setEmail(email);
-
-            final Organisation organisation = new Organisation();
-            organisation.setValue(vcCreator.getOrganisation());
-            creator.setOrganisation(organisation);
-        }
-        return creator;
+            if (vcCreator.getEMail() != null) {
+                final Email email = new Email();
+                email.setValue(vcCreator.getEMail());
+                creator.setEmail(email);
+            }
+
+            if (vcCreator.getOrganisation() != null) {
+                final Organisation organisation = new Organisation();
+                organisation.setValue(vcCreator.getOrganisation());
+                creator.setOrganisation(organisation);
+            }
+            return creator;
+        }
     }
 }