root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '3.4.x' into 3.5.x 

Closes gh-47019
This commit is contained in:
Moritz Halbritter 2025-09-02 14:53:52 +02:00
parent d785a7f26b c4af7d6c75
commit f50e779942
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicate.java
View File

@ -29,6 +29,7 @@ import org.springframework.util.Assert;
* {@link Predicate} that matches against connection name. * {@link Predicate} that matches against connection name.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Yanming Zhou
*/ */
class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> { class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> {
@ -47,7 +48,7 @@ class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource
private String getActual(RunningService service) { private String getActual(RunningService service) {
String label = service.labels().get("org.springframework.boot.service-connection"); 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) { private String asCanonicalName(String name) {

8
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/ConnectionNamePredicateTests.java
View File

@ -32,6 +32,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link ConnectionNamePredicate}. * Tests for {@link ConnectionNamePredicate}.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Yanming Zhou
*/ */
class ConnectionNamePredicateTests { class ConnectionNamePredicateTests {
@ -60,10 +61,15 @@ class ConnectionNamePredicateTests {
@Test @Test
void customDomain() { void customDomain() {
assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/library/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/library/redis"));
assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis")); assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis"));
assertThat(predicateOf("redis")).rejects(sourceOf("internalhost:8080/redis")); 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 @Test