From e7248ff2737de7ec176fd91a1e7a268ae16420da Mon Sep 17 00:00:00 2001 From: dreis2211 Date: Mon, 29 Jan 2018 22:31:10 +0100 Subject: [PATCH] Use interfaces for collection declarations Closes gh-11839 --- .../main/java/org/springframework/boot/actuate/info/Info.java | 2 +- .../org/springframework/boot/cli/DefaultCommandFactory.java | 2 +- .../cli/command/init/ServiceCapabilitiesReportGenerator.java | 2 +- .../springframework/boot/cli/command/options/OptionHandler.java | 2 +- .../java/org/springframework/boot/cli/compiler/AstUtils.java | 2 +- .../org/springframework/boot/cli/compiler/GroovyCompiler.java | 2 +- .../springframework/boot/builder/SpringApplicationBuilder.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java index a27c880e624..61c4eefc2ff 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/info/Info.java @@ -40,7 +40,7 @@ public final class Info { private final Map details; private Info(Builder builder) { - LinkedHashMap content = new LinkedHashMap<>(); + Map content = new LinkedHashMap<>(); content.putAll(builder.content); this.details = Collections.unmodifiableMap(content); } diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java index 8bb06dc9fb3..9414a7613c6 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/DefaultCommandFactory.java @@ -42,7 +42,7 @@ public class DefaultCommandFactory implements CommandFactory { private static final List DEFAULT_COMMANDS; static { - ArrayList defaultCommands = new ArrayList<>(); + List defaultCommands = new ArrayList<>(); defaultCommands.add(new VersionCommand()); defaultCommands.add(new RunCommand()); defaultCommands.add(new GrabCommand()); diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java index b462a4fe284..5f5367c681e 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/init/ServiceCapabilitiesReportGenerator.java @@ -93,7 +93,7 @@ class ServiceCapabilitiesReportGenerator { } private List getSortedDependencies(InitializrServiceMetadata metadata) { - ArrayList dependencies = new ArrayList<>(metadata.getDependencies()); + List dependencies = new ArrayList<>(metadata.getDependencies()); dependencies.sort(Comparator.comparing(Dependency::getId)); return dependencies; } diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java index 29d1972d156..c2940e4b529 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/options/OptionHandler.java @@ -150,7 +150,7 @@ public class OptionHandler { private static class OptionHelpAdapter implements OptionHelp { - private final LinkedHashSet options; + private final Set options; private final String description; diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java index ef2656c1e0b..c4c37965d6f 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/AstUtils.java @@ -167,7 +167,7 @@ public abstract class AstUtils { private static List getExpressionStatements( BlockStatement block) { - ArrayList statements = new ArrayList<>(); + List statements = new ArrayList<>(); for (Statement statement : block.getStatements()) { if (statement instanceof ExpressionStatement) { statements.add((ExpressionStatement) statement); diff --git a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java index cd14ed22fb1..41551152316 100644 --- a/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java +++ b/spring-boot-project/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GroovyCompiler.java @@ -257,7 +257,7 @@ public class GroovyCompiler { }); } - private int getIndexOfASTTransformationVisitor(LinkedList conversionOperations) { + private int getIndexOfASTTransformationVisitor(List conversionOperations) { for (int index = 0; index < conversionOperations.size(); index++) { if (conversionOperations.get(index).getClass().getName() .startsWith(ASTTransformationVisitor.class.getName())) { diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java index cbc4cb32318..3a03607155a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java @@ -424,7 +424,7 @@ public class SpringApplicationBuilder { } private Map getMapFromProperties(Properties properties) { - HashMap map = new HashMap<>(); + Map map = new HashMap<>(); for (Object key : Collections.list(properties.propertyNames())) { map.put((String) key, properties.get(key)); }