Changeset 5542

Timestamp:

08/08/14 11:25:05 (10 years ago)

Author:

Twan Goosen

Message:

Upgraded to latest Spring release and added list of validation errors to the VC usage exception. Preparing for #607

Location:

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryUsageException.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/VirtualCollectionValidator.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/virtualcollectionregistry/service/impl/VirtualCollectionValidatorImpl.java (modified) (1 diff)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/pom.xml

@@ -48 +48 @@
         <jackson.version>1.6.1</jackson.version>
         <wicket.version>1.4.23</wicket.version>
-        <spring.version>4.0.5.RELEASE</spring.version>
+        <spring.version>4.0.6.RELEASE</spring.version>
         
         <!-- Production settings below -->

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry;
+
+import java.util.Collections;
+import java.util.List;
 
 public class VirtualCollectionRegistryUsageException extends
         VirtualCollectionRegistryException {
+
     private static final long serialVersionUID = 1L;
+
+    private final List<String> validationErrors;
 
     public VirtualCollectionRegistryUsageException(String msg) {
@@ -11 +17 @@
     public VirtualCollectionRegistryUsageException(String msg,
             Throwable cause) {
+        this(msg, cause, null);
+    }
+
+    public VirtualCollectionRegistryUsageException(String msg,
+            Throwable cause, List<String> validationErrors) {
         super(msg, cause);
+        this.validationErrors = validationErrors;
+    }
+
+    /**
+     *
+     * @return list of validation errors (never null)
+     */
+    public List<String> getValidationErrors() {
+        if (validationErrors == null) {
+            return Collections.emptyList();
+        } else {
+            return validationErrors;
+        }
     }
 

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

@@ -1 +1 @@
 package eu.clarin.cmdi.virtualcollectionregistry.service;
 
-import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryException;
+import eu.clarin.cmdi.virtualcollectionregistry.VirtualCollectionRegistryUsageException;
 import eu.clarin.cmdi.virtualcollectionregistry.model.VirtualCollection;
 
@@ -10 +10 @@
 public interface VirtualCollectionValidator {
 
-    void validate(VirtualCollection vc) throws VirtualCollectionRegistryException;
+    void validate(VirtualCollection vc) throws VirtualCollectionRegistryUsageException;
 
 }

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

@@ -34 +34 @@
     @Override
     public void validate(VirtualCollection vc)
-            throws VirtualCollectionRegistryException {
+            throws VirtualCollectionRegistryUsageException {
         if (vc == null) {
             throw new NullPointerException("vc == null");