From c83bb82a9b3258de14f52ecc7414113aece6fc3e Mon Sep 17 00:00:00 2001
From: Matteo Giordano <Matteo.Giordano@eng.it>
Date: Mon, 8 Jun 2020 12:47:20 +0200
Subject: [PATCH 1/2] Label accepted configuration parameter values

---
 .../model/dto/ConfigurationParameterDTO.java  | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java
index f089d10e3..7e093864e 100644
--- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java
+++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java
@@ -8,6 +8,7 @@
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
+import java.util.Map;
 import java.util.Objects;
 
 import static com.cloudesire.platform.apiclient.dto.model.constants.ErrorKeys.INVALID_SIZE;
@@ -41,10 +42,23 @@ public class ConfigurationParameterDTO extends NamedEntityDTO
     @ApiModelProperty( "Whether to hide the parameter values" )
     private boolean sensitive;
 
+    private Map<String, String> labeledValues;
+
     public ConfigurationParameterDTO( String name, String code, String description )
     {
-        super( name );
+        this( name, description );
         this.code = code;
+    }
+
+    public ConfigurationParameterDTO( String name, Map<String, String> labeledValues, String description )
+    {
+        this( name, description );
+        this.labeledValues = labeledValues;
+    }
+
+    private ConfigurationParameterDTO( String name, String description )
+    {
+        super( name );
         this.description = description;
     }
 
@@ -129,6 +143,17 @@ public ConfigurationParameterDTO setSensitive( boolean sensitive )
         return this;
     }
 
+    public Map<String, String> getLabeledValues()
+    {
+        return labeledValues;
+    }
+
+    public ConfigurationParameterDTO setLabeledValues( Map<String, String> labeledValues )
+    {
+        this.labeledValues = labeledValues;
+        return this;
+    }
+
     @Override
     public boolean equals( Object o )
     {

From 59e55d10fef515d6b0b2bb52a068169404a05cfa Mon Sep 17 00:00:00 2001
From: Matteo Giordano <Matteo.Giordano@eng.it>
Date: Tue, 9 Jun 2020 12:37:19 +0200
Subject: [PATCH 2/2] Rename

---
 .../model/dto/ConfigurationParameterDTO.java  | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java
index 7e093864e..c38936c8d 100644
--- a/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java
+++ b/cloudesire-api-client-dto/src/main/java/com/cloudesire/platform/apiclient/dto/model/dto/ConfigurationParameterDTO.java
@@ -30,6 +30,9 @@ public class ConfigurationParameterDTO extends NamedEntityDTO
     @RegExp
     private String validation;
 
+    @ApiModelProperty( "Possible labeled values for the parameter" )
+    private Map<String, String> acceptedValues;
+
     @ApiModelProperty( "Short description to help user compiling the correct value" )
     private String hint;
 
@@ -42,18 +45,16 @@ public class ConfigurationParameterDTO extends NamedEntityDTO
     @ApiModelProperty( "Whether to hide the parameter values" )
     private boolean sensitive;
 
-    private Map<String, String> labeledValues;
-
     public ConfigurationParameterDTO( String name, String code, String description )
     {
         this( name, description );
         this.code = code;
     }
 
-    public ConfigurationParameterDTO( String name, Map<String, String> labeledValues, String description )
+    public ConfigurationParameterDTO( String name, Map<String, String> acceptedValues, String description )
     {
         this( name, description );
-        this.labeledValues = labeledValues;
+        this.acceptedValues = acceptedValues;
     }
 
     private ConfigurationParameterDTO( String name, String description )
@@ -99,6 +100,17 @@ public ConfigurationParameterDTO setValidation( String validation )
         return this;
     }
 
+    public Map<String, String> getAcceptedValues()
+    {
+        return acceptedValues;
+    }
+
+    public ConfigurationParameterDTO setAcceptedValues( Map<String, String> acceptedValues )
+    {
+        this.acceptedValues = acceptedValues;
+        return this;
+    }
+
     public String getHint()
     {
         return hint;
@@ -143,17 +155,6 @@ public ConfigurationParameterDTO setSensitive( boolean sensitive )
         return this;
     }
 
-    public Map<String, String> getLabeledValues()
-    {
-        return labeledValues;
-    }
-
-    public ConfigurationParameterDTO setLabeledValues( Map<String, String> labeledValues )
-    {
-        this.labeledValues = labeledValues;
-        return this;
-    }
-
     @Override
     public boolean equals( Object o )
     {