From 037e421b700ba836e053fdc58101104a0b6ccb0e Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Fri, 28 Jun 2019 11:36:58 +0000 Subject: Remove topic.properties and incorporate into overall properties 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: Ifc25185c8f717c95a226b2db25c1a8e96b9bbff9 Issue-ID: POLICY-1744 Signed-off-by: a.sreekumar --- pom.xml | 2 +- .../onappf/ApexStarterCommandLineArguments.java | 1 - .../apex/services/onappf/ApexStarterMain.java | 14 +----- .../parameters/ApexStarterParameterGroup.java | 5 ++- .../onappf/parameters/RestServerParameters.java | 52 ---------------------- .../onappf/rest/ApexStarterRestServer.java | 2 +- .../src/main/resources/config/OnapPfConfig.json | 12 +++++ .../src/main/resources/config/topic.properties | 23 ---------- .../services/onappf/TestApexStarterActivator.java | 15 ++----- .../apex/services/onappf/TestApexStarterMain.java | 3 +- .../onappf/comm/TestPdpStateChangeListener.java | 17 +++---- .../onappf/comm/TestPdpUpdateListener.java | 17 +++---- .../services/onappf/parameters/CommonTestData.java | 33 +++++++++++++- .../parameters/TestApexStarterParameterGroup.java | 23 +++++++++- .../onappf/rest/CommonApexStarterRestServer.java | 7 +-- .../resources/ApexStarterConfigParameters.json | 28 ++++++++++++ .../resources/ApexStarterConfigParameters_sim.json | 14 +++++- .../src/test/resources/TestConfigParameters.json | 30 ++++++++++++- .../src/test/resources/topic.properties | 22 --------- .../src/test/resources/topic_sim.properties | 22 --------- 20 files changed, 160 insertions(+), 182 deletions(-) delete mode 100644 services/services-onappf/src/main/java/org/onap/policy/apex/services/onappf/parameters/RestServerParameters.java delete mode 100644 services/services-onappf/src/main/resources/config/topic.properties delete mode 100644 services/services-onappf/src/test/resources/topic.properties delete mode 100644 services/services-onappf/src/test/resources/topic_sim.properties diff --git a/pom.xml b/pom.xml index b4e25d77d..99e606974 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 1.1.1 2.26 5.3.7.Final - 1.5.0 + 1.5.1-SNAPSHOT 2.1.0