From 9727c320342dfaffeb13c4b5894fb4a9047943d7 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Tue, 19 Mar 2019 16:29:56 +0000 Subject: [PATCH] Move examples into separate module Issue-ID: POLICY-1195 Change-Id: Id2dc5b5b490134648ca267e27b795f3f4c03bc7b Signed-off-by: liamfallon --- .../org/onap/policy/models/dao/EntityTest.java | 2 -- models-examples/pom.xml | 34 ++++++++++++++++++++++ .../src/main}/resources/policies/README.txt | 0 .../vCPE.policy.monitoring.input.tosca.json | 0 .../vCPE.policy.monitoring.input.tosca.yaml | 0 .../vCPE.policy.monitoring.output.tosca.yaml | 0 .../policies/vCPE.policy.operational.input.json | 0 .../vCPE.policy.operational.input.tosca.yaml | 0 .../policies/vCPE.policy.operational.output.json | 0 .../vCPE.policy.operational.output.tosca.json | 0 .../vCPE.policy.operational.output.tosca.yaml | 0 .../vDNS.policy.guard.frequency.input.json | 0 .../vDNS.policy.guard.frequency.output.json | 0 .../policies/vDNS.policy.guard.minmax.input.json | 0 .../policies/vDNS.policy.guard.minmax.output.json | 0 .../vDNS.policy.monitoring.input.tosca.json | 0 .../vDNS.policy.monitoring.input.tosca.yaml | 0 .../vDNS.policy.monitoring.output.tosca.yaml | 0 .../policies/vDNS.policy.operational.input.json | 0 .../vDNS.policy.operational.input.tosca.yaml | 0 .../policies/vDNS.policy.operational.output.json | 0 .../vDNS.policy.operational.output.tosca.json | 0 .../vDNS.policy.operational.output.tosca.yaml | 0 .../vFirewall.policy.monitoring.input.tosca.json | 0 .../vFirewall.policy.monitoring.input.tosca.yaml | 0 .../vFirewall.policy.monitoring.output.tosca.yaml | 0 .../vFirewall.policy.operational.input.json | 0 .../vFirewall.policy.operational.input.tosca.json | 0 .../vFirewall.policy.operational.input.tosca.yaml | 0 .../vFirewall.policy.operational.output.json | 0 .../vFirewall.policy.operational.output.tosca.yaml | 0 ...n2.collectors.datafile.datafile-app-server.yaml | 0 .../onap.policy.monitoring.cdap.tca.hi.lo.app.yaml | 0 models-provider/pom.xml | 6 ++++ models-tosca/pom.xml | 6 ++++ .../tosca/simple/concepts/ToscaEntityType.java | 6 ++-- .../serialization/ToscaPoliciesJsonAdapter.java | 1 - .../LegacyOperationalPolicySerializationTest.java | 8 ++--- .../MonitoringPolicySerializationTest.java | 13 ++++----- pom.xml | 10 +++++++ 40 files changed, 68 insertions(+), 18 deletions(-) create mode 100644 models-examples/pom.xml rename {models-tosca/src/test => models-examples/src/main}/resources/policies/README.txt (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.monitoring.input.tosca.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.monitoring.input.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.monitoring.output.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.operational.input.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.operational.input.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.operational.output.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.operational.output.tosca.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vCPE.policy.operational.output.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.guard.frequency.input.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.guard.frequency.output.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.guard.minmax.input.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.guard.minmax.output.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.monitoring.input.tosca.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.monitoring.input.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.monitoring.output.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.operational.input.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.operational.input.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.operational.output.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.operational.output.tosca.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vDNS.policy.operational.output.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.monitoring.input.tosca.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.operational.input.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.operational.input.tosca.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.operational.input.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.operational.output.json (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policies/vFirewall.policy.operational.output.tosca.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml (100%) rename {models-tosca/src/test => models-examples/src/main}/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml (100%) diff --git a/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java b/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java index 8278cfe20..9b07dfbb1 100644 --- a/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java +++ b/models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java @@ -26,7 +26,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.File; import java.sql.Connection; import java.sql.DriverManager; import java.util.ArrayList; @@ -61,7 +60,6 @@ public class EntityTest { @After public void teardown() throws Exception { connection.close(); - new File("derby.log").delete(); } @Test diff --git a/models-examples/pom.xml b/models-examples/pom.xml new file mode 100644 index 000000000..6eb8dabc1 --- /dev/null +++ b/models-examples/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + org.onap.policy.models + policy-models + 2.0.0-SNAPSHOT + + + policy-models-examples + + ${project.artifactId} + Various examples of policy type and policy models in various formats + diff --git a/models-tosca/src/test/resources/policies/README.txt b/models-examples/src/main/resources/policies/README.txt similarity index 100% rename from models-tosca/src/test/resources/policies/README.txt rename to models-examples/src/main/resources/policies/README.txt diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.json rename to models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.yaml rename to models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.monitoring.output.tosca.yaml rename to models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.operational.input.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.json similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.operational.input.json rename to models-examples/src/main/resources/policies/vCPE.policy.operational.input.json diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.operational.input.tosca.yaml rename to models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.operational.output.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.json similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.operational.output.json rename to models-examples/src/main/resources/policies/vCPE.policy.operational.output.json diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.operational.output.tosca.json rename to models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json diff --git a/models-tosca/src/test/resources/policies/vCPE.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vCPE.policy.operational.output.tosca.yaml rename to models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.guard.frequency.input.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.guard.frequency.input.json rename to models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.guard.frequency.output.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.guard.frequency.output.json rename to models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.guard.minmax.input.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.guard.minmax.input.json rename to models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.guard.minmax.output.json b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.guard.minmax.output.json rename to models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.json rename to models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.yaml rename to models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.monitoring.output.tosca.yaml rename to models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.operational.input.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.operational.input.json rename to models-examples/src/main/resources/policies/vDNS.policy.operational.input.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.operational.input.tosca.yaml rename to models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.operational.output.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.operational.output.json rename to models-examples/src/main/resources/policies/vDNS.policy.operational.output.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.operational.output.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.operational.output.tosca.json rename to models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json diff --git a/models-tosca/src/test/resources/policies/vDNS.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vDNS.policy.operational.output.tosca.yaml rename to models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.json rename to models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml rename to models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml rename to models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.json b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.json similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.json rename to models-examples/src/main/resources/policies/vFirewall.policy.operational.input.json diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.tosca.json rename to models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.tosca.yaml rename to models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.operational.output.json b/models-examples/src/main/resources/policies/vFirewall.policy.operational.output.json similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.operational.output.json rename to models-examples/src/main/resources/policies/vFirewall.policy.operational.output.json diff --git a/models-tosca/src/test/resources/policies/vFirewall.policy.operational.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml similarity index 100% rename from models-tosca/src/test/resources/policies/vFirewall.policy.operational.output.tosca.yaml rename to models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml diff --git a/models-tosca/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml similarity index 100% rename from models-tosca/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml rename to models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml diff --git a/models-tosca/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml b/models-examples/src/main/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml similarity index 100% rename from models-tosca/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml rename to models-examples/src/main/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml diff --git a/models-provider/pom.xml b/models-provider/pom.xml index 755aea7cb..8da16edab 100644 --- a/models-provider/pom.xml +++ b/models-provider/pom.xml @@ -33,6 +33,12 @@ The provider interface that allows components to manipualte models in the database + + org.onap.policy.common + common-parameters + ${policy.common.version} + + org.onap.policy.models policy-models-base diff --git a/models-tosca/pom.xml b/models-tosca/pom.xml index 56c8d7c15..019c5b3fd 100644 --- a/models-tosca/pom.xml +++ b/models-tosca/pom.xml @@ -39,6 +39,12 @@ ${project.version} + + org.onap.policy.models + policy-models-examples + ${project.version} + + org.onap.policy.common gson diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java index 8b6dd40d6..7eaf58b2e 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java @@ -30,11 +30,10 @@ import java.util.TreeMap; import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.EmbeddedId; -import javax.persistence.Entity; import javax.persistence.Inheritance; import javax.persistence.InheritanceType; +import javax.persistence.MappedSuperclass; import javax.persistence.OneToMany; -import javax.persistence.Table; import lombok.Data; import lombok.EqualsAndHashCode; @@ -54,8 +53,7 @@ import org.onap.policy.models.base.PfValidationResult.ValidationResult; /** * Class to represent the EntrySchema of list/map property in TOSCA definition. */ -@Entity -@Table(name = "ToscaEntityType") +@MappedSuperclass @Inheritance(strategy = InheritanceType.TABLE_PER_CLASS) @Data @EqualsAndHashCode(callSuper = false) diff --git a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaPoliciesJsonAdapter.java b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaPoliciesJsonAdapter.java index 424373c3d..3f25b708f 100644 --- a/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaPoliciesJsonAdapter.java +++ b/models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaPoliciesJsonAdapter.java @@ -30,7 +30,6 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.Type; import java.util.Iterator; -import java.util.Map.Entry; import lombok.NonNull; import org.onap.policy.models.base.PfConceptKey; diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/serialization/LegacyOperationalPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/serialization/LegacyOperationalPolicySerializationTest.java index 76721046e..3c9deb7df 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/serialization/LegacyOperationalPolicySerializationTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/serialization/LegacyOperationalPolicySerializationTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import org.junit.Before; import org.junit.Test; -import org.onap.policy.common.utils.resources.TextFileUtils; +import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.models.base.PfValidationResult; import org.onap.policy.models.tosca.legacy.concepts.LegacyOperationalPolicy; import org.onap.policy.models.tosca.legacy.mapping.LegacyOperationalPolicyMapper; @@ -57,9 +57,9 @@ public class LegacyOperationalPolicySerializationTest { @Test public void testJsonDeserialization() throws JsonSyntaxException, IOException { - LegacyOperationalPolicy legacyOperationalPolicy = gson.fromJson( - TextFileUtils.getTextFileAsString("src/test/resources/policies/vCPE.policy.operational.input.json"), - LegacyOperationalPolicy.class); + String vcpePolicyJson = ResourceUtils.getResourceAsString("policies/vCPE.policy.operational.input.json"); + + LegacyOperationalPolicy legacyOperationalPolicy = gson.fromJson(vcpePolicyJson, LegacyOperationalPolicy.class); ToscaServiceTemplate serviceTemplate = new LegacyOperationalPolicyMapper().toToscaServiceTemplate(legacyOperationalPolicy); diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java index 4c3cbc85a..565fd6cb4 100644 --- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java +++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java @@ -31,7 +31,7 @@ import java.io.IOException; import org.junit.Before; import org.junit.Test; -import org.onap.policy.common.utils.resources.TextFileUtils; +import org.onap.policy.common.utils.resources.ResourceUtils; import org.onap.policy.models.base.PfValidationResult; import org.onap.policy.models.tosca.simple.concepts.ToscaServiceTemplate; import org.onap.policy.models.tosca.simple.serialization.ToscaServiceTemplateMessageBodyHandler; @@ -57,11 +57,9 @@ public class MonitoringPolicySerializationTest { @Test public void testJsonDeserialization() throws JsonSyntaxException, IOException { - ToscaServiceTemplate serviceTemplate = gson.fromJson( - TextFileUtils - .getTextFileAsString("src/test/resources/policies/vCPE.policy.monitoring.input.tosca.json"), - ToscaServiceTemplate.class); + String vcpePolicyJson = ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.json"); + ToscaServiceTemplate serviceTemplate = gson.fromJson(vcpePolicyJson, ToscaServiceTemplate.class); assertNotNull(serviceTemplate); LOGGER.info(serviceTemplate.validate(new PfValidationResult()).toString()); assertTrue(serviceTemplate.validate(new PfValidationResult()).isValid()); @@ -73,8 +71,9 @@ public class MonitoringPolicySerializationTest { @Test public void testYamlDeserialization() throws JsonSyntaxException, IOException { Yaml yaml = new Yaml(); - Object yamlObject = yaml.load(TextFileUtils - .getTextFileAsString("src/test/resources/policies/vCPE.policy.monitoring.input.tosca.yaml")); + + String vcpePolicyYaml = ResourceUtils.getResourceAsString("policies/vCPE.policy.monitoring.input.tosca.yaml"); + Object yamlObject = yaml.load(vcpePolicyYaml); String yamlAsJsonString = new Gson().toJson(yamlObject); diff --git a/pom.xml b/pom.xml index c0df3294f..8d80849fb 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,7 @@ models-pap models-decisions models-provider + models-examples @@ -78,6 +79,15 @@ slf4j-api + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + org.projectlombok lombok -- 2.16.6