Ref #28289: validate value-sets before default values

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/service/ParametersService.java

@@ -108,22 +108,6 @@ private void validateSpec(ProxySpec spec) {
             throw new IllegalStateException(String.format("Configuration error: error in parameters of spec '%s', error: not every parameter has a default value. Either define no defaults, or defaults for all parameters.", spec.getId()));
         }
 
-        // Check that every default value exists
-        if (spec.getParameters().getDefinitions().get(0).getDefaultValue() != null) {
-            for (ParameterDefinition definition : spec.getParameters().getDefinitions()) {
-                boolean defaultValueExists = false;
-                for (Parameters.ValueSet valueSet : spec.getParameters().getValueSets()) {
-                    if (valueSet.getParameterValues(definition.getId()).contains(definition.getDefaultValue())) {
-                        defaultValueExists = true;
-                        break;
-                    }
-                }
-                if (!defaultValueExists) {
-                    throw new IllegalStateException(String.format("Configuration error: error in parameters of spec '%s', error: default value for parameter with id '%s' is not defined in a value-set", spec.getId(), definition.getId()));
-                }
-            }
-        }
-
         // Validate Parameter Value Sets
         int valueSetIdx = 0;
         for (Parameters.ValueSet valueSet : spec.getParameters().getValueSets()) {
@@ -143,6 +127,22 @@ private void validateSpec(ProxySpec spec) {
             valueSetIdx++;
         }
 
+        // Check that every default value exists
+        if (spec.getParameters().getDefinitions().get(0).getDefaultValue() != null) {
+            for (ParameterDefinition definition : spec.getParameters().getDefinitions()) {
+                boolean defaultValueExists = false;
+                for (Parameters.ValueSet valueSet : spec.getParameters().getValueSets()) {
+                    if (valueSet.getParameterValues(definition.getId()).contains(definition.getDefaultValue())) {
+                        defaultValueExists = true;
+                        break;
+                    }
+                }
+                if (!defaultValueExists) {
+                    throw new IllegalStateException(String.format("Configuration error: error in parameters of spec '%s', error: default value for parameter with id '%s' is not defined in a value-set", spec.getId(), definition.getId()));
+                }
+            }
+        }
+
     }
 
     /**