From 945b118b0cb46918450336f49bb61e5639bf10cd Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 1 Jan 2020 08:41:11 +0100 Subject: [PATCH] Polish --- .../actuate/stat/ProjectRequestDocumentFactory.java | 5 ++--- .../initializr/generator/buildsystem/BuildSettings.java | 4 ++-- .../initializr/generator/io/text/BulletedSection.java | 4 ++-- .../language/kotlin/KotlinPropertyDeclaration.java | 6 +++--- .../initializr/metadata/InitializrMetadataBuilder.java | 5 +++-- .../initializr/metadata/InitializrMetadataCustomizer.java | 4 ++-- .../web/autoconfigure/InitializrAutoConfiguration.java | 6 +++--- .../initializr/web/autoconfigure/InitializrWebConfig.java | 5 ++--- .../initializr/web/support/CommandLineHelpGenerator.java | 5 ++--- 9 files changed, 21 insertions(+), 23 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 17ca46b3..1adff398 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-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -76,8 +76,7 @@ public class ProjectRequestDocumentFactory { } // Let's not rely on the resolved dependencies here - List dependencies = new ArrayList<>(); - dependencies.addAll(request.getDependencies()); + List dependencies = new ArrayList<>(request.getDependencies()); List validDependencies = dependencies.stream() .filter((id) -> metadata.getDependencies().get(id) != null).collect(Collectors.toList()); document.setDependencies(new DependencyInformation(validDependencies)); diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/BuildSettings.java b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/BuildSettings.java index bf2380ef..d1d36a18 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/BuildSettings.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/BuildSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -64,7 +64,7 @@ public class BuildSettings { * * @param builder type */ - public abstract static class Builder { + public abstract static class Builder> { private String group; diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/io/text/BulletedSection.java b/initializr-generator/src/main/java/io/spring/initializr/generator/io/text/BulletedSection.java index d5dc7795..8184826f 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/io/text/BulletedSection.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/io/text/BulletedSection.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -69,7 +69,7 @@ public class BulletedSection implements Section { * @param item the item to add * @return this for method chaining */ - public BulletedSection addItem(T item) { + public BulletedSection addItem(T item) { this.items.add(item); return this; } diff --git a/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinPropertyDeclaration.java b/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinPropertyDeclaration.java index 3c90bc58..76765371 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinPropertyDeclaration.java +++ b/initializr-generator/src/main/java/io/spring/initializr/generator/language/kotlin/KotlinPropertyDeclaration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -133,12 +133,12 @@ public final class KotlinPropertyDeclaration implements Annotatable { protected abstract T self(); @SuppressWarnings("unchecked") - public AccessorBuilder getter() { + public AccessorBuilder getter() { return new AccessorBuilder<>((T) this, (created) -> this.getter = created); } @SuppressWarnings("unchecked") - public AccessorBuilder setter() { + public AccessorBuilder setter() { return new AccessorBuilder<>((T) this, (created) -> this.setter = created); } diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java index fbd4ac35..61b258d1 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -18,6 +18,7 @@ package io.spring.initializr.metadata; import java.io.InputStream; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; @@ -185,7 +186,7 @@ public final class InitializrMetadataBuilder { private static final Log logger = LogFactory.getLog(ResourceInitializrMetadataCustomizer.class); - private static final Charset UTF_8 = Charset.forName("UTF-8"); + private static final Charset UTF_8 = StandardCharsets.UTF_8; private final Resource resource; diff --git a/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataCustomizer.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataCustomizer.java index a43c60e0..8fed379e 100644 --- a/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataCustomizer.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/InitializrMetadataCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -26,7 +26,7 @@ public interface InitializrMetadataCustomizer { /** * Customize the {@link InitializrMetadata}, updating or moving around capabilities * before they are validated. - * @param metadata the initalizr metadata + * @param metadata the initializr metadata */ void customize(InitializrMetadata metadata); 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 079a6169..552fc3bd 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -143,8 +143,8 @@ public class InitializrAutoConfiguration { @Bean @ConditionalOnMissingBean - ProjectGenerationController projectGenerationController(InitializrMetadataProvider metadataProvider, - ApplicationContext applicationContext) { + ProjectGenerationController projectGenerationController( + InitializrMetadataProvider metadataProvider, ApplicationContext applicationContext) { ProjectGenerationInvoker projectGenerationInvoker = new ProjectGenerationInvoker<>( applicationContext, new DefaultProjectRequestToDescriptionConverter()); return new DefaultProjectGenerationController(metadataProvider, projectGenerationInvoker); diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java index 5de2b88a..37af59d8 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -27,7 +27,6 @@ import io.spring.initializr.web.support.Agent.AgentId; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.util.StringUtils; -import org.springframework.web.HttpMediaTypeNotAcceptableException; import org.springframework.web.accept.ContentNegotiationStrategy; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer; @@ -61,7 +60,7 @@ public class InitializrWebConfig implements WebMvcConfigurer { private final UrlPathHelper urlPathHelper = new UrlPathHelper(); @Override - public List resolveMediaTypes(NativeWebRequest request) throws HttpMediaTypeNotAcceptableException { + public List resolveMediaTypes(NativeWebRequest request) { String path = this.urlPathHelper .getPathWithinApplication(request.getNativeRequest(HttpServletRequest.class)); if (!StringUtils.hasText(path) || !path.equals("/")) { // Only care about "/" 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 3fa888c4..5b086dee 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-2019 the original author or authors. + * Copyright 2012-2020 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. @@ -283,8 +283,7 @@ public class CommandLineHelpGenerator { private static List computeRow(String[][] content, int rowIndex, int maxWidth) { String[] line = content[rowIndex]; - List row = HelpFormatter.format(line, maxWidth); - return row; + return HelpFormatter.format(line, maxWidth); } private static void appendEmptyRow(StringBuilder sb, int[] columnsLength) {