chore(deps): update spring-boot

includes the following dependency updates:
* spring >= 3.1
* spring-boot >= 6.2

pom.xml

@@ -24,9 +24,8 @@
 
     <lombok.version>1.18.20</lombok.version>
     <citrus.version>4.0.2</citrus.version>
-    <spring-boot.version>3.1.5</spring-boot.version>
-    <spring.version>6.0.13</spring.version>
-    <spring.ws.version>4.0.7</spring.ws.version>
+    <spring-boot.version>3.2.1</spring-boot.version>
+    <spring.version>6.1.2</spring.version>
     <testng.version>7.8.0</testng.version>
     <wsdl4j.version>1.6.3</wsdl4j.version>
     <xerces.version>2.12.2</xerces.version>

simulator-spring-boot/src/main/java/org/citrusframework/simulator/service/impl/ScenarioExecutionServiceImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,18 +29,19 @@
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;
 import java.util.Optional;
 
+import static java.lang.String.format;
 import static org.citrusframework.simulator.service.impl.TestCaseUtil.getScenarioExecutionId;
+import static org.springframework.util.CollectionUtils.isEmpty;
 
 /**
- * Service Implementation for managing {@link ScenarioExecution}.
+ * Service implementation for managing {@link ScenarioExecution}.
  */
 @Service
 @Transactional
@@ -92,10 +93,8 @@ public ScenarioExecution createAndSaveExecutionScenario(String scenarioName, @Nu
         scenarioExecution.setStartDate(timeProvider.getTimeNow());
         scenarioExecution.setStatus(ScenarioExecution.Status.RUNNING);
 
-        if (!CollectionUtils.isEmpty(scenarioParameters)) {
-            for (ScenarioParameter scenarioParameter : scenarioParameters) {
-                scenarioExecution.addScenarioParameter(scenarioParameter);
-            }
+        if (!isEmpty(scenarioParameters)) {
+            scenarioParameters.forEach(scenarioExecution::addScenarioParameter);
         }
 
         return save(scenarioExecution);
@@ -109,7 +108,7 @@ public ScenarioExecution completeScenarioExecutionSuccess(TestCase testCase) {
 
     @Override
     public ScenarioExecution completeScenarioExecutionFailure(TestCase testCase, Throwable cause) {
-        logger.warn("Request to complete ScenarioExecution for failed TestCase : {}", testCase, cause);
+        logger.warn("Request to complete ScenarioExecution for failed TestCase : {}", testCase);
         return completeScenarioExecution(ScenarioExecution.Status.FAILED, testCase, cause);
     }
 
@@ -126,7 +125,7 @@ private ScenarioExecution completeScenarioExecution(ScenarioExecution.Status sta
                 return scenarioExecution;
             })
             .map(scenarioExecutionRepository::save)
-            .orElseThrow(() -> new CitrusRuntimeException(String.format("Error while completing ScenarioExecution for test %s", testCase.getName())));
+            .orElseThrow(() -> new CitrusRuntimeException(format("Error while completing ScenarioExecution for test %s", testCase.getName())));
     }
 
     private static void writeCauseToErrorMessage(Throwable cause, ScenarioExecution scenarioExecution) {

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/MessageHeaderResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public ResponseEntity<Long> countMessageHeaders(MessageHeaderCriteria criteria)
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the messageHeader, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/message-headers/{id}")
-    public ResponseEntity<MessageHeader> getMessageHeader(@PathVariable Long id) {
+    public ResponseEntity<MessageHeader> getMessageHeader(@PathVariable("id") Long id) {
         logger.debug("REST request to get MessageHeader : {}", id);
         Optional<MessageHeader> messageHeader = messageHeaderService.findOne(id);
         return ResponseUtil.wrapOrNotFound(messageHeader);

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/MessageResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public ResponseEntity<Long> countMessages(MessageCriteria criteria) {
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the message, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/messages/{id}")
-    public ResponseEntity<Message> getMessage(@PathVariable Long id) {
+    public ResponseEntity<Message> getMessage(@PathVariable("id") Long id) {
         logger.debug("REST request to get Message : {}", id);
         Optional<Message> message = messageService.findOne(id);
         return ResponseUtil.wrapOrNotFound(message);

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/ScenarioActionResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public ResponseEntity<Long> countScenarioActions(ScenarioActionCriteria criteria
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the scenarioAction, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/scenario-actions/{id}")
-    public ResponseEntity<ScenarioAction> getScenarioAction(@PathVariable Long id) {
+    public ResponseEntity<ScenarioAction> getScenarioAction(@PathVariable("id") Long id) {
         logger.debug("REST request to get ScenarioAction : {}", id);
         Optional<ScenarioAction> scenarioAction = scenarioActionService.findOne(id);
         return ResponseUtil.wrapOrNotFound(scenarioAction);

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/ScenarioExecutionResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ public ResponseEntity<Long> countScenarioExecutions(ScenarioExecutionCriteria cr
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the scenarioExecution, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/scenario-executions/{id}")
-    public ResponseEntity<ScenarioExecution> getScenarioExecution(@PathVariable Long id) {
+    public ResponseEntity<ScenarioExecution> getScenarioExecution(@PathVariable("id") Long id) {
         logger.debug("REST request to get ScenarioExecution : {}", id);
         Optional<ScenarioExecution> scenarioExecution = scenarioExecutionService.findOne(id);
         return ResponseUtil.wrapOrNotFound(scenarioExecution);

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/ScenarioParameterResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ public ResponseEntity<Long> countScenarioParameters(ScenarioParameterCriteria cr
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the scenarioParameter, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/scenario-parameters/{id}")
-    public ResponseEntity<ScenarioParameter> getScenarioParameter(@PathVariable Long id) {
+    public ResponseEntity<ScenarioParameter> getScenarioParameter(@PathVariable("id") Long id) {
         logger.debug("REST request to get ScenarioParameter : {}", id);
         Optional<ScenarioParameter> scenarioParameter = scenarioParameterService.findOne(id);
         return ResponseUtil.wrapOrNotFound(scenarioParameter);

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/ScenarioResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/TestParameterResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -93,7 +93,7 @@ public ResponseEntity<Long> countTestParameters(TestParameterCriteria criteria)
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the testParameter, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/test-parameters/{testResultId}/{key}")
-    public ResponseEntity<TestParameter> getTestParameter(@PathVariable Long testResultId, @PathVariable String key) {
+    public ResponseEntity<TestParameter> getTestParameter(@PathVariable("testResultId") Long testResultId, @PathVariable("key") String key) {
         logger.debug("REST request to get TestParameter '{}' of TestResult: {}", key, testResultId);
         Optional<TestParameter> testParameter = testParameterService.findOne(testResultId, key);
         return ResponseUtil.wrapOrNotFound(testParameter);

simulator-spring-boot/src/main/java/org/citrusframework/simulator/web/rest/TestResultResource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2023 the original author or authors.
+ * Copyright 2023-2024 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,7 +118,7 @@ public ResponseEntity<TestResultByStatus> countTestResultsByStatus() {
      * @return the {@link ResponseEntity} with status {@code 200 (OK)} and with body the testResult, or with status {@code 404 (Not Found)}.
      */
     @GetMapping("/test-results/{id}")
-    public ResponseEntity<TestResult> getTestResult(@PathVariable Long id) {
+    public ResponseEntity<TestResult> getTestResult(@PathVariable("id") Long id) {
         logger.debug("REST request to get TestResult : {}", id);
         Optional<TestResult> testResult = testResultService.findOne(id);
         return ResponseUtil.wrapOrNotFound(testResult);