/*-
* ============LICENSE_START=======================================================
- * Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019-2021 Nordix Foundation.
+ * Modifications Copyright (C) 2019-2020 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.
package org.onap.policy.models.sim.pdp;
-import java.io.FileInputStream;
import java.util.Arrays;
-import java.util.Properties;
-
-
+import org.onap.policy.common.utils.cmd.CommandLineException;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.models.sim.pdp.exception.PdpSimulatorException;
+import org.onap.policy.models.sim.pdp.exception.PdpSimulatorRunTimeException;
import org.onap.policy.models.sim.pdp.parameters.PdpSimulatorParameterGroup;
import org.onap.policy.models.sim.pdp.parameters.PdpSimulatorParameterHandler;
import org.slf4j.Logger;
* @param args the command line arguments
*/
public PdpSimulatorMain(final String[] args) {
- LOGGER.info("In PdpSimulator with parameters ", Arrays.toString(args));
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("In PdpSimulator with parameters {}", Arrays.toString(args));
+ }
// Check the arguments
final PdpSimulatorCommandLineArguments arguments = new PdpSimulatorCommandLineArguments();
}
// Validate that the arguments are sane
arguments.validate();
- } catch (final PdpSimulatorException e) {
+ } catch (final PdpSimulatorRunTimeException | CommandLineException e) {
LOGGER.error(PDP_SIMULATOR_FAIL_MSG, e);
return;
}
return;
}
- // Read the properties
- final Properties topicProperties = new Properties();
- try {
- final String propFile = arguments.getFullPropertyFilePath();
- try (FileInputStream stream = new FileInputStream(propFile)) {
- topicProperties.load(stream);
- }
- } catch (final Exception e) {
- LOGGER.error(PDP_SIMULATOR_FAIL_MSG, e);
- return;
- }
-
// create the activator
- activator = new PdpSimulatorActivator(parameterGroup, topicProperties);
+ activator = new PdpSimulatorActivator(parameterGroup);
Registry.register(PdpSimulatorConstants.REG_PDP_SIMULATOR_ACTIVATOR, activator);
// Start the activator
try {
}
/**
- * The main method.
+ * The main method. Arguments are validated in the constructor thus adding the NOSONAR.
*
* @param args the arguments
*
*/
- public static void main(final String[] args) {
+ public static void main(final String[] args) { // NOSONAR
+ /*
+ * The arguments are validated by the constructor, thus sonar is disabled.
+ */
+
new PdpSimulatorMain(args);
}
}