Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 1f0136c

Browse files
tzolovtzolov
committed
Upgrade to boot2.6.x cloud2021.0.x
 Related to spring-attic/spring-cloud-dataflow-build#50 Related to spring-attic/spring-cloud-dataflow-build#51 Related to spring-attic/spring-cloud-dataflow#4757
1 parent ec16a17 commit 1f0136c

16 files changed

+280
-302
lines changed

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/AggressiveShutdownStrategyTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose;
1717

18-
import static org.mockito.Matchers.anyListOf;
18+
import static org.mockito.ArgumentMatchers.anyList;
1919
import static org.mockito.Mockito.doThrow;
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.times;
@@ -41,23 +41,23 @@ public void first_btrfs_error_should_be_caught_silently_and_retried() throws Exc
4141
doThrow(new DockerExecutionException(btrfs_message))
4242
.doNothing()
4343
.when(mockDocker)
44-
.rm(anyListOf(String.class));
44+
.rm(anyList());
4545

4646
ShutdownStrategy.AGGRESSIVE.shutdown(mockDockerCompose, mockDocker);
4747

48-
verify(mockDocker, times(2)).rm(anyListOf(String.class));
48+
verify(mockDocker, times(2)).rm(anyList());
4949
}
5050

5151
@Test
5252
public void after_two_btrfs_failures_we_should_just_log_and_continue() throws Exception {
5353
doThrow(new DockerExecutionException(btrfs_message))
5454
.doThrow(new DockerExecutionException(btrfs_message))
5555
.when(mockDocker)
56-
.rm(anyListOf(String.class));
56+
.rm(anyList());
5757

5858
ShutdownStrategy.AGGRESSIVE.shutdown(mockDockerCompose, mockDocker);
5959

60-
verify(mockDocker, times(2)).rm(anyListOf(String.class));
60+
verify(mockDocker, times(2)).rm(anyList());
6161
}
6262

6363
}

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/AggressiveShutdownWithNetworkCleanupStrategyTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose;
1717

18-
import static org.mockito.Matchers.anyListOf;
18+
import static org.mockito.ArgumentMatchers.anyList;
1919
import static org.mockito.Mockito.doThrow;
2020
import static org.mockito.Mockito.mock;
2121
import static org.mockito.Mockito.times;
@@ -41,7 +41,7 @@ public class AggressiveShutdownWithNetworkCleanupStrategyTest {
4141
public void docker_compose_down_should_be_called_despite_docker_rm_throwing_exception() throws Exception {
4242
doThrow(new DockerExecutionException(error_msg))
4343
.when(mockDocker)
44-
.rm(anyListOf(String.class));
44+
.rm(anyList());
4545

4646
ShutdownStrategy.AGGRESSIVE_WITH_NETWORK_CLEANUP.shutdown(mockDockerCompose, mockDocker);
4747

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/configuration/MockDockerEnvironment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.configuration;
1717

18-
import static org.mockito.Matchers.any;
19-
import static org.mockito.Matchers.eq;
18+
import static org.mockito.ArgumentMatchers.any;
19+
import static org.mockito.ArgumentMatchers.eq;
2020
import static org.mockito.Mockito.doReturn;
2121
import static org.mockito.Mockito.spy;
2222
import static org.mockito.Mockito.when;

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/configuration/ProjectNameTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.configuration;
1717

18+
import java.util.List;
19+
20+
import org.junit.Rule;
21+
import org.junit.Test;
22+
import org.junit.rules.ExpectedException;
23+
1824
import static org.hamcrest.MatcherAssert.assertThat;
1925
import static org.hamcrest.Matchers.contains;
2026
import static org.hamcrest.Matchers.equalTo;
2127
import static org.hamcrest.Matchers.hasSize;
2228
import static org.hamcrest.Matchers.is;
2329
import static org.hamcrest.Matchers.not;
2430

25-
import java.util.List;
26-
import org.junit.Rule;
27-
import org.junit.Test;
28-
import org.junit.rules.ExpectedException;
29-
import org.springframework.cloud.dataflow.common.test.docker.compose.configuration.ProjectName;
30-
3131
public class ProjectNameTests {
3232

3333
@Rule

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/CommandTests.java

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,26 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18-
import static org.apache.commons.io.IOUtils.toInputStream;
19-
import static org.hamcrest.MatcherAssert.assertThat;
20-
import static org.hamcrest.Matchers.contains;
21-
import static org.hamcrest.core.Is.is;
22-
import static org.mockito.Matchers.anyVararg;
23-
import static org.mockito.Mockito.verify;
24-
import static org.mockito.Mockito.verifyZeroInteractions;
25-
import static org.mockito.Mockito.when;
26-
2718
import java.io.IOException;
2819
import java.util.ArrayList;
2920
import java.util.List;
3021
import java.util.function.Consumer;
22+
3123
import org.junit.Before;
3224
import org.junit.Ignore;
3325
import org.junit.Test;
3426
import org.junit.runner.RunWith;
3527
import org.mockito.Mock;
36-
import org.mockito.runners.MockitoJUnitRunner;
37-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.Command;
38-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecutable;
39-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.ErrorHandler;
28+
import org.mockito.junit.MockitoJUnitRunner;
29+
30+
import static org.apache.commons.io.IOUtils.toInputStream;
31+
import static org.hamcrest.MatcherAssert.assertThat;
32+
import static org.hamcrest.Matchers.contains;
33+
import static org.hamcrest.core.Is.is;
34+
import static org.mockito.ArgumentMatchers.any;
35+
import static org.mockito.Mockito.verify;
36+
import static org.mockito.Mockito.verifyNoMoreInteractions;
37+
import static org.mockito.Mockito.when;
4038

4139
@RunWith(MockitoJUnitRunner.class)
4240
public class CommandTests {
@@ -49,7 +47,7 @@ public class CommandTests {
4947

5048
@Before
5149
public void before() throws IOException {
52-
when(dockerComposeExecutable.execute(anyVararg())).thenReturn(executedProcess);
50+
when(dockerComposeExecutable.execute(any())).thenReturn(executedProcess);
5351
dockerComposeCommand = new Command(dockerComposeExecutable, logConsumer);
5452

5553
givenTheUnderlyingProcessHasOutput("");
@@ -69,7 +67,7 @@ public void before() throws IOException {
6967
not_invoke_error_handler_when_exit_code_of_the_executed_process_is_0() throws IOException, InterruptedException {
7068
dockerComposeCommand.execute(errorHandler, "rm", "-f");
7169

72-
verifyZeroInteractions(errorHandler);
70+
verifyNoMoreInteractions(errorHandler);
7371
}
7472

7573
@Test public void

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/ConflictingContainerRemovingDockerComposeTests.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,22 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18-
import static org.junit.Assert.assertEquals;
19-
import static org.mockito.Matchers.anySetOf;
20-
import static org.mockito.Mockito.doThrow;
21-
import static org.mockito.Mockito.mock;
22-
import static org.mockito.Mockito.times;
23-
import static org.mockito.Mockito.verify;
24-
import static org.mockito.Mockito.verifyZeroInteractions;
25-
2618
import java.io.IOException;
2719
import java.util.Arrays;
2820
import java.util.HashSet;
2921
import java.util.Set;
22+
3023
import org.junit.Rule;
3124
import org.junit.Test;
3225
import org.junit.rules.ExpectedException;
33-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.ConflictingContainerRemovingDockerCompose;
34-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.Docker;
35-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerCompose;
36-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerExecutionException;
26+
27+
import static org.junit.Assert.assertEquals;
28+
import static org.mockito.ArgumentMatchers.anySet;
29+
import static org.mockito.Mockito.doThrow;
30+
import static org.mockito.Mockito.mock;
31+
import static org.mockito.Mockito.times;
32+
import static org.mockito.Mockito.verify;
33+
import static org.mockito.Mockito.verifyNoMoreInteractions;
3734

3835
public class ConflictingContainerRemovingDockerComposeTests {
3936
private final DockerCompose dockerCompose = mock(DockerCompose.class);
@@ -56,7 +53,7 @@ public void call_up_only_once_if_successful() throws IOException, InterruptedExc
5653
conflictingContainerRemovingDockerCompose.up();
5754

5855
verify(dockerCompose, times(1)).up();
59-
verifyZeroInteractions(docker);
56+
verifyNoMoreInteractions(docker);
6057
}
6158

6259
@Test
@@ -93,7 +90,7 @@ public void ignore_docker_execution_exceptions_in_rm() throws IOException, Inter
9390
String conflictingContainer = "conflictingContainer";
9491
doThrow(new DockerExecutionException("The name \"" + conflictingContainer + "\" is already in use")).doNothing()
9592
.when(dockerCompose).up();
96-
doThrow(DockerExecutionException.class).when(docker).rm(anySetOf(String.class));
93+
doThrow(DockerExecutionException.class).when(docker).rm(anySet());
9794

9895
ConflictingContainerRemovingDockerCompose conflictingContainerRemovingDockerCompose = new ConflictingContainerRemovingDockerCompose(
9996
dockerCompose, docker);
@@ -108,7 +105,7 @@ public void fail_on_non_docker_execution_exceptions_in_rm() throws IOException,
108105
String conflictingContainer = "conflictingContainer";
109106
doThrow(new DockerExecutionException("The name \"" + conflictingContainer + "\" is already in use")).doNothing()
110107
.when(dockerCompose).up();
111-
doThrow(RuntimeException.class).when(docker).rm(anySetOf(String.class));
108+
doThrow(RuntimeException.class).when(docker).rm(anySet());
112109

113110
exception.expect(RuntimeException.class);
114111
ConflictingContainerRemovingDockerCompose conflictingContainerRemovingDockerCompose = new ConflictingContainerRemovingDockerCompose(

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/DockerCommandLocationsTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18-
import static java.util.Optional.empty;
19-
import static org.hamcrest.MatcherAssert.assertThat;
20-
import static org.hamcrest.core.Is.is;
21-
2218
import java.io.IOException;
19+
2320
import org.junit.Before;
2421
import org.junit.Rule;
2522
import org.junit.Test;
2623
import org.junit.rules.TemporaryFolder;
27-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerCommandLocations;
24+
25+
import static java.util.Optional.empty;
26+
import static org.hamcrest.MatcherAssert.assertThat;
27+
import static org.hamcrest.core.Is.is;
2828

2929
public class DockerCommandLocationsTests {
3030
private static final String badLocation = "file/that/does/not/exist";

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/DockerComposeExecOptionTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18+
import org.junit.Test;
19+
1820
import static org.hamcrest.MatcherAssert.assertThat;
1921
import static org.hamcrest.collection.IsEmptyCollection.empty;
2022
import static org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecOption.noOptions;
2123

22-
import org.junit.Test;
23-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecOption;
24-
2524
public class DockerComposeExecOptionTests {
2625

2726
@Test public void

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/DockerComposeTests.java

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,39 +15,35 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18-
import static org.apache.commons.io.IOUtils.toInputStream;
19-
import static org.hamcrest.MatcherAssert.assertThat;
20-
import static org.hamcrest.Matchers.contains;
21-
import static org.hamcrest.core.Is.is;
22-
import static org.mockito.Matchers.anyVararg;
23-
import static org.mockito.Mockito.mock;
24-
import static org.mockito.Mockito.reset;
25-
import static org.mockito.Mockito.times;
26-
import static org.mockito.Mockito.verify;
27-
import static org.mockito.Mockito.when;
28-
import static org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecArgument.arguments;
29-
import static org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecOption.options;
30-
3118
import java.io.ByteArrayOutputStream;
3219
import java.io.IOException;
3320
import java.io.InputStream;
3421
import java.nio.charset.StandardCharsets;
3522
import java.util.List;
23+
3624
import org.junit.Before;
3725
import org.junit.Rule;
3826
import org.junit.Test;
3927
import org.junit.rules.ExpectedException;
28+
4029
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.Container;
4130
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.ContainerName;
4231
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.DockerMachine;
4332
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.DockerPort;
4433
import org.springframework.cloud.dataflow.common.test.docker.compose.connection.Ports;
45-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DefaultDockerCompose;
46-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerCompose;
47-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecutable;
48-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeRunArgument;
49-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeRunOption;
50-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerExecutionException;
34+
35+
import static org.apache.commons.io.IOUtils.toInputStream;
36+
import static org.hamcrest.MatcherAssert.assertThat;
37+
import static org.hamcrest.Matchers.contains;
38+
import static org.hamcrest.core.Is.is;
39+
import static org.mockito.ArgumentMatchers.any;
40+
import static org.mockito.Mockito.mock;
41+
import static org.mockito.Mockito.reset;
42+
import static org.mockito.Mockito.times;
43+
import static org.mockito.Mockito.verify;
44+
import static org.mockito.Mockito.when;
45+
import static org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecArgument.arguments;
46+
import static org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeExecOption.options;
5147

5248
public class DockerComposeTests {
5349

@@ -64,7 +60,7 @@ public class DockerComposeTests {
6460
@Before
6561
public void before() throws IOException {
6662
when(dockerMachine.getIp()).thenReturn("0.0.0.0");
67-
when(executor.execute(anyVararg())).thenReturn(executedProcess);
63+
when(executor.execute(any())).thenReturn(executedProcess);
6864
when(executedProcess.getInputStream()).thenReturn(toInputStream("0.0.0.0:7000->7000/tcp"));
6965
when(executedProcess.exitValue()).thenReturn(0);
7066
when(container.getContainerName()).thenReturn("my-container");

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/DockerComposeVersionTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18+
import com.github.zafarkhaja.semver.Version;
19+
import org.junit.Test;
20+
1821
import static org.hamcrest.MatcherAssert.assertThat;
1922
import static org.hamcrest.Matchers.greaterThan;
2023
import static org.hamcrest.Matchers.is;
2124
import static org.hamcrest.Matchers.lessThan;
2225

23-
import com.github.zafarkhaja.semver.Version;
24-
import org.junit.Test;
25-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerComposeVersion;
26-
2726

2827
public class DockerComposeVersionTests {
2928

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/DockerTests.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,20 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18+
import java.io.IOException;
19+
20+
import com.github.zafarkhaja.semver.Version;
21+
import org.junit.Before;
22+
import org.junit.Test;
23+
1824
import static org.apache.commons.io.IOUtils.toInputStream;
1925
import static org.hamcrest.MatcherAssert.assertThat;
2026
import static org.hamcrest.Matchers.is;
21-
import static org.mockito.Matchers.anyVararg;
27+
import static org.mockito.ArgumentMatchers.any;
2228
import static org.mockito.Mockito.mock;
2329
import static org.mockito.Mockito.verify;
2430
import static org.mockito.Mockito.when;
2531

26-
import com.github.zafarkhaja.semver.Version;
27-
import java.io.IOException;
28-
import org.junit.Before;
29-
import org.junit.Test;
30-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.Docker;
31-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerExecutable;
32-
3332
public class DockerTests {
3433

3534
private final DockerExecutable executor = mock(DockerExecutable.class);
@@ -39,7 +38,7 @@ public class DockerTests {
3938

4039
@Before
4140
public void before() throws IOException {
42-
when(executor.execute(anyVararg())).thenReturn(executedProcess);
41+
when(executor.execute(any())).thenReturn(executedProcess);
4342
when(executedProcess.exitValue()).thenReturn(0);
4443
}
4544

‎spring-cloud-dataflow-common-test-docker/src/test/java/org/springframework/cloud/dataflow/common/test/docker/compose/execution/GracefulShutdownStrategyTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
*/
1616
package org.springframework.cloud.dataflow.common.test.docker.compose.execution;
1717

18-
import static org.mockito.Mockito.inOrder;
19-
import static org.mockito.Mockito.mock;
20-
2118
import org.junit.Test;
2219
import org.mockito.InOrder;
20+
2321
import org.springframework.cloud.dataflow.common.test.docker.compose.configuration.ShutdownStrategy;
24-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.Docker;
25-
import org.springframework.cloud.dataflow.common.test.docker.compose.execution.DockerCompose;
22+
23+
import static org.mockito.Mockito.inOrder;
24+
import static org.mockito.Mockito.mock;
2625

2726
public class GracefulShutdownStrategyTests {
2827

0 commit comments

Comments
 (0)