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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2024-04-04 21:31:48 -07:00
parent f7397b9557
commit 3ed77ae5f3
33 changed files with 108 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcDatabaseDialect.java
View File

@@ -16,8 +16,6 @@
package org.springframework.boot.autoconfigure.data.jdbc;
import java.util.function.Supplier;
import org.springframework.data.jdbc.core.dialect.JdbcDb2Dialect;
import org.springframework.data.jdbc.core.dialect.JdbcMySqlDialect;
import org.springframework.data.jdbc.core.dialect.JdbcPostgresDialect;
@@ -26,6 +24,7 @@ import org.springframework.data.relational.core.dialect.Dialect;
import org.springframework.data.relational.core.dialect.H2Dialect;
import org.springframework.data.relational.core.dialect.HsqlDbDialect;
import org.springframework.data.relational.core.dialect.MariaDbDialect;
import org.springframework.data.relational.core.dialect.MySqlDialect;
import org.springframework.data.relational.core.dialect.OracleDialect;
/**
@@ -34,87 +33,56 @@ import org.springframework.data.relational.core.dialect.OracleDialect;
* @author Jens Schauder
* @since 3.3.0
*/
public enum JdbcDatabaseDialect implements Supplier<Dialect> {
public enum JdbcDatabaseDialect {
/**
* Provides an instance of {@link JdbcDb2Dialect}.
*/
DB2 {
@Override
public Dialect get() {
return JdbcDb2Dialect.INSTANCE;
}
},
DB2(JdbcDb2Dialect.INSTANCE),
/**
* Provides an instance of {@link H2Dialect}.
*/
H2 {
@Override
public Dialect get() {
return H2Dialect.INSTANCE;
}
},
H2(H2Dialect.INSTANCE),
/**
* Provides an instance of {@link HsqlDbDialect}.
*/
HSQL {
@Override
public Dialect get() {
return HsqlDbDialect.INSTANCE;
}
},
HSQL(HsqlDbDialect.INSTANCE),
/**
* Provides an instance of {@link MariaDbDialect}.
*/
MARIA {
@Override
public Dialect get() {
return MariaDbDialect.INSTANCE;
}
},
MARIA(MySqlDialect.INSTANCE),
/**
* Provides an instance of {@link JdbcMySqlDialect}.
*/
MYSQL {
@Override
public Dialect get() {
return JdbcMySqlDialect.INSTANCE;
}
},
MYSQL(MySqlDialect.INSTANCE),
/**
* Provides an instance of {@link OracleDialect}.
*/
ORACLE {
@Override
public Dialect get() {
return OracleDialect.INSTANCE;
}
},
ORACLE(OracleDialect.INSTANCE),
/**
* Provides an instance of {@link JdbcPostgresDialect}.
*/
POSTGRESQL {
@Override
public Dialect get() {
return JdbcPostgresDialect.INSTANCE;
}
},
POSTGRESQL(JdbcPostgresDialect.INSTANCE),
/**
* Provides an instance of {@link JdbcSqlServerDialect}.
*/
SQL_SERVER {
@Override
public Dialect get() {
return JdbcSqlServerDialect.INSTANCE;
}
SQL_SERVER(JdbcSqlServerDialect.INSTANCE);
private final Dialect dialect;
JdbcDatabaseDialect(Dialect dialect) {
this.dialect = dialect;
}
final Dialect getDialect() {
return this.dialect;
}
}

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jdbc/JdbcRepositoriesAutoConfiguration.java
View File

@@ -148,10 +148,7 @@ public class JdbcRepositoriesAutoConfiguration {
@ConditionalOnMissingBean
public Dialect jdbcDialect(NamedParameterJdbcOperations operations) {
JdbcDatabaseDialect dialect = this.properties.getDialect();
if (dialect != null) {
return dialect.get();
}
return super.jdbcDialect(operations);
return (dialect != null) ? dialect.getDialect() : super.jdbcDialect(operations);
}
}

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/ssl/BundleContentProperty.java
View File

@@ -68,8 +68,7 @@ record BundleContentProperty(String name, String value) {
private Resource getResource() {
Assert.state(!isPemContent(), "Value contains PEM content");
ApplicationResourceLoader resourceLoader = new ApplicationResourceLoader();
return resourceLoader.getResource(this.value);
return new ApplicationResourceLoader().getResource(this.value);
}
}

1
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfigurationTests.java
View File

@@ -109,7 +109,6 @@ class GraphQlWebFluxAutoConfigurationTests {
.contentTypeCompatibleWith(MediaType.TEXT_EVENT_STREAM)
.expectBody(String.class)
.returnResult();
assertThat(result.getResponseBody()).contains("event:next",
"data:{\"data\":{\"booksOnSale\":{\"id\":\"book-1\",\"name\":\"GraphQL for beginners\",\"pageCount\":100,\"author\":\"John GraphQL\"}}}",
"event:next",