Skip to content
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

Remove deprecated DockerComposeRule.waitingForService method #6041

Closed
wants to merge 1 commit into from
Closed

Remove deprecated DockerComposeRule.waitingForService method #6041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...va/org/springframework/cloud/dataflow/common/test/docker/junit5/DockerComposeManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public void build(String classKey, String methodKey) {
Builder<?> builder = DockerComposeRule.builder();
builder.files(DockerComposeFiles.from(locations.toArray(new String[0])));
for (String service : services) {
builder.waitingForService(service, toHaveAllPortsOpen());
builder.waitingForService(service, toHaveAllPortsOpen(), DockerComposeRule.DEFAULT_TIMEOUT);
}
builder.saveLogsTo("build/test-docker-logs/" + log + classKey + "-" + methodKey);
DockerComposeRule rule = builder.build();
Expand Down Expand Up @@ -132,7 +132,7 @@ public void build(String classKey, String methodKey) {
Builder<?> builder = DockerComposeRule.builder();
builder.files(DockerComposeFiles.from(locations.toArray(new String[0])));
for (String service : services) {
builder.waitingForService(service, toHaveAllPortsOpen());
builder.waitingForService(service, toHaveAllPortsOpen(), DockerComposeRule.DEFAULT_TIMEOUT);
}
builder.saveLogsTo("build/test-docker-logs/" + log + classKey + "-" + methodKey);
DockerComposeRule rule = builder.build();
Expand Down
5 changes: 0 additions & 5 deletions ...java/org/springframework/cloud/dataflow/common/test/docker/compose/DockerComposeRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,11 +236,6 @@ public T logCollector(LogCollector logCollector) {
return self();
}

@Deprecated
public T waitingForService(String serviceName, HealthCheck<Container> healthCheck) {
return waitingForService(serviceName, healthCheck, DEFAULT_TIMEOUT);
}

public T waitingForService(String serviceName, HealthCheck<Container> healthCheck, ReadableDuration timeout) {
ClusterHealthCheck clusterHealthCheck = serviceHealthCheck(serviceName, healthCheck);
return addClusterWait(new ClusterWait(clusterHealthCheck, timeout));
Expand Down
1 change: 1 addition & 0 deletions whats-new.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ VersionInfoProperties versionInfoProperties, SecurityStateBean securityStateBean
** stopAll
** getStepNamesForJob
* The following deprecated `Converters` have been removed from SCDF: `AbstractDateTimeConverter`, `DateToStringConverter`, and `StringToDateConverter`. Use the converters provided by Spring Batch.
* `DockerComposeRule.waitingForService(String serviceName, HealthCheck<Container> healthCheck)` has been replaced by `DockerComposeRule.waitingForService(String serviceName, HealthCheck<Container> healthCheck, ReadableDuration timeout)`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You got the "update the Whats New in the same PR" thing going... 🎉



=== Breaking Changes
Expand Down
Loading