/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2025 Nordix Foundation.
* Modifications Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2023 Bell Canada. All rights reserved.
* ================================================================================
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.util.Properties;
import org.junit.jupiter.api.AfterEach;
Properties jdbcProperties = new Properties();
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
-
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:PdpProviderTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:PdpProviderTest");
daoParameters.setJdbcProperties(jdbcProperties);
@Test
void testGroupsGet() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().getPdpGroups(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().getPdpGroups(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().getPdpGroups(null, "name");
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().getPdpGroups(null, "name"))
+ .hasMessageMatching(DAO_IS_NULL);
String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
@Test
void testFilteredPdpGroupGet() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().getFilteredPdpGroups(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().getFilteredPdpGroups(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().getFilteredPdpGroups(null, PdpGroupFilter.builder().build());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().getFilteredPdpGroups(null, PdpGroupFilter.builder().build()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().getFilteredPdpGroups(pfDao, null);
- }).hasMessageMatching("filter is marked .*ull but is null");
+ assertThatThrownBy(() -> new PdpProvider().getFilteredPdpGroups(pfDao, null))
+ .hasMessageMatching("filter is marked .*ull but is null");
String originalJson = ResourceUtils.getResourceAsString("testdata/PdpGroupsForFiltering.json");
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
@Test
void testGroupsCreate() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().createPdpGroups(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().createPdpGroups(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().createPdpGroups(null, new ArrayList<>());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().createPdpGroups(null, new ArrayList<>()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().createPdpGroups(pfDao, null);
- }).hasMessageMatching("pdpGroups is marked .*ull but is null");
+ assertThatThrownBy(() -> new PdpProvider().createPdpGroups(pfDao, null))
+ .hasMessageMatching("pdpGroups is marked .*ull but is null");
String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
assertEquals(originalJson.replaceAll("\\s+", ""), gotJson.replaceAll("\\s+", ""));
pdpGroups0.getGroups().get(0).setPdpGroupState(null);
- assertThatThrownBy(() -> {
- new PdpProvider().createPdpGroups(pfDao, pdpGroups0.getGroups());
- }).hasMessageContaining("PDP group").hasMessageContaining("pdpGroupState")
+ assertThatThrownBy(() -> new PdpProvider().createPdpGroups(pfDao, pdpGroups0.getGroups()))
+ .hasMessageContaining("PDP group").hasMessageContaining("pdpGroupState")
.hasMessageContaining(Validated.IS_NULL);
}
@Test
void testGroupsUpdate() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpGroups(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpGroups(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpGroups(null, new ArrayList<>());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpGroups(null, new ArrayList<>()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpGroups(pfDao, null);
- }).hasMessageMatching("pdpGroups is marked .*ull but is null");
+ assertThatThrownBy(() -> new PdpProvider().updatePdpGroups(pfDao, null))
+ .hasMessageMatching("pdpGroups is marked .*ull but is null");
String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
assertTrue(beforePdpInstances.containsAll(afterPdpInstances));
pdpGroups0.getGroups().get(0).setPdpGroupState(null);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpGroups(pfDao, pdpGroups0.getGroups());
- }).hasMessageContaining("PDP group").hasMessageContaining("pdpGroupState")
+ assertThatThrownBy(() -> new PdpProvider().updatePdpGroups(pfDao, pdpGroups0.getGroups()))
+ .hasMessageContaining("PDP group").hasMessageContaining("pdpGroupState")
.hasMessageContaining(Validated.IS_NULL);
}
@Test
void testPoliciesDelete() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().deletePdpGroup(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().deletePdpGroup(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().deletePdpGroup(null, "name");
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().deletePdpGroup(null, "name"))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().deletePdpGroup(pfDao, null);
- }).hasMessageMatching("name is marked .*ull but is null");
+ assertThatThrownBy(() -> new PdpProvider().deletePdpGroup(pfDao, null))
+ .hasMessageMatching("name is marked .*ull but is null");
- assertThatThrownBy(() -> {
- new PdpProvider().deletePdpGroup(pfDao, "name");
- }).hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist");
+ assertThatThrownBy(() -> new PdpProvider().deletePdpGroup(pfDao, "name"))
+ .hasMessage("delete of PDP group \"name:0.0.0\" failed, PDP group does not exist");
String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
assertEquals(0, new PdpProvider().getPdpGroups(pfDao, PDP_GROUP0).size());
- assertThatThrownBy(() -> {
- new PdpProvider().deletePdpGroup(pfDao, PDP_GROUP0);
- }).hasMessage("delete of PDP group \"PdpGroup0:0.0.0\" failed, PDP group does not exist");
+ assertThatThrownBy(() -> new PdpProvider().deletePdpGroup(pfDao, PDP_GROUP0))
+ .hasMessage("delete of PDP group \"PdpGroup0:0.0.0\" failed, PDP group does not exist");
}
@Test
void testPdpSubgroupUpdate() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(null, null, new PdpSubGroup());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(null, null, new PdpSubGroup()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(null, "name", null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(null, "name", null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(null, "name", new PdpSubGroup());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(null, "name", new PdpSubGroup()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(pfDao, null, null);
- }).hasMessageMatching(GROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(pfDao, null, null))
+ .hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(pfDao, null, new PdpSubGroup());
- }).hasMessageMatching(GROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(pfDao, null, new PdpSubGroup()))
+ .hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(pfDao, "name", null);
- }).hasMessageMatching(SUBGROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(pfDao, "name", null))
+ .hasMessageMatching(SUBGROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(pfDao, "name", new PdpSubGroup());
- }).hasMessage("parameter \"localName\" is null");
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(pfDao, "name", new PdpSubGroup()))
+ .hasMessage("parameter \"localName\" is null");
String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
assertEquals(10, afterUpdatePdpGroups.get(0).getPdpSubgroups().get(0).getDesiredInstanceCount());
existingSubGroup.setDesiredInstanceCount(-1);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdpSubGroup(pfDao, PDP_GROUP0, existingSubGroup);
- }).hasMessageContaining("PDP sub group").hasMessageContaining("desiredInstanceCount")
+ assertThatThrownBy(() -> new PdpProvider().updatePdpSubGroup(pfDao, PDP_GROUP0, existingSubGroup))
+ .hasMessageContaining("PDP sub group").hasMessageContaining("desiredInstanceCount")
.hasMessageContaining("below the minimum value");
existingSubGroup.setDesiredInstanceCount(10);
}
@Test
void testPdpUpdate() throws Exception {
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, null, null, new Pdp());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, null, null, new Pdp()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, null, "TYPE", null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, null, "TYPE", null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, null, "TYPE", new Pdp());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, null, "TYPE", new Pdp()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, "name", null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, "name", null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, "name", null, new Pdp());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, "name", null, new Pdp()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, "name", "TYPE", null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, "name", "TYPE", null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(null, "name", "TYPE", new Pdp());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(null, "name", "TYPE", new Pdp()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, null, null, null);
- }).hasMessageMatching(GROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, null, null, null))
+ .hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, null, null, new Pdp());
- }).hasMessageMatching(GROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, null, null, new Pdp()))
+ .hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, null, "TYPE", null);
- }).hasMessageMatching(GROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, null, "TYPE", null))
+ .hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, null, "TYPE", new Pdp());
- }).hasMessageMatching(GROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, null, "TYPE", new Pdp()))
+ .hasMessageMatching(GROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, "name", null, null);
- }).hasMessageMatching(SUBGROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, "name", null, null))
+ .hasMessageMatching(SUBGROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, "name", null, new Pdp());
- }).hasMessageMatching(SUBGROUP_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, "name", null, new Pdp()))
+ .hasMessageMatching(SUBGROUP_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, "name", "TYPE", null);
- }).hasMessageMatching("pdp is marked .*ull but is null");
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, "name", "TYPE", null))
+ .hasMessageMatching("pdp is marked .*ull but is null");
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, "name", "TYPE", new Pdp());
- }).hasMessage("parameter \"localName\" is null");
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, "name", "TYPE", new Pdp()))
+ .hasMessage("parameter \"localName\" is null");
String originalJson = ResourceUtils.getResourceAsString(PDP_GROUPS0_JSON);
PdpGroups pdpGroups0 = standardCoder.decode(originalJson, PdpGroups.class);
afterUpdatePdpGroups.get(0).getPdpSubgroups().get(0).getPdpInstances().get(0).getHealthy());
existingPdp.setMessage("");
- assertThatThrownBy(() -> {
- new PdpProvider().updatePdp(pfDao, PDP_GROUP0, "APEX", existingPdp);
- }).hasMessageContaining("PDP").hasMessageContaining("message").hasMessageContaining(Validated.IS_BLANK);
+ assertThatThrownBy(() -> new PdpProvider().updatePdp(pfDao, PDP_GROUP0, "APEX", existingPdp))
+ .hasMessageContaining("PDP").hasMessageContaining("message").hasMessageContaining(Validated.IS_BLANK);
existingPdp.setMessage("A Message");
}
@Test
void testGetAllPolicyStatusPfDao() {
- assertThatThrownBy(() -> {
- new PdpProvider().getAllPolicyStatus(null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().getAllPolicyStatus(null))
+ .hasMessageMatching(DAO_IS_NULL);
assertThat(new PdpProvider().getAllPolicyStatus(pfDao)).isEmpty();
@Test
void testGetAllPolicyStatusPfDaoToscaConceptIdentifierOptVersion() {
- assertThatThrownBy(() -> {
- new PdpProvider().getAllPolicyStatus(null, new ToscaConceptIdentifierOptVersion("somePdp", null));
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider()
+ .getAllPolicyStatus(null, new ToscaConceptIdentifierOptVersion("somePdp", null)))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().getAllPolicyStatus(pfDao, null);
- }).hasMessageContaining("policy").hasMessageContaining("null");
+ assertThatThrownBy(() -> new PdpProvider().getAllPolicyStatus(pfDao, null))
+ .hasMessageContaining("policy").hasMessageContaining("null");
assertThat(new PdpProvider().getAllPolicyStatus(pfDao, new ToscaConceptIdentifierOptVersion("somePdp", null)))
.isEmpty();
@Test
void testGetGroupPolicyStatus() {
- assertThatThrownBy(() -> {
- new PdpProvider().getGroupPolicyStatus(null, "someGroup");
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new PdpProvider().getGroupPolicyStatus(null, "someGroup"))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new PdpProvider().getGroupPolicyStatus(pfDao, null);
- }).hasMessageContaining("group").hasMessageContaining("null");
+ assertThatThrownBy(() -> new PdpProvider().getGroupPolicyStatus(pfDao, null))
+ .hasMessageContaining("group").hasMessageContaining("null");
assertThat(new PdpProvider().getGroupPolicyStatus(pfDao, PDP_GROUP0)).isEmpty();
List<PdpPolicyStatus> records = prov.getGroupPolicyStatus(pfDao, GROUP_A);
assertThat(records).hasSize(2);
- records.sort((rec1, rec2) -> rec1.getPdpId().compareTo(rec2.getPdpId()));
+ records.sort(Comparator.comparing(PdpPolicyStatus::getPdpId));
assertThat(records.get(0)).isEqualTo(idx);
assertThat(records.get(1)).isEqualTo(idy);
List<PdpPolicyStatus> records = prov.getGroupPolicyStatus(pfDao, GROUP_A);
assertThat(records).hasSize(4);
- Collections.sort(records, (rec1, rec2) -> rec1.getPdpId().compareTo(rec2.getPdpId()));
+ records.sort(Comparator.comparing(PdpPolicyStatus::getPdpId));
assertThat(records.get(0)).isEqualTo(idw);
assertThat(records.get(1)).isEqualTo(idx);
assertThat(records.get(2)).isEqualTo(idy);
List<PdpPolicyStatus> records = prov.getGroupPolicyStatus(pfDao, GROUP_A);
assertThat(records).hasSize(2);
- Collections.sort(records, (rec1, rec2) -> rec1.getPdpId().compareTo(rec2.getPdpId()));
+ records.sort(Comparator.comparing(PdpPolicyStatus::getPdpId));
assertThat(records.get(0)).isEqualTo(idx);
assertThat(records.get(1)).isEqualTo(idz);
}
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2025 Nordix Foundation.
* Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
class PolicyToscaPersistenceTest {
private static final Logger LOGGER = LoggerFactory.getLogger(PolicyToscaPersistenceTest.class);
- private static YamlJsonTranslator yamlJsonTranslator = new YamlJsonTranslator();
- private StandardCoder standardCoder = new StandardCoder();
+ private static final YamlJsonTranslator yamlJsonTranslator = new YamlJsonTranslator();
+ private final StandardCoder standardCoder = new StandardCoder();
private static PolicyModelsProvider databaseProvider;
*/
@BeforeAll
public static void setupParameters() throws Exception {
- // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB
PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters();
- if (System.getProperty("USE-MARIADB") != null) {
- parameters.setDatabaseDriver("org.mariadb.jdbc.Driver");
- parameters.setDatabaseUrl("jdbc:mariadb://localhost:3306/policy");
- } else {
- parameters.setDatabaseDriver("org.h2.Driver");
- parameters.setDatabaseUrl("jdbc:h2:mem:PolicyToscaPersistenceTest");
- }
+ parameters.setDatabaseDriver("org.h2.Driver");
+ parameters.setDatabaseUrl("jdbc:h2:mem:PolicyToscaPersistenceTest");
parameters.setDatabaseUser("policy");
parameters.setDatabasePassword("P01icY");
CountDownLatch threadCountDownLatch = new CountDownLatch(10);
for (int i = 0; i < 10; i++) {
- new Thread() {
- @Override
- public void run() {
- assertThatCode(() -> databaseProvider.createPolicies(serviceTemplate)).doesNotThrowAnyException();
- assertThatCode(() -> databaseProvider.updatePolicies(serviceTemplate)).doesNotThrowAnyException();
- threadCountDownLatch.countDown();
- }
- }.start();
+ new Thread(() -> {
+ assertThatCode(() -> databaseProvider.createPolicies(serviceTemplate)).doesNotThrowAnyException();
+ assertThatCode(() -> databaseProvider.updatePolicies(serviceTemplate)).doesNotThrowAnyException();
+ threadCountDownLatch.countDown();
+ }).start();
}
threadCountDownLatch.await(10, TimeUnit.SECONDS);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2025 Nordix Foundation.
* Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* @author Liam Fallon (liam.fallon@est.tech)
*/
class PolicyTypePersistenceTest {
- private YamlJsonTranslator yamlTranslator = new YamlJsonTranslator();
+ private final YamlJsonTranslator yamlTranslator = new YamlJsonTranslator();
private static PolicyModelsProvider databaseProvider;
/**
*/
@BeforeAll
public static void setupParameters() throws PfModelException {
- // H2, use "org.mariadb.jdbc.Driver" and "jdbc:mariadb://localhost:3306/policy" for locally installed MariaDB
PolicyModelsProviderParameters parameters = new PolicyModelsProviderParameters();
- if (System.getProperty("USE-MARIADB") != null) {
- parameters.setDatabaseDriver("org.mariadb.jdbc.Driver");
- parameters.setDatabaseUrl("jdbc:mariadb://localhost:3306/policy");
- } else {
- parameters.setDatabaseDriver("org.h2.Driver");
- parameters.setDatabaseUrl("jdbc:h2:mem:PolicyToscaPersistenceTest");
- }
-
+ parameters.setDatabaseDriver("org.h2.Driver");
+ parameters.setDatabaseUrl("jdbc:h2:mem:PolicyToscaPersistenceTest");
parameters.setDatabaseUser("policy");
parameters.setDatabasePassword("P01icY");
parameters.setPersistenceUnit("ToscaConceptTest");
CountDownLatch threadCountDownLatch = new CountDownLatch(10);
for (int i = 0; i < 10; i++) {
- new Thread() {
- @Override
- public void run() {
- assertThatCode(() -> databaseProvider.createPolicyTypes(serviceTemplate))
- .doesNotThrowAnyException();
- threadCountDownLatch.countDown();
- }
- }.start();
+ new Thread(() -> {
+ assertThatCode(() -> databaseProvider.createPolicyTypes(serviceTemplate))
+ .doesNotThrowAnyException();
+ threadCountDownLatch.countDown();
+ }).start();
}
threadCountDownLatch.await(9, TimeUnit.SECONDS);
deleteUnreferencedPolicyTypes();
- assertThatThrownBy(() -> {
- databaseProvider.getPolicyTypes(null, null);
- }).hasMessageContaining("policy types for null:null do not exist");
+ assertThatThrownBy(() -> databaseProvider.getPolicyTypes(null, null))
+ .hasMessageContaining("policy types for null:null do not exist");
}
private void deleteUnreferencedPolicyTypes() throws PfModelException {
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020-2021, 2023-2024 Nordix Foundation.
+ * Copyright (C) 2020-2021, 2023-2025 Nordix Foundation.
* Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2024 Nordix Foundation
* ================================================================================
/**
* Read the policy type definition.
- *
- * @throws Exception on errors
*/
@BeforeAll
public static void readPolicyDefinition() {
Properties jdbcProperties = new Properties();
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
- "jdbc:h2:mem:AuthorativeToscaProviderGenericTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
+ "jdbc:h2:mem:AuthorativeToscaProviderGenericTest");
daoParameters.setJdbcProperties(jdbcProperties);
pfDao = new PfDaoFactory().createPfDao(daoParameters);
@Test
void testCreateGetDelete() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getServiceTemplateList(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getServiceTemplateList(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), createdPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
List<ToscaServiceTemplate> gotServiceTemplateList =
new AuthorativeToscaProvider().getServiceTemplateList(pfDao, null, null);
ToscaPolicyType gotPolicyType = gotServiceTemplateList.get(0).getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
List<ToscaPolicyType> gotPolicyTypeList =
new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, VERSION_001);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, null);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, null);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, VERSION_001);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyTypeList(new DefaultPfDao(), POLICY_NO_VERSION,
VERSION_001)).hasMessageContaining("Policy Framework DAO has not been initialized");
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2022-2024 Nordix Foundation.
+ * Copyright (C) 2022-2025 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
/**
* Read policy metadataSet input json.
+ *
* @throws Exception Coder exception
*/
@BeforeEach
Properties jdbcProperties = new Properties();
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
- "jdbc:h2:mem:AuthorativeToscaProviderNodeTemplatesTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
+ "jdbc:h2:mem:AuthorativeToscaProviderNodeTemplatesTest");
daoParameters.setJdbcProperties(jdbcProperties);
pfDao = new PfDaoFactory().createPfDao(daoParameters);
@Test
void testPolicyMetadataSetsGet() throws Exception {
- assertThatThrownBy(() -> {
- authorativeToscaProvider.getNodeTemplateMetadataSet(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.getNodeTemplateMetadataSet(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
assertNotNull(toscaServiceTemplate);
authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate);
@Test
void testToscaNodeTemplatesGet() throws Exception {
- assertThatThrownBy(() -> {
- authorativeToscaProvider.getToscaNodeTemplate(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.getToscaNodeTemplate(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
assertNotNull(toscaServiceTemplate);
authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate);
@Test
void testToscaNodeTemplatesCreate() throws Exception {
- assertThatThrownBy(() -> {
- authorativeToscaProvider.createToscaNodeTemplates(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.createToscaNodeTemplates(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.createToscaNodeTemplates(null, new ToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.createToscaNodeTemplates(null, new ToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.createToscaNodeTemplates(pfDao, null);
- }).hasMessageMatching("^toscaServiceTemplate is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> authorativeToscaProvider.createToscaNodeTemplates(pfDao, null))
+ .hasMessageMatching("^toscaServiceTemplate is marked .*on.*ull but is null$");
ToscaServiceTemplate createdNodeTemplates =
authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate);
//Create node template with invalid node type
createToscaNodeTemplate.getToscaTopologyTemplate().getNodeTemplates().get("apexMetadata_adaptive")
.setType("invalid.type");
- assertThatThrownBy(() -> {
- authorativeToscaProvider.createToscaNodeTemplates(pfDao, createToscaNodeTemplate);
- }).hasMessageMatching("^NODE_TYPE .* for toscaNodeTemplate .* does not exist$");
+ assertThatThrownBy(() -> authorativeToscaProvider.createToscaNodeTemplates(pfDao, createToscaNodeTemplate))
+ .hasMessageMatching("^NODE_TYPE .* for toscaNodeTemplate .* does not exist$");
}
@Test
void testToscaNodeTemplateUpdate() throws Exception {
- assertThatThrownBy(() -> {
- authorativeToscaProvider.updateToscaNodeTemplates(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.updateToscaNodeTemplates(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.updateToscaNodeTemplates(null, new ToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.updateToscaNodeTemplates(null, new ToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.updateToscaNodeTemplates(pfDao, null);
- }).hasMessageMatching("^serviceTemplate is marked non-null but is null$");
+ assertThatThrownBy(() -> authorativeToscaProvider.updateToscaNodeTemplates(pfDao, null))
+ .hasMessageMatching("^serviceTemplate is marked non-null but is null$");
authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate);
ToscaServiceTemplate updatedTemplate =
//Update nodeTemplate with invalid node type
updatedToscaServiceTemplate.getToscaTopologyTemplate().getNodeTemplates().get("apexMetadata_grpc")
.setTypeVersion("0.0.0");
- assertThatThrownBy(() -> {
- authorativeToscaProvider.updateToscaNodeTemplates(pfDao, updatedToscaServiceTemplate);
- }).hasMessageMatching("^NODE_TYPE .* for toscaNodeTemplate .* does not exist$");
+ assertThatThrownBy(() -> authorativeToscaProvider.updateToscaNodeTemplates(pfDao, updatedToscaServiceTemplate))
+ .hasMessageMatching("^NODE_TYPE .* for toscaNodeTemplate .* does not exist$");
}
@Test
void testToscaNodeTemplateDelete() throws Exception {
- assertThatThrownBy(() -> {
- authorativeToscaProvider.deleteToscaNodeTemplate(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.deleteToscaNodeTemplate(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.deleteToscaNodeTemplate(null, null, "0.0.1");
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> authorativeToscaProvider.deleteToscaNodeTemplate(null, null, "0.0.1"))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, null, null);
- }).hasMessageMatching("^name is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, null, null))
+ .hasMessageMatching("^name is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, "name", null);
- }).hasMessageMatching("^version is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, "name", null))
+ .hasMessageMatching("^version is marked .*on.*ull but is null$");
authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate);
- assertThatThrownBy(() -> {
- authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, "dummyname", "1.0.1");
- }).hasMessage("node template dummyname:1.0.1 not found");
+ assertThatThrownBy(() -> authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, "dummyname", "1.0.1"))
+ .hasMessage("node template dummyname:1.0.1 not found");
ToscaServiceTemplate responseTemplate =
authorativeToscaProvider.createToscaNodeTemplates(pfDao, toscaServiceTemplate);
//delete node templates referenced in existing policy
- assertThatThrownBy(() -> {
- authorativeToscaProvider
- .deleteToscaNodeTemplate(pfDao, "apexMetadata_decisionMaker", "1.0.0");
- }).hasMessageEndingWith("Node template is in use, it is referenced in Tosca Policy "
- + "operational.apex.decisionMaker version 1.0.0");
+ assertThatThrownBy(() -> authorativeToscaProvider
+ .deleteToscaNodeTemplate(pfDao, "apexMetadata_decisionMaker", "1.0.0"))
+ .hasMessageEndingWith("Node template is in use, it is referenced in Tosca Policy "
+ + "operational.apex.decisionMaker version 1.0.0");
//delete unreferenced node template
authorativeToscaProvider.deleteToscaNodeTemplate(pfDao, "apexMetadata_adaptive", "2.3.1");
Properties jdbcProperties = new Properties();
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
- "jdbc:h2:mem:AuthorativeToscaProviderPolicyTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
+ "jdbc:h2:mem:AuthorativeToscaProviderPolicyTest");
daoParameters.setJdbcProperties(jdbcProperties);
pfDao = new PfDaoFactory().createPfDao(daoParameters);
@Test
void testPoliciesGet() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getPolicies(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicies(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getPolicyList(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyList(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate =
- standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), createdPolicy.getType());
ToscaServiceTemplate gotServiceTemplate =
- new AuthorativeToscaProvider().getPolicies(pfDao, policyKey.getName(), policyKey.getVersion());
+ new AuthorativeToscaProvider().getPolicies(pfDao, policyKey.getName(), policyKey.getVersion());
ToscaPolicy gotPolicy =
- gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
assertEquals(beforePolicy.getType(), gotPolicy.getType());
@Test
void testPoliciesGetFiltered() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicies(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicies(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicies(null,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().build());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicies(null,
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().build())).hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicies(pfDao, null);
- }).hasMessageMatching("^filter is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicies(pfDao, null))
+ .hasMessageMatching("^filter is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyList(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyList(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyList(null,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().build());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyList(null,
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().build())).hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyList(pfDao, null);
- }).hasMessageMatching("^filter is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyList(pfDao, null))
+ .hasMessageMatching("^filter is marked .*on.*ull but is null$");
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate =
- standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), createdPolicy.getType());
ToscaServiceTemplate gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicies(pfDao,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().build());
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().build());
ToscaPolicy gotPolicy =
- gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
assertEquals(beforePolicy.getType(), gotPolicy.getType());
gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicies(pfDao,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).build());
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).build());
gotPolicy = gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
assertEquals(beforePolicy.getType(), gotPolicy.getType());
gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicies(pfDao,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).version(VERSION_100).build());
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).version(VERSION_100).build());
gotPolicy = gotServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicy));
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
gotPolicyList = new AuthorativeToscaProvider().getFilteredPolicyList(pfDao,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().build());
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().build());
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
gotPolicyList = new AuthorativeToscaProvider().getFilteredPolicyList(pfDao,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).build());
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).build());
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
gotPolicyList = new AuthorativeToscaProvider().getFilteredPolicyList(pfDao,
- ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).version(VERSION_100).build());
+ ToscaTypedEntityFilter.<ToscaPolicy>builder().name(policyKey.getName()).version(VERSION_100).build());
assertEquals(1, gotPolicyList.size());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, gotPolicyList.get(0)));
}
@Test
void testPolicyCreate() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(null, new ToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(null, new ToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, null);
- }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(pfDao, null))
+ .hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate =
- standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), createdPolicy.getType());
}
@Test
void testPolicyUpdate() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicies(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().updatePolicies(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicies(null, new ToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().updatePolicies(null, new ToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicies(pfDao, null);
- }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().updatePolicies(pfDao, null))
+ .hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate =
- standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), createdPolicy.getType());
ToscaServiceTemplate updatedServiceTemplate =
- new AuthorativeToscaProvider().updatePolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().updatePolicies(pfDao, toscaServiceTemplate);
ToscaPolicy updatedPolicy =
- updatedServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ updatedServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, updatedPolicy));
assertEquals(beforePolicy.getType(), updatedPolicy.getType());
}
@Test
void testPoliciesDelete() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, null, VERSION);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(null, null, VERSION))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, "name", null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(null, "name", null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(null, "name", VERSION);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(null, "name", VERSION))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, null, null);
- }).hasMessageMatching("^name is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(pfDao, null, null))
+ .hasMessageMatching("^name is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, null, VERSION);
- }).hasMessageMatching("^name is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(pfDao, null, VERSION))
+ .hasMessageMatching("^name is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, "name", null);
- }).hasMessageMatching("^version is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(pfDao, "name", null))
+ .hasMessageMatching("^version is marked .*on.*ull but is null$");
createPolicyTypes();
ToscaServiceTemplate toscaServiceTemplate =
- standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
+ standardCoder.decode(ResourceUtils.getResourceAsString(VCPE_JSON), ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
PfConceptKey policyKey = new PfConceptKey(POLICY_AND_VERSION);
ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), createdPolicy.getType());
ToscaServiceTemplate deletedServiceTemplate =
- new AuthorativeToscaProvider().deletePolicy(pfDao, policyKey.getName(), policyKey.getVersion());
+ new AuthorativeToscaProvider().deletePolicy(pfDao, policyKey.getName(), policyKey.getVersion());
ToscaPolicy deletedPolicy =
- deletedServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ deletedServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), deletedPolicy.getType());
void testAssertPoliciesExist() {
ToscaServiceTemplate testServiceTemplate = new ToscaServiceTemplate();
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicy(pfDao, "name", null);
- }).hasMessageMatching("^version is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicy(pfDao, "name", null))
+ .hasMessageMatching("^version is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate);
- }).hasMessage("topology template not specified on service template");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate))
+ .hasMessage("topology template not specified on service template");
testServiceTemplate.setToscaTopologyTemplate(new ToscaTopologyTemplate());
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate);
- }).hasMessage("no policies specified on topology template of service template");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate))
+ .hasMessage("no policies specified on topology template of service template");
testServiceTemplate.getToscaTopologyTemplate().setPolicies(new ArrayList<>());
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate);
- }).hasMessage("An incoming list of concepts must have at least one entry");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicies(pfDao, testServiceTemplate))
+ .hasMessage("An incoming list of concepts must have at least one entry");
}
@Test
void testEntityMaps() throws CoderException, PfModelException {
- Object yamlObject =
- new Yaml().load(ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
+ Object yamlObject = new Yaml().load(ResourceUtils
+ .getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
- standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
+ standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplatePolicyType);
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplatePolicyType);
assertEquals(2, toscaServiceTemplatePolicyType.getPolicyTypesAsMap().size());
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(
- ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
- ToscaServiceTemplate.class);
+ ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"),
+ ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplate);
ToscaServiceTemplate createdServiceTemplate =
- new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
+ new AuthorativeToscaProvider().createPolicies(pfDao, toscaServiceTemplate);
PfConceptKey policyKey = new PfConceptKey("onap.restart.tca:1.0.0");
ToscaPolicy beforePolicy =
- toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
ToscaPolicy createdPolicy =
- createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
+ createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).get(policyKey.getName());
assertEquals(0, beforePolicy.compareNameVersion(beforePolicy, createdPolicy));
assertEquals(beforePolicy.getType(), createdPolicy.getType());
Map<String, ToscaPolicy> policyMapItem = createdServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0);
createdServiceTemplate.getToscaTopologyTemplate().getPolicies().add(policyMapItem);
- assertThatThrownBy(() -> {
- createdServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap();
- }).hasMessageContaining("list of map of entities contains more than one entity with key");
+ assertThatThrownBy(() -> createdServiceTemplate.getToscaTopologyTemplate().getPoliciesAsMap())
+ .hasMessageContaining("list of map of entities contains more than one entity with key");
ToscaDataType duplDataType = toscaServiceTemplatePolicyType.getDataTypes().values().iterator().next();
private void createPolicyTypes() throws CoderException, PfModelException {
Object yamlObject =
- new Yaml().load(ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
+ new Yaml().load(ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
- standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
+ standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
assertNotNull(toscaServiceTemplatePolicyType);
new AuthorativeToscaProvider().createPolicyTypes(pfDao, toscaServiceTemplatePolicyType);
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019-2021, 2023-2024 Nordix Foundation.
+ * Copyright (C) 2019-2021, 2023-2025 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
/**
* Read the policy type definition.
*
- * @throws Exception on errors
*/
@BeforeAll
public static void readPolicyDefinition() {
Properties jdbcProperties = new Properties();
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
- "jdbc:h2:mem:AuthorativeToscaProviderPolicyTypeTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
+ "jdbc:h2:mem:AuthorativeToscaProviderPolicyTypeTest");
daoParameters.setJdbcProperties(jdbcProperties);
pfDao = new PfDaoFactory().createPfDao(daoParameters);
@Test
void testPolicyTypesGet() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getPolicyTypes(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyTypes(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getPolicyList(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyList(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), createdPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
ToscaServiceTemplate gotServiceTemplate = new AuthorativeToscaProvider().getPolicyTypes(pfDao,
policyTypeKey.getName(), policyTypeKey.getVersion());
ToscaPolicyType gotPolicyType = gotServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
List<ToscaPolicyType> gotPolicyTypeList =
new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, VERSION_001);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, null);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, null);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getPolicyTypeList(pfDao, null, VERSION_001);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
assertThatThrownBy(() -> new AuthorativeToscaProvider().getPolicyTypeList(new DefaultPfDao(), POLICY_NO_VERSION,
VERSION_001)).hasMessageContaining("Policy Framework DAO has not been initialized");
@Test
void testPolicyTypesGetFiltered() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyTypes(null,
- ToscaEntityFilter.<ToscaPolicyType>builder().build());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypes(null,
+ ToscaEntityFilter.<ToscaPolicyType>builder().build())).hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao, null);
- }).hasMessageMatching("^filter is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao, null))
+ .hasMessageMatching("^filter is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyTypeList(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypeList(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyTypeList(null,
- ToscaEntityFilter.<ToscaPolicyType>builder().build());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypeList(null,
+ ToscaEntityFilter.<ToscaPolicyType>builder().build()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao, null);
- }).hasMessageMatching("^filter is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao, null))
+ .hasMessageMatching("^filter is marked .*on.*ull but is null$");
assertThatThrownBy(() -> new AuthorativeToscaProvider().getFilteredPolicyTypeList(new DefaultPfDao(),
ToscaEntityFilter.<ToscaPolicyType>builder().name("i.dont.Exist").build()))
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), createdPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
ToscaServiceTemplate gotServiceTemplate = new AuthorativeToscaProvider().getFilteredPolicyTypes(pfDao,
List<ToscaPolicyType> gotPolicyTypeList =
new AuthorativeToscaProvider().getPolicyTypeList(pfDao, POLICY_NO_VERSION, VERSION_001);
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
ToscaEntityFilter.<ToscaPolicyType>builder().build());
assertEquals(2, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
ToscaEntityFilter.<ToscaPolicyType>builder().name(policyTypeKey.getName()).build());
assertEquals(1, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao, ToscaEntityFilter
.<ToscaPolicyType>builder().name(policyTypeKey.getName()).version(VERSION_001).build());
assertEquals(1, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
gotPolicyTypeList = new AuthorativeToscaProvider().getFilteredPolicyTypeList(pfDao,
ToscaEntityFilter.<ToscaPolicyType>builder().version("1.0.0").build());
assertEquals(1, gotPolicyTypeList.size());
- assertEquals(true, beforePolicyType.getName().equals(gotPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), gotPolicyType.getName());
}
private void checkEqualsNameDescription(ToscaPolicyType beforePolicyType, ToscaPolicyType gotPolicyType) {
@Test
void testPolicyTypesCreate() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(null, new ToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(null, new ToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(pfDao, null);
- }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(pfDao, null))
+ .hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
ToscaServiceTemplate testToscaServiceTemplate = new ToscaServiceTemplate();
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate);
- }).hasMessage(MISSING_POLICY_TYPES);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate))
+ .hasMessage(MISSING_POLICY_TYPES);
testToscaServiceTemplate.setPolicyTypes(new LinkedHashMap<>());
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate);
- }).hasMessage("An incoming list of concepts must have at least one entry");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(pfDao, testToscaServiceTemplate))
+ .hasMessage("An incoming list of concepts must have at least one entry");
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), createdPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
}
@Test
void testPolicyTypesUpdate() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicyTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().updatePolicyTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicyTypes(null, new ToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().updatePolicyTypes(null, new ToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().updatePolicyTypes(pfDao, null);
- }).hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().updatePolicyTypes(pfDao, null))
+ .hasMessageMatching("^serviceTemplate is marked .*on.*ull but is null$");
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), createdPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
ToscaServiceTemplate updatedServiceTemplate =
new AuthorativeToscaProvider().updatePolicyTypes(pfDao, toscaServiceTemplate);
ToscaPolicyType updatedPolicy = updatedServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(updatedPolicy.getName()));
+ assertEquals(beforePolicyType.getName(), updatedPolicy.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), updatedPolicy.getDescription()));
}
@Test
void testPolicyTypesDelete() throws Exception {
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(null, null, VERSION);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(null, null, VERSION))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(null, "name", null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(null, "name", null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(null, "name", VERSION);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(null, "name", VERSION))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(pfDao, null, null);
- }).hasMessageMatching("^name is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(pfDao, null, null))
+ .hasMessageMatching("^name is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(pfDao, null, VERSION);
- }).hasMessageMatching("^name is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(pfDao, null, VERSION))
+ .hasMessageMatching("^name is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(pfDao, "name", null);
- }).hasMessageMatching("^version is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(pfDao, "name", null))
+ .hasMessageMatching("^version is marked .*on.*ull but is null$");
ToscaServiceTemplate toscaServiceTemplate = standardCoder.decode(yamlAsJsonString, ToscaServiceTemplate.class);
ToscaPolicyType beforePolicyType = toscaServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
ToscaPolicyType createdPolicyType = createdServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(createdPolicyType.getName()));
+ assertEquals(beforePolicyType.getName(), createdPolicyType.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), createdPolicyType.getDescription()));
ToscaServiceTemplate deletedServiceTemplate = new AuthorativeToscaProvider().deletePolicyType(pfDao,
policyTypeKey.getName(), policyTypeKey.getVersion());
ToscaPolicyType deletedPolicy = deletedServiceTemplate.getPolicyTypes().get(policyTypeKey.getName());
- assertEquals(true, beforePolicyType.getName().equals(deletedPolicy.getName()));
+ assertEquals(beforePolicyType.getName(), deletedPolicy.getName());
assertEquals(0, ObjectUtils.compare(beforePolicyType.getDescription(), deletedPolicy.getDescription()));
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().getPolicyTypes(pfDao, policyTypeKey.getName(), policyTypeKey.getVersion());
- }).hasMessage("policy types for onap.policies.NoVersion:0.0.1 do not exist");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider()
+ .getPolicyTypes(pfDao, policyTypeKey.getName(), policyTypeKey.getVersion()))
+ .hasMessage("policy types for onap.policies.NoVersion:0.0.1 do not exist");
}
@Test
void testAssertPoliciesExist() {
ToscaServiceTemplate testServiceTemplate = new ToscaServiceTemplate();
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().deletePolicyType(pfDao, "name", null);
- }).hasMessageMatching("^version is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().deletePolicyType(pfDao, "name", null))
+ .hasMessageMatching("^version is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
- }).hasMessage(MISSING_POLICY_TYPES);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate))
+ .hasMessage(MISSING_POLICY_TYPES);
testServiceTemplate.setToscaTopologyTemplate(new ToscaTopologyTemplate());
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
- }).hasMessage(MISSING_POLICY_TYPES);
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate))
+ .hasMessage(MISSING_POLICY_TYPES);
testServiceTemplate.setPolicyTypes(new LinkedHashMap<>());
- assertThatThrownBy(() -> {
- new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate);
- }).hasMessage("An incoming list of concepts must have at least one entry");
+ assertThatThrownBy(() -> new AuthorativeToscaProvider().createPolicyTypes(pfDao, testServiceTemplate))
+ .hasMessage("An incoming list of concepts must have at least one entry");
}
@Test
import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;
import org.onap.policy.models.tosca.authorative.provider.AuthorativeToscaProvider;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraint;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataTypes;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicies;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaProperty;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaTopologyTemplate;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger;
import org.yaml.snakeyaml.Yaml;
/**
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:SimpleToscaProviderTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:h2:mem:SimpleToscaProviderTest");
daoParameters.setJdbcProperties(jdbcProperties);
PfConceptKey dataType0Key = new PfConceptKey("DataType0", "0.0.1");
JpaToscaDataType dataType0 = new JpaToscaDataType();
dataType0.setKey(dataType0Key);
- dataType0.setConstraints(new ArrayList<JpaToscaConstraint>());
- dataType0.setMetadata(new TreeMap<String, String>());
- dataType0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dataType0.setConstraints(new ArrayList<>());
+ dataType0.setMetadata(new TreeMap<>());
+ dataType0.setProperties(new LinkedHashMap<>());
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
assertEquals(1, createdServiceTemplate.getDataTypes().getConceptMap().size());
assertEquals(dataType0, createdServiceTemplate.getDataTypes().get(dataType0Key));
- assertEquals(null, createdServiceTemplate.getDataTypes().get(dataType0Key).getDescription());
+ assertNull(createdServiceTemplate.getDataTypes().get(dataType0Key).getDescription());
dataType0.setDescription("Updated Description");
.hasMessage("data type DataType0:0.0.1 is in use, it is referenced in policy type pt0:0.0.2");
JpaToscaDataType dataType0v2 = new JpaToscaDataType(new PfConceptKey("DataType0:0.0.2"));
- dataType0v2.setConstraints(new ArrayList<JpaToscaConstraint>());
- dataType0v2.setMetadata(new TreeMap<String, String>());
- dataType0v2.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dataType0v2.setConstraints(new ArrayList<>());
+ dataType0v2.setMetadata(new TreeMap<>());
+ dataType0v2.setProperties(new LinkedHashMap<>());
updatedServiceTemplate.getDataTypes().getConceptMap().put(dataType0v2.getKey(), dataType0v2);
new SimpleToscaProvider().createDataTypes(pfDao, updatedServiceTemplate);
PfConceptKey policyType0Key = new PfConceptKey("PolicyType0", "0.0.1");
JpaToscaPolicyType policyType0 = new JpaToscaPolicyType();
policyType0.setKey(policyType0Key);
- policyType0.setMetadata(new TreeMap<String, String>());
- policyType0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
- policyType0.setTargets(new ArrayList<PfConceptKey>());
- policyType0.setTriggers(new ArrayList<JpaToscaTrigger>());
+ policyType0.setMetadata(new TreeMap<>());
+ policyType0.setProperties(new LinkedHashMap<>());
+ policyType0.setTargets(new ArrayList<>());
+ policyType0.setTriggers(new ArrayList<>());
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
serviceTemplate.getPolicyTypes().getConceptMap().put(policyType0Key, policyType0);
assertEquals(1, createdServiceTemplate.getPolicyTypes().getConceptMap().size());
assertEquals(policyType0, createdServiceTemplate.getPolicyTypes().get(policyType0Key));
- assertEquals(null, createdServiceTemplate.getPolicyTypes().get(policyType0Key).getDescription());
+ assertNull(createdServiceTemplate.getPolicyTypes().get(policyType0Key).getDescription());
policyType0.setDescription("Updated Description");
assertEquals(policyType0, gotServiceTemplate.getPolicyTypes().get(policyType0Key));
assertEquals("Updated Description", gotServiceTemplate.getPolicyTypes().get(policyType0Key).getDescription());
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicyType(pfDao, new PfConceptKey("IDontExist:0.0.1"));
- }).hasMessage("policy type IDontExist:0.0.1 not found");
+ assertThatThrownBy(
+ () -> new SimpleToscaProvider().deletePolicyType(pfDao, new PfConceptKey("IDontExist:0.0.1")))
+ .hasMessage("policy type IDontExist:0.0.1 not found");
JpaToscaPolicyType pt1 = new JpaToscaPolicyType(new PfConceptKey("pt1:0.0.2"));
pt1.setDerivedFrom(policyType0Key);
PfConceptKey policyType0Key = new PfConceptKey("PolicyType0", "0.0.1");
JpaToscaPolicyType policyType0 = new JpaToscaPolicyType();
policyType0.setKey(policyType0Key);
- policyType0.setMetadata(new TreeMap<String, String>());
- policyType0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
- policyType0.setTargets(new ArrayList<PfConceptKey>());
- policyType0.setTriggers(new ArrayList<JpaToscaTrigger>());
+ policyType0.setMetadata(new TreeMap<>());
+ policyType0.setProperties(new LinkedHashMap<>());
+ policyType0.setTargets(new ArrayList<>());
+ policyType0.setTriggers(new ArrayList<>());
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
new SimpleToscaProvider().createPolicyTypes(pfDao, serviceTemplate);
assertEquals(policyType0, createdServiceTemplate.getPolicyTypes().get(policyType0Key));
- assertEquals(null, createdServiceTemplate.getPolicyTypes().get(policyType0Key).getDescription());
+ assertNull(createdServiceTemplate.getPolicyTypes().get(policyType0Key).getDescription());
policyType0.setDescription("Updated Description");
toscaPolicy.setType(null);
toscaPolicy.setTypeVersion(null);
- assertThatThrownBy(() -> {
- originalServiceTemplate.fromAuthorative(toscaServiceTemplate);
- }).hasMessage("Type not specified, the type of this TOSCA entity must be specified in the type field");
+ assertThatThrownBy(() -> originalServiceTemplate.fromAuthorative(toscaServiceTemplate))
+ .hasMessage("Type not specified, the type of this TOSCA entity must be specified in the type field");
toscaPolicy.setType("IDontExist");
- assertThatThrownBy(() -> {
- originalServiceTemplate.fromAuthorative(toscaServiceTemplate);
- }).hasMessage("Version not specified, the version of this TOSCA entity must be "
- + "specified in the type_version field");
+ assertThatThrownBy(() -> originalServiceTemplate.fromAuthorative(toscaServiceTemplate))
+ .hasMessage("Version not specified, the version of this TOSCA entity must be "
+ + "specified in the type_version field");
toscaPolicy.setTypeVersion("hello");
- assertThatThrownBy(() -> {
- originalServiceTemplate.fromAuthorative(toscaServiceTemplate);
- }).hasMessageContaining("value \"hello\", does not match regular expression");
+ assertThatThrownBy(() -> originalServiceTemplate.fromAuthorative(toscaServiceTemplate))
+ .hasMessageContaining("value \"hello\", does not match regular expression");
toscaPolicy.setTypeVersion("99.100.101");
originalServiceTemplate.fromAuthorative(toscaServiceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicies(pfDao, originalServiceTemplate);
- }).hasMessageContaining("policy type").hasMessageContaining("IDontExist:99.100.101")
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(pfDao, originalServiceTemplate))
+ .hasMessageContaining("policy type").hasMessageContaining("IDontExist:99.100.101")
.hasMessageContaining(Validated.NOT_FOUND);
toscaPolicy.setType("IDontExist");
toscaPolicy.setType(null);
- assertThatThrownBy(() -> {
- originalServiceTemplate.fromAuthorative(toscaServiceTemplate);
- }).hasMessage("Type not specified, the type of this TOSCA entity must be specified in the type field");
+ assertThatThrownBy(() -> originalServiceTemplate.fromAuthorative(toscaServiceTemplate))
+ .hasMessage("Type not specified, the type of this TOSCA entity must be specified in the type field");
toscaPolicy.setType(originalPolicyType);
toscaPolicy.setTypeVersion(originalPolicyTypeVersion);
assertEquals(0, originalServiceTemplate.getTopologyTemplate().getPolicies().get(policyKey)
.compareTo(deletedServiceTemplate.getTopologyTemplate().getPolicies().get(policyKey)));
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicies(pfDao, policyKey.getName(), policyKey.getVersion());
- }).hasMessage("policies for onap.restart.tca:1.0.0 do not exist");
+ assertThatThrownBy(
+ () -> new SimpleToscaProvider().getPolicies(pfDao, policyKey.getName(), policyKey.getVersion()))
+ .hasMessage("policies for onap.restart.tca:1.0.0 do not exist");
assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicy(pfDao, policyKey))
.hasMessage("no policies found");
@Test
void testGetDataTypesCornerCases() throws PfModelException {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getDataTypes(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("service template not found in database");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getDataTypes(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("service template not found in database");
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
new SimpleToscaProvider().createPolicyTypes(pfDao, serviceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getDataTypes(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("data types for hello:0.0.1 do not exist");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getDataTypes(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("data types for hello:0.0.1 do not exist");
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
JpaToscaDataType dt01 = new JpaToscaDataType(new PfConceptKey("dt0:0.0.1"));
- dt01.setConstraints(new ArrayList<JpaToscaConstraint>());
- dt01.setMetadata(new TreeMap<String, String>());
- dt01.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dt01.setConstraints(new ArrayList<>());
+ dt01.setMetadata(new TreeMap<>());
+ dt01.setProperties(new LinkedHashMap<>());
serviceTemplate.getDataTypes().getConceptMap().put(dt01.getKey(), dt01);
new SimpleToscaProvider().createDataTypes(pfDao, serviceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getDataTypes(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("data types for hello:0.0.1 do not exist");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getDataTypes(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("data types for hello:0.0.1 do not exist");
JpaToscaServiceTemplate gotSt =
new SimpleToscaProvider().getDataTypes(pfDao, dt01.getName(), dt01.getVersion());
assertEquals(1, gotSt.getDataTypes().getAll(dt01.getName(), dt01.getVersion()).size());
JpaToscaDataType dt02 = new JpaToscaDataType(new PfConceptKey("dt0:0.0.2"));
- dt02.setConstraints(new ArrayList<JpaToscaConstraint>());
- dt02.setMetadata(new TreeMap<String, String>());
- dt02.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dt02.setConstraints(new ArrayList<>());
+ dt02.setMetadata(new TreeMap<>());
+ dt02.setProperties(new LinkedHashMap<>());
serviceTemplate.getDataTypes().getConceptMap().put(dt02.getKey(), dt02);
new SimpleToscaProvider().createDataTypes(pfDao, serviceTemplate);
@Test
void testGetPolicyTypesCornerCases() throws PfModelException {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicyTypes(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("service template not found in database");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicyTypes(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("service template not found in database");
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
new SimpleToscaProvider().createDataTypes(pfDao, serviceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicyTypes(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("policy types for hello:0.0.1 do not exist");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicyTypes(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("policy types for hello:0.0.1 do not exist");
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
JpaToscaPolicyType pt01 = new JpaToscaPolicyType(new PfConceptKey("p0:0.0.1"));
- pt01.setMetadata(new TreeMap<String, String>());
- pt01.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
- pt01.setTargets(new ArrayList<PfConceptKey>());
- pt01.setTriggers(new ArrayList<JpaToscaTrigger>());
+ pt01.setMetadata(new TreeMap<>());
+ pt01.setProperties(new LinkedHashMap<>());
+ pt01.setTargets(new ArrayList<>());
+ pt01.setTriggers(new ArrayList<>());
serviceTemplate.getPolicyTypes().getConceptMap().put(pt01.getKey(), pt01);
new SimpleToscaProvider().createPolicyTypes(pfDao, serviceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicyTypes(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("policy types for hello:0.0.1 do not exist");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicyTypes(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("policy types for hello:0.0.1 do not exist");
JpaToscaServiceTemplate gotSt =
new SimpleToscaProvider().getPolicyTypes(pfDao, pt01.getName(), pt01.getVersion());
assertEquals(1, gotSt.getPolicyTypes().getAll(pt01.getName(), pt01.getVersion()).size());
JpaToscaPolicyType pt02 = new JpaToscaPolicyType(new PfConceptKey("p0:0.0.2"));
- pt02.setMetadata(new TreeMap<String, String>());
- pt02.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
- pt02.setTargets(new ArrayList<PfConceptKey>());
- pt02.setTriggers(new ArrayList<JpaToscaTrigger>());
+ pt02.setMetadata(new TreeMap<>());
+ pt02.setProperties(new LinkedHashMap<>());
+ pt02.setTargets(new ArrayList<>());
+ pt02.setTriggers(new ArrayList<>());
serviceTemplate.getPolicyTypes().getConceptMap().put(pt02.getKey(), pt02);
new SimpleToscaProvider().createPolicyTypes(pfDao, serviceTemplate);
@Test
void testGetPoliciesCornerCases() throws PfModelException {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicies(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("service template not found in database");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicies(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("service template not found in database");
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
JpaToscaDataType dt0 = new JpaToscaDataType(new PfConceptKey("dt0:0.0.1"));
- dt0.setConstraints(new ArrayList<JpaToscaConstraint>());
- dt0.setMetadata(new TreeMap<String, String>());
- dt0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dt0.setConstraints(new ArrayList<>());
+ dt0.setMetadata(new TreeMap<>());
+ dt0.setProperties(new LinkedHashMap<>());
serviceTemplate.getDataTypes().getConceptMap().put(dt0.getKey(), dt0);
new SimpleToscaProvider().createDataTypes(pfDao, serviceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicies(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("policies for hello:0.0.1 do not exist");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicies(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("policies for hello:0.0.1 do not exist");
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
JpaToscaPolicyType pt01 = new JpaToscaPolicyType(new PfConceptKey("pt0:0.0.1"));
- pt01.setMetadata(new TreeMap<String, String>());
- pt01.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
- pt01.setTargets(new ArrayList<PfConceptKey>());
- pt01.setTriggers(new ArrayList<JpaToscaTrigger>());
+ pt01.setMetadata(new TreeMap<>());
+ pt01.setProperties(new LinkedHashMap<>());
+ pt01.setTargets(new ArrayList<>());
+ pt01.setTriggers(new ArrayList<>());
serviceTemplate.getPolicyTypes().getConceptMap().put(pt01.getKey(), pt01);
serviceTemplate.setTopologyTemplate(new JpaToscaTopologyTemplate());
JpaToscaPolicy p01 = new JpaToscaPolicy(new PfConceptKey("p0:0.0.1"));
p01.setType(pt01.getKey());
- p01.setMetadata(new TreeMap<String, String>());
- p01.setProperties(new LinkedHashMap<String, String>());
- p01.setTargets(new ArrayList<PfConceptKey>());
+ p01.setMetadata(new TreeMap<>());
+ p01.setProperties(new LinkedHashMap<>());
+ p01.setTargets(new ArrayList<>());
serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(p01.getKey(), p01);
new SimpleToscaProvider().createPolicies(pfDao, serviceTemplate);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicies(pfDao, "hello", "0.0.1");
- }).hasMessageMatching("policies for hello:0.0.1 do not exist");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicies(pfDao, "hello", "0.0.1"))
+ .hasMessageMatching("policies for hello:0.0.1 do not exist");
JpaToscaServiceTemplate gotSt = new SimpleToscaProvider().getPolicies(pfDao, p01.getName(), p01.getVersion());
JpaToscaPolicy p02 = new JpaToscaPolicy(new PfConceptKey("p0:0.0.2"));
p02.setType(pt01.getKey());
p02.setType(pt01.getKey());
- p02.setMetadata(new TreeMap<String, String>());
- p02.setProperties(new LinkedHashMap<String, String>());
- p02.setTargets(new ArrayList<PfConceptKey>());
+ p02.setMetadata(new TreeMap<>());
+ p02.setProperties(new LinkedHashMap<>());
+ p02.setTargets(new ArrayList<>());
serviceTemplate.getTopologyTemplate().getPolicies().getConceptMap().put(p02.getKey(), p02);
new SimpleToscaProvider().createPolicies(pfDao, serviceTemplate);
@Test
void testNonNullsDataType() {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getServiceTemplate(null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().getServiceTemplate(null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().appendToServiceTemplate(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().appendToServiceTemplate(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().appendToServiceTemplate(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().appendToServiceTemplate(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().appendToServiceTemplate(pfDao, null);
- }).hasMessageMatching("^incomingServiceTemplateFragment is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new SimpleToscaProvider().appendToServiceTemplate(pfDao, null))
+ .hasMessageMatching("^incomingServiceTemplateFragment is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getDataTypes(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().getDataTypes(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createDataTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createDataTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createDataTypes(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createDataTypes(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createDataTypes(pfDao, null);
- }).hasMessageMatching(INCOMING_TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createDataTypes(pfDao, null))
+ .hasMessageMatching(INCOMING_TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updateDataTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updateDataTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updateDataTypes(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updateDataTypes(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updateDataTypes(pfDao, null);
- }).hasMessageMatching(TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updateDataTypes(pfDao, null))
+ .hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deleteDataType(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().deleteDataType(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deleteDataType(null, new PfConceptKey());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().deleteDataType(null, new PfConceptKey()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deleteDataType(pfDao, null);
- }).hasMessageMatching("^dataTypeKey is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new SimpleToscaProvider().deleteDataType(pfDao, null))
+ .hasMessageMatching("^dataTypeKey is marked .*on.*ull but is null$");
}
@Test
void testNotNullsPolicyTypes() {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicyTypes(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicyTypes(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicyTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicyTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicyTypes(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicyTypes(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicyTypes(pfDao, null);
- }).hasMessageMatching(INCOMING_TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicyTypes(pfDao, null))
+ .hasMessageMatching(INCOMING_TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updatePolicyTypes(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updatePolicyTypes(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updatePolicyTypes(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updatePolicyTypes(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updatePolicyTypes(pfDao, null);
- }).hasMessageMatching(TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updatePolicyTypes(pfDao, null))
+ .hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicyType(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicyType(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicyType(null, new PfConceptKey());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicyType(null, new PfConceptKey()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicyType(pfDao, null);
- }).hasMessageMatching("^policyTypeKey is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicyType(pfDao, null))
+ .hasMessageMatching("^policyTypeKey is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getPolicies(null, null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().getPolicies(null, null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicies(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicies(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().createPolicies(pfDao, null);
- }).hasMessageMatching(INCOMING_TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().createPolicies(pfDao, null))
+ .hasMessageMatching(INCOMING_TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updatePolicies(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updatePolicies(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updatePolicies(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updatePolicies(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().updatePolicies(pfDao, null);
- }).hasMessageMatching(TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().updatePolicies(pfDao, null))
+ .hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicy(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicy(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicy(null, new PfConceptKey());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicy(null, new PfConceptKey()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deletePolicy(pfDao, null);
- }).hasMessageMatching("^policyKey is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new SimpleToscaProvider().deletePolicy(pfDao, null))
+ .hasMessageMatching("^policyKey is marked .*on.*ull but is null$");
}
@Test
void testDeleteServiceTemplate() throws PfModelException {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deleteServiceTemplate(null);
- }).hasMessageMatching("^dao is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new SimpleToscaProvider().deleteServiceTemplate(null))
+ .hasMessageMatching("^dao is marked .*on.*ull but is null$");
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().deleteServiceTemplate(pfDao);
- }).hasMessage("service template not found in database");
+ assertThatThrownBy(() -> new SimpleToscaProvider().deleteServiceTemplate(pfDao))
+ .hasMessage("service template not found in database");
PfConceptKey dataType0Key = new PfConceptKey("DataType0", "0.0.1");
JpaToscaDataType dataType0 = new JpaToscaDataType();
dataType0.setKey(dataType0Key);
- dataType0.setConstraints(new ArrayList<JpaToscaConstraint>());
- dataType0.setMetadata(new TreeMap<String, String>());
- dataType0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dataType0.setConstraints(new ArrayList<>());
+ dataType0.setMetadata(new TreeMap<>());
+ dataType0.setProperties(new LinkedHashMap<>());
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
assertEquals(1, createdServiceTemplate.getDataTypes().getConceptMap().size());
assertEquals(dataType0, createdServiceTemplate.getDataTypes().get(dataType0Key));
- assertEquals(null, createdServiceTemplate.getDataTypes().get(dataType0Key).getDescription());
+ assertNull(createdServiceTemplate.getDataTypes().get(dataType0Key).getDescription());
JpaToscaServiceTemplate deletedServiceTemplate = new SimpleToscaProvider().deleteServiceTemplate(pfDao);
@Test
void testNullParameters() {
- assertThatThrownBy(() -> {
- new SimpleToscaProvider().getCascadedDataTypes(null, null, null);
- }).hasMessageMatching("^dbServiceTemplate is marked .*on.*ull but is null$");
+ assertThatThrownBy(() -> new SimpleToscaProvider().getCascadedDataTypes(null, null, null))
+ .hasMessageMatching("^dbServiceTemplate is marked .*on.*ull but is null$");
}
private void createPolicyTypes() throws CoderException, PfModelException {
/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2020-2021, 2023-2024 Nordix Foundation.
+ * Copyright (C) 2020-2021, 2023-2025 Nordix Foundation.
* Modifications Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
import org.onap.policy.models.dao.PfDao;
import org.onap.policy.models.dao.PfDaoFactory;
import org.onap.policy.models.dao.impl.DefaultPfDao;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaConstraint;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataType;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaDataTypes;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyType;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaPolicyTypes;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaProperty;
import org.onap.policy.models.tosca.simple.concepts.JpaToscaServiceTemplate;
-import org.onap.policy.models.tosca.simple.concepts.JpaToscaTrigger;
/**
* Test the {@link SimpleToscaProvider} class.
Properties jdbcProperties = new Properties();
jdbcProperties.setProperty("jakarta.persistence.jdbc.user", "policy");
jdbcProperties.setProperty("jakarta.persistence.jdbc.password", "P01icY");
-
- if (System.getProperty("USE-MARIADB") != null) {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.mariadb.jdbc.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url", "jdbc:mariadb://localhost:3306/policy");
- } else {
- jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
- jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
- "jdbc:h2:mem:SimpleToscaServiceTemplateProviderTest");
- }
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.driver", "org.h2.Driver");
+ jdbcProperties.setProperty("jakarta.persistence.jdbc.url",
+ "jdbc:h2:mem:SimpleToscaServiceTemplateProviderTest");
daoParameters.setJdbcProperties(jdbcProperties);
@Test
void testCreateUpdateGetDeleteDataType() throws PfModelException {
JpaToscaServiceTemplate serviceTemplate = new JpaToscaServiceTemplate();
- serviceTemplate.setMetadata(new TreeMap<String, String>());
+ serviceTemplate.setMetadata(new TreeMap<>());
JpaToscaServiceTemplate dbServiceTemplate =
new SimpleToscaServiceTemplateProvider().write(pfDao, serviceTemplate);
PfConceptKey dataType0Key = new PfConceptKey("DataType0", "0.0.1");
JpaToscaDataType dataType0 = new JpaToscaDataType();
dataType0.setKey(dataType0Key);
- dataType0.setConstraints(new ArrayList<JpaToscaConstraint>());
- dataType0.setMetadata(new TreeMap<String, String>());
- dataType0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
+ dataType0.setConstraints(new ArrayList<>());
+ dataType0.setMetadata(new TreeMap<>());
+ dataType0.setProperties(new LinkedHashMap<>());
serviceTemplate.setDataTypes(new JpaToscaDataTypes());
serviceTemplate.getDataTypes().getConceptMap().put(dataType0Key, dataType0);
JpaToscaPolicyType policyType0 = new JpaToscaPolicyType();
policyType0.setKey(policyType0Key);
- policyType0.setMetadata(new TreeMap<String, String>());
- policyType0.setProperties(new LinkedHashMap<String, JpaToscaProperty>());
- policyType0.setTargets(new ArrayList<PfConceptKey>());
- policyType0.setTriggers(new ArrayList<JpaToscaTrigger>());
+ policyType0.setMetadata(new TreeMap<>());
+ policyType0.setProperties(new LinkedHashMap<>());
+ policyType0.setTargets(new ArrayList<>());
+ policyType0.setTriggers(new ArrayList<>());
serviceTemplate.setPolicyTypes(new JpaToscaPolicyTypes());
serviceTemplate.getPolicyTypes().getConceptMap().put(policyType0Key, policyType0);
@Test
void testNonNulls() {
- assertThatThrownBy(() -> {
- new SimpleToscaServiceTemplateProvider().write(null, null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaServiceTemplateProvider().write(null, null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaServiceTemplateProvider().write(pfDao, null);
- }).hasMessageMatching(TEMPLATE_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaServiceTemplateProvider().write(pfDao, null))
+ .hasMessageMatching(TEMPLATE_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaServiceTemplateProvider().write(null, new JpaToscaServiceTemplate());
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaServiceTemplateProvider().write(null, new JpaToscaServiceTemplate()))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaServiceTemplateProvider().read(null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaServiceTemplateProvider().read(null))
+ .hasMessageMatching(DAO_IS_NULL);
- assertThatThrownBy(() -> {
- new SimpleToscaServiceTemplateProvider().delete(null);
- }).hasMessageMatching(DAO_IS_NULL);
+ assertThatThrownBy(() -> new SimpleToscaServiceTemplateProvider().delete(null))
+ .hasMessageMatching(DAO_IS_NULL);
}
}
<!--
============LICENSE_START=======================================================
Copyright (C) 2018 Ericsson. All rights reserved.
- Copyright (C) 2019-2020, 2022-2024 Nordix Foundation.
+ Copyright (C) 2019-2020, 2022-2025 Nordix Foundation.
Copyright (C) 2019-2021 AT&T Intellectual Property. All rights reserved.
Modifications Copyright (C) 2020 Bell Canada.
================================================================================
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.mariadb.jdbc</groupId>
- <artifactId>mariadb-java-client</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
Code Review / policy / models.git / commitdiff