Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align SQL Server-related class names with existing precedents

Browse Source 
Closes gh-35181
This commit is contained in:
Andy Wilkinson
2023-04-26 17:54:30 +01:00
parent 1e785e81f8
commit 5e73047164
9 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/sqlserver/MsSqlServerEnvironment.java → spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerEnvironment.java
View File

@@ -26,13 +26,13 @@ import org.springframework.util.StringUtils;
*
* @author Andy Wilkinson
*/
class MsSqlServerEnvironment {
class SqlServerEnvironment {
private final String username = "SA";
private final String password;
MsSqlServerEnvironment(Map<String, String> env) {
SqlServerEnvironment(Map<String, String> env) {
this.password = extractPassword(env);
}

14
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/sqlserver/MsSqlServerJdbcDockerComposeConnectionDetailsFactory.java → spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerJdbcDockerComposeConnectionDetailsFactory.java
View File

@@ -28,34 +28,34 @@ import org.springframework.boot.docker.compose.service.connection.jdbc.JdbcUrlBu
*
* @author Andy Wilkinson
*/
class MsSqlServerJdbcDockerComposeConnectionDetailsFactory
class SqlServerJdbcDockerComposeConnectionDetailsFactory
extends DockerComposeConnectionDetailsFactory<JdbcConnectionDetails> {
protected MsSqlServerJdbcDockerComposeConnectionDetailsFactory() {
protected SqlServerJdbcDockerComposeConnectionDetailsFactory() {
super("mssql/server");
}
@Override
protected JdbcConnectionDetails getDockerComposeConnectionDetails(DockerComposeConnectionSource source) {
return new MsSqlJdbcDockerComposeConnectionDetails(source.getRunningService());
return new SqlServerJdbcDockerComposeConnectionDetails(source.getRunningService());
}
/**
* {@link JdbcConnectionDetails} backed by a {@code mssql/server}
* {@link RunningService}.
*/
static class MsSqlJdbcDockerComposeConnectionDetails extends DockerComposeConnectionDetails
static class SqlServerJdbcDockerComposeConnectionDetails extends DockerComposeConnectionDetails
implements JdbcConnectionDetails {
private static final JdbcUrlBuilder jdbcUrlBuilder = new JdbcUrlBuilder("sqlserver", 1433);
private final MsSqlServerEnvironment environment;
private final SqlServerEnvironment environment;
private final String jdbcUrl;
MsSqlJdbcDockerComposeConnectionDetails(RunningService service) {
SqlServerJdbcDockerComposeConnectionDetails(RunningService service) {
super(service);
this.environment = new MsSqlServerEnvironment(service.env());
this.environment = new SqlServerEnvironment(service.env());
this.jdbcUrl = disableEncryptionIfNecessary(jdbcUrlBuilder.build(service, ""));
}

12
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/sqlserver/MsSqlServerR2dbcDockerComposeConnectionDetailsFactory.java → spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/sqlserver/SqlServerR2dbcDockerComposeConnectionDetailsFactory.java
View File

@@ -32,22 +32,22 @@ import org.springframework.boot.docker.compose.service.connection.r2dbc.Connecti
* @author Andy Wilkinson
* @author Phillip Webb
*/
class MsSqlServerR2dbcDockerComposeConnectionDetailsFactory
class SqlServerR2dbcDockerComposeConnectionDetailsFactory
extends DockerComposeConnectionDetailsFactory<R2dbcConnectionDetails> {
MsSqlServerR2dbcDockerComposeConnectionDetailsFactory() {
SqlServerR2dbcDockerComposeConnectionDetailsFactory() {
super("mssql/server", "io.r2dbc.spi.ConnectionFactoryOptions");
}
@Override
protected R2dbcConnectionDetails getDockerComposeConnectionDetails(DockerComposeConnectionSource source) {
return new MsSqlR2dbcDockerComposeConnectionDetails(source.getRunningService());
return new SqlServerR2dbcDockerComposeConnectionDetails(source.getRunningService());
}
/**
* {@link R2dbcConnectionDetails} backed by a {@code mssql} {@link RunningService}.
*/
static class MsSqlR2dbcDockerComposeConnectionDetails extends DockerComposeConnectionDetails
static class SqlServerR2dbcDockerComposeConnectionDetails extends DockerComposeConnectionDetails
implements R2dbcConnectionDetails {
private static final ConnectionFactoryOptionsBuilder connectionFactoryOptionsBuilder = new ConnectionFactoryOptionsBuilder(
@@ -55,9 +55,9 @@ class MsSqlServerR2dbcDockerComposeConnectionDetailsFactory
private final ConnectionFactoryOptions connectionFactoryOptions;
MsSqlR2dbcDockerComposeConnectionDetails(RunningService service) {
SqlServerR2dbcDockerComposeConnectionDetails(RunningService service) {
super(service);
MsSqlServerEnvironment environment = new MsSqlServerEnvironment(service.env());
SqlServerEnvironment environment = new SqlServerEnvironment(service.env());
this.connectionFactoryOptions = connectionFactoryOptionsBuilder.build(service, "",
environment.getUsername(), environment.getPassword());
}

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

@@ -17,6 +17,6 @@ org.springframework.boot.docker.compose.service.connection.postgres.PostgresJdbc
org.springframework.boot.docker.compose.service.connection.postgres.PostgresR2dbcDockerComposeConnectionDetailsFactory,\
org.springframework.boot.docker.compose.service.connection.rabbit.RabbitDockerComposeConnectionDetailsFactory,\
org.springframework.boot.docker.compose.service.connection.redis.RedisDockerComposeConnectionDetailsFactory,\
org.springframework.boot.docker.compose.service.connection.sqlserver.MsSqlServerJdbcDockerComposeConnectionDetailsFactory,\
org.springframework.boot.docker.compose.service.connection.sqlserver.MsSqlServerR2dbcDockerComposeConnectionDetailsFactory,\
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