spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 20:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x'

Browse Source 
Closes gh-47020
This commit is contained in:
Moritz Halbritter
2025-09-02 15:12:58 +02:00
parent 7f7d5b157f f50e779942
commit e70edced2f
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java
+2 -1
View File
@@ -29,6 +29,7 @@ import org.springframework.util.Assert;
* {@link Predicate} that matches against connection name.
*
* @author Phillip Webb
* @author Yanming Zhou
*/
class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> {
@@ -47,7 +48,7 @@ class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource
private String getActual(RunningService service) {
String label = service.labels().get("org.springframework.boot.service-connection");
return (label != null) ? asCanonicalName(label) : service.image().getName();
return asCanonicalName((label != null) ? label : service.image().getName());
}
private String asCanonicalName(String name) {
core/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
+7 -1
View File
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link ConnectionNamePredicate}.
*
* @author Phillip Webb
* @author Yanming Zhou
*/
class ConnectionNamePredicateTests {
@@ -60,11 +61,16 @@ class ConnectionNamePredicateTests {
@Test
void customDomain() {
assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/library/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/library/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis"));
assertThat(predicateOf("redis")).rejects(sourceOf("internalhost:8080/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("docker.my-company.com/library/redis:latest"));
assertThat(predicateOf("openzipkin/zipkin")).rejects(sourceOf("myhost.com:8080/zipkin"));
assertThat(predicateOf("openzipkin/zipkin")).rejects(sourceOf("myhost.com:8080/library/zipkin"));
assertThat(predicateOf("openzipkin/zipkin")).accepts(sourceOf("myhost.com:8080/openzipkin/zipkin"));
assertThat(predicateOf("postgres")).accepts(sourceOf("docker.my-company.com/postgres:latest"));
}
@Test