Fix examples broken by checkstyle changes 85/67885/2
authorliamfallon <liam.fallon@ericsson.com>
Wed, 19 Sep 2018 20:44:33 +0000 (21:44 +0100)
committerliamfallon <liam.fallon@ericsson.com>
Wed, 19 Sep 2018 20:59:46 +0000 (21:59 +0100)
Checkstyle changes to some class names must be propgated
into example configurations and name changes meant some
examples were not being packaged.

Issue-ID: POLICY-1034
Change-Id: I5485fc2ffc22c496bbae9465e1c3b09c4feade97
Signed-off-by: liamfallon <liam.fallon@ericsson.com>
27 files changed:
examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutJsonEvent.json
examples/examples-aadm/src/main/resources/examples/config/AADM/Stdin2StdoutXmlEvent.json
examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAnomalyDetectionJsonEvent.json
examples/examples-adaptive/src/main/resources/examples/config/Adaptive/Stdin2StdoutAutoLearnJsonEvent.json
examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTClient.json
examples/examples-decisionmaker/src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServer.json
examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigFile2StdoutJsonEvent.json
examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/1/MyFirstPolicyConfigStdin2StdoutJsonEvent.json
examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigFile2StdoutJsonEvent.json
examples/examples-myfirstpolicy/src/main/resources/examples/config/MyFirstPolicy/2/MyFirstPolicyConfigStdin2StdoutJsonEvent.json
examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/kafka2kafka.json
examples/examples-pcvs/src/main/resources/examples/config/pcvs/vpnsla/stdin2stdout.json
packages/apex-pdp-package-full/pom.xml
packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSJsonEvent.json
packages/apex-pdp-package-full/src/main/package/examples/config/JMS/JMS2JMSObjectEvent.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEvent.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventJavascript.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutJsonEventMVEL.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/File2StdoutXmlEvent.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2RESTJsonEventJava.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJRuby.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJava.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJavascript.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventJython.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutJsonEventMVEL.json
packages/apex-pdp-package-full/src/main/package/examples/config/SampleDomain/Stdin2StdoutXmlEvent.json

index 427dea3..e78824b 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 3658b09..022f7c8 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -33,7 +33,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 4da0bb9..3e9bafc 100644 (file)
@@ -9,7 +9,7 @@
         "engineParameters": {
             "executorParameters": {
                 "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
                 },
                 "JAVA": {
                     "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters"
@@ -22,7 +22,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -35,7 +35,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 5ae70f3..dc3d768 100644 (file)
@@ -9,7 +9,7 @@
         "engineParameters": {
             "executorParameters": {
                 "MVEL": {
-                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MVELExecutorParameters"
+                    "parameterClassName": "org.onap.policy.apex.plugins.executor.mvel.MvelExecutorParameters"
                 },
                 "JAVA": {
                     "parameterClassName": "org.onap.policy.apex.plugins.executor.java.JavaExecutorParameters"
@@ -22,7 +22,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -35,7 +35,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 9fa0b6d..a2cf2b9 100644 (file)
@@ -29,7 +29,7 @@
         "DMaaPConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://localhost:3904/events/toApex/APEX/1?timeout=60000"
                 }
@@ -54,7 +54,7 @@
         "DMaapProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://localhost:3904/events/fromApex"
                 }
index edf1b9c..5a8e6ea 100644 (file)
@@ -29,7 +29,7 @@
         "RESTConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTSERVER",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
                 "parameters": {
                     "standalone": true,
                     "host": "0.0.0.0",
@@ -59,7 +59,7 @@
         "RESTProducer": {
             "carrierTechnologyParameters":{
                 "carrierTechnology" : "RESTSERVER",
-                "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters"
+                "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
             },
             "eventProtocolParameters":{
                 "eventProtocol" : "JSON"
index d8d53f8..71b66be 100644 (file)
@@ -22,7 +22,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 338e1df..21a159c 100644 (file)
@@ -22,7 +22,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -35,7 +35,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index d4dba44..18de30a 100644 (file)
@@ -22,7 +22,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 0853a98..0553f6a 100644 (file)
@@ -22,7 +22,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -35,7 +35,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 070bbc1..aba5946 100644 (file)
@@ -42,7 +42,7 @@
         "GuardRequestorConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://192.168.144.235:54321/AAIAndGuardSim/sim/pdp/api/getDecision",
                     "httpMethod": "POST",
@@ -61,7 +61,7 @@
         "DCAEConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://192.168.144.235:3904/events/unauthenticated.DCAE_CL_OUTPUT/APEX/1?timeout=60000"
                 }
@@ -78,7 +78,7 @@
         "APPCConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://192.168.144.235:3904/events/APPC_LCM_WRITE/APEX/1?timeout=60000"
                 }
         "GuardRequestorProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RESTRequestorCarrierTechnologyParameters"
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
             },
             "eventProtocolParameters": {
                 "eventProtocol": "JSON"
         "APPCProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://192.168.144.235:3904/events/APPC-LCM-READ"
                 }
         "PolicyLogProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RESTClientCarrierTechnologyParameters",
+                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restclient.RestClientCarrierTechnologyParameters",
                 "parameters": {
                     "url": "http://192.168.144.235:3904/events/POLICY_CL_MGT"
                 }
index 841028b..39a96f2 100644 (file)
@@ -26,7 +26,7 @@
         "aProducer": {
             "carrierTechnologyParameters":{
                 "carrierTechnology" : "KAFKA",
-                "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.kafka.KAFKACarrierTechnologyParameters",
+                "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
                 "parameters" : {
                     'bootstrapServers'  : 'localhost:9092',
                     'acks'              : 'all',
@@ -48,7 +48,7 @@
         "aConsumer": {
             "carrierTechnologyParameters":{
                 "carrierTechnology" : "KAFKA",
-                "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.kafka.KAFKACarrierTechnologyParameters",
+                "parameterClassName" : "org.onap.policy.apex.plugins.event.carrier.kafka.KafkaCarrierTechnologyParameters",
                 "parameters" : {
                     'bootstrapServers'  : 'localhost:9092',
                     'groupId'           : 'apex-group-id',
index d48a47e..009b7fb 100644 (file)
@@ -27,7 +27,7 @@
             "carrierTechnologyParameters" : {
                 "carrierTechnology" : "FILE",
                 "parameters" : {
-                    "standardIO" : true
+                    "standardIo" : true
                 }
             },
             "eventProtocolParameters" : {
@@ -40,7 +40,7 @@
             "carrierTechnologyParameters" : {
                 "carrierTechnology" : "FILE",
                 "parameters" : {
-                    "standardIO" : true
+                    "standardIo" : true
                 }
             },
             "eventProtocolParameters" : {
index fbfce9a..070d2d8 100644 (file)
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/models/DecisionMaker</outputDirectory>
-                                    <includes>/DecisionMakerPolicyModel.json</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/models/Periodic</outputDirectory>
-                                    <includes>/PeriodicPolicyModel.json</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <version>${project.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/examples/models/ONAPvCPE</outputDirectory>
-                                    <includes>/ONAPvCPEPolicyModel.json</includes>
+                                    <outputDirectory>${project.build.directory}</outputDirectory>
+                                    <includes>etc/**/*,examples/**/*</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.examples</groupId>
                                     <version>${project.version}</version>
                                     <type>war</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.directory}/etc</outputDirectory>
-                                    <includes>/readme_examples-servlet.txt</includes>
+                                    <outputDirectory>${project.build.directory}/examples/servlet</outputDirectory>
+                                    <includes>readme_examples-servlet.txt</includes>
                                 </artifactItem>
                                 <artifactItem>
                                     <groupId>org.onap.policy.apex-pdp.tools</groupId>
index 7f671bb..7a2a0c4 100644 (file)
@@ -22,7 +22,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "producerTopic": "jms/topic/apexOut",
@@ -43,7 +43,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "consumerTopic": "jms/topic/apexIn"
index 1860e98..9554ad0 100644 (file)
@@ -22,7 +22,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "producerTopic": "jms/topic/apexOut"
@@ -42,7 +42,7 @@
                 "parameters": {
                     "initialContextFactory": "org.onap.policy.apex.apps.uservice.test.adapt.jms.TestInitialContextFactory",
                     "connectionFactory": "ConnectionFactory",
-                    "providerURL": "remote://localhost:5445",
+                    "providerUrl": "remote://localhost:5445",
                     "securityPrincipal": "guest",
                     "securityCredentials": "IAmAGuest",
                     "consumerTopic": "jms/topic/apexIn"
index 593a272..06af5e6 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 593a272..06af5e6 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 4b44ac8..1415ee6 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 48e60f8..6d9bad4 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index a7dc157..18447df 100644 (file)
@@ -33,7 +33,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 060e083..bae4f41 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index b5c73eb..3167fff 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 415a094..c9ab0c0 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index a6095dc..d547c68 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index c5f2b30..cb3ace1 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -32,7 +32,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
index 692807a..f87adff 100644 (file)
@@ -19,7 +19,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {
@@ -33,7 +33,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "standardIO": true
+                    "standardIo": true
                 }
             },
             "eventProtocolParameters": {