Fix RepositoryRestConfigurerAdapter deprecation

- Fixes #833
spring-cloud · Dec 8, 2020 · 4fa0a5f · 4fa0a5f
1 parent 961dea7
commit 4fa0a5f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/...ain/java/org/springframework/cloud/skipper/server/config/SpringDataRestConfiguration.java b/...ain/java/org/springframework/cloud/skipper/server/config/SpringDataRestConfiguration.java
@@ -15,19 +15,22 @@
  */
 package org.springframework.cloud.skipper.server.config;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
 import org.springframework.data.rest.core.mapping.RepositoryDetectionStrategy;
-import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurerAdapter;
+import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
 
 /**
  * @author Mark Pollack
+ * @author Janne Valkealahti
  */
 @Configuration
-public class SpringDataRestConfiguration extends RepositoryRestConfigurerAdapter {
+public class SpringDataRestConfiguration {
 
-	@Override
-	public void configureRepositoryRestConfiguration(RepositoryRestConfiguration config) {
-		config.setRepositoryDetectionStrategy(RepositoryDetectionStrategy.RepositoryDetectionStrategies.ANNOTATED);
+	@Bean
+	public RepositoryRestConfigurer skipperRepositoryRestConfigurer() {
+		return RepositoryRestConfigurer.withConfig(c -> {
+			c.setRepositoryDetectionStrategy(RepositoryDetectionStrategy.RepositoryDetectionStrategies.ANNOTATED);
+		});
 	}
 }
diff --git a/...d/skipper/server/local/security/support/oauth2testserver/OAuth2TestServerApplication.java b/...d/skipper/server/local/security/support/oauth2testserver/OAuth2TestServerApplication.java
@@ -62,7 +62,6 @@
 				LocalDeployerAutoConfiguration.class,
 				CloudFoundryDeployerAutoConfiguration.class,
 				KubernetesAutoConfiguration.class,
-				org.springframework.cloud.kubernetes.KubernetesAutoConfiguration.class,
 				DataSourceAutoConfiguration.class,
 				DataSourceTransactionManagerAutoConfiguration.class,
 				JmxAutoConfiguration.class,