Derive FlywayConnectionDetails from JdbcConnectionDetails

Rather than implementing factories for FlywayConnectionDetails for
each supported SQL database, we instead use a factory to takes
JdbcConnectionDetails as a source and produces
FlywayConnectionDetails.

Closes gh-35138

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/DockerComposeServiceConnectionsApplicationListener.java

@@ -65,9 +65,12 @@ class DockerComposeServiceConnectionsApplicationListener
 	private void registerConnectionDetails(BeanDefinitionRegistry registry, List<RunningService> runningServices) {
 		for (RunningService runningService : runningServices) {
 			DockerComposeConnectionSource source = new DockerComposeConnectionSource(runningService);
-			this.factories.getConnectionDetails(source, false)
-				.forEach((connectionDetailsType, connectionDetails) -> register(registry, runningService,
-						connectionDetailsType, connectionDetails));
+			this.factories.getConnectionDetails(source, false).forEach((connectionDetailsType, connectionDetails) -> {
+				register(registry, runningService, connectionDetailsType, connectionDetails);
+				this.factories.getConnectionDetails(connectionDetails, false)
+					.forEach((adaptedType, adaptedDetails) -> register(registry, runningService, adaptedType,
+							adaptedDetails));
+			});
 		}
 	}
 

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactory.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.docker.compose.service.connection.flyway;
+
+import org.springframework.boot.autoconfigure.flyway.FlywayConnectionDetails;
+import org.springframework.boot.autoconfigure.jdbc.JdbcConnectionDetails;
+import org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory;
+
+/**
+ * {@link ConnectionDetailsFactory} that produces {@link FlywayConnectionDetails} by
+ * adapting {@link JdbcConnectionDetails}.
+ *
+ * @author Andy Wilkinson
+ */
+class JdbcAdaptingFlywayConnectionDetailsFactory
+		implements ConnectionDetailsFactory<JdbcConnectionDetails, FlywayConnectionDetails> {
+
+	@Override
+	public FlywayConnectionDetails getConnectionDetails(JdbcConnectionDetails input) {
+		return new FlywayConnectionDetails() {
+
+			@Override
+			public String getUsername() {
+				return input.getUsername();
+			}
+
+			@Override
+			public String getPassword() {
+				return input.getPassword();
+			}
+
+			@Override
+			public String getJdbcUrl() {
+				return input.getJdbcUrl();
+			}
+
+			@Override
+			public String getDriverClassName() {
+				return input.getDriverClassName();
+			}
+
+		};
+	}
+
+}

spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/flyway/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Auto-configuration for docker compose Flyway service connections.
+ */
+package org.springframework.boot.docker.compose.service.connection.flyway;

spring-boot-project/spring-boot-docker-compose/src/main/resources/META-INF/spring.factories

@@ -3,10 +3,11 @@ org.springframework.context.ApplicationListener=\
 org.springframework.boot.docker.compose.lifecycle.DockerComposeListener,\
 org.springframework.boot.docker.compose.service.connection.DockerComposeServiceConnectionsApplicationListener
 
-# Connection Detail Factories
+# Connection Details Factories
 org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\
 org.springframework.boot.docker.compose.service.connection.cassandra.CassandraDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.elasticsearch.ElasticsearchDockerComposeConnectionDetailsFactory,\
+org.springframework.boot.docker.compose.service.connection.flyway.JdbcAdaptingFlywayConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mariadb.MariaDbJdbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mariadb.MariaDbR2dbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.mongo.MongoDockerComposeConnectionDetailsFactory,\
@@ -21,3 +22,4 @@ org.springframework.boot.docker.compose.service.connection.redis.RedisDockerComp
 org.springframework.boot.docker.compose.service.connection.sqlserver.SqlServerJdbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.sqlserver.SqlServerR2dbcDockerComposeConnectionDetailsFactory,\
 org.springframework.boot.docker.compose.service.connection.zipkin.ZipkinDockerComposeConnectionDetailsFactory
+

spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/flyway/JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2012-2023 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.docker.compose.service.connection.flyway;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.autoconfigure.flyway.FlywayConnectionDetails;
+import org.springframework.boot.docker.compose.service.connection.test.AbstractDockerComposeIntegrationTests;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link JdbcAdaptingFlywayConnectionDetailsFactory}.
+ *
+ * @author Andy Wilkinson
+ */
+class JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests extends AbstractDockerComposeIntegrationTests {
+
+	JdbcAdaptingFlywayConnectionDetailsFactoryIntegrationTests() {
+		super("flyway-compose.yaml");
+	}
+
+	@Test
+	void runCreatesConnectionDetails() {
+		FlywayConnectionDetails connectionDetails = run(FlywayConnectionDetails.class);
+		assertThat(connectionDetails.getUsername()).isEqualTo("myuser");
+		assertThat(connectionDetails.getPassword()).isEqualTo("secret");
+		assertThat(connectionDetails.getJdbcUrl()).startsWith("jdbc:postgresql://").endsWith("/mydatabase");
+	}
+
+}

spring-boot-project/spring-boot-docker-compose/src/test/resources/org/springframework/boot/docker/compose/service/connection/flyway/flyway-compose.yaml

@@ -0,0 +1,9 @@
+services:
+  database:
+    image: 'postgres:15.2'
+    ports:
+      - '5432'
+    environment:
+      - 'POSTGRES_USER=myuser'
+      - 'POSTGRES_DB=mydatabase'
+      - 'POSTGRES_PASSWORD=secret'