Merge "Fix simple sonar issues in models: errors to sim-pdp"

diff --cc models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java
index c188560,5d1a8d0..d5c03a2
--- 1/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java
--- 2/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java
+++ b/models-provider/src/test/java/org/onap/policy/models/provider/impl/DatabasePolicyModelsProviderTest.java
@@@ -400,10 -407,10 +407,10 @@@ public class DatabasePolicyModelsProvid
          try (PolicyModelsProvider databaseProvider =
                  new PolicyModelsProviderFactory().createPolicyModelsProvider(parameters)) {
  
-             assertTrue(databaseProvider.getPolicyTypes("name", "1.0.0").getPolicyTypes().isEmpty());
-             assertEquals(0, databaseProvider.getPolicyTypeList("name", "1.0.0").size());
+             assertTrue(databaseProvider.getPolicyTypes(NAME, VERSION_100).getPolicyTypes().isEmpty());
+             assertTrue(databaseProvider.getPolicyTypeList(NAME, VERSION_100).isEmpty());
              assertEquals(0, databaseProvider.getFilteredPolicyTypes(ToscaPolicyTypeFilter.builder().build())
 -                    .getPolicyTypes().get(0).size());
 +                    .getPolicyTypes().size());
              assertEquals(0, databaseProvider.getFilteredPolicyTypeList(ToscaPolicyTypeFilter.builder().build()).size());
  
              assertThatThrownBy(() -> {
@@@ -414,15 -421,15 +421,15 @@@
                  databaseProvider.updatePolicyTypes(new ToscaServiceTemplate());
              }).hasMessage("no policy types specified on service template");
  
-             assertTrue(databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().isEmpty());
+             assertTrue(databaseProvider.deletePolicyType(NAME, VERSION_100).getPolicyTypes().isEmpty());
  
-             assertTrue(databaseProvider.deletePolicyType("name", "1.0.0").getPolicyTypes().isEmpty());
+             assertTrue(databaseProvider.deletePolicyType(NAME, VERSION_100).getPolicyTypes().isEmpty());
  
              assertTrue(
-                     databaseProvider.getPolicies("name", "1.0.0").getToscaTopologyTemplate().getPolicies().isEmpty());
-             assertEquals(0, databaseProvider.getPolicyList("name", "1.0.0").size());
+                     databaseProvider.getPolicies(NAME, VERSION_100).getToscaTopologyTemplate().getPolicies().isEmpty());
+             assertTrue(databaseProvider.getPolicyList(NAME, VERSION_100).isEmpty());
              assertEquals(0, databaseProvider.getFilteredPolicies(ToscaPolicyFilter.builder().build())
 -                    .getToscaTopologyTemplate().getPolicies().get(0).size());
 +                    .getToscaTopologyTemplate().getPolicies().size());
              assertEquals(0, databaseProvider.getFilteredPolicyList(ToscaPolicyFilter.builder().build()).size());
  
              assertThatThrownBy(() -> {

diff --cc models-provider/src/test/java/org/onap/policy/models/provider/impl/PolicyPersistenceTest.java
Simple merge