From a61d85f711c03e08aec22c0130c0b60130f39d86 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 28 Oct 2018 07:24:51 +0900 Subject: [PATCH] Polish "Polish local variables and lambda names" Closes gh-752 --- .../AbstractProjectRequestPostProcessor.java | 3 ++- .../web/support/SpringBootMetadataReader.java | 14 +++++++------- .../io/spring/initializr/web/ui/UiController.java | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/initializr-service/src/main/java/io/spring/initializr/service/extension/AbstractProjectRequestPostProcessor.java b/initializr-service/src/main/java/io/spring/initializr/service/extension/AbstractProjectRequestPostProcessor.java index d8745936..c28cd9cf 100644 --- a/initializr-service/src/main/java/io/spring/initializr/service/extension/AbstractProjectRequestPostProcessor.java +++ b/initializr-service/src/main/java/io/spring/initializr/service/extension/AbstractProjectRequestPostProcessor.java @@ -65,7 +65,8 @@ public class AbstractProjectRequestPostProcessor implements ProjectRequestPostPr */ protected Dependency getDependency(ProjectRequest request, String id) { return request.getResolvedDependencies().stream() - .filter((dependency) -> id.equals(dependency.getId())).findFirst().orElse(null); + .filter((dependency) -> id.equals(dependency.getId())).findFirst() + .orElse(null); } /** diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java b/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java index 18acb81b..e8274b99 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/SpringBootMetadataReader.java @@ -55,15 +55,15 @@ public class SpringBootMetadataReader { * @return the versions */ public List getBootVersions() { - ArrayNode projectReleases = (ArrayNode) this.content.get("projectReleases"); + ArrayNode releases = (ArrayNode) this.content.get("projectReleases"); List list = new ArrayList<>(); - for (JsonNode jsonNode : projectReleases) { + for (JsonNode node : releases) { DefaultMetadataElement version = new DefaultMetadataElement(); - version.setId(jsonNode.get("version").textValue()); - String name = jsonNode.get("versionDisplayName").textValue(); - version.setName(jsonNode.get("snapshot").booleanValue() ? name + " (SNAPSHOT)" - : name); - version.setDefault(jsonNode.get("current").booleanValue()); + version.setId(node.get("version").textValue()); + String name = node.get("versionDisplayName").textValue(); + version.setName( + node.get("snapshot").booleanValue() ? name + " (SNAPSHOT)" : name); + version.setDefault(node.get("current").booleanValue()); list.add(version); } return list; diff --git a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java index b776f449..55d183d6 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/ui/UiController.java @@ -57,11 +57,11 @@ public class UiController { List dependencyGroups = this.metadataProvider.get() .getDependencies().getContent(); List content = new ArrayList<>(); - Version versionObj = (StringUtils.isEmpty(version) ? null + Version requestedVersion = (StringUtils.isEmpty(version) ? null : Version.parse(version)); dependencyGroups.forEach((group) -> group.getContent().forEach((dependency) -> { - if (versionObj != null && dependency.getVersionRange() != null) { - if (dependency.match(versionObj)) { + if (requestedVersion != null && dependency.getVersionRange() != null) { + if (dependency.match(requestedVersion)) { content.add(new DependencyItem(group.getName(), dependency)); } }