From 2a046e0a0b067543841d08d592cfe423a292ed97 Mon Sep 17 00:00:00 2001 From: buildmaster Date: Fri, 4 Oct 2019 05:29:40 +0000 Subject: [PATCH] Bumping versions --- benchmarks/pom.xml | 2 +- .../instrument/web/client/TraceWebClientAutoConfiguration.java | 3 ++- .../web/client/TraceWebClientAutoConfigurationTests.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml index 01b9c303a..829e9b623 100644 --- a/benchmarks/pom.xml +++ b/benchmarks/pom.xml @@ -33,7 +33,7 @@ true 1.8 1.8 - 2.2.0.BUILD-SNAPSHOT + 2.2.0.RC1 5.8.0 diff --git a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java index 916b589b4..3028c6f90 100644 --- a/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java +++ b/spring-cloud-sleuth-core/src/main/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfiguration.java @@ -237,7 +237,8 @@ class RestTemplateInterceptorInjector { private boolean hasTraceInterceptor(RestTemplate restTemplate) { for (ClientHttpRequestInterceptor interceptor : restTemplate.getInterceptors()) { - if (interceptor instanceof TracingClientHttpRequestInterceptor || interceptor instanceof LazyTracingClientHttpRequestInterceptor) { + if (interceptor instanceof TracingClientHttpRequestInterceptor + || interceptor instanceof LazyTracingClientHttpRequestInterceptor) { return true; } } diff --git a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java index 3bf6ba104..a8f81a8ed 100644 --- a/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java +++ b/spring-cloud-sleuth-core/src/test/java/org/springframework/cloud/sleuth/instrument/web/client/TraceWebClientAutoConfigurationTests.java @@ -104,7 +104,8 @@ public class TraceWebClientAutoConfigurationTests { .containsOnlyElementsOf(Collections.singletonList(1)); } - private void incrementNumberOfInstances(Map numberOfInstances, ClientHttpRequestInterceptor interceptor) { + private void incrementNumberOfInstances(Map numberOfInstances, + ClientHttpRequestInterceptor interceptor) { Integer no = numberOfInstances.get(interceptor.getClass()); if (no == null) { numberOfInstances.put(interceptor.getClass(), 1);