Remove topic.properties and incorporate into overall config file 34/90734/1
authora.sreekumar <ajith.sreekumar@est.tech>
Mon, 1 Jul 2019 14:50:01 +0000 (14:50 +0000)
committera.sreekumar <ajith.sreekumar@est.tech>
Mon, 1 Jul 2019 14:50:01 +0000 (14:50 +0000)
commit9ef4186f69ef694e6251161622a33d7bc1400f39
tree054b74bdc1699e85555e65c2341265c6daf2b758
parentd848416090efd6850ab25011d8518b15525a1bdb
Remove topic.properties and incorporate into overall config file

1) The properties in the topic.properties file is moved into overall
config json file and the topic.properties file is removed.
2) Common parameters such as RestServer and Topic related parameters
from policy-common is used.

Change-Id: I390bbe3cda101a69e7ce614404ecdfbf98598dd2
Issue-ID: POLICY-1744
Signed-off-by: a.sreekumar <ajith.sreekumar@est.tech>
22 files changed:
main/src/main/java/org/onap/policy/pap/main/parameters/PapParameterGroup.java
main/src/main/java/org/onap/policy/pap/main/parameters/RestServerParameters.java [deleted file]
main/src/main/java/org/onap/policy/pap/main/rest/PapRestServer.java
main/src/main/java/org/onap/policy/pap/main/startstop/Main.java
main/src/main/java/org/onap/policy/pap/main/startstop/PapCommandLineArguments.java
main/src/test/java/org/onap/policy/pap/main/comm/PublisherTest.java
main/src/test/java/org/onap/policy/pap/main/parameters/TestPapParameterGroup.java
main/src/test/java/org/onap/policy/pap/main/rest/CommonPapRestServer.java
main/src/test/java/org/onap/policy/pap/main/startstop/TestMain.java
main/src/test/java/org/onap/policy/pap/main/startstop/TestPapActivator.java
main/src/test/resources/e2e/PapConfigParameters.json
main/src/test/resources/parameters/MinimumParameters.json
main/src/test/resources/parameters/PapConfigParameters.json
main/src/test/resources/parameters/PapConfigParametersStd.json
main/src/test/resources/parameters/PapConfigParameters_sim.json
main/src/test/resources/parameters/topic.properties [deleted file]
main/src/test/resources/parameters/topic_sim.properties [deleted file]
packages/policy-pap-tarball/src/main/resources/etc/defaultConfig.json
packages/policy-pap-tarball/src/main/resources/etc/s3pConfig.json
packages/policy-pap-tarball/src/main/resources/etc/topic.properties [deleted file]
testsuites/stability/src/main/resources/simulatorsetup/config/pdp/OnapPfConfig.json
testsuites/stability/src/main/resources/simulatorsetup/config/pdp/topic.properties [deleted file]