From 7e0290e973560f7a72cbb1342fb829243a994c1e Mon Sep 17 00:00:00 2001 From: buildmaster Date: Tue, 17 Sep 2019 09:58:07 +0000 Subject: [PATCH] Bumping versions --- README.adoc | 2 +- .../config/client/ConfigServicePropertySourceLocator.java | 3 ++- .../config/client/ConfigServicePropertySourceLocatorTests.java | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.adoc b/README.adoc index a8a1e531..4bace665 100644 --- a/README.adoc +++ b/README.adoc @@ -500,7 +500,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables: -- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. +- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL. - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL. - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`. diff --git a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java index d750d936..e847574e 100644 --- a/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java +++ b/spring-cloud-config-client/src/main/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocator.java @@ -148,7 +148,8 @@ public class ConfigServicePropertySourceLocator implements PropertySourceLocator + (errorBody == null ? "" : ": " + errorBody), error); } - logger.warn("Could not locate PropertySource: " + (error != null ? error.getMessage() : errorBody)); + logger.warn("Could not locate PropertySource: " + + (error != null ? error.getMessage() : errorBody)); return null; } diff --git a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java index a615d887..a5f58bb2 100644 --- a/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java +++ b/spring-cloud-config-client/src/test/java/org/springframework/cloud/config/client/ConfigServicePropertySourceLocatorTests.java @@ -111,8 +111,7 @@ public class ConfigServicePropertySourceLocatorTests { @Test public void sunnyDayWithNoSuchLabel() { mockRequestResponseWithLabel( - new ResponseEntity<>((Void) null, HttpStatus.NOT_FOUND), - "nosuchlabel"); + new ResponseEntity<>((Void) null, HttpStatus.NOT_FOUND), "nosuchlabel"); this.locator.setRestTemplate(this.restTemplate); assertThat(this.locator.locate(this.environment)).isNull(); }