Add unit test for DuplicateComputeInComponentErrorBuilder and refactor ComponentDependencyModelErrorBuilder

Issue-ID: SDC-2327
Signed-off-by: Marcin Kowalski <m.kowalski3@partner.samsung.com>
Change-Id: Icb6cf51f7777a8a9d3b237ecd98579edc11f9ebb

2 files changed, 6 insertions, 6 deletions

diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/ComponentDependencyModelErrorBuilder.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/ComponentDependencyModelErrorBuilder.java
index 12b654c413..249ad1cb28 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/ComponentDependencyModelErrorBuilder.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/errors/ComponentDependencyModelErrorBuilder.java
@@ -38,11 +38,11 @@ public class ComponentDependencyModelErrorBuilder {
 
   }
 
-  public static ErrorCode getcyclicDependencyComponentErrorBuilder() {
+  public static ErrorCode getCyclicDependencyComponentErrorBuilder() {
     ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
     builder.withId(CYCLIC_DEPENDENCY_IN_COMPONENTS);
     builder.withCategory(ErrorCategory.APPLICATION);
-    builder.withMessage(String.format(CYCLIC_DEPENDENCY_COMPONENT_MSG));
+    builder.withMessage(CYCLIC_DEPENDENCY_COMPONENT_MSG);
     return builder.build();
   }
 
@@ -50,7 +50,7 @@ public class ComponentDependencyModelErrorBuilder {
     ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
     builder.withId(INVALID_COMPONENT_RELATION_TYPE);
     builder.withCategory(ErrorCategory.APPLICATION);
-    builder.withMessage(String.format(INVALID_REALTION_TYPE_MSG));
+    builder.withMessage(INVALID_REALTION_TYPE_MSG);
     return builder.build();
   }
 
@@ -58,7 +58,7 @@ public class ComponentDependencyModelErrorBuilder {
     ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
     builder.withId(NO_SOURCE_COMPONENT);
     builder.withCategory(ErrorCategory.APPLICATION);
-    builder.withMessage(String.format(NO_SOURCE_COMPONENT_MSG));
+    builder.withMessage(NO_SOURCE_COMPONENT_MSG);
     return builder.build();
   }
 
@@ -66,7 +66,7 @@ public class ComponentDependencyModelErrorBuilder {
     ErrorCode.ErrorCodeBuilder builder = new ErrorCode.ErrorCodeBuilder();
     builder.withId(SAME_SOURCE_TARGET_COMPONENT);
     builder.withCategory(ErrorCategory.APPLICATION);
-    builder.withMessage(String.format(SOURCE_TARGET_COMPONENT_EQUAL_MSG));
+    builder.withMessage(SOURCE_TARGET_COMPONENT_EQUAL_MSG);
     return builder.build();
   }
 }
diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
index 59d0793eac..5d2fd518fa 100644
--- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
+++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/VendorSoftwareProductManagerImpl.java
@@ -199,7 +199,7 @@ public class VendorSoftwareProductManagerImpl implements VendorSoftwareProductMa
 
     if (validateComponentDependencies(componentDependencies)) {
       vspErrors
-          .add(ComponentDependencyModelErrorBuilder.getcyclicDependencyComponentErrorBuilder());
+          .add(ComponentDependencyModelErrorBuilder.getCyclicDependencyComponentErrorBuilder());
     }
     validationResponse
         .setVspErrors(vspErrors);