Merge "Reorder modifiers"

[so.git] / mso-catalog-db / src / main / java / org / openecomp / mso / db / catalog / beans / VnfRecipe.java

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
index 49865e8..d94334c 100644 (file)
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfRecipe.java
@@ -26,9 +26,8 @@ public class VnfRecipe extends Recipe implements Serializable {
        
        private static final long serialVersionUID = 768026109321305392L;
 
-       private String vnfType;
-       private String vnfParamXSD;
-       private String vfModuleId; 
+       private String vnfType = null;
+       private String vfModuleId = null; 
 
        public VnfRecipe() {}
 
@@ -38,13 +37,6 @@ public class VnfRecipe extends Recipe implements Serializable {
        public void setVnfType(String vnfType) {
                this.vnfType = vnfType;
        }
-
-       public String getVnfParamXSD() {
-               return vnfParamXSD;
-       }
-       public void setVnfParamXSD(String vnfParamXSD) {
-               this.vnfParamXSD = vnfParamXSD;
-       }
        
        public String getVfModuleId() {
                return vfModuleId;
@@ -56,11 +48,7 @@ public class VnfRecipe extends Recipe implements Serializable {
        
        @Override
        public String toString () {
-               StringBuilder sb = new StringBuilder();
-               sb.append(super.toString());
-               sb.append(",vnfParamXSD=").append(vnfParamXSD);
-               sb.append(",serviceType=").append(getServiceType());
-               sb.append(",vfModuleId=").append(getVfModuleId());
-               return sb.toString();
+               return super.toString() + ",vnfParamXSD=" + getParamXSD() + ",serviceType=" + getServiceType() + ",vfModuleId=" +
+                       getVfModuleId();
        }
 }