1 files changed, 61 insertions, 47 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java
index 2aeb0c95bc..a77cc21077 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/datatypes/heattotosca/unifiedmodel/consolidation/TypeComputeConsolidationData.java
@@ -1,58 +1,72 @@
+/*
+ * Copyright © 2016-2018 European Support Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * The type Type compute consolidation data.
- */
 public class TypeComputeConsolidationData {
 
-  //key - compute node template id
-  private Map<String, ComputeTemplateConsolidationData> computeTemplateConsolidationData;
-
-  /**
-   * Instantiates a new Type compute consolidation data.
-   */
-  public TypeComputeConsolidationData() {
-    computeTemplateConsolidationData = new HashMap<>();
-  }
-
-  /**
-   * Gets all compute node template ids.
-   *
-   * @return the all compute node template ids
-   */
-  public Collection<String> getAllComputeNodeTemplateIds() {
-    return computeTemplateConsolidationData.keySet();
-  }
-
-  public Collection<ComputeTemplateConsolidationData> getAllComputeTemplateConsolidationData(){
-    return computeTemplateConsolidationData.values();
-  }
-
-  /**
-   * Gets compute template consolidation data.
-   *
-   * @param computeNodeTemplateId the compute node template id
-   * @return the compute template consolidation data
-   */
-  public ComputeTemplateConsolidationData getComputeTemplateConsolidationData(
-      String computeNodeTemplateId) {
-    return computeTemplateConsolidationData.get(computeNodeTemplateId);
-  }
-
-  /**
-   * Sets compute template consolidation data.
-   *
-   * @param computeNodeTemplateId            the compute node template id
-   * @param computeTemplateConsolidationData the compute template consolidation data
-   */
-  public void setComputeTemplateConsolidationData(String computeNodeTemplateId,
+    //key - compute node template id
+    private final Map<String, ComputeTemplateConsolidationData> computeTemplateConsolidationData;
+
+    public TypeComputeConsolidationData() {
+        computeTemplateConsolidationData = new HashMap<>();
+    }
+
+    public Collection<String> getAllComputeNodeTemplateIds() {
+        return computeTemplateConsolidationData.keySet();
+    }
+
+    public Collection<ComputeTemplateConsolidationData> getAllComputeTemplateConsolidationData() {
+        return computeTemplateConsolidationData.values();
+    }
+
+    /**
+    * Gets compute template consolidation data.
+    *
+    * @param computeNodeTemplateId the compute node template id
+    * @return the compute template consolidation data
+    */
+    public ComputeTemplateConsolidationData getComputeTemplateConsolidationData(
+            String computeNodeTemplateId) {
+        return computeTemplateConsolidationData.get(computeNodeTemplateId);
+    }
+
+    public void setComputeTemplateConsolidationData(String computeNodeTemplateId,
                                                   ComputeTemplateConsolidationData
                                                       computeTemplateConsolidationData) {
-    this.computeTemplateConsolidationData.put(computeNodeTemplateId,
-        computeTemplateConsolidationData);
-  }
+        this.computeTemplateConsolidationData.put(computeNodeTemplateId, computeTemplateConsolidationData);
+    }
+
+    /**
+    * create new compute template consolidation data if it doesn't exist yet.
+    *
+    * @return compute template consolidation data entity by given keys
+    */
+    ComputeTemplateConsolidationData addComputeTemplateConsolidationData(String computeNodeTemplateId) {
+        ComputeTemplateConsolidationData consolidationData = getComputeTemplateConsolidationData(computeNodeTemplateId);
+        if (consolidationData == null) {
+            consolidationData = new ComputeTemplateConsolidationData();
+            consolidationData.setNodeTemplateId(computeNodeTemplateId);
+            setComputeTemplateConsolidationData(computeNodeTemplateId, consolidationData);
+        }
+        return consolidationData;
+    }
+
 }