diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index 6cd463dcdb..ffcb11de52 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -28,7 +28,6 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.cfg.AvailableSettings; import org.hibernate.dialect.DB2Dialect; -import org.hibernate.dialect.DerbyDialect; import org.hibernate.dialect.DerbyTenSevenDialect; import org.hibernate.dialect.H2Dialect; import org.hibernate.dialect.HANAColumnStoreDialect; @@ -37,7 +36,6 @@ import org.hibernate.dialect.Informix10Dialect; import org.hibernate.dialect.MySQL57Dialect; import org.hibernate.dialect.Oracle12cDialect; import org.hibernate.dialect.PostgreSQL95Dialect; -import org.hibernate.dialect.PostgreSQLDialect; import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.dialect.SybaseDialect; import org.hibernate.resource.jdbc.spi.PhysicalConnectionHandlingMode; @@ -173,7 +171,7 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { * @param database the target database * @return the Hibernate database dialect class, or {@code null} if none found */ - @SuppressWarnings("deprecation") // for Derby/PostgreSQLDialect on Hibernate 6.2 + @SuppressWarnings("deprecation") // for DerbyDialect and PostgreSQLDialect on Hibernate 6.2 @Nullable protected Class determineDatabaseDialectClass(Database database) { if (oldDialectsPresent) { // Hibernate <6.2 @@ -195,13 +193,13 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { else { // Hibernate 6.2 aligned return switch (database) { case DB2 -> DB2Dialect.class; - case DERBY -> DerbyDialect.class; + case DERBY -> org.hibernate.dialect.DerbyDialect.class; case H2 -> H2Dialect.class; case HANA -> HANAColumnStoreDialect.class; case HSQL -> HSQLDialect.class; case MYSQL -> MySQL57Dialect.class; case ORACLE -> Oracle12cDialect.class; - case POSTGRESQL -> PostgreSQLDialect.class; + case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class; case SQL_SERVER -> SQLServer2012Dialect.class; case SYBASE -> SybaseDialect.class; default -> null; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java index 1d44e77274..723173a649 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/function/server/support/RouterFunctionMapping.java @@ -29,7 +29,6 @@ import org.springframework.http.codec.ServerCodecConfigurer; import org.springframework.http.server.reactive.observation.ServerRequestObservationContext; import org.springframework.lang.Nullable; import org.springframework.util.CollectionUtils; -import org.springframework.web.filter.reactive.ServerHttpObservationFilter; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.RouterFunctions; @@ -172,7 +171,8 @@ public class RouterFunctionMapping extends AbstractHandlerMapping implements Ini PathPattern matchingPattern = (PathPattern) attributes.get(RouterFunctions.MATCHING_PATTERN_ATTRIBUTE); if (matchingPattern != null) { attributes.put(BEST_MATCHING_PATTERN_ATTRIBUTE, matchingPattern); - ServerHttpObservationFilter.findObservationContext(serverRequest.exchange()) + org.springframework.web.filter.reactive.ServerHttpObservationFilter + .findObservationContext(serverRequest.exchange()) .ifPresent(context -> context.setPathPattern(matchingPattern.toString())); ServerRequestObservationContext.findCurrent(serverRequest.exchange()) .ifPresent(context -> context.setPathPattern(matchingPattern.toString())); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java index 0d92856404..604caf088a 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/handler/AbstractUrlHandlerMapping.java @@ -31,7 +31,6 @@ import org.springframework.http.server.reactive.observation.ServerRequestObserva import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.web.filter.reactive.ServerHttpObservationFilter; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.util.pattern.PathPattern; @@ -168,7 +167,8 @@ public abstract class AbstractUrlHandlerMapping extends AbstractHandlerMapping { exchange.getAttributes().put(BEST_MATCHING_HANDLER_ATTRIBUTE, handler); exchange.getAttributes().put(BEST_MATCHING_PATTERN_ATTRIBUTE, pattern); - ServerHttpObservationFilter.findObservationContext(exchange) + org.springframework.web.filter.reactive.ServerHttpObservationFilter + .findObservationContext(exchange) .ifPresent(context -> context.setPathPattern(pattern.toString())); ServerRequestObservationContext.findCurrent(exchange) .ifPresent(context -> context.setPathPattern(pattern.toString())); diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java index 5e1be8dc62..31164f291a 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/RequestMappingInfoHandlerMapping.java @@ -40,7 +40,6 @@ import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.filter.reactive.ServerHttpObservationFilter; import org.springframework.web.method.HandlerMethod; import org.springframework.web.reactive.HandlerMapping; import org.springframework.web.reactive.result.condition.NameValueExpression; @@ -143,7 +142,8 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe exchange.getAttributes().put(BEST_MATCHING_HANDLER_ATTRIBUTE, handlerMethod); exchange.getAttributes().put(BEST_MATCHING_PATTERN_ATTRIBUTE, bestPattern); - ServerHttpObservationFilter.findObservationContext(exchange) + org.springframework.web.filter.reactive.ServerHttpObservationFilter + .findObservationContext(exchange) .ifPresent(context -> context.setPathPattern(bestPattern.toString())); ServerRequestObservationContext.findCurrent(exchange) .ifPresent(context -> context.setPathPattern(bestPattern.toString())); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java index f27974eb58..8f347d3a97 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/function/server/support/RouterFunctionMappingTests.java @@ -23,7 +23,6 @@ import reactor.test.StepVerifier; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.http.codec.ServerCodecConfigurer; import org.springframework.http.server.reactive.observation.ServerRequestObservationContext; -import org.springframework.web.filter.reactive.ServerHttpObservationFilter; import org.springframework.web.reactive.HandlerMapping; import org.springframework.web.reactive.function.server.HandlerFunction; import org.springframework.web.reactive.function.server.RouterFunction; @@ -136,7 +135,7 @@ class RouterFunctionMappingTests { PathPattern matchingPattern = exchange.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); assertThat(matchingPattern).isNotNull(); assertThat(matchingPattern.getPatternString()).isEqualTo("/match"); - assertThat(ServerHttpObservationFilter.findObservationContext(exchange)) + assertThat(org.springframework.web.filter.reactive.ServerHttpObservationFilter.findObservationContext(exchange)) .hasValueSatisfying(context -> assertThat(context.getPathPattern()).isEqualTo(matchingPattern.getPatternString())); assertThat(ServerRequestObservationContext.findCurrent(exchange)) .hasValueSatisfying(context -> assertThat(context.getPathPattern()).isEqualTo(matchingPattern.getPatternString())); @@ -152,7 +151,7 @@ class RouterFunctionMappingTests { private ServerWebExchange createExchange(String urlTemplate) { MockServerWebExchange exchange = MockServerWebExchange.from(MockServerHttpRequest.get(urlTemplate)); ServerRequestObservationContext observationContext = new ServerRequestObservationContext(exchange.getRequest(), exchange.getResponse(), exchange.getAttributes()); - exchange.getAttributes().put(ServerHttpObservationFilter.CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE, observationContext); + exchange.getAttributes().put(org.springframework.web.filter.reactive.ServerHttpObservationFilter.CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE, observationContext); exchange.getAttributes().put(ServerRequestObservationContext.CURRENT_OBSERVATION_CONTEXT_ATTRIBUTE, observationContext); return exchange; }