Skip to content

Commit eab1283

Browse files
spring-buildsspring-builds
committed
Bumping versions
1 parent e1f4bfc commit eab1283

File tree

66 files changed

+672
-515
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+672
-515
lines changed

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,20 @@ public okhttp3.OkHttpClient okHttpClient(okhttp3.OkHttpClient.Builder builder, C
266266
int connectTimeout = httpClientProperties.getConnectionTimeout();
267267
boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
268268
Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
269-
List<Protocol> protocols = httpClientProperties.getOkHttp().getProtocols().stream().map(Protocol::valueOf)
270-
.collect(Collectors.toList());
269+
List<Protocol> protocols = httpClientProperties.getOkHttp()
270+
.getProtocols()
271+
.stream()
272+
.map(Protocol::valueOf)
273+
.collect(Collectors.toList());
271274
if (disableSslValidation) {
272275
disableSsl(builder);
273276
}
274277
this.okHttpClient = builder.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS)
275-
.followRedirects(followRedirects).readTimeout(readTimeout).connectionPool(connectionPool)
276-
.protocols(protocols).build();
278+
.followRedirects(followRedirects)
279+
.readTimeout(readTimeout)
280+
.connectionPool(connectionPool)
281+
.protocols(protocols)
282+
.build();
277283
return this.okHttpClient;
278284
}
279285

@@ -415,11 +421,12 @@ public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
415421
if (!ClassUtils.isPresent("feign.Feign", classLoader)) {
416422
return;
417423
}
418-
hints.reflection().registerTypes(
419-
Set.of(TypeReference.of(FeignClientFactoryBean.class),
420-
TypeReference.of(ResponseInterceptor.Chain.class), TypeReference.of(Capability.class)),
421-
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
422-
MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
424+
hints.reflection()
425+
.registerTypes(
426+
Set.of(TypeReference.of(FeignClientFactoryBean.class),
427+
TypeReference.of(ResponseInterceptor.Chain.class), TypeReference.of(Capability.class)),
428+
hint -> hint.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
429+
MemberCategory.INVOKE_DECLARED_METHODS, MemberCategory.DECLARED_FIELDS));
423430
}
424431

425432
}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,10 @@ private <T> T getFromContext(String fallbackMechanism, String feignClientName, F
108108
}
109109

110110
private FeignCircuitBreaker.Builder builder(String feignClientName, FeignCircuitBreaker.Builder builder) {
111-
return builder.circuitBreakerFactory(circuitBreakerFactory).feignClientName(feignClientName)
112-
.circuitBreakerGroupEnabled(circuitBreakerGroupEnabled)
113-
.circuitBreakerNameResolver(circuitBreakerNameResolver);
111+
return builder.circuitBreakerFactory(circuitBreakerFactory)
112+
.feignClientName(feignClientName)
113+
.circuitBreakerGroupEnabled(circuitBreakerGroupEnabled)
114+
.circuitBreakerNameResolver(circuitBreakerNameResolver);
114115
}
115116

116117
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ public <T> T getInstance(String contextName, String beanName, Class<T> type) {
7171
public FeignClientFactory withApplicationContextInitializers(Map<String, Object> applicationContextInitializers) {
7272
Map<String, ApplicationContextInitializer<GenericApplicationContext>> convertedInitializers = new HashMap<>();
7373
applicationContextInitializers.keySet()
74-
.forEach(contextId -> convertedInitializers.put(contextId,
75-
(ApplicationContextInitializer<GenericApplicationContext>) applicationContextInitializers
76-
.get(contextId)));
74+
.forEach(contextId -> convertedInitializers.put(contextId,
75+
(ApplicationContextInitializer<GenericApplicationContext>) applicationContextInitializers
76+
.get(contextId)));
7777
return new FeignClientFactory(convertedInitializers);
7878
}
7979

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

Lines changed: 53 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,10 @@ private void applyBuildCustomizers(FeignClientFactory context, Feign.Builder bui
155155
FeignBuilderCustomizer.class);
156156

157157
if (customizerMap != null) {
158-
customizerMap.values().stream().sorted(AnnotationAwareOrderComparator.INSTANCE)
159-
.forEach(feignBuilderCustomizer -> feignBuilderCustomizer.customize(builder));
158+
customizerMap.values()
159+
.stream()
160+
.sorted(AnnotationAwareOrderComparator.INSTANCE)
161+
.forEach(feignBuilderCustomizer -> feignBuilderCustomizer.customize(builder));
160162
}
161163
additionalCustomizers.forEach(customizer -> customizer.customize(builder));
162164
}
@@ -244,8 +246,10 @@ protected void configureUsingConfiguration(FeignClientFactory context, Feign.Bui
244246

245247
Map<String, Capability> capabilities = getInheritedAwareInstances(context, Capability.class);
246248
if (capabilities != null) {
247-
capabilities.values().stream().sorted(AnnotationAwareOrderComparator.INSTANCE)
248-
.forEach(builder::addCapability);
249+
capabilities.values()
250+
.stream()
251+
.sorted(AnnotationAwareOrderComparator.INSTANCE)
252+
.forEach(builder::addCapability);
249253
}
250254
}
251255

@@ -334,7 +338,7 @@ protected void configureDefaultRequestElements(FeignClientProperties.FeignClient
334338
Map<String, Collection<String>> defaultRequestHeaders = new HashMap<>();
335339
if (defaultConfig != null) {
336340
defaultConfig.getDefaultRequestHeaders()
337-
.forEach((k, v) -> defaultRequestHeaders.put(k, new ArrayList<>(v)));
341+
.forEach((k, v) -> defaultRequestHeaders.put(k, new ArrayList<>(v)));
338342
}
339343
if (clientConfig != null) {
340344
clientConfig.getDefaultRequestHeaders().forEach((k, v) -> defaultRequestHeaders.put(k, new ArrayList<>(v)));
@@ -346,11 +350,11 @@ protected void configureDefaultRequestElements(FeignClientProperties.FeignClient
346350
Map<String, Collection<String>> defaultQueryParameters = new HashMap<>();
347351
if (defaultConfig != null) {
348352
defaultConfig.getDefaultQueryParameters()
349-
.forEach((k, v) -> defaultQueryParameters.put(k, new ArrayList<>(v)));
353+
.forEach((k, v) -> defaultQueryParameters.put(k, new ArrayList<>(v)));
350354
}
351355
if (clientConfig != null) {
352356
clientConfig.getDefaultQueryParameters()
353-
.forEach((k, v) -> defaultQueryParameters.put(k, new ArrayList<>(v)));
357+
.forEach((k, v) -> defaultQueryParameters.put(k, new ArrayList<>(v)));
354358
}
355359
if (!defaultQueryParameters.isEmpty()) {
356360
addDefaultQueryParams(defaultQueryParameters, builder);
@@ -686,15 +690,48 @@ public int hashCode() {
686690

687691
@Override
688692
public String toString() {
689-
return new StringBuilder("FeignClientFactoryBean{").append("type=").append(type).append(", ").append("name='")
690-
.append(name).append("', ").append("url='").append(url).append("', ").append("path='").append(path)
691-
.append("', ").append("dismiss404=").append(dismiss404).append(", ").append("inheritParentContext=")
692-
.append(inheritParentContext).append(", ").append("applicationContext=").append(applicationContext)
693-
.append(", ").append("beanFactory=").append(beanFactory).append(", ").append("fallback=")
694-
.append(fallback).append(", ").append("fallbackFactory=").append(fallbackFactory).append("}")
695-
.append("connectTimeoutMillis=").append(connectTimeoutMillis).append("}").append("readTimeoutMillis=")
696-
.append(readTimeoutMillis).append("}").append("followRedirects=").append(followRedirects)
697-
.append("refreshableClient=").append(refreshableClient).append("}").toString();
693+
return new StringBuilder("FeignClientFactoryBean{").append("type=")
694+
.append(type)
695+
.append(", ")
696+
.append("name='")
697+
.append(name)
698+
.append("', ")
699+
.append("url='")
700+
.append(url)
701+
.append("', ")
702+
.append("path='")
703+
.append(path)
704+
.append("', ")
705+
.append("dismiss404=")
706+
.append(dismiss404)
707+
.append(", ")
708+
.append("inheritParentContext=")
709+
.append(inheritParentContext)
710+
.append(", ")
711+
.append("applicationContext=")
712+
.append(applicationContext)
713+
.append(", ")
714+
.append("beanFactory=")
715+
.append(beanFactory)
716+
.append(", ")
717+
.append("fallback=")
718+
.append(fallback)
719+
.append(", ")
720+
.append("fallbackFactory=")
721+
.append(fallbackFactory)
722+
.append("}")
723+
.append("connectTimeoutMillis=")
724+
.append(connectTimeoutMillis)
725+
.append("}")
726+
.append("readTimeoutMillis=")
727+
.append(readTimeoutMillis)
728+
.append("}")
729+
.append("followRedirects=")
730+
.append(followRedirects)
731+
.append("refreshableClient=")
732+
.append(refreshableClient)
733+
.append("}")
734+
.toString();
698735
}
699736

700737
@Override

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ class FeignClientMicrometerEnabledCondition implements Condition {
3030
@Override
3131
public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
3232
FeignClientProperties feignClientProperties = context.getBeanFactory()
33-
.getBeanProvider(FeignClientProperties.class).getIfAvailable();
33+
.getBeanProvider(FeignClientProperties.class)
34+
.getIfAvailable();
3435
if (feignClientProperties != null) {
3536
Map<String, FeignClientProperties.FeignClientConfiguration> feignClientConfigMap = feignClientProperties
36-
.getConfig();
37+
.getConfig();
3738
if (feignClientConfigMap != null) {
3839
FeignClientProperties.FeignClientConfiguration feignClientConfig = feignClientConfigMap
39-
.get(context.getEnvironment().getProperty("spring.cloud.openfeign.client.name"));
40+
.get(context.getEnvironment().getProperty("spring.cloud.openfeign.client.name"));
4041
if (feignClientConfig != null) {
4142
FeignClientProperties.MicrometerProperties micrometer = feignClientConfig.getMicrometer();
4243
if (micrometer != null && micrometer.getEnabled() != null) {

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public void registerFeignClients(AnnotationMetadata metadata, BeanDefinitionRegi
192192
Assert.isTrue(annotationMetadata.isInterface(), "@FeignClient can only be specified on an interface");
193193

194194
Map<String, Object> attributes = annotationMetadata
195-
.getAnnotationAttributes(FeignClient.class.getCanonicalName());
195+
.getAnnotationAttributes(FeignClient.class.getCanonicalName());
196196

197197
String name = getClientName(attributes);
198198
String className = annotationMetadata.getClassName();
@@ -206,8 +206,9 @@ public void registerFeignClients(AnnotationMetadata metadata, BeanDefinitionRegi
206206
private void registerFeignClient(BeanDefinitionRegistry registry, AnnotationMetadata annotationMetadata,
207207
Map<String, Object> attributes) {
208208
String className = annotationMetadata.getClassName();
209-
if (String.valueOf(false).equals(
210-
environment.getProperty("spring.cloud.openfeign.lazy-attributes-resolution", String.valueOf(false)))) {
209+
if (String.valueOf(false)
210+
.equals(environment.getProperty("spring.cloud.openfeign.lazy-attributes-resolution",
211+
String.valueOf(false)))) {
211212
eagerlyRegisterFeignClientBeanDefinition(className, attributes, registry);
212213
}
213214
else {
@@ -392,7 +393,7 @@ protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
392393

393394
protected Set<String> getBasePackages(AnnotationMetadata importingClassMetadata) {
394395
Map<String, Object> attributes = importingClassMetadata
395-
.getAnnotationAttributes(EnableFeignClients.class.getCanonicalName());
396+
.getAnnotationAttributes(EnableFeignClients.class.getCanonicalName());
396397

397398
Set<String> basePackages = new HashSet<>();
398399
for (String pkg : (String[]) attributes.get("value")) {

‎spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,12 @@ public boolean processArgument(AnnotatedParameterContext context, Annotation ann
5353
String name = cookie.value().trim();
5454
checkState(emptyToNull(name) != null, "Cookie.name() was empty on parameter %s", parameterIndex);
5555
context.setParameterName(name);
56-
String cookieExpression = data.template().headers()
57-
.getOrDefault(HttpHeaders.COOKIE, Collections.singletonList("")).stream().findFirst().orElse("");
56+
String cookieExpression = data.template()
57+
.headers()
58+
.getOrDefault(HttpHeaders.COOKIE, Collections.singletonList(""))
59+
.stream()
60+
.findFirst()
61+
.orElse("");
5862
if (cookieExpression.length() == 0) {
5963
cookieExpression = String.format("%s={%s}", name, name);
6064
}

‎spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/MatrixVariableParameterProcessor.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,11 @@ public boolean processArgument(AnnotatedParameterContext context, Annotation ann
7373
private String expandMap(Object object) {
7474
Map<String, Object> paramMap = (Map) object;
7575

76-
return paramMap.keySet().stream().filter(key -> paramMap.get(key) != null)
77-
.map(key -> ";" + key + "=" + paramMap.get(key).toString()).collect(Collectors.joining());
76+
return paramMap.keySet()
77+
.stream()
78+
.filter(key -> paramMap.get(key) != null)
79+
.map(key -> ";" + key + "=" + paramMap.get(key).toString())
80+
.collect(Collectors.joining());
7881
}
7982

8083
}

‎spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/aot/FeignChildContextInitializer.java‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registe
7070
}
7171
Set<String> contextIds = new HashSet<>(getContextIdsFromConfig());
7272
Map<String, GenericApplicationContext> childContextAotContributions = contextIds.stream()
73-
.map(contextId -> Map.entry(contextId, buildChildContext(contextId)))
74-
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
73+
.map(contextId -> Map.entry(contextId, buildChildContext(contextId)))
74+
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
7575
return new AotContribution(childContextAotContributions);
7676
}
7777

@@ -91,9 +91,11 @@ private static class AotContribution implements BeanRegistrationAotContribution
9191
private final Map<String, GenericApplicationContext> childContexts;
9292

9393
AotContribution(Map<String, GenericApplicationContext> childContexts) {
94-
this.childContexts = childContexts.entrySet().stream().filter(entry -> entry.getValue() != null)
95-
.map(entry -> Map.entry(entry.getKey(), entry.getValue()))
96-
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
94+
this.childContexts = childContexts.entrySet()
95+
.stream()
96+
.filter(entry -> entry.getValue() != null)
97+
.map(entry -> Map.entry(entry.getKey(), entry.getValue()))
98+
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
9799
}
98100

99101
@Override
@@ -103,21 +105,22 @@ public void applyTo(GenerationContext generationContext, BeanRegistrationCode be
103105
name = name.replaceAll("[-]", "_");
104106
GenerationContext childGenerationContext = generationContext.withName(name);
105107
ClassName initializerClassName = new ApplicationContextAotGenerator()
106-
.processAheadOfTime(entry.getValue(), childGenerationContext);
108+
.processAheadOfTime(entry.getValue(), childGenerationContext);
107109
return Map.entry(entry.getKey(), initializerClassName);
108110
}).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
109111
GeneratedMethod postProcessorMethod = beanRegistrationCode.getMethods()
110-
.add("addFeignChildContextInitializer", method -> {
111-
method.addJavadoc("Use AOT child context management initialization")
112-
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
113-
.addParameter(RegisteredBean.class, "registeredBean")
114-
.addParameter(FeignClientFactory.class, "instance").returns(FeignClientFactory.class)
115-
.addStatement("$T<String, Object> initializers = new $T<>()", Map.class, HashMap.class);
116-
generatedInitializerClassNames.keySet()
117-
.forEach(contextId -> method.addStatement("initializers.put($S, new $L())", contextId,
118-
generatedInitializerClassNames.get(contextId)));
119-
method.addStatement("return instance.withApplicationContextInitializers(initializers)");
120-
});
112+
.add("addFeignChildContextInitializer", method -> {
113+
method.addJavadoc("Use AOT child context management initialization")
114+
.addModifiers(Modifier.PRIVATE, Modifier.STATIC)
115+
.addParameter(RegisteredBean.class, "registeredBean")
116+
.addParameter(FeignClientFactory.class, "instance")
117+
.returns(FeignClientFactory.class)
118+
.addStatement("$T<String, Object> initializers = new $T<>()", Map.class, HashMap.class);
119+
generatedInitializerClassNames.keySet()
120+
.forEach(contextId -> method.addStatement("initializers.put($S, new $L())", contextId,
121+
generatedInitializerClassNames.get(contextId)));
122+
method.addStatement("return instance.withApplicationContextInitializers(initializers)");
123+
});
121124
beanRegistrationCode.addInstancePostProcessor(postProcessorMethod.toMethodReference());
122125
}
123126

0 commit comments

Comments
 (0)