Rename maven modules to mirror directory structure 93/31593/6
authorliamfallon <liam.fallon@ericsson.com>
Tue, 13 Feb 2018 11:29:56 +0000 (11:29 +0000)
committerliamfallon <liam.fallon@ericsson.com>
Mon, 19 Feb 2018 14:31:28 +0000 (14:31 +0000)
The naming of Maven modules in drools-applications was not
aligned with the directory structure in the git repository
of drools-applications. Therefore it was difficult to
see the strucutre of the repository in Eclipse and other
IDEs. This change amends the Maven module IDs to
reflect the repository directory structure.

This patch reset fixes the previos patch set, where many
references to maven modules internally in drools-applciations
were missed. See also changes in engine and docker repos.

Updated to reflect repo directory structure in maven
artifact groups.

Issue-ID: POLICY-238
Change-Id: I8ab1a7ecdb664045222bbbfda269135e3e449109
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
85 files changed:
controlloop/common/actors/actor.appc/pom.xml
controlloop/common/actors/actor.appclcm/pom.xml
controlloop/common/actors/actor.so/pom.xml
controlloop/common/actors/actor.test/pom.xml
controlloop/common/actors/actor.vfc/pom.xml
controlloop/common/actors/actorServiceProvider/pom.xml
controlloop/common/actors/pom.xml
controlloop/common/eventmanager/pom.xml
controlloop/common/feature-controlloop-utils/pom.xml
controlloop/common/guard/pom.xml
controlloop/common/model-impl/aai/pom.xml
controlloop/common/model-impl/appc/pom.xml
controlloop/common/model-impl/appclcm/pom.xml
controlloop/common/model-impl/events/pom.xml
controlloop/common/model-impl/pom.xml
controlloop/common/model-impl/rest/pom.xml
controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestGet.java
controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestPair.java
controlloop/common/model-impl/rest/src/test/java/org/onap/policy/rest/TestPost.java
controlloop/common/model-impl/sdc/pom.xml
controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResource.java
controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestResourceInstance.java
controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestService.java
controlloop/common/model-impl/sdc/src/test/java/org/onap/policy/sdc/TestServiceInstance.java
controlloop/common/model-impl/so/pom.xml
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOAsyncRequestStatus.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOCloudConfiguration.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOInstanceReferences.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOPolicyExceptionHolder.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstance.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORelatedInstanceListElement.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequest.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestError.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestInfo.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestParameters.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestReferences.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SORequestStatus.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOServiceExceptionHolder.java
controlloop/common/model-impl/so/src/main/java/org/onap/policy/so/SOSubscriberInfo.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoAsyncRequestStatus.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoCloudConfiguration.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoInstanceReferences.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoModelInfo.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoPolicyExceptionHolder.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstance.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRelatedInstanceListElement.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequest.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestDetails.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestError.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestInfo.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestParameters.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestReferences.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoRequestStatus.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponse.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoResponseWrapper.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoServiceExceptionHolder.java
controlloop/common/model-impl/so/src/test/java/org/onap/policy/so/TestSoSubscriberInfo.java
controlloop/common/model-impl/trafficgenerator/pom.xml
controlloop/common/model-impl/vfc/pom.xml
controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealActionVmInfo.java
controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealAdditionalParams.java
controlloop/common/model-impl/vfc/src/main/java/org/onap/policy/vfc/VFCHealRequest.java
controlloop/common/msb/pom.xml
controlloop/common/policy-yaml/pom.xml
controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Constraint.java
controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/ControlLoopGuard.java
controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/Guard.java
controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/GuardPolicy.java
controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/MatchParameters.java
controlloop/common/policy-yaml/src/main/java/org/onap/policy/controlloop/policy/guard/builder/impl/ControlLoopGuardBuilderImpl.java
controlloop/common/policy-yaml/src/test/resources/v2.0.0/policy_vService.yaml
controlloop/common/pom.xml
controlloop/common/simulators/pom.xml
controlloop/packages/apps/pom.xml
controlloop/packages/apps/src/files/apps-installer
controlloop/packages/artifacts/pom.xml
controlloop/packages/basex/pom.xml
controlloop/packages/basex/src/files/bin/create-cl-amsterdam
controlloop/packages/pom.xml
controlloop/pom.xml
controlloop/templates/archetype-cl-amsterdam/pom.xml
controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml
controlloop/templates/pom.xml
controlloop/templates/template.demo/pom.xml
pom.xml

index eea703b..46418ae 100644 (file)
@@ -2,61 +2,64 @@
 <project
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-           <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>actors</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>actor.appc</artifactId>
-       <dependencies>
-               <dependency>
-               <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>trafficgenerator</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                  <groupId>org.onap.policy.drools-pdp</groupId>
-                  <artifactId>policy-management</artifactId>
-                  <version>${project.version}</version>
-                  <scope>provided</scope>
-               </dependency>
-       </dependencies>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+    <artifactId>actors</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>actor.appc</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>trafficgenerator</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
index be561bd..c0f3973 100644 (file)
@@ -2,61 +2,64 @@
 <project
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
        xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-           <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>actors</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>actor.appclcm</artifactId>
-       <dependencies>
-               <dependency>
-               <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                  <groupId>org.onap.policy.drools-pdp</groupId>
-                  <artifactId>policy-management</artifactId>
-                  <version>${project.version}</version>
-                  <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+    <artifactId>actors</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>actor.appclcm</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appclcm</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 3246e89..3a8ae1c 100644 (file)
@@ -1,67 +1,70 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>actors</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>actor.so</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-core</artifactId>
-                       <version>6.5.0.Final</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-management</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+    <artifactId>actors</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>actor.so</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 27cb029..429e095 100644 (file)
@@ -1,64 +1,67 @@
 <?xml version="1.0"?>
 <project
-       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-       xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>actors</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>actor.test</artifactId>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+    <artifactId>actors</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>actor.test</artifactId>
+
+  <build>
+    <plugins>
+      <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.so</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appclcm</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 45d1e89..62d11ac 100644 (file)
@@ -1,55 +1,58 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>actors</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>actor.vfc</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-management</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+    <artifactId>actors</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>actor.vfc</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 05f486e..52177ea 100644 (file)
@@ -1,20 +1,22 @@
 <?xml version="1.0"?>
 <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>actors</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>actorServiceProvider</artifactId>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+    <artifactId>actors</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>actorServiceProvider</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index b7691f8..3263eec 100644 (file)
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-       
-       <artifactId>actors</artifactId>
-    <packaging>pom</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>pom</packaging>
+  
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+  <artifactId>actors</artifactId>
 
-    <parent>
-        <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>common</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
-    
-       <modules>
-               <module>actorServiceProvider</module>
-               <module>actor.appc</module>
-               <module>actor.vfc</module>
-               <module>actor.appclcm</module>
-           <module>actor.so</module>
-               <module>actor.test</module>
-    </modules>
-       <dependencies>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>19.0</version>
-               </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>policy-yaml</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
+  <modules>
+    <module>actorServiceProvider</module>
+    <module>actor.appc</module>
+    <module>actor.vfc</module>
+    <module>actor.appclcm</module>
+    <module>actor.so</module>
+    <module>actor.test</module>
+  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>19.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 </project>
index e6d090d..d0ce651 100644 (file)
   -->
 
 <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.drools-applications</groupId>
-               <artifactId>common</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>eventmanager</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>org.eclipse.persistence.jpa</artifactId>
-                       <version>2.7.0</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml</artifactId>
-                       <version>1.0.1</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>guard</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>trafficgenerator</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>sdc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>4.5.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-management</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+        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.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>eventmanager</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.jpa</artifactId>
+      <version>2.7.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.att.research.xacml</groupId>
+      <artifactId>xacml</artifactId>
+      <version>1.0.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.so</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appclcm</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>guard</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appclcm</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>trafficgenerator</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>sdc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 5cec48a..4af489d 100644 (file)
   -->
 
 <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.drools-applications</groupId>
-               <artifactId>common</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>feature-controlloop-utils</artifactId>
-       <description>
-               Loadable PDP-D feature module to enable simulator usage in a non-junit 
-               lab environments.  In a pdp-d lab environment this capability can be 
-               enabled with the "feature" mechanisms.
-       </description>
-       
-       <properties>
-               <maven.compiler.source>1.8</maven.compiler.source>
-               <maven.compiler.target>1.8</maven.compiler.target>
-       </properties>
+        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>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <version>2.6</version>
-                               <executions>
-                                       <execution>
-                                               <id>zipfile</id>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <attach>true</attach>
-                                                       <finalName>${project.artifactId}-${project.version}</finalName>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/assemble_zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-dependency-plugin</artifactId>
-                               <version>2.8</version>
-                               <executions>
-                                       <execution>
-                                               <id>copy-dependencies</id>
-                                               <goals>
-                                                       <goal>copy-dependencies</goal>
-                                               </goals>
-                                               <phase>prepare-package</phase>
-                                               <configuration>
-                                                       <transitive>false</transitive>
-                                                       <outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
-                                                       <overWriteReleases>false</overWriteReleases>
-                                                       <overWriteSnapshots>true</overWriteSnapshots>
-                                                       <overWriteIfNewer>true</overWriteIfNewer>
-                                                       <useRepositoryLayout>false</useRepositoryLayout>
-                                                       <addParentPoms>false</addParentPoms>
-                                                       <copyPom>false</copyPom>
-                                                       <includeScope>runtime</includeScope>
-                                                       <excludeTransitive>true</excludeTransitive>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-management</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-endpoints</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>rest</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>feature-controlloop-utils</artifactId>
+
+  <description>
+    Loadable PDP-D feature module to enable simulator usage in a non-junit 
+    lab environments.  In a pdp-d lab environment this capability can be 
+    enabled with the "feature" mechanisms.
+  </description>
+  
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <build>
+    <plugins>
+      <plugin>
+       <artifactId>maven-assembly-plugin</artifactId>
+       <version>2.6</version>
+       <executions>
+         <execution>
+           <id>zipfile</id>
+           <goals>
+             <goal>single</goal>
+           </goals>
+           <phase>package</phase>
+           <configuration>
+             <attach>true</attach>
+             <finalName>${project.artifactId}-${project.version}</finalName>
+             <descriptors>
+               <descriptor>src/assembly/assemble_zip.xml</descriptor>
+             </descriptors>
+             <appendAssemblyId>false</appendAssemblyId>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+      
+      <plugin>
+       <groupId>org.apache.maven.plugins</groupId>
+       <artifactId>maven-dependency-plugin</artifactId>
+       <version>2.8</version>
+       <executions>
+         <execution>
+           <id>copy-dependencies</id>
+           <goals>
+             <goal>copy-dependencies</goal>
+           </goals>
+           <phase>prepare-package</phase>
+           <configuration>
+             <transitive>false</transitive>
+             <outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
+             <overWriteReleases>false</overWriteReleases>
+             <overWriteSnapshots>true</overWriteSnapshots>
+             <overWriteIfNewer>true</overWriteIfNewer>
+             <useRepositoryLayout>false</useRepositoryLayout>
+             <addParentPoms>false</addParentPoms>
+             <copyPom>false</copyPom>
+             <includeScope>runtime</includeScope>
+             <excludeTransitive>true</excludeTransitive>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-endpoints</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>rest</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index fa31577..36c7e19 100644 (file)
@@ -1,76 +1,79 @@
 <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.drools-applications</groupId>
-               <artifactId>common</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
   <artifactId>guard</artifactId>
+
   <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>policy-yaml</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-       <dependency>
-               <groupId>com.att.research.xacml</groupId>
-               <artifactId>xacml-pdp</artifactId>
-               <version>1.0.1</version>
-       </dependency>
-       <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-       <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-       <dependency>
-                       <groupId>org.apache.httpcomponents</groupId>
-                       <artifactId>httpclient</artifactId>
-                       <version>4.5.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-core</artifactId>
-                       <version>6.5.0.Final</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-            <groupId>org.eclipse.persistence</groupId>
-            <artifactId>org.eclipse.persistence.jpa</artifactId>
-            <version>2.7.0</version>
-                       <scope>provided</scope>
-        </dependency>
-        <dependency>
-               <groupId>org.onap.policy.drools-pdp</groupId>
-               <artifactId>policy-management</artifactId>
-               <version>${project.version}</version>
-               <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.drools-applications</groupId>
-            <artifactId>simulators</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>2.13.0</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>[1.4.186,)</version>
-            <scope>test</scope>
-        </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.att.research.xacml</groupId>
+      <artifactId>xacml-pdp</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.jpa</artifactId>
+      <version>2.7.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.13.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>[1.4.186,)</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
index 19341af..5d52781 100644 (file)
@@ -1,50 +1,50 @@
 <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>
+        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>
 
-       <artifactId>aai</artifactId>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <artifactId>aai</artifactId>
 
-       <dependencies>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>rest</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <version>2.13.0</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.powermock</groupId>
-                       <artifactId>powermock-core</artifactId>
-                       <version>1.7.3</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-endpoints</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>rest</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.13.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-core</artifactId>
+      <version>1.7.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-endpoints</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
index ce43e15..d69f1ed 100644 (file)
 
 <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>
-  <artifactId>appc</artifactId>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>appc</artifactId>
 
   <dependencies>
-       <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>4.12</version>
-               <scope>test</scope>
-       </dependency>
-       <dependency>
-               <groupId>com.google.code.gson</groupId>
-               <artifactId>gson</artifactId>
-               <version>2.5</version>
-               <scope>provided</scope>
-       </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
index 73ff74f..26368ee 100644 (file)
 
 <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>
-  <artifactId>appclcm</artifactId>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>appclcm</artifactId>
 
   <dependencies>
-       <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>4.12</version>
-               <scope>test</scope>
-       </dependency>
-       <dependency>
-               <groupId>com.google.code.gson</groupId>
-               <artifactId>gson</artifactId>
-               <version>2.5</version>
-               <scope>provided</scope>
-       </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
index e95afc8..f3d56f6 100644 (file)
 
 <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.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
   <artifactId>events</artifactId>
+
   <dependencies>
-       <dependency>
-               <groupId>com.google.code.gson</groupId>
-               <artifactId>gson</artifactId>
-               <version>2.5</version>
-               <scope>provided</scope>
-       </dependency>
     <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.12</version>
-        <scope>test</scope>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>
index 78ddad7..2d61479 100644 (file)
   -->
 
 <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>
-    
-       <artifactId>model-impl</artifactId>
-    <packaging>pom</packaging>
-
-    <parent>
-        <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>common</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
+        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>
+  <packaging>pom</packaging>
+  
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+  <artifactId>model-impl</artifactId>
 
-    <modules>
-       <module>aai</module>
-       <module>appc</module>
-       <module>appclcm</module>
-        <module>events</module>
-        <module>so</module>
-       <module>rest</module>
-       <module>sdc</module>
-       <module>trafficgenerator</module>
-        <module>vfc</module>
-    </modules>
+  <modules>
+    <module>aai</module>
+    <module>appc</module>
+    <module>appclcm</module>
+    <module>events</module>
+    <module>so</module>
+    <module>rest</module>
+    <module>sdc</module>
+    <module>trafficgenerator</module>
+    <module>vfc</module>
+  </modules>
 
 
 </project>
index 2e1303e..06fd30d 100644 (file)
 <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>
 
-  <artifactId>rest</artifactId>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <artifactId>rest</artifactId>
 
   <dependencies>
-       <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>4.12</version>
-               <scope>test</scope>
-       </dependency>
-       <dependency>
-               <groupId>com.google.code.gson</groupId>
-               <artifactId>gson</artifactId>
-               <version>2.5</version>
-               <scope>provided</scope>
-       </dependency>
-       <dependency>
-           <groupId>org.apache.httpcomponents</groupId>
-           <artifactId>httpclient</artifactId>
-           <version>4.5.5</version>
-           <scope>provided</scope>
-       </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <version>4.5.5</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
index 96dec30..0bf1da8 100755 (executable)
@@ -1,52 +1,52 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * rest\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.rest;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-import org.onap.policy.rest.RESTManager.Pair;\r
-\r
-public class TestGet {\r
-\r
-    @Test(expected = NullPointerException.class)\r
-    public void testUrlNull() {\r
-        RESTManager mgr = new RESTManager();\r
-        mgr.get(null, "user", null, null);\r
-    }\r
-\r
-    @Test(expected = IllegalArgumentException.class)\r
-    public void testUsernameNull() {\r
-        RESTManager mgr = new RESTManager();\r
-        mgr.get("nothing", null, null, null);\r
-    }\r
-\r
-    @Test\r
-    public void testUrlExampleOrg() {\r
-        RESTManager mgr = new RESTManager();\r
-\r
-        Pair<Integer, String> result = mgr.get("http://www.example.org", "user", null, null);\r
-        assertEquals((Integer)200, result.a);\r
-        assertTrue(result.b != null);\r
-        assertTrue(result.b.length() > 0);\r
-    }\r
+/*-
+ * ============LICENSE_START=======================================================
+ * rest
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+import org.onap.policy.rest.RESTManager.Pair;
+
+public class TestGet {
+
+    @Test(expected = NullPointerException.class)
+    public void testUrlNull() {
+        RESTManager mgr = new RESTManager();
+        mgr.get(null, "user", null, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testUsernameNull() {
+        RESTManager mgr = new RESTManager();
+        mgr.get("nothing", null, null, null);
+    }
+
+    @Test
+    public void testUrlExampleOrg() {
+        RESTManager mgr = new RESTManager();
+
+        Pair<Integer, String> result = mgr.get("http://www.example.org", "user", null, null);
+        assertEquals((Integer)200, result.a);
+        assertTrue(result.b != null);
+        assertTrue(result.b.length() > 0);
+    }
 }
\ No newline at end of file
index 3ada0a7..aea5a73 100755 (executable)
@@ -1,42 +1,42 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * rest\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.rest;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-\r
-import org.junit.Test;\r
-import org.onap.policy.rest.RESTManager.Pair;\r
-\r
-public class TestPair {\r
-\r
-    @Test\r
-    public void testPair() {\r
-        RESTManager mgr = new RESTManager();\r
-\r
-        Pair<Integer, Integer> pii = mgr.new Pair<>(1, 2);\r
-        assertEquals((Integer) 1, (Integer) pii.a);\r
-        assertEquals((Integer) 2, (Integer) pii.b);\r
-\r
-        Pair<Integer, String> pis = mgr.new Pair<>(1, "test");\r
-        assertEquals((Integer) 1, (Integer) pis.a);\r
-        assertEquals("test", pis.b);\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * rest
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.onap.policy.rest.RESTManager.Pair;
+
+public class TestPair {
+
+    @Test
+    public void testPair() {
+        RESTManager mgr = new RESTManager();
+
+        Pair<Integer, Integer> pii = mgr.new Pair<>(1, 2);
+        assertEquals((Integer) 1, (Integer) pii.a);
+        assertEquals((Integer) 2, (Integer) pii.b);
+
+        Pair<Integer, String> pis = mgr.new Pair<>(1, "test");
+        assertEquals((Integer) 1, (Integer) pis.a);
+        assertEquals("test", pis.b);
+    }
+}
index 40f1b30..1cdde22 100755 (executable)
@@ -1,42 +1,42 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * rest\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.rest;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-\r
-import org.junit.Test;\r
-import org.onap.policy.rest.RESTManager.Pair;\r
-\r
-public class TestPost {\r
-\r
-    @Test(expected = IllegalArgumentException.class)\r
-    public void testUsernameNull() {\r
-        RESTManager mgr = new RESTManager();\r
-        mgr.post("nothing", null, null, null, null, null);\r
-    }\r
-\r
-    @Test\r
-    public void testBodyNull() {\r
-        RESTManager mgr = new RESTManager();\r
-        Pair<Integer, String> result = mgr.post("http://www.example.org", "user", null, null, null, null);\r
-        assertEquals(null, result);\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * rest
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.rest;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.onap.policy.rest.RESTManager.Pair;
+
+public class TestPost {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testUsernameNull() {
+        RESTManager mgr = new RESTManager();
+        mgr.post("nothing", null, null, null, null, null);
+    }
+
+    @Test
+    public void testBodyNull() {
+        RESTManager mgr = new RESTManager();
+        Pair<Integer, String> result = mgr.post("http://www.example.org", "user", null, null, null, null);
+        assertEquals(null, result);
+    }
+}
index 76c9de3..54724e6 100644 (file)
@@ -1,19 +1,21 @@
 <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.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>sdc</artifactId>
+        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.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>sdc</artifactId>
 
   <dependencies>
-       <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>4.12</version>
-               <scope>test</scope>
-       </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
index 58999f3..7e64787 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * sdc\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.sdc;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.util.UUID;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestResource {\r
-\r
-    @Test\r
-    public void testConstructors() {\r
-        Resource res = new Resource();\r
-        assertEquals(null, res.getResourceUUID());\r
-        assertEquals(null, res.getResourceInvariantUUID());\r
-        assertEquals(null, res.getResourceName());\r
-        assertEquals(null, res.getResourceType());\r
-        assertEquals(null, res.getResourceVersion());\r
-\r
-        UUID uuid = UUID.randomUUID();\r
-        res = new Resource(uuid);\r
-        assertEquals(uuid, res.getResourceUUID());\r
-        assertEquals(null, res.getResourceInvariantUUID());\r
-        assertEquals(null, res.getResourceName());\r
-        assertEquals(null, res.getResourceType());\r
-        assertEquals(null, res.getResourceVersion());\r
-\r
-        String name = "constTest";\r
-        res = new Resource(name, ResourceType.CP);\r
-        assertEquals(null, res.getResourceUUID());\r
-        assertEquals(name, res.getResourceName());\r
-        assertEquals(ResourceType.CP, res.getResourceType());\r
-        assertEquals(null, res.getResourceInvariantUUID());\r
-        assertEquals(null, res.getResourceVersion());\r
-\r
-        uuid = UUID.randomUUID();\r
-        UUID uuidInvariant = UUID.randomUUID();\r
-        name = "constTestUUID";\r
-        String version = "0.0.1";\r
-        res = new Resource(uuid, uuidInvariant, name, version, ResourceType.VF);\r
-        assertEquals(uuid, res.getResourceUUID());\r
-        assertEquals(uuidInvariant, res.getResourceInvariantUUID());\r
-        assertEquals(name, res.getResourceName());\r
-        assertEquals(ResourceType.VF, res.getResourceType());\r
-        assertEquals(version, res.getResourceVersion());\r
-\r
-        Resource r2 = new Resource(res);\r
-        assertEquals(uuid, r2.getResourceUUID());\r
-        assertEquals(uuidInvariant, r2.getResourceInvariantUUID());\r
-        assertEquals(name, r2.getResourceName());\r
-        assertEquals(ResourceType.VF, r2.getResourceType());\r
-        assertEquals(version, r2.getResourceVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testUuid() {\r
-        Resource res = new Resource();\r
-        UUID uuid = UUID.randomUUID();\r
-        res.setResourceUUID(uuid);\r
-        assertEquals(uuid, res.getResourceUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testInvariantUuid() {\r
-        Resource res = new Resource();\r
-        UUID uuid = UUID.randomUUID();\r
-        res.setResourceInvariantUUID(uuid);\r
-        assertEquals(uuid, res.getResourceInvariantUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testName() {\r
-        Resource res = new Resource();\r
-        String name = "nameTest";\r
-        res.setResourceName(name);\r
-        assertEquals(name, res.getResourceName());\r
-    }\r
-\r
-    @Test\r
-    public void testVersion() {\r
-        Resource res = new Resource();\r
-        String version = "versionTest";\r
-        res.setResourceVersion(version);\r
-        assertEquals(version, res.getResourceVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testType() {\r
-        Resource res = new Resource();\r
-        res.setResourceType(ResourceType.CP);\r
-        assertEquals(ResourceType.CP, res.getResourceType());\r
-    }\r
-\r
-    @Test\r
-    public void testEquals() {\r
-        Resource r1 = new Resource();\r
-        Resource r2 = new Resource(r1);\r
-        assertTrue(r1.equals(r2));\r
-        assertTrue(r2.equals(r1));\r
-\r
-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",\r
-                ResourceType.VFC);\r
-        r2 = new Resource(r1);\r
-        assertTrue(r1.equals(r2));\r
-        assertTrue(r2.equals(r1));\r
-    }\r
-\r
-    @Test\r
-    public void testToString() {\r
-        Resource r1 = new Resource();\r
-        Resource r2 = new Resource(r1);\r
-        assertEquals(r1.toString(), r2.toString());\r
-\r
-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",\r
-                ResourceType.VFC);\r
-        r2 = new Resource(r1);\r
-        assertEquals(r1.toString(), r2.toString());\r
-    }\r
-\r
-    @Test\r
-    public void testHashCode() {\r
-        Resource r1 = new Resource();\r
-        Resource r2 = new Resource(r1);\r
-        assertEquals(r1.hashCode(), r2.hashCode());\r
-\r
-        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",\r
-                ResourceType.VFC);\r
-        r2 = new Resource(r1);\r
-        assertEquals(r1.hashCode(), r2.hashCode());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestResource {
+
+    @Test
+    public void testConstructors() {
+        Resource res = new Resource();
+        assertEquals(null, res.getResourceUUID());
+        assertEquals(null, res.getResourceInvariantUUID());
+        assertEquals(null, res.getResourceName());
+        assertEquals(null, res.getResourceType());
+        assertEquals(null, res.getResourceVersion());
+
+        UUID uuid = UUID.randomUUID();
+        res = new Resource(uuid);
+        assertEquals(uuid, res.getResourceUUID());
+        assertEquals(null, res.getResourceInvariantUUID());
+        assertEquals(null, res.getResourceName());
+        assertEquals(null, res.getResourceType());
+        assertEquals(null, res.getResourceVersion());
+
+        String name = "constTest";
+        res = new Resource(name, ResourceType.CP);
+        assertEquals(null, res.getResourceUUID());
+        assertEquals(name, res.getResourceName());
+        assertEquals(ResourceType.CP, res.getResourceType());
+        assertEquals(null, res.getResourceInvariantUUID());
+        assertEquals(null, res.getResourceVersion());
+
+        uuid = UUID.randomUUID();
+        UUID uuidInvariant = UUID.randomUUID();
+        name = "constTestUUID";
+        String version = "0.0.1";
+        res = new Resource(uuid, uuidInvariant, name, version, ResourceType.VF);
+        assertEquals(uuid, res.getResourceUUID());
+        assertEquals(uuidInvariant, res.getResourceInvariantUUID());
+        assertEquals(name, res.getResourceName());
+        assertEquals(ResourceType.VF, res.getResourceType());
+        assertEquals(version, res.getResourceVersion());
+
+        Resource r2 = new Resource(res);
+        assertEquals(uuid, r2.getResourceUUID());
+        assertEquals(uuidInvariant, r2.getResourceInvariantUUID());
+        assertEquals(name, r2.getResourceName());
+        assertEquals(ResourceType.VF, r2.getResourceType());
+        assertEquals(version, r2.getResourceVersion());
+    }
+
+    @Test
+    public void testUuid() {
+        Resource res = new Resource();
+        UUID uuid = UUID.randomUUID();
+        res.setResourceUUID(uuid);
+        assertEquals(uuid, res.getResourceUUID());
+    }
+
+    @Test
+    public void testInvariantUuid() {
+        Resource res = new Resource();
+        UUID uuid = UUID.randomUUID();
+        res.setResourceInvariantUUID(uuid);
+        assertEquals(uuid, res.getResourceInvariantUUID());
+    }
+
+    @Test
+    public void testName() {
+        Resource res = new Resource();
+        String name = "nameTest";
+        res.setResourceName(name);
+        assertEquals(name, res.getResourceName());
+    }
+
+    @Test
+    public void testVersion() {
+        Resource res = new Resource();
+        String version = "versionTest";
+        res.setResourceVersion(version);
+        assertEquals(version, res.getResourceVersion());
+    }
+
+    @Test
+    public void testType() {
+        Resource res = new Resource();
+        res.setResourceType(ResourceType.CP);
+        assertEquals(ResourceType.CP, res.getResourceType());
+    }
+
+    @Test
+    public void testEquals() {
+        Resource r1 = new Resource();
+        Resource r2 = new Resource(r1);
+        assertTrue(r1.equals(r2));
+        assertTrue(r2.equals(r1));
+
+        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+                ResourceType.VFC);
+        r2 = new Resource(r1);
+        assertTrue(r1.equals(r2));
+        assertTrue(r2.equals(r1));
+    }
+
+    @Test
+    public void testToString() {
+        Resource r1 = new Resource();
+        Resource r2 = new Resource(r1);
+        assertEquals(r1.toString(), r2.toString());
+
+        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+                ResourceType.VFC);
+        r2 = new Resource(r1);
+        assertEquals(r1.toString(), r2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        Resource r1 = new Resource();
+        Resource r2 = new Resource(r1);
+        assertEquals(r1.hashCode(), r2.hashCode());
+
+        r1 = new Resource(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1",
+                ResourceType.VFC);
+        r2 = new Resource(r1);
+        assertEquals(r1.hashCode(), r2.hashCode());
+    }
+}
index ef5986f..77847f1 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * sdc\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.sdc;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.util.UUID;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestResourceInstance {\r
-\r
-    @Test\r
-    public void testConstructors() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        assertEquals(null, ri.getResourceInstanceName());\r
-        assertEquals(null, ri.getResourceUUID());\r
-        assertEquals(null, ri.getResourceInvariantUUID());\r
-        assertEquals(null, ri.getResourceName());\r
-        assertEquals(null, ri.getResourceType());\r
-        assertEquals(null, ri.getResourceVersion());\r
-\r
-        ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null);\r
-        assertEquals(null, ri2.getResourceInstanceName());\r
-        assertEquals(null, ri2.getResourceUUID());\r
-        assertEquals(null, ri2.getResourceInvariantUUID());\r
-        assertEquals(null, ri2.getResourceName());\r
-        assertEquals(null, ri2.getResourceType());\r
-        assertEquals(null, ri2.getResourceVersion());\r
-\r
-        ri2 = new ResourceInstance(ri);\r
-        assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName());\r
-        assertEquals(ri2.getResourceUUID(), ri.getResourceUUID());\r
-        assertEquals(ri2.getResourceInvariantUUID(), ri.getResourceInvariantUUID());\r
-        assertEquals(ri2.getResourceName(), ri.getResourceName());\r
-        assertEquals(ri2.getResourceType(), ri.getResourceType());\r
-        assertEquals(ri2.getResourceVersion(), ri.getResourceVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testInstanceName() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        String name = "nameTestInstance";\r
-        ri.setResourceInstanceName(name);;\r
-        assertEquals(name, ri.getResourceInstanceName());\r
-    }\r
-\r
-    @Test\r
-    public void testUuid() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        UUID uuid = UUID.randomUUID();\r
-        ri.setResourceUUID(uuid);\r
-        assertEquals(uuid, ri.getResourceUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testInvariantUuid() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        UUID uuid = UUID.randomUUID();\r
-        ri.setResourceInvariantUUID(uuid);\r
-        assertEquals(uuid, ri.getResourceInvariantUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testName() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        String name = "nameTest";\r
-        ri.setResourceName(name);\r
-        assertEquals(name, ri.getResourceName());\r
-    }\r
-\r
-    @Test\r
-    public void testVersion() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        String version = "versionTest";\r
-        ri.setResourceVersion(version);\r
-        assertEquals(version, ri.getResourceVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testType() {\r
-        ResourceInstance ri = new ResourceInstance();\r
-        ri.setResourceType(ResourceType.CP);\r
-        assertEquals(ResourceType.CP, ri.getResourceType());\r
-    }\r
-\r
-    @Test\r
-    public void testEquals() {\r
-        ResourceInstance ri1 = new ResourceInstance();\r
-        ResourceInstance ri2 = new ResourceInstance(ri1);\r
-        assertTrue(ri1.equals(ri2));\r
-        assertTrue(ri2.equals(ri1));\r
-\r
-        ri1.setResourceInstanceName("instance");\r
-        ri1.setResourceName("resource");\r
-        ri1.setResourceInvariantUUID(UUID.randomUUID());\r
-        ri1.setResourceInvariantUUID(UUID.randomUUID());\r
-        ri1.setResourceVersion("0.0.0");\r
-        ri1.setResourceType(ResourceType.VL);\r
-        ri2 = new ResourceInstance(ri1);\r
-        assertTrue(ri1.equals(ri2));\r
-        assertTrue(ri2.equals(ri1));\r
-    }\r
-\r
-    @Test\r
-    public void testToString() {\r
-        ResourceInstance ri1 = new ResourceInstance();\r
-        ResourceInstance ri2 = new ResourceInstance(ri1);\r
-        assertEquals(ri1.toString(), ri2.toString());\r
-\r
-        ri1.setResourceInstanceName("instance");\r
-        ri1.setResourceName("resource");\r
-        ri1.setResourceInvariantUUID(UUID.randomUUID());\r
-        ri1.setResourceInvariantUUID(UUID.randomUUID());\r
-        ri1.setResourceVersion("0.0.0");\r
-        ri1.setResourceType(ResourceType.VL);\r
-        ri2 = new ResourceInstance(ri1);\r
-        assertEquals(ri1.toString(), ri2.toString());\r
-    }\r
-\r
-    @Test\r
-    public void testHashCode() {\r
-        ResourceInstance ri1 = new ResourceInstance();\r
-        ResourceInstance ri2 = new ResourceInstance(ri1);\r
-        assertEquals(ri1.hashCode(), ri2.hashCode());\r
-\r
-        ri1.setResourceInstanceName("instance");\r
-        ri1.setResourceName("resource");\r
-        ri1.setResourceInvariantUUID(UUID.randomUUID());\r
-        ri1.setResourceInvariantUUID(UUID.randomUUID());\r
-        ri1.setResourceVersion("0.0.0");\r
-        ri1.setResourceType(ResourceType.VL);\r
-        ri2 = new ResourceInstance(ri1);\r
-        assertEquals(ri1.hashCode(), ri2.hashCode());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestResourceInstance {
+
+    @Test
+    public void testConstructors() {
+        ResourceInstance ri = new ResourceInstance();
+        assertEquals(null, ri.getResourceInstanceName());
+        assertEquals(null, ri.getResourceUUID());
+        assertEquals(null, ri.getResourceInvariantUUID());
+        assertEquals(null, ri.getResourceName());
+        assertEquals(null, ri.getResourceType());
+        assertEquals(null, ri.getResourceVersion());
+
+        ResourceInstance ri2 = new ResourceInstance((ResourceInstance) null);
+        assertEquals(null, ri2.getResourceInstanceName());
+        assertEquals(null, ri2.getResourceUUID());
+        assertEquals(null, ri2.getResourceInvariantUUID());
+        assertEquals(null, ri2.getResourceName());
+        assertEquals(null, ri2.getResourceType());
+        assertEquals(null, ri2.getResourceVersion());
+
+        ri2 = new ResourceInstance(ri);
+        assertEquals(ri2.getResourceInstanceName(), ri.getResourceInstanceName());
+        assertEquals(ri2.getResourceUUID(), ri.getResourceUUID());
+        assertEquals(ri2.getResourceInvariantUUID(), ri.getResourceInvariantUUID());
+        assertEquals(ri2.getResourceName(), ri.getResourceName());
+        assertEquals(ri2.getResourceType(), ri.getResourceType());
+        assertEquals(ri2.getResourceVersion(), ri.getResourceVersion());
+    }
+
+    @Test
+    public void testInstanceName() {
+        ResourceInstance ri = new ResourceInstance();
+        String name = "nameTestInstance";
+        ri.setResourceInstanceName(name);;
+        assertEquals(name, ri.getResourceInstanceName());
+    }
+
+    @Test
+    public void testUuid() {
+        ResourceInstance ri = new ResourceInstance();
+        UUID uuid = UUID.randomUUID();
+        ri.setResourceUUID(uuid);
+        assertEquals(uuid, ri.getResourceUUID());
+    }
+
+    @Test
+    public void testInvariantUuid() {
+        ResourceInstance ri = new ResourceInstance();
+        UUID uuid = UUID.randomUUID();
+        ri.setResourceInvariantUUID(uuid);
+        assertEquals(uuid, ri.getResourceInvariantUUID());
+    }
+
+    @Test
+    public void testName() {
+        ResourceInstance ri = new ResourceInstance();
+        String name = "nameTest";
+        ri.setResourceName(name);
+        assertEquals(name, ri.getResourceName());
+    }
+
+    @Test
+    public void testVersion() {
+        ResourceInstance ri = new ResourceInstance();
+        String version = "versionTest";
+        ri.setResourceVersion(version);
+        assertEquals(version, ri.getResourceVersion());
+    }
+
+    @Test
+    public void testType() {
+        ResourceInstance ri = new ResourceInstance();
+        ri.setResourceType(ResourceType.CP);
+        assertEquals(ResourceType.CP, ri.getResourceType());
+    }
+
+    @Test
+    public void testEquals() {
+        ResourceInstance ri1 = new ResourceInstance();
+        ResourceInstance ri2 = new ResourceInstance(ri1);
+        assertTrue(ri1.equals(ri2));
+        assertTrue(ri2.equals(ri1));
+
+        ri1.setResourceInstanceName("instance");
+        ri1.setResourceName("resource");
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceType(ResourceType.VL);
+        ri2 = new ResourceInstance(ri1);
+        assertTrue(ri1.equals(ri2));
+        assertTrue(ri2.equals(ri1));
+    }
+
+    @Test
+    public void testToString() {
+        ResourceInstance ri1 = new ResourceInstance();
+        ResourceInstance ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.toString(), ri2.toString());
+
+        ri1.setResourceInstanceName("instance");
+        ri1.setResourceName("resource");
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceType(ResourceType.VL);
+        ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.toString(), ri2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        ResourceInstance ri1 = new ResourceInstance();
+        ResourceInstance ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.hashCode(), ri2.hashCode());
+
+        ri1.setResourceInstanceName("instance");
+        ri1.setResourceName("resource");
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceInvariantUUID(UUID.randomUUID());
+        ri1.setResourceVersion("0.0.0");
+        ri1.setResourceType(ResourceType.VL);
+        ri2 = new ResourceInstance(ri1);
+        assertEquals(ri1.hashCode(), ri2.hashCode());
+    }
+}
index 4d1fa99..e576023 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * sdc\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.sdc;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.util.UUID;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestService {\r
-\r
-    @Test\r
-    public void testConstructors() {\r
-        Service svc = new Service();\r
-        assertEquals(null, svc.getServiceUUID());\r
-        assertEquals(null, svc.getServiceInvariantUUID());\r
-        assertEquals(null, svc.getServiceName());\r
-        assertEquals(null, svc.getServiceVersion());\r
-\r
-        UUID uuid = UUID.randomUUID();\r
-        svc = new Service(uuid);\r
-        assertEquals(uuid, svc.getServiceUUID());\r
-        assertEquals(null, svc.getServiceInvariantUUID());\r
-        assertEquals(null, svc.getServiceName());\r
-        assertEquals(null, svc.getServiceVersion());\r
-\r
-        String name = "constTest";\r
-        svc = new Service(name);\r
-        assertEquals(null, svc.getServiceUUID());\r
-        assertEquals(name, svc.getServiceName());\r
-        assertEquals(null, svc.getServiceInvariantUUID());\r
-        assertEquals(null, svc.getServiceVersion());\r
-\r
-        uuid = UUID.randomUUID();\r
-        UUID uuidInvariant = UUID.randomUUID();\r
-        name = "constTestUUID";\r
-        String version = "0.0.1";\r
-        svc = new Service(uuid, uuidInvariant, name, version);\r
-        assertEquals(uuid, svc.getServiceUUID());\r
-        assertEquals(uuidInvariant, svc.getServiceInvariantUUID());\r
-        assertEquals(name, svc.getServiceName());\r
-        assertEquals(version, svc.getServiceVersion());\r
-\r
-        Service s2 = new Service(svc);\r
-        assertEquals(uuid, s2.getServiceUUID());\r
-        assertEquals(uuidInvariant, s2.getServiceInvariantUUID());\r
-        assertEquals(name, s2.getServiceName());\r
-        assertEquals(version, s2.getServiceVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testUuid() {\r
-        Service svc = new Service();\r
-        UUID uuid = UUID.randomUUID();\r
-        svc.setServiceUUID(uuid);\r
-        assertEquals(uuid, svc.getServiceUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testInvariantUuid() {\r
-        Service svc = new Service();\r
-        UUID uuid = UUID.randomUUID();\r
-        svc.setServiceInvariantUUID(uuid);\r
-        assertEquals(uuid, svc.getServiceInvariantUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testName() {\r
-        Service svc = new Service();\r
-        String name = "nameTest";\r
-        svc.setServiceName(name);\r
-        assertEquals(name, svc.getServiceName());\r
-    }\r
-\r
-    @Test\r
-    public void testVersion() {\r
-        Service svc = new Service();\r
-        String version = "versionTest";\r
-        svc.setServiceVersion(version);\r
-        assertEquals(version, svc.getServiceVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testEquals() {\r
-        Service s1 = new Service();\r
-        Service s2 = new Service(s1);\r
-        assertTrue(s1.equals(s2));\r
-        assertTrue(s2.equals(s1));\r
-\r
-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");\r
-        s2 = new Service(s1);\r
-        assertTrue(s1.equals(s2));\r
-        assertTrue(s2.equals(s1));\r
-    }\r
-\r
-    @Test\r
-    public void testToString() {\r
-        Service s1 = new Service();\r
-        Service s2 = new Service(s1);\r
-        assertEquals(s1.toString(), s2.toString());\r
-\r
-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");\r
-        s2 = new Service(s1);\r
-        assertEquals(s1.toString(), s2.toString());\r
-    }\r
-\r
-    @Test\r
-    public void testHashCode() {\r
-        Service s1 = new Service();\r
-        Service s2 = new Service(s1);\r
-        assertEquals(s1.hashCode(), s2.hashCode());\r
-\r
-        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");\r
-        s2 = new Service(s1);\r
-        assertEquals(s1.hashCode(), s2.hashCode());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestService {
+
+    @Test
+    public void testConstructors() {
+        Service svc = new Service();
+        assertEquals(null, svc.getServiceUUID());
+        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceName());
+        assertEquals(null, svc.getServiceVersion());
+
+        UUID uuid = UUID.randomUUID();
+        svc = new Service(uuid);
+        assertEquals(uuid, svc.getServiceUUID());
+        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceName());
+        assertEquals(null, svc.getServiceVersion());
+
+        String name = "constTest";
+        svc = new Service(name);
+        assertEquals(null, svc.getServiceUUID());
+        assertEquals(name, svc.getServiceName());
+        assertEquals(null, svc.getServiceInvariantUUID());
+        assertEquals(null, svc.getServiceVersion());
+
+        uuid = UUID.randomUUID();
+        UUID uuidInvariant = UUID.randomUUID();
+        name = "constTestUUID";
+        String version = "0.0.1";
+        svc = new Service(uuid, uuidInvariant, name, version);
+        assertEquals(uuid, svc.getServiceUUID());
+        assertEquals(uuidInvariant, svc.getServiceInvariantUUID());
+        assertEquals(name, svc.getServiceName());
+        assertEquals(version, svc.getServiceVersion());
+
+        Service s2 = new Service(svc);
+        assertEquals(uuid, s2.getServiceUUID());
+        assertEquals(uuidInvariant, s2.getServiceInvariantUUID());
+        assertEquals(name, s2.getServiceName());
+        assertEquals(version, s2.getServiceVersion());
+    }
+
+    @Test
+    public void testUuid() {
+        Service svc = new Service();
+        UUID uuid = UUID.randomUUID();
+        svc.setServiceUUID(uuid);
+        assertEquals(uuid, svc.getServiceUUID());
+    }
+
+    @Test
+    public void testInvariantUuid() {
+        Service svc = new Service();
+        UUID uuid = UUID.randomUUID();
+        svc.setServiceInvariantUUID(uuid);
+        assertEquals(uuid, svc.getServiceInvariantUUID());
+    }
+
+    @Test
+    public void testName() {
+        Service svc = new Service();
+        String name = "nameTest";
+        svc.setServiceName(name);
+        assertEquals(name, svc.getServiceName());
+    }
+
+    @Test
+    public void testVersion() {
+        Service svc = new Service();
+        String version = "versionTest";
+        svc.setServiceVersion(version);
+        assertEquals(version, svc.getServiceVersion());
+    }
+
+    @Test
+    public void testEquals() {
+        Service s1 = new Service();
+        Service s2 = new Service(s1);
+        assertTrue(s1.equals(s2));
+        assertTrue(s2.equals(s1));
+
+        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+        s2 = new Service(s1);
+        assertTrue(s1.equals(s2));
+        assertTrue(s2.equals(s1));
+    }
+
+    @Test
+    public void testToString() {
+        Service s1 = new Service();
+        Service s2 = new Service(s1);
+        assertEquals(s1.toString(), s2.toString());
+
+        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+        s2 = new Service(s1);
+        assertEquals(s1.toString(), s2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        Service s1 = new Service();
+        Service s2 = new Service(s1);
+        assertEquals(s1.hashCode(), s2.hashCode());
+
+        s1 = new Service(UUID.randomUUID(), UUID.randomUUID(), "equalsTest", "1.1.1");
+        s2 = new Service(s1);
+        assertEquals(s1.hashCode(), s2.hashCode());
+    }
+}
index 0600445..5ee4a9d 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * sdc\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.sdc;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.util.UUID;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestServiceInstance {\r
-\r
-    @Test\r
-    public void testConstructors() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        assertEquals(null, si.getServiceInstanceName());\r
-        assertEquals(null, si.getServiceUUID());\r
-        assertEquals(null, si.getServiceInstanceUUID());\r
-        assertEquals(null, si.getServiceName());\r
-        assertEquals(null, si.getPersonaModelUUID());\r
-        assertEquals(null, si.getWidgetModelUUID());\r
-        assertEquals(null, si.getWidgetModelVersion());\r
-\r
-        ServiceInstance si2 = new ServiceInstance((ServiceInstance) null);\r
-        assertEquals(null, si2.getServiceInstanceName());\r
-        assertEquals(null, si2.getServiceUUID());\r
-        assertEquals(null, si2.getServiceInstanceUUID());\r
-        assertEquals(null, si2.getServiceName());\r
-        assertEquals(null, si2.getPersonaModelUUID());\r
-        assertEquals(null, si2.getWidgetModelUUID());\r
-        assertEquals(null, si2.getWidgetModelVersion());\r
-\r
-        si2 = new ServiceInstance(si);\r
-        assertEquals(si2.getServiceInstanceName(), si.getServiceInstanceName());\r
-        assertEquals(si2.getServiceUUID(), si.getServiceUUID());\r
-        assertEquals(si2.getServiceInstanceUUID(), si.getServiceInstanceUUID());\r
-        assertEquals(si2.getServiceName(), si.getServiceName());\r
-        assertEquals(si2.getPersonaModelUUID(), si.getPersonaModelUUID());\r
-        assertEquals(si2.getWidgetModelUUID(), si.getWidgetModelUUID());\r
-        assertEquals(si2.getWidgetModelVersion(), si.getWidgetModelVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testInstanceName() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        String name = "nameTestInstance";\r
-        si.setServiceInstanceName(name);;\r
-        assertEquals(name, si.getServiceInstanceName());\r
-    }\r
-\r
-    @Test\r
-    public void testUuid() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        UUID uuid = UUID.randomUUID();\r
-        si.setServiceUUID(uuid);\r
-        assertEquals(uuid, si.getServiceUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testInstanceUuid() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        UUID uuid = UUID.randomUUID();\r
-        si.setServiceInstanceUUID(uuid);\r
-        assertEquals(uuid, si.getServiceInstanceUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testName() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        String name = "nameTest";\r
-        si.setServiceName(name);\r
-        assertEquals(name, si.getServiceName());\r
-    }\r
-\r
-    @Test\r
-    public void testPersonaModelUuid() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        UUID uuid = UUID.randomUUID();\r
-        si.setPersonaModelUUID(uuid);\r
-        assertEquals(uuid, si.getPersonaModelUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testWidgetModelUuid() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        UUID uuid = UUID.randomUUID();\r
-        si.setWidgetModelUUID(uuid);\r
-        assertEquals(uuid, si.getWidgetModelUUID());\r
-    }\r
-\r
-    @Test\r
-    public void testWidgetModelVersion() {\r
-        ServiceInstance si = new ServiceInstance();\r
-        String version = "2.2.2";\r
-        si.setWidgetModelVersion(version);;\r
-        assertEquals(version, si.getWidgetModelVersion());\r
-    }\r
-\r
-    @Test\r
-    public void testEquals() {\r
-        ServiceInstance si1 = new ServiceInstance();\r
-        ServiceInstance si2 = new ServiceInstance(si1);\r
-        assertTrue(si1.equals(si2));\r
-        assertTrue(si2.equals(si1));\r
-\r
-        si1.setServiceInstanceName("instance");\r
-        si1.setServiceName("service");\r
-        si1.setServiceInstanceUUID(UUID.randomUUID());\r
-        si1.setServiceUUID(UUID.randomUUID());\r
-        si1.setPersonaModelUUID(UUID.randomUUID());\r
-        si1.setWidgetModelUUID(UUID.randomUUID());\r
-        si1.setWidgetModelVersion("3.3.3");\r
-        si2 = new ServiceInstance(si1);\r
-        assertTrue(si1.equals(si2));\r
-        assertTrue(si2.equals(si1));\r
-    }\r
-\r
-    @Test\r
-    public void testToString() {\r
-        ServiceInstance si1 = new ServiceInstance();\r
-        ServiceInstance si2 = new ServiceInstance(si1);\r
-        assertEquals(si1.toString(), si2.toString());\r
-\r
-        si1.setServiceInstanceName("instance");\r
-        si1.setServiceName("service");\r
-        si1.setServiceInstanceUUID(UUID.randomUUID());\r
-        si1.setServiceUUID(UUID.randomUUID());\r
-        si1.setPersonaModelUUID(UUID.randomUUID());\r
-        si1.setWidgetModelUUID(UUID.randomUUID());\r
-        si1.setWidgetModelVersion("3.3.3");\r
-        si2 = new ServiceInstance(si1);\r
-        assertEquals(si1.toString(), si2.toString());\r
-    }\r
-\r
-    @Test\r
-    public void testHashCode() {\r
-        ServiceInstance si1 = new ServiceInstance();\r
-        ServiceInstance si2 = new ServiceInstance(si1);\r
-        assertEquals(si1.hashCode(), si2.hashCode());\r
-\r
-        si1.setServiceInstanceName("instance");\r
-        si1.setServiceName("service");\r
-        si1.setServiceInstanceUUID(UUID.randomUUID());\r
-        si1.setServiceUUID(UUID.randomUUID());\r
-        si1.setPersonaModelUUID(UUID.randomUUID());\r
-        si1.setWidgetModelUUID(UUID.randomUUID());\r
-        si1.setWidgetModelVersion("3.3.3");\r
-        si2 = new ServiceInstance(si1);\r
-        assertEquals(si1.hashCode(), si2.hashCode());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * sdc
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.sdc;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestServiceInstance {
+
+    @Test
+    public void testConstructors() {
+        ServiceInstance si = new ServiceInstance();
+        assertEquals(null, si.getServiceInstanceName());
+        assertEquals(null, si.getServiceUUID());
+        assertEquals(null, si.getServiceInstanceUUID());
+        assertEquals(null, si.getServiceName());
+        assertEquals(null, si.getPersonaModelUUID());
+        assertEquals(null, si.getWidgetModelUUID());
+        assertEquals(null, si.getWidgetModelVersion());
+
+        ServiceInstance si2 = new ServiceInstance((ServiceInstance) null);
+        assertEquals(null, si2.getServiceInstanceName());
+        assertEquals(null, si2.getServiceUUID());
+        assertEquals(null, si2.getServiceInstanceUUID());
+        assertEquals(null, si2.getServiceName());
+        assertEquals(null, si2.getPersonaModelUUID());
+        assertEquals(null, si2.getWidgetModelUUID());
+        assertEquals(null, si2.getWidgetModelVersion());
+
+        si2 = new ServiceInstance(si);
+        assertEquals(si2.getServiceInstanceName(), si.getServiceInstanceName());
+        assertEquals(si2.getServiceUUID(), si.getServiceUUID());
+        assertEquals(si2.getServiceInstanceUUID(), si.getServiceInstanceUUID());
+        assertEquals(si2.getServiceName(), si.getServiceName());
+        assertEquals(si2.getPersonaModelUUID(), si.getPersonaModelUUID());
+        assertEquals(si2.getWidgetModelUUID(), si.getWidgetModelUUID());
+        assertEquals(si2.getWidgetModelVersion(), si.getWidgetModelVersion());
+    }
+
+    @Test
+    public void testInstanceName() {
+        ServiceInstance si = new ServiceInstance();
+        String name = "nameTestInstance";
+        si.setServiceInstanceName(name);;
+        assertEquals(name, si.getServiceInstanceName());
+    }
+
+    @Test
+    public void testUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setServiceUUID(uuid);
+        assertEquals(uuid, si.getServiceUUID());
+    }
+
+    @Test
+    public void testInstanceUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setServiceInstanceUUID(uuid);
+        assertEquals(uuid, si.getServiceInstanceUUID());
+    }
+
+    @Test
+    public void testName() {
+        ServiceInstance si = new ServiceInstance();
+        String name = "nameTest";
+        si.setServiceName(name);
+        assertEquals(name, si.getServiceName());
+    }
+
+    @Test
+    public void testPersonaModelUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setPersonaModelUUID(uuid);
+        assertEquals(uuid, si.getPersonaModelUUID());
+    }
+
+    @Test
+    public void testWidgetModelUuid() {
+        ServiceInstance si = new ServiceInstance();
+        UUID uuid = UUID.randomUUID();
+        si.setWidgetModelUUID(uuid);
+        assertEquals(uuid, si.getWidgetModelUUID());
+    }
+
+    @Test
+    public void testWidgetModelVersion() {
+        ServiceInstance si = new ServiceInstance();
+        String version = "2.2.2";
+        si.setWidgetModelVersion(version);;
+        assertEquals(version, si.getWidgetModelVersion());
+    }
+
+    @Test
+    public void testEquals() {
+        ServiceInstance si1 = new ServiceInstance();
+        ServiceInstance si2 = new ServiceInstance(si1);
+        assertTrue(si1.equals(si2));
+        assertTrue(si2.equals(si1));
+
+        si1.setServiceInstanceName("instance");
+        si1.setServiceName("service");
+        si1.setServiceInstanceUUID(UUID.randomUUID());
+        si1.setServiceUUID(UUID.randomUUID());
+        si1.setPersonaModelUUID(UUID.randomUUID());
+        si1.setWidgetModelUUID(UUID.randomUUID());
+        si1.setWidgetModelVersion("3.3.3");
+        si2 = new ServiceInstance(si1);
+        assertTrue(si1.equals(si2));
+        assertTrue(si2.equals(si1));
+    }
+
+    @Test
+    public void testToString() {
+        ServiceInstance si1 = new ServiceInstance();
+        ServiceInstance si2 = new ServiceInstance(si1);
+        assertEquals(si1.toString(), si2.toString());
+
+        si1.setServiceInstanceName("instance");
+        si1.setServiceName("service");
+        si1.setServiceInstanceUUID(UUID.randomUUID());
+        si1.setServiceUUID(UUID.randomUUID());
+        si1.setPersonaModelUUID(UUID.randomUUID());
+        si1.setWidgetModelUUID(UUID.randomUUID());
+        si1.setWidgetModelVersion("3.3.3");
+        si2 = new ServiceInstance(si1);
+        assertEquals(si1.toString(), si2.toString());
+    }
+
+    @Test
+    public void testHashCode() {
+        ServiceInstance si1 = new ServiceInstance();
+        ServiceInstance si2 = new ServiceInstance(si1);
+        assertEquals(si1.hashCode(), si2.hashCode());
+
+        si1.setServiceInstanceName("instance");
+        si1.setServiceName("service");
+        si1.setServiceInstanceUUID(UUID.randomUUID());
+        si1.setServiceUUID(UUID.randomUUID());
+        si1.setPersonaModelUUID(UUID.randomUUID());
+        si1.setWidgetModelUUID(UUID.randomUUID());
+        si1.setWidgetModelVersion("3.3.3");
+        si2 = new ServiceInstance(si1);
+        assertEquals(si1.hashCode(), si2.hashCode());
+    }
+}
index 718a82e..a026236 100644 (file)
   -->
 
 <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>
+  <modelVersion>4.0.0</modelVersion>
 
-       <artifactId>so</artifactId>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <artifactId>so</artifactId>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-core</artifactId>
-                       <version>6.5.0.Final</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>rest</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-management</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <version>2.13.0</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>rest</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.13.0</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 2cc22f3..ea1257d 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-import java.time.LocalDateTime;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SOAsyncRequestStatus implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("correlator")\r
-    private String correlator;\r
-\r
-    @SerializedName("requestId")\r
-    private String requestId;\r
-\r
-    @SerializedName("instanceReferences")\r
-    private SOInstanceReferences instanceReferences;\r
-\r
-    @SerializedName("startTime")\r
-    private LocalDateTime startTime;\r
-\r
-    @SerializedName("finishTime")\r
-    private LocalDateTime finishTime;\r
-\r
-    @SerializedName("requestScope")\r
-    private String requestScope;\r
-\r
-    @SerializedName("requestType")\r
-    private String requestType;\r
-\r
-    @SerializedName("requestStatus")\r
-    private SORequestStatus requestStatus;\r
-\r
-    public SOAsyncRequestStatus() {\r
-        // required by author\r
-    }\r
-\r
-    public String getCorrelator() {\r
-        return correlator;\r
-    }\r
-\r
-\r
-    public LocalDateTime getFinishTime() {\r
-        return finishTime;\r
-    }\r
-\r
-    public SOInstanceReferences getInstanceReferences() {\r
-        return instanceReferences;\r
-    }\r
-\r
-    public String getRequestId() {\r
-        return requestId;\r
-    }\r
-\r
-    public String getRequestScope() {\r
-        return requestScope;\r
-    }\r
-\r
-    public SORequestStatus getRequestStatus() {\r
-        return requestStatus;\r
-    }\r
-\r
-    public String getRequestType() {\r
-        return requestType;\r
-    }\r
-\r
-    public LocalDateTime getStartTime() {\r
-        return startTime;\r
-    }\r
-\r
-    public void setCorrelator(String correlator) {\r
-        this.correlator = correlator;\r
-    }\r
-\r
-    public void setFinishTime(LocalDateTime finishTime) {\r
-        this.finishTime = finishTime;\r
-    }\r
-\r
-    public void setInstanceReferences(SOInstanceReferences instanceReferences) {\r
-        this.instanceReferences = instanceReferences;\r
-    }\r
-\r
-    public void setRequestId(String requestId) {\r
-        this.requestId = requestId;\r
-    }\r
-\r
-    public void setRequestScope(String requestScope) {\r
-        this.requestScope = requestScope;\r
-    }\r
-\r
-    public void setRequestStatus(SORequestStatus requestStatus) {\r
-        this.requestStatus = requestStatus;\r
-    }\r
-\r
-    public void setRequestType(String requestType) {\r
-        this.requestType = requestType;\r
-    }\r
-\r
-    public void setStartTime(LocalDateTime startTime) {\r
-        this.startTime = startTime;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOAsyncRequestStatus implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("correlator")
+    private String correlator;
+
+    @SerializedName("requestId")
+    private String requestId;
+
+    @SerializedName("instanceReferences")
+    private SOInstanceReferences instanceReferences;
+
+    @SerializedName("startTime")
+    private LocalDateTime startTime;
+
+    @SerializedName("finishTime")
+    private LocalDateTime finishTime;
+
+    @SerializedName("requestScope")
+    private String requestScope;
+
+    @SerializedName("requestType")
+    private String requestType;
+
+    @SerializedName("requestStatus")
+    private SORequestStatus requestStatus;
+
+    public SOAsyncRequestStatus() {
+        // required by author
+    }
+
+    public String getCorrelator() {
+        return correlator;
+    }
+
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public SOInstanceReferences getInstanceReferences() {
+        return instanceReferences;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public String getRequestScope() {
+        return requestScope;
+    }
+
+    public SORequestStatus getRequestStatus() {
+        return requestStatus;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public LocalDateTime getStartTime() {
+        return startTime;
+    }
+
+    public void setCorrelator(String correlator) {
+        this.correlator = correlator;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public void setInstanceReferences(SOInstanceReferences instanceReferences) {
+        this.instanceReferences = instanceReferences;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+    public void setRequestScope(String requestScope) {
+        this.requestScope = requestScope;
+    }
+
+    public void setRequestStatus(SORequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public void setStartTime(LocalDateTime startTime) {
+        this.startTime = startTime;
+    }
+
+}
index a1233bf..7ad497a 100644 (file)
@@ -1,57 +1,57 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SOCloudConfiguration implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("lcpCloudRegionId")\r
-    private String lcpCloudRegionId;\r
-\r
-    @SerializedName("tenantId")\r
-    private String tenantId;\r
-\r
-    public SOCloudConfiguration() {\r
-        //required by author\r
-    }\r
-\r
-    public String getLcpCloudRegionId() {\r
-        return lcpCloudRegionId;\r
-    }\r
-\r
-    public String getTenantId() {\r
-        return tenantId;\r
-    }\r
-\r
-    public void setLcpCloudRegionId(String lcpCloudRegionId) {\r
-        this.lcpCloudRegionId = lcpCloudRegionId;\r
-    }\r
-\r
-    public void setTenantId(String tenantId) {\r
-        this.tenantId = tenantId;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOCloudConfiguration implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("lcpCloudRegionId")
+    private String lcpCloudRegionId;
+
+    @SerializedName("tenantId")
+    private String tenantId;
+
+    public SOCloudConfiguration() {
+        //required by author
+    }
+
+    public String getLcpCloudRegionId() {
+        return lcpCloudRegionId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    public void setLcpCloudRegionId(String lcpCloudRegionId) {
+        this.lcpCloudRegionId = lcpCloudRegionId;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+}
index f215508..307e051 100644 (file)
@@ -1,57 +1,57 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SOInstanceReferences implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("requestId")\r
-    private String requestId;\r
-\r
-    @SerializedName("instanceId")\r
-    private String instanceId;\r
-\r
-    public SOInstanceReferences() {\r
-        //requried by author\r
-    }\r
-\r
-    public String getInstanceId() {\r
-        return instanceId;\r
-    }\r
-\r
-    public String getRequestId() {\r
-        return requestId;\r
-    }\r
-\r
-    public void setInstanceId(String instanceId) {\r
-        this.instanceId = instanceId;\r
-    }\r
-\r
-    public void setRequestId(String requestId) {\r
-        this.requestId = requestId;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOInstanceReferences implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("requestId")
+    private String requestId;
+
+    @SerializedName("instanceId")
+    private String instanceId;
+
+    public SOInstanceReferences() {
+        //requried by author
+    }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+}
index cab396d..975a21c 100644 (file)
@@ -1,57 +1,57 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SOPolicyExceptionHolder implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("messageId")\r
-    private String messageId;\r
-\r
-    @SerializedName("text")\r
-    private String text;\r
-\r
-    public SOPolicyExceptionHolder() {\r
-      //required by author\r
-    }\r
-\r
-    public String getMessageId() {\r
-        return messageId;\r
-    }\r
-\r
-    public String getText() {\r
-        return text;\r
-    }\r
-\r
-    public void setMessageId(String messageId) {\r
-        this.messageId = messageId;\r
-    }\r
-\r
-    public void setText(String text) {\r
-        this.text = text;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOPolicyExceptionHolder implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("messageId")
+    private String messageId;
+
+    @SerializedName("text")
+    private String text;
+
+    public SOPolicyExceptionHolder() {
+      //required by author
+    }
+
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
index 2bd46e0..e7f3efc 100644 (file)
@@ -1,70 +1,70 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORelatedInstance implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("instanceId")\r
-    private String instanceId;\r
-\r
-    @SerializedName("instanceName")\r
-    private String instanceName;\r
-\r
-    @SerializedName("modelInfo")\r
-    private SOModelInfo modelInfo;\r
-\r
-    public SORelatedInstance() {\r
-      //required by author\r
-    }\r
-\r
-    public String getInstanceId() {\r
-        return instanceId;\r
-    }\r
-\r
-\r
-    public String getInstanceName() {\r
-        return instanceName;\r
-    }\r
-\r
-    public SOModelInfo getModelInfo() {\r
-        return modelInfo;\r
-    }\r
-\r
-    public void setInstanceId(String instanceId) {\r
-        this.instanceId = instanceId;\r
-    }\r
-\r
-    public void setInstanceName(String instanceName) {\r
-        this.instanceName = instanceName;\r
-    }\r
-\r
-\r
-    public void setModelInfo(SOModelInfo modelInfo) {\r
-        this.modelInfo = modelInfo;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORelatedInstance implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("instanceId")
+    private String instanceId;
+
+    @SerializedName("instanceName")
+    private String instanceName;
+
+    @SerializedName("modelInfo")
+    private SOModelInfo modelInfo;
+
+    public SORelatedInstance() {
+      //required by author
+    }
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public SOModelInfo getModelInfo() {
+        return modelInfo;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+
+    public void setModelInfo(SOModelInfo modelInfo) {
+        this.modelInfo = modelInfo;
+    }
+
+}
index 71fb119..1148ef1 100644 (file)
@@ -1,46 +1,46 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORelatedInstanceListElement implements Serializable {\r
\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("relatedInstance")\r
-    private SORelatedInstance relatedInstance;\r
-\r
-    public SORelatedInstanceListElement() {\r
-      //required by author\r
-    }\r
-\r
-    public SORelatedInstance getRelatedInstance() {\r
-        return relatedInstance;\r
-    }\r
-\r
-    public void setRelatedInstance(SORelatedInstance relatedInstance) {\r
-        this.relatedInstance = relatedInstance;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORelatedInstanceListElement implements Serializable {
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("relatedInstance")
+    private SORelatedInstance relatedInstance;
+
+    public SORelatedInstanceListElement() {
+      //required by author
+    }
+
+    public SORelatedInstance getRelatedInstance() {
+        return relatedInstance;
+    }
+
+    public void setRelatedInstance(SORelatedInstance relatedInstance) {
+        this.relatedInstance = relatedInstance;
+    }
+
+}
index be5ef13..73ebba2 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-import java.time.LocalDateTime;\r
-import java.util.UUID;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORequest implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("requestId")\r
-    private UUID requestId;\r
-\r
-    @SerializedName("startTime")\r
-    private String startTime;\r
-\r
-    @SerializedName("finishTime")\r
-    private LocalDateTime finishTime;\r
-\r
-    @SerializedName("requestScope")\r
-    private String requestScope;\r
-\r
-    @SerializedName("requestType")\r
-    private String requestType;\r
-\r
-    @SerializedName("requestDetails")\r
-    private SORequestDetails requestDetails;\r
-\r
-    @SerializedName("requestStatus")\r
-    private SORequestStatus requestStatus;\r
-\r
-    public SORequest() {\r
-        // required by author\r
-    }\r
-\r
-    public LocalDateTime getFinishTime() {\r
-        return finishTime;\r
-    }\r
-\r
-    public SORequestDetails getRequestDetails() {\r
-        return requestDetails;\r
-    }\r
-\r
-    public UUID getRequestId() {\r
-        return requestId;\r
-    }\r
-\r
-    public String getRequestScope() {\r
-        return requestScope;\r
-    }\r
-\r
-    public SORequestStatus getRequestStatus() {\r
-        return requestStatus;\r
-    }\r
-\r
-    public String getRequestType() {\r
-        return requestType;\r
-    }\r
-\r
-    public String getStartTime() {\r
-        return startTime;\r
-    }\r
-\r
-    public void setFinishTime(LocalDateTime finishTime) {\r
-        this.finishTime = finishTime;\r
-    }\r
-\r
-    public void setRequestDetails(SORequestDetails requestDetails) {\r
-        this.requestDetails = requestDetails;\r
-    }\r
-\r
-    public void setRequestId(UUID requestId) {\r
-        this.requestId = requestId;\r
-    }\r
-\r
-    public void setRequestScope(String requestScope) {\r
-        this.requestScope = requestScope;\r
-    }\r
-\r
-    public void setRequestStatus(SORequestStatus requestStatus) {\r
-        this.requestStatus = requestStatus;\r
-    }\r
-\r
-    public void setRequestType(String requestType) {\r
-        this.requestType = requestType;\r
-    }\r
-\r
-    public void setStartTime(String startTime) {\r
-        this.startTime = startTime;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequest implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("requestId")
+    private UUID requestId;
+
+    @SerializedName("startTime")
+    private String startTime;
+
+    @SerializedName("finishTime")
+    private LocalDateTime finishTime;
+
+    @SerializedName("requestScope")
+    private String requestScope;
+
+    @SerializedName("requestType")
+    private String requestType;
+
+    @SerializedName("requestDetails")
+    private SORequestDetails requestDetails;
+
+    @SerializedName("requestStatus")
+    private SORequestStatus requestStatus;
+
+    public SORequest() {
+        // required by author
+    }
+
+    public LocalDateTime getFinishTime() {
+        return finishTime;
+    }
+
+    public SORequestDetails getRequestDetails() {
+        return requestDetails;
+    }
+
+    public UUID getRequestId() {
+        return requestId;
+    }
+
+    public String getRequestScope() {
+        return requestScope;
+    }
+
+    public SORequestStatus getRequestStatus() {
+        return requestStatus;
+    }
+
+    public String getRequestType() {
+        return requestType;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setFinishTime(LocalDateTime finishTime) {
+        this.finishTime = finishTime;
+    }
+
+    public void setRequestDetails(SORequestDetails requestDetails) {
+        this.requestDetails = requestDetails;
+    }
+
+    public void setRequestId(UUID requestId) {
+        this.requestId = requestId;
+    }
+
+    public void setRequestScope(String requestScope) {
+        this.requestScope = requestScope;
+    }
+
+    public void setRequestStatus(SORequestStatus requestStatus) {
+        this.requestStatus = requestStatus;
+    }
+
+    public void setRequestType(String requestType) {
+        this.requestType = requestType;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+}
index 4986041..7632108 100644 (file)
@@ -1,57 +1,57 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORequestError implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("policyException")\r
-    private SOPolicyExceptionHolder policyException;\r
-\r
-    @SerializedName("serviceException")\r
-    private SOServiceExceptionHolder serviceException;\r
-\r
-    public SORequestError() {\r
-        // required by author\r
-    }\r
-\r
-    public SOPolicyExceptionHolder getPolicyException() {\r
-        return policyException;\r
-    }\r
-\r
-    public SOServiceExceptionHolder getServiceException() {\r
-        return serviceException;\r
-    }\r
-\r
-    public void setPolicyException(SOPolicyExceptionHolder policyException) {\r
-        this.policyException = policyException;\r
-    }\r
-\r
-    public void setServiceException(SOServiceExceptionHolder serviceException) {\r
-        this.serviceException = serviceException;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestError implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("policyException")
+    private SOPolicyExceptionHolder policyException;
+
+    @SerializedName("serviceException")
+    private SOServiceExceptionHolder serviceException;
+
+    public SORequestError() {
+        // required by author
+    }
+
+    public SOPolicyExceptionHolder getPolicyException() {
+        return policyException;
+    }
+
+    public SOServiceExceptionHolder getServiceException() {
+        return serviceException;
+    }
+
+    public void setPolicyException(SOPolicyExceptionHolder policyException) {
+        this.policyException = policyException;
+    }
+
+    public void setServiceException(SOServiceExceptionHolder serviceException) {
+        this.serviceException = serviceException;
+    }
+
+}
index 28bc0b8..fd92e32 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORequestInfo implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("instanceName")\r
-    private String instanceName;\r
-\r
-    @SerializedName("source")\r
-    private String source;\r
-\r
-    @SerializedName("productFamilyId")\r
-    private String productFamilyId;\r
-\r
-    @SerializedName("suppressRollback")\r
-    private boolean suppressRollback;\r
-\r
-    @SerializedName("billingAccountNumber")\r
-    private String billingAccountNumber;\r
-\r
-    @SerializedName("callbackUrl")\r
-    private String callbackUrl;\r
-\r
-    @SerializedName("correlator")\r
-    private String correlator;\r
-\r
-    @SerializedName("orderNumber")\r
-    private String orderNumber;\r
-\r
-    @SerializedName("orderVersion")\r
-    private Integer orderVersion;\r
-\r
-    @SerializedName("requestorId")\r
-    private String requestorId;\r
-\r
-    public SORequestInfo() {\r
-        // required by author\r
-    }\r
-\r
-    public String getBillingAccountNumber() {\r
-        return billingAccountNumber;\r
-    }\r
-\r
-    public String getCallbackUrl() {\r
-        return callbackUrl;\r
-    }\r
-\r
-    public String getCorrelator() {\r
-        return correlator;\r
-    }\r
-\r
-    public String getInstanceName() {\r
-        return instanceName;\r
-    }\r
-\r
-    public String getOrderNumber() {\r
-        return orderNumber;\r
-    }\r
-\r
-    public Integer getOrderVersion() {\r
-        return orderVersion;\r
-    }\r
-\r
-    public String getProductFamilyId() {\r
-        return productFamilyId;\r
-    }\r
-\r
-    public String getRequestorId() {\r
-        return requestorId;\r
-    }\r
-\r
-    public String getSource() {\r
-        return source;\r
-    }\r
-\r
-    public boolean isSuppressRollback() {\r
-        return suppressRollback;\r
-    }\r
-\r
-    public void setBillingAccountNumber(String billingAccountNumber) {\r
-        this.billingAccountNumber = billingAccountNumber;\r
-    }\r
-\r
-    public void setCallbackUrl(String callbackUrl) {\r
-        this.callbackUrl = callbackUrl;\r
-    }\r
-\r
-    public void setCorrelator(String correlator) {\r
-        this.correlator = correlator;\r
-    }\r
-\r
-    public void setInstanceName(String instanceName) {\r
-        this.instanceName = instanceName;\r
-    }\r
-\r
-    public void setOrderNumber(String orderNumber) {\r
-        this.orderNumber = orderNumber;\r
-    }\r
-\r
-    public void setOrderVersion(Integer orderVersion) {\r
-        this.orderVersion = orderVersion;\r
-    }\r
-\r
-    public void setProductFamilyId(String productFamilyId) {\r
-        this.productFamilyId = productFamilyId;\r
-    }\r
-\r
-    public void setRequestorId(String requestorId) {\r
-        this.requestorId = requestorId;\r
-    }\r
-\r
-    public void setSource(String source) {\r
-        this.source = source;\r
-    }\r
-\r
-    public void setSuppressRollback(boolean suppressRollback) {\r
-        this.suppressRollback = suppressRollback;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestInfo implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("instanceName")
+    private String instanceName;
+
+    @SerializedName("source")
+    private String source;
+
+    @SerializedName("productFamilyId")
+    private String productFamilyId;
+
+    @SerializedName("suppressRollback")
+    private boolean suppressRollback;
+
+    @SerializedName("billingAccountNumber")
+    private String billingAccountNumber;
+
+    @SerializedName("callbackUrl")
+    private String callbackUrl;
+
+    @SerializedName("correlator")
+    private String correlator;
+
+    @SerializedName("orderNumber")
+    private String orderNumber;
+
+    @SerializedName("orderVersion")
+    private Integer orderVersion;
+
+    @SerializedName("requestorId")
+    private String requestorId;
+
+    public SORequestInfo() {
+        // required by author
+    }
+
+    public String getBillingAccountNumber() {
+        return billingAccountNumber;
+    }
+
+    public String getCallbackUrl() {
+        return callbackUrl;
+    }
+
+    public String getCorrelator() {
+        return correlator;
+    }
+
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public Integer getOrderVersion() {
+        return orderVersion;
+    }
+
+    public String getProductFamilyId() {
+        return productFamilyId;
+    }
+
+    public String getRequestorId() {
+        return requestorId;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public boolean isSuppressRollback() {
+        return suppressRollback;
+    }
+
+    public void setBillingAccountNumber(String billingAccountNumber) {
+        this.billingAccountNumber = billingAccountNumber;
+    }
+
+    public void setCallbackUrl(String callbackUrl) {
+        this.callbackUrl = callbackUrl;
+    }
+
+    public void setCorrelator(String correlator) {
+        this.correlator = correlator;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber;
+    }
+
+    public void setOrderVersion(Integer orderVersion) {
+        this.orderVersion = orderVersion;
+    }
+
+    public void setProductFamilyId(String productFamilyId) {
+        this.productFamilyId = productFamilyId;
+    }
+
+    public void setRequestorId(String requestorId) {
+        this.requestorId = requestorId;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public void setSuppressRollback(boolean suppressRollback) {
+        this.suppressRollback = suppressRollback;
+    }
+
+}
index c1a6c7d..1697520 100644 (file)
@@ -1,60 +1,60 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-import java.util.LinkedList;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORequestParameters implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("subscriptionServiceType")\r
-    private String subscriptionServiceType;\r
-\r
-    @SerializedName("userParams")\r
-    private List<Map<String, String>> userParams = new LinkedList<>();\r
-\r
-    public SORequestParameters() {\r
-        // required by author\r
-    }\r
-\r
-    public String getSubscriptionServiceType() {\r
-        return subscriptionServiceType;\r
-    }\r
-\r
-    public List<Map<String, String>> getUserParams() {\r
-        return userParams;\r
-    }\r
-\r
-    public void setSubscriptionServiceType(String subscriptionServiceType) {\r
-        this.subscriptionServiceType = subscriptionServiceType;\r
-    }\r
-\r
-    public void setUserParams(List<Map<String, String>> userParams) {\r
-        this.userParams = userParams;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestParameters implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("subscriptionServiceType")
+    private String subscriptionServiceType;
+
+    @SerializedName("userParams")
+    private List<Map<String, String>> userParams = new LinkedList<>();
+
+    public SORequestParameters() {
+        // required by author
+    }
+
+    public String getSubscriptionServiceType() {
+        return subscriptionServiceType;
+    }
+
+    public List<Map<String, String>> getUserParams() {
+        return userParams;
+    }
+
+    public void setSubscriptionServiceType(String subscriptionServiceType) {
+        this.subscriptionServiceType = subscriptionServiceType;
+    }
+
+    public void setUserParams(List<Map<String, String>> userParams) {
+        this.userParams = userParams;
+    }
+
+}
index 913402d..ed14f6b 100644 (file)
@@ -1,53 +1,53 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORequestReferences implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("instanceId")\r
-    private String instanceId;\r
-\r
-    @SerializedName("requestId")\r
-    private String requestId;\r
-\r
-    public String getInstanceId() {\r
-        return instanceId;\r
-    }\r
-\r
-    public String getRequestId() {\r
-        return requestId;\r
-    }\r
-\r
-    public void setInstanceId(String instanceId) {\r
-        this.instanceId = instanceId;\r
-    }\r
-\r
-    public void setRequestId(String requestId) {\r
-        this.requestId = requestId;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestReferences implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("instanceId")
+    private String instanceId;
+
+    @SerializedName("requestId")
+    private String requestId;
+
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    public void setRequestId(String requestId) {
+        this.requestId = requestId;
+    }
+
+}
index 8c5e784..2e77c15 100644 (file)
@@ -1,82 +1,82 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SORequestStatus implements Serializable {\r
-\r
-    /**\r
-     * \r
-     */\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("percentProgress")\r
-    private int percentProgress;\r
-\r
-    @SerializedName("requestState")\r
-    private String requestState;\r
-\r
-    @SerializedName("timestamp")\r
-    private String timestamp;\r
-\r
-    @SerializedName("wasRolledBack")\r
-    private boolean wasRolledBack;\r
-\r
-    public SORequestStatus() {\r
-      //required by author\r
-    }\r
-\r
-    public int getPercentProgress() {\r
-        return percentProgress;\r
-    }\r
-\r
-    public String getRequestState() {\r
-        return requestState;\r
-    }\r
-\r
-    public String getTimestamp() {\r
-        return timestamp;\r
-    }\r
-\r
-    public boolean isWasRolledBack() {\r
-        return wasRolledBack;\r
-    }\r
-\r
-    public void setPercentProgress(int percentProgress) {\r
-        this.percentProgress = percentProgress;\r
-    }\r
-\r
-    public void setRequestState(String requestState) {\r
-        this.requestState = requestState;\r
-    }\r
-\r
-    public void setTimestamp(String timestamp) {\r
-        this.timestamp = timestamp;\r
-    }\r
-\r
-    public void setWasRolledBack(boolean wasRolledBack) {\r
-        this.wasRolledBack = wasRolledBack;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SORequestStatus implements Serializable {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("percentProgress")
+    private int percentProgress;
+
+    @SerializedName("requestState")
+    private String requestState;
+
+    @SerializedName("timestamp")
+    private String timestamp;
+
+    @SerializedName("wasRolledBack")
+    private boolean wasRolledBack;
+
+    public SORequestStatus() {
+      //required by author
+    }
+
+    public int getPercentProgress() {
+        return percentProgress;
+    }
+
+    public String getRequestState() {
+        return requestState;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public boolean isWasRolledBack() {
+        return wasRolledBack;
+    }
+
+    public void setPercentProgress(int percentProgress) {
+        this.percentProgress = percentProgress;
+    }
+
+    public void setRequestState(String requestState) {
+        this.requestState = requestState;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public void setWasRolledBack(boolean wasRolledBack) {
+        this.wasRolledBack = wasRolledBack;
+    }
+
+}
index 61366d3..703e13b 100644 (file)
@@ -1,66 +1,66 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-import java.util.LinkedList;\r
-import java.util.List;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SOServiceExceptionHolder implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("messageId")\r
-    private String messageId;\r
-\r
-    @SerializedName("text")\r
-    private String text;\r
-\r
-    @SerializedName("variables")\r
-    private List<String> variables = new LinkedList<>();\r
-\r
-    public SOServiceExceptionHolder() {\r
-        // required by author\r
-    }\r
-\r
-    public String getMessageId() {\r
-        return messageId;\r
-    }\r
-\r
-    public String getText() {\r
-        return text;\r
-    }\r
-\r
-    public List<String> getVariables() {\r
-        return variables;\r
-    }\r
-\r
-    public void setMessageId(String messageId) {\r
-        this.messageId = messageId;\r
-    }\r
-\r
-    public void setText(String text) {\r
-        this.text = text;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+import java.util.List;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOServiceExceptionHolder implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("messageId")
+    private String messageId;
+
+    @SerializedName("text")
+    private String text;
+
+    @SerializedName("variables")
+    private List<String> variables = new LinkedList<>();
+
+    public SOServiceExceptionHolder() {
+        // required by author
+    }
+
+    public String getMessageId() {
+        return messageId;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public List<String> getVariables() {
+        return variables;
+    }
+
+    public void setMessageId(String messageId) {
+        this.messageId = messageId;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
index 14c46b0..618e9ec 100644 (file)
@@ -1,68 +1,68 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class SOSubscriberInfo implements Serializable {\r
-\r
-    private static final long serialVersionUID = -3283942659786236032L;\r
-\r
-    @SerializedName("globalSubscriberId")\r
-    private String globalSubscriberId;\r
-\r
-    @SerializedName("subscriberCommonSiteId")\r
-    private String subscriberCommonSiteId;\r
-\r
-    @SerializedName("subscriberName")\r
-    private String subscriberName;\r
-\r
-    public SOSubscriberInfo() {\r
-        //required by author\r
-    }\r
-\r
-    public String getGlobalSubscriberId() {\r
-        return globalSubscriberId;\r
-    }\r
-\r
-    public String getSubscriberCommonSiteId() {\r
-        return subscriberCommonSiteId;\r
-    }\r
-\r
-    public String getSubscriberName() {\r
-        return subscriberName;\r
-    }\r
-\r
-    public void setGlobalSubscriberId(String globalSubscriberId) {\r
-        this.globalSubscriberId = globalSubscriberId;\r
-    }\r
-\r
-    public void setSubscriberCommonSiteId(String subscriberCommonSiteId) {\r
-        this.subscriberCommonSiteId = subscriberCommonSiteId;\r
-    }\r
-\r
-    public void setSubscriberName(String subscriberName) {\r
-        this.subscriberName = subscriberName;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class SOSubscriberInfo implements Serializable {
+
+    private static final long serialVersionUID = -3283942659786236032L;
+
+    @SerializedName("globalSubscriberId")
+    private String globalSubscriberId;
+
+    @SerializedName("subscriberCommonSiteId")
+    private String subscriberCommonSiteId;
+
+    @SerializedName("subscriberName")
+    private String subscriberName;
+
+    public SOSubscriberInfo() {
+        //required by author
+    }
+
+    public String getGlobalSubscriberId() {
+        return globalSubscriberId;
+    }
+
+    public String getSubscriberCommonSiteId() {
+        return subscriberCommonSiteId;
+    }
+
+    public String getSubscriberName() {
+        return subscriberName;
+    }
+
+    public void setGlobalSubscriberId(String globalSubscriberId) {
+        this.globalSubscriberId = globalSubscriberId;
+    }
+
+    public void setSubscriberCommonSiteId(String subscriberCommonSiteId) {
+        this.subscriberCommonSiteId = subscriberCommonSiteId;
+    }
+
+    public void setSubscriberName(String subscriberName) {
+        this.subscriberName = subscriberName;
+    }
+
+}
index 119c291..7c50ea0 100755 (executable)
@@ -1,78 +1,78 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.time.LocalDateTime;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoAsyncRequestStatus {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();\r
-\r
-        assertTrue(obj.getCorrelator() == null);\r
-        assertTrue(obj.getFinishTime() == null);\r
-        assertTrue(obj.getInstanceReferences() == null);\r
-        assertTrue(obj.getRequestId() == null);\r
-        assertTrue(obj.getRequestScope() == null);\r
-        assertTrue(obj.getRequestStatus() == null);\r
-        assertTrue(obj.getStartTime() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();\r
-\r
-        obj.setCorrelator("correlator");\r
-        assertEquals("correlator", obj.getCorrelator());\r
-\r
-        LocalDateTime finishTime = LocalDateTime.now();\r
-        obj.setFinishTime(finishTime);\r
-        assertEquals(finishTime, obj.getFinishTime());\r
-\r
-        SOInstanceReferences instanceReferences = new SOInstanceReferences();\r
-        obj.setInstanceReferences(instanceReferences);\r
-        assertEquals(instanceReferences, obj.getInstanceReferences());\r
-\r
-        obj.setRequestId("requestId");\r
-        assertEquals("requestId", obj.getRequestId());\r
-\r
-        obj.setRequestScope("requestScope");\r
-        assertEquals("requestScope", obj.getRequestScope());\r
-\r
-        SORequestStatus requestStatus = new SORequestStatus();\r
-        obj.setRequestStatus(requestStatus);\r
-        assertEquals(requestStatus, obj.getRequestStatus());\r
-\r
-        obj.setRequestType("requestType");\r
-        assertEquals("requestType", obj.getRequestType());\r
-\r
-        LocalDateTime startTime = LocalDateTime.now();\r
-        obj.setStartTime(startTime);\r
-        assertEquals(startTime, obj.getStartTime());\r
-\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+
+import org.junit.Test;
+
+public class TestSoAsyncRequestStatus {
+
+    @Test
+    public void testConstructor() {
+        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
+
+        assertTrue(obj.getCorrelator() == null);
+        assertTrue(obj.getFinishTime() == null);
+        assertTrue(obj.getInstanceReferences() == null);
+        assertTrue(obj.getRequestId() == null);
+        assertTrue(obj.getRequestScope() == null);
+        assertTrue(obj.getRequestStatus() == null);
+        assertTrue(obj.getStartTime() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOAsyncRequestStatus obj = new SOAsyncRequestStatus();
+
+        obj.setCorrelator("correlator");
+        assertEquals("correlator", obj.getCorrelator());
+
+        LocalDateTime finishTime = LocalDateTime.now();
+        obj.setFinishTime(finishTime);
+        assertEquals(finishTime, obj.getFinishTime());
+
+        SOInstanceReferences instanceReferences = new SOInstanceReferences();
+        obj.setInstanceReferences(instanceReferences);
+        assertEquals(instanceReferences, obj.getInstanceReferences());
+
+        obj.setRequestId("requestId");
+        assertEquals("requestId", obj.getRequestId());
+
+        obj.setRequestScope("requestScope");
+        assertEquals("requestScope", obj.getRequestScope());
+
+        SORequestStatus requestStatus = new SORequestStatus();
+        obj.setRequestStatus(requestStatus);
+        assertEquals(requestStatus, obj.getRequestStatus());
+
+        obj.setRequestType("requestType");
+        assertEquals("requestType", obj.getRequestType());
+
+        LocalDateTime startTime = LocalDateTime.now();
+        obj.setStartTime(startTime);
+        assertEquals(startTime, obj.getStartTime());
+
+    }
+}
index f059129..bab8970 100755 (executable)
@@ -1,48 +1,48 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoCloudConfiguration {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOCloudConfiguration obj = new SOCloudConfiguration();\r
-\r
-        assertTrue(obj.getLcpCloudRegionId() == null);\r
-        assertTrue(obj.getTenantId() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOCloudConfiguration obj = new SOCloudConfiguration();\r
-\r
-        obj.setLcpCloudRegionId("lcpCloudRegionId");\r
-        assertEquals("lcpCloudRegionId", obj.getLcpCloudRegionId());\r
-\r
-        obj.setTenantId("tenantId");\r
-        assertEquals("tenantId", obj.getTenantId());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoCloudConfiguration {
+
+    @Test
+    public void testConstructor() {
+        SOCloudConfiguration obj = new SOCloudConfiguration();
+
+        assertTrue(obj.getLcpCloudRegionId() == null);
+        assertTrue(obj.getTenantId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOCloudConfiguration obj = new SOCloudConfiguration();
+
+        obj.setLcpCloudRegionId("lcpCloudRegionId");
+        assertEquals("lcpCloudRegionId", obj.getLcpCloudRegionId());
+
+        obj.setTenantId("tenantId");
+        assertEquals("tenantId", obj.getTenantId());
+    }
+}
index 8c63e9c..ee083ae 100755 (executable)
@@ -1,48 +1,48 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoInstanceReferences {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOInstanceReferences obj = new SOInstanceReferences();\r
-\r
-        assertTrue(obj.getInstanceId() == null);\r
-        assertTrue(obj.getRequestId() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOInstanceReferences obj = new SOInstanceReferences();\r
-\r
-        obj.setInstanceId("instanceId");\r
-        assertEquals("instanceId", obj.getInstanceId());\r
-\r
-        obj.setRequestId("requestId");\r
-        assertEquals("requestId", obj.getRequestId());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoInstanceReferences {
+
+    @Test
+    public void testConstructor() {
+        SOInstanceReferences obj = new SOInstanceReferences();
+
+        assertTrue(obj.getInstanceId() == null);
+        assertTrue(obj.getRequestId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOInstanceReferences obj = new SOInstanceReferences();
+
+        obj.setInstanceId("instanceId");
+        assertEquals("instanceId", obj.getInstanceId());
+
+        obj.setRequestId("requestId");
+        assertEquals("requestId", obj.getRequestId());
+    }
+}
index 99f829f..037e82e 100755 (executable)
@@ -1,69 +1,69 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoModelInfo {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOModelInfo obj = new SOModelInfo();\r
-\r
-        assertTrue(obj.getModelCustomizationId() == null);\r
-        assertTrue(obj.getModelCustomizationName() == null);\r
-        assertTrue(obj.getModelInvariantId() == null);\r
-        assertTrue(obj.getModelName() == null);\r
-        assertTrue(obj.getModelType() == null);\r
-        assertTrue(obj.getModelVersion() == null);\r
-        assertTrue(obj.getModelVersionId() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOModelInfo obj = new SOModelInfo();\r
-\r
-        obj.setModelCustomizationId("modelCustomizationId");\r
-        assertEquals("modelCustomizationId", obj.getModelCustomizationId());\r
-\r
-        obj.setModelCustomizationName("modelCustomizationName");\r
-        assertEquals("modelCustomizationName", obj.getModelCustomizationName());\r
-\r
-        obj.setModelInvariantId("modelInvariantId");\r
-        assertEquals("modelInvariantId", obj.getModelInvariantId());\r
-\r
-        obj.setModelName("modelName");\r
-        assertEquals("modelName", obj.getModelName());\r
-\r
-        obj.setModelType("modelType");\r
-        assertEquals("modelType", obj.getModelType());\r
-\r
-        obj.setModelVersion("modelVersion");\r
-        assertEquals("modelVersion", obj.getModelVersion());\r
-\r
-        obj.setModelVersionId("modelVersionId");\r
-        assertEquals("modelVersionId", obj.getModelVersionId());\r
-\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoModelInfo {
+
+    @Test
+    public void testConstructor() {
+        SOModelInfo obj = new SOModelInfo();
+
+        assertTrue(obj.getModelCustomizationId() == null);
+        assertTrue(obj.getModelCustomizationName() == null);
+        assertTrue(obj.getModelInvariantId() == null);
+        assertTrue(obj.getModelName() == null);
+        assertTrue(obj.getModelType() == null);
+        assertTrue(obj.getModelVersion() == null);
+        assertTrue(obj.getModelVersionId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOModelInfo obj = new SOModelInfo();
+
+        obj.setModelCustomizationId("modelCustomizationId");
+        assertEquals("modelCustomizationId", obj.getModelCustomizationId());
+
+        obj.setModelCustomizationName("modelCustomizationName");
+        assertEquals("modelCustomizationName", obj.getModelCustomizationName());
+
+        obj.setModelInvariantId("modelInvariantId");
+        assertEquals("modelInvariantId", obj.getModelInvariantId());
+
+        obj.setModelName("modelName");
+        assertEquals("modelName", obj.getModelName());
+
+        obj.setModelType("modelType");
+        assertEquals("modelType", obj.getModelType());
+
+        obj.setModelVersion("modelVersion");
+        assertEquals("modelVersion", obj.getModelVersion());
+
+        obj.setModelVersionId("modelVersionId");
+        assertEquals("modelVersionId", obj.getModelVersionId());
+
+    }
+}
index 978ec8a..1c619a8 100755 (executable)
@@ -1,48 +1,48 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoPolicyExceptionHolder {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();\r
-\r
-        assertTrue(obj.getMessageId() == null);\r
-        assertTrue(obj.getText() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();\r
-\r
-        obj.setMessageId("messageId");\r
-        assertEquals("messageId", obj.getMessageId());\r
-\r
-        obj.setText("text");\r
-        assertEquals("text", obj.getText());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoPolicyExceptionHolder {
+
+    @Test
+    public void testConstructor() {
+        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
+
+        assertTrue(obj.getMessageId() == null);
+        assertTrue(obj.getText() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOPolicyExceptionHolder obj = new SOPolicyExceptionHolder();
+
+        obj.setMessageId("messageId");
+        assertEquals("messageId", obj.getMessageId());
+
+        obj.setText("text");
+        assertEquals("text", obj.getText());
+    }
+}
index a8e94b8..0482883 100755 (executable)
@@ -1,53 +1,53 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRelatedInstance {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORelatedInstance obj = new SORelatedInstance();\r
-\r
-        assertTrue(obj.getInstanceId() == null);\r
-        assertTrue(obj.getInstanceName() == null);\r
-        assertTrue(obj.getModelInfo() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORelatedInstance obj = new SORelatedInstance();\r
-\r
-        obj.setInstanceId("instanceId");\r
-        assertEquals("instanceId", obj.getInstanceId());\r
-\r
-        obj.setInstanceName("instanceName");\r
-        assertEquals("instanceName", obj.getInstanceName());\r
-\r
-        SOModelInfo modelInfo = new SOModelInfo();\r
-        obj.setModelInfo(modelInfo);\r
-        assertEquals(modelInfo, obj.getModelInfo());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRelatedInstance {
+
+    @Test
+    public void testConstructor() {
+        SORelatedInstance obj = new SORelatedInstance();
+
+        assertTrue(obj.getInstanceId() == null);
+        assertTrue(obj.getInstanceName() == null);
+        assertTrue(obj.getModelInfo() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORelatedInstance obj = new SORelatedInstance();
+
+        obj.setInstanceId("instanceId");
+        assertEquals("instanceId", obj.getInstanceId());
+
+        obj.setInstanceName("instanceName");
+        assertEquals("instanceName", obj.getInstanceName());
+
+        SOModelInfo modelInfo = new SOModelInfo();
+        obj.setModelInfo(modelInfo);
+        assertEquals(modelInfo, obj.getModelInfo());
+    }
+}
index 17abd06..83f1d58 100755 (executable)
@@ -1,45 +1,45 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRelatedInstanceListElement {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();\r
-\r
-        assertTrue(obj.getRelatedInstance() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();\r
-\r
-        SORelatedInstance relatedInstance = new SORelatedInstance();\r
-        obj.setRelatedInstance(relatedInstance);\r
-        assertEquals(relatedInstance, obj.getRelatedInstance());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRelatedInstanceListElement {
+
+    @Test
+    public void testConstructor() {
+        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
+
+        assertTrue(obj.getRelatedInstance() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORelatedInstanceListElement obj = new SORelatedInstanceListElement();
+
+        SORelatedInstance relatedInstance = new SORelatedInstance();
+        obj.setRelatedInstance(relatedInstance);
+        assertEquals(relatedInstance, obj.getRelatedInstance());
+    }
+}
index 229765a..f582541 100755 (executable)
@@ -1,72 +1,72 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.time.LocalDateTime;\r
-import java.util.UUID;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequest {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequest obj = new SORequest();\r
-\r
-        assertTrue(obj.getFinishTime() == null);\r
-        assertTrue(obj.getRequestDetails() == null);\r
-        assertTrue(obj.getRequestId() == null);\r
-        assertTrue(obj.getRequestScope() == null);\r
-        assertTrue(obj.getRequestStatus() == null);\r
-        assertTrue(obj.getRequestType() == null);\r
-        assertTrue(obj.getStartTime() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequest obj = new SORequest();\r
-\r
-        LocalDateTime finishTime = LocalDateTime.now();\r
-        obj.setFinishTime(finishTime);\r
-        assertEquals(finishTime, obj.getFinishTime());\r
-\r
-        UUID uuid = UUID.randomUUID();\r
-        obj.setRequestId(uuid);\r
-        assertEquals(uuid, obj.getRequestId());\r
-\r
-        obj.setRequestScope("requestScope");\r
-        assertEquals("requestScope", obj.getRequestScope());\r
-\r
-        SORequestStatus requestStatus = new SORequestStatus();\r
-        obj.setRequestStatus(requestStatus);\r
-        assertEquals(requestStatus, obj.getRequestStatus());\r
-\r
-        obj.setRequestType("requestType");\r
-        assertEquals("requestType", obj.getRequestType());\r
-\r
-        LocalDateTime startTime = LocalDateTime.now();\r
-        obj.setStartTime(startTime.toString());\r
-        assertEquals(startTime.toString(), obj.getStartTime());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestSoRequest {
+
+    @Test
+    public void testConstructor() {
+        SORequest obj = new SORequest();
+
+        assertTrue(obj.getFinishTime() == null);
+        assertTrue(obj.getRequestDetails() == null);
+        assertTrue(obj.getRequestId() == null);
+        assertTrue(obj.getRequestScope() == null);
+        assertTrue(obj.getRequestStatus() == null);
+        assertTrue(obj.getRequestType() == null);
+        assertTrue(obj.getStartTime() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequest obj = new SORequest();
+
+        LocalDateTime finishTime = LocalDateTime.now();
+        obj.setFinishTime(finishTime);
+        assertEquals(finishTime, obj.getFinishTime());
+
+        UUID uuid = UUID.randomUUID();
+        obj.setRequestId(uuid);
+        assertEquals(uuid, obj.getRequestId());
+
+        obj.setRequestScope("requestScope");
+        assertEquals("requestScope", obj.getRequestScope());
+
+        SORequestStatus requestStatus = new SORequestStatus();
+        obj.setRequestStatus(requestStatus);
+        assertEquals(requestStatus, obj.getRequestStatus());
+
+        obj.setRequestType("requestType");
+        assertEquals("requestType", obj.getRequestType());
+
+        LocalDateTime startTime = LocalDateTime.now();
+        obj.setStartTime(startTime.toString());
+        assertEquals(startTime.toString(), obj.getStartTime());
+    }
+}
index 42dfe08..6e9a2ba 100755 (executable)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertNotEquals;\r
-import static org.junit.Assert.assertNotNull;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import java.util.ArrayList;\r
-import java.util.List;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequestDetails {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequestDetails obj = new SORequestDetails();\r
-\r
-        assertTrue(obj.getCloudConfiguration() == null);\r
-        assertTrue(obj.getModelInfo() == null);\r
-        assertTrue(obj.getRequestInfo() == null);\r
-        assertTrue(obj.getRequestParameters() == null);\r
-        assertTrue(obj.getSubscriberInfo() == null);\r
-\r
-        assertTrue(obj.getRelatedInstanceList() != null);\r
-        assertEquals(0, obj.getRelatedInstanceList().size());\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequestDetails obj = new SORequestDetails();\r
-\r
-        SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();\r
-        obj.setCloudConfiguration(cloudConfiguration);\r
-        assertEquals(cloudConfiguration, obj.getCloudConfiguration());\r
-\r
-        SOModelInfo modelInfo = new SOModelInfo();\r
-        obj.setModelInfo(modelInfo);\r
-        assertEquals(modelInfo, obj.getModelInfo());\r
-\r
-        SORequestInfo requestInfo = new SORequestInfo();\r
-        obj.setRequestInfo(requestInfo);\r
-        assertEquals(requestInfo, obj.getRequestInfo());\r
-\r
-        SORequestParameters requestParameters = new SORequestParameters();\r
-        obj.setRequestParameters(requestParameters);\r
-        assertEquals(requestParameters, obj.getRequestParameters());\r
-\r
-        SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();\r
-        obj.setSubscriberInfo(subscriberInfo);\r
-        assertEquals(subscriberInfo, obj.getSubscriberInfo());\r
-    }\r
-    \r
-       @Test\r
-       public void testSOMRequestDetailsMethods() {\r
-               SORequestDetails details = new SORequestDetails();\r
-               assertNotNull(details);\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();\r
-               details.setCloudConfiguration(cloudConfiguration);\r
-               assertEquals(cloudConfiguration, details.getCloudConfiguration());\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               SOModelInfo modelInfo = new SOModelInfo();\r
-               details.setModelInfo(modelInfo);\r
-               assertEquals(modelInfo, details.getModelInfo());\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               List<SORelatedInstanceListElement> relatedInstanceList = new ArrayList<>();\r
-               details.setRelatedInstanceList(relatedInstanceList);\r
-               assertEquals(relatedInstanceList, details.getRelatedInstanceList());\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               SORequestInfo requestInfo = new SORequestInfo();\r
-               details.setRequestInfo(requestInfo);\r
-               assertEquals(requestInfo, details.getRequestInfo());\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               SORequestParameters requestParameters = new SORequestParameters();\r
-               details.setRequestParameters(requestParameters);\r
-               assertEquals(requestParameters, details.getRequestParameters());\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();\r
-               details.setSubscriberInfo(subscriberInfo);\r
-               assertEquals(subscriberInfo, details.getSubscriberInfo());\r
-               assertNotEquals(0, details.hashCode());\r
-               \r
-               assertEquals("SORequestDetails [modelInfo=org.onap.policy.so", details.toString().substring(0,  46));\r
-               \r
-               SORequestDetails copiedDetails = new SORequestDetails(details);\r
-\r
-        assertTrue(details.equals(details));\r
-        assertTrue(details.equals(copiedDetails));\r
-        assertFalse(details.equals(null));\r
-        assertFalse(details.equals("Hello"));\r
-        \r
-        details.setCloudConfiguration(null);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setCloudConfiguration(null);\r
-        assertTrue(details.equals(copiedDetails));\r
-        details.setCloudConfiguration(cloudConfiguration);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setCloudConfiguration(cloudConfiguration);\r
-        assertTrue(details.equals(copiedDetails));\r
-\r
-        details.setModelInfo(null);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setModelInfo(null);\r
-        assertTrue(details.equals(copiedDetails));\r
-        details.setModelInfo(modelInfo);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setModelInfo(modelInfo);\r
-        assertTrue(details.equals(copiedDetails));\r
-        \r
-        details.setRequestInfo(null);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setRequestInfo(null);\r
-        assertTrue(details.equals(copiedDetails));\r
-        details.setRequestInfo(requestInfo);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setRequestInfo(requestInfo);\r
-        assertTrue(details.equals(copiedDetails));\r
-               \r
-        details.setRequestParameters(null);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setRequestParameters(null);\r
-        assertTrue(details.equals(copiedDetails));\r
-        details.setRequestParameters(requestParameters);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setRequestParameters(requestParameters);\r
-        assertTrue(details.equals(copiedDetails));\r
-               \r
-        details.setSubscriberInfo(null);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setSubscriberInfo(null);\r
-        assertTrue(details.equals(copiedDetails));\r
-        details.setSubscriberInfo(subscriberInfo);\r
-        assertFalse(details.equals(copiedDetails));\r
-        copiedDetails.setSubscriberInfo(subscriberInfo);\r
-        assertTrue(details.equals(copiedDetails));\r
-               \r
-        details.setRelatedInstanceList(null);\r
-        assertFalse(details.equals(copiedDetails));\r
-               copiedDetails.setRelatedInstanceList(null);\r
-        assertTrue(details.equals(copiedDetails));\r
-        details.setRelatedInstanceList(relatedInstanceList);\r
-        assertFalse(details.equals(copiedDetails));\r
-               copiedDetails.setRelatedInstanceList(relatedInstanceList);\r
-        assertTrue(details.equals(copiedDetails));\r
-       }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Test;
+
+public class TestSoRequestDetails {
+
+    @Test
+    public void testConstructor() {
+        SORequestDetails obj = new SORequestDetails();
+
+        assertTrue(obj.getCloudConfiguration() == null);
+        assertTrue(obj.getModelInfo() == null);
+        assertTrue(obj.getRequestInfo() == null);
+        assertTrue(obj.getRequestParameters() == null);
+        assertTrue(obj.getSubscriberInfo() == null);
+
+        assertTrue(obj.getRelatedInstanceList() != null);
+        assertEquals(0, obj.getRelatedInstanceList().size());
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestDetails obj = new SORequestDetails();
+
+        SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+        obj.setCloudConfiguration(cloudConfiguration);
+        assertEquals(cloudConfiguration, obj.getCloudConfiguration());
+
+        SOModelInfo modelInfo = new SOModelInfo();
+        obj.setModelInfo(modelInfo);
+        assertEquals(modelInfo, obj.getModelInfo());
+
+        SORequestInfo requestInfo = new SORequestInfo();
+        obj.setRequestInfo(requestInfo);
+        assertEquals(requestInfo, obj.getRequestInfo());
+
+        SORequestParameters requestParameters = new SORequestParameters();
+        obj.setRequestParameters(requestParameters);
+        assertEquals(requestParameters, obj.getRequestParameters());
+
+        SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
+        obj.setSubscriberInfo(subscriberInfo);
+        assertEquals(subscriberInfo, obj.getSubscriberInfo());
+    }
+    
+       @Test
+       public void testSOMRequestDetailsMethods() {
+               SORequestDetails details = new SORequestDetails();
+               assertNotNull(details);
+               assertNotEquals(0, details.hashCode());
+               
+               SOCloudConfiguration cloudConfiguration = new SOCloudConfiguration();
+               details.setCloudConfiguration(cloudConfiguration);
+               assertEquals(cloudConfiguration, details.getCloudConfiguration());
+               assertNotEquals(0, details.hashCode());
+               
+               SOModelInfo modelInfo = new SOModelInfo();
+               details.setModelInfo(modelInfo);
+               assertEquals(modelInfo, details.getModelInfo());
+               assertNotEquals(0, details.hashCode());
+               
+               List<SORelatedInstanceListElement> relatedInstanceList = new ArrayList<>();
+               details.setRelatedInstanceList(relatedInstanceList);
+               assertEquals(relatedInstanceList, details.getRelatedInstanceList());
+               assertNotEquals(0, details.hashCode());
+               
+               SORequestInfo requestInfo = new SORequestInfo();
+               details.setRequestInfo(requestInfo);
+               assertEquals(requestInfo, details.getRequestInfo());
+               assertNotEquals(0, details.hashCode());
+               
+               SORequestParameters requestParameters = new SORequestParameters();
+               details.setRequestParameters(requestParameters);
+               assertEquals(requestParameters, details.getRequestParameters());
+               assertNotEquals(0, details.hashCode());
+               
+               SOSubscriberInfo subscriberInfo = new SOSubscriberInfo();
+               details.setSubscriberInfo(subscriberInfo);
+               assertEquals(subscriberInfo, details.getSubscriberInfo());
+               assertNotEquals(0, details.hashCode());
+               
+               assertEquals("SORequestDetails [modelInfo=org.onap.policy.so", details.toString().substring(0,  46));
+               
+               SORequestDetails copiedDetails = new SORequestDetails(details);
+
+        assertTrue(details.equals(details));
+        assertTrue(details.equals(copiedDetails));
+        assertFalse(details.equals(null));
+        assertFalse(details.equals("Hello"));
+        
+        details.setCloudConfiguration(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setCloudConfiguration(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setCloudConfiguration(cloudConfiguration);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setCloudConfiguration(cloudConfiguration);
+        assertTrue(details.equals(copiedDetails));
+
+        details.setModelInfo(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setModelInfo(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setModelInfo(modelInfo);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setModelInfo(modelInfo);
+        assertTrue(details.equals(copiedDetails));
+        
+        details.setRequestInfo(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestInfo(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setRequestInfo(requestInfo);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestInfo(requestInfo);
+        assertTrue(details.equals(copiedDetails));
+               
+        details.setRequestParameters(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestParameters(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setRequestParameters(requestParameters);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setRequestParameters(requestParameters);
+        assertTrue(details.equals(copiedDetails));
+               
+        details.setSubscriberInfo(null);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setSubscriberInfo(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setSubscriberInfo(subscriberInfo);
+        assertFalse(details.equals(copiedDetails));
+        copiedDetails.setSubscriberInfo(subscriberInfo);
+        assertTrue(details.equals(copiedDetails));
+               
+        details.setRelatedInstanceList(null);
+        assertFalse(details.equals(copiedDetails));
+               copiedDetails.setRelatedInstanceList(null);
+        assertTrue(details.equals(copiedDetails));
+        details.setRelatedInstanceList(relatedInstanceList);
+        assertFalse(details.equals(copiedDetails));
+               copiedDetails.setRelatedInstanceList(relatedInstanceList);
+        assertTrue(details.equals(copiedDetails));
+       }
+}
index 1108daf..a3c19cf 100755 (executable)
@@ -1,50 +1,50 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequestError {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequestError obj = new SORequestError();\r
-\r
-        assertTrue(obj.getPolicyException() == null);\r
-        assertTrue(obj.getServiceException() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequestError obj = new SORequestError();\r
-\r
-        SOPolicyExceptionHolder policyException = new SOPolicyExceptionHolder();\r
-        obj.setPolicyException(policyException);\r
-        assertEquals(policyException, obj.getPolicyException());\r
-\r
-        SOServiceExceptionHolder serviceException = new SOServiceExceptionHolder();\r
-        obj.setServiceException(serviceException);\r
-        assertEquals(serviceException, obj.getServiceException());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestError {
+
+    @Test
+    public void testConstructor() {
+        SORequestError obj = new SORequestError();
+
+        assertTrue(obj.getPolicyException() == null);
+        assertTrue(obj.getServiceException() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestError obj = new SORequestError();
+
+        SOPolicyExceptionHolder policyException = new SOPolicyExceptionHolder();
+        obj.setPolicyException(policyException);
+        assertEquals(policyException, obj.getPolicyException());
+
+        SOServiceExceptionHolder serviceException = new SOServiceExceptionHolder();
+        obj.setServiceException(serviceException);
+        assertEquals(serviceException, obj.getServiceException());
+    }
+}
index d1b7f24..a77fe8b 100755 (executable)
@@ -1,81 +1,81 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequestInfo {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequestInfo obj = new SORequestInfo();\r
-\r
-        assertTrue(obj.getBillingAccountNumber() == null);\r
-        assertTrue(obj.getCallbackUrl() == null);\r
-        assertTrue(obj.getCorrelator() == null);\r
-        assertTrue(obj.getInstanceName() == null);\r
-        assertTrue(obj.getOrderNumber() == null);\r
-        assertTrue(obj.getOrderVersion() == null);\r
-        assertTrue(obj.getProductFamilyId() == null);\r
-        assertTrue(obj.getRequestorId() == null);\r
-        assertTrue(obj.getSource() == null);\r
-        assertTrue(obj.isSuppressRollback() == false);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequestInfo obj = new SORequestInfo();\r
-\r
-        obj.setBillingAccountNumber("billingAccountNumber");\r
-        assertEquals("billingAccountNumber", obj.getBillingAccountNumber());\r
-\r
-        obj.setCallbackUrl("callbackUrl");\r
-        assertEquals("callbackUrl", obj.getCallbackUrl());\r
-\r
-        obj.setCorrelator("correlator");\r
-        assertEquals("correlator", obj.getCorrelator());\r
-\r
-        obj.setInstanceName("instanceName");\r
-        assertEquals("instanceName", obj.getInstanceName());\r
-\r
-        obj.setOrderNumber("orderNumber");\r
-        assertEquals("orderNumber", obj.getOrderNumber());\r
-\r
-        int orderVersion = 2008;\r
-        obj.setOrderVersion(orderVersion);\r
-        assertEquals((Integer) orderVersion, obj.getOrderVersion());\r
-\r
-        obj.setProductFamilyId("productFamilyId");\r
-        assertEquals("productFamilyId", obj.getProductFamilyId());\r
-\r
-        obj.setRequestorId("requestorId");\r
-        assertEquals("requestorId", obj.getRequestorId());\r
-\r
-        obj.setSource("source");\r
-        assertEquals("source", obj.getSource());\r
-\r
-        obj.setSuppressRollback(true);\r
-        assertEquals(true, obj.isSuppressRollback());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestInfo {
+
+    @Test
+    public void testConstructor() {
+        SORequestInfo obj = new SORequestInfo();
+
+        assertTrue(obj.getBillingAccountNumber() == null);
+        assertTrue(obj.getCallbackUrl() == null);
+        assertTrue(obj.getCorrelator() == null);
+        assertTrue(obj.getInstanceName() == null);
+        assertTrue(obj.getOrderNumber() == null);
+        assertTrue(obj.getOrderVersion() == null);
+        assertTrue(obj.getProductFamilyId() == null);
+        assertTrue(obj.getRequestorId() == null);
+        assertTrue(obj.getSource() == null);
+        assertTrue(obj.isSuppressRollback() == false);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestInfo obj = new SORequestInfo();
+
+        obj.setBillingAccountNumber("billingAccountNumber");
+        assertEquals("billingAccountNumber", obj.getBillingAccountNumber());
+
+        obj.setCallbackUrl("callbackUrl");
+        assertEquals("callbackUrl", obj.getCallbackUrl());
+
+        obj.setCorrelator("correlator");
+        assertEquals("correlator", obj.getCorrelator());
+
+        obj.setInstanceName("instanceName");
+        assertEquals("instanceName", obj.getInstanceName());
+
+        obj.setOrderNumber("orderNumber");
+        assertEquals("orderNumber", obj.getOrderNumber());
+
+        int orderVersion = 2008;
+        obj.setOrderVersion(orderVersion);
+        assertEquals((Integer) orderVersion, obj.getOrderVersion());
+
+        obj.setProductFamilyId("productFamilyId");
+        assertEquals("productFamilyId", obj.getProductFamilyId());
+
+        obj.setRequestorId("requestorId");
+        assertEquals("requestorId", obj.getRequestorId());
+
+        obj.setSource("source");
+        assertEquals("source", obj.getSource());
+
+        obj.setSuppressRollback(true);
+        assertEquals(true, obj.isSuppressRollback());
+    }
+}
index cb32be5..1ebf5d7 100755 (executable)
@@ -1,46 +1,46 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequestParameters {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequestParameters obj = new SORequestParameters();\r
-\r
-        assertTrue(obj.getSubscriptionServiceType() == null);\r
-        assertTrue(obj.getUserParams() != null);\r
-        assertEquals(0, obj.getUserParams().size());\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequestParameters obj = new SORequestParameters();\r
-\r
-        obj.setSubscriptionServiceType("subscriptionServiceType");\r
-        assertEquals("subscriptionServiceType", obj.getSubscriptionServiceType());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestParameters {
+
+    @Test
+    public void testConstructor() {
+        SORequestParameters obj = new SORequestParameters();
+
+        assertTrue(obj.getSubscriptionServiceType() == null);
+        assertTrue(obj.getUserParams() != null);
+        assertEquals(0, obj.getUserParams().size());
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestParameters obj = new SORequestParameters();
+
+        obj.setSubscriptionServiceType("subscriptionServiceType");
+        assertEquals("subscriptionServiceType", obj.getSubscriptionServiceType());
+    }
+}
index e212ba1..498a2e0 100755 (executable)
@@ -1,48 +1,48 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequestReferences {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequestReferences obj = new SORequestReferences();\r
-\r
-        assertTrue(obj.getInstanceId() == null);\r
-        assertTrue(obj.getRequestId() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequestReferences obj = new SORequestReferences();\r
-\r
-        obj.setInstanceId("instanceId");\r
-        assertEquals("instanceId", obj.getInstanceId());\r
-        \r
-        obj.setRequestId("requestId");\r
-        assertEquals("requestId", obj.getRequestId());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestReferences {
+
+    @Test
+    public void testConstructor() {
+        SORequestReferences obj = new SORequestReferences();
+
+        assertTrue(obj.getInstanceId() == null);
+        assertTrue(obj.getRequestId() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestReferences obj = new SORequestReferences();
+
+        obj.setInstanceId("instanceId");
+        assertEquals("instanceId", obj.getInstanceId());
+        
+        obj.setRequestId("requestId");
+        assertEquals("requestId", obj.getRequestId());
+    }
+}
index 9fa0b97..1b8d745 100755 (executable)
@@ -1,57 +1,57 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoRequestStatus {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SORequestStatus obj = new SORequestStatus();\r
-\r
-        assertEquals(0, obj.getPercentProgress());\r
-        assertTrue(obj.getRequestState() == null);\r
-        assertTrue(obj.getTimestamp() == null);\r
-        assertFalse(obj.isWasRolledBack());\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SORequestStatus obj = new SORequestStatus();\r
-\r
-        obj.setPercentProgress(2008);\r
-        assertEquals(2008, obj.getPercentProgress());\r
-\r
-        obj.setRequestState("requestState");\r
-        assertEquals("requestState", obj.getRequestState());\r
-\r
-        obj.setTimestamp("timestamp");\r
-        assertEquals("timestamp", obj.getTimestamp());\r
-\r
-        obj.setWasRolledBack(true);\r
-        assertTrue(obj.isWasRolledBack());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoRequestStatus {
+
+    @Test
+    public void testConstructor() {
+        SORequestStatus obj = new SORequestStatus();
+
+        assertEquals(0, obj.getPercentProgress());
+        assertTrue(obj.getRequestState() == null);
+        assertTrue(obj.getTimestamp() == null);
+        assertFalse(obj.isWasRolledBack());
+    }
+
+    @Test
+    public void testSetGet() {
+        SORequestStatus obj = new SORequestStatus();
+
+        obj.setPercentProgress(2008);
+        assertEquals(2008, obj.getPercentProgress());
+
+        obj.setRequestState("requestState");
+        assertEquals("requestState", obj.getRequestState());
+
+        obj.setTimestamp("timestamp");
+        assertEquals("timestamp", obj.getTimestamp());
+
+        obj.setWasRolledBack(true);
+        assertTrue(obj.isWasRolledBack());
+    }
+}
index edac2fa..cf9a85e 100755 (executable)
@@ -1,59 +1,59 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoResponse {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOResponse obj = new SOResponse();\r
-\r
-        assertEquals(0, obj.getHttpResponseCode());\r
-        assertTrue(obj.getRequest() == null);\r
-        assertTrue(obj.getRequestError() == null);\r
-        assertTrue(obj.getRequestReferences() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOResponse obj = new SOResponse();\r
-\r
-        obj.setHttpResponseCode(2008);\r
-        assertEquals(2008, obj.getHttpResponseCode());\r
-\r
-        SORequest request = new SORequest();\r
-        obj.setRequest(request);\r
-        assertEquals(request, obj.getRequest());\r
-\r
-        SORequestError requestError = new SORequestError();\r
-        obj.setRequestError(requestError);\r
-        assertEquals(requestError, obj.getRequestError());\r
-\r
-        SORequestReferences requestReferences = new SORequestReferences();\r
-        obj.setRequestReferences(requestReferences);\r
-        assertEquals(requestReferences, obj.getRequestReferences());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoResponse {
+
+    @Test
+    public void testConstructor() {
+        SOResponse obj = new SOResponse();
+
+        assertEquals(0, obj.getHttpResponseCode());
+        assertTrue(obj.getRequest() == null);
+        assertTrue(obj.getRequestError() == null);
+        assertTrue(obj.getRequestReferences() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOResponse obj = new SOResponse();
+
+        obj.setHttpResponseCode(2008);
+        assertEquals(2008, obj.getHttpResponseCode());
+
+        SORequest request = new SORequest();
+        obj.setRequest(request);
+        assertEquals(request, obj.getRequest());
+
+        SORequestError requestError = new SORequestError();
+        obj.setRequestError(requestError);
+        assertEquals(requestError, obj.getRequestError());
+
+        SORequestReferences requestReferences = new SORequestReferences();
+        obj.setRequestReferences(requestReferences);
+        assertEquals(requestReferences, obj.getRequestReferences());
+    }
+}
index 7b48301..860761a 100755 (executable)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertNotEquals;\r
-import static org.junit.Assert.assertNotNull;\r
-\r
-import java.util.UUID;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoResponseWrapper {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOResponse response = new SOResponse();\r
-        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");\r
-\r
-        assertEquals(response, obj.getSoResponse());\r
-        assertEquals("reqID", obj.getRequestID());\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOResponse response = new SOResponse();\r
-        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");\r
-\r
-        SOResponse response2 = new SOResponse();\r
-        response2.setHttpResponseCode(2008);\r
-        obj.setSoResponse(response2);\r
-        assertEquals(response2, obj.getSoResponse());\r
-\r
-        obj.setRequestID("id2");\r
-        assertEquals("id2", obj.getRequestID());\r
-    }\r
-    \r
-       @SuppressWarnings("unlikely-arg-type")\r
-       @Test\r
-       public void testSOResponseWrapperMethods() {\r
-               String requestID = UUID.randomUUID().toString();\r
-               SOResponse response = new SOResponse();\r
-\r
-               SOResponseWrapper responseWrapper = new SOResponseWrapper(response, requestID);\r
-               assertNotNull(responseWrapper);\r
-               assertNotEquals(0, responseWrapper.hashCode());\r
-               \r
-               assertEquals(response, responseWrapper.getSoResponse());\r
-               \r
-               assertNotEquals(0, responseWrapper.hashCode());\r
-               \r
-               assertEquals("SOResponseWrapper [SOResponse=org.onap.policy.", responseWrapper.toString().substring(0,  46));\r
-               \r
-               SOResponseWrapper identicalResponseWrapper = new SOResponseWrapper(response, requestID);\r
-\r
-        assertEquals(responseWrapper,  responseWrapper);\r
-        assertEquals(responseWrapper,  identicalResponseWrapper);\r
-        assertNotEquals(null, responseWrapper);\r
-        assertNotEquals("Hello", responseWrapper);\r
-        assertFalse(responseWrapper.equals(null));\r
-        assertFalse(responseWrapper.equals("AString"));\r
-        \r
-        assertEquals(new SOResponseWrapper(null, null), new SOResponseWrapper(null, null));\r
-        assertNotEquals(new SOResponseWrapper(null, null), identicalResponseWrapper);\r
-        \r
-               assertNotEquals(0, new SOResponseWrapper(null, null).hashCode());\r
-\r
-               identicalResponseWrapper.setSoResponse(new SOResponse());\r
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);\r
-        identicalResponseWrapper.setSoResponse(response);\r
-        assertEquals(responseWrapper,  identicalResponseWrapper);\r
-        \r
-        identicalResponseWrapper.setRequestID(UUID.randomUUID().toString());\r
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);\r
-        identicalResponseWrapper.setRequestID(requestID);\r
-        assertEquals(responseWrapper,  identicalResponseWrapper);\r
-        \r
-        responseWrapper.setRequestID(null);\r
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);\r
-        identicalResponseWrapper.setRequestID(null);\r
-        assertEquals(responseWrapper,  identicalResponseWrapper);\r
-        responseWrapper.setRequestID(requestID);\r
-        assertNotEquals(responseWrapper,  identicalResponseWrapper);\r
-        identicalResponseWrapper.setRequestID(requestID);\r
-        assertEquals(responseWrapper,  identicalResponseWrapper);\r
-       }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.UUID;
+
+import org.junit.Test;
+
+public class TestSoResponseWrapper {
+
+    @Test
+    public void testConstructor() {
+        SOResponse response = new SOResponse();
+        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
+
+        assertEquals(response, obj.getSoResponse());
+        assertEquals("reqID", obj.getRequestID());
+    }
+
+    @Test
+    public void testSetGet() {
+        SOResponse response = new SOResponse();
+        SOResponseWrapper obj = new SOResponseWrapper(response, "reqID");
+
+        SOResponse response2 = new SOResponse();
+        response2.setHttpResponseCode(2008);
+        obj.setSoResponse(response2);
+        assertEquals(response2, obj.getSoResponse());
+
+        obj.setRequestID("id2");
+        assertEquals("id2", obj.getRequestID());
+    }
+    
+       @SuppressWarnings("unlikely-arg-type")
+       @Test
+       public void testSOResponseWrapperMethods() {
+               String requestID = UUID.randomUUID().toString();
+               SOResponse response = new SOResponse();
+
+               SOResponseWrapper responseWrapper = new SOResponseWrapper(response, requestID);
+               assertNotNull(responseWrapper);
+               assertNotEquals(0, responseWrapper.hashCode());
+               
+               assertEquals(response, responseWrapper.getSoResponse());
+               
+               assertNotEquals(0, responseWrapper.hashCode());
+               
+               assertEquals("SOResponseWrapper [SOResponse=org.onap.policy.", responseWrapper.toString().substring(0,  46));
+               
+               SOResponseWrapper identicalResponseWrapper = new SOResponseWrapper(response, requestID);
+
+        assertEquals(responseWrapper,  responseWrapper);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        assertNotEquals(null, responseWrapper);
+        assertNotEquals("Hello", responseWrapper);
+        assertFalse(responseWrapper.equals(null));
+        assertFalse(responseWrapper.equals("AString"));
+        
+        assertEquals(new SOResponseWrapper(null, null), new SOResponseWrapper(null, null));
+        assertNotEquals(new SOResponseWrapper(null, null), identicalResponseWrapper);
+        
+               assertNotEquals(0, new SOResponseWrapper(null, null).hashCode());
+
+               identicalResponseWrapper.setSoResponse(new SOResponse());
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setSoResponse(response);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        
+        identicalResponseWrapper.setRequestID(UUID.randomUUID().toString());
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setRequestID(requestID);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        
+        responseWrapper.setRequestID(null);
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setRequestID(null);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+        responseWrapper.setRequestID(requestID);
+        assertNotEquals(responseWrapper,  identicalResponseWrapper);
+        identicalResponseWrapper.setRequestID(requestID);
+        assertEquals(responseWrapper,  identicalResponseWrapper);
+       }
+}
index 877ea71..7c802ef 100755 (executable)
@@ -1,50 +1,50 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoServiceExceptionHolder {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();\r
-\r
-        assertTrue(obj.getMessageId() == null);\r
-        assertTrue(obj.getText() == null);\r
-        assertTrue(obj.getVariables() != null);\r
-        assertEquals(0, obj.getVariables().size());\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();\r
-\r
-        obj.setMessageId("messageId");\r
-        assertEquals("messageId", obj.getMessageId());\r
-\r
-        obj.setText("text");\r
-        assertEquals("text", obj.getText());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoServiceExceptionHolder {
+
+    @Test
+    public void testConstructor() {
+        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
+
+        assertTrue(obj.getMessageId() == null);
+        assertTrue(obj.getText() == null);
+        assertTrue(obj.getVariables() != null);
+        assertEquals(0, obj.getVariables().size());
+    }
+
+    @Test
+    public void testSetGet() {
+        SOServiceExceptionHolder obj = new SOServiceExceptionHolder();
+
+        obj.setMessageId("messageId");
+        assertEquals("messageId", obj.getMessageId());
+
+        obj.setText("text");
+        assertEquals("text", obj.getText());
+    }
+}
index 0bff38c..b0662fa 100755 (executable)
@@ -1,52 +1,52 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * so\r
- * ================================================================================\r
- * \r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.so;\r
-\r
-import static org.junit.Assert.assertEquals;\r
-import static org.junit.Assert.assertTrue;\r
-\r
-import org.junit.Test;\r
-\r
-public class TestSoSubscriberInfo {\r
-\r
-    @Test\r
-    public void testConstructor() {\r
-        SOSubscriberInfo obj = new SOSubscriberInfo();\r
-\r
-        assertTrue(obj.getGlobalSubscriberId() == null);\r
-        assertTrue(obj.getSubscriberCommonSiteId() == null);\r
-        assertTrue(obj.getSubscriberName() == null);\r
-    }\r
-\r
-    @Test\r
-    public void testSetGet() {\r
-        SOSubscriberInfo obj = new SOSubscriberInfo();\r
-\r
-        obj.setGlobalSubscriberId("globalSubscriberId");\r
-        assertEquals("globalSubscriberId", obj.getGlobalSubscriberId());\r
-\r
-        obj.setSubscriberCommonSiteId("subscriberCommonSiteId");\r
-        assertEquals("subscriberCommonSiteId", obj.getSubscriberCommonSiteId());\r
-        \r
-        obj.setSubscriberName("subscriberName");\r
-        assertEquals("subscriberName", obj.getSubscriberName());\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * so
+ * ================================================================================
+ * 
+ * ================================================================================
+ * 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+public class TestSoSubscriberInfo {
+
+    @Test
+    public void testConstructor() {
+        SOSubscriberInfo obj = new SOSubscriberInfo();
+
+        assertTrue(obj.getGlobalSubscriberId() == null);
+        assertTrue(obj.getSubscriberCommonSiteId() == null);
+        assertTrue(obj.getSubscriberName() == null);
+    }
+
+    @Test
+    public void testSetGet() {
+        SOSubscriberInfo obj = new SOSubscriberInfo();
+
+        obj.setGlobalSubscriberId("globalSubscriberId");
+        assertEquals("globalSubscriberId", obj.getGlobalSubscriberId());
+
+        obj.setSubscriberCommonSiteId("subscriberCommonSiteId");
+        assertEquals("subscriberCommonSiteId", obj.getSubscriberCommonSiteId());
+        
+        obj.setSubscriberName("subscriberName");
+        assertEquals("subscriberName", obj.getSubscriberName());
+    }
+}
index fcf9893..975614e 100644 (file)
 <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>
 
-  <artifactId>trafficgenerator</artifactId>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <artifactId>trafficgenerator</artifactId>
 
   <dependencies>
-       <dependency>
-               <groupId>junit</groupId>
-               <artifactId>junit</artifactId>
-               <version>4.12</version>
-               <scope>test</scope>
-       </dependency>
-       <dependency>
-               <groupId>com.google.code.gson</groupId>
-               <artifactId>gson</artifactId>
-               <version>2.5</version>
-               <scope>provided</scope>
-       </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 </project>
index ffd45cf..913fe78 100644 (file)
   -->
 
 <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>
+  <modelVersion>4.0.0</modelVersion>
 
-       <artifactId>vfc</artifactId>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+    <artifactId>model-impl</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>model-impl</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <artifactId>vfc</artifactId>
 
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <version>2.13.0</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>rest</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-core</artifactId>
-                       <version>6.5.0.Final</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-management</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>2.13.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>rest</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
index dd1ccfd..a800420 100644 (file)
@@ -1,54 +1,54 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * Copyright (C) 2017 Intel Corp. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.vfc;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class VFCHealActionVmInfo implements Serializable {\r
-\r
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2017 Intel Corp. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.vfc;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VFCHealActionVmInfo implements Serializable {
+
        private static final long serialVersionUID = 3208673205100673119L;
-\r
-       @SerializedName("vmid")\r
-       private String vmid;\r
-\r
-       @SerializedName("vmname")\r
-       private String vmname;\r
-\r
-       public VFCHealActionVmInfo() {\r
-               // Default constructor for VFCHealActionVmInfo\r
-       }\r
-\r
-       public String getVmid() {\r
-               return vmid;\r
-       }\r
-\r
-       public void setVmid(String vmid) {\r
-               this.vmid = vmid;\r
-       }\r
-\r
-       public String getVmname() {\r
-               return vmname;\r
-       }\r
-\r
-       public void setVmname(String vmname) {\r
-               this.vmname = vmname;\r
-       }\r
-}\r
+
+       @SerializedName("vmid")
+       private String vmid;
+
+       @SerializedName("vmname")
+       private String vmname;
+
+       public VFCHealActionVmInfo() {
+               // Default constructor for VFCHealActionVmInfo
+       }
+
+       public String getVmid() {
+               return vmid;
+       }
+
+       public void setVmid(String vmid) {
+               this.vmid = vmid;
+       }
+
+       public String getVmname() {
+               return vmname;
+       }
+
+       public void setVmname(String vmname) {
+               this.vmname = vmname;
+       }
+}
index 4ffdb5b..5c75553 100644 (file)
@@ -1,54 +1,54 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * Copyright (C) 2017 Intel Corp. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.vfc;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class VFCHealAdditionalParams implements Serializable {\r
-\r
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2017 Intel Corp. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.vfc;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VFCHealAdditionalParams implements Serializable {
+
        private static final long serialVersionUID = 2656694137285096191L;
-\r
-       @SerializedName("action")\r
-       private String action;\r
-\r
-       @SerializedName("actionvminfo")\r
-       private VFCHealActionVmInfo actionInfo;\r
-\r
-       public VFCHealAdditionalParams() {\r
-               // Default constructor for VFCHealAdditionalParams\r
-       }\r
-\r
-       public String getAction() {\r
-               return action;\r
-       }\r
-\r
-       public void setAction(String action) {\r
-               this.action = action;\r
-       }\r
-\r
-       public VFCHealActionVmInfo getActionInfo() {\r
-               return actionInfo;\r
-       }\r
-\r
-       public void setActionInfo(VFCHealActionVmInfo actionInfo) {\r
-               this.actionInfo = actionInfo;\r
-       }\r
-}\r
+
+       @SerializedName("action")
+       private String action;
+
+       @SerializedName("actionvminfo")
+       private VFCHealActionVmInfo actionInfo;
+
+       public VFCHealAdditionalParams() {
+               // Default constructor for VFCHealAdditionalParams
+       }
+
+       public String getAction() {
+               return action;
+       }
+
+       public void setAction(String action) {
+               this.action = action;
+       }
+
+       public VFCHealActionVmInfo getActionInfo() {
+               return actionInfo;
+       }
+
+       public void setActionInfo(VFCHealActionVmInfo actionInfo) {
+               this.actionInfo = actionInfo;
+       }
+}
index 787e341..11ea495 100644 (file)
@@ -1,65 +1,65 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * Copyright (C) 2017 Intel Corp. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.vfc;\r
-\r
-import java.io.Serializable;\r
-\r
-import com.google.gson.annotations.SerializedName;\r
-\r
-public class VFCHealRequest implements Serializable {\r
-\r
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2017 Intel Corp. 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.vfc;
+
+import java.io.Serializable;
+
+import com.google.gson.annotations.SerializedName;
+
+public class VFCHealRequest implements Serializable {
+
        private static final long serialVersionUID = -7341931593089709247L;
-\r
-       @SerializedName("vnfInstanceId")\r
-       private String vnfInstanceId;\r
-\r
-       @SerializedName("cause")\r
-       private String cause;\r
-\r
-       @SerializedName("additionalParams")\r
-       private VFCHealAdditionalParams additionalParams;\r
-\r
-       public VFCHealRequest() {\r
-               // Default constructor for VFCHealRequest\r
-       }\r
-\r
-       public String getVnfInstanceId() {\r
-               return vnfInstanceId;\r
-       }\r
-\r
-       public void setVnfInstanceId(String vnfInstanceId) {\r
-               this.vnfInstanceId = vnfInstanceId;\r
-       }\r
-\r
-       public String getCause() {\r
-               return cause;\r
-       }\r
-\r
-       public void setCause(String cause) {\r
-               this.cause = cause;\r
-       }\r
-\r
-       public VFCHealAdditionalParams getAdditionalParams() {\r
-               return additionalParams;\r
-       }\r
-\r
-       public void setAdditionalParams(VFCHealAdditionalParams additionalParams) {\r
-               this.additionalParams = additionalParams;\r
-       }\r
-}\r
+
+       @SerializedName("vnfInstanceId")
+       private String vnfInstanceId;
+
+       @SerializedName("cause")
+       private String cause;
+
+       @SerializedName("additionalParams")
+       private VFCHealAdditionalParams additionalParams;
+
+       public VFCHealRequest() {
+               // Default constructor for VFCHealRequest
+       }
+
+       public String getVnfInstanceId() {
+               return vnfInstanceId;
+       }
+
+       public void setVnfInstanceId(String vnfInstanceId) {
+               this.vnfInstanceId = vnfInstanceId;
+       }
+
+       public String getCause() {
+               return cause;
+       }
+
+       public void setCause(String cause) {
+               this.cause = cause;
+       }
+
+       public VFCHealAdditionalParams getAdditionalParams() {
+               return additionalParams;
+       }
+
+       public void setAdditionalParams(VFCHealAdditionalParams additionalParams) {
+               this.additionalParams = additionalParams;
+       }
+}
index a24f333..1a83926 100644 (file)
@@ -2,56 +2,58 @@
 <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">
-    <parent>
-        <artifactId>common</artifactId>
-        <groupId>org.onap.policy.drools-applications</groupId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>msb</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.msb.java-sdk</groupId>
-            <artifactId>msb-java-sdk</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-module-junit4</artifactId>
-            <version>1.6.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
-            <version>1.6.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.2.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.2.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.policy.common</groupId>
-            <artifactId>utils-test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>msb</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.msb.java-sdk</groupId>
+      <artifactId>msb-java-sdk</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
+      <version>1.6.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
+      <version>1.6.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>1.2.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.common</groupId>
+      <artifactId>utils-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 
 </project>
index d0451c4..6e4f599 100644 (file)
@@ -1,64 +1,66 @@
 <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.drools-applications</groupId>
-               <artifactId>common</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-    <artifactId>policy-yaml</artifactId>
-       
-       <dependencies>
-           <dependency>
-              <groupId>org.slf4j</groupId>
-              <artifactId>slf4j-api</artifactId>
-              <version>1.7.25</version>
-              <scope>provided</scope>
-          </dependency>
-          <dependency>
-              <groupId>ch.qos.logback</groupId>
-              <artifactId>logback-classic</artifactId>
-              <version>1.2.3</version>
-              <scope>provided</scope>
-          </dependency>
-               <dependency>
-                       <groupId>org.yaml</groupId>
-                       <artifactId>snakeyaml</artifactId>
-                       <version>1.17</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.jgrapht</groupId>
-                       <artifactId>jgrapht-core</artifactId>
-                       <version>0.9.2</version>
-               </dependency>
-               <dependency>
-                   <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>sdc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                   <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.guava</groupId>
-                       <artifactId>guava</artifactId>
-                       <version>19.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.common</groupId>
-                       <artifactId>utils-test</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-                       </dependency>
-       </dependencies>
+        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.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>policy-yaml</artifactId>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.2.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.yaml</groupId>
+      <artifactId>snakeyaml</artifactId>
+      <version>1.17</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jgrapht</groupId>
+      <artifactId>jgrapht-core</artifactId>
+      <version>0.9.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>sdc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>19.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.common</groupId>
+      <artifactId>utils-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 96c277b..3ebf701 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * policy-yaml\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.controlloop.policy.guard;\r
-\r
-import java.util.Collections;\r
-import java.util.LinkedList;\r
-import java.util.List;\r
-import java.util.Map;\r
-\r
-public class Constraint {\r
-\r
-    private Integer freqLimitPerTarget;\r
-    private Map<String,String> timeWindow;\r
-    private Map<String, String> activeTimeRange;\r
-    \r
-    private List<String> blacklist;\r
-    \r
-    public Constraint() {\r
-        // Do Nothing empty constructor. \r
-    }\r
-\r
-    public Integer getFreq_limit_per_target() {\r
-        return freqLimitPerTarget;\r
-    }\r
-\r
-\r
-    public void setFreq_limit_per_target(Integer freqLimitPerTarget) {\r
-        this.freqLimitPerTarget = freqLimitPerTarget;\r
-    }\r
-\r
-\r
-    public Map<String, String> getTime_window() {\r
-        return timeWindow;\r
-    }\r
-\r
-\r
-    public void setTime_window(Map<String, String> timeWindow) {\r
-        this.timeWindow = timeWindow;\r
-    }\r
-\r
-\r
-    public Map<String, String> getActive_time_range() {\r
-        return activeTimeRange;\r
-    }\r
-\r
-\r
-    public void setActive_time_range(Map<String, String> activeTimeRange) {\r
-        this.activeTimeRange = activeTimeRange;\r
-    }\r
-\r
-\r
-    public List<String> getBlacklist() {\r
-        return blacklist;\r
-    }\r
-\r
-    public void setBlacklist(List<String> blacklist) {\r
-        this.blacklist = blacklist;\r
-    }\r
-\r
-    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow) {\r
-        this.freqLimitPerTarget = freqLimitPerTarget;\r
-        if(timeWindow!=null){\r
-            this.timeWindow = Collections.unmodifiableMap(timeWindow);\r
-        }\r
-    }\r
-    \r
-    public Constraint(List<String> blacklist) {\r
-        this.blacklist = new LinkedList<>(blacklist);\r
-    }\r
-    \r
-    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow, List<String> blacklist) {\r
-        this.freqLimitPerTarget = freqLimitPerTarget;\r
-        this.timeWindow = Collections.unmodifiableMap(timeWindow);\r
-        this.blacklist = new LinkedList<>(blacklist);\r
-    }\r
-    \r
-    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow, Map<String, String> activeTimeRange) {\r
-        this(freqLimitPerTarget, timeWindow);\r
-        if (activeTimeRange != null) {\r
-            this.activeTimeRange = Collections.unmodifiableMap(activeTimeRange);\r
-        }\r
-    }\r
-    \r
-    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow, Map<String, String> activeTimeRange, List<String> blacklist) {\r
-        this(freqLimitPerTarget, timeWindow);\r
-        if (activeTimeRange != null) {\r
-            this.activeTimeRange = Collections.unmodifiableMap(activeTimeRange);\r
-        }\r
-        if(blacklist!=null){\r
-            this.blacklist = new LinkedList<>(blacklist);\r
-        }\r
-    }\r
-    \r
-    public Constraint(Constraint constraint) {\r
-        this.freqLimitPerTarget = constraint.freqLimitPerTarget;\r
-        this.timeWindow = constraint.timeWindow;\r
-        if (constraint.activeTimeRange != null) {\r
-            this.activeTimeRange = Collections.unmodifiableMap(constraint.activeTimeRange);\r
-        }\r
-        this.blacklist = new LinkedList<>(constraint.blacklist);\r
-    }\r
-    \r
-    public boolean isValid() {\r
-        return ((freqLimitPerTarget == null && timeWindow != null)|| (timeWindow == null && freqLimitPerTarget != null))? false : true;\r
-    }\r
-    \r
-    @Override\r
-    public String toString() {\r
-        return "Constraint [freq_limit_per_target=" + freqLimitPerTarget + ", time_window=" + timeWindow + ", active_time_range=" + activeTimeRange + ", blacklist=" + blacklist + "]";\r
-    }\r
-\r
-    @Override\r
-    public int hashCode() {\r
-        final int prime = 31;\r
-        int result = 1;\r
-        result = prime * result + ((freqLimitPerTarget == null) ? 0 : freqLimitPerTarget.hashCode());\r
-        result = prime * result + ((timeWindow == null) ? 0 : timeWindow.hashCode());\r
-        result = prime * result + ((activeTimeRange == null) ? 0 : activeTimeRange.hashCode());\r
-        result = prime * result + ((blacklist == null) ? 0 : blacklist.hashCode());\r
-        return result;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (this == obj)\r
-            return true;\r
-        if (obj == null)\r
-            return false;\r
-        if (getClass() != obj.getClass())\r
-            return false;\r
-        Constraint other = (Constraint) obj;\r
-        return equalsMayBeNull(freqLimitPerTarget, other.freqLimitPerTarget)\r
-                       && equalsMayBeNull(timeWindow, other.timeWindow)\r
-                       && equalsMayBeNull(activeTimeRange, other.activeTimeRange)\r
-                       && equalsMayBeNull(blacklist, other.blacklist);\r
-    }\r
-    \r
-    private boolean equalsMayBeNull(final Object obj1, final Object obj2){\r
-       if ( obj1 == null ) {\r
-            return obj2 == null;\r
-        } \r
-       return obj1.equals(obj2);\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-yaml
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.policy.guard;
+
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+public class Constraint {
+
+    private Integer freqLimitPerTarget;
+    private Map<String,String> timeWindow;
+    private Map<String, String> activeTimeRange;
+    
+    private List<String> blacklist;
+    
+    public Constraint() {
+        // Do Nothing empty constructor. 
+    }
+
+    public Integer getFreq_limit_per_target() {
+        return freqLimitPerTarget;
+    }
+
+
+    public void setFreq_limit_per_target(Integer freqLimitPerTarget) {
+        this.freqLimitPerTarget = freqLimitPerTarget;
+    }
+
+
+    public Map<String, String> getTime_window() {
+        return timeWindow;
+    }
+
+
+    public void setTime_window(Map<String, String> timeWindow) {
+        this.timeWindow = timeWindow;
+    }
+
+
+    public Map<String, String> getActive_time_range() {
+        return activeTimeRange;
+    }
+
+
+    public void setActive_time_range(Map<String, String> activeTimeRange) {
+        this.activeTimeRange = activeTimeRange;
+    }
+
+
+    public List<String> getBlacklist() {
+        return blacklist;
+    }
+
+    public void setBlacklist(List<String> blacklist) {
+        this.blacklist = blacklist;
+    }
+
+    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow) {
+        this.freqLimitPerTarget = freqLimitPerTarget;
+        if(timeWindow!=null){
+            this.timeWindow = Collections.unmodifiableMap(timeWindow);
+        }
+    }
+    
+    public Constraint(List<String> blacklist) {
+        this.blacklist = new LinkedList<>(blacklist);
+    }
+    
+    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow, List<String> blacklist) {
+        this.freqLimitPerTarget = freqLimitPerTarget;
+        this.timeWindow = Collections.unmodifiableMap(timeWindow);
+        this.blacklist = new LinkedList<>(blacklist);
+    }
+    
+    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow, Map<String, String> activeTimeRange) {
+        this(freqLimitPerTarget, timeWindow);
+        if (activeTimeRange != null) {
+            this.activeTimeRange = Collections.unmodifiableMap(activeTimeRange);
+        }
+    }
+    
+    public Constraint(Integer freqLimitPerTarget, Map<String, String> timeWindow, Map<String, String> activeTimeRange, List<String> blacklist) {
+        this(freqLimitPerTarget, timeWindow);
+        if (activeTimeRange != null) {
+            this.activeTimeRange = Collections.unmodifiableMap(activeTimeRange);
+        }
+        if(blacklist!=null){
+            this.blacklist = new LinkedList<>(blacklist);
+        }
+    }
+    
+    public Constraint(Constraint constraint) {
+        this.freqLimitPerTarget = constraint.freqLimitPerTarget;
+        this.timeWindow = constraint.timeWindow;
+        if (constraint.activeTimeRange != null) {
+            this.activeTimeRange = Collections.unmodifiableMap(constraint.activeTimeRange);
+        }
+        this.blacklist = new LinkedList<>(constraint.blacklist);
+    }
+    
+    public boolean isValid() {
+        return ((freqLimitPerTarget == null && timeWindow != null)|| (timeWindow == null && freqLimitPerTarget != null))? false : true;
+    }
+    
+    @Override
+    public String toString() {
+        return "Constraint [freq_limit_per_target=" + freqLimitPerTarget + ", time_window=" + timeWindow + ", active_time_range=" + activeTimeRange + ", blacklist=" + blacklist + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((freqLimitPerTarget == null) ? 0 : freqLimitPerTarget.hashCode());
+        result = prime * result + ((timeWindow == null) ? 0 : timeWindow.hashCode());
+        result = prime * result + ((activeTimeRange == null) ? 0 : activeTimeRange.hashCode());
+        result = prime * result + ((blacklist == null) ? 0 : blacklist.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Constraint other = (Constraint) obj;
+        return equalsMayBeNull(freqLimitPerTarget, other.freqLimitPerTarget)
+                       && equalsMayBeNull(timeWindow, other.timeWindow)
+                       && equalsMayBeNull(activeTimeRange, other.activeTimeRange)
+                       && equalsMayBeNull(blacklist, other.blacklist);
+    }
+    
+    private boolean equalsMayBeNull(final Object obj1, final Object obj2){
+       if ( obj1 == null ) {
+            return obj2 == null;
+        } 
+       return obj1.equals(obj2);
+    }
+}
index 7c90801..6fb0ca9 100644 (file)
@@ -1,93 +1,93 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * policy-yaml\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.controlloop.policy.guard;\r
-\r
-import java.util.LinkedList;\r
-\r
-public class ControlLoopGuard {\r
-    \r
-    private Guard guard;\r
-    \r
-    private LinkedList<GuardPolicy> guards;\r
-    \r
-    public ControlLoopGuard() {\r
-        //DO Nothing Empty Constructor\r
-    }\r
-    \r
-    public Guard getGuard() {\r
-        return guard;\r
-    }\r
-\r
-    public void setGuard(Guard guard) {\r
-        this.guard = guard;\r
-    }\r
-\r
-    public LinkedList<GuardPolicy> getGuards() {\r
-        return guards;\r
-    }\r
-\r
-    public void setGuards(LinkedList<GuardPolicy> guards) {\r
-        this.guards = guards;\r
-    }\r
-\r
-    public ControlLoopGuard(ControlLoopGuard cLGuard) {\r
-        this.guard = new Guard();\r
-        this.guards = new LinkedList<>(cLGuard.guards);\r
-    }\r
-    \r
-    @Override\r
-    public String toString() {\r
-        return "Guard [guard=" + guard + ", GuardPolicies=" + guards + "]";\r
-    }\r
-\r
-    @Override\r
-    public int hashCode() {\r
-        final int prime = 31;\r
-        int result = 1;\r
-        result = prime * result + ((guard == null) ? 0 : guard.hashCode());\r
-        result = prime * result + ((guards == null) ? 0 : guards.hashCode());\r
-        return result;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (this == obj)\r
-            return true;\r
-        if (obj == null)\r
-            return false;\r
-        if (getClass() != obj.getClass())\r
-            return false;\r
-        ControlLoopGuard other = (ControlLoopGuard) obj;\r
-        if (guard == null) {\r
-            if (other.guard != null)\r
-                return false;\r
-        } else if (!guard.equals(other.guard))\r
-            return false;\r
-        if (guards == null) {\r
-            if (other.guards != null)\r
-                return false;\r
-        } else if (!guards.equals(other.guards))\r
-            return false;\r
-        return true;\r
-    }\r
-\r
-    \r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-yaml
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.policy.guard;
+
+import java.util.LinkedList;
+
+public class ControlLoopGuard {
+    
+    private Guard guard;
+    
+    private LinkedList<GuardPolicy> guards;
+    
+    public ControlLoopGuard() {
+        //DO Nothing Empty Constructor
+    }
+    
+    public Guard getGuard() {
+        return guard;
+    }
+
+    public void setGuard(Guard guard) {
+        this.guard = guard;
+    }
+
+    public LinkedList<GuardPolicy> getGuards() {
+        return guards;
+    }
+
+    public void setGuards(LinkedList<GuardPolicy> guards) {
+        this.guards = guards;
+    }
+
+    public ControlLoopGuard(ControlLoopGuard cLGuard) {
+        this.guard = new Guard();
+        this.guards = new LinkedList<>(cLGuard.guards);
+    }
+    
+    @Override
+    public String toString() {
+        return "Guard [guard=" + guard + ", GuardPolicies=" + guards + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((guard == null) ? 0 : guard.hashCode());
+        result = prime * result + ((guards == null) ? 0 : guards.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ControlLoopGuard other = (ControlLoopGuard) obj;
+        if (guard == null) {
+            if (other.guard != null)
+                return false;
+        } else if (!guard.equals(other.guard))
+            return false;
+        if (guards == null) {
+            if (other.guards != null)
+                return false;
+        } else if (!guards.equals(other.guards))
+            return false;
+        return true;
+    }
+
+    
+}
index dedc9a0..2910046 100644 (file)
@@ -1,68 +1,68 @@
-/*-\r
- * ============LICENSE_START=======================================================\r
- * policy-yaml\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.controlloop.policy.guard;\r
-\r
-public class Guard {\r
-\r
-    private static final String DEFAULTVERSION = "2.0.0";\r
-    \r
-    private String version = DEFAULTVERSION;\r
-    \r
-    public Guard() {\r
-        //DO Nothing empty Constructor. \r
-    }\r
-    \r
-    public String getVersion() {\r
-        return version;\r
-    }\r
-\r
-    public void setVersion(String version) {\r
-        this.version = version;\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "Guard [version=" + version + "]";\r
-    }\r
-    @Override\r
-    public int hashCode() {\r
-        final int prime = 31;\r
-        int result = 1;\r
-        result = prime * result + ((version == null) ? 0 : version.hashCode());\r
-        return result;\r
-    }\r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (this == obj)\r
-            return true;\r
-        if (obj == null)\r
-            return false;\r
-        if (getClass() != obj.getClass())\r
-            return false;\r
-        Guard other = (Guard) obj;\r
-        if (version == null) {\r
-            if (other.version != null)\r
-                return false;\r
-        } else if (!version.equals(other.version))\r
-            return false;\r
-        return true;\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-yaml
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.policy.guard;
+
+public class Guard {
+
+    private static final String DEFAULTVERSION = "2.0.0";
+    
+    private String version = DEFAULTVERSION;
+    
+    public Guard() {
+        //DO Nothing empty Constructor. 
+    }
+    
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    @Override
+    public String toString() {
+        return "Guard [version=" + version + "]";
+    }
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((version == null) ? 0 : version.hashCode());
+        return result;
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Guard other = (Guard) obj;
+        if (version == null) {
+            if (other.version != null)
+                return false;
+        } else if (!version.equals(other.version))
+            return false;
+        return true;
+    }
+}
index 16a384a..c45014c 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * policy-yaml\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.controlloop.policy.guard;\r
-\r
-import java.util.LinkedList;\r
-import java.util.List;\r
-import java.util.UUID;\r
-\r
-public class GuardPolicy {\r
-\r
-    private String id = UUID.randomUUID().toString();\r
-    private String name;\r
-    private String description;\r
-    private MatchParameters matchParameters;\r
-    private LinkedList<Constraint> limitConstraints;\r
-    \r
-    public GuardPolicy() {\r
-        //Do Nothing Empty Constructor. \r
-    }\r
-    \r
-    public String getId() {\r
-        return id;\r
-    }\r
-\r
-    public void setId(String id) {\r
-        this.id = id;\r
-    }\r
-\r
-    public String getName() {\r
-        return name;\r
-    }\r
-\r
-    public void setName(String name) {\r
-        this.name = name;\r
-    }\r
-\r
-    public String getDescription() {\r
-        return description;\r
-    }\r
-\r
-    public void setDescription(String description) {\r
-        this.description = description;\r
-    }\r
-\r
-    public MatchParameters getMatch_parameters() {\r
-        return matchParameters;\r
-    }\r
-\r
-    public void setMatch_parameters(MatchParameters matchParameters) {\r
-        this.matchParameters = matchParameters;\r
-    }\r
-\r
-    public LinkedList<Constraint> getLimit_constraints() {\r
-        return  limitConstraints;\r
-    }\r
-\r
-    public void setLimit_constraints(LinkedList<Constraint> limitConstraints) {\r
-        this.limitConstraints = limitConstraints;\r
-    }\r
-\r
-    public GuardPolicy(String id) {\r
-        this.id = id;\r
-    }\r
-    \r
-    public GuardPolicy(String name, MatchParameters matchParameters) {\r
-        this.name = name;\r
-        this.matchParameters = matchParameters;\r
-    }\r
-    \r
-    public GuardPolicy(String id, String name, String description, MatchParameters matchParameters) {\r
-        this(name, matchParameters);\r
-        this.id = id;\r
-        this.description = description;\r
-    }\r
-    \r
-    public GuardPolicy(String name, MatchParameters matchParameters, List<Constraint> limitConstraints) {\r
-        this(name, matchParameters);\r
-        if (limitConstraints != null) {\r
-            this.limitConstraints = (LinkedList<Constraint>) limitConstraints;\r
-        }\r
-    }\r
-    \r
-    public GuardPolicy(String name, String description, MatchParameters matchParameters, List<Constraint> limitConstraints) {\r
-        this(name, matchParameters, limitConstraints);\r
-        this.description = description;\r
-    }\r
-    \r
-    public GuardPolicy(String id, String name, String description, MatchParameters matchParameters, List<Constraint> limitConstraints) {\r
-        this(name, description, matchParameters, limitConstraints);\r
-        this.id = id;\r
-    }\r
-    \r
-    public GuardPolicy(GuardPolicy policy) {\r
-        this.id = policy.id;\r
-        this.name = policy.name;\r
-        this.description = policy.description;\r
-        this.matchParameters = new MatchParameters(policy.matchParameters);\r
-        if (policy.limitConstraints != null) {\r
-            this.limitConstraints = policy.limitConstraints;\r
-        }\r
-    }\r
-    \r
-    public boolean isValid() {\r
-        return (id==null || name ==null)? false : true;\r
-    }\r
-    \r
-    @Override\r
-    public String toString() {\r
-        return "Policy [id=" + id + ", name=" + name + ", description=" + description + ", match_parameters=" \r
-                +matchParameters + ", limitConstraints=" + limitConstraints + "]";\r
-    }\r
-\r
-    @Override\r
-    public int hashCode() {\r
-        final int prime = 31;\r
-        int result = 1;\r
-        result = prime * result + ((description == null) ? 0 : description.hashCode());\r
-        result = prime * result + ((id == null) ? 0 : id.hashCode());\r
-        result = prime * result + ((name == null) ? 0 : name.hashCode());\r
-        result = prime * result + ((limitConstraints == null) ? 0 : limitConstraints.hashCode());\r
-        result = prime * result + ((matchParameters == null) ? 0 : matchParameters.hashCode());\r
-        return result;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (this == obj)\r
-            return true;\r
-        if (obj == null)\r
-            return false;\r
-        if (getClass() != obj.getClass())\r
-            return false;\r
-        GuardPolicy other = (GuardPolicy) obj;\r
-        return equalsMayBeNull(description, other.description)\r
-                       && equalsMayBeNull(id, other.id)\r
-                       && equalsMayBeNull(name, other.name)\r
-                       && equalsMayBeNull(limitConstraints, other.limitConstraints)\r
-                       && equalsMayBeNull(matchParameters, other.matchParameters);\r
-    }\r
-    \r
-    private boolean equalsMayBeNull(final Object obj1, final Object obj2){\r
-       if ( obj1 == null ) {\r
-            return obj2 == null;\r
-        }\r
-       return obj1.equals(obj2);\r
-    }        \r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-yaml
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.policy.guard;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+public class GuardPolicy {
+
+    private String id = UUID.randomUUID().toString();
+    private String name;
+    private String description;
+    private MatchParameters matchParameters;
+    private LinkedList<Constraint> limitConstraints;
+    
+    public GuardPolicy() {
+        //Do Nothing Empty Constructor. 
+    }
+    
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public MatchParameters getMatch_parameters() {
+        return matchParameters;
+    }
+
+    public void setMatch_parameters(MatchParameters matchParameters) {
+        this.matchParameters = matchParameters;
+    }
+
+    public LinkedList<Constraint> getLimit_constraints() {
+        return  limitConstraints;
+    }
+
+    public void setLimit_constraints(LinkedList<Constraint> limitConstraints) {
+        this.limitConstraints = limitConstraints;
+    }
+
+    public GuardPolicy(String id) {
+        this.id = id;
+    }
+    
+    public GuardPolicy(String name, MatchParameters matchParameters) {
+        this.name = name;
+        this.matchParameters = matchParameters;
+    }
+    
+    public GuardPolicy(String id, String name, String description, MatchParameters matchParameters) {
+        this(name, matchParameters);
+        this.id = id;
+        this.description = description;
+    }
+    
+    public GuardPolicy(String name, MatchParameters matchParameters, List<Constraint> limitConstraints) {
+        this(name, matchParameters);
+        if (limitConstraints != null) {
+            this.limitConstraints = (LinkedList<Constraint>) limitConstraints;
+        }
+    }
+    
+    public GuardPolicy(String name, String description, MatchParameters matchParameters, List<Constraint> limitConstraints) {
+        this(name, matchParameters, limitConstraints);
+        this.description = description;
+    }
+    
+    public GuardPolicy(String id, String name, String description, MatchParameters matchParameters, List<Constraint> limitConstraints) {
+        this(name, description, matchParameters, limitConstraints);
+        this.id = id;
+    }
+    
+    public GuardPolicy(GuardPolicy policy) {
+        this.id = policy.id;
+        this.name = policy.name;
+        this.description = policy.description;
+        this.matchParameters = new MatchParameters(policy.matchParameters);
+        if (policy.limitConstraints != null) {
+            this.limitConstraints = policy.limitConstraints;
+        }
+    }
+    
+    public boolean isValid() {
+        return (id==null || name ==null)? false : true;
+    }
+    
+    @Override
+    public String toString() {
+        return "Policy [id=" + id + ", name=" + name + ", description=" + description + ", match_parameters=" 
+                +matchParameters + ", limitConstraints=" + limitConstraints + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((description == null) ? 0 : description.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((limitConstraints == null) ? 0 : limitConstraints.hashCode());
+        result = prime * result + ((matchParameters == null) ? 0 : matchParameters.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        GuardPolicy other = (GuardPolicy) obj;
+        return equalsMayBeNull(description, other.description)
+                       && equalsMayBeNull(id, other.id)
+                       && equalsMayBeNull(name, other.name)
+                       && equalsMayBeNull(limitConstraints, other.limitConstraints)
+                       && equalsMayBeNull(matchParameters, other.matchParameters);
+    }
+    
+    private boolean equalsMayBeNull(final Object obj1, final Object obj2){
+       if ( obj1 == null ) {
+            return obj2 == null;
+        }
+       return obj1.equals(obj2);
+    }        
+}
index 8e5d0c0..445e00f 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * policy-yaml\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.controlloop.policy.guard;\r
-\r
-import java.util.LinkedList;\r
-import java.util.List;\r
-\r
-\r
-public class MatchParameters {\r
-    private String controlLoopName;\r
-    private String actor;\r
-    private String recipe;\r
-    private List<String> targets;\r
-\r
-    public MatchParameters() {\r
-        // Do Nothing Empty Constructor.\r
-    }   \r
-    \r
-    public String getControlLoopName() {\r
-        return controlLoopName;\r
-    }\r
-\r
-    public void setControlLoopName(String controlLoopName) {\r
-        this.controlLoopName = controlLoopName;\r
-    }\r
-\r
-    public String getActor() {\r
-        return actor;\r
-    }\r
-\r
-    public void setActor(String actor) {\r
-        this.actor = actor;\r
-    }\r
-\r
-    public String getRecipe() {\r
-        return recipe;\r
-    }\r
-\r
-    public void setRecipe(String recipe) {\r
-        this.recipe = recipe;\r
-    }\r
-\r
-    public List<String> getTargets() {\r
-        return targets;\r
-    }\r
-\r
-    public void setTargets(List<String> targets) {\r
-        this.targets = targets;\r
-    }\r
-\r
-    public MatchParameters(String actor, String recipe) {\r
-        this.actor = actor;\r
-        this.recipe = recipe;\r
-    }\r
-\r
-    public MatchParameters(String actor, String recipe, List<String> targets) {\r
-        this(actor, recipe);\r
-        if (targets != null) {\r
-            this.targets = new LinkedList<>(targets);\r
-        }\r
-    }\r
-\r
-    public MatchParameters(String controlLoopName, String actor, String recipe, List<String> targets) {\r
-        this(actor, recipe, targets);\r
-        this.controlLoopName = controlLoopName;\r
-    }\r
-\r
-    public MatchParameters(MatchParameters matchParameters) {\r
-\r
-        this.controlLoopName = matchParameters.controlLoopName;\r
-        this.actor = matchParameters.actor;\r
-        this.recipe = matchParameters.recipe;\r
-        if (matchParameters.targets != null) {\r
-            this.targets = new LinkedList<>(matchParameters.targets);\r
-        }\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return "MatchParameters [controlLoopName=" + controlLoopName + ", actor=" + actor + ", recipe=" + recipe\r
-                + ", targets=" + targets + "]";\r
-    }\r
-\r
-    @Override\r
-    public int hashCode() {\r
-        final int prime = 31;\r
-        int result = 1;\r
-        result = prime * result + ((actor == null) ? 0 : actor.hashCode());\r
-        result = prime * result + ((controlLoopName == null) ? 0 : controlLoopName.hashCode());\r
-        result = prime * result + ((recipe == null) ? 0 : recipe.hashCode());\r
-        result = prime * result + ((targets == null) ? 0 : targets.hashCode());\r
-        return result;\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (this == obj)\r
-            return true;\r
-        if (obj == null)\r
-            return false;\r
-        if (getClass() != obj.getClass())\r
-            return false;\r
-        MatchParameters other = (MatchParameters) obj;\r
-        \r
-        return equalsMayBeNull(actor, other.actor)\r
-                       && equalsMayBeNull(controlLoopName, other.controlLoopName)\r
-                       && equalsMayBeNull(recipe, other.recipe)\r
-                       && equalsMayBeNull(targets, other.targets);\r
-    }\r
-    \r
-    private boolean equalsMayBeNull(final Object obj1, final Object obj2){\r
-       if ( obj1 == null ) {\r
-            return obj2 == null;\r
-        }\r
-       return obj1.equals(obj2);\r
-    }\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-yaml
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.policy.guard;
+
+import java.util.LinkedList;
+import java.util.List;
+
+
+public class MatchParameters {
+    private String controlLoopName;
+    private String actor;
+    private String recipe;
+    private List<String> targets;
+
+    public MatchParameters() {
+        // Do Nothing Empty Constructor.
+    }   
+    
+    public String getControlLoopName() {
+        return controlLoopName;
+    }
+
+    public void setControlLoopName(String controlLoopName) {
+        this.controlLoopName = controlLoopName;
+    }
+
+    public String getActor() {
+        return actor;
+    }
+
+    public void setActor(String actor) {
+        this.actor = actor;
+    }
+
+    public String getRecipe() {
+        return recipe;
+    }
+
+    public void setRecipe(String recipe) {
+        this.recipe = recipe;
+    }
+
+    public List<String> getTargets() {
+        return targets;
+    }
+
+    public void setTargets(List<String> targets) {
+        this.targets = targets;
+    }
+
+    public MatchParameters(String actor, String recipe) {
+        this.actor = actor;
+        this.recipe = recipe;
+    }
+
+    public MatchParameters(String actor, String recipe, List<String> targets) {
+        this(actor, recipe);
+        if (targets != null) {
+            this.targets = new LinkedList<>(targets);
+        }
+    }
+
+    public MatchParameters(String controlLoopName, String actor, String recipe, List<String> targets) {
+        this(actor, recipe, targets);
+        this.controlLoopName = controlLoopName;
+    }
+
+    public MatchParameters(MatchParameters matchParameters) {
+
+        this.controlLoopName = matchParameters.controlLoopName;
+        this.actor = matchParameters.actor;
+        this.recipe = matchParameters.recipe;
+        if (matchParameters.targets != null) {
+            this.targets = new LinkedList<>(matchParameters.targets);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "MatchParameters [controlLoopName=" + controlLoopName + ", actor=" + actor + ", recipe=" + recipe
+                + ", targets=" + targets + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((actor == null) ? 0 : actor.hashCode());
+        result = prime * result + ((controlLoopName == null) ? 0 : controlLoopName.hashCode());
+        result = prime * result + ((recipe == null) ? 0 : recipe.hashCode());
+        result = prime * result + ((targets == null) ? 0 : targets.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        MatchParameters other = (MatchParameters) obj;
+        
+        return equalsMayBeNull(actor, other.actor)
+                       && equalsMayBeNull(controlLoopName, other.controlLoopName)
+                       && equalsMayBeNull(recipe, other.recipe)
+                       && equalsMayBeNull(targets, other.targets);
+    }
+    
+    private boolean equalsMayBeNull(final Object obj1, final Object obj2){
+       if ( obj1 == null ) {
+            return obj2 == null;
+        }
+       return obj1.equals(obj2);
+    }
+}
index 6071638..a431a0b 100644 (file)
-/*-\r
- * ============LICENSE_START=======================================================\r
- * policy-yaml\r
- * ================================================================================\r
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
- * ================================================================================\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- * \r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- * \r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- * ============LICENSE_END=========================================================\r
- */\r
-\r
-package org.onap.policy.controlloop.policy.guard.builder.impl;\r
-\r
-import java.util.LinkedList;\r
-\r
-import org.onap.policy.controlloop.compiler.CompilerException;\r
-import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;\r
-import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;\r
-import org.onap.policy.controlloop.policy.builder.BuilderException;\r
-import org.onap.policy.controlloop.policy.builder.MessageLevel;\r
-import org.onap.policy.controlloop.policy.builder.Results;\r
-import org.onap.policy.controlloop.policy.builder.impl.MessageImpl;\r
-import org.onap.policy.controlloop.policy.builder.impl.ResultsImpl;\r
-import org.onap.policy.controlloop.policy.guard.Constraint;\r
-import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;\r
-import org.onap.policy.controlloop.policy.guard.Guard;\r
-import org.onap.policy.controlloop.policy.guard.GuardPolicy;\r
-import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
-import org.yaml.snakeyaml.DumperOptions;\r
-import org.yaml.snakeyaml.DumperOptions.FlowStyle;\r
-import org.yaml.snakeyaml.Yaml;\r
-\r
-public class ControlLoopGuardBuilderImpl implements ControlLoopGuardBuilder {\r
-    private static final String NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID = "No existing guard policy matching the id: ";\r
-       private static final String THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL = "The id of target guard policy must not be null";\r
-       private static Logger logger = LoggerFactory.getLogger(ControlLoopGuardBuilderImpl.class.getName());\r
-    private ControlLoopGuard cLGuard;\r
-    \r
-    public ControlLoopGuardBuilderImpl(Guard guard) {\r
-        cLGuard = new ControlLoopGuard();\r
-        cLGuard.setGuard(guard);\r
-    }\r
-    \r
-    @Override\r
-    public ControlLoopGuardBuilder addGuardPolicy(GuardPolicy... policies) throws BuilderException {\r
-        if (policies == null) {\r
-            throw new BuilderException("GuardPolicy must not be null");\r
-        }\r
-        for (GuardPolicy policy : policies) {\r
-            if (!policy.isValid()) {\r
-                throw new BuilderException("Invalid guard policy - some required fields are missing");\r
-            }\r
-            if (cLGuard.getGuards() == null) {\r
-                cLGuard.setGuards(new LinkedList<>());\r
-            }\r
-            cLGuard.getGuards().add(policy);\r
-        }\r
-        return this;\r
-    }\r
-\r
-    @Override\r
-    public ControlLoopGuardBuilder removeGuardPolicy(GuardPolicy... policies) throws BuilderException {\r
-        if (policies == null) {\r
-            throw new BuilderException("GuardPolicy must not be null");\r
-        }\r
-        if (cLGuard.getGuards() == null) {\r
-            throw new BuilderException("No existing guard policies to remove");\r
-        }\r
-        for (GuardPolicy policy : policies) {\r
-            if (!policy.isValid()) {\r
-                throw new BuilderException("Invalid guard policy - some required fields are missing");\r
-            }\r
-            boolean removed = cLGuard.getGuards().remove(policy);\r
-            if (!removed) {\r
-                throw new BuilderException("Unknown guard policy: " + policy.getName());\r
-            }\r
-        }\r
-        return this;\r
-    }\r
-\r
-    @Override\r
-    public ControlLoopGuardBuilder removeAllGuardPolicies() throws BuilderException {\r
-        cLGuard.getGuards().clear();\r
-        return this;\r
-    }\r
-\r
-    @Override\r
-    public ControlLoopGuardBuilder addLimitConstraint(String id, Constraint... constraints) throws BuilderException {\r
-        if (id == null) {\r
-            throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);\r
-        }\r
-        if (constraints == null) {\r
-            throw new BuilderException("Constraint much not be null");\r
-        }\r
-        if (!addLimitConstraints(id,constraints)) {\r
-            throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);\r
-        }\r
-        return this;\r
-    }\r
-\r
-    private boolean addLimitConstraints(String id, Constraint... constraints) throws BuilderException {\r
-        boolean exist = false;\r
-        for (GuardPolicy policy: cLGuard.getGuards()) {\r
-            //\r
-            // We could have only one guard policy matching the id\r
-            //\r
-            if (policy.getId().equals(id)) {\r
-                exist = true;\r
-                for (Constraint cons: constraints) {\r
-                    if (!cons.isValid()) {\r
-                        throw new BuilderException("Invalid guard constraint - some required fields are missing");\r
-                    }\r
-                    if (policy.getLimit_constraints() == null) {\r
-                        policy.setLimit_constraints(new LinkedList<>());\r
-                    }\r
-                    policy.getLimit_constraints().add(cons);\r
-                }\r
-                break;\r
-            }\r
-        }\r
-        return exist;\r
-    }\r
-\r
-    @Override\r
-    public ControlLoopGuardBuilder removeLimitConstraint(String id, Constraint... constraints) throws BuilderException {\r
-        if (id == null) {\r
-            throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);\r
-        }\r
-        if (constraints == null) {\r
-            throw new BuilderException("Constraint much not be null");\r
-        }\r
-        if (!removeConstraints(id, constraints)) {\r
-            throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);\r
-        }\r
-        return this;\r
-    }\r
-\r
-    private boolean removeConstraints(String id, Constraint... constraints) throws BuilderException {\r
-        boolean exist = false;\r
-        for (GuardPolicy policy: cLGuard.getGuards()) {\r
-            //\r
-            // We could have only one guard policy matching the id\r
-            //\r
-            if (policy.getId().equals(id)) {\r
-                exist = true;\r
-                for (Constraint cons: constraints) {\r
-                    if (!cons.isValid()) {\r
-                        throw new BuilderException("Invalid guard constraint - some required fields are missing");\r
-                    }\r
-                    boolean removed = policy.getLimit_constraints().remove(cons);\r
-                    if (!removed) {\r
-                        throw new BuilderException("Unknown guard constraint: " + cons);\r
-                    }\r
-                }\r
-                break;\r
-            }\r
-        }\r
-        return exist;\r
-    }\r
-\r
-    @Override\r
-    public ControlLoopGuardBuilder removeAllLimitConstraints(String id) throws BuilderException {\r
-        if (cLGuard.getGuards() == null || cLGuard.getGuards().isEmpty()) {\r
-            throw new BuilderException("No guard policies exist");\r
-        } \r
-        if (id == null) {\r
-            throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);\r
-        }\r
-        boolean exist = false;\r
-        for (GuardPolicy policy: cLGuard.getGuards()) {\r
-            if (policy.getId().equals(id)) {\r
-                exist = true;\r
-                policy.getLimit_constraints().clear();\r
-            }\r
-        }\r
-        if (!exist) {\r
-            throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);\r
-        }\r
-        return this;\r
-    }\r
-\r
-    \r
-    private class BuilderCompilerCallback implements ControlLoopCompilerCallback {\r
-\r
-        private ResultsImpl results = new ResultsImpl();\r
-        \r
-        @Override\r
-        public boolean onWarning(String message) {\r
-            results.addMessage(new MessageImpl(message, MessageLevel.WARNING));\r
-            return false;\r
-        }\r
-\r
-        @Override\r
-        public boolean onError(String message) {\r
-            results.addMessage(new MessageImpl(message, MessageLevel.ERROR));\r
-            return false;\r
-        }\r
-    }\r
-    \r
-    @Override\r
-    public ControlLoopGuard getControlLoopGuard() {\r
-        return new ControlLoopGuard(this.cLGuard);\r
-    }   \r
-    \r
-    \r
-    @Override\r
-    public Results buildSpecification() {\r
-        //\r
-        // Dump the specification\r
-        //\r
-        DumperOptions options = new DumperOptions();\r
-        options.setDefaultFlowStyle(FlowStyle.BLOCK);\r
-        options.setPrettyFlow(true);\r
-        Yaml yaml = new Yaml(options);\r
-        String dumpedYaml = yaml.dump(cLGuard);\r
-        //\r
-        // This is our callback class for our compiler\r
-        //\r
-        BuilderCompilerCallback callback = new BuilderCompilerCallback();\r
-        //\r
-        // Compile it\r
-        //\r
-        try {\r
-            ControlLoopGuardCompiler.compile(cLGuard, callback);\r
-        } catch (CompilerException e) {\r
-            logger.error(e.getMessage() + e);\r
-            callback.results.addMessage(new MessageImpl(e.getMessage(), MessageLevel.EXCEPTION));\r
-        }\r
-        //\r
-        // Save the spec\r
-        //\r
-        callback.results.setSpecification(dumpedYaml);\r
-        return callback.results;\r
-    }\r
-\r
-}\r
+/*-
+ * ============LICENSE_START=======================================================
+ * policy-yaml
+ * ================================================================================
+ * Copyright (C) 2017 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.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.policy.guard.builder.impl;
+
+import java.util.LinkedList;
+
+import org.onap.policy.controlloop.compiler.CompilerException;
+import org.onap.policy.controlloop.compiler.ControlLoopCompilerCallback;
+import org.onap.policy.controlloop.guard.compiler.ControlLoopGuardCompiler;
+import org.onap.policy.controlloop.policy.builder.BuilderException;
+import org.onap.policy.controlloop.policy.builder.MessageLevel;
+import org.onap.policy.controlloop.policy.builder.Results;
+import org.onap.policy.controlloop.policy.builder.impl.MessageImpl;
+import org.onap.policy.controlloop.policy.builder.impl.ResultsImpl;
+import org.onap.policy.controlloop.policy.guard.Constraint;
+import org.onap.policy.controlloop.policy.guard.ControlLoopGuard;
+import org.onap.policy.controlloop.policy.guard.Guard;
+import org.onap.policy.controlloop.policy.guard.GuardPolicy;
+import org.onap.policy.controlloop.policy.guard.builder.ControlLoopGuardBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.DumperOptions.FlowStyle;
+import org.yaml.snakeyaml.Yaml;
+
+public class ControlLoopGuardBuilderImpl implements ControlLoopGuardBuilder {
+    private static final String NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID = "No existing guard policy matching the id: ";
+       private static final String THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL = "The id of target guard policy must not be null";
+       private static Logger logger = LoggerFactory.getLogger(ControlLoopGuardBuilderImpl.class.getName());
+    private ControlLoopGuard cLGuard;
+    
+    public ControlLoopGuardBuilderImpl(Guard guard) {
+        cLGuard = new ControlLoopGuard();
+        cLGuard.setGuard(guard);
+    }
+    
+    @Override
+    public ControlLoopGuardBuilder addGuardPolicy(GuardPolicy... policies) throws BuilderException {
+        if (policies == null) {
+            throw new BuilderException("GuardPolicy must not be null");
+        }
+        for (GuardPolicy policy : policies) {
+            if (!policy.isValid()) {
+                throw new BuilderException("Invalid guard policy - some required fields are missing");
+            }
+            if (cLGuard.getGuards() == null) {
+                cLGuard.setGuards(new LinkedList<>());
+            }
+            cLGuard.getGuards().add(policy);
+        }
+        return this;
+    }
+
+    @Override
+    public ControlLoopGuardBuilder removeGuardPolicy(GuardPolicy... policies) throws BuilderException {
+        if (policies == null) {
+            throw new BuilderException("GuardPolicy must not be null");
+        }
+        if (cLGuard.getGuards() == null) {
+            throw new BuilderException("No existing guard policies to remove");
+        }
+        for (GuardPolicy policy : policies) {
+            if (!policy.isValid()) {
+                throw new BuilderException("Invalid guard policy - some required fields are missing");
+            }
+            boolean removed = cLGuard.getGuards().remove(policy);
+            if (!removed) {
+                throw new BuilderException("Unknown guard policy: " + policy.getName());
+            }
+        }
+        return this;
+    }
+
+    @Override
+    public ControlLoopGuardBuilder removeAllGuardPolicies() throws BuilderException {
+        cLGuard.getGuards().clear();
+        return this;
+    }
+
+    @Override
+    public ControlLoopGuardBuilder addLimitConstraint(String id, Constraint... constraints) throws BuilderException {
+        if (id == null) {
+            throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);
+        }
+        if (constraints == null) {
+            throw new BuilderException("Constraint much not be null");
+        }
+        if (!addLimitConstraints(id,constraints)) {
+            throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);
+        }
+        return this;
+    }
+
+    private boolean addLimitConstraints(String id, Constraint... constraints) throws BuilderException {
+        boolean exist = false;
+        for (GuardPolicy policy: cLGuard.getGuards()) {
+            //
+            // We could have only one guard policy matching the id
+            //
+            if (policy.getId().equals(id)) {
+                exist = true;
+                for (Constraint cons: constraints) {
+                    if (!cons.isValid()) {
+                        throw new BuilderException("Invalid guard constraint - some required fields are missing");
+                    }
+                    if (policy.getLimit_constraints() == null) {
+                        policy.setLimit_constraints(new LinkedList<>());
+                    }
+                    policy.getLimit_constraints().add(cons);
+                }
+                break;
+            }
+        }
+        return exist;
+    }
+
+    @Override
+    public ControlLoopGuardBuilder removeLimitConstraint(String id, Constraint... constraints) throws BuilderException {
+        if (id == null) {
+            throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);
+        }
+        if (constraints == null) {
+            throw new BuilderException("Constraint much not be null");
+        }
+        if (!removeConstraints(id, constraints)) {
+            throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);
+        }
+        return this;
+    }
+
+    private boolean removeConstraints(String id, Constraint... constraints) throws BuilderException {
+        boolean exist = false;
+        for (GuardPolicy policy: cLGuard.getGuards()) {
+            //
+            // We could have only one guard policy matching the id
+            //
+            if (policy.getId().equals(id)) {
+                exist = true;
+                for (Constraint cons: constraints) {
+                    if (!cons.isValid()) {
+                        throw new BuilderException("Invalid guard constraint - some required fields are missing");
+                    }
+                    boolean removed = policy.getLimit_constraints().remove(cons);
+                    if (!removed) {
+                        throw new BuilderException("Unknown guard constraint: " + cons);
+                    }
+                }
+                break;
+            }
+        }
+        return exist;
+    }
+
+    @Override
+    public ControlLoopGuardBuilder removeAllLimitConstraints(String id) throws BuilderException {
+        if (cLGuard.getGuards() == null || cLGuard.getGuards().isEmpty()) {
+            throw new BuilderException("No guard policies exist");
+        } 
+        if (id == null) {
+            throw new BuilderException(THE_ID_OF_TARGET_GUARD_POLICY_MUST_NOT_BE_NULL);
+        }
+        boolean exist = false;
+        for (GuardPolicy policy: cLGuard.getGuards()) {
+            if (policy.getId().equals(id)) {
+                exist = true;
+                policy.getLimit_constraints().clear();
+            }
+        }
+        if (!exist) {
+            throw new BuilderException(NO_EXISTING_GUARD_POLICY_MATCHING_THE_ID + id);
+        }
+        return this;
+    }
+
+    
+    private class BuilderCompilerCallback implements ControlLoopCompilerCallback {
+
+        private ResultsImpl results = new ResultsImpl();
+        
+        @Override
+        public boolean onWarning(String message) {
+            results.addMessage(new MessageImpl(message, MessageLevel.WARNING));
+            return false;
+        }
+
+        @Override
+        public boolean onError(String message) {
+            results.addMessage(new MessageImpl(message, MessageLevel.ERROR));
+            return false;
+        }
+    }
+    
+    @Override
+    public ControlLoopGuard getControlLoopGuard() {
+        return new ControlLoopGuard(this.cLGuard);
+    }   
+    
+    
+    @Override
+    public Results buildSpecification() {
+        //
+        // Dump the specification
+        //
+        DumperOptions options = new DumperOptions();
+        options.setDefaultFlowStyle(FlowStyle.BLOCK);
+        options.setPrettyFlow(true);
+        Yaml yaml = new Yaml(options);
+        String dumpedYaml = yaml.dump(cLGuard);
+        //
+        // This is our callback class for our compiler
+        //
+        BuilderCompilerCallback callback = new BuilderCompilerCallback();
+        //
+        // Compile it
+        //
+        try {
+            ControlLoopGuardCompiler.compile(cLGuard, callback);
+        } catch (CompilerException e) {
+            logger.error(e.getMessage() + e);
+            callback.results.addMessage(new MessageImpl(e.getMessage(), MessageLevel.EXCEPTION));
+        }
+        //
+        // Save the spec
+        //
+        callback.results.setSpecification(dumpedYaml);
+        return callback.results;
+    }
+
+}
index fc47634..d679e07 100644 (file)
-controlLoop:\r
-  version: 2.0.0\r
-  controlLoopName: ControlLoop-GENERIC-64cdc9fa-6601-4989-9de7-8f47134aa043\r
-  #\r
-  # Example of how someone can fine-grain this\r
-  # policy for a specific service and/or resources\r
-  # contained within the service.\r
-  #\r
-  services:\r
-    - serviceName: vFooService\r
\r
-  resources:\r
-    - resourceName: vVNF1\r
-      resourceType: VFC\r
-    - resourceName: vVNF2\r
-      resourceType: VFC\r
-    - resourceName: vVNF3\r
-      resourceType: VFC\r
-    - resourceName: vVNF4\r
-      resourceType: VFC\r
\r
-  trigger_policy: unique-policy-id-1-restart\r
-  timeout: 1200\r
-  #\r
-  # Example of case where an abatement isn't possible\r
-  # from DCAE to Policy. So Policy should NOT expect\r
-  #\r
-  abatement: false\r
\r
-policies:\r
\r
-  - id: unique-policy-id-1-restart\r
-    name: Restart Policy\r
-    description:\r
-    actor: APPC\r
-    recipe: Restart\r
-    target:\r
-      type: VM\r
-    retry: 2\r
-    timeout: 300\r
-    success: unique-policy-id-1-healthdiagnostic\r
-    failure: unique-policy-id-2-rebuild\r
-    failure_timeout: unique-policy-id-2-rebuild\r
-    failure_retries: unique-policy-id-2-rebuild\r
-    failure_exception: final_failure_exception\r
-    failure_guard: unique-policy-id-2-rebuild\r
-   \r
\r
-  - id: unique-policy-id-2-rebuild\r
-    name: Rebuild Policy\r
-    description:\r
-    actor: APPC\r
-    recipe: Rebuild\r
-    target:\r
-      type: VM\r
-    retry: 0\r
-    timeout: 600\r
-    success: unique-policy-id-2-healthdiagnostic\r
-    failure: unique-policy-id-3-migrate\r
-    failure_timeout: unique-policy-id-3-migrate\r
-    failure_retries: unique-policy-id-3-migrate\r
-    failure_exception: final_failure_exception\r
-    failure_guard: unique-policy-id-3-migrate\r
\r
-  - id: unique-policy-id-3-migrate\r
-    name: Migrate Policy\r
-    description:\r
-    actor: APPC\r
-    recipe: Migrate\r
-    target:\r
-      type: VM\r
-    retry: 0\r
-    timeout: 600\r
-    success: final_success\r
-    failure: final_failure\r
-    failure_timeout: final_failure_timeout\r
-    failure_retries: final_failure_retries\r
-    failure_exception: final_failure_exception\r
-    failure_guard: final_failure_guard\r
\r
-  - id: unique-policy-id-1-healthdiagnostic\r
-    name: Do A Health Diagnostic\r
-    description:\r
-    actor: APPC\r
-    recipe: health-diagnostic\r
-    # Example of a payload\r
-    payload:\r
-      health-diagnostic-code: HC01234\r
-      health-diagnostic-code-parameters: "{\"Junk\":\"--version\",\"Junk2\":\"--help\"}"\r
-    target:\r
-      type: VM\r
-    retry: 0\r
-    timeout: 600\r
-    success: final_success\r
-    failure: unique-policy-id-2-rebuild\r
-    failure_timeout: unique-policy-id-2-rebuild\r
-    failure_retries: unique-policy-id-2-rebuild\r
-    failure_exception: final_failure_exception\r
-    failure_guard: unique-policy-id-2-rebuild\r
\r
\r
-  - id: unique-policy-id-2-healthdiagnostic\r
-    name: Do Health Diagnostic\r
-    description:\r
-    actor: APPC\r
-    recipe: health-diagnostic\r
-    payload:\r
-      health-diagnostic-code: HC01234\r
-      health-diagnostic-code-parameters: "{\"Junk\":\"--version\",\"Junk2\":\"--help\"}"\r
-    target:\r
-      type: VM\r
-    retry: 0\r
-    timeout: 600\r
-    success: final_success\r
-    failure: final_failure\r
-    failure_timeout: final_failure_timeout\r
-    failure_retries: final_failure_retries\r
-    failure_exception: final_failure_exception\r
-    failure_guard: final_failure_guard\r
-    \r
-\r
+controlLoop:
+  version: 2.0.0
+  controlLoopName: ControlLoop-GENERIC-64cdc9fa-6601-4989-9de7-8f47134aa043
+  #
+  # Example of how someone can fine-grain this
+  # policy for a specific service and/or resources
+  # contained within the service.
+  #
+  services:
+    - serviceName: vFooService
+  resources:
+    - resourceName: vVNF1
+      resourceType: VFC
+    - resourceName: vVNF2
+      resourceType: VFC
+    - resourceName: vVNF3
+      resourceType: VFC
+    - resourceName: vVNF4
+      resourceType: VFC
+  trigger_policy: unique-policy-id-1-restart
+  timeout: 1200
+  #
+  # Example of case where an abatement isn't possible
+  # from DCAE to Policy. So Policy should NOT expect
+  #
+  abatement: false
+policies:
+  - id: unique-policy-id-1-restart
+    name: Restart Policy
+    description:
+    actor: APPC
+    recipe: Restart
+    target:
+      type: VM
+    retry: 2
+    timeout: 300
+    success: unique-policy-id-1-healthdiagnostic
+    failure: unique-policy-id-2-rebuild
+    failure_timeout: unique-policy-id-2-rebuild
+    failure_retries: unique-policy-id-2-rebuild
+    failure_exception: final_failure_exception
+    failure_guard: unique-policy-id-2-rebuild
+   
+  - id: unique-policy-id-2-rebuild
+    name: Rebuild Policy
+    description:
+    actor: APPC
+    recipe: Rebuild
+    target:
+      type: VM
+    retry: 0
+    timeout: 600
+    success: unique-policy-id-2-healthdiagnostic
+    failure: unique-policy-id-3-migrate
+    failure_timeout: unique-policy-id-3-migrate
+    failure_retries: unique-policy-id-3-migrate
+    failure_exception: final_failure_exception
+    failure_guard: unique-policy-id-3-migrate
+  - id: unique-policy-id-3-migrate
+    name: Migrate Policy
+    description:
+    actor: APPC
+    recipe: Migrate
+    target:
+      type: VM
+    retry: 0
+    timeout: 600
+    success: final_success
+    failure: final_failure
+    failure_timeout: final_failure_timeout
+    failure_retries: final_failure_retries
+    failure_exception: final_failure_exception
+    failure_guard: final_failure_guard
+  - id: unique-policy-id-1-healthdiagnostic
+    name: Do A Health Diagnostic
+    description:
+    actor: APPC
+    recipe: health-diagnostic
+    # Example of a payload
+    payload:
+      health-diagnostic-code: HC01234
+      health-diagnostic-code-parameters: "{\"Junk\":\"--version\",\"Junk2\":\"--help\"}"
+    target:
+      type: VM
+    retry: 0
+    timeout: 600
+    success: final_success
+    failure: unique-policy-id-2-rebuild
+    failure_timeout: unique-policy-id-2-rebuild
+    failure_retries: unique-policy-id-2-rebuild
+    failure_exception: final_failure_exception
+    failure_guard: unique-policy-id-2-rebuild
+  - id: unique-policy-id-2-healthdiagnostic
+    name: Do Health Diagnostic
+    description:
+    actor: APPC
+    recipe: health-diagnostic
+    payload:
+      health-diagnostic-code: HC01234
+      health-diagnostic-code-parameters: "{\"Junk\":\"--version\",\"Junk2\":\"--help\"}"
+    target:
+      type: VM
+    retry: 0
+    timeout: 600
+    success: final_success
+    failure: final_failure
+    failure_timeout: final_failure_timeout
+    failure_retries: final_failure_retries
+    failure_exception: final_failure_exception
+    failure_guard: final_failure_guard
+    
+
index 576d734..582183d 100644 (file)
@@ -1,47 +1,47 @@
 <!--
-  ============LICENSE_START=======================================================
-  Drools PDP Application Common Models
-  ================================================================================
-  Copyright (C) 2017 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.
-  ============LICENSE_END=========================================================
-  -->
+    ============LICENSE_START=======================================================
+    Drools PDP Application Common Models
+    ================================================================================
+    Copyright (C) 2017 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.
+    ============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>
-    
-       <artifactId>common</artifactId>
-    <packaging>pom</packaging>
+        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>
+  <packaging>pom</packaging>
+  
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+    <artifactId>controlloop</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-    <parent>
-        <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>controlloop</artifactId>
-        <version>1.2.0-SNAPSHOT</version>
-    </parent>
+  <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+  <artifactId>common</artifactId>
 
-    <modules>
-       <module>actors</module>
-        <module>guard</module>
-       <module>eventmanager</module>
-        <module>model-impl</module>
-       <module>policy-yaml</module>
-       <module>simulators</module>
-       <module>feature-controlloop-utils</module>
-               <module>msb</module>
-    </modules>
+  <modules>
+    <module>actors</module>
+    <module>guard</module>
+    <module>eventmanager</module>
+    <module>model-impl</module>
+    <module>policy-yaml</module>
+    <module>simulators</module>
+    <module>feature-controlloop-utils</module>
+    <module>msb</module>
+  </modules>
 
 
 </project>
index 8f92694..c256d13 100644 (file)
   -->
 
 <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.drools-applications</groupId>
-               <artifactId>common</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>simulators</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-pdp</groupId>
-                       <artifactId>policy-endpoints</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                  <groupId>org.onap.policy.drools-pdp</groupId>
-                  <artifactId>policy-management</artifactId>
-                  <version>${project.version}</version>
-                  <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-       </dependencies>
+        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.drools-applications.controlloop.common</groupId>
+    <artifactId>common</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>simulators</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-endpoints</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
index 5be2023..1e5acf6 100644 (file)
   -->
 
 <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">
+        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>
+  <packaging>pom</packaging>
 
-       <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+    <artifactId>packages</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>packages</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       
-       <artifactId>apps</artifactId>
-       <packaging>pom</packaging>
+  <artifactId>apps</artifactId>
 
-       <name>PDP-D APPS Installation Package</name>
-       <description>PDP-D APPS Installation Package</description>
+  <name>Drools Applications Installation Package</name>
+  <description>Drools Applications Installation Package</description>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+  <build>
+    <plugins>
+      <plugin>
+       <artifactId>maven-assembly-plugin</artifactId>
+       <executions>
+         <execution>
+           <goals>
+             <goal>single</goal>
+           </goals>
+           <phase>package</phase>
+           <configuration>
+             <descriptors>
+               <descriptor>src/assembly/zip.xml</descriptor>
+             </descriptors>
+             <appendAssemblyId>false</appendAssemblyId>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+    </plugins>
+  </build>
 
-       <!--  List any dependencies here that should be included in the installer zip -->
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>basex</artifactId>
-                       <version>${project.version}</version>
-                       <type>tar.gz</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>artifacts</artifactId>
-                       <version>${project.version}</version>
-                       <type>zip</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>feature-controlloop-utils</artifactId>
-                       <version>${project.version}</version>
-                       <type>zip</type>
-               </dependency>
-       </dependencies>
+  <!--  List any dependencies here that should be included in the installer zip -->
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+      <artifactId>basex</artifactId>
+      <version>${project.version}</version>
+      <type>tar.gz</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+      <artifactId>artifacts</artifactId>
+      <version>${project.version}</version>
+      <type>zip</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>feature-controlloop-utils</artifactId>
+      <version>${project.version}</version>
+      <type>zip</type>
+    </dependency>
+  </dependencies>
 
 </project>
 
index 545c3dc..d483707 100644 (file)
@@ -38,21 +38,19 @@ source ${POLICY_HOME}/etc/build.info
 
 mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=com.att.research.xacml:xacml-pdp:1.0.0:jar
 
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:archetype-cl-amsterdam:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:events:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:appc:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:appclcm:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:aai:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:so:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:trafficgenerator:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:eventmanager:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:guard:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:actorserviceprovider:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:actor.appc:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:actor.appclcm:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:actor.so:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:actor.vfc:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:policy-yaml:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:demo:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:template.demo:${version}:jar -Dtransitive=false
-mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:guard:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.templates:archetype-cl-amsterdam:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:events:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:appc:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:appclcm:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:aai:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:so:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.model-impl:trafficgenerator:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications:controlloop.common:eventmanager:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common:guard:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actorserviceprovider:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.appc:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.appclcm:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.so:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.actors:actor.vfc:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.common.policy-yaml:${version}:jar -Dtransitive=false
+mvn org.apache.maven.plugins:maven-dependency-plugin:3.0.2:get -Dartifact=org.onap.policy.drools-applications.controlloop.templates:template.demo:${version}:jar -Dtransitive=false
index 0a84e32..0965fa0 100644 (file)
   -->
 
 <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">
+        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>
+  <packaging>pom</packaging>
 
-       <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+    <artifactId>packages</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>packages</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <artifactId>artifacts</artifactId>
 
-       <artifactId>artifacts</artifactId>
-       <packaging>pom</packaging>
+  <name>Artifacts for Drools Applications</name>
+  <description>Drools Application models, rules and tooling</description>
 
-       <name>Artifacts for PDP-D Applications</name>
-       <description>PDP-D models, rules and tooling</description>
+  <build>
+    <plugins>
+      <plugin>
+       <artifactId>maven-assembly-plugin</artifactId>
+       <executions>
+         <execution>
+           <goals>
+             <goal>single</goal>
+           </goals>
+           <phase>package</phase>
+           <configuration>
+             <descriptors>
+               <descriptor>src/assembly/zip.xml</descriptor>
+             </descriptors>
+             <appendAssemblyId>false</appendAssemblyId>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+    </plugins>
+  </build>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+  <!-- The following are placed in the local or remote repository at installation -->
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications</groupId>
+      <artifactId>drools-applications</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications</groupId>
+      <artifactId>controlloop</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+      <artifactId>controlloop</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>model-impl</artifactId>
+      <version>${project.version}</version>
+      <type>pom</type>
+    </dependency>
 
-       <!-- The following are placed in the local or remote repository at installation -->
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>drools-pdp-apps</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>controlloop</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>common</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>model-impl</artifactId>
-                       <version>${project.version}</version>
-                       <type>pom</type>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appc</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-                <dependency>
-                        <groupId>org.onap.policy.drools-applications</groupId>
-                        <artifactId>vfc</artifactId>
-                        <version>${project.version}</version>
-                        <type>jar</type>
-                </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>sdc</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>trafficgenerator</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>eventmanager</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>guard</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appc</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.so</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.vfc</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>policy-yaml</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>template.demo</artifactId>
-                       <version>${project.version}</version>
-                       <type>jar</type>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml-pdp</artifactId>
-                       <version>1.0.1</version>
-                       <type>jar</type>
-               </dependency>
-       </dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appc</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appclcm</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>vfc</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>sdc</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>trafficgenerator</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>eventmanager</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>guard</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appc</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appclcm</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.so</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.vfc</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.templates</groupId>
+      <artifactId>template.demo</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.att.research.xacml</groupId>
+      <artifactId>xacml-pdp</artifactId>
+      <version>1.0.1</version>
+      <type>jar</type>
+    </dependency>
+  </dependencies>
 </project>
index b28f9a8..ed5016b 100644 (file)
   -->
 
 <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.drools-applications</groupId>
-               <artifactId>packages</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-
-       <artifactId>basex</artifactId>
-       <packaging>pom</packaging>
-
-       <name>PDP-D APPS Base Package</name>
-       <description>PDP-D APPS Packaging</description>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>single</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <descriptors>
-                                                               <descriptor>src/assembly/zip.xml</descriptor>
-                                                       </descriptors>
-                                                       <appendAssemblyId>false</appendAssemblyId>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+        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>
+  <packaging>pom</packaging>
+
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+    <artifactId>packages</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>basex</artifactId>
+
+  <name>Drools ApplicationsBase Package</name>
+  <description>Drools Applications Packaging</description>
+
+  <build>
+    <plugins>
+      <plugin>
+       <artifactId>maven-assembly-plugin</artifactId>
+       <executions>
+         <execution>
+           <goals>
+             <goal>single</goal>
+           </goals>
+           <phase>package</phase>
+           <configuration>
+             <descriptors>
+               <descriptor>src/assembly/zip.xml</descriptor>
+             </descriptors>
+             <appendAssemblyId>false</appendAssemblyId>
+           </configuration>
+         </execution>
+       </executions>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>
 
index fabf35d..ad55850 100644 (file)
@@ -124,7 +124,7 @@ if [ ! -w "${DIR_TMP}" ]; then
        exit 1
 fi
 
-ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications"
+ARCHETYPE_GROUP_ID="org.onap.policy.drools-applications.controlloop.templates"
 ARCHETYPE_ARTIFACT_ID="archetype-cl-amsterdam"
 ARCHETYPE_VERSION="${VERSION}"
 
index 5362fa5..99e4bea 100644 (file)
   -->
 
 <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">
+        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>
+  <packaging>pom</packaging>
 
-       <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+    <artifactId>controlloop</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>controlloop</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <groupId>org.onap.policy.drools-applications.controlloop.packages</groupId>
+  <artifactId>packages</artifactId>
 
-       <artifactId>packages</artifactId>
-       <packaging>pom</packaging>
+  <name>PDP-D Application Installation Packages</name>
+  <description>PDP-D Installation</description>
 
-       <name>PDP-D Application Installation Packages</name>
-       <description>PDP-D Installation</description>
-
-       <modules>
-               <module>basex</module>
-               <module>artifacts</module>
-               <module>apps</module>
-       </modules>
+  <modules>
+    <module>basex</module>
+    <module>artifacts</module>
+    <module>apps</module>
+  </modules>
 </project>
index b36fe57..d44283c 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  drools-pdp-apps
+  drools-applications
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   -->
 
 <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">
+        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>
+  <packaging>pom</packaging>
 
-       <modelVersion>4.0.0</modelVersion>
-    
-       <artifactId>controlloop</artifactId>
-    <packaging>pom</packaging>
+  <parent>
+    <groupId>org.onap.policy.drools-applications</groupId>
+    <artifactId>drools-applications</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-    <parent>
-        <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>drools-pdp-apps</artifactId>
-           <version>1.2.0-SNAPSHOT</version>
-    </parent>
+    <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+    <artifactId>controlloop</artifactId>
 
-    <modules>
-       <module>common</module>
-       <module>templates</module>
-       <module>packages</module>
-    </modules>
+  <modules>
+    <module>common</module>
+    <module>templates</module>
+    <module>packages</module>
+  </modules>
 
 
 </project>
index ef553e0..c2f3a19 100644 (file)
   -->
 
 <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>
+        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>
+  <packaging>maven-archetype</packaging>
 
-       <parent>
-               <groupId>org.onap.policy.drools-applications</groupId>
-               <artifactId>templates</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop.templates</groupId>
+    <artifactId>templates</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-       <artifactId>archetype-cl-amsterdam</artifactId>
-       <packaging>maven-archetype</packaging>
+  <artifactId>archetype-cl-amsterdam</artifactId>
 
-       <name>archetype-cl-amsterdam</name>
-       <description>Archetype to generate a yaml based control loop for ONAP Amsterdam release</description>
+  <name>${artifactId}</name>
+  <description>Archetype to generate a yaml based control loop for ONAP Amsterdam release</description>
 
-       <build>
-               <extensions>
-                       <extension>
-                               <groupId>org.apache.maven.archetype</groupId>
-                               <artifactId>archetype-packaging</artifactId>
-                               <version>3.0.1</version>
-                       </extension>
-               </extensions>
+  <build>
+    <extensions>
+      <extension>
+       <groupId>org.apache.maven.archetype</groupId>
+       <artifactId>archetype-packaging</artifactId>
+       <version>3.0.1</version>
+      </extension>
+    </extensions>
 
-               <pluginManagement>
-                       <plugins>
-                               <plugin>
-                                       <artifactId>maven-archetype-plugin</artifactId>
-                                       <version>3.0.1</version>
-                               </plugin>
-                       </plugins>
-               </pluginManagement>
-       </build>
+    <pluginManagement>
+      <plugins>
+       <plugin>
+         <artifactId>maven-archetype-plugin</artifactId>
+         <version>3.0.1</version>
+       </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>
index 4b83f89..1cb159a 100644 (file)
   -->
 
 <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>
+        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>
 
-       <groupId>${groupId}</groupId>
-       <artifactId>${artifactId}</artifactId>
-       <version>${version}</version>
-       <packaging>kjar</packaging>
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <version>${version}</version>
+  <packaging>kjar</packaging>
 
-       <name>${artifactId}</name>
-       <description>Control Loop Amsterdam Release Rules</description>
+  <name>${artifactId}</name>
+  <description>Control Loop Amsterdam Release Rules</description>
 
-       <properties>
-               <maven.compiler.source>1.8</maven.compiler.source>
-               <maven.compiler.target>1.8</maven.compiler.target>
-       </properties>
+  <properties>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
 
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.kie</groupId>
-                               <artifactId>kie-maven-plugin</artifactId>
-                               <version>6.5.0.Final</version>
-                               <extensions>true</extensions>
-                       </plugin>
-               </plugins>
-       </build>
+  <build>
+    <plugins>
+      <plugin>
+       <groupId>org.kie</groupId>
+       <artifactId>kie-maven-plugin</artifactId>
+       <version>6.5.0.Final</version>
+       <extensions>true</extensions>
+      </plugin>
+    </plugins>
+  </build>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appc</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appclcm</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>vfc</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>   
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>sdc</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>trafficgenerator</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>eventmanager</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>                   
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>guard</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appc</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appclcm</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.so</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.vfc</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>policy-yaml</artifactId>
-                       <version>${dependenciesVersion}</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml-pdp</artifactId>
-                       <version>1.0.1</version>
-               </dependency>
-               <dependency>
-                  <groupId>org.onap.policy.drools-pdp</groupId>
-                  <artifactId>policy-management</artifactId>
-                  <version>${dependenciesVersion}</version>
-                  <scope>provided</scope>
-                  <optional>true</optional>
-               </dependency>
-       </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appc</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appclcm</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>vfc</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>      
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>sdc</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>trafficgenerator</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>eventmanager</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>                      
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>guard</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appc</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appclcm</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.so</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.vfc</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>${dependenciesVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.att.research.xacml</groupId>
+      <artifactId>xacml-pdp</artifactId>
+      <version>1.0.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${dependenciesVersion}</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
 </project>
index b33553e..71541ab 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  drools-pdp-apps Control Loop Drools Templates
+  drools-applications Control Loop Drools Templates
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   -->
 
 <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">
+        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>
+  <packaging>pom</packaging>
 
-       <modelVersion>4.0.0</modelVersion>
-    
-       <artifactId>templates</artifactId>
-    <packaging>pom</packaging>
+  <parent>
+    <groupId>org.onap.policy.drools-applications.controlloop</groupId>
+    <artifactId>controlloop</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
 
-    <parent>
-        <groupId>org.onap.policy.drools-applications</groupId>
-        <artifactId>controlloop</artifactId>
-           <version>1.2.0-SNAPSHOT</version>
-    </parent>
+  <groupId>org.onap.policy.drools-applications.controlloop.templates</groupId>
+  <artifactId>templates</artifactId>
 
-    <modules>
-       <module>template.demo</module>
-       <module>archetype-cl-amsterdam</module>
-    </modules>
+  <modules>
+    <module>template.demo</module>
+    <module>archetype-cl-amsterdam</module>
+  </modules>
 
 
 </project>
index c501bfd..f2700e7 100644 (file)
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-  drools-pdp-apps Control Loop Drools Templates
+  drools-applications Control Loop Drools Templates
   ================================================================================
   Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
   ================================================================================
   ============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.drools-applications</groupId>
-               <artifactId>templates</artifactId>
-               <version>1.2.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>template.demo</artifactId>
-       <dependencies>
-               <dependency>
-                       <groupId>org.eclipse.persistence</groupId>
-                       <artifactId>org.eclipse.persistence.jpa</artifactId>
-                       <version>2.7.0</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-core</artifactId>
-                       <version>6.5.0.Final</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.drools</groupId>
-                       <artifactId>drools-compiler</artifactId>
-                       <version>6.5.0.Final</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.google.code.gson</groupId>
-                       <artifactId>gson</artifactId>
-                       <version>2.5</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>trafficgenerator</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>events</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>guard</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>aai</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>sdc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>policy-yaml</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>eventmanager</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml</artifactId>
-                       <version>1.0.1</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.att.research.xacml</groupId>
-                       <artifactId>xacml-pdp</artifactId>
-                       <version>1.0.1</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>persistence-api</artifactId>
-                       <version>1.0.2</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actorServiceProvider</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.appclcm</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.so</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>actor.vfc</artifactId>
-                       <version>${project.version}</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.12</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>com.h2database</groupId>
-                       <artifactId>h2</artifactId>
-                       <version>[1.4.186,)</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.onap.policy.drools-applications</groupId>
-                       <artifactId>simulators</artifactId>
-                       <version>${project.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                  <groupId>org.onap.policy.drools-pdp</groupId>
-                  <artifactId>policy-management</artifactId>
-                  <version>${project.version}</version>
-                  <scope>provided</scope>
-               </dependency>
-       </dependencies>
+        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.drools-applications.controlloop.templates</groupId>
+    <artifactId>templates</artifactId>
+    <version>1.2.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>template.demo</artifactId>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.persistence</groupId>
+      <artifactId>org.eclipse.persistence.jpa</artifactId>
+      <version>2.7.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-core</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.drools</groupId>
+      <artifactId>drools-compiler</artifactId>
+      <version>6.5.0.Final</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.5</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>appclcm</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>so</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>trafficgenerator</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>events</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>guard</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>aai</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.model-impl</groupId>
+      <artifactId>sdc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>policy-yaml</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>eventmanager</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.att.research.xacml</groupId>
+      <artifactId>xacml</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.att.research.xacml</groupId>
+      <artifactId>xacml-pdp</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.persistence</groupId>
+      <artifactId>persistence-api</artifactId>
+      <version>1.0.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actorServiceProvider</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.appclcm</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.so</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId>
+      <artifactId>actor.vfc</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>[1.4.186,)</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
+      <artifactId>simulators</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.onap.policy.drools-pdp</groupId>
+      <artifactId>policy-management</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>
+
diff --git a/pom.xml b/pom.xml
index 33f7f10..0988e55 100644 (file)
--- a/pom.xml
+++ b/pom.xml
 <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.oparent</groupId>
-               <artifactId>oparent</artifactId>
-               <version>0.1.1</version>
-               <relativePath/>
-       </parent>
+       <modelVersion>4.0.0</modelVersion>
+        <parent>
+                <groupId>org.onap.oparent</groupId>
+                <artifactId>oparent</artifactId>
+                <version>0.1.1</version>
+                <relativePath/>
+        </parent>
 
-       <groupId>org.onap.policy.drools-applications</groupId>
-       <artifactId>drools-pdp-apps</artifactId>
-       <version>1.2.0-SNAPSHOT</version>
+        <groupId>org.onap.policy.drools-applications</groupId>
+        <artifactId>drools-applications</artifactId>
+        <version>1.2.0-SNAPSHOT</version>
 
-       <name>policy-drools-applications</name>
-       <packaging>pom</packaging>
+        <name>policy-drools-applications</name>
+        <packaging>pom</packaging>
 
        <properties>
                <!-- Project common build settings -->