Delete VSP merge Hint - fix sonar issues

Change-Id: I7e8d3efd9db3ec714ab97d740cc71e826713b467
Issue-ID: SDC-1014
Signed-off-by: ayalaben <ayala.benzvi@amdocs.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/VspMergeDao.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/VspMergeDao.java
index c9525bfbd8..aefab60759 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/VspMergeDao.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/VspMergeDao.java
@@ -5,12 +5,14 @@ import org.openecomp.sdc.versioning.dao.types.Version;
 
 public interface VspMergeDao {
 
-  boolean isVspModelConflicted(String vspId, Version version);
+  boolean isConflicted(String vspId, Version version);
 
-  void updateVspModelId(String vspId, Version version);
+  void updateHint(String vspId, Version version);
+
+  void deleteHint(String vspId, Version version);
 
   // TODO: 11/7/2017 change to sdc Resolution
-  void updateVspModelConflictResolution(String vspId, Version version, Resolution resolution);
+  void updateConflictResolution(String vspId, Version version, Resolution resolution);
 
-  void applyVspModelConflictResolution(String vspId, Version version);
+  void applyConflictResolution(String vspId, Version version);
 }