2 files changed, 6 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-common-lib/pom.xml b/openecomp-be/lib/openecomp-common-lib/pom.xml
index a2a36c3cab..9ffb3c5284 100644
--- a/openecomp-be/lib/openecomp-common-lib/pom.xml
+++ b/openecomp-be/lib/openecomp-common-lib/pom.xml
@@ -46,6 +46,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-text</artifactId>
+      <version>${apache-commons-text.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/model/HeatPseudoParameters.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/model/HeatPseudoParameters.java
index 7ed8203bfe..73020bcbcf 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/model/HeatPseudoParameters.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/model/HeatPseudoParameters.java
@@ -23,33 +23,27 @@ package org.openecomp.sdc.heat.datatypes.model;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
+@AllArgsConstructor
 @Getter
 public enum HeatPseudoParameters {
     OS_STACK_NAME("OS::stack_name"),
     OS_STACK_ID("OS::stack_id"),
     OS_PROJECT_ID("OS::project_id");
 
-    private static List<String> pseudoParameterNames;
-    private String pseudoParameter;
+    private static final List<String> pseudoParameterNames = new ArrayList<>();
+    private final String pseudoParameter;
 
     static {
-        pseudoParameterNames = new ArrayList<>();
-        for (HeatPseudoParameters parameter : HeatPseudoParameters.values()) {
+        for (HeatPseudoParameters parameter : values()) {
             pseudoParameterNames.add(parameter.getPseudoParameter());
         }
     }
 
-    HeatPseudoParameters(String pseudoParameter) {
-        this.pseudoParameter = pseudoParameter;
-    }
-
     public static List<String> getPseudoParameterNames() {
         return pseudoParameterNames;
     }
 
-    public static void setPseudoParameterNames(List<String> pseudoParameterNames) {
-        HeatPseudoParameters.pseudoParameterNames = pseudoParameterNames;
-    }
 }