1 files changed, 32 insertions, 20 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 046c97cad..8e16ad2ce 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * PNF-REGISTRATION-HANDLER
  * ================================================================================
- * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 NOKIA 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.
@@ -20,15 +20,7 @@
 
 package org.onap.pnfsimulator.simulator;
 
-import static java.lang.Integer.parseInt;
-import static org.onap.pnfsimulator.message.MessageConstants.MESSAGE_INTERVAL;
-import static org.onap.pnfsimulator.message.MessageConstants.TEST_DURATION;
-import static org.onap.pnfsimulator.message.MessageConstants.VES_SERVER_URL;
-
 import com.github.fge.jsonschema.core.exceptions.ProcessingException;
-import java.io.IOException;
-import java.time.Duration;
-import java.util.Optional;
 import org.json.JSONObject;
 import org.onap.pnfsimulator.message.MessageProvider;
 import org.onap.pnfsimulator.simulator.validation.JSONValidator;
@@ -36,6 +28,14 @@ import org.onap.pnfsimulator.simulator.validation.ValidationException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.time.Duration;
+
+import static java.lang.Integer.parseInt;
+import static org.onap.pnfsimulator.message.MessageConstants.MESSAGE_INTERVAL;
+import static org.onap.pnfsimulator.message.MessageConstants.TEST_DURATION;
+import static org.onap.pnfsimulator.message.MessageConstants.VES_SERVER_URL;
+
 @Service
 public class SimulatorFactory {
 
@@ -50,22 +50,34 @@ public class SimulatorFactory {
         this.validator = validator;
     }
 
-    public Simulator create(JSONObject simulatorParams, JSONObject commonEventHeaderParams,
-        Optional<JSONObject> pnfRegistrationParams, Optional<JSONObject> notificationParams)
-        throws ProcessingException, IOException, ValidationException {
+    public Simulator createSimulatorWithNotification(JSONObject simulatorParams, JSONObject commonEventHeaderParams,
+                                                     JSONObject notificationParams)
+            throws ProcessingException, IOException, ValidationException {
+        JSONObject messageBody = messageProvider
+                .createMessageWithNotification(commonEventHeaderParams, notificationParams);
+        return createSimulatorWithMessage(simulatorParams, messageBody);
+    }
+
+    public Simulator createSimulatorWithPnfRegistration(JSONObject simulatorParams, JSONObject commonEventHeaderParams,
+                                                        JSONObject pnfRegistrationParams)
+            throws ProcessingException, IOException, ValidationException {
+        JSONObject messageBody = messageProvider
+                .createMessageWithPnfRegistration(commonEventHeaderParams, pnfRegistrationParams);
+        return createSimulatorWithMessage(simulatorParams, messageBody);
+    }
+
+    private Simulator createSimulatorWithMessage(JSONObject simulatorParams, JSONObject messageBody)
+            throws ValidationException, ProcessingException, IOException {
         Duration duration = Duration.ofSeconds(parseInt(simulatorParams.getString(TEST_DURATION)));
         Duration interval = Duration.ofSeconds(parseInt(simulatorParams.getString(MESSAGE_INTERVAL)));
         String vesUrl = simulatorParams.getString(VES_SERVER_URL);
-
-        JSONObject messageBody = messageProvider
-            .createMessage(commonEventHeaderParams, pnfRegistrationParams, notificationParams);
         validator.validate(messageBody.toString(), DEFAULT_OUTPUT_SCHEMA_PATH);
 
         return Simulator.builder()
-            .withVesUrl(vesUrl)
-            .withDuration(duration)
-            .withInterval(interval)
-            .withMessageBody(messageBody)
-            .build();
+                .withVesUrl(vesUrl)
+                .withDuration(duration)
+                .withInterval(interval)
+                .withMessageBody(messageBody)
+                .build();
     }
 }
\ No newline at end of file