fix(simulator-spring-boot): indicate simulation failure with http status

citrusframework · May 12, 2024 · b22be63 · b22be63
1 parent 4e42ef3
commit b22be63
Show file tree

Hide file tree

Showing 116 changed files with 593 additions and 489 deletions.
diff --git a/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -22,7 +22,7 @@
 public class DefaultScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive();
 

diff --git a/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java
@@ -22,7 +22,7 @@
 public class GoodByeScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive()
             .payload("<GoodBye xmlns=\"http://citrusframework.org/schemas/hello\">" +

diff --git a/...-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/...-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java
@@ -24,7 +24,7 @@ public class GoodNightScenario extends AbstractSimulatorScenario {
     private static final String CORRELATION_ID = "correlationId";
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive()
             .payload("<GoodNight xmlns=\"http://citrusframework.org/schemas/hello\">" +

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/...type-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java
@@ -22,7 +22,7 @@
 public class HelloScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("Simulator: ${simulator.name}");
 
         scenario

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/...type-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java
@@ -32,7 +32,7 @@ public class GoodByeStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("GoodBye starter was executed!");
         scenario.echo("${payload}");
     }

diff --git a/...hetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/...hetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java
@@ -33,7 +33,7 @@ public class HelloStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("${greeting}");
         scenario.echo("${payload}");
     }

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/resources/application.properties b/...type-jms/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=JMS Simulator
-logging.level.org.citrusframework=INFO
 
 # Enable JMS support
 citrus.simulator.jms.enabled=true

diff --git a/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -22,7 +22,7 @@
 public class DefaultScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive();
 

diff --git a/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java
@@ -22,7 +22,7 @@
 public class GoodByeScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive()
             .payload("<mail-message xmlns=\"http://www.citrusframework.org/schema/mail/message\">" +

diff --git a/...mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/...mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java
@@ -22,7 +22,7 @@
 public class GoodNightScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive()
             .payload("<mail-message xmlns=\"http://www.citrusframework.org/schema/mail/message\">" +

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/...ype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java
@@ -22,7 +22,7 @@
 public class HelloScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("Simulator: ${simulator.name}");
 
         scenario

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/...ype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java
@@ -32,7 +32,7 @@ public class GoodByeStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("GoodBye starter was executed!");
         scenario.echo("${payload}");
     }

diff --git a/...etype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/...etype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java
@@ -33,7 +33,7 @@ public class HelloStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("${greeting}");
         scenario.echo("${payload}");
     }

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties b/...ype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=Mail Server Simulator
-logging.level.org.citrusframework=INFO
 
 # Enable Mail endpoint support
 citrus.simulator.endpoint.enabled=true

diff --git a/...e-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...e-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -24,7 +24,7 @@
 public class DefaultScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .receive();
 

diff --git a/...e-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/...e-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java
@@ -27,7 +27,7 @@
 public class GoodByeScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .http()
             .receive()

diff --git a/...rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/...rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java
@@ -29,7 +29,7 @@ public class GoodNightScenario extends AbstractSimulatorScenario {
     private static final String CORRELATION_ID = "x-correlationid";
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .http()
             .receive()

diff --git a/...ype-rest/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/...ype-rest/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java
@@ -27,7 +27,7 @@
 public class HelloScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("Simulator: ${simulator.name}");
 
         scenario

diff --git a/...ype-rest/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/...ype-rest/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java
@@ -32,7 +32,7 @@ public class GoodByeStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("GoodBye starter was executed!");
         scenario.echo("${payload}");
     }

diff --git a/...etype-rest/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/...etype-rest/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java
@@ -32,7 +32,7 @@ public class HelloStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("${greeting}");
         scenario.echo("${payload}");
     }

diff --git a/...ype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties b/...ype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=REST Simulator
-logging.level.org.citrusframework=INFO
 
 # Enable Http REST support
 citrus.simulator.rest.enabled=true

diff --git a/...-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties b/...-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=REST Petstore Simulator
-logging.level.org.citrusframework=INFO
 
 # Enable Http REST support
 citrus.simulator.rest.enabled=true

diff --git a/...ype-ws/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...ype-ws/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -22,7 +22,7 @@
 public class DefaultScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .soap()
             .sendFault()

diff --git a/...ype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/...ype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java
@@ -22,7 +22,7 @@
 public class GoodByeScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .soap()
             .receive()

diff --git a/...e-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/...e-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java
@@ -26,7 +26,7 @@
 public class GoodNightScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.correlation().start()
             .withHandler(this);
 

diff --git a/...etype-ws/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/...etype-ws/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java
@@ -22,7 +22,7 @@
 public class HelloScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .soap()
             .receive()

diff --git a/...etype-ws/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/...etype-ws/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java
@@ -32,7 +32,7 @@ public class GoodByeStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("GoodBye starter was executed!");
         scenario.echo("${payload}");
     }

diff --git a/...chetype-ws/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/...chetype-ws/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java
@@ -32,7 +32,7 @@ public class HelloStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.echo("${title} ${firstname} ${lastname} ");
         scenario.echo("${greeting}");
     }

diff --git a/...etype-ws/src/main/resources/archetype-resources/src/main/resources/application.properties b/...etype-ws/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=SOAP Simulator
-logging.level.org.citrusframework=INFO
 
 # Enable SOAP web service support
 citrus.simulator.ws.enabled=true

diff --git a/...e-wsdl/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...e-wsdl/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -22,7 +22,7 @@
 public class DefaultScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario
             .soap()
             .sendFault()

diff --git a/...ype-wsdl/src/main/resources/archetype-resources/src/main/resources/application.properties b/...ype-wsdl/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=SOAP WSDL Simulator
-logging.level.org.citrusframework=INFO
 
 # Enable SOAP web service support
 citrus.simulator.ws.enabled=true

diff --git a/...nk-service/src/main/java/org/citrusframework/simulator/sample/scenario/CalculateIban.java b/...nk-service/src/main/java/org/citrusframework/simulator/sample/scenario/CalculateIban.java
@@ -53,7 +53,7 @@ public CalculateIban(BankService bankService, QueryParameterService queryParamet
     }
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.http()
                 .receive()
                     .get()

diff --git a/...-service/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java b/...-service/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java
@@ -25,7 +25,7 @@
 public class DefaultScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.receive());
 
         scenario.$(scenario.http()

diff --git a/...ank-service/src/main/java/org/citrusframework/simulator/sample/scenario/ValidateIban.java b/...ank-service/src/main/java/org/citrusframework/simulator/sample/scenario/ValidateIban.java
@@ -52,7 +52,7 @@ public ValidateIban(BankService bankService, QueryParameterService queryParamete
     }
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.http()
                 .receive()
                     .get()

diff --git a/...-service/src/main/java/org/citrusframework/simulator/sample/starter/CalculateStarter.java b/...-service/src/main/java/org/citrusframework/simulator/sample/starter/CalculateStarter.java
@@ -53,7 +53,7 @@ public CalculateStarter(@Qualifier("simulatorHttpClientEndpoint") HttpClient cli
     }
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(echo("Sending request to Calculate-IBAN REST Service..."));
 
         scenario.$(http().client(client)

diff --git a/...k-service/src/main/java/org/citrusframework/simulator/sample/starter/ValidateStarter.java b/...k-service/src/main/java/org/citrusframework/simulator/sample/starter/ValidateStarter.java
@@ -51,7 +51,7 @@ public ValidateStarter(@Qualifier("simulatorHttpClientEndpoint") HttpClient clie
     }
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(echo("Sending request to Validate-IBAN REST Service..."));
 
         scenario.$(http().client(client)

diff --git a/simulator-samples/sample-bank-service/src/main/resources/application.properties b/simulator-samples/sample-bank-service/src/main/resources/application.properties
@@ -1,5 +1,4 @@
 info.simulator.name=Citrus Bank Simulator
-logging.level.org.citrusframework=INFO
 
 # SSL Configuration for HTTPS endpoint
 server.port=8443

diff --git a/...combined/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java b/...combined/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java
@@ -35,7 +35,7 @@ public class DefaultScenario extends AbstractSimulatorScenario {
     private static final Logger logger = LoggerFactory.getLogger(DefaultScenario.class);
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         boolean isSoap = false;
         try {
             scenario.$(scenario.receive());

diff --git a/...combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java b/...combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java
@@ -30,7 +30,7 @@
 public class GoodByeScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.receive()
                 .message()
                 .body("<GoodBye xmlns=\"http://citrusframework.org/schemas/hello\">" +

diff --git a/...mbined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java b/...mbined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java
@@ -34,7 +34,7 @@ public class GoodNightScenario extends AbstractSimulatorScenario {
     private static final String JMS_CORRELATION_ID = "x_correlationid";
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.receive()
             .message()
             .validate((message, context) -> {

diff --git a/...e-combined/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java b/...e-combined/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java
@@ -33,7 +33,7 @@
 public class HelloScenario extends AbstractSimulatorScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(echo("Simulator: ${simulator.name}"));
 
         scenario.$(scenario.receive()

diff --git a/...e-combined/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java b/...e-combined/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java
@@ -39,7 +39,7 @@ public class GoodByeStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(echo("GoodBye starter was executed!"));
         scenario.$(echo("${payload}"));
     }

diff --git a/...ple-combined/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java b/...ple-combined/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java
@@ -38,7 +38,7 @@ public class HelloStarter extends AbstractScenarioStarter {
     private TemplateService templateService;
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(echo("${greeting}"));
         scenario.$(echo("${payload}"));
     }

diff --git a/simulator-samples/sample-combined/src/main/resources/application.properties b/simulator-samples/sample-combined/src/main/resources/application.properties
@@ -1,6 +1,5 @@
 info.simulator.name=Combined REST and JMS Simulator
 
-logging.level.org.citrusframework=INFO
 
 # Enable Http REST and JMS support
 citrus.simulator.rest.enabled=true

diff --git a/...rc/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxBusyScenario.java b/...rc/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxBusyScenario.java
@@ -33,7 +33,7 @@
 public class FaxBusyScenario extends AbstractFaxScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.receive()
                 .message()
                 .validate(xpath().expression(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage"))

diff --git a/...in/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxCancelledScenario.java b/...in/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxCancelledScenario.java
@@ -33,7 +33,7 @@
 public class FaxCancelledScenario extends AbstractFaxScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.receive()
             .message()
             .validate(xpath().expression(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage"))

diff --git a/...ain/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java b/...ain/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java
@@ -34,7 +34,7 @@
 public class FaxNoAnswerScenario extends AbstractFaxScenario {
 
     @Override
-    public void run(ScenarioRunner scenario) {
+    public void runScenario(ScenarioRunner scenario) {
         scenario.$(scenario.receive()
                 .message()
                 .validate(xpath().expression(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage"))