From 33777a6093ecd40b3c359765ecc37bb37af82923 Mon Sep 17 00:00:00 2001 From: Kaveh Shamsi Date: Wed, 20 Apr 2022 17:58:41 +0200 Subject: [PATCH] configure oauth2 client args before other optional args (#280) --- .../service/registry/EurekaClientOAuth2AutoConfiguration.java | 4 ++-- .../registry/EurekaClientOAuth2AutoConfigurationTest.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfiguration.java b/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfiguration.java index a482b29c..13a4d908 100644 --- a/spring-cloud-services-service-registry-autoconfigure/src/main/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfiguration.java +++ b/spring-cloud-services-service-registry-autoconfigure/src/main/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/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java b/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java index 5c67c2bc..a250db81 100644 --- a/spring-cloud-services-service-registry-autoconfigure/src/test/java/io/pivotal/spring/cloud/service/registry/EurekaClientOAuth2AutoConfigurationTest.java +++ b/spring-cloud-services-service-registry-autoconfigure/src/test/java/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;