Validate license; (DOECODE-851)

Author: Tim Sowers

src/main/java/gov/osti/entity/DOECodeMetadata.java

@@ -13,6 +13,8 @@
 import java.io.File;
 import java.io.Reader;
 import java.util.List;
+import java.util.Set;
+import java.util.HashSet;
 
 import gov.osti.entity.BiblioLink;
 import gov.osti.listeners.DoeServletContextListener;
@@ -125,6 +127,13 @@ public enum License {
 
         private final String label;
         private final String value;
+
+        private static final Set<String> values = new HashSet<String>(License.values().length);
+
+        static{
+            for(License f: License.values())
+                values.add(f.value());
+        }
 
         private License(String label, String value) {
             this.label =label;
@@ -138,6 +147,10 @@ public String value() {
         public String label() {
             return this.label;
         }
+
+        public static boolean contains(String value){
+            return values.contains(value);
+        }
     }
 
     /**

src/main/java/gov/osti/services/Metadata.java

@@ -28,6 +28,7 @@
 import gov.osti.entity.MetadataSnapshot;
 import gov.osti.entity.DOECodeMetadata;
 import gov.osti.entity.DOECodeMetadata.Accessibility;
+import gov.osti.entity.DOECodeMetadata.License;
 import gov.osti.entity.DOECodeMetadata.Status;
 import gov.osti.entity.Developer;
 import gov.osti.entity.DoiReservation;
@@ -2394,6 +2395,12 @@ protected static List<String> validateSubmit(DOECodeMetadata m) {
             reasons.add("A License is required.");
         else if (hasLicense && m.getLicenses().contains(DOECodeMetadata.License.Other.value()) && StringUtils.isBlank(m.getProprietaryUrl()))
             reasons.add("Proprietary License URL is required.");
+        if (hasLicense) {
+            for (String l : licenseList) {
+                if (!DOECodeMetadata.License.contains(l))
+                    reasons.add("License not valid: [" + l +"]");
+            }
+        }
         if (licenseContactRequired && !hasLicenseContactEmail)
             reasons.add("A License Contact Email is required.");
         if (null==m.getDevelopers() || m.getDevelopers().isEmpty())