Move examples into separate module 92/82692/1
authorliamfallon <liam.fallon@est.tech>
Tue, 19 Mar 2019 16:29:56 +0000 (16:29 +0000)
committerliamfallon <liam.fallon@est.tech>
Tue, 19 Mar 2019 16:29:56 +0000 (16:29 +0000)
Issue-ID: POLICY-1195
Change-Id: Id2dc5b5b490134648ca267e27b795f3f4c03bc7b
Signed-off-by: liamfallon <liam.fallon@est.tech>
40 files changed:
models-dao/src/test/java/org/onap/policy/models/dao/EntityTest.java
models-examples/pom.xml [new file with mode: 0644]
models-examples/src/main/resources/policies/README.txt [moved from models-tosca/src/test/resources/policies/README.txt with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json [moved from models-tosca/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.json with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml [moved from models-tosca/src/test/resources/policies/vCPE.policy.monitoring.input.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml [moved from models-tosca/src/test/resources/policies/vCPE.policy.monitoring.output.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.operational.input.json [moved from models-tosca/src/test/resources/policies/vCPE.policy.operational.input.json with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.yaml [moved from models-tosca/src/test/resources/policies/vCPE.policy.operational.input.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.operational.output.json [moved from models-tosca/src/test/resources/policies/vCPE.policy.operational.output.json with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.json [moved from models-tosca/src/test/resources/policies/vCPE.policy.operational.output.tosca.json with 100% similarity]
models-examples/src/main/resources/policies/vCPE.policy.operational.output.tosca.yaml [moved from models-tosca/src/test/resources/policies/vCPE.policy.operational.output.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.input.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.guard.frequency.input.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.guard.frequency.output.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.guard.frequency.output.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.input.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.guard.minmax.input.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.guard.minmax.output.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.guard.minmax.output.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml [moved from models-tosca/src/test/resources/policies/vDNS.policy.monitoring.input.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml [moved from models-tosca/src/test/resources/policies/vDNS.policy.monitoring.output.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.operational.input.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.operational.input.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.operational.input.tosca.yaml [moved from models-tosca/src/test/resources/policies/vDNS.policy.operational.input.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.operational.output.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.operational.output.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.json [moved from models-tosca/src/test/resources/policies/vDNS.policy.operational.output.tosca.json with 100% similarity]
models-examples/src/main/resources/policies/vDNS.policy.operational.output.tosca.yaml [moved from models-tosca/src/test/resources/policies/vDNS.policy.operational.output.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json [moved from models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.json with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml [moved from models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml [moved from models-tosca/src/test/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.operational.input.json [moved from models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.json with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.json [moved from models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.tosca.json with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.operational.input.tosca.yaml [moved from models-tosca/src/test/resources/policies/vFirewall.policy.operational.input.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.operational.output.json [moved from models-tosca/src/test/resources/policies/vFirewall.policy.operational.output.json with 100% similarity]
models-examples/src/main/resources/policies/vFirewall.policy.operational.output.tosca.yaml [moved from models-tosca/src/test/resources/policies/vFirewall.policy.operational.output.tosca.yaml with 100% similarity]
models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml [moved from models-tosca/src/test/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml with 100% similarity]
models-examples/src/main/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml [moved from models-tosca/src/test/resources/policytypes/onap.policy.monitoring.cdap.tca.hi.lo.app.yaml with 100% similarity]
models-provider/pom.xml
models-tosca/pom.xml
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/concepts/ToscaEntityType.java
models-tosca/src/main/java/org/onap/policy/models/tosca/simple/serialization/ToscaPoliciesJsonAdapter.java
models-tosca/src/test/java/org/onap/policy/models/tosca/legacy/serialization/LegacyOperationalPolicySerializationTest.java
models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
pom.xml

index 8278cfe..9b07dfb 100644 (file)
@@ -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 (file)
index 0000000..6eb8dab
--- /dev/null
@@ -0,0 +1,34 @@
+<!--
+  ============LICENSE_START=======================================================
+   Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+  ================================================================================
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  SPDX-License-Identifier: Apache-2.0
+  ============LICENSE_END=========================================================
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.onap.policy.models</groupId>
+        <artifactId>policy-models</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>policy-models-examples</artifactId>
+
+    <name>${project.artifactId}</name>
+    <description>Various examples of policy type and policy models in various formats</description>
+</project>
index 755aea7..8da16ed 100644 (file)
     <description>The provider interface that allows components to manipualte models in the database</description>
 
     <dependencies>
+        <dependency>
+            <groupId>org.onap.policy.common</groupId>
+            <artifactId>common-parameters</artifactId>
+            <version>${policy.common.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.onap.policy.models</groupId>
             <artifactId>policy-models-base</artifactId>
index 56c8d7c..019c5b3 100644 (file)
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.onap.policy.models</groupId>
+            <artifactId>policy-models-examples</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.onap.policy.common</groupId>
             <artifactId>gson</artifactId>
index 8b6dd40..7eaf58b 100644 (file)
@@ -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)
index 7672104..3c9deb7 100644 (file)
@@ -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);
index 4c3cbc8..565fd6c 100644 (file)
@@ -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 c0df329..8d80849 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,7 @@
         <module>models-pap</module>
         <module>models-decisions</module>
         <module>models-provider</module>
+        <module>models-examples</module>
     </modules>
 
     <distributionManagement>
             <artifactId>slf4j-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>