Fix StepExecutionControllers and add AllInOneExecutionContextSerializ…

…er to support Jackson and other serialization options. Fixes spring-cloud#5557
corneil · Dec 14, 2023 · 0dff9c7 · 0dff9c7
1 parent 34f29f9
commit 0dff9c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionController.java b/...java/org/springframework/cloud/dataflow/server/controller/JobStepExecutionController.java
@@ -37,6 +37,7 @@
 import org.springframework.hateoas.server.ExposesResourceFor;
 import org.springframework.hateoas.server.mvc.RepresentationModelAssemblerSupport;
 import org.springframework.http.HttpStatus;
+import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -63,6 +64,7 @@ public class JobStepExecutionController {
 	 */
 	@Autowired
 	public JobStepExecutionController(JobServiceContainer jobServiceContainer) {
+		Assert.notNull(jobServiceContainer, "jobServiceContainer required");
         this.jobServiceContainer = jobServiceContainer;
 	}
 

diff --git a/...er/src/test/java/org/springframework/cloud/dataflow/server/db/migration/DB2SmokeTest.java b/...er/src/test/java/org/springframework/cloud/dataflow/server/db/migration/DB2SmokeTest.java
@@ -27,7 +27,7 @@
 public class DB2SmokeTest extends AbstractSmokeTest {
 	@BeforeAll
 	static void startContainer() {
-		container = new Db2Container().acceptLicense();
+		container = new Db2Container("ibmcom/db2:11.5.0.0a").acceptLicense();
 		container.start();
 	}
 }