re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>

3 files changed, 57 insertions, 63 deletions

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/CategoryDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/CategoryDefinition.java
index 9286344af6..d943fb0a05 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/CategoryDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/CategoryDefinition.java
@@ -20,47 +20,41 @@
 
 package org.openecomp.sdc.be.model.category;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
 import org.openecomp.sdc.be.datatypes.category.CategoryDataDefinition;
 
-public class CategoryDefinition extends CategoryDataDefinition implements Serializable {
+import java.util.ArrayList;
+import java.util.List;
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 6552733796860992476L;
+public class CategoryDefinition extends CategoryDataDefinition {
 
-	List<SubCategoryDefinition> subcategories;
+    private List<SubCategoryDefinition> subcategories;
 
-	public CategoryDefinition() {
-		super();
-	}
+    public CategoryDefinition() {
+        super();
+    }
 
-	public CategoryDefinition(CategoryDataDefinition c) {
-		super(c);
-	}
+    public CategoryDefinition(CategoryDataDefinition c) {
+        super(c);
+    }
 
-	public List<SubCategoryDefinition> getSubcategories() {
-		return subcategories;
-	}
+    public List<SubCategoryDefinition> getSubcategories() {
+        return subcategories;
+    }
 
-	public void setSubcategories(List<SubCategoryDefinition> subcategories) {
-		this.subcategories = subcategories;
-	}
+    public void setSubcategories(List<SubCategoryDefinition> subcategories) {
+        this.subcategories = subcategories;
+    }
 
-	public void addSubCategory(SubCategoryDefinition subcategory) {
-		if (subcategories == null) {
-			subcategories = new ArrayList<SubCategoryDefinition>();
-		}
-		subcategories.add(subcategory);
-	}
+    public void addSubCategory(SubCategoryDefinition subcategory) {
+        if (subcategories == null) {
+            subcategories = new ArrayList<>();
+        }
+        subcategories.add(subcategory);
+    }
 
-	@Override
-	public String toString() {
-		return super.toString() + " CategoryDefinition [subcategories=" + subcategories + "]";
-	}
+    @Override
+    public String toString() {
+        return super.toString() + " CategoryDefinition [subcategories=" + subcategories + "]";
+    }
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/GroupingDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/GroupingDefinition.java
index aeee0a8972..8d839332fe 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/GroupingDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/GroupingDefinition.java
@@ -24,12 +24,12 @@ import org.openecomp.sdc.be.datatypes.category.GroupingDataDefinition;
 
 public class GroupingDefinition extends GroupingDataDefinition {
 
-	public GroupingDefinition() {
-		super();
-	}
+    public GroupingDefinition() {
+        super();
+    }
 
-	public GroupingDefinition(GroupingDataDefinition g) {
-		super(g);
-	}
+    public GroupingDefinition(GroupingDataDefinition g) {
+        super(g);
+    }
 
 }
diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/SubCategoryDefinition.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/SubCategoryDefinition.java
index 14559a1354..c9ae3ac5c5 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/SubCategoryDefinition.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/category/SubCategoryDefinition.java
@@ -20,41 +20,41 @@
 
 package org.openecomp.sdc.be.model.category;
 
+import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition;
+
 import java.util.ArrayList;
 import java.util.List;
 
-import org.openecomp.sdc.be.datatypes.category.SubCategoryDataDefinition;
-
 public class SubCategoryDefinition extends SubCategoryDataDefinition {
 
-	private List<GroupingDefinition> groupings;
+    private List<GroupingDefinition> groupings;
 
-	public SubCategoryDefinition() {
-		super();
-	}
+    public SubCategoryDefinition() {
+        super();
+    }
 
-	public SubCategoryDefinition(SubCategoryDataDefinition subCategory) {
-		super(subCategory);
-	}
+    public SubCategoryDefinition(SubCategoryDataDefinition subCategory) {
+        super(subCategory);
+    }
 
-	public List<GroupingDefinition> getGroupings() {
-		return groupings;
-	}
+    public List<GroupingDefinition> getGroupings() {
+        return groupings;
+    }
 
-	public void setGroupings(List<GroupingDefinition> groupingDefinitions) {
-		this.groupings = groupingDefinitions;
-	}
+    public void setGroupings(List<GroupingDefinition> groupingDefinitions) {
+        this.groupings = groupingDefinitions;
+    }
 
-	public void addGrouping(GroupingDefinition groupingDefinition) {
-		if (groupings == null) {
-			groupings = new ArrayList<GroupingDefinition>();
-		}
-		groupings.add(groupingDefinition);
-	}
+    public void addGrouping(GroupingDefinition groupingDefinition) {
+        if (groupings == null) {
+            groupings = new ArrayList<>();
+        }
+        groupings.add(groupingDefinition);
+    }
 
-	@Override
-	public String toString() {
-		return super.toString() + " SubCategoryDefinition [groupings=" + groupings + "]";
-	}
+    @Override
+    public String toString() {
+        return super.toString() + " SubCategoryDefinition [groupings=" + groupings + "]";
+    }
 
 }