1 files changed, 39 insertions, 17 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java
index f0a9f8f31c..08fb7116bb 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/DeploymentFlavorErrorBuilder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright © 2016-2017 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.vendorsoftwareproduct.errors;
 
 
@@ -6,14 +22,14 @@ import org.openecomp.sdc.common.errors.ErrorCode;
 import org.openecomp.sdc.versioning.dao.types.Version;
 
 public class DeploymentFlavorErrorBuilder {
-    private static final String CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING_MSG=
+    private static final String CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING_MSG =
             "Deployment Flavor cannot be added for VSPs onboarded with HEAT.";
-    private static final String FEATURE_GROUP_NOT_EXIST_FOR_VSP_MSG=
-            "Invalid request,Feature Group with Id %s does not exist for Vsp with Id %s and version " +
-                    "%s.";
+    private static final String FEATURE_GROUP_NOT_EXIST_FOR_VSP_MSG =
+            "Invalid request,Feature Group with Id %s does not exist for Vsp with Id %s and version "
+                    + "%s.";
     private static final String INVALID_COMPONENT_COMPUTE_ASSOCIATION_MSG
-            ="Invalid request,for valid association please provide ComponentId for Compute Flavor";
-    private static final String SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED_MSG=
+            = "Invalid request,for valid association please provide ComponentId for Compute Flavor";
+    private static final String SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED_MSG =
             "Invalid Request,Same Vfc cannot be associated more than once.";
     private static final String DUPLICATE_DEPLOYMENT_FLAVOR_MODEL_NOT_ALLOWED_MSG =
             "Invalid request, Deployment Flavor with model %s already exists for Vsp with Id %s.";
@@ -29,48 +45,54 @@ public class DeploymentFlavorErrorBuilder {
             "submitted with an invalid Deployment Flavor. All Deployment Flavor should have " +
             "FeatureGroup. Please fix the Deployment Flavor %s and re-submit the VSP.";
 
+    private DeploymentFlavorErrorBuilder(){
+
+    }
+
     public static ErrorCode getAddDeploymentNotSupportedHeatOnboardErrorBuilder(){
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING);
         builder.withCategory(ErrorCategory.APPLICATION);
-        builder.withMessage(String.format(CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING_MSG));
+        builder.withMessage(CREATE_DEPLOYMENT_FLAVOR_NOT_ALLOWED_IN_HEAT_ONBOARDING_MSG);
         return builder.build();
     }
 
     public static ErrorCode getFeatureGroupNotexistErrorBuilder( String featureGroupId, String
-            VspId, Version activeVersion){
+            vspId, Version activeVersion){
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.FEATURE_GROUP_NOT_EXIST_FOR_VSP);
         builder.withCategory(ErrorCategory.APPLICATION);
         builder.withMessage(String.format(FEATURE_GROUP_NOT_EXIST_FOR_VSP_MSG,featureGroupId,
-                VspId,activeVersion.toString()));
+                vspId,activeVersion.toString()));
         return builder.build();
     }
 
     public static ErrorCode getDuplicateVfcAssociationErrorBuilder(){
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
-        builder.withId(VendorSoftwareProductErrorCodes.SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED);
+        builder.withId(VendorSoftwareProductErrorCodes
+                .SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED);
         builder.withCategory(ErrorCategory.APPLICATION);
-        builder.withMessage(String.format(SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED_MSG));
+        builder.withMessage(SAME_VFC_ASSOCIATION_MORE_THAN_ONCE_NOT_ALLOWED_MSG);
         return builder.build();
     }
 
-    public static ErrorCode getInvalidAssociationErrorBuilder(){
+    public static ErrorCode getInvalidAssociationErrorBuilder() {
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.INVALID_COMPONENT_COMPUTE_ASSOCIATION);
         builder.withCategory(ErrorCategory.APPLICATION);
-        builder.withMessage(String.format(INVALID_COMPONENT_COMPUTE_ASSOCIATION_MSG));
+        builder.withMessage(INVALID_COMPONENT_COMPUTE_ASSOCIATION_MSG);
         return builder.build();
     }
 
-    public static ErrorCode getDuplicateDeploymentFlavorModelErrorBuilder(String name, String vspId){
+    public static ErrorCode getDuplicateDeploymentFlavorModelErrorBuilder(String name,
+                                                                          String vspId) {
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.DUPLICATE_DEPLOYMENT_FLAVOR_MODEL_NOT_ALLOWED);
         builder.withCategory(ErrorCategory.APPLICATION);
         builder.withMessage(String.format(DUPLICATE_DEPLOYMENT_FLAVOR_MODEL_NOT_ALLOWED_MSG,name,vspId));
         return builder.build();
     }
-    public static ErrorCode getInvalidComputeIdErrorBuilder( String computeFlavorId, String
+    public static ErrorCode getInvalidComputeIdErrorBuilder(String computeFlavorId, String
             vfcId){
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.INVALID_COMPUTE_FLAVOR_ID);
@@ -80,7 +102,7 @@ public class DeploymentFlavorErrorBuilder {
         return builder.build();
     }
 
-    public static ErrorCode getInvalidComponentComputeAssociationErrorBuilder(String model){
+    public static ErrorCode getInvalidComponentComputeAssociationErrorBuilder(String model) {
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.INVALID_COMPONENT_COMPUTE_ASSOCIATION);
         builder.withCategory(ErrorCategory.APPLICATION);
@@ -88,7 +110,7 @@ public class DeploymentFlavorErrorBuilder {
         return builder.build();
     }
 
-    public static ErrorCode getFeatureGroupMandatoryErrorBuilder(String model){
+    public static ErrorCode getFeatureGroupMandatoryErrorBuilder(String model) {
         ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
         builder.withId(VendorSoftwareProductErrorCodes.FEATUREGROUP_REQUIRED_IN_DEPLOYMENT_FLAVOR);
         builder.withCategory(ErrorCategory.APPLICATION);