Changeset 5536

Timestamp:

08/07/14 15:04:10 (10 years ago)

Author:

Twan Goosen

Message:

Added validation of resources to the vc validator called on creation/update.
Refs #61

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src

Files:

• main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/ReferenceValidator.java (modified) (1 diff)
• main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionValidatorImpl.java (modified) (5 diffs)
• test/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionValidatorImplTest.java (added)

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

@@ -49 +49 @@
     }
 
-    private final static ReferenceValidator validator = new ReferenceValidator();
-
-    public static boolean validate(String value) {
+    public boolean validate(String value) {
         final Validatable<String> validatable = new Validatable<>(value);
-        validator.validate(validatable);
+        validate(validatable);
         return validatable.isValid();
     }

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

@@ -9 +9 @@
 import eu.clarin.cmdi.virtualcollectionregistry.model.Resource;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
+import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE;
@@ -26 +28 @@
 @Scope(value = SCOPE_PROTOTYPE)
 public class VirtualCollectionValidatorImpl implements VirtualCollectionValidator {
+
     private final Set<Creator> uniqueCreators = new HashSet<Creator>(16);
     private final Set<String> uniqueResourceRefs = new HashSet<String>(512);
@@ -57 +60 @@
                 if (vc.getResources().isEmpty()) {
                     throw new VirtualCollectionRegistryUsageException(
-                        "extensional collection must contain on or " +
-                        "more resources");
+                            "extensional collection must contain on or "
+                            + "more resources");
                 }
                 if (vc.getGeneratedBy() != null) {
                     throw new VirtualCollectionRegistryUsageException(
                             "extensional collection must not contain GeneratedBy");
+                }
+                final List<String> invalidRefs = getInvalidReferences(vc);
+                if (!invalidRefs.isEmpty()) {
+                    throw new VirtualCollectionRegistryUsageException(
+                            String.format(
+                                    "one or more references are not valid: %s",
+                                    invalidRefs));
                 }
                 break;
@@ -88 +98 @@
         }
 
-        if ((vc.getReproducibilityNotice() != null) &&
-                (vc.getReproducibility() == null)) {
+        if ((vc.getReproducibilityNotice() != null)
+                && (vc.getReproducibility() == null)) {
             throw new VirtualCollectionRegistryUsageException(
                     "reproducibility notice without reproducubility");
@@ -115 +125 @@
     }
 
+    private List<String> getInvalidReferences(VirtualCollection vc) {
+        final ReferenceValidator referenceValidator = new ReferenceValidator();
+        final List<String> invalidRefs = new ArrayList<>();
+        for (Resource resource : vc.getResources()) {
+            if (!referenceValidator.validate(resource.getRef())) {
+                invalidRefs.add(resource.getRef());
+            }
+        }
+        return invalidRefs;
+    }
+
     private void reset() {
         uniqueCreators.clear();