From ec48337dac5c5d99f6e2737cc5b84bf75d39bd76 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 8 Nov 2022 16:35:59 +0900 Subject: [PATCH] Use Java 17 constructs --- .../stat/ProjectRequestDocumentFactory.java | 8 ++--- .../GradleProjectGenerationConfiguration.java | 6 ++-- .../buildsystem/maven/MavenBuildAssert.java | 8 ++--- .../test/project/AbstractProjectAssert.java | 4 +-- .../buildsystem/gradle/GradleBuildWriter.java | 31 +++++++------------ .../gradle/KotlinDslGradleBuildWriter.java | 4 +-- .../buildsystem/maven/MavenBuildWriter.java | 27 ++++++---------- .../buildsystem/maven/MavenPlugin.java | 5 ++- .../generator/io/SimpleIndentStrategy.java | 8 ++--- .../groovy/GroovySourceCodeWriter.java | 4 +-- .../language/java/JavaSourceCodeWriter.java | 4 +-- .../kotlin/KotlinSourceCodeWriter.java | 4 +-- .../project/DefaultProjectAssetGenerator.java | 5 ++- .../generator/project/ProjectGenerator.java | 5 ++- .../generator/version/VersionParser.java | 7 ++--- .../generator/version/VersionProperty.java | 4 +-- .../initializr/metadata/Dependency.java | 8 ++--- .../metadata/SingleSelectCapability.java | 14 ++++----- .../support/MetadataBuildItemMapper.java | 26 ++++++---------- .../web/support/CommandLineHelpGenerator.java | 11 +++---- 20 files changed, 76 insertions(+), 117 deletions(-) diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java index 1adff398..dfaaa9e8 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -87,9 +87,8 @@ public class ProjectRequestDocumentFactory { } // Let's make sure that the document is flagged as invalid no matter what - if (event instanceof ProjectFailedEvent) { + if (event instanceof ProjectFailedEvent failed) { ErrorStateInformation errorState = document.triggerError(); - ProjectFailedEvent failed = (ProjectFailedEvent) event; if (failed.getCause() != null) { errorState.setMessage(failed.getCause().getMessage()); } @@ -112,8 +111,7 @@ public class ProjectRequestDocumentFactory { } private ClientInformation determineClientInformation(ProjectRequest request) { - if (request instanceof WebProjectRequest) { - WebProjectRequest webProjectRequest = (WebProjectRequest) request; + if (request instanceof WebProjectRequest webProjectRequest) { Agent agent = determineAgent(webProjectRequest); String ip = determineIp(webProjectRequest); String country = determineCountry(webProjectRequest); diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java index 846d5d5d..7788255c 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/gradle/GradleProjectGenerationConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -173,7 +173,7 @@ public class GradleProjectGenerationConfiguration { @Bean @ConditionalOnPlatformVersion("2.2.0.M3") BuildCustomizer testTaskContributor() { - return new BuildCustomizer() { + return new BuildCustomizer<>() { @Override public void customize(GradleBuild build) { build.tasks().customize("test", (test) -> test.invoke("useJUnitPlatform")); @@ -216,7 +216,7 @@ public class GradleProjectGenerationConfiguration { @Bean @ConditionalOnPlatformVersion("2.2.0.M3") BuildCustomizer testTaskContributor() { - return new BuildCustomizer() { + return new BuildCustomizer<>() { @Override public void customize(GradleBuild build) { build.tasks().customizeWithType("Test", (test) -> test.invoke("useJUnitPlatform")); diff --git a/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/buildsystem/maven/MavenBuildAssert.java b/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/buildsystem/maven/MavenBuildAssert.java index c85eaad4..6674b36f 100644 --- a/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/buildsystem/maven/MavenBuildAssert.java +++ b/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/buildsystem/maven/MavenBuildAssert.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -354,9 +354,8 @@ public class MavenBuildAssert extends AbstractTextAssert { } private static Dependency toDependency(Node item) { - if (item instanceof Element) { + if (item instanceof Element element) { Dependency dependency = new Dependency(); - Element element = (Element) item; NodeList groupId = element.getElementsByTagName("groupId"); if (groupId.getLength() > 0) { dependency.setGroupId(groupId.item(0).getTextContent()); @@ -383,8 +382,7 @@ public class MavenBuildAssert extends AbstractTextAssert { } private static BillOfMaterials toBom(Node item) { - if (item instanceof Element) { - Element element = (Element) item; + if (item instanceof Element element) { NodeList type = element.getElementsByTagName("type"); NodeList scope = element.getElementsByTagName("scope"); if (isBom(type, scope)) { diff --git a/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/project/AbstractProjectAssert.java b/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/project/AbstractProjectAssert.java index c554a9f9..0bd206d4 100644 --- a/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/project/AbstractProjectAssert.java +++ b/initializr-generator-test/src/main/java/io/spring/initializr/generator/test/project/AbstractProjectAssert.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -132,7 +132,7 @@ public abstract class AbstractProjectAssert getRelativePathsOfProjectFiles() { List relativePaths = new ArrayList<>(); try { - Files.walkFileTree(this.actual, new SimpleFileVisitor() { + Files.walkFileTree(this.actual, new SimpleFileVisitor<>() { @Override public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) { relativePaths.add(createRelativePath(file)); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java index 222c18c0..d5ce0c27 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/GradleBuildWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -75,7 +75,7 @@ public abstract class GradleBuildWriter { } private void writeImports(IndentingWriter writer, GradleTaskContainer tasks) { - List imports = tasks.importedTypes().sorted().collect(Collectors.toList()); + List imports = tasks.importedTypes().sorted().toList(); imports.forEach((importedType) -> writer.println("import " + importedType)); if (!imports.isEmpty()) { writer.println(); @@ -163,24 +163,15 @@ public abstract class GradleBuildWriter { if (type == null) { return "implementation"; } - switch (type) { - case ANNOTATION_PROCESSOR: - return "annotationProcessor"; - case COMPILE: - return "implementation"; - case COMPILE_ONLY: - return "compileOnly"; - case PROVIDED_RUNTIME: - return "providedRuntime"; - case RUNTIME: - return "runtimeOnly"; - case TEST_COMPILE: - return "testImplementation"; - case TEST_RUNTIME: - return "testRuntimeOnly"; - default: - throw new IllegalStateException("Unrecognized dependency type '" + type + "'"); - } + return switch (type) { + case ANNOTATION_PROCESSOR -> "annotationProcessor"; + case COMPILE -> "implementation"; + case COMPILE_ONLY -> "compileOnly"; + case PROVIDED_RUNTIME -> "providedRuntime"; + case RUNTIME -> "runtimeOnly"; + case TEST_COMPILE -> "testImplementation"; + case TEST_RUNTIME -> "testRuntimeOnly"; + }; } private void writeBoms(IndentingWriter writer, GradleBuild build) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java index 3da0170b..dd624dfa 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/gradle/KotlinDslGradleBuildWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -125,7 +125,7 @@ public class KotlinDslGradleBuildWriter extends GradleBuildWriter { protected void writeConfigurations(IndentingWriter writer, GradleConfigurationContainer configurations) { configurations.names() .forEach((configuration) -> writer.println("val " + configuration + " by configurations.creating")); - if (!configurations.customizations().findFirst().isPresent()) { + if (configurations.customizations().findFirst().isEmpty()) { return; } writer.println("configurations {"); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildWriter.java index 0c550182..e81af7d0 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenBuildWriter.java @@ -263,24 +263,15 @@ public class MavenBuildWriter { if (type == null) { return null; } - switch (type) { - case ANNOTATION_PROCESSOR: - return null; - case COMPILE: - return null; - case COMPILE_ONLY: - return null; - case PROVIDED_RUNTIME: - return "provided"; - case RUNTIME: - return "runtime"; - case TEST_COMPILE: - return "test"; - case TEST_RUNTIME: - return "test"; - default: - throw new IllegalStateException("Unrecognized dependency type '" + type + "'"); - } + return switch (type) { + case ANNOTATION_PROCESSOR -> null; + case COMPILE -> null; + case COMPILE_ONLY -> null; + case PROVIDED_RUNTIME -> "provided"; + case RUNTIME -> "runtime"; + case TEST_COMPILE -> "test"; + case TEST_RUNTIME -> "test"; + }; } private boolean isOptional(Dependency dependency) { diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenPlugin.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenPlugin.java index 4cfdc3ed..091d416f 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenPlugin.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -315,11 +315,10 @@ public class MavenPlugin { this.settings.add(nestedSetting); return nestedSetting; }).getValue(); - if (!(value instanceof ConfigurationBuilder)) { + if (!(value instanceof ConfigurationBuilder nestedConfiguration)) { throw new IllegalArgumentException(String.format( "Could not customize parameter '%s', a single value %s is already registered", name, value)); } - ConfigurationBuilder nestedConfiguration = (ConfigurationBuilder) value; consumer.accept(nestedConfiguration); return this; } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/io/SimpleIndentStrategy.java b/initializr-generator/src/main/java/io/spring/initializr/generator/io/SimpleIndentStrategy.java index d8d61d32..95a0f7e7 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/io/SimpleIndentStrategy.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/io/SimpleIndentStrategy.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,11 +43,7 @@ public class SimpleIndentStrategy implements Function { if (level < 0) { throw new IllegalArgumentException("Indent level must not be negative, got" + level); } - StringBuilder indentBuilder = new StringBuilder(); - for (int i = 0; i < level; i++) { - indentBuilder.append(this.indent); - } - return indentBuilder.toString(); + return String.valueOf(this.indent).repeat(level); } } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/language/groovy/GroovySourceCodeWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/language/groovy/GroovySourceCodeWriter.java index 1e443a2f..d37b613c 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/language/groovy/GroovySourceCodeWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/language/groovy/GroovySourceCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -285,7 +285,7 @@ public class GroovySourceCodeWriter implements SourceCodeWriter value.substring(0, value.lastIndexOf("."))) - .collect(Collectors.toList())); + .toList()); } }); return imports; diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/language/java/JavaSourceCodeWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/language/java/JavaSourceCodeWriter.java index 700ccfd7..64bbd689 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/language/java/JavaSourceCodeWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/language/java/JavaSourceCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -288,7 +288,7 @@ public class JavaSourceCodeWriter implements SourceCodeWriter { } if (Enum.class.isAssignableFrom(attribute.getType())) { imports.addAll(attribute.getValues().stream().map((value) -> value.substring(0, value.lastIndexOf("."))) - .collect(Collectors.toList())); + .toList()); } }); return imports; diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinSourceCodeWriter.java b/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinSourceCodeWriter.java index 6540b689..3dcb4914 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinSourceCodeWriter.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinSourceCodeWriter.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -333,7 +333,7 @@ public class KotlinSourceCodeWriter implements SourceCodeWriter value.substring(0, value.lastIndexOf("."))) - .collect(Collectors.toList())); + .toList()); } }); return imports; diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java index 9b62d3ce..63d3f601 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/project/DefaultProjectAssetGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -import java.util.stream.Collectors; import io.spring.initializr.generator.project.contributor.ProjectContributor; @@ -58,7 +57,7 @@ public class DefaultProjectAssetGenerator implements ProjectAssetGenerator Path projectRoot = resolveProjectDirectoryFactory(context).createProjectDirectory(description); Path projectDirectory = initializerProjectDirectory(projectRoot, description); List contributors = context.getBeanProvider(ProjectContributor.class).orderedStream() - .collect(Collectors.toList()); + .toList(); for (ProjectContributor contributor : contributors) { contributor.contribute(projectDirectory); } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java b/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java index 5d9a00b4..6b2042fc 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/project/ProjectGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -140,8 +140,7 @@ public class ProjectGenerator { private Supplier resolve(ProjectDescription description, ProjectGenerationContext context) { return () -> { - if (description instanceof MutableProjectDescription) { - MutableProjectDescription mutableDescription = (MutableProjectDescription) description; + if (description instanceof MutableProjectDescription mutableDescription) { ProjectDescriptionDiffFactory diffFactory = context.getBeanProvider(ProjectDescriptionDiffFactory.class) .getIfAvailable(DefaultProjectDescriptionDiffFactory::new); // Create the diff here so that it takes a copy of the description diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java index 90149b6d..7fde07b5 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import java.util.Collections; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import io.spring.initializr.generator.version.Version.Qualifier; @@ -50,7 +49,7 @@ public class VersionParser { private static final Pattern VERSION_REGEX = Pattern .compile("^(\\d+)\\.(\\d+|x)\\.(\\d+|x)(?:([.|-])([^0-9]+)(\\d+)?)?$"); - private static final Pattern RANGE_REGEX = Pattern.compile("(\\(|\\[)(.*),(.*)(\\)|\\])"); + private static final Pattern RANGE_REGEX = Pattern.compile("([(\\[])(.*),(.*)([)\\]])"); private final List latestVersions; @@ -153,7 +152,7 @@ public class VersionParser { return false; } return true; - }).collect(Collectors.toList()); + }).toList(); return (matches.size() != 1) ? null : matches.get(0); } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java index 13c8451d..d7e0eda0 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/version/VersionProperty.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public final class VersionProperty implements Serializable, Comparable SCOPE_ALL = Collections.unmodifiableList(Arrays.asList(SCOPE_COMPILE, - SCOPE_RUNTIME, SCOPE_COMPILE_ONLY, SCOPE_ANNOTATION_PROCESSOR, SCOPE_PROVIDED, SCOPE_TEST)); + public static final List SCOPE_ALL = List.of(SCOPE_COMPILE, SCOPE_RUNTIME, SCOPE_COMPILE_ONLY, + SCOPE_ANNOTATION_PROCESSOR, SCOPE_PROVIDED, SCOPE_TEST); private List aliases = new ArrayList<>(); diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java index 8b910c82..3baca88a 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/SingleSelectCapability.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -85,13 +85,11 @@ public class SingleSelectCapability extends ServiceCapability otherContent) { - withWritableContent((content) -> { - otherContent.forEach((it) -> { - if (get(it.getId()) == null) { - this.content.add(it); - } - }); - }); + withWritableContent((content) -> otherContent.forEach((it) -> { + if (get(it.getId()) == null) { + this.content.add(it); + } + })); } private T withReadableContent(Function, T> consumer) { diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java index 405b443b..8e745ff8 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,21 +51,15 @@ public final class MetadataBuildItemMapper { } private static DependencyScope toDependencyScope(String scope) { - switch (scope) { - case Dependency.SCOPE_ANNOTATION_PROCESSOR: - return DependencyScope.ANNOTATION_PROCESSOR; - case Dependency.SCOPE_COMPILE: - return DependencyScope.COMPILE; - case Dependency.SCOPE_RUNTIME: - return DependencyScope.RUNTIME; - case Dependency.SCOPE_COMPILE_ONLY: - return DependencyScope.COMPILE_ONLY; - case Dependency.SCOPE_PROVIDED: - return DependencyScope.PROVIDED_RUNTIME; - case Dependency.SCOPE_TEST: - return DependencyScope.TEST_COMPILE; - } - return null; + return switch (scope) { + case Dependency.SCOPE_ANNOTATION_PROCESSOR -> DependencyScope.ANNOTATION_PROCESSOR; + case Dependency.SCOPE_COMPILE -> DependencyScope.COMPILE; + case Dependency.SCOPE_RUNTIME -> DependencyScope.RUNTIME; + case Dependency.SCOPE_COMPILE_ONLY -> DependencyScope.COMPILE_ONLY; + case Dependency.SCOPE_PROVIDED -> DependencyScope.PROVIDED_RUNTIME; + case Dependency.SCOPE_TEST -> DependencyScope.TEST_COMPILE; + default -> null; + }; } /** diff --git a/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java b/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java index 5b086dee..75088a01 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/CommandLineHelpGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2020 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,6 @@ import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import io.spring.initializr.generator.io.template.TemplateRenderer; import io.spring.initializr.metadata.Dependency; @@ -135,7 +134,7 @@ public class CommandLineHelpGenerator { String[][] parameterTable = new String[defaults.size() + 1][]; parameterTable[0] = new String[] { "Parameter", "Description", "Default value" }; int i = 1; - for (String id : defaults.keySet().stream().sorted().collect(Collectors.toList())) { + for (String id : defaults.keySet().stream().sorted().toList()) { String[] data = new String[3]; data[0] = id; data[1] = (String) parametersDescription.get(id); @@ -159,7 +158,7 @@ public class CommandLineHelpGenerator { String[][] parameterTable = new String[defaults.size() + 1][]; parameterTable[0] = new String[] { "Id", "Description", "Default value" }; int i = 1; - for (String id : defaults.keySet().stream().sorted().collect(Collectors.toList())) { + for (String id : defaults.keySet().stream().sorted().toList()) { String[] data = new String[3]; data[0] = id; data[1] = (String) parametersDescription.get(id); @@ -175,7 +174,7 @@ public class CommandLineHelpGenerator { dependencyTable[0] = new String[] { "Id", "Description", "Required version" }; int i = 1; for (Dependency dep : metadata.getDependencies().getAll().stream() - .sorted(Comparator.comparing(MetadataElement::getId)).collect(Collectors.toList())) { + .sorted(Comparator.comparing(MetadataElement::getId)).toList()) { String[] data = new String[3]; data[0] = dep.getId(); data[1] = (dep.getDescription() != null) ? dep.getDescription() : dep.getName(); @@ -195,7 +194,7 @@ public class CommandLineHelpGenerator { } int i = 1; for (Type type : metadata.getTypes().getContent().stream().sorted(Comparator.comparing(MetadataElement::getId)) - .collect(Collectors.toList())) { + .toList()) { String[] data = new String[typeTable[0].length]; data[0] = (type.isDefault() ? type.getId() + " *" : type.getId()); data[1] = (type.getDescription() != null) ? type.getDescription() : type.getName();