diff options
Diffstat (limited to 'main/src/main/java/org/onap/policy/pap/main/startstop')
-rw-r--r-- | main/src/main/java/org/onap/policy/pap/main/startstop/Main.java | 14 | ||||
-rw-r--r-- | main/src/main/java/org/onap/policy/pap/main/startstop/PapCommandLineArguments.java | 1 |
2 files changed, 2 insertions, 13 deletions
diff --git a/main/src/main/java/org/onap/policy/pap/main/startstop/Main.java b/main/src/main/java/org/onap/policy/pap/main/startstop/Main.java index 6351fa80..ba73d354 100644 --- a/main/src/main/java/org/onap/policy/pap/main/startstop/Main.java +++ b/main/src/main/java/org/onap/policy/pap/main/startstop/Main.java @@ -21,10 +21,9 @@ package org.onap.policy.pap.main.startstop; -import java.io.FileInputStream; import java.util.Arrays; import java.util.Properties; - +import org.onap.policy.common.endpoints.utils.ParameterUtils; import org.onap.policy.common.utils.services.Registry; import org.onap.policy.pap.main.PapConstants; import org.onap.policy.pap.main.PolicyPapException; @@ -81,16 +80,7 @@ public class Main { } // Read the properties - final Properties props = new Properties(); - try { - final String propFile = arguments.getFullPropertyFilePath(); - try (FileInputStream stream = new FileInputStream(propFile)) { - props.load(stream); - } - } catch (final Exception e) { - LOGGER.error(START_FAILED, e); - return; - } + Properties props = ParameterUtils.getTopicProperties(parameterGroup.getTopicParameterGroup()); // Initialize database try { diff --git a/main/src/main/java/org/onap/policy/pap/main/startstop/PapCommandLineArguments.java b/main/src/main/java/org/onap/policy/pap/main/startstop/PapCommandLineArguments.java index fd728d28..c917082e 100644 --- a/main/src/main/java/org/onap/policy/pap/main/startstop/PapCommandLineArguments.java +++ b/main/src/main/java/org/onap/policy/pap/main/startstop/PapCommandLineArguments.java @@ -163,7 +163,6 @@ public class PapCommandLineArguments { */ public void validate() throws PolicyPapException { validateReadableFile("policy pap configuration", configurationFilePath); - validateReadableFile("policy pap properties", propertyFilePath); } /** |