upgraded to release version of spring boot 4

lpandzic · lpandzic · commit 53fca2cc3c31 · 2025-11-21T08:58:04.000+01:00
diff --git a/infobip-spring-data-common/src/main/java/com/infobip/spring/data/common/PreferredConstructorDiscoverer.java b/infobip-spring-data-common/src/main/java/com/infobip/spring/data/common/PreferredConstructorDiscoverer.java
@@ -6,9 +6,9 @@
 import org.springframework.core.DefaultParameterNameDiscoverer;
 import org.springframework.core.ParameterNameDiscoverer;
 import org.springframework.data.annotation.PersistenceCreator;
+import org.springframework.data.core.TypeInformation;
 import org.springframework.data.mapping.*;
 import org.springframework.data.util.KotlinReflectionUtils;
-import org.springframework.data.util.TypeInformation;
 import org.springframework.lang.Nullable;
 
 import java.lang.reflect.Constructor;
diff --git a/infobip-spring-data-jdbc-querydsl-boot-starter/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcRepositoriesAutoConfiguration.java b/infobip-spring-data-jdbc-querydsl-boot-starter/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcRepositoriesAutoConfiguration.java
@@ -2,11 +2,11 @@
 
 import com.infobip.spring.data.common.QuerydslSqlQueryConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.data.jdbc.JdbcRepositoriesAutoConfiguration;
+import org.springframework.boot.data.jdbc.autoconfigure.DataJdbcRepositoriesAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
-@AutoConfigureBefore(JdbcRepositoriesAutoConfiguration.class)
+@AutoConfigureBefore(DataJdbcRepositoriesAutoConfiguration.class)
 @Import({QuerydslSqlQueryConfiguration.class, QuerydslJdbcRepositoryConfigExtension.class, QuerydslJdbcRepositoriesRegistrar.class})
 @Configuration
 public class QuerydslJdbcRepositoriesAutoConfiguration {
diff --git a/infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcRepositoryFactory.java b/infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcRepositoryFactory.java
@@ -79,7 +79,7 @@ protected RepositoryComposition.RepositoryFragments getRepositoryFragments(Repos
                 constructorExpression,
                 path,
                 querydslJdbcPredicateExecutor
-                                                                         );
+        );
         return fragments.append(implemented(simpleQuerydslJdbcFragment))
                         .append(implemented(querydslJdbcPredicateExecutor));
     }
@@ -89,21 +89,21 @@ private QuerydslJdbcPredicateExecutor<?> createQuerydslJdbcPredicateExecutor(Rep
                                                                                  RelationalPathBase<?> path) {
         var entity = context.getRequiredPersistentEntity(metadata.getDomainType());
         var querydsl = new Querydsl(sqlQueryFactory, entity);
-        return getTargetRepositoryViaReflection(QuerydslJdbcPredicateExecutor.class,
-                                                entity,
-                                                converter,
-                                                constructorExpression,
-                                                path,
-                                                querydsl);
+        return instantiateClass(QuerydslJdbcPredicateExecutor.class,
+                                entity,
+                                converter,
+                                constructorExpression,
+                                path,
+                                querydsl);
     }
 
     private SimpleQuerydslJdbcFragment<?> createSimpleQuerydslJdbcFragment(ConstructorExpression<?> constructor,
                                                                            RelationalPath<?> path,
                                                                            QuerydslPredicateExecutor<?> executor) {
-        return getTargetRepositoryViaReflection(SimpleQuerydslJdbcFragment.class,
-                                                executor,
-                                                sqlQueryFactory,
-                                                constructor,
-                                                path);
+        return instantiateClass(SimpleQuerydslJdbcFragment.class,
+                                executor,
+                                sqlQueryFactory,
+                                constructor,
+                                path);
     }
 }
diff --git a/infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcRepositoryFactoryBean.java b/infobip-spring-data-jdbc-querydsl/src/main/java/com/infobip/spring/data/jdbc/QuerydslJdbcRepositoryFactoryBean.java
@@ -22,7 +22,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.jdbc.core.convert.*;
-import org.springframework.data.jdbc.repository.QueryMappingConfiguration;
 import org.springframework.data.jdbc.repository.support.JdbcRepositoryFactoryBean;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.relational.core.dialect.Dialect;
@@ -42,7 +41,6 @@ public class QuerydslJdbcRepositoryFactoryBean<T extends Repository<S, ID>, S, I
     private DataAccessStrategy dataAccessStrategy;
     private QueryMappingConfiguration queryMappingConfiguration = QueryMappingConfiguration.EMPTY;
     private NamedParameterJdbcOperations operations;
-    private EntityCallbacks entityCallbacks;
     private SQLQueryFactory sqlQueryFactory;
     private Dialect dialect;
 
@@ -68,7 +66,6 @@ protected RepositoryFactorySupport doCreateRepositoryFactory() {
                                                                       operations,
                                                                       sqlQueryFactory);
         jdbcRepositoryFactory.setQueryMappingConfiguration(queryMappingConfiguration);
-        jdbcRepositoryFactory.setEntityCallbacks(entityCallbacks);
 
         return jdbcRepositoryFactory;
     }
@@ -134,6 +131,10 @@ public void afterPropertiesSet() {
             this.operations = beanFactory.getBean(NamedParameterJdbcOperations.class);
         }
 
+        if (this.queryMappingConfiguration == null) {
+            this.queryMappingConfiguration = QueryMappingConfiguration.EMPTY;
+        }
+
         if (this.dataAccessStrategy == null) {
 
             Assert.state(beanFactory != null, "If no DataAccessStrategy is set a BeanFactory must be available.");
@@ -148,18 +149,10 @@ public void afterPropertiesSet() {
                                                           var sqlParametersFactory = new SqlParametersFactory(this.mappingContext, this.converter);
                                                           var insertStrategyFactory = new InsertStrategyFactory(this.operations, this.dialect);
                                                           return new DefaultDataAccessStrategy(sqlGeneratorSource, this.mappingContext, this.converter,
-                                                                                               this.operations, sqlParametersFactory, insertStrategyFactory);
+                                                                                               this.operations, sqlParametersFactory, insertStrategyFactory, queryMappingConfiguration);
                                                       });
         }
 
-        if (this.queryMappingConfiguration == null) {
-            this.queryMappingConfiguration = QueryMappingConfiguration.EMPTY;
-        }
-
-        if (beanFactory != null) {
-            entityCallbacks = EntityCallbacks.create(beanFactory);
-        }
-
         super.afterPropertiesSet();
     }
 }
diff --git a/infobip-spring-data-jdbc-querydsl/src/test/java/com/infobip/spring/data/jdbc/TestConfiguration.java b/infobip-spring-data-jdbc-querydsl/src/test/java/com/infobip/spring/data/jdbc/TestConfiguration.java
@@ -1,7 +1,7 @@
 package com.infobip.spring.data.jdbc;
 
 import org.flywaydb.core.Flyway;
-import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
+import org.springframework.boot.flyway.autoconfigure.FlywayMigrationStrategy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/infobip-spring-data-jpa-querydsl-boot-starter/src/main/java/com/infobip/spring/data/jpa/QuerydslJpaRepositoriesAutoConfiguration.java b/infobip-spring-data-jpa-querydsl-boot-starter/src/main/java/com/infobip/spring/data/jpa/QuerydslJpaRepositoriesAutoConfiguration.java
@@ -1,12 +1,12 @@
 package com.infobip.spring.data.jpa;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration;
+import org.springframework.boot.data.jpa.autoconfigure.DataJpaRepositoriesAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Import({ExtendedQuerydslJpaConfiguration.class, QuerydslJpaRepositoryConfigExtension.class, QuerydslJpaRepositoriesRegistrar.class})
-@AutoConfigureBefore(JpaRepositoriesAutoConfiguration.class)
+@AutoConfigureBefore(DataJpaRepositoriesAutoConfiguration.class)
 @Configuration
 public class QuerydslJpaRepositoriesAutoConfiguration {
 }
diff --git a/infobip-spring-data-jpa-querydsl-boot-starter/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java b/infobip-spring-data-jpa-querydsl-boot-starter/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
@@ -1,7 +1,7 @@
 package com.infobip.spring.data.jpa;
 
 import org.flywaydb.core.Flyway;
-import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
+import org.springframework.boot.flyway.autoconfigure.FlywayMigrationStrategy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/infobip-spring-data-jpa-querydsl/src/main/java/com/infobip/spring/data/jpa/ExtendedQuerydslJpaRepositoryFactory.java b/infobip-spring-data-jpa-querydsl/src/main/java/com/infobip/spring/data/jpa/ExtendedQuerydslJpaRepositoryFactory.java
@@ -35,11 +35,11 @@ protected RepositoryComposition.RepositoryFragments getRepositoryFragments(Repos
         var fragments = super.getRepositoryFragments(metadata);
         JpaEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType());
         var path = entityPathResolver.createPath(entityInformation.getJavaType());
-        var simpleJPAQuerydslFragment = getTargetRepositoryViaReflection(SimpleQuerydslJpaFragment.class,
-                                                                         path,
-                                                                         jpaQueryFactory,
-                                                                         jpaSQLQueryFactory,
-                                                                         entityManager);
+        var simpleJPAQuerydslFragment = instantiateClass(SimpleQuerydslJpaFragment.class,
+                                                         path,
+                                                         jpaQueryFactory,
+                                                         jpaSQLQueryFactory,
+                                                         entityManager);
         var fragment = RepositoryFragment.implemented(simpleJPAQuerydslFragment);
         return fragments.append(fragment);
     }
diff --git a/infobip-spring-data-jpa-querydsl/src/main/java/com/infobip/spring/data/jpa/ExtendedQuerydslJpaRepositoryFactoryBean.java b/infobip-spring-data-jpa-querydsl/src/main/java/com/infobip/spring/data/jpa/ExtendedQuerydslJpaRepositoryFactoryBean.java
@@ -57,14 +57,6 @@ public void setEntityPathResolver(ObjectProvider<EntityPathResolver> resolver) {
         this.entityPathResolver = resolver.getIfAvailable(() -> SimpleEntityPathResolver.INSTANCE);
     }
 
-    @Autowired
-    public void setQueryMethodFactory(@Nullable JpaQueryMethodFactory factory) {
-        super.setQueryMethodFactory(factory);
-        if (factory != null) {
-            this.queryMethodFactory = factory;
-        }
-    }
-
     @Autowired
     public void setJPAQueryFactory(JPAQueryFactory jpaQueryFactory) {
         this.jpaQueryFactory = jpaQueryFactory;
diff --git a/infobip-spring-data-jpa-querydsl/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java b/infobip-spring-data-jpa-querydsl/src/test/java/com/infobip/spring/data/jpa/TestConfiguration.java
@@ -1,7 +1,7 @@
 package com.infobip.spring.data.jpa;
 
 import org.flywaydb.core.Flyway;
-import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
+import org.springframework.boot.flyway.autoconfigure.FlywayMigrationStrategy;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/infobip-spring-data-r2dbc-querydsl-boot-starter/src/main/java/com/infobip/spring/data/r2dbc/QuerydslR2dbcRepositoriesAutoConfiguration.java b/infobip-spring-data-r2dbc-querydsl-boot-starter/src/main/java/com/infobip/spring/data/r2dbc/QuerydslR2dbcRepositoriesAutoConfiguration.java
@@ -1,12 +1,12 @@
 package com.infobip.spring.data.r2dbc;
 
 import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.data.r2dbc.R2dbcRepositoriesAutoConfiguration;
+import org.springframework.boot.data.r2dbc.autoconfigure.DataR2dbcAutoConfiguration;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 @Import({R2dbcConfiguration.class, QuerydslR2dbcRepositoriesAutoConfigureRegistrar.class})
-@AutoConfigureBefore(R2dbcRepositoriesAutoConfiguration.class)
+@AutoConfigureBefore(DataR2dbcAutoConfiguration.class)
 @Configuration
 public class QuerydslR2dbcRepositoriesAutoConfiguration {
 }
diff --git a/infobip-spring-data-r2dbc-querydsl/src/main/java/com/infobip/spring/data/r2dbc/QuerydslR2dbcRepositoryFactory.java b/infobip-spring-data-r2dbc-querydsl/src/main/java/com/infobip/spring/data/r2dbc/QuerydslR2dbcRepositoryFactory.java
@@ -75,13 +75,13 @@ protected RepositoryComposition.RepositoryFragments getRepositoryFragments(Repos
 
     private RepositoryFragment<Object> createSimpleQuerydslR2dbcFragment(RelationalPath<?> path,
                                                                          ConstructorExpression<?> constructor) {
-        var simpleJPAQuerydslFragment = getTargetRepositoryViaReflection(SimpleQuerydslR2dbcFragment.class,
-                                                                         sqlQueryFactory,
-                                                                         constructor,
-                                                                         path,
-                                                                         databaseClient,
-                                                                         converter,
-                                                                         querydslParameterBinder);
+        var simpleJPAQuerydslFragment = instantiateClass(SimpleQuerydslR2dbcFragment.class,
+                                                         sqlQueryFactory,
+                                                         constructor,
+                                                         path,
+                                                         databaseClient,
+                                                         converter,
+                                                         querydslParameterBinder);
         return RepositoryFragment.implemented(simpleJPAQuerydslFragment);
     }
 
@@ -93,7 +93,7 @@ private RepositoryFragment<Object> createQuerydslJdbcPredicateExecutor(Construct
         var entity = context.getRequiredPersistentEntity(constructorExpression.getType());
 
         var querydsl = new Querydsl(sqlQueryFactory, entity);
-        var querydslJdbcPredicateExecutor = getTargetRepositoryViaReflection(
+        var querydslJdbcPredicateExecutor = instantiateClass(
                 ReactiveQuerydslR2dbcPredicateExecutor.class,
                 constructorExpression,
                 path,
diff --git a/pom.xml b/pom.xml
@@ -66,12 +66,12 @@
 
 	<properties>
 		<!-- DEPENDENCY VERSIONS -->
-		<spring-boot.version>3.5.0</spring-boot.version>
+		<spring-boot.version>4.0.0</spring-boot.version>
 		<querydsl.version>5.1.0</querydsl.version>
 
-		<infobip-testcontainers.version>4.4.4</infobip-testcontainers.version>
+		<infobip-testcontainers.version>5.0.0</infobip-testcontainers.version>
 
-		<auto-service.version>1.0.1</auto-service.version>
+		<auto-service.version>1.1.1</auto-service.version>
 
 		<!-- PLUGIN VERSIONS -->
 		<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -151,6 +151,12 @@
 			<version>${infobip-testcontainers.version}</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-flyway</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>
