X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-model%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Fbe%2Fmodel%2FUploadServiceInfo.java;h=f19463ea775fbd8b012231708891ba279e651dd9;hb=216ea4998de9ae4ee603d7f8f5f6725b218ca710;hp=26cee8447c21257ab6b544ee86e0b4802cdc7184;hpb=fbc285a47209b763ef3bf7b64e7e0c6e3e1a5202;p=sdc.git

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java
index 26cee8447c..f19463ea77 100644
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/UploadServiceInfo.java
@@ -21,7 +21,9 @@ package org.openecomp.sdc.be.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import org.openecomp.sdc.be.model.category.CategoryDefinition;
 import org.openecomp.sdc.be.model.category.SubCategoryDefinition;
@@ -29,6 +31,7 @@ import org.openecomp.sdc.common.api.UploadArtifactInfo;
 
 @Getter
 @Setter
+@NoArgsConstructor
 public class UploadServiceInfo {
 
     private String payloadData;
@@ -47,59 +50,24 @@ public class UploadServiceInfo {
     private String serviceEcompNaming;
     private String ecompGeneratedNaming;
     private String namingPolicy;
+    private String serviceFunction;
+    private String environmentContext;
+    private String instantiationType;
     private String projectCode;
     private List<UploadArtifactInfo> artifactList;
-    private String contactId, name, serviceIconPath, icon, vendorName, vendorRelease, serviceVendorModelNumber;
+    private String contactId;
+    private String name;
+    private String serviceIconPath;
+    private String icon;
+    private String vendorName;
+    private String tenant;
+    private String vendorRelease;
+    private String serviceVendorModelNumber;
     private String serviceType = "";
     private String model;
-
-    public UploadServiceInfo(String payloadData, String payloadName, String description, List<String> tags, String invariantUUID, String UUID,
-                             String type, String category, String subcategory, String resourceVendor, String resourceVendorRelease,
-                             String serviceRole, String serviceEcompNaming, String ecompGeneratedNaming, String namingPolicy,
-                             List<UploadArtifactInfo> artifactList, String contactId, String name, String resourceIconPath, String icon,
-                             String vendorName, String vendorRelease, String serviceVendorModelNumber, String serviceType, String projectCode, String model) {
-        this.payloadData = payloadData;
-        this.payloadName = payloadName;
-        this.description = description;
-        this.tags = tags;
-        this.invariantUUID = invariantUUID;
-        this.UUID = UUID;
-        this.type = type;
-        this.category = category;
-        this.subcategory = subcategory;
-        this.resourceVendor = resourceVendor;
-        this.resourceVendorRelease = resourceVendorRelease;
-        this.serviceRole = serviceRole;
-        this.serviceEcompNaming = serviceEcompNaming;
-        this.ecompGeneratedNaming = ecompGeneratedNaming;
-        this.namingPolicy = namingPolicy;
-        this.artifactList = artifactList;
-        this.contactId = contactId;
-        this.name = name;
-        this.serviceIconPath = serviceIconPath;
-        this.icon = icon;
-        this.vendorName = vendorName;
-        this.vendorRelease = vendorRelease;
-        this.serviceVendorModelNumber = serviceVendorModelNumber;
-        this.serviceType = serviceType;
-        this.projectCode = projectCode;
-        this.model = model;
-        if (category != null) {
-            String[] arr = category.split("/");
-            if (arr.length >= 2) {
-                categories = new ArrayList<>();
-                CategoryDefinition catDef = new CategoryDefinition();
-                catDef.setName(arr[0]);
-                SubCategoryDefinition subCat = new SubCategoryDefinition();
-                subCat.setName(arr[1]);
-                catDef.addSubCategory(subCat);
-                categories.add(catDef);
-            }
-        }
-    }
-
-    public UploadServiceInfo() {
-    }
+    private Map<String, String> categorySpecificMetadata;
+    private String derivedFromGenericType;
+    private String derivedFromGenericVersion;
 
     public void addSubCategory(String category, String subCategory) {
         if (category != null || subCategory != null) {