GH-5076: Adapt to changes in spring-boot autoconfiguration

Author: fkleedorfer

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/RDF4JConfig.java

@@ -11,8 +11,6 @@
 
 package org.eclipse.rdf4j.spring;
 
-import java.lang.invoke.MethodHandles;
-
 import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.eclipse.rdf4j.common.annotation.Experimental;
 import org.eclipse.rdf4j.repository.Repository;
@@ -41,6 +39,8 @@
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import java.lang.invoke.MethodHandles;
+
 /**
  * @author Florian Kleedorfer
  * @since 4.0.0

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/operationcache/OperationCacheConfig.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.rdf4j.spring.operationcache;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -19,7 +20,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty("rdf4j.spring.operationcache.enabled")
 @EnableConfigurationProperties(OperationCacheProperties.class)
 public class OperationCacheConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/operationlog/OperationLogConfig.java

@@ -12,6 +12,7 @@
 package org.eclipse.rdf4j.spring.operationlog;
 
 import org.eclipse.rdf4j.spring.operationlog.log.OperationLog;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +22,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty(prefix = "rdf4j.spring.operationlog", name = "enabled")
 @EnableConfigurationProperties(OperationLogProperties.class)
 public class OperationLogConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/pool/PoolConfig.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.rdf4j.spring.pool;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -19,7 +20,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty(prefix = "rdf4j.spring.pool", name = "enabled")
 @EnableConfigurationProperties(PoolProperties.class)
 public class PoolConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/repository/inmemory/InMemoryRepositoryConfig.java

@@ -16,6 +16,7 @@
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
 import org.eclipse.rdf4j.sail.shacl.ShaclSail;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -26,7 +27,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(InMemoryRepositoryProperties.class)
 @ConditionalOnProperty("rdf4j.spring.repository.inmemory.enabled")
 public class InMemoryRepositoryConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/repository/remote/RemoteRepositoryConfig.java

@@ -19,6 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -29,7 +30,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(RemoteRepositoryProperties.class)
 @ConditionalOnProperty("rdf4j.spring.repository.remote.manager-url")
 public class RemoteRepositoryConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/resultcache/ResultCacheConfig.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.rdf4j.spring.resultcache;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
@@ -19,7 +20,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty("rdf4j.spring.resultcache.enabled")
 @EnableConfigurationProperties(ResultCacheProperties.class)
 public class ResultCacheConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/tx/TxConfig.java

@@ -12,6 +12,7 @@
 package org.eclipse.rdf4j.spring.tx;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -21,7 +22,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty(prefix = "rdf4j.spring.tx", name = "enabled")
 @EnableConfigurationProperties(TxProperties.class)
 public class TxConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/uuidsource/noveltychecking/NoveltyCheckingUUIDSourceConfig.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.noveltychecking;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -20,7 +21,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @ConditionalOnProperty(prefix = "rdf4j.spring.uuidsource.noveltychecking", name = "enabled")
 @EnableConfigurationProperties(NoveltyCheckingUUIDSourceProperties.class)
 public class NoveltyCheckingUUIDSourceConfig {

spring6-components/rdf4j-spring6/src/main/java/org/eclipse/rdf4j/spring/uuidsource/predictable/PredictableUUIDSourceConfig.java

@@ -11,6 +11,7 @@
 
 package org.eclipse.rdf4j.spring.uuidsource.predictable;
 
+import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -20,7 +21,7 @@
  * @author Florian Kleedorfer
  * @since 4.0.0
  */
-@Configuration
+@AutoConfiguration
 @EnableConfigurationProperties(PredictableUUIDSourceProperties.class)
 @ConditionalOnProperty(prefix = "rdf4j.spring.uuidsource.predictable", name = "enabled")
 public class PredictableUUIDSourceConfig {