Fix sonar issues

Issue-ID: SDC-2541
Signed-off-by: talig <talig@amdocs.com>
Change-Id: Iae720fabd7e38f3b6292696221fd7de435247ba3

8 files changed, 9 insertions, 21 deletions

diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/ItemConvertor.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/ItemConvertor.java
index f8550bb..fc4ffaa 100644
--- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/ItemConvertor.java
+++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/ItemConvertor.java
@@ -22,12 +22,8 @@ public interface ItemConvertor<T> {
 
     String getItemType();
 
-    //Item toItem(T model);
-
     void toItem(T source, Item target);
 
-   // void fromItem(Item source, T target);
-
     T fromItem(Item item);
 
 }
diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/VersionConvertor.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/VersionConvertor.java
index 458a1a1..b59c8ff 100644
--- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/VersionConvertor.java
+++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/convertors/VersionConvertor.java
@@ -22,11 +22,7 @@ public interface VersionConvertor<T> {
 
     String getItemType();
 
-    //Version toVersion(T model);
-
     void toVersion(T source, Version target);
 
-    //void fromVersion(Version source, T target);
-
     T fromVersion(Version version);
 }
diff --git a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java
index c7b6f6a..f045a44 100644
--- a/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java
+++ b/versioning-lib/src/main/java/org/onap/sdc/common/versioning/services/impl/VersioningManagerImpl.java
@@ -40,8 +40,6 @@ import org.springframework.stereotype.Service;
 @Service
 public class VersioningManagerImpl implements VersioningManager {
 
-    //private static final Logger LOGGER = LoggerFactory.getLogger(VersioningManagerImpl.class);
-
     private final ItemDao itemDao;
     private final VersionDao versionDao;
     private final VersionCalculator versionCalculator;
@@ -158,7 +156,6 @@ public class VersioningManagerImpl implements VersioningManager {
         if (version.getStatus() == Certified
                     && version.getState().getSynchronizationState() == SynchronizationState.OutOfSync) {
             forceSync(itemId, version.getId());
-            //LOGGER.info("Item Id {}, version Id {}: Force sync is done", itemId, version.getId());
             version = versionDao.get(itemId, version.getId()).orElseThrow(() -> new IllegalStateException(
                     "Get version after a successful force sync must return the version"));
         }
@@ -167,7 +164,6 @@ public class VersioningManagerImpl implements VersioningManager {
 
     private InternalVersion getSyncedVersion(String itemId, String versionId) {
         sync(itemId, versionId);
-        //LOGGER.info("Item Id {}, version Id {}: First time sync is done", itemId, version.getId());
         return versionDao.get(itemId, versionId).orElseThrow(
                 () -> new IllegalStateException("Get version after a successful sync must return the version"));
     }
diff --git a/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/ItemZusammenDaoTest.java b/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/ItemZusammenDaoTest.java
index 6c785d3..9c1a002 100644
--- a/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/ItemZusammenDaoTest.java
+++ b/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/ItemZusammenDaoTest.java
@@ -103,7 +103,7 @@ public class ItemZusammenDaoTest {
         doReturn(returnedItems).when(zusammenAdaptorMock).listItems(eq(SESSION_CONTEXT));
 
         Collection<InternalItem> items = itemDao.list();
-        assertEquals(items.size(), 3);
+        assertEquals(3, items.size());
 
         Iterator<InternalItem> itemIterator = items.iterator();
         assertItemEquals(itemIterator.next(), returnedItems.get(0));
@@ -135,7 +135,7 @@ public class ItemZusammenDaoTest {
 
         Assert.assertNotNull(item);
         assertItemEquals(item, toBeReturned);
-        assertEquals(item.getStatus(), ItemStatus.ACTIVE);
+        assertEquals(ItemStatus.ACTIVE, item.getStatus());
 
     }
 
diff --git a/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/VersionZusammenDaoTest.java b/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/VersionZusammenDaoTest.java
index bb96472..41b7f6f 100644
--- a/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/VersionZusammenDaoTest.java
+++ b/versioning-lib/src/test/java/org/onap/sdc/common/versioning/persistence/zusammen/VersionZusammenDaoTest.java
@@ -103,7 +103,7 @@ public class VersionZusammenDaoTest {
                 .listPublicVersions(eq(SESSION_CONTEXT), eq(new Id(itemId)));
 
         List<InternalVersion> versions = versionDao.list(itemId);
-        Assert.assertEquals(versions.size(), 3);
+        Assert.assertEquals(3, versions.size());
 
         int zusammenVersionIndex;
         for (InternalVersion version : versions) {
@@ -347,7 +347,7 @@ public class VersionZusammenDaoTest {
 
         List<Revision> revisions = versionDao.listRevisions(itemId, versionId);
 
-        Assert.assertEquals(revisions.size(), 4);
+        Assert.assertEquals(4, revisions.size());
         assertRevisionEquals(revisions.get(0), zusammenRevisions.get(0)); // rev4 - latest
         assertRevisionEquals(revisions.get(1), zusammenRevisions.get(2)); // rev3
         assertRevisionEquals(revisions.get(2), zusammenRevisions.get(3)); // rev2
diff --git a/versioning-lib/src/test/java/org/onap/sdc/common/versioning/services/impl/MajorVersionCalculatorImplTest.java b/versioning-lib/src/test/java/org/onap/sdc/common/versioning/services/impl/MajorVersionCalculatorImplTest.java
index 8982496..fc113d0 100644
--- a/versioning-lib/src/test/java/org/onap/sdc/common/versioning/services/impl/MajorVersionCalculatorImplTest.java
+++ b/versioning-lib/src/test/java/org/onap/sdc/common/versioning/services/impl/MajorVersionCalculatorImplTest.java
@@ -35,7 +35,7 @@ public class MajorVersionCalculatorImplTest {
     @Test
     public void calculateInitialVersionWithNullAndMajor() {
         String expectedInitialVersion = calculator.calculate(null, VersionCreationMethod.major);
-        assertEquals(expectedInitialVersion, INITIAL_VERSION);
+        assertEquals(INITIAL_VERSION, expectedInitialVersion);
     }
 
     @Test
diff --git a/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/persistence/impl/ZusammenConnectorImpl.java b/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/persistence/impl/ZusammenConnectorImpl.java
index 55446bb..67eba3c 100644
--- a/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/persistence/impl/ZusammenConnectorImpl.java
+++ b/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/persistence/impl/ZusammenConnectorImpl.java
@@ -48,10 +48,6 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class ZusammenConnectorImpl implements ZusammenConnector {
 
-    private static final String GET_ELEMENT_ERR_MSG =
-            "Failed to get element. Item Id: %s, version Id: %s, element Id: %s message: %s";
-    private static final String GET_ELEMENT_IN_REV_ERR_MSG =
-            "Failed to get element. Item Id: %s, version Id: %s, revision Id: %s, element Id: %s message: %s";
     private final ItemAdaptorFactory itemAdaptorFactory;
     private final ItemVersionAdaptorFactory versionAdaptorFactory;
     private final ElementAdaptorFactory elementAdaptorFactory;
diff --git a/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/services/ZusammenElementUtil.java b/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/services/ZusammenElementUtil.java
index b31a0f6..b5e948a 100644
--- a/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/services/ZusammenElementUtil.java
+++ b/zusammen-lib/src/main/java/org/onap/sdc/common/zusammen/services/ZusammenElementUtil.java
@@ -25,6 +25,10 @@ public class ZusammenElementUtil {
 
     public static final String ELEMENT_TYPE_PROPERTY = "elementType";
 
+    private ZusammenElementUtil() {
+        throw new IllegalStateException("Utility class");
+    }
+
     public static ZusammenElement buildStructuralElement(String elementType, Action action) {
         ZusammenElement element = buildElement(null, action);
         Info info = new Info();