Ref #25533: add optional name to valuesets

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/model/runtime/ProvidedParameters.java

@@ -31,11 +31,13 @@ public class ProvidedParameters {
 
     private final Map<String, String> backendValues;
     private final String stringRepresentation;
+    private final String valueSetName;
 
     @JsonCreator
-    public ProvidedParameters(Map<String, String> backendValues, String stringRepresentation) {
+    public ProvidedParameters(Map<String, String> backendValues, String stringRepresentation, String valueSetName) {
         this.backendValues = backendValues;
         this.stringRepresentation = stringRepresentation;
+        this.valueSetName = valueSetName;
     }
 
     public int size() {
@@ -50,4 +52,8 @@ public String getValue(String parameterId) {
     public String toString() {
         return stringRepresentation;
     }
+
+    public String getValueSetName() {
+        return valueSetName;
+    }
 }

src/main/java/eu/openanalytics/containerproxy/model/spec/Parameters.java

@@ -55,6 +55,8 @@ public static class ValueSet {
         private AccessControl accessControl;
         private Map<String, List<String>> values;
 
+        private String name = null;
+
         public void setValues(Map<String, List<String>> values) {
             this.values = values;
         }
@@ -78,5 +80,13 @@ public List<String> getParameterValues(String parameterId) {
         public Set<String> getParameterIds() {
             return values.keySet();
         }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
     }
 }

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

@@ -206,7 +206,11 @@ private Optional<ProvidedParameters> convertParametersIfAllowed(List<ParameterDe
         }
         // providedParameters contains an allowed value for every parameter
         // return the backend values (instead of the names provided by the user)
-        return Optional.of(new ProvidedParameters(backendValues, getStringRepresentation(parameters, providedParameters)));
+        return Optional.of(new ProvidedParameters(
+                backendValues,
+                getStringRepresentation(parameters, providedParameters),
+                valueSet.getName()
+                ));
     }
 
     public String getStringRepresentation(List<ParameterDefinition> parameters, Map<String, String> providedParameters) {