configure oauth2 client args before other optional args (#280)

pivotal-cf · Apr 20, 2022 · 33777a6 · 33777a6
1 parent 3f7ee5e
commit 33777a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...in/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfiguration.java b/...in/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfiguration.java
@@ -23,7 +23,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
+import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
@@ -38,7 +38,7 @@
 @EnableConfigurationProperties(EurekaClientOAuth2Properties.class)
 @ConditionalOnClass({ EurekaClientConfig.class })
 @ConditionalOnProperty(prefix = "eureka.client.oauth2", name = { "client-id", "client-secret", "access-token-uri" })
-@AutoConfigureBefore(EurekaClientAutoConfiguration.class)
+@AutoConfigureBefore(DiscoveryClientOptionalArgsConfiguration.class)
 public class EurekaClientOAuth2AutoConfiguration {
 
 	@Bean

diff --git a/...ava/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java b/...ava/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java
@@ -15,7 +15,6 @@
  */
 package io.pivotal.spring.cloud.service.registry;
 
-import com.netflix.discovery.DiscoveryClient.DiscoveryClientOptionalArgs;
 import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
 import org.junit.Test;