From b4fb3fe7b47535eac5a302b71c3075fd2350c4ca Mon Sep 17 00:00:00 2001 From: Olga MaciaszekSharma Date: Mon, 1 Mar 2021 15:35:49 +0100 Subject: [PATCH] Refactor. --- .../openfeign/FeignHttpClientUrlTests.java | 18 +++++++++--------- ...eignHttpClientUrlTestsWithLoadBalancer.java | 18 +++++++++--------- ...lientUrlTestsWithRetryableLoadBalancer.java | 18 +++++++++--------- src/checkstyle/checkstyle-suppressions.xml | 1 - 4 files changed, 27 insertions(+), 28 deletions(-) diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java index 822d0c32..6be4e5f8 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTests.java @@ -79,8 +79,8 @@ class FeignHttpClientUrlTests { @Test void testUrlHttpClient() { - assertThat(this.urlClient).as("UrlClient was null").isNotNull(); - Hello hello = this.urlClient.getHello(); + assertThat(urlClient).as("UrlClient was null").isNotNull(); + Hello hello = urlClient.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -88,7 +88,7 @@ class FeignHttpClientUrlTests { @Test void testBeanUrl() { - Hello hello = this.beanClient.getHello(); + Hello hello = beanClient.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -96,7 +96,7 @@ class FeignHttpClientUrlTests { @Test void testBeanUrlNoProtocol() { - Hello hello = this.beanClientNoProtocol.getHello(); + Hello hello = beanClientNoProtocol.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -180,16 +180,16 @@ class FeignHttpClientUrlTests { private String message; - public Hello() { + Hello() { } - public Hello(String message) { + Hello(String message) { this.message = message; } public String getMessage() { - return this.message; + return message; } public void setMessage(String message) { @@ -205,12 +205,12 @@ class FeignHttpClientUrlTests { return false; } Hello that = (Hello) o; - return Objects.equals(this.message, that.message); + return Objects.equals(message, that.message); } @Override public int hashCode() { - return Objects.hash(this.message); + return Objects.hash(message); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithLoadBalancer.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithLoadBalancer.java index 03527fa5..ee8f7b0a 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithLoadBalancer.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithLoadBalancer.java @@ -82,8 +82,8 @@ class FeignHttpClientUrlTestsWithLoadBalancer { @Test void testUrlHttpClient() { - assertThat(this.urlClient).as("UrlClient was null").isNotNull(); - Hello hello = this.urlClient.getHello(); + assertThat(urlClient).as("UrlClient was null").isNotNull(); + Hello hello = urlClient.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -91,7 +91,7 @@ class FeignHttpClientUrlTestsWithLoadBalancer { @Test void testBeanUrl() { - Hello hello = this.beanClient.getHello(); + Hello hello = beanClient.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -99,7 +99,7 @@ class FeignHttpClientUrlTestsWithLoadBalancer { @Test void testBeanUrlNoProtocol() { - Hello hello = this.beanClientNoProtocol.getHello(); + Hello hello = beanClientNoProtocol.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -183,16 +183,16 @@ class FeignHttpClientUrlTestsWithLoadBalancer { private String message; - public Hello() { + Hello() { } - public Hello(String message) { + Hello(String message) { this.message = message; } public String getMessage() { - return this.message; + return message; } public void setMessage(String message) { @@ -208,12 +208,12 @@ class FeignHttpClientUrlTestsWithLoadBalancer { return false; } Hello that = (Hello) o; - return Objects.equals(this.message, that.message); + return Objects.equals(message, that.message); } @Override public int hashCode() { - return Objects.hash(this.message); + return Objects.hash(message); } } diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithRetryableLoadBalancer.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithRetryableLoadBalancer.java index 50f4372c..667844f0 100644 --- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithRetryableLoadBalancer.java +++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignHttpClientUrlTestsWithRetryableLoadBalancer.java @@ -82,8 +82,8 @@ class FeignHttpClientUrlTestsWithRetryableLoadBalancer { @Test void testUrlHttpClient() { - assertThat(this.urlClient).as("UrlClient was null").isNotNull(); - Hello hello = this.urlClient.getHello(); + assertThat(urlClient).as("UrlClient was null").isNotNull(); + Hello hello = urlClient.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -91,7 +91,7 @@ class FeignHttpClientUrlTestsWithRetryableLoadBalancer { @Test void testBeanUrl() { - Hello hello = this.beanClient.getHello(); + Hello hello = beanClient.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -99,7 +99,7 @@ class FeignHttpClientUrlTestsWithRetryableLoadBalancer { @Test void testBeanUrlNoProtocol() { - Hello hello = this.beanClientNoProtocol.getHello(); + Hello hello = beanClientNoProtocol.getHello(); assertThat(hello).as("hello was null").isNotNull(); assertThat(hello).as("first hello didn't match") .isEqualTo(new Hello("hello world 1")); @@ -183,16 +183,16 @@ class FeignHttpClientUrlTestsWithRetryableLoadBalancer { private String message; - public Hello() { + Hello() { } - public Hello(String message) { + Hello(String message) { this.message = message; } public String getMessage() { - return this.message; + return message; } public void setMessage(String message) { @@ -208,12 +208,12 @@ class FeignHttpClientUrlTestsWithRetryableLoadBalancer { return false; } Hello that = (Hello) o; - return Objects.equals(this.message, that.message); + return Objects.equals(message, that.message); } @Override public int hashCode() { - return Objects.hash(this.message); + return Objects.hash(message); } } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index f96986bf..39915018 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -16,7 +16,6 @@ -