Skip to content

Commit f825089

Browse files
nosannosan
committed
Polish
Signed-off-by: Dmytro Nosan <[email protected]>
1 parent 338a3a2 commit f825089

File tree

2 files changed

+21
-21
lines changed
  • spring-boot-project/spring-boot-tools
    • spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling
    • spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven

2 files changed

+21
-21
lines changed

‎spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/test/java/org/springframework/boot/gradle/tasks/bundling/DockerSpecTests.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ void asDockerConfigurationWithDefaults() {
5959
DockerConfiguration dockerConfiguration = this.dockerSpec.asDockerConfiguration();
6060
assertThat(dockerConfiguration.getHost()).isNull();
6161
assertThat(dockerConfiguration.getBuilderRegistryAuthentication())
62-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
62+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
6363
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
64-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
64+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
6565
}
6666

6767
@Test
@@ -77,9 +77,9 @@ void asDockerConfigurationWithHostConfiguration() {
7777
assertThat(host.getContext()).isNull();
7878
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
7979
assertThat(dockerConfiguration.getBuilderRegistryAuthentication())
80-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
80+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
8181
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
82-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
82+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
8383
}
8484

8585
@Test
@@ -93,9 +93,9 @@ void asDockerConfigurationWithHostConfigurationNoTlsVerify() {
9393
assertThat(host.getContext()).isNull();
9494
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
9595
assertThat(this.dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication())
96-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
96+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
9797
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
98-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
98+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
9999
}
100100

101101
@Test
@@ -109,9 +109,9 @@ void asDockerConfigurationWithContextConfiguration() {
109109
assertThat(host.getCertificatePath()).isNull();
110110
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
111111
assertThat(this.dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication())
112-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
112+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
113113
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
114-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
114+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
115115
}
116116

117117
@Test
@@ -133,9 +133,9 @@ void asDockerConfigurationWithBindHostToBuilder() {
133133
assertThat(host.getCertificatePath()).isNull();
134134
assertThat(dockerConfiguration.isBindHostToBuilder()).isTrue();
135135
assertThat(this.dockerSpec.asDockerConfiguration().getBuilderRegistryAuthentication())
136-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
136+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
137137
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
138-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
138+
.isInstanceOf(getDefaultDockerRegistryAuthentication());
139139
}
140140

141141
@Test
@@ -214,7 +214,7 @@ String decoded(String value) {
214214
return new String(Base64.getDecoder().decode(value));
215215
}
216216

217-
private Class<?> getDockerRegistryConfigFileAuthenticationClass() {
217+
private Class<?> getDefaultDockerRegistryAuthentication() {
218218
return ClassUtils.resolveClassName(
219219
"org.springframework.boot.buildpack.platform.docker.configuration.DefaultDockerRegistryAuthentication",
220220
getClass().getClassLoader());

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/test/java/org/springframework/boot/maven/DockerTests.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ class DockerTests {
3939
private final ImageReference imageReference = ImageReference.of("ubuntu:22.04");
4040

4141
@Test
42-
void asDockerConfigurationWithDefaults() throws ClassNotFoundException {
42+
void asDockerConfigurationWithDefaults() {
4343
Docker docker = new Docker();
4444
DockerConfiguration dockerConfiguration = createDockerConfiguration(docker);
4545
assertThat(dockerConfiguration.getHost()).isNull();
4646
assertThat(dockerConfiguration.getBuilderRegistryAuthentication())
47-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
47+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
4848
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
49-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
49+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
5050
}
5151

5252
@Test
@@ -63,9 +63,9 @@ void asDockerConfigurationWithHostConfiguration() {
6363
assertThat(host.getContext()).isNull();
6464
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
6565
assertThat(dockerConfiguration.getBuilderRegistryAuthentication())
66-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
66+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
6767
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
68-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
68+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
6969
}
7070

7171
@Test
@@ -80,9 +80,9 @@ void asDockerConfigurationWithContextConfiguration() {
8080
assertThat(host.getCertificatePath()).isNull();
8181
assertThat(dockerConfiguration.isBindHostToBuilder()).isFalse();
8282
assertThat(dockerConfiguration.getBuilderRegistryAuthentication())
83-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
83+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
8484
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
85-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
85+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
8686
}
8787

8888
@Test
@@ -108,9 +108,9 @@ void asDockerConfigurationWithBindHostToBuilder() {
108108
assertThat(host.getCertificatePath()).isEqualTo("/tmp/ca-cert");
109109
assertThat(dockerConfiguration.isBindHostToBuilder()).isTrue();
110110
assertThat(createDockerConfiguration(docker).getBuilderRegistryAuthentication())
111-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
111+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
112112
assertThat(dockerConfiguration.getPublishRegistryAuthentication())
113-
.isInstanceOf(getDockerRegistryConfigFileAuthenticationClass());
113+
.isInstanceOf(getDefaultDockerRegistryAuthenticationClass());
114114
}
115115

116116
@Test
@@ -201,7 +201,7 @@ private DockerConfiguration createDockerConfiguration(Docker docker) {
201201

202202
}
203203

204-
private Class<?> getDockerRegistryConfigFileAuthenticationClass() {
204+
private Class<?> getDefaultDockerRegistryAuthenticationClass() {
205205
return ClassUtils.resolveClassName(
206206
"org.springframework.boot.buildpack.platform.docker.configuration.DefaultDockerRegistryAuthentication",
207207
getClass().getClassLoader());

0 commit comments

Comments
 (0)