Fix tests.

spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsRegistrar.java

@@ -240,6 +240,7 @@ class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar, ResourceLo
 		}
 		definition.addPropertyValue("fallbackFactory", attributes.get("fallbackFactory"));
 		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_BY_TYPE);
+		definition.addPropertyValue("refreshableClient", isClientRefreshEnabled());
 		String[] qualifiers = getQualifiers(attributes);
 		if (ObjectUtils.isEmpty(qualifiers)) {
 			qualifiers = new String[] { contextId + "FeignClient" };

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/EagerInitFeignClientUsingConfigurerTests.java

@@ -0,0 +1,169 @@
+/*
+ * Copyright 2013-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.openfeign;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import feign.Capability;
+import feign.Feign;
+import feign.Logger;
+import feign.RequestInterceptor;
+import feign.micrometer.MicrometerObservationCapability;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.util.ReflectionUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author matt king
+ * @author Jonatan Ivanov
+ * @author Olga Maciaszek-Sharma
+ */
+@DirtiesContext
+@SpringBootTest(classes = EagerInitFeignClientUsingConfigurerTests.Application.class, value = {
+		"spring.cloud.openfeign.client.config.default.loggerLevel=full",
+		"spring.cloud.openfeign.client.config.default.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor",
+		"spring.cloud.openfeign.client.config.default.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor" })
+class EagerInitFeignClientUsingConfigurerTests {
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	@Autowired
+	private FeignClientFactory context;
+
+	private static final String BEAN_NAME_PREFIX = "&org.springframework.cloud.openfeign.EagerInitFeignClientUsingConfigurerTests$";
+
+	@Test
+	public void testFeignClient() {
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "TestFeignClient");
+		Feign.Builder builder = factoryBean.feign(context);
+
+		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder, "requestInterceptors");
+		assertThat(interceptors.size()).as("interceptors not set").isEqualTo(3);
+		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set").isEqualTo(Logger.Level.FULL);
+
+		List<Capability> capabilities = (List) getBuilderValue(builder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerObservationCapability.class);
+	}
+
+	private Object getBuilderValue(Feign.Builder builder, String member) {
+		Field builderField = ReflectionUtils.findField(Feign.Builder.class, member);
+		ReflectionUtils.makeAccessible(builderField);
+
+		return ReflectionUtils.getField(builderField, builder);
+	}
+
+	@Test
+	public void testNoInheritFeignClient() {
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
+		Feign.Builder builder = factoryBean.feign(context);
+
+		List<RequestInterceptor> interceptors = (List) getBuilderValue(builder, "requestInterceptors");
+		assertThat(interceptors).as("interceptors not set").isEmpty();
+		assertThat(factoryBean.isInheritParentContext()).as("is inheriting from parent configuration").isFalse();
+
+		List<Capability> capabilities = (List) getBuilderValue(builder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerObservationCapability.class);
+	}
+
+	@Test
+	public void testNoInheritFeignClient_ignoreProperties() {
+		FeignClientFactoryBean factoryBean = (FeignClientFactoryBean) applicationContext
+				.getBean(BEAN_NAME_PREFIX + "NoInheritFeignClient");
+		Feign.Builder builder = factoryBean.feign(context);
+
+		assertThat(getBuilderValue(builder, "logLevel")).as("log level not set").isEqualTo(Logger.Level.HEADERS);
+
+		List<Capability> capabilities = (List) getBuilderValue(builder, "capabilities");
+		assertThat(capabilities).hasSize(2).hasAtLeastOneElementOfType(NoOpCapability.class)
+				.hasAtLeastOneElementOfType(MicrometerObservationCapability.class);
+	}
+
+	@EnableAutoConfiguration
+	@Configuration(proxyBeanMethods = false)
+	@EnableFeignClients(clients = { TestFeignClient.class, NoInheritFeignClient.class })
+	protected static class Application {
+
+		@Bean
+		public RequestInterceptor requestInterceptor() {
+			return requestTemplate -> {
+			};
+		}
+
+		@Bean
+		public NoOpCapability noOpCapability() {
+			return new NoOpCapability();
+		}
+
+	}
+
+	public static class NoInheritConfiguration {
+
+		@Bean
+		public Logger.Level logLevel() {
+			return Logger.Level.HEADERS;
+		}
+
+		@Bean
+		public NoOpCapability noOpCapability() {
+			return new NoOpCapability();
+		}
+
+		@Bean
+		public FeignClientConfigurer feignClientConfigurer() {
+			return new FeignClientConfigurer() {
+
+				@Override
+				public boolean inheritParentConfiguration() {
+					return false;
+				}
+			};
+
+		}
+
+	}
+
+	@FeignClient("testFeignClient")
+	interface TestFeignClient {
+
+	}
+
+	@FeignClient(name = "noInheritFeignClient", configuration = NoInheritConfiguration.class)
+	interface NoInheritFeignClient {
+
+	}
+
+	private static class NoOpCapability implements Capability {
+
+	}
+
+}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignClientWithRefreshableOptionsTest.java

@@ -67,7 +67,7 @@ public class FeignClientWithRefreshableOptionsTest {
 	private FeignClientProperties clientProperties;
 
 	@Test
-	public void overridedOptionsBeanShouldBePresentInsteadOfRefreshable() {
+	public void overriddenOptionsBeanShouldBePresentInsteadOfRefreshable() {
 		OptionsTestClient.OptionsResponseForTests options = overrideOptionsClient.override();
 		assertConnectionAndReadTimeout(options, 1, 1);
 	}

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/LazyInitFeignClientUsingConfigurerTests.java

@@ -41,15 +41,17 @@ import static org.assertj.core.api.Assertions.assertThat;
 /**
  * @author matt king
  * @author Jonatan Ivanov
+ * @author Olga Maciaszek-Sharma
  */
 @DirtiesContext
-@SpringBootTest(classes = FeignClientUsingConfigurerTest.Application.class, value = {
+@SpringBootTest(classes = LazyInitFeignClientUsingConfigurerTests.Application.class, value = {
+		"spring.cloud.openfeign.lazy-attributes-resolution=true",
 		"spring.cloud.openfeign.client.config.default.loggerLevel=full",
 		"spring.cloud.openfeign.client.config.default.requestInterceptors[0]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.FooRequestInterceptor",
 		"spring.cloud.openfeign.client.config.default.requestInterceptors[1]=org.springframework.cloud.openfeign.FeignClientUsingPropertiesTests.BarRequestInterceptor" })
-class FeignClientUsingConfigurerTest {
+class LazyInitFeignClientUsingConfigurerTests {
 
-	private static final String BEAN_NAME_PREFIX = "org.springframework.cloud.openfeign.FeignClientUsingConfigurerTest$";
+	private static final String BEAN_NAME_PREFIX = "org.springframework.cloud.openfeign.LazyInitFeignClientUsingConfigurerTests$";
 
 	@Autowired
 	private ConfigurableListableBeanFactory beanFactory;

spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/circuitbreaker/AsyncCircuitBreakerTests.java

@@ -65,7 +65,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  * @author John Niang
  */
 @SpringBootTest(classes = AsyncCircuitBreakerTests.Application.class, webEnvironment = RANDOM_PORT,
-		properties = "spring.cloud.openfeign.circuitbreaker.enabled=true")
+		properties = { "spring.cloud.openfeign.circuitbreaker.enabled=true",
+				"spring.cloud.openfeign.lazy-attributes-resolution=true" })
 @AutoConfigureMockMvc
 class AsyncCircuitBreakerTests {