New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dataflow needs to be compilable using boot 3.x #5657

Closed

cppwfs wants to merge 2 commits into spring-cloud:main-3 from cppwfs:SCDF-COMPILE-FINAL

Contributor

cppwfs commented Feb 1, 2024 •

edited

Loading

Batch removed some methods that are still required by dataflow.
- Created dataflow version of those classes so that we can implement those methods
Removed hibernate version from skipper (use boot's bom)
Updated Skipper so that it is 3.0 compliant.
Update classic docs to be restful doc 3.0 compliant
Disabled CTR, TaskLauncher, SingleStepBatch jobs for this effort. Will need be addressed when worked on.
Work to be done once merged:
- Check to see if versions are up to date in modules
- Remove versions when possible ( use boot's bom)
- Deprecations were not updated in this process. This still needs to be done.


          Added dataflow specific PageQueryProvider for missing functions

089dadb

Batch removed some methods that are still required by dataflow.
Created dataflow version of those classes so that we can implement those methods

Added hibernate version

Checkpoint for server core and server

Updated Skipper components

Update classic docs to be restful doc 3.0 compliant

cppwfs requested a review from onobc

February 1, 2024 16:59

cppwfs changed the title ~~Added dataflow specific PageQueryProvider for missing functions~~ Dataflow needs to be compilable using boot 3.x

onobc reviewed

View reviewed changes

pom.xml Show resolved Hide resolved

onobc reviewed

View reviewed changes

spring-cloud-dataflow-server-core/pom.xml Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...rc/main/java/org/springframework/cloud/dataflow/server/batch/JobRestartRuntimeException.java Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Show resolved Hide resolved

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java Outdated Show resolved Hide resolved

onobc reviewed

View reviewed changes

...n/java/org/springframework/cloud/dataflow/server/repository/DataflowSqlPagingQueryUtils.java Show resolved Hide resolved

onobc reviewed

View reviewed changes

.../main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java Show resolved Hide resolved

onobc reviewed

View reviewed changes

.../main/java/org/springframework/cloud/dataflow/server/service/impl/DefaultTaskJobService.java Show resolved Hide resolved

onobc requested changes

View reviewed changes

Contributor

onobc left a comment

@cppwfs thanks for knocking this out. All my comments are small in nature.


          Update code to resolve review comments

1ba1048

Thank you @cbono!!!!

cppwfs force-pushed the SCDF-COMPILE-FINAL branch from 4315a03 to 1ba1048 Compare

February 1, 2024 20:44

onobc reviewed

View reviewed changes

spring-cloud-dataflow-server-core/pom.xml

@@ @@ -257,6 +253,11 @@ @@
               			<artifactId>postgresql</artifactId>
               			<scope>test</scope>
               		</dependency>
+              		<dependency>

Contributor

onobc Feb 1, 2024

👍🏻

onobc reviewed

View reviewed changes

...ver-core/src/main/java/org/springframework/cloud/dataflow/server/batch/SimpleJobService.java

               		this.executionContextDao = executionContextDao;
               		this.aggregateJobQueryDao = aggregateJobQueryDao;
               		this.schemaVersionTarget = schemaVersionTarget;
-              		Assert.notNull(this.jobOperator = jobOperator, "jobOperator must not be null");
+              		Objects.requireNonNull(jobOperator, "jobOperator must not be null");
+              		this.jobOperator = jobOperator;

Contributor

onobc Feb 1, 2024

Even 1 step further yields...

this.jobOperator = Objects.requireNonNull(jobOperator, "jobOperator must not be null");

onobc approved these changes

View reviewed changes

Contributor

onobc left a comment

Thanks for the updates @cppwfs - LGTM

Contributor Author

cppwfs commented Feb 1, 2024

Made the last change that @onobc requested. Squashed, Merged here: 67d3bd1

Thanks for all the reviews and help along the way!

cppwfs closed this

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet