From 44f0abad4813fb6a1834bf7b6e87e4b5498b7ac7 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 26 Oct 2018 21:54:45 +0900 Subject: [PATCH 1/3] Polish --- initializr-service/src/main/resources/application.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/initializr-service/src/main/resources/application.yml b/initializr-service/src/main/resources/application.yml index 8079df32..b35b9dde 100644 --- a/initializr-service/src/main/resources/application.yml +++ b/initializr-service/src/main/resources/application.yml @@ -135,11 +135,8 @@ initializr: version: 1.5.0.RELEASE - versionRange: "[1.5.0.RELEASE,1.5.x.BUILD-SNAPSHOT]" version: 1.6.6.RELEASE - - versionRange: "[2.0.0.RELEASE,2.0.x.RELEASE]" + - versionRange: "2.0.0.RELEASE" version: 2.0.2.RELEASE - - versionRange: "2.0.x.BUILD-SNAPSHOT" - version: 2.0.3.BUILD-SNAPSHOT - repositories: spring-snapshots,spring-milestones spring-cloud-task: groupId: org.springframework.cloud artifactId: spring-cloud-task-dependencies From 47d5bd25cde2afba920b44a8e9990873d8ab0b92 Mon Sep 17 00:00:00 2001 From: Govinda Date: Sat, 20 Oct 2018 15:21:12 +0530 Subject: [PATCH 2/3] Polish local variables and lambda names See gh-752 --- .../info/DependencyRangesInfoContributor.java | 24 ++++++------ .../AbstractProjectRequestPostProcessor.java | 2 +- .../InitializrAutoConfiguration.java | 11 +++--- .../DefaultDependencyMetadataProvider.java | 26 ++++++------- .../web/support/SpringBootMetadataReader.java | 14 +++---- .../initializr/web/ui/UiController.java | 37 ++++++++++--------- 6 files changed, 58 insertions(+), 56 deletions(-) diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java index 0bbf5a77..89d1b8d4 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/info/DependencyRangesInfoContributor.java @@ -45,9 +45,9 @@ public class DependencyRangesInfoContributor implements InfoContributor { @Override public void contribute(Info.Builder builder) { Map details = new LinkedHashMap<>(); - this.metadataProvider.get().getDependencies().getAll().forEach((d) -> { - if (d.getBom() == null) { - contribute(details, d); + this.metadataProvider.get().getDependencies().getAll().forEach((dependency) -> { + if (dependency.getBom() == null) { + contribute(details, dependency); } }); if (!details.isEmpty()) { @@ -55,16 +55,16 @@ public class DependencyRangesInfoContributor implements InfoContributor { } } - private void contribute(Map details, Dependency d) { - if (!ObjectUtils.isEmpty(d.getMappings())) { + private void contribute(Map details, Dependency dependency) { + if (!ObjectUtils.isEmpty(dependency.getMappings())) { Map dep = new LinkedHashMap<>(); - d.getMappings().forEach((it) -> { + dependency.getMappings().forEach((it) -> { if (it.getRange() != null && it.getVersion() != null) { dep.put(it.getVersion(), it.getRange()); } }); if (!dep.isEmpty()) { - if (d.getRange() == null) { + if (dependency.getRange() == null) { boolean openRange = dep.values().stream() .anyMatch((v) -> v.getHigherVersion() == null); if (!openRange) { @@ -76,14 +76,14 @@ public class DependencyRangesInfoContributor implements InfoContributor { dep.forEach((k, r) -> { depInfo.put(k, "Spring Boot " + r); }); - details.put(d.getId(), depInfo); + details.put(dependency.getId(), depInfo); } } - else if (d.getVersion() != null && d.getRange() != null) { + else if (dependency.getVersion() != null && dependency.getRange() != null) { Map dep = new LinkedHashMap<>(); - String requirement = "Spring Boot " + d.getRange(); - dep.put(d.getVersion(), requirement); - details.put(d.getId(), dep); + String requirement = "Spring Boot " + dependency.getRange(); + dep.put(dependency.getVersion(), requirement); + details.put(dependency.getId(), dep); } } 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 008e9227..d8745936 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,7 @@ public class AbstractProjectRequestPostProcessor implements ProjectRequestPostPr */ protected Dependency getDependency(ProjectRequest request, String id) { return request.getResolvedDependencies().stream() - .filter((d) -> id.equals(d.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/autoconfigure/InitializrAutoConfiguration.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java index ab9b4013..499fdb10 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrAutoConfiguration.java @@ -166,11 +166,12 @@ public class InitializrAutoConfiguration { @Bean public JCacheManagerCustomizer initializrCacheManagerCustomizer() { - return (cm) -> { - cm.createCache("initializr.metadata", config().setExpiryPolicyFactory( - CreatedExpiryPolicy.factoryOf(Duration.TEN_MINUTES))); - cm.createCache("initializr.dependency-metadata", config()); - cm.createCache("initializr.project-resources", config()); + return (cacheManager) -> { + cacheManager.createCache("initializr.metadata", + config().setExpiryPolicyFactory( + CreatedExpiryPolicy.factoryOf(Duration.TEN_MINUTES))); + cacheManager.createCache("initializr.dependency-metadata", config()); + cacheManager.createCache("initializr.project-resources", config()); }; } diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java index f1fc2251..6191d510 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/DefaultDependencyMetadataProvider.java @@ -40,30 +40,30 @@ public class DefaultDependencyMetadataProvider implements DependencyMetadataProv @Cacheable(cacheNames = "initializr.dependency-metadata", key = "#p1") public DependencyMetadata get(InitializrMetadata metadata, Version bootVersion) { Map dependencies = new LinkedHashMap<>(); - for (Dependency d : metadata.getDependencies().getAll()) { - if (d.match(bootVersion)) { - dependencies.put(d.getId(), d.resolve(bootVersion)); + for (Dependency dependency : metadata.getDependencies().getAll()) { + if (dependency.match(bootVersion)) { + dependencies.put(dependency.getId(), dependency.resolve(bootVersion)); } } Map repositories = new LinkedHashMap<>(); - for (Dependency d : dependencies.values()) { - if (d.getRepository() != null) { - repositories.put(d.getRepository(), metadata.getConfiguration().getEnv() - .getRepositories().get(d.getRepository())); + for (Dependency dependency : dependencies.values()) { + if (dependency.getRepository() != null) { + repositories.put(dependency.getRepository(), metadata.getConfiguration() + .getEnv().getRepositories().get(dependency.getRepository())); } } Map boms = new LinkedHashMap<>(); - for (Dependency d : dependencies.values()) { - if (d.getBom() != null) { - boms.put(d.getBom(), metadata.getConfiguration().getEnv().getBoms() - .get(d.getBom()).resolve(bootVersion)); + for (Dependency dependency : dependencies.values()) { + if (dependency.getBom() != null) { + boms.put(dependency.getBom(), metadata.getConfiguration().getEnv() + .getBoms().get(dependency.getBom()).resolve(bootVersion)); } } // Each resolved bom may require additional repositories - for (BillOfMaterials b : boms.values()) { - for (String id : b.getRepositories()) { + for (BillOfMaterials bom : boms.values()) { + for (String id : bom.getRepositories()) { repositories.put(id, metadata.getConfiguration().getEnv().getRepositories().get(id)); } 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 64f0ae86..18acb81b 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 array = (ArrayNode) this.content.get("projectReleases"); + ArrayNode projectReleases = (ArrayNode) this.content.get("projectReleases"); List list = new ArrayList<>(); - for (JsonNode it : array) { + for (JsonNode jsonNode : projectReleases) { DefaultMetadataElement version = new DefaultMetadataElement(); - version.setId(it.get("version").textValue()); - String name = it.get("versionDisplayName").textValue(); - version.setName( - it.get("snapshot").booleanValue() ? name + " (SNAPSHOT)" : name); - version.setDefault(it.get("current").booleanValue()); + 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()); 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 c6b59833..b776f449 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,15 +57,16 @@ public class UiController { List dependencyGroups = this.metadataProvider.get() .getDependencies().getContent(); List content = new ArrayList<>(); - Version v = (StringUtils.isEmpty(version) ? null : Version.parse(version)); - dependencyGroups.forEach((g) -> g.getContent().forEach((d) -> { - if (v != null && d.getVersionRange() != null) { - if (d.match(v)) { - content.add(new DependencyItem(g.getName(), d)); + Version versionObj = (StringUtils.isEmpty(version) ? null + : Version.parse(version)); + dependencyGroups.forEach((group) -> group.getContent().forEach((dependency) -> { + if (versionObj != null && dependency.getVersionRange() != null) { + if (dependency.match(versionObj)) { + content.add(new DependencyItem(group.getName(), dependency)); } } else { - content.add(new DependencyItem(g.getName(), d)); + content.add(new DependencyItem(group.getName(), dependency)); } })); String json = writeDependencies(content); @@ -76,27 +77,27 @@ public class UiController { private static String writeDependencies(List items) { ObjectNode json = JsonNodeFactory.instance.objectNode(); ArrayNode maps = JsonNodeFactory.instance.arrayNode(); - items.forEach((d) -> maps.add(mapDependency(d))); + items.forEach((dependency) -> maps.add(mapDependency(dependency))); json.set("dependencies", maps); return json.toString(); } private static ObjectNode mapDependency(DependencyItem item) { ObjectNode node = JsonNodeFactory.instance.objectNode(); - Dependency d = item.dependency; - node.put("id", d.getId()); - node.put("name", d.getName()); + Dependency dependency = item.dependency; + node.put("id", dependency.getId()); + node.put("name", dependency.getName()); node.put("group", item.group); - if (d.getDescription() != null) { - node.put("description", d.getDescription()); + if (dependency.getDescription() != null) { + node.put("description", dependency.getDescription()); } - if (d.getWeight() > 0) { - node.put("weight", d.getWeight()); + if (dependency.getWeight() > 0) { + node.put("weight", dependency.getWeight()); } - if (!CollectionUtils.isEmpty(d.getKeywords()) - || !CollectionUtils.isEmpty(d.getAliases())) { - List all = new ArrayList<>(d.getKeywords()); - all.addAll(d.getAliases()); + if (!CollectionUtils.isEmpty(dependency.getKeywords()) + || !CollectionUtils.isEmpty(dependency.getAliases())) { + List all = new ArrayList<>(dependency.getKeywords()); + all.addAll(dependency.getAliases()); node.put("keywords", StringUtils.collectionToCommaDelimitedString(all)); } return node; From a61d85f711c03e08aec22c0130c0b60130f39d86 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sun, 28 Oct 2018 07:24:51 +0900 Subject: [PATCH 3/3] 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)); } }