Commit e70edce

committed

Merge branch '3.5.x'

2 parents 7f7d5b1 + f50e779 commit e70edceCopy full SHA for e70edce

File tree

-2

lines changed

core/spring-boot-docker-compose/src
- main/java/org/springframework/boot/docker/compose/service/connection
  - ConnectionNamePredicate.java
- test/java/org/springframework/boot/docker/compose/service/connection
  - ConnectionNamePredicateTests.java

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`* {@link Predicate} that matches against connection name.`
`30`	`30`	`*`
`31`	`31`	`* @author Phillip Webb`
	`32`	`+ * @author Yanming Zhou`
`32`	`33`	`*/`
`33`	`34`	`class ConnectionNamePredicate implements Predicate<DockerComposeConnectionSource> {`
`34`	`35`
`@@ -47,7 +48,7 @@ public boolean test(DockerComposeConnectionSource source) {`
`47`	`48`
`48`	`49`	`private String getActual(RunningService service) {`
`49`	`50`	`String label = service.labels().get("org.springframework.boot.service-connection");`
`50`		`- return (label != null) ? asCanonicalName(label) : service.image().getName();`
	`51`	`+ return asCanonicalName((label != null) ? label : service.image().getName());`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`private String asCanonicalName(String name) {`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`* Tests for {@link ConnectionNamePredicate}.`
`33`	`33`	`*`
`34`	`34`	`* @author Phillip Webb`
	`35`	`+ * @author Yanming Zhou`
`35`	`36`	`*/`
`36`	`37`	`class ConnectionNamePredicateTests {`
`37`	`38`
`@@ -60,11 +61,16 @@ void organization() {`
`60`	`61`
`61`	`62`	`@Test`
`62`	`63`	`void customDomain() {`
	`64`	`+ assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/redis"));`
`63`	`65`	`assertThat(predicateOf("redis")).accepts(sourceOf("internalhost:8080/library/redis"));`
	`66`	`+ assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/redis"));`
`64`	`67`	`assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com/library/redis"));`
`65`	`68`	`assertThat(predicateOf("redis")).accepts(sourceOf("myhost.com:8080/library/redis"));`
`66`		`- assertThat(predicateOf("redis")).rejects(sourceOf("internalhost:8080/redis"));`
`67`	`69`	`assertThat(predicateOf("redis")).accepts(sourceOf("docker.my-company.com/library/redis:latest"));`
	`70`	`+ assertThat(predicateOf("openzipkin/zipkin")).rejects(sourceOf("myhost.com:8080/zipkin"));`
	`71`	`+ assertThat(predicateOf("openzipkin/zipkin")).rejects(sourceOf("myhost.com:8080/library/zipkin"));`
	`72`	`+ assertThat(predicateOf("openzipkin/zipkin")).accepts(sourceOf("myhost.com:8080/openzipkin/zipkin"));`
	`73`	`+ assertThat(predicateOf("postgres")).accepts(sourceOf("docker.my-company.com/postgres:latest"));`
`68`	`74`	`}`
`69`	`75`
`70`	`76`	`@Test`

Comments

(0)