From 05365b79f91a6be3443561f83b926cdc9453208c Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 26 Apr 2021 15:47:19 +0200 Subject: [PATCH 01/28] Switch version to 3.1.0-SNAPSHOT. --- docs/pom.xml | 2 +- pom.xml | 2 +- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 2 +- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 69b4126e..d1233ca9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 94a70115..299a2ace 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 9b95fc63..da667efd 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 49674531..ed285e51 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -10,7 +10,7 @@ spring-cloud-openfeign-dependencies - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index 255260ed..b8c4fb13 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT .. spring-cloud-starter-openfeign From 80a7102b14a604d95ff65f3de5462ae75004957e Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 11 May 2021 15:10:09 +0200 Subject: [PATCH 02/28] Fix gh actions setup for branch. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a1fcbc58..c1b14837 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main ] + branches: [ 3.1.x ] pull_request: - branches: [ main ] + branches: [ 3.1.x ] jobs: build: From 5f9a827a4065215a5537df78ba5745288cb699aa Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Tue, 11 May 2021 15:45:00 +0200 Subject: [PATCH 03/28] Upgrade feign to 11 (#540) --- .../main/asciidoc/spring-cloud-openfeign.adoc | 8 -- .../openfeign/FeignAutoConfiguration.java | 2 - .../openfeign/support/DefaultGzipDecoder.java | 80 ------------------- .../DefaultGzipDecoderConfiguration.java | 58 -------------- ...coderTests.java => GzipDecodingTests.java} | 9 ++- .../FeignBlockingLoadBalancerClientTests.java | 16 +++- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 7 files changed, 20 insertions(+), 155 deletions(-) delete mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoder.java delete mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java rename spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/{DefaultGzipDecoderTests.java => GzipDecodingTests.java} (94%) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index b59ecfff..de867deb 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -498,14 +498,6 @@ feign.compression.request.min-request-size=2048 These properties allow you to be selective about the compressed media types and minimum request threshold length. -For http clients except OkHttpClient, default gzip decoder can be enabled to decode gzip response in UTF-8 encoding: - -[source,java] ----- -feign.compression.response.enabled=true -feign.compression.response.useGzipDecoder=true ----- - === Feign logging A logger is created for each Feign client created. By default the name of the logger is the full class name of the interface used to create the Feign client. Feign logging only responds to the `DEBUG` level. diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java index fd2dd7be..3c4de289 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java @@ -56,7 +56,6 @@ import org.springframework.cloud.commons.httpclient.ApacheHttpClientFactory; import org.springframework.cloud.commons.httpclient.OkHttpClientConnectionPoolFactory; import org.springframework.cloud.commons.httpclient.OkHttpClientFactory; import org.springframework.cloud.openfeign.security.OAuth2FeignRequestInterceptor; -import org.springframework.cloud.openfeign.support.DefaultGzipDecoderConfiguration; import org.springframework.cloud.openfeign.support.FeignEncoderProperties; import org.springframework.cloud.openfeign.support.FeignHttpClientProperties; import org.springframework.cloud.openfeign.support.PageJacksonModule; @@ -84,7 +83,6 @@ import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResour @ConditionalOnClass(Feign.class) @EnableConfigurationProperties({ FeignClientProperties.class, FeignHttpClientProperties.class, FeignEncoderProperties.class }) -@Import(DefaultGzipDecoderConfiguration.class) public class FeignAutoConfiguration { private static final Log LOG = LogFactory.getLog(FeignAutoConfiguration.class); diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoder.java deleted file mode 100644 index 896e8272..00000000 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoder.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2013-2020 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.support; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; -import java.util.Collection; -import java.util.zip.GZIPInputStream; - -import feign.FeignException; -import feign.Response; -import feign.codec.Decoder; - -import org.springframework.cloud.openfeign.encoding.HttpEncoding; - -/** - * When response is compressed as gzip, this decompresses and uses {@link SpringDecoder} - * to decode. - * - * @author Jaesik Kim - */ -public class DefaultGzipDecoder implements Decoder { - - private Decoder decoder; - - public DefaultGzipDecoder(Decoder decoder) { - this.decoder = decoder; - } - - @Override - public Object decode(final Response response, Type type) throws IOException, FeignException { - Collection encoding = response.headers().containsKey(HttpEncoding.CONTENT_ENCODING_HEADER) - ? response.headers().get(HttpEncoding.CONTENT_ENCODING_HEADER) : null; - - if (encoding != null) { - if (encoding.contains(HttpEncoding.GZIP_ENCODING)) { - String decompressedBody = decompress(response); - if (decompressedBody != null) { - Response decompressedResponse = response.toBuilder().body(decompressedBody.getBytes()).build(); - return decoder.decode(decompressedResponse, type); - } - } - } - return decoder.decode(response, type); - } - - private String decompress(Response response) throws IOException { - if (response.body() == null) { - return null; - } - try (GZIPInputStream gzipInputStream = new GZIPInputStream(response.body().asInputStream()); - BufferedReader reader = new BufferedReader( - new InputStreamReader(gzipInputStream, StandardCharsets.UTF_8))) { - String outputString = ""; - String line; - while ((line = reader.readLine()) != null) { - outputString += line; - } - return outputString; - } - } - -} diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java deleted file mode 100644 index 2d476060..00000000 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/DefaultGzipDecoderConfiguration.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright 2013-2020 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.support; - -import feign.codec.Decoder; -import feign.optionals.OptionalDecoder; - -import org.springframework.beans.factory.ObjectFactory; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.http.HttpMessageConverters; -import org.springframework.cloud.openfeign.FeignAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * Configures Default Gzip Decoder. - * - * @author Jaesik Kim - */ -@Configuration(proxyBeanMethods = false) -@ConditionalOnProperty("feign.compression.response.enabled") -// The OK HTTP client uses "transparent" compression. -// If the accept-encoding header is present, it disables transparent compression -@ConditionalOnMissingBean(type = "okhttp3.OkHttpClient") -@AutoConfigureAfter(FeignAutoConfiguration.class) -public class DefaultGzipDecoderConfiguration { - - private ObjectFactory messageConverters; - - public DefaultGzipDecoderConfiguration(ObjectFactory messageConverters) { - this.messageConverters = messageConverters; - } - - @Bean - @ConditionalOnMissingBean - @ConditionalOnProperty("feign.compression.response.useGzipDecoder") - public Decoder defaultGzipDecoder() { - return new OptionalDecoder( - new ResponseEntityDecoder(new DefaultGzipDecoder(new SpringDecoder(messageConverters)))); - } - -} diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/GzipDecodingTests.java similarity index 94% rename from spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java rename to spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/GzipDecodingTests.java index 356412be..e5accdba 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/DefaultGzipDecoderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/GzipDecodingTests.java @@ -39,15 +39,16 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Jaesik Kim + * @author Olga Maciaszek-Sharma */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = DefaultGzipDecoderTests.Application.class, +@SpringBootTest(classes = GzipDecodingTests.Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, value = { "spring.application.name=defaultGzipDecoderTests", "feign.compression.response.enabled=true", - "feign.compression.response.useGzipDecoder=true", "feign.client.config.default.loggerLevel=full", + "feign.client.config.default.loggerLevel=none", "feign.metrics.enabled=false", "logging.level.org.springframework.cloud.openfeign=DEBUG" }) @DirtiesContext -public class DefaultGzipDecoderTests extends FeignClientFactoryBean { +public class GzipDecodingTests extends FeignClientFactoryBean { @Autowired FeignContext context; @@ -55,7 +56,7 @@ public class DefaultGzipDecoderTests extends FeignClientFactoryBean { @Value("${local.server.port}") private int port = 0; - public DefaultGzipDecoderTests() { + public GzipDecodingTests() { setName("tests"); setContextId("test"); } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java index daf22e7c..468df6a1 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignBlockingLoadBalancerClientTests.java @@ -16,7 +16,9 @@ package org.springframework.cloud.openfeign.loadbalancer; +import java.io.BufferedReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URI; import java.nio.charset.StandardCharsets; import java.util.Collection; @@ -105,8 +107,7 @@ class FeignBlockingLoadBalancerClientTests { Response response = feignBlockingLoadBalancerClient.execute(request, new Request.Options()); assertThat(response.status()).isEqualTo(HttpStatus.SERVICE_UNAVAILABLE.value()); - assertThat(response.body().toString()) - .isEqualTo("Load balancer does not contain an instance for the service test"); + assertThat(read(response)).isEqualTo("Load balancer does not contain an instance for the service test"); } @Test @@ -167,6 +168,17 @@ class FeignBlockingLoadBalancerClientTests { .contains(HttpStatus.OK); } + private String read(Response response) throws IOException { + BufferedReader reader = new BufferedReader( + new InputStreamReader(response.body().asInputStream(), StandardCharsets.UTF_8)); + String outputString = ""; + String line; + while ((line = reader.readLine()) != null) { + outputString += line; + } + return outputString; + } + private Request testRequest() { return testRequest("test"); } diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index ed285e51..55d19709 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies - 10.12 + 11.2 3.8.0 2.1.2.RELEASE From ebe30c8d3c10d30559cea2579aca103437dea4b0 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Thu, 13 May 2021 14:54:10 +0200 Subject: [PATCH 04/28] Upgrade SC Build to 3.1.0-SNAPSHOT. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 299a2ace..d0f12008 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 3.0.3-SNAPSHOT + 3.1.0-SNAPSHOT From 1187c3e5b806fb2c49b341a82f86bd8cbab2faf4 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Fri, 14 May 2021 17:15:31 +0200 Subject: [PATCH 05/28] Use WebConverters for Hateoas. (#543) --- .../openfeign/FeignClientsConfiguration.java | 29 +++--- .../hateoas/FeignHalAutoConfiguration.java | 32 ++----- .../hateoas/WebConvertersCustomizer.java | 41 +++++++++ .../support/EmptyObjectProvider.java | 54 +++++++++++ .../HttpMessageConverterCustomizer.java | 33 +++++++ .../openfeign/support/SpringDecoder.java | 36 ++++++-- .../openfeign/support/SpringEncoder.java | 34 +++++-- ...FeignHalAutoConfigurationContextTests.java | 28 +++--- .../FeignHalAutoConfigurationTests.java | 90 ------------------- 9 files changed, 220 insertions(+), 157 deletions(-) create mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/WebConvertersCustomizer.java create mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/EmptyObjectProvider.java create mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/HttpMessageConverterCustomizer.java delete mode 100644 spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationTests.java diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java index eda8d607..c1e378a0 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java @@ -47,6 +47,7 @@ import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory; import org.springframework.cloud.openfeign.clientconfig.FeignClientConfigurer; import org.springframework.cloud.openfeign.support.AbstractFormWriter; import org.springframework.cloud.openfeign.support.FeignEncoderProperties; +import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer; import org.springframework.cloud.openfeign.support.PageableSpringEncoder; import org.springframework.cloud.openfeign.support.PageableSpringQueryMapEncoder; import org.springframework.cloud.openfeign.support.ResponseEntityDecoder; @@ -97,22 +98,25 @@ public class FeignClientsConfiguration { @Bean @ConditionalOnMissingBean - public Decoder feignDecoder() { - return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(this.messageConverters))); + public Decoder feignDecoder(ObjectProvider customizers) { + return new OptionalDecoder(new ResponseEntityDecoder(new SpringDecoder(messageConverters, customizers))); } @Bean @ConditionalOnMissingBean @ConditionalOnMissingClass("org.springframework.data.domain.Pageable") - public Encoder feignEncoder(ObjectProvider formWriterProvider) { - return springEncoder(formWriterProvider, encoderProperties); + public Encoder feignEncoder(ObjectProvider formWriterProvider, + ObjectProvider customizers) { + return springEncoder(formWriterProvider, encoderProperties, customizers); } @Bean @ConditionalOnClass(name = "org.springframework.data.domain.Pageable") @ConditionalOnMissingBean - public Encoder feignEncoderPageable(ObjectProvider formWriterProvider) { - PageableSpringEncoder encoder = new PageableSpringEncoder(springEncoder(formWriterProvider, encoderProperties)); + public Encoder feignEncoderPageable(ObjectProvider formWriterProvider, + ObjectProvider customizers) { + PageableSpringEncoder encoder = new PageableSpringEncoder( + springEncoder(formWriterProvider, encoderProperties, customizers)); if (springDataWebProperties != null) { encoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter()); @@ -133,13 +137,13 @@ public class FeignClientsConfiguration { @ConditionalOnMissingBean public Contract feignContract(ConversionService feignConversionService) { boolean decodeSlash = feignClientProperties == null || feignClientProperties.isDecodeSlash(); - return new SpringMvcContract(this.parameterProcessors, feignConversionService, decodeSlash); + return new SpringMvcContract(parameterProcessors, feignConversionService, decodeSlash); } @Bean public FormattingConversionService feignConversionService() { FormattingConversionService conversionService = new DefaultFormattingConversionService(); - for (FeignFormatterRegistrar feignFormatterRegistrar : this.feignFormatterRegistrars) { + for (FeignFormatterRegistrar feignFormatterRegistrar : feignFormatterRegistrars) { feignFormatterRegistrar.registerFormatters(conversionService); } return conversionService; @@ -154,7 +158,7 @@ public class FeignClientsConfiguration { @Bean @ConditionalOnMissingBean(FeignLoggerFactory.class) public FeignLoggerFactory feignLoggerFactory() { - return new DefaultFeignLoggerFactory(this.logger); + return new DefaultFeignLoggerFactory(logger); } @Bean @@ -165,14 +169,15 @@ public class FeignClientsConfiguration { } private Encoder springEncoder(ObjectProvider formWriterProvider, - FeignEncoderProperties encoderProperties) { + FeignEncoderProperties encoderProperties, ObjectProvider customizers) { AbstractFormWriter formWriter = formWriterProvider.getIfAvailable(); if (formWriter != null) { - return new SpringEncoder(new SpringPojoFormEncoder(formWriter), this.messageConverters, encoderProperties); + return new SpringEncoder(new SpringPojoFormEncoder(formWriter), messageConverters, encoderProperties, + customizers); } else { - return new SpringEncoder(new SpringFormEncoder(), this.messageConverters, encoderProperties); + return new SpringEncoder(new SpringFormEncoder(), messageConverters, encoderProperties, customizers); } } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java index e20d1f43..1a67fe1d 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfiguration.java @@ -16,26 +16,18 @@ package org.springframework.cloud.openfeign.hateoas; -import java.util.Collections; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.hateoas.RepresentationModel; -import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration; -import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter; - -import static org.springframework.hateoas.MediaTypes.HAL_JSON; +import org.springframework.hateoas.config.HateoasConfiguration; +import org.springframework.hateoas.config.WebConverters; /** * @author Hector Espert @@ -43,23 +35,15 @@ import static org.springframework.hateoas.MediaTypes.HAL_JSON; */ @Configuration(proxyBeanMethods = false) @ConditionalOnWebApplication -@ConditionalOnClass(RepresentationModel.class) +@ConditionalOnClass(WebConverters.class) @AutoConfigureAfter({ JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, - RepositoryRestMvcAutoConfiguration.class }) + RepositoryRestMvcAutoConfiguration.class, HateoasConfiguration.class }) public class FeignHalAutoConfiguration { @Bean - @ConditionalOnBean(HalMediaTypeConfiguration.class) - @ConditionalOnMissingBean - public TypeConstrainedMappingJackson2HttpMessageConverter halJacksonHttpMessageConverter( - ObjectProvider objectMapper, HalMediaTypeConfiguration halConfiguration) { - ObjectMapper mapper = objectMapper.getIfAvailable(ObjectMapper::new).copy(); - halConfiguration.configureObjectMapper(mapper); - TypeConstrainedMappingJackson2HttpMessageConverter converter = new TypeConstrainedMappingJackson2HttpMessageConverter( - RepresentationModel.class); - converter.setSupportedMediaTypes(Collections.singletonList(HAL_JSON)); - converter.setObjectMapper(mapper); - return converter; + @ConditionalOnBean(WebConverters.class) + HttpMessageConverterCustomizer webConvertersCustomizer(WebConverters webConverters) { + return new WebConvertersCustomizer(webConverters); } } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/WebConvertersCustomizer.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/WebConvertersCustomizer.java new file mode 100644 index 00000000..79909862 --- /dev/null +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/hateoas/WebConvertersCustomizer.java @@ -0,0 +1,41 @@ +/* + * Copyright 2016-2021 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.hateoas; + +import java.util.List; + +import org.springframework.cloud.openfeign.support.HttpMessageConverterCustomizer; +import org.springframework.hateoas.config.WebConverters; +import org.springframework.http.converter.HttpMessageConverter; + +/** + * @author Olga Maciaszek-Sharma + */ +public class WebConvertersCustomizer implements HttpMessageConverterCustomizer { + + private final WebConverters webConverters; + + public WebConvertersCustomizer(WebConverters webConverters) { + this.webConverters = webConverters; + } + + @Override + public void accept(List> httpMessageConverters) { + webConverters.augmentClient(httpMessageConverters); + } + +} diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/EmptyObjectProvider.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/EmptyObjectProvider.java new file mode 100644 index 00000000..35b55726 --- /dev/null +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/EmptyObjectProvider.java @@ -0,0 +1,54 @@ +/* + * Copyright 2013-2021 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.support; + +import java.util.function.Consumer; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.ObjectProvider; + +/** + * @author Olga Maciaszek-Sharma + */ +class EmptyObjectProvider implements ObjectProvider { + + @Override + public T getObject(Object... args) throws BeansException { + return null; + } + + @Override + public T getIfAvailable() throws BeansException { + return null; + } + + @Override + public T getIfUnique() throws BeansException { + return null; + } + + @Override + public T getObject() throws BeansException { + return null; + } + + @Override + public void forEach(Consumer action) { + // do nothing + } + +} diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/HttpMessageConverterCustomizer.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/HttpMessageConverterCustomizer.java new file mode 100644 index 00000000..f204637e --- /dev/null +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/HttpMessageConverterCustomizer.java @@ -0,0 +1,33 @@ +/* + * Copyright 2016-2021 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.support; + +import java.util.List; +import java.util.function.Consumer; + +import org.springframework.http.converter.HttpMessageConverter; + +/** + * Allows customising {@link HttpMessageConverter} objects passed via {@link Consumer} + * parameter. + * + * @author Olga Maciaszek-Sharma + * @since 3.1.0 + */ +public interface HttpMessageConverterCustomizer extends Consumer>> { + +} diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java index 41aa94b4..b4ecd810 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringDecoder.java @@ -21,6 +21,7 @@ import java.io.InputStream; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.WildcardType; +import java.util.List; import feign.FeignException; import feign.Response; @@ -28,31 +29,48 @@ import feign.codec.DecodeException; import feign.codec.Decoder; import org.springframework.beans.factory.ObjectFactory; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpResponse; +import org.springframework.http.converter.HttpMessageConverter; import org.springframework.web.client.HttpMessageConverterExtractor; import static org.springframework.cloud.openfeign.support.FeignUtils.getHttpHeaders; /** * @author Spencer Gibb + * @author Olga Maciaszek-Sharma */ public class SpringDecoder implements Decoder { - private ObjectFactory messageConverters; + private final ObjectFactory messageConverters; + private final ObjectProvider customizers; + + /** + * @deprecated in favour of + * {@link SpringDecoder#SpringDecoder(ObjectFactory, ObjectProvider)} + */ + @Deprecated public SpringDecoder(ObjectFactory messageConverters) { + this(messageConverters, new EmptyObjectProvider<>()); + } + + public SpringDecoder(ObjectFactory messageConverters, + ObjectProvider customizers) { this.messageConverters = messageConverters; + this.customizers = customizers; } @Override public Object decode(final Response response, Type type) throws IOException, FeignException { if (type instanceof Class || type instanceof ParameterizedType || type instanceof WildcardType) { + List> converters = messageConverters.getObject().getConverters(); + customizers.forEach(customizer -> customizer.accept(converters)); @SuppressWarnings({ "unchecked", "rawtypes" }) - HttpMessageConverterExtractor extractor = new HttpMessageConverterExtractor(type, - this.messageConverters.getObject().getConverters()); + HttpMessageConverterExtractor extractor = new HttpMessageConverterExtractor(type, converters); return extractor.extractData(new FeignResponseAdapter(response)); } @@ -70,23 +88,23 @@ public class SpringDecoder implements Decoder { @Override public HttpStatus getStatusCode() throws IOException { - return HttpStatus.valueOf(this.response.status()); + return HttpStatus.valueOf(response.status()); } @Override public int getRawStatusCode() throws IOException { - return this.response.status(); + return response.status(); } @Override public String getStatusText() throws IOException { - return this.response.reason(); + return response.reason(); } @Override public void close() { try { - this.response.body().close(); + response.body().close(); } catch (IOException ex) { // Ignore exception on close... @@ -95,12 +113,12 @@ public class SpringDecoder implements Decoder { @Override public InputStream getBody() throws IOException { - return this.response.body().asInputStream(); + return response.body().asInputStream(); } @Override public HttpHeaders getHeaders() { - return getHttpHeaders(this.response.headers()); + return getHttpHeaders(response.headers()); } } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java index 5cfd6011..1eff6374 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringEncoder.java @@ -24,6 +24,7 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.stream.Stream; import feign.RequestTemplate; @@ -34,6 +35,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.ObjectFactory; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.http.HttpMessageConverters; import org.springframework.cloud.openfeign.encoding.HttpEncoding; import org.springframework.http.HttpHeaders; @@ -68,19 +70,37 @@ public class SpringEncoder implements Encoder { private final FeignEncoderProperties encoderProperties; + private final ObjectProvider customizers; + public SpringEncoder(ObjectFactory messageConverters) { this(new SpringFormEncoder(), messageConverters); } + /** + * @deprecated in favour of + * {@link SpringEncoder#SpringEncoder(SpringFormEncoder, ObjectFactory, FeignEncoderProperties, ObjectProvider)} + */ + @Deprecated public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory messageConverters) { this(springFormEncoder, messageConverters, new FeignEncoderProperties()); } + /** + * @deprecated in favour of + * {@link SpringEncoder#SpringEncoder(SpringFormEncoder, ObjectFactory, FeignEncoderProperties, ObjectProvider)} + */ + @Deprecated public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory messageConverters, FeignEncoderProperties encoderProperties) { + this(springFormEncoder, messageConverters, encoderProperties, new EmptyObjectProvider<>()); + } + + public SpringEncoder(SpringFormEncoder springFormEncoder, ObjectFactory messageConverters, + FeignEncoderProperties encoderProperties, ObjectProvider customizers) { this.springFormEncoder = springFormEncoder; this.messageConverters = messageConverters; this.encoderProperties = encoderProperties; + this.customizers = customizers; } @Override @@ -96,7 +116,7 @@ public class SpringEncoder implements Encoder { } if (isMultipartType(requestContentType)) { - this.springFormEncoder.encode(requestBody, bodyType, request); + springFormEncoder.encode(requestBody, bodyType, request); return; } else { @@ -111,7 +131,9 @@ public class SpringEncoder implements Encoder { private void encodeWithMessageConverter(Object requestBody, Type bodyType, RequestTemplate request, MediaType requestContentType) { - for (HttpMessageConverter messageConverter : this.messageConverters.getObject().getConverters()) { + List> converters = messageConverters.getObject().getConverters(); + customizers.forEach(customizer -> customizer.accept(converters)); + for (HttpMessageConverter messageConverter : converters) { FeignOutputMessage outputMessage; try { if (messageConverter instanceof GenericHttpMessageConverter) { @@ -227,21 +249,21 @@ public class SpringEncoder implements Encoder { private final HttpHeaders httpHeaders; private FeignOutputMessage(RequestTemplate request) { - this.httpHeaders = getHttpHeaders(request.headers()); + httpHeaders = getHttpHeaders(request.headers()); } @Override public OutputStream getBody() throws IOException { - return this.outputStream; + return outputStream; } @Override public HttpHeaders getHeaders() { - return this.httpHeaders; + return httpHeaders; } public ByteArrayOutputStream getOutputStream() { - return this.outputStream; + return outputStream; } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationContextTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationContextTests.java index 570a96fd..5ecaa1ae 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationContextTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationContextTests.java @@ -16,8 +16,8 @@ package org.springframework.cloud.openfeign.hateoas; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration; @@ -27,19 +27,20 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.data.rest.webmvc.config.RepositoryRestMvcConfiguration; -import org.springframework.hateoas.RepresentationModel; +import org.springframework.hateoas.config.WebConverters; import static org.assertj.core.api.Assertions.assertThat; /** * @author Hector Espert + * @author Olga Maciaszek-Sharma */ -public class FeignHalAutoConfigurationContextTests { +class FeignHalAutoConfigurationContextTests { private WebApplicationContextRunner contextRunner; - @Before - public void setUp() { + @BeforeEach + void setUp() { contextRunner = new WebApplicationContextRunner() .withConfiguration(AutoConfigurations.of(JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, HypermediaAutoConfiguration.class, @@ -48,23 +49,18 @@ public class FeignHalAutoConfigurationContextTests { } @Test - public void testHalJacksonHttpMessageConverterIsNotLoaded() { + void shouldNotLoadWebConvertersCustomizerWhenNotWebConvertersNotInClasspath() { FilteredClassLoader filteredClassLoader = new FilteredClassLoader(RepositoryRestMvcConfiguration.class, - RepresentationModel.class); + WebConverters.class); contextRunner.withClassLoader(filteredClassLoader) - .run(context -> assertThat(context).doesNotHaveBean("halJacksonHttpMessageConverter")); + .run(context -> assertThat(context).doesNotHaveBean("webConvertersCustomizer")); } @Test - public void testHalJacksonHttpMessageConverterIsLoaded() { + void shouldLoadWebConvertersCustomizer() { FilteredClassLoader filteredClassLoader = new FilteredClassLoader(RepositoryRestMvcConfiguration.class); contextRunner.withClassLoader(filteredClassLoader) - .run(context -> assertThat(context).hasBean("halJacksonHttpMessageConverter")); - } - - @Test - public void testHalJacksonHttpMessageConverterIsNotLoadedUseRestDataMessageConverterInstead() { - contextRunner.run(context -> assertThat(context).hasBean("halJacksonHttpMessageConverter")); + .run(context -> assertThat(context).hasBean("webConvertersCustomizer")); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationTests.java deleted file mode 100644 index b2757760..00000000 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/hateoas/FeignHalAutoConfigurationTests.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2016-2020 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.hateoas; - -import java.util.Collections; - -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import org.springframework.beans.factory.ObjectProvider; -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.hateoas.mediatype.MessageResolver; -import org.springframework.hateoas.mediatype.hal.CurieProvider; -import org.springframework.hateoas.mediatype.hal.HalConfiguration; -import org.springframework.hateoas.mediatype.hal.HalMediaTypeConfiguration; -import org.springframework.hateoas.mediatype.hal.Jackson2HalModule; -import org.springframework.hateoas.server.LinkRelationProvider; -import org.springframework.hateoas.server.mvc.TypeConstrainedMappingJackson2HttpMessageConverter; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; -import static org.springframework.hateoas.MediaTypes.HAL_JSON; - -/** - * @author Hector Espert - * @author Olga Maciaszek-Sharma - */ -@RunWith(MockitoJUnitRunner.class) -public class FeignHalAutoConfigurationTests { - - @Mock - private ObjectProvider halConfiguration; - - @Mock - private ObjectProvider objectMapper; - - @Mock - private LinkRelationProvider relProvider; - - @Mock - private ObjectProvider curieProvider; - - @Mock - private MessageResolver messageResolver; - - @InjectMocks - private FeignHalAutoConfiguration feignHalAutoConfiguration; - - @Test - public void halJacksonHttpMessageConverter() { - ObjectMapper mapper = new ObjectMapper(); - when(objectMapper.getIfAvailable(any())).thenReturn(mapper); - - when(halConfiguration.getIfAvailable(any())).thenReturn(mock(HalConfiguration.class)); - when(curieProvider.getIfAvailable(any())).thenReturn(mock(CurieProvider.class)); - - HalMediaTypeConfiguration halMediaTypeConfiguration = new HalMediaTypeConfiguration(relProvider, curieProvider, - halConfiguration, messageResolver, new DefaultListableBeanFactory()); - - TypeConstrainedMappingJackson2HttpMessageConverter converter = feignHalAutoConfiguration - .halJacksonHttpMessageConverter(objectMapper, halMediaTypeConfiguration); - - assertThat(converter).isNotNull(); - assertThat(converter.getObjectMapper()).isNotNull(); - assertThat(converter.getSupportedMediaTypes()).isEqualTo(Collections.singletonList(HAL_JSON)); - - assertThat(Jackson2HalModule.isAlreadyRegisteredIn(converter.getObjectMapper())).isTrue(); - } - -} From 6aeb1ff6767a0a6440c5dc0ef2dac203c4bcf810 Mon Sep 17 00:00:00 2001 From: ManasviGoyal <55101825+ManasviGoyal@users.noreply.github.com> Date: Wed, 21 Jul 2021 15:51:21 +0530 Subject: [PATCH 06/28] Added Tip (#580) --- docs/src/main/asciidoc/spring-cloud-openfeign.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index b59ecfff..c27783a9 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -70,6 +70,11 @@ in your external configuration using https://cloud.spring.io/spring-cloud-static Spring Cloud OpenFeign supports all the features available for the blocking mode of Spring Cloud LoadBalancer. You can read more about them in the https://docs.spring.io/spring-cloud-commons/docs/current/reference/html/#spring-cloud-loadbalancer[project documentation]. +TIP: To use `@EnableFeignClients` annotation on `@Configuration`-annotated-classes, make sure to specify where the clients are located, for example: +`@EnableFeignClients(basePackages = "com.example.clients")` +or list them explicitly: +`@EnableFeignClients(clients = InventoryServiceFeignClient.class)` + [[spring-cloud-feign-overriding-defaults]] === Overriding Feign Defaults From fe91a99984395665460b21934363772dc8a959a7 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 21 Jul 2021 12:47:18 +0200 Subject: [PATCH 07/28] Fix Spring Cloud Build and Spring Cloud Commons versions. --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b9d18586..38899ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-build - 3.0.4-SNAPSHOT + 3.1.0-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.0.4-SNAPSHOT + 3.1.0-SNAPSHOT 2.10 From 183e6ff30ad0fc828a1c2b070dfb1b1528a0f8c5 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 21 Jul 2021 12:52:28 +0200 Subject: [PATCH 08/28] Fix Spring Cloud Build and Spring Cloud Commons versions. --- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index dbba2c4d..e0149925 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.0.4-SNAPSHOT + 3.1.0-SNAPSHOT spring-cloud-openfeign-dependencies From a08fd801c2f8053e322554e849d007c8f048d3e7 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 21 Jul 2021 13:20:08 +0200 Subject: [PATCH 09/28] Remove unnecessary property info. --- docs/src/main/asciidoc/_configprops.adoc | 1 - .../META-INF/additional-spring-configuration-metadata.json | 6 ------ 2 files changed, 7 deletions(-) diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index 6a46bd84..3bba5138 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -13,7 +13,6 @@ |feign.compression.request.mime-types | `[text/xml, application/xml, application/json]` | The list of supported mime types. |feign.compression.request.min-request-size | `2048` | The minimum threshold content size. |feign.compression.response.enabled | `false` | Enables the response from Feign to be compressed. -|feign.compression.response.useGzipDecoder | `false` | Enables the default gzip decoder to be used. |feign.encoder.charset-from-content-type | `false` | Indicates whether the charset should be derived from the {@code Content-Type} header. |feign.httpclient.connection-timeout | `2000` | |feign.httpclient.connection-timer-repeat | `3000` | diff --git a/spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json index c7de5d77..8b4fc57a 100644 --- a/spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-cloud-openfeign-core/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -44,12 +44,6 @@ "description": "Enables the response from Feign to be compressed.", "defaultValue": "false" }, - { - "name": "feign.compression.response.useGzipDecoder", - "type": "java.lang.Boolean", - "description": "Enables the default gzip decoder to be used.", - "defaultValue": "false" - }, { "name": "feign.compression.request.enabled", "type": "java.lang.Boolean", From f3f95250815f7fca13210fab9a6b08dfeb54aa96 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 21 Jul 2021 13:20:24 +0200 Subject: [PATCH 10/28] Fix branch name. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 72afb5ec..d514be95 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ 3.1.x ] + branches: [ main ] pull_request: - branches: [ 3.1.x ] + branches: [ main ] jobs: build: From b5283e2f88ce2cbab1831d318fe060adf3b2b743 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 21 Jul 2021 13:21:08 +0200 Subject: [PATCH 11/28] Fix Github workflow setup. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d514be95..a82cfdaf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ main ] + branches: [ 3.0.x ] pull_request: - branches: [ main ] + branches: [ 3.0.x ] jobs: build: From 1b063edf7e6865ddf41da2615b0a4696ccbbeb33 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 26 Jul 2021 15:37:05 +0200 Subject: [PATCH 12/28] Upgrade Feign to 11.4. Fixes gh-581. --- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index e0149925..346186dd 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies - 11.2 + 11.4 3.8.0 2.1.2.RELEASE From 7581b2c27f90cbf65810e8411aaa9b0445bcd28c Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 26 Jul 2021 16:05:39 +0200 Subject: [PATCH 13/28] Fix github workflows setup. --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index a82cfdaf..d514be95 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Build on: push: - branches: [ 3.0.x ] + branches: [ main ] pull_request: - branches: [ 3.0.x ] + branches: [ main ] jobs: build: From 71930fd9f09e6a8e8ca3b5bf3089ae8f0829a694 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 26 Jul 2021 17:03:33 +0200 Subject: [PATCH 14/28] Do not reset RequestAttributes. Fixes gh-572. --- .../openfeign/FeignCircuitBreakerInvocationHandler.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java index 3cf62021..b31374a7 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java @@ -106,7 +106,7 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { return () -> { try { RequestContextHolder.setRequestAttributes(requestAttributes); - return this.dispatch.get(method).invoke(args); + return dispatch.get(method).invoke(args); } catch (RuntimeException throwable) { throw throwable; @@ -114,9 +114,6 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { catch (Throwable throwable) { throw new RuntimeException(throwable); } - finally { - RequestContextHolder.resetRequestAttributes(); - } }; } From 626d0a739bd685b0eaf111bb1d91ee2e080eb4eb Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Tue, 27 Jul 2021 10:52:23 +0200 Subject: [PATCH 15/28] Bump Feign to 11.6. Fixes gh-584. --- spring-cloud-openfeign-dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 346186dd..50f60c8f 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -15,7 +15,7 @@ spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies - 11.4 + 11.6 3.8.0 2.1.2.RELEASE From c101fd2c6e9825fa39d0b2d27b6cb2f03ed27032 Mon Sep 17 00:00:00 2001 From: Kwangyong Kim Date: Tue, 27 Jul 2021 17:59:32 +0900 Subject: [PATCH 16/28] Add CircuitBreakerNameResolver (#575) --- .../main/asciidoc/spring-cloud-openfeign.adoc | 17 +++++++++- .../openfeign/CircuitBreakerNameResolver.java | 34 +++++++++++++++++++ .../openfeign/FeignAutoConfiguration.java | 24 +++++++++++-- .../cloud/openfeign/FeignCircuitBreaker.java | 14 ++++++-- .../FeignCircuitBreakerInvocationHandler.java | 9 +++-- .../FeignCircuitBreakerTargeter.java | 9 +++-- .../FeignAutoConfigurationTests.java | 33 ++++++++++++++++++ 7 files changed, 129 insertions(+), 11 deletions(-) create mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/CircuitBreakerNameResolver.java diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index c27783a9..b498afc2 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -348,7 +348,22 @@ public class FooConfiguration { } ---- -The circuit breaker name follows this pattern `#`. When calling a `@FeignClient` with name `foo` and the called interface method is `bar` then the circuit breaker name will be `foo_bar`. +The circuit breaker name follows this pattern `#()`. When calling a `@FeignClient` with `FooClient` interface and the called interface method that has no parameters is `bar` then the circuit breaker name will be `FooClient#bar()`. + +NOTE: As of 2020.0.2, the circuit breaker name pattern has changed from `_`. +Using `CircuitBreakerNameResolver` introduced in 2020.0.4, circuit breaker names can retain the old pattern. + +Providing a bean of `CircuitBreakerNameResolver`, you can change the circuit breaker name pattern. +[source,java,indent=0] +---- +@Configuration +public class FooConfiguration { + @Bean + public CircuitBreakerNameResolver circuitBreakerNameResolver() { + return (String feignClientName, Target target, Method method) -> feignClientName + "_" + method.getName(); + } +} +---- To enable Spring Cloud CircuitBreaker group set the `feign.circuitbreaker.group.enabled` property to `true` (by default `false`). diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/CircuitBreakerNameResolver.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/CircuitBreakerNameResolver.java new file mode 100644 index 00000000..a7425250 --- /dev/null +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/CircuitBreakerNameResolver.java @@ -0,0 +1,34 @@ +/* + * Copyright 2013-2021 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.Method; + +import feign.Target; + +/** + * Used to resolve a circuitbreaker name which will be used in + * {@link org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory}. + * + * @author Kwangyong Kim + * @since 2020.0.4 + */ +public interface CircuitBreakerNameResolver { + + String resolveCircuitBreakerName(String feignClientName, Target target, Method method); + +} diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java index fd2dd7be..373cd9e8 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java @@ -17,6 +17,7 @@ package org.springframework.cloud.openfeign; import java.io.IOException; +import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Timer; @@ -29,6 +30,7 @@ import com.fasterxml.jackson.databind.Module; import feign.Client; import feign.Feign; import feign.RequestInterceptor; +import feign.Target; import feign.hc5.ApacheHttp5Client; import feign.httpclient.ApacheHttpClient; import feign.okhttp.OkHttpClient; @@ -79,6 +81,7 @@ import org.springframework.security.oauth2.client.resource.OAuth2ProtectedResour * @author Olga Maciaszek-Sharma * @author Nguyen Ky Thanh * @author Andrii Bohutskyi + * @author Kwangyong Kim */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Feign.class) @@ -146,12 +149,29 @@ public class FeignAutoConfiguration { return new DefaultTargeter(); } + @Bean + @ConditionalOnMissingBean(CircuitBreakerNameResolver.class) + public CircuitBreakerNameResolver circuitBreakerNameResolver() { + return new DefaultCircuitBreakerNameResolver(); + } + @Bean @ConditionalOnMissingBean @ConditionalOnBean(CircuitBreakerFactory.class) public Targeter circuitBreakerFeignTargeter(CircuitBreakerFactory circuitBreakerFactory, - @Value("${feign.circuitbreaker.group.enabled:false}") boolean circuitBreakerGroupEnabled) { - return new FeignCircuitBreakerTargeter(circuitBreakerFactory, circuitBreakerGroupEnabled); + @Value("${feign.circuitbreaker.group.enabled:false}") boolean circuitBreakerGroupEnabled, + CircuitBreakerNameResolver circuitBreakerNameResolver) { + return new FeignCircuitBreakerTargeter(circuitBreakerFactory, circuitBreakerGroupEnabled, + circuitBreakerNameResolver); + } + + static class DefaultCircuitBreakerNameResolver implements CircuitBreakerNameResolver { + + @Override + public String resolveCircuitBreakerName(String feignClientName, Target target, Method method) { + return Feign.configKey(target.getClass(), method); + } + } } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java index 979d079b..f7d55b4b 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreaker.java @@ -27,6 +27,7 @@ import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory; * * @author Marcin Grzejszczak * @author Andrii Bohutskyi + * @author Kwangyong Kim * @since 3.0.0 */ public final class FeignCircuitBreaker { @@ -53,6 +54,8 @@ public final class FeignCircuitBreaker { private boolean circuitBreakerGroupEnabled; + private CircuitBreakerNameResolver circuitBreakerNameResolver; + Builder circuitBreakerFactory(CircuitBreakerFactory circuitBreakerFactory) { this.circuitBreakerFactory = circuitBreakerFactory; return this; @@ -68,6 +71,11 @@ public final class FeignCircuitBreaker { return this; } + Builder circuitBreakerNameResolver(CircuitBreakerNameResolver circuitBreakerNameResolver) { + this.circuitBreakerNameResolver = circuitBreakerNameResolver; + return this; + } + public T target(Target target, T fallback) { return build(fallback != null ? new FallbackFactory.Default(fallback) : null).newInstance(target); } @@ -82,9 +90,9 @@ public final class FeignCircuitBreaker { } public Feign build(final FallbackFactory nullableFallbackFactory) { - super.invocationHandlerFactory( - (target, dispatch) -> new FeignCircuitBreakerInvocationHandler(circuitBreakerFactory, - feignClientName, target, dispatch, nullableFallbackFactory, circuitBreakerGroupEnabled)); + super.invocationHandlerFactory((target, dispatch) -> new FeignCircuitBreakerInvocationHandler( + circuitBreakerFactory, feignClientName, target, dispatch, nullableFallbackFactory, + circuitBreakerGroupEnabled, circuitBreakerNameResolver)); return super.build(); } diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java index b31374a7..531e3c78 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerInvocationHandler.java @@ -24,7 +24,6 @@ import java.util.Map; import java.util.function.Function; import java.util.function.Supplier; -import feign.Feign; import feign.InvocationHandlerFactory; import feign.Target; @@ -51,9 +50,11 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { private final boolean circuitBreakerGroupEnabled; + private final CircuitBreakerNameResolver circuitBreakerNameResolver; + FeignCircuitBreakerInvocationHandler(CircuitBreakerFactory factory, String feignClientName, Target target, Map dispatch, FallbackFactory nullableFallbackFactory, - boolean circuitBreakerGroupEnabled) { + boolean circuitBreakerGroupEnabled, CircuitBreakerNameResolver circuitBreakerNameResolver) { this.factory = factory; this.feignClientName = feignClientName; this.target = checkNotNull(target, "target"); @@ -61,6 +62,7 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { this.fallbackMethodMap = toFallbackMethod(dispatch); this.nullableFallbackFactory = nullableFallbackFactory; this.circuitBreakerGroupEnabled = circuitBreakerGroupEnabled; + this.circuitBreakerNameResolver = circuitBreakerNameResolver; } @Override @@ -82,7 +84,8 @@ class FeignCircuitBreakerInvocationHandler implements InvocationHandler { else if ("toString".equals(method.getName())) { return toString(); } - String circuitName = Feign.configKey(target.type(), method); + + String circuitName = circuitBreakerNameResolver.resolveCircuitBreakerName(feignClientName, target, method); CircuitBreaker circuitBreaker = circuitBreakerGroupEnabled ? factory.create(circuitName, feignClientName) : factory.create(circuitName); Supplier supplier = asSupplier(method, args); diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerTargeter.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerTargeter.java index 0a122856..f1ac0238 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerTargeter.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignCircuitBreakerTargeter.java @@ -29,9 +29,13 @@ class FeignCircuitBreakerTargeter implements Targeter { private final boolean circuitBreakerGroupEnabled; - FeignCircuitBreakerTargeter(CircuitBreakerFactory circuitBreakerFactory, boolean circuitBreakerGroupEnabled) { + private final CircuitBreakerNameResolver circuitBreakerNameResolver; + + FeignCircuitBreakerTargeter(CircuitBreakerFactory circuitBreakerFactory, boolean circuitBreakerGroupEnabled, + CircuitBreakerNameResolver circuitBreakerNameResolver) { this.circuitBreakerFactory = circuitBreakerFactory; this.circuitBreakerGroupEnabled = circuitBreakerGroupEnabled; + this.circuitBreakerNameResolver = circuitBreakerNameResolver; } @Override @@ -85,7 +89,8 @@ class FeignCircuitBreakerTargeter implements Targeter { private FeignCircuitBreaker.Builder builder(String feignClientName, FeignCircuitBreaker.Builder builder) { return builder.circuitBreakerFactory(circuitBreakerFactory).feignClientName(feignClientName) - .circuitBreakerGroupEnabled(circuitBreakerGroupEnabled); + .circuitBreakerGroupEnabled(circuitBreakerGroupEnabled) + .circuitBreakerNameResolver(circuitBreakerNameResolver); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignAutoConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignAutoConfigurationTests.java index 0ba44516..9d9568ef 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignAutoConfigurationTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignAutoConfigurationTests.java @@ -16,12 +16,16 @@ package org.springframework.cloud.openfeign; +import java.lang.reflect.Method; + +import feign.Target; import org.assertj.core.api.Condition; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.cloud.client.circuitbreaker.CircuitBreakerFactory; +import org.springframework.cloud.openfeign.FeignAutoConfiguration.CircuitBreakerPresentFeignTargeterConfiguration.DefaultCircuitBreakerNameResolver; import org.springframework.context.ConfigurableApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -31,6 +35,7 @@ import static org.mockito.Mockito.mock; * @author Tim Peeters * @author Olga Maciaszek-Sharma * @author Andrii Bohutskyi + * @author Kwangyong Kim */ class FeignAutoConfigurationTests { @@ -50,6 +55,8 @@ class FeignAutoConfigurationTests { .withPropertyValues("feign.circuitbreaker.enabled=true").run(ctx -> { assertOnlyOneTargeterPresent(ctx, FeignCircuitBreakerTargeter.class); assertThatFeignCircuitBreakerTargeterHasGroupEnabledPropertyWithValue(ctx, false); + assertThatFeignCircuitBreakerTargeterHasSameCircuitBreakerNameResolver(ctx, + DefaultCircuitBreakerNameResolver.class); }); } @@ -63,6 +70,17 @@ class FeignAutoConfigurationTests { }); } + @Test + void shouldInstantiateFeignCircuitBreakerTargeterWhenEnabledWithCustomCircuitBreakerNameResolver() { + runner.withBean(CircuitBreakerFactory.class, () -> mock(CircuitBreakerFactory.class)) + .withBean(CircuitBreakerNameResolver.class, CustomCircuitBreakerNameResolver::new) + .withPropertyValues("feign.circuitbreaker.enabled=true").run(ctx -> { + assertOnlyOneTargeterPresent(ctx, FeignCircuitBreakerTargeter.class); + assertThatFeignCircuitBreakerTargeterHasSameCircuitBreakerNameResolver(ctx, + CustomCircuitBreakerNameResolver.class); + }); + } + private void assertOnlyOneTargeterPresent(ConfigurableApplicationContext ctx, Class beanClass) { assertThat(ctx.getBeansOfType(Targeter.class)).hasSize(1).hasValueSatisfying(new Condition<>( beanClass::isInstance, String.format("Targeter should be an instance of %s", beanClass))); @@ -75,4 +93,19 @@ class FeignAutoConfigurationTests { assertThat(bean).hasFieldOrPropertyWithValue("circuitBreakerGroupEnabled", expectedValue); } + private void assertThatFeignCircuitBreakerTargeterHasSameCircuitBreakerNameResolver( + ConfigurableApplicationContext ctx, Class beanClass) { + final CircuitBreakerNameResolver bean = ctx.getBean(CircuitBreakerNameResolver.class); + assertThat(bean).isExactlyInstanceOf(beanClass); + } + + static class CustomCircuitBreakerNameResolver implements CircuitBreakerNameResolver { + + @Override + public String resolveCircuitBreakerName(String feignClientName, Target target, Method method) { + return feignClientName + "_" + method.getName(); + } + + } + } From a3704f0614fed3dcd54a182982e320aed72358a2 Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Tue, 27 Jul 2021 17:54:47 +0800 Subject: [PATCH 17/28] Support regex expression for @PathVariable (#577) Fix gh-576 --- docs/src/main/asciidoc/spring-cloud-openfeign.adoc | 3 +++ .../annotation/PathVariableParameterProcessor.java | 4 +++- .../openfeign/support/SpringMvcContractTests.java | 13 +++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index b0cc5aee..0bbc38d2 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -52,6 +52,9 @@ public interface StoreClient { @RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json") Store update(@PathVariable("storeId") Long storeId, Store store); + + @RequestMapping(method = RequestMethod.DELETE, value = "/stores/{storeId:\\d+}") + void delete(@PathVariable Long storeId); } ---- diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/PathVariableParameterProcessor.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/PathVariableParameterProcessor.java index fdfb31a3..80741ee7 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/PathVariableParameterProcessor.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/PathVariableParameterProcessor.java @@ -34,6 +34,7 @@ import static feign.Util.emptyToNull; * * @author Jakub Narloch * @author Abhijit Sarkar + * @author Yanming Zhou * @see AnnotatedParameterProcessor */ public class PathVariableParameterProcessor implements AnnotatedParameterProcessor { @@ -54,7 +55,8 @@ public class PathVariableParameterProcessor implements AnnotatedParameterProcess MethodMetadata data = context.getMethodMetadata(); String varName = '{' + name + '}'; - if (!data.template().url().contains(varName) && !searchMapValues(data.template().queries(), varName) + String varNameRegex = ".*\\{" + name + "(:[^}]+)?\\}.*"; + if (!data.template().url().matches(varNameRegex) && !searchMapValues(data.template().queries(), varName) && !searchMapValues(data.template().headers(), varName)) { data.formParams().add(name); } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java index 7f6d7ad7..69b25f6f 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java @@ -130,6 +130,16 @@ public class SpringMvcContractTests { assertThat(data.template().decodeSlash()).isTrue(); } + @Test + public void testProcessAnnotationOnMethod_Simple_RegexPathVariable() throws Exception { + Method method = TestTemplate_Simple.class.getDeclaredMethod("getTestWithDigitalId", String.class); + MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method); + + assertThat(data.template().url()).isEqualTo("/test/{id:\\d+}"); + assertThat(data.template().method()).isEqualTo("GET"); + assertThat(data.formParams()).isEmpty(); + } + @Test public void testProcessAnnotationOnMethod_Simple_SlashEncoded() throws Exception { contract = new SpringMvcContract(Collections.emptyList(), getConversionService(), false); @@ -588,6 +598,9 @@ public class SpringMvcContractTests { @RequestMapping(value = "/test/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE) ResponseEntity getTest(@PathVariable("id") String id); + @GetMapping("/test/{id:\\d+}") + ResponseEntity getTestWithDigitalId(@PathVariable("id") String id); + @GetMapping(produces = MediaType.APPLICATION_JSON_VALUE) TestObject getTest(); From ff30485b403a9db9e2e67ff8580361aef867e56b Mon Sep 17 00:00:00 2001 From: Yanming Zhou Date: Wed, 28 Jul 2021 17:36:54 +0800 Subject: [PATCH 18/28] Respect SpringDataWebProperties where possible (#583) --- .../openfeign/FeignClientsConfiguration.java | 9 +- .../support/PageableSpringEncoder.java | 5 +- .../PageableSpringQueryMapEncoder.java | 34 ++++- .../support/PageableEncoderTests.java | 27 +++- ...PageableEncoderWithSpringDataWebTests.java | 52 +++++++ .../PageableSpringQueryMapEncoderTests.java | 127 ++++++++++++++++++ ...QueryMapEncoderWithSpringDataWebTests.java | 52 +++++++ 7 files changed, 293 insertions(+), 13 deletions(-) create mode 100644 spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderWithSpringDataWebTests.java create mode 100644 spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderTests.java create mode 100644 spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderWithSpringDataWebTests.java diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java index c1e378a0..f25b0da0 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientsConfiguration.java @@ -71,6 +71,7 @@ import static feign.form.ContentType.MULTIPART; * @author Jonatan Ivanov * @author Olga Maciaszek-Sharma * @author Hyeonmin Park + * @author Yanming Zhou */ @Configuration(proxyBeanMethods = false) public class FeignClientsConfiguration { @@ -130,7 +131,13 @@ public class FeignClientsConfiguration { @ConditionalOnClass(name = "org.springframework.data.domain.Pageable") @ConditionalOnMissingBean public QueryMapEncoder feignQueryMapEncoderPageable() { - return new PageableSpringQueryMapEncoder(); + PageableSpringQueryMapEncoder queryMapEncoder = new PageableSpringQueryMapEncoder(); + if (springDataWebProperties != null) { + queryMapEncoder.setPageParameter(springDataWebProperties.getPageable().getPageParameter()); + queryMapEncoder.setSizeParameter(springDataWebProperties.getPageable().getSizeParameter()); + queryMapEncoder.setSortParameter(springDataWebProperties.getSort().getSortParameter()); + } + return queryMapEncoder; } @Bean diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringEncoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringEncoder.java index 916044f1..d0f66ac0 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringEncoder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringEncoder.java @@ -32,6 +32,7 @@ import org.springframework.data.domain.Sort; * Provides support for encoding spring Pageable via composition. * * @author Pascal Büttiker + * @author Yanming Zhou */ public class PageableSpringEncoder implements Encoder { @@ -82,8 +83,8 @@ public class PageableSpringEncoder implements Encoder { Pageable pageable = (Pageable) object; if (pageable.isPaged()) { - template.query(pageParameter, pageable.getPageNumber() + ""); - template.query(sizeParameter, pageable.getPageSize() + ""); + template.query(pageParameter, String.valueOf(pageable.getPageNumber())); + template.query(sizeParameter, String.valueOf(pageable.getPageSize())); } if (pageable.getSort() != null) { diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoder.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoder.java index 0a2171b6..ab72411a 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoder.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoder.java @@ -31,10 +31,38 @@ import org.springframework.data.domain.Sort; * {@link org.springframework.cloud.openfeign.SpringQueryMap}. * * @author Hyeonmin Park + * @author Yanming Zhou * @since 2.2.8 */ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder { + /** + * Page index parameter name. + */ + private String pageParameter = "page"; + + /** + * Page size parameter name. + */ + private String sizeParameter = "size"; + + /** + * Sort parameter name. + */ + private String sortParameter = "sort"; + + public void setPageParameter(String pageParameter) { + this.pageParameter = pageParameter; + } + + public void setSizeParameter(String sizeParameter) { + this.sizeParameter = sizeParameter; + } + + public void setSortParameter(String sortParameter) { + this.sortParameter = sortParameter; + } + @Override public Map encode(Object object) { if (supports(object)) { @@ -44,8 +72,8 @@ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder { Pageable pageable = (Pageable) object; if (pageable.isPaged()) { - queryMap.put("page", pageable.getPageNumber()); - queryMap.put("size", pageable.getPageSize()); + queryMap.put(pageParameter, pageable.getPageNumber()); + queryMap.put(sizeParameter, pageable.getPageSize()); } if (pageable.getSort() != null) { @@ -69,7 +97,7 @@ public class PageableSpringQueryMapEncoder extends BeanQueryMapEncoder { sortQueries.add(order.getProperty() + "%2C" + order.getDirection()); } if (!sortQueries.isEmpty()) { - queryMap.put("sort", sortQueries); + queryMap.put(sortParameter, sortQueries); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderTests.java index 15ff0c53..ad3f7579 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderTests.java @@ -37,6 +37,7 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen * Tests the pagination encoding and sorting. * * @author Charlie Mordant. + * @author Yanming Zhou */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, @@ -55,6 +56,18 @@ public class PageableEncoderTests { @Autowired private FeignContext context; + protected String getPageParameter() { + return "page"; + } + + protected String getSizeParameter() { + return "size"; + } + + protected String getSortParameter() { + return "sort"; + } + @Test public void testPaginationAndSortingRequest() { Encoder encoder = this.context.getInstance("foo", Encoder.class); @@ -65,11 +78,11 @@ public class PageableEncoderTests { // Request queries shall contain three entries assertThat(request.queries()).hasSize(3); // Request page shall contain page - assertThat(request.queries().get("page")).contains(String.valueOf(PAGE)); + assertThat(request.queries().get(getPageParameter())).contains(String.valueOf(PAGE)); // Request size shall contain size - assertThat(request.queries().get("size")).contains(String.valueOf(SIZE)); + assertThat(request.queries().get(getSizeParameter())).contains(String.valueOf(SIZE)); // Request sort size shall contain sort entries - assertThat(request.queries().get("sort")).hasSize(2); + assertThat(request.queries().get(getSortParameter())).hasSize(2); } private Pageable createPageAndSortRequest() { @@ -84,11 +97,11 @@ public class PageableEncoderTests { encoder.encode(createPageAndRequest(), null, request); assertThat(request.queries().size()).isEqualTo(2); // Request page shall contain page - assertThat(request.queries().get("page")).contains(String.valueOf(PAGE)); + assertThat(request.queries().get(getPageParameter())).contains(String.valueOf(PAGE)); // Request size shall contain size - assertThat(request.queries().get("size")).contains(String.valueOf(SIZE)); + assertThat(request.queries().get(getSizeParameter())).contains(String.valueOf(SIZE)); // Request sort size shall contain sort entries - assertThat(request.queries()).doesNotContainKey("sort"); + assertThat(request.queries()).doesNotContainKey(getSortParameter()); } private Pageable createPageAndRequest() { @@ -105,7 +118,7 @@ public class PageableEncoderTests { // Request queries shall contain three entries assertThat(request.queries().size()).isEqualTo(1); // Request sort size shall contain sort entries - assertThat(request.queries().get("sort")).hasSize(2); + assertThat(request.queries().get(getSortParameter())).hasSize(2); } private Sort createSort() { diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderWithSpringDataWebTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderWithSpringDataWebTests.java new file mode 100644 index 00000000..a81c46b3 --- /dev/null +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableEncoderWithSpringDataWebTests.java @@ -0,0 +1,52 @@ +/* + * Copyright 2013-2020 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.support; + +import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +/** + * Tests the pagination encoding and sorting. + * + * @author Yanming Zhou + */ +@EnableConfigurationProperties(SpringDataWebProperties.class) +@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, + value = { "spring.application.name=springencodertest", "spring.jmx.enabled=false", + "spring.data.web.pageable.pageParameter=pageNo", "spring.data.web.pageable.sizeParameter=pageSize", + "spring.data.web.sort.sortParameter=orderBy" }) +public class PageableEncoderWithSpringDataWebTests extends PageableEncoderTests { + + @Override + protected String getPageParameter() { + return "pageNo"; + } + + @Override + protected String getSizeParameter() { + return "pageSize"; + } + + @Override + protected String getSortParameter() { + return "orderBy"; + } + +} diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderTests.java new file mode 100644 index 00000000..2ac911e2 --- /dev/null +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderTests.java @@ -0,0 +1,127 @@ +/* + * Copyright 2013-2020 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.support; + +import java.util.List; +import java.util.Map; + +import feign.QueryMapEncoder; +import org.junit.Test; +import org.junit.runner.RunWith; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.cloud.openfeign.FeignContext; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +/** + * Tests the pagination encoding and sorting. + * + * @author Yanming Zhou + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, + value = { "spring.application.name=springencodertest", "spring.jmx.enabled=false" }) +@DirtiesContext +public class PageableSpringQueryMapEncoderTests { + + public static final int PAGE = 1; + + public static final int SIZE = 10; + + public static final String SORT_2 = "sort2"; + + public static final String SORT_1 = "sort1"; + + @Autowired + private FeignContext context; + + protected String getPageParameter() { + return "page"; + } + + protected String getSizeParameter() { + return "size"; + } + + protected String getSortParameter() { + return "sort"; + } + + @Test + public void testPaginationAndSortingRequest() { + QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class); + assertThat(encoder).isNotNull(); + + Map map = encoder.encode(createPageAndSortRequest()); + assertThat(map).hasSize(3); + assertThat((Integer) map.get(getPageParameter())).isEqualTo(PAGE); + assertThat((Integer) map.get(getSizeParameter())).isEqualTo(SIZE); + assertThat((List) map.get(getSortParameter())).hasSize(2); + } + + private Pageable createPageAndSortRequest() { + return PageRequest.of(PAGE, SIZE, Sort.Direction.ASC, SORT_1, SORT_2); + } + + @Test + public void testPaginationRequest() { + QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class); + assertThat(encoder).isNotNull(); + + Map map = encoder.encode(createPageAndRequest()); + assertThat(map).hasSize(2); + assertThat((Integer) map.get(getPageParameter())).isEqualTo(PAGE); + assertThat((Integer) map.get(getSizeParameter())).isEqualTo(SIZE); + assertThat(map).doesNotContainKey(getSortParameter()); + } + + private Pageable createPageAndRequest() { + return PageRequest.of(PAGE, SIZE); + } + + @Test + public void testSortingRequest() { + QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class); + assertThat(encoder).isNotNull(); + + Map map = encoder.encode(createSort()); + assertThat(map).hasSize(1); + assertThat((List) map.get(getSortParameter())).hasSize(2); + } + + private Sort createSort() { + return Sort.by(SORT_1, SORT_2).ascending(); + } + + @Test + public void testUnpagedRequest() { + QueryMapEncoder encoder = this.context.getInstance("foo", QueryMapEncoder.class); + assertThat(encoder).isNotNull(); + + Map map = encoder.encode(Pageable.unpaged()); + assertThat(map).isEmpty(); + } + +} diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderWithSpringDataWebTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderWithSpringDataWebTests.java new file mode 100644 index 00000000..914a0516 --- /dev/null +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/PageableSpringQueryMapEncoderWithSpringDataWebTests.java @@ -0,0 +1,52 @@ +/* + * Copyright 2013-2020 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.support; + +import org.springframework.boot.autoconfigure.data.web.SpringDataWebProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.SpringBootTest; + +import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT; + +/** + * Tests the pagination encoding and sorting. + * + * @author Yanming Zhou + */ +@EnableConfigurationProperties(SpringDataWebProperties.class) +@SpringBootTest(classes = SpringEncoderTests.Application.class, webEnvironment = RANDOM_PORT, + value = { "spring.application.name=springencodertest", "spring.jmx.enabled=false", + "spring.data.web.pageable.pageParameter=pageNo", "spring.data.web.pageable.sizeParameter=pageSize", + "spring.data.web.sort.sortParameter=orderBy" }) +public class PageableSpringQueryMapEncoderWithSpringDataWebTests extends PageableSpringQueryMapEncoderTests { + + @Override + protected String getPageParameter() { + return "pageNo"; + } + + @Override + protected String getSizeParameter() { + return "pageSize"; + } + + @Override + protected String getSortParameter() { + return "orderBy"; + } + +} From fae18f20391b952fd8f0438e551baa29d881eadb Mon Sep 17 00:00:00 2001 From: spencergibb Date: Fri, 30 Jul 2021 14:13:05 -0400 Subject: [PATCH 19/28] migrates from symlink to include --- docs/src/main/asciidoc/index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 120000 => 100644 docs/src/main/asciidoc/index.adoc diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/index.adoc deleted file mode 120000 index f609d02f..00000000 --- a/docs/src/main/asciidoc/index.adoc +++ /dev/null @@ -1 +0,0 @@ -spring-cloud-openfeign.adoc \ No newline at end of file diff --git a/docs/src/main/asciidoc/index.adoc b/docs/src/main/asciidoc/index.adoc new file mode 100644 index 00000000..503e0a53 --- /dev/null +++ b/docs/src/main/asciidoc/index.adoc @@ -0,0 +1 @@ +include::spring-cloud-openfeign.adoc[] From f4615d198edb1fe134cbaf3989c284be77004e44 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 30 Jul 2021 18:15:57 +0000 Subject: [PATCH 20/28] Update SNAPSHOT to 3.1.0-M1 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d1233ca9..e47ac764 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M1 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 38899ff8..8ce3dd35 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M1 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.0-SNAPSHOT + 3.1.0-M1 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.0-SNAPSHOT + 3.1.0-M1 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index da667efd..7034e50b 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M1 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 50f60c8f..dd5a4cf5 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-M1 spring-cloud-openfeign-dependencies - 3.1.0-SNAPSHOT + 3.1.0-M1 pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index b8c4fb13..c1af6769 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M1 .. spring-cloud-starter-openfeign From 8dd2c8296891c759a8304afd3f7292e61c292525 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 30 Jul 2021 18:17:15 +0000 Subject: [PATCH 21/28] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index e47ac764..d1233ca9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-M1 + 3.1.0-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 8ce3dd35..38899ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 3.1.0-M1 + 3.1.0-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.0-M1 + 3.1.0-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.0-M1 + 3.1.0-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 7034e50b..da667efd 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-M1 + 3.1.0-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index dd5a4cf5..50f60c8f 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0-M1 + 3.1.0-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.0-M1 + 3.1.0-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index c1af6769..b8c4fb13 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-M1 + 3.1.0-SNAPSHOT .. spring-cloud-starter-openfeign From 4fc80e6b01164d43e348213cf92383eed91ee9f1 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Wed, 8 Sep 2021 18:52:11 +0200 Subject: [PATCH 22/28] Update docs. Fixes gh-585. --- docs/src/main/asciidoc/spring-cloud-openfeign.adoc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc index c27783a9..aa87ca5c 100644 --- a/docs/src/main/asciidoc/spring-cloud-openfeign.adoc +++ b/docs/src/main/asciidoc/spring-cloud-openfeign.adoc @@ -477,9 +477,9 @@ public interface UserClient extends UserService { ---- NOTE: It is generally not advisable to share an interface between a -server and a client. It introduces tight coupling, and also actually -doesn't work with Spring MVC in its current form (method parameter -mapping is not inherited). +server and a client. It introduces tight coupling, and is also not supported by +all the maintained Spring MVC versions (method parameter +mapping is not inherited in some versions). === Feign request/response compression From c761919bc9231162a83aeb2b2f5de3f28110b887 Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Thu, 9 Sep 2021 17:59:08 +0200 Subject: [PATCH 23/28] Only add default query params and default headers if not already in template. Fixes gh-590. --- .../openfeign/FeignClientFactoryBean.java | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java index ef290045..969520c9 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignClientFactoryBean.java @@ -17,6 +17,7 @@ package org.springframework.cloud.openfeign; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Objects; @@ -276,13 +277,8 @@ public class FeignClientFactoryBean builder.encoder(getOrInstantiate(config.getEncoder())); } - if (Objects.nonNull(config.getDefaultRequestHeaders())) { - builder.requestInterceptor(requestTemplate -> requestTemplate.headers(config.getDefaultRequestHeaders())); - } - - if (Objects.nonNull(config.getDefaultQueryParameters())) { - builder.requestInterceptor(requestTemplate -> requestTemplate.queries(config.getDefaultQueryParameters())); - } + addDefaultRequestHeaders(config, builder); + addDefaultQueryParams(config, builder); if (Objects.nonNull(config.getDecoder())) { builder.decoder(getOrInstantiate(config.getDecoder())); @@ -301,6 +297,35 @@ public class FeignClientFactoryBean } } + private void addDefaultQueryParams(FeignClientProperties.FeignClientConfiguration config, Feign.Builder builder) { + Map> defaultQueryParameters = config.getDefaultQueryParameters(); + if (Objects.nonNull(defaultQueryParameters)) { + builder.requestInterceptor(requestTemplate -> { + Map> queries = requestTemplate.queries(); + defaultQueryParameters.keySet().forEach(key -> { + if (!queries.containsKey(key)) { + requestTemplate.query(key, defaultQueryParameters.get(key)); + } + }); + }); + } + } + + private void addDefaultRequestHeaders(FeignClientProperties.FeignClientConfiguration config, + Feign.Builder builder) { + Map> defaultRequestHeaders = config.getDefaultRequestHeaders(); + if (Objects.nonNull(defaultRequestHeaders)) { + builder.requestInterceptor(requestTemplate -> { + Map> headers = requestTemplate.headers(); + defaultRequestHeaders.keySet().forEach(key -> { + if (!headers.containsKey(key)) { + requestTemplate.header(key, defaultRequestHeaders.get(key)); + } + }); + }); + } + } + private T getOrInstantiate(Class tClass) { try { return beanFactory != null ? beanFactory.getBean(tClass) : applicationContext.getBean(tClass); From 1ff68c11d241bc2ba7f52553a1b1b60e64b7a8c7 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 28 Sep 2021 00:22:33 +0000 Subject: [PATCH 24/28] Bumping versions --- README.adoc | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/README.adoc b/README.adoc index c8917b89..1637c57e 100644 --- a/README.adoc +++ b/README.adoc @@ -66,23 +66,9 @@ the `.mvn` configuration, so if you find you have to do it to make a build succeed, please raise a ticket to get the settings added to source control. -For hints on how to build the project look in `.travis.yml` if there -is one. There should be a "script" and maybe "install" command. Also -look at the "services" section to see if any services need to be -running locally (e.g. mongo or rabbit). Ignore the git-related bits -that you might find in "before_install" since they're related to setting git -credentials and you already have those. - -The projects that require middleware generally include a -`docker-compose.yml`, so consider using -https://docs.docker.com/compose/[Docker Compose] to run the middeware servers -in Docker containers. See the README in the -https://github.com/spring-cloud-samples/scripts[scripts demo -repository] for specific instructions about the common cases of mongo, -rabbit and redis. - -NOTE: If all else fails, build with the command from `.travis.yml` (usually -`./mvnw install`). +The projects that require middleware (i.e. Redis) for testing generally +require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running. + === Documentation From 6533389e1608ac5bc6a36b58250e514d59e44558 Mon Sep 17 00:00:00 2001 From: GongYi Date: Wed, 29 Sep 2021 20:01:36 +0800 Subject: [PATCH 25/28] Add a CookieValueParameterProcessor to support @CookieValue (#604) --- .../CookieValueParameterProcessor.java | 68 +++++++++++++++++++ .../openfeign/support/SpringMvcContract.java | 2 + .../support/SpringMvcContractTests.java | 30 ++++++++ 3 files changed, 100 insertions(+) create mode 100644 spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java new file mode 100644 index 00000000..f18f27c2 --- /dev/null +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java @@ -0,0 +1,68 @@ +/* + * Copyright 2013-2021 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.annotation; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Arrays; + +import feign.MethodMetadata; + +import org.springframework.cloud.openfeign.AnnotatedParameterProcessor; +import org.springframework.http.HttpHeaders; +import org.springframework.web.bind.annotation.CookieValue; + +import static feign.Util.checkState; +import static feign.Util.emptyToNull; + +/** + * @{link CookieValue} annotation processor. + * + * @author Gong Yi + * + */ +public class CookieValueParameterProcessor implements AnnotatedParameterProcessor { + + private static final Class ANNOTATION = CookieValue.class; + + @Override + public Class getAnnotationType() { + return ANNOTATION; + } + + @Override + public boolean processArgument(AnnotatedParameterContext context, Annotation annotation, Method method) { + int parameterIndex = context.getParameterIndex(); + MethodMetadata data = context.getMethodMetadata(); + CookieValue cookie = ANNOTATION.cast(annotation); + String name = cookie.value().trim(); + checkState(emptyToNull(name) != null, "Cookie.name() was empty on parameter %s", parameterIndex); + context.setParameterName(name); + String cookieExpression = data.template().headers().getOrDefault(HttpHeaders.COOKIE, Arrays.asList("")).stream() + .findFirst().orElse(""); + if (cookieExpression.length() == 0) { + cookieExpression = String.format("%s={%s}", name, name); + } + else { + cookieExpression += String.format("; %s={%s}", name, name); + } + data.template().removeHeader(HttpHeaders.COOKIE); + data.template().header(HttpHeaders.COOKIE, cookieExpression); + return true; + } + +} diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java index a3f2c8b5..504c9262 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java @@ -38,6 +38,7 @@ import feign.Request; import org.springframework.cloud.openfeign.AnnotatedParameterProcessor; import org.springframework.cloud.openfeign.CollectionFormat; +import org.springframework.cloud.openfeign.annotation.CookieValueParameterProcessor; import org.springframework.cloud.openfeign.annotation.MatrixVariableParameterProcessor; import org.springframework.cloud.openfeign.annotation.PathVariableParameterProcessor; import org.springframework.cloud.openfeign.annotation.QueryMapParameterProcessor; @@ -360,6 +361,7 @@ public class SpringMvcContract extends Contract.BaseContract implements Resource annotatedArgumentResolvers.add(new RequestHeaderParameterProcessor()); annotatedArgumentResolvers.add(new QueryMapParameterProcessor()); annotatedArgumentResolvers.add(new RequestPartParameterProcessor()); + annotatedArgumentResolvers.add(new CookieValueParameterProcessor()); return annotatedArgumentResolvers; } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java index 69b25f6f..a034481a 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/support/SpringMvcContractTests.java @@ -45,6 +45,7 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.util.MultiValueMap; import org.springframework.util.ReflectionUtils; +import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.MatrixVariable; @@ -587,6 +588,24 @@ public class SpringMvcContractTests { assertThat(data.formParams()).contains("file", "id"); } + @Test + public void testSingleCookieAnnotation() throws NoSuchMethodException { + Method method = TestTemplate_Cookies.class.getDeclaredMethod("singleCookie", String.class, String.class); + + MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method); + assertThat(data.template().headers().get("cookie").iterator().next()).isEqualTo("cookie1={cookie1}"); + } + + @Test + public void testMultipleCookiesAnnotation() throws NoSuchMethodException { + Method method = TestTemplate_Cookies.class.getDeclaredMethod("multipleCookies", String.class, String.class, + String.class); + + MethodMetadata data = contract.parseAndValidateMetadata(method.getDeclaringClass(), method); + assertThat(data.template().headers().get("cookie").iterator().next()) + .isEqualTo("cookie1={cookie1}; cookie2={cookie2}"); + } + private ConversionService getConversionService() { FormattingConversionServiceFactoryBean conversionServiceFactoryBean = new FormattingConversionServiceFactoryBean(); conversionServiceFactoryBean.afterPropertiesSet(); @@ -637,6 +656,17 @@ public class SpringMvcContractTests { } + public interface TestTemplate_Cookies { + + @GetMapping("/test/{id}") + ResponseEntity singleCookie(@PathVariable("id") String id, @CookieValue("cookie1") String cookie1); + + @GetMapping("/test/{id}") + ResponseEntity multipleCookies(@PathVariable("id") String id, + @CookieValue("cookie1") String cookie1, @CookieValue("cookie2") String cookie2); + + } + public interface TestTemplate_HeadersWithoutValues { @GetMapping(value = "/test/{id}", headers = { "X-Foo", "!X-Bar", "X-Baz!=fooBar" }) From 9018acfc4065becda99265b5618b446378a944d3 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Thu, 30 Sep 2021 00:23:25 +0000 Subject: [PATCH 26/28] Bumping versions --- .../openfeign/annotation/CookieValueParameterProcessor.java | 1 - 1 file changed, 1 deletion(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java index f18f27c2..3edd4d7b 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/annotation/CookieValueParameterProcessor.java @@ -31,7 +31,6 @@ import static feign.Util.emptyToNull; /** * @{link CookieValue} annotation processor. - * * @author Gong Yi * */ From f5be046f90e34aa3e21d52be57ba2c76e4a299e9 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 1 Oct 2021 17:06:36 +0000 Subject: [PATCH 27/28] Update SNAPSHOT to 3.1.0-M2 --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index d1233ca9..18b74252 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M2 spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index 38899ff8..a33e57e2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M2 pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.0-SNAPSHOT + 3.1.0-M2 @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.0-SNAPSHOT + 3.1.0-M2 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index da667efd..803cbd53 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M2 .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index 50f60c8f..bab6b7d8 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0-SNAPSHOT + 3.1.0-M2 spring-cloud-openfeign-dependencies - 3.1.0-SNAPSHOT + 3.1.0-M2 pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index b8c4fb13..f55e6c5b 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-SNAPSHOT + 3.1.0-M2 .. spring-cloud-starter-openfeign From c6ea224501a6fd1cd75ac71821ad945419085d59 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 1 Oct 2021 17:07:56 +0000 Subject: [PATCH 28/28] Going back to snapshots --- docs/pom.xml | 2 +- pom.xml | 6 +++--- spring-cloud-openfeign-core/pom.xml | 2 +- spring-cloud-openfeign-dependencies/pom.xml | 4 ++-- spring-cloud-starter-openfeign/pom.xml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 18b74252..d1233ca9 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-M2 + 3.1.0-SNAPSHOT spring-cloud-openfeign-docs jar diff --git a/pom.xml b/pom.xml index a33e57e2..38899ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 spring-cloud-openfeign - 3.1.0-M2 + 3.1.0-SNAPSHOT pom Spring Cloud OpenFeign Spring Cloud OpenFeign org.springframework.cloud spring-cloud-build - 3.1.0-M2 + 3.1.0-SNAPSHOT @@ -26,7 +26,7 @@ ${basedir} 2.11.3 - 3.1.0-M2 + 3.1.0-SNAPSHOT 2.10 diff --git a/spring-cloud-openfeign-core/pom.xml b/spring-cloud-openfeign-core/pom.xml index 803cbd53..da667efd 100644 --- a/spring-cloud-openfeign-core/pom.xml +++ b/spring-cloud-openfeign-core/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-M2 + 3.1.0-SNAPSHOT .. spring-cloud-openfeign-core diff --git a/spring-cloud-openfeign-dependencies/pom.xml b/spring-cloud-openfeign-dependencies/pom.xml index bab6b7d8..50f60c8f 100644 --- a/spring-cloud-openfeign-dependencies/pom.xml +++ b/spring-cloud-openfeign-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 3.1.0-M2 + 3.1.0-SNAPSHOT spring-cloud-openfeign-dependencies - 3.1.0-M2 + 3.1.0-SNAPSHOT pom spring-cloud-openfeign-dependencies Spring Cloud OpenFeign Dependencies diff --git a/spring-cloud-starter-openfeign/pom.xml b/spring-cloud-starter-openfeign/pom.xml index f55e6c5b..b8c4fb13 100644 --- a/spring-cloud-starter-openfeign/pom.xml +++ b/spring-cloud-starter-openfeign/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-openfeign - 3.1.0-M2 + 3.1.0-SNAPSHOT .. spring-cloud-starter-openfeign