diff options
author | Gary Wu <gary.i.wu@huawei.com> | 2018-06-07 14:15:10 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-06-07 14:15:10 +0000 |
commit | 935ad375aab3c58a1ea245d2d20c49fc20941388 (patch) | |
tree | e3bc155089031f88c98a288c41fe8a13959e1fd8 /test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java | |
parent | 2805840c029892f85c6e723606fb18c9f6dd1529 (diff) | |
parent | d77cb63fe253a8f9335764aeecf971348c894728 (diff) |
Merge "Changing docker image tag" into beijing
Diffstat (limited to 'test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java')
-rw-r--r-- | test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java index 9f3d48ab3..e3a003831 100644 --- a/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java +++ b/test/mocks/pnfsimulator/src/main/java/org/onap/pnfsimulator/simulator/SimulatorFactory.java @@ -1,4 +1,4 @@ -/* +/*- * ============LICENSE_START======================================================= * org.onap.integration * ================================================================================ @@ -37,19 +37,17 @@ import org.onap.pnfsimulator.simulator.validation.ValidationException; public class SimulatorFactory { private MessageProvider messageProvider; - private ParamsValidator paramsValidator; - public SimulatorFactory(MessageProvider messageProvider, ParamsValidator paramsValidator) { + public SimulatorFactory(MessageProvider messageProvider) { this.messageProvider = messageProvider; - this.paramsValidator = paramsValidator; } public Simulator create(String vesServerUrl, String configFilePath) throws IOException, ValidationException { String configJson = FileUtils.readFileToString(new File(configFilePath), StandardCharsets.UTF_8); JSONObject configObject = new JSONObject(configJson); + ParamsValidator.forObject(configObject).validate(); - paramsValidator.validate(configObject); Duration duration = Duration.ofSeconds(parseJsonField(configObject, TEST_DURATION)); Duration interval = Duration.ofSeconds(parseJsonField(configObject, MESSAGE_INTERVAL)); JSONObject messageBody = messageProvider.createMessage(configObject); |