1 files changed, 9 insertions, 14 deletions

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
index 3239608007..32d1443ef1 100644
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/components/merge/property/MergePropertyData.java
@@ -7,9 +7,9 @@
  * 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.
@@ -17,18 +17,15 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.sdc.be.components.merge.property;
 
-import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
-
 import java.util.ArrayList;
 import java.util.List;
+import org.openecomp.sdc.be.datatypes.elements.PropertyDataDefinition;
 
 /**
- * A POJO which represents an instance property data definition (a {@link org.openecomp.sdc.be.model.ComponentInstanceProperty} or {@link org.openecomp.sdc.be.model.ComponentInstanceInput})
- * that its value needs to be merged during an upgrade of a VSP.
- *
+ * A POJO which represents an instance property data definition (a {@link org.openecomp.sdc.be.model.ComponentInstanceProperty} or {@link
+ * org.openecomp.sdc.be.model.ComponentInstanceInput}) that its value needs to be merged during an upgrade of a VSP.
  */
 public class MergePropertyData {
 
@@ -36,7 +33,6 @@ public class MergePropertyData {
     private PropertyDataDefinition oldProp;
     /*The new state of the instance property to merge */
     private PropertyDataDefinition newProp;
-
     private List<String> getInputNamesToMerge = new ArrayList<>();
 
     public PropertyDataDefinition getOldProp() {
@@ -48,15 +44,15 @@ public class MergePropertyData {
         return this;
     }
 
+    public PropertyDataDefinition getNewProp() {
+        return newProp;
+    }
+
     public MergePropertyData setNewProp(PropertyDataDefinition newProp) {
         this.newProp = newProp;
         return this;
     }
 
-    public PropertyDataDefinition getNewProp() {
-        return newProp;
-    }
-
     public void addAddGetInputNamesToMerge(List<String> getInputsNameToMerge) {
         getInputNamesToMerge.addAll(getInputsNameToMerge);
     }
@@ -68,5 +64,4 @@ public class MergePropertyData {
     public boolean isGetInputProp() {
         return oldProp.isGetInputProperty();
     }
-    
 }