Repository: karaf Updated Branches: refs/heads/master b0c08227c -> 4888b6a17
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/support/RegexCommandLoggingFilter.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/RegexCommandLoggingFilter.java b/shell/core/src/main/java/org/apache/karaf/shell/support/RegexCommandLoggingFilter.java index 0b01131..9793f4f 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/support/RegexCommandLoggingFilter.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/support/RegexCommandLoggingFilter.java @@ -56,7 +56,7 @@ public class RegexCommandLoggingFilter implements CommandLoggingFilter { private int group=1; private String replacement=DEFAULT_REPLACEMENT; - ArrayList<ReplaceRegEx> regexs = new ArrayList<ReplaceRegEx>(); + ArrayList<ReplaceRegEx> regexs = new ArrayList<>(); public CharSequence filter(CharSequence command) { if( pattern!=null ) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/support/completers/StringsCompleter.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/completers/StringsCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/support/completers/StringsCompleter.java index 33364fa..0ddcf51 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/support/completers/StringsCompleter.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/support/completers/StringsCompleter.java @@ -44,7 +44,7 @@ public class StringsCompleter } public StringsCompleter(final boolean caseSensitive) { - this.strings = new TreeSet<String>(new Comparator<String>() { + this.strings = new TreeSet<>(new Comparator<String>() { @Override public int compare(String o1, String o2) { return caseSensitive ? o1.compareTo(o2) : o1.compareToIgnoreCase(o2); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java index 8492542..d2ff974 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/DefaultConverter.java @@ -397,7 +397,7 @@ public class DefaultConverter private static final Map<Class, Class> primitives; static { - primitives = new HashMap<Class, Class>(); + primitives = new HashMap<>(); primitives.put(byte.class, Byte.class); primitives.put(short.class, Short.class); primitives.put(char.class, Character.class); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java index ac97de2..42cf1b7 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/support/converter/GenericType.java @@ -34,7 +34,7 @@ public class GenericType extends ReifiedType { private static final GenericType[] EMPTY = new GenericType[0]; - private static final Map<String, Class> primitiveClasses = new HashMap<String, Class>(); + private static final Map<String, Class> primitiveClasses = new HashMap<>(); static { primitiveClasses.put("int", int.class); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java b/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java index 731a61e..27de543 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/support/parsing/GogoParser.java @@ -139,7 +139,7 @@ public class GogoParser { } public List<List<List<String>>> program() { - program = new ArrayList<List<List<String>>>(); + program = new ArrayList<>(); ws(); if (!eof()) { program.add(pipeline()); @@ -164,7 +164,7 @@ public class GogoParser { } public List<List<String>> pipeline() { - statements = new ArrayList<List<String>>(); + statements = new ArrayList<>(); statements.add(statement()); while (peek() == '|') { current++; @@ -173,7 +173,7 @@ public class GogoParser { statements.add(statement()); } else { - statements.add(new ArrayList<String>()); + statements.add(new ArrayList<>()); break; } } @@ -183,7 +183,7 @@ public class GogoParser { } public List<String> statement() { - statement = new ArrayList<String>(); + statement = new ArrayList<>(); statement.add(value()); while (!eof()) { ws(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/support/table/Row.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/support/table/Row.java b/shell/core/src/main/java/org/apache/karaf/shell/support/table/Row.java index 4a27cec..8a8dbd6 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/support/table/Row.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/support/table/Row.java @@ -24,8 +24,8 @@ public class Row { private List<String> content; Row() { - data = new ArrayList<Object>(); - content = new ArrayList<String>(); + data = new ArrayList<>(); + content = new ArrayList<>(); } Row(List<Col> cols) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java index 1248112..c5d1781 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/Activator.java @@ -186,7 +186,7 @@ public class Activator extends BaseActivator implements ManagedService { server.setKeyExchangeFactories(SshUtils.buildKexAlgorithms(kexAlgorithms)); server.setShellFactory(new ShellFactoryImpl(sessionFactory)); server.setCommandFactory(new ScpCommandFactory.Builder().withDelegate(new ShellCommandFactory(sessionFactory)).build()); - server.setSubsystemFactories(Arrays.<NamedFactory<org.apache.sshd.server.Command>>asList(new SftpSubsystemFactory())); + server.setSubsystemFactories(Arrays.asList(new SftpSubsystemFactory())); server.setKeyPairProvider(keyPairProvider); server.setPasswordAuthenticator(authenticator); server.setPublickeyAuthenticator(authenticator); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java index 20a769e..b6d1034 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/KarafJaasAuthenticator.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; public class KarafJaasAuthenticator implements PasswordAuthenticator, PublickeyAuthenticator { - public static final Session.AttributeKey<Subject> SUBJECT_ATTRIBUTE_KEY = new Session.AttributeKey<Subject>(); + public static final Session.AttributeKey<Subject> SUBJECT_ATTRIBUTE_KEY = new Session.AttributeKey<>(); private final Logger LOGGER = LoggerFactory.getLogger(KarafJaasAuthenticator.class); private String realm; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java index 82c8e04..bc2bb41 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/SshUtils.java @@ -40,7 +40,7 @@ public class SshUtils { public static <S> List<NamedFactory<S>> filter(Class<S> type, Collection<NamedFactory<S>> factories, String[] names) { - List<NamedFactory<S>> list = new ArrayList<NamedFactory<S>>(); + List<NamedFactory<S>> list = new ArrayList<>(); for (String name : names) { name = name.trim(); boolean found = false; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactoriesFactory.java ---------------------------------------------------------------------- diff --git a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactoriesFactory.java b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactoriesFactory.java index 994121e..4d59e73 100644 --- a/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactoriesFactory.java +++ b/shell/ssh/src/main/java/org/apache/karaf/shell/ssh/UserAuthFactoriesFactory.java @@ -50,8 +50,8 @@ public class UserAuthFactoriesFactory { private List<NamedFactory<UserAuth>> factories; public void setAuthMethods(String[] methods) { - this.methodSet = new HashSet<String>(); - this.factories = new ArrayList<NamedFactory<UserAuth>>(); + this.methodSet = new HashSet<>(); + this.factories = new ArrayList<>(); for (String am : methods) { if (PASSWORD_METHOD.equals(am)) { this.factories.add(new UserAuthPasswordFactory()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/table/src/main/java/org/apache/karaf/shell/table/Row.java ---------------------------------------------------------------------- diff --git a/shell/table/src/main/java/org/apache/karaf/shell/table/Row.java b/shell/table/src/main/java/org/apache/karaf/shell/table/Row.java index 384bc9c..7fa1dc1 100644 --- a/shell/table/src/main/java/org/apache/karaf/shell/table/Row.java +++ b/shell/table/src/main/java/org/apache/karaf/shell/table/Row.java @@ -24,8 +24,8 @@ public class Row { private List<String> content; Row() { - data = new ArrayList<Object>(); - content = new ArrayList<String>(); + data = new ArrayList<>(); + content = new ArrayList<>(); } Row(List<Col> cols) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/table/src/main/java/org/apache/karaf/shell/table/ShellTable.java ---------------------------------------------------------------------- diff --git a/shell/table/src/main/java/org/apache/karaf/shell/table/ShellTable.java b/shell/table/src/main/java/org/apache/karaf/shell/table/ShellTable.java index 444b0fb..9f3ed1b 100644 --- a/shell/table/src/main/java/org/apache/karaf/shell/table/ShellTable.java +++ b/shell/table/src/main/java/org/apache/karaf/shell/table/ShellTable.java @@ -27,8 +27,8 @@ import java.util.List; @Deprecated public class ShellTable { - private List<Col> cols = new ArrayList<Col>(); - private List<Row> rows = new ArrayList<Row>(); + private List<Col> cols = new ArrayList<>(); + private List<Row> rows = new ArrayList<>(); boolean showHeaders = true; private String separator = " | "; private int size; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/subsystem/src/main/java/org/apache/karaf/subsystem/commands/InfoAction.java ---------------------------------------------------------------------- diff --git a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/InfoAction.java b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/InfoAction.java index 38adaa5..6c90028 100644 --- a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/InfoAction.java +++ b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/InfoAction.java @@ -89,10 +89,10 @@ public class InfoAction extends SubsystemSupport implements Action { protected String generateFormattedOutput(Subsystem subsystem) { StringBuilder output = new StringBuilder(); - Map<String, Object> otherAttribs = new TreeMap<String, Object>(); - Map<String, Object> subsystemAttribs = new TreeMap<String, Object>(); - Map<String, Object> serviceAttribs = new TreeMap<String, Object>(); - Map<String, Object> packagesAttribs = new TreeMap<String, Object>(); + Map<String, Object> otherAttribs = new TreeMap<>(); + Map<String, Object> subsystemAttribs = new TreeMap<>(); + Map<String, Object> serviceAttribs = new TreeMap<>(); + Map<String, Object> packagesAttribs = new TreeMap<>(); Map<String, String> dict = subsystem.getSubsystemHeaders(null); // do an initial loop and separate the attributes in different groups @@ -159,7 +159,7 @@ public class InfoAction extends SubsystemSupport implements Action { output.append('\n'); } - Map<String, ClauseFormatter> formatters = new HashMap<String, ClauseFormatter>(); + Map<String, ClauseFormatter> formatters = new HashMap<>(); /* formatters.put(REQUIRE_BUNDLE_ATTRIB, new ClauseFormatter() { public void pre(Clause clause, StringBuilder output) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemCompleter.java ---------------------------------------------------------------------- diff --git a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemCompleter.java b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemCompleter.java index 025b9f4..f195bb4 100644 --- a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemCompleter.java +++ b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemCompleter.java @@ -28,7 +28,7 @@ public class SubsystemCompleter extends SubsystemSupport implements Completer { @Override public int complete(Session session, CommandLine commandLine, List<String> candidates) { - List<String> strings = new ArrayList<String>(); + List<String> strings = new ArrayList<>(); for (Subsystem ss : getSubsystems()) { strings.add(Long.toString(ss.getSubsystemId())); strings.add(ss.getSymbolicName() + "/" + ss.getVersion()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java ---------------------------------------------------------------------- diff --git a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java index c19ebfe..fa22350 100644 --- a/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java +++ b/subsystem/src/main/java/org/apache/karaf/subsystem/commands/SubsystemSupport.java @@ -56,7 +56,7 @@ public abstract class SubsystemSupport { if (id == null || id.isEmpty()) { return getSubsystems(); } - List<Subsystem> subsystems = new ArrayList<Subsystem>(); + List<Subsystem> subsystems = new ArrayList<>(); // Try with the id Pattern pattern = Pattern.compile("^\\d+$"); Matcher matcher = pattern.matcher(id); @@ -102,7 +102,7 @@ public abstract class SubsystemSupport { } protected List<Long> getSubsytemIds(Collection<Subsystem> subsystems) { - List<Long> ids = new ArrayList<Long>(); + List<Long> ids = new ArrayList<>(); for (Subsystem ss : subsystems) { long id = ss.getSubsystemId(); if (!ids.contains(id)) { @@ -114,9 +114,9 @@ public abstract class SubsystemSupport { } protected List<Subsystem> getSubsystems() { - Map<Long, Subsystem> subsystems = new TreeMap<Long, Subsystem>(); + Map<Long, Subsystem> subsystems = new TreeMap<>(); doGetSubsystems(subsystems, getRoot()); - return new ArrayList<Subsystem>(subsystems.values()); + return new ArrayList<>(subsystems.values()); } private void doGetSubsystems(Map<Long, Subsystem> subsystems, Subsystem subsystem) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java ---------------------------------------------------------------------- diff --git a/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java b/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java index f881e22..4cf4ad1 100644 --- a/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java +++ b/system/src/main/java/org/apache/karaf/system/management/internal/SystemMBeanImpl.java @@ -154,7 +154,7 @@ public class SystemMBeanImpl extends StandardMBean implements SystemMBean { @Override public Map<String, String> getProperties(boolean unset, boolean dumpToFile) throws MBeanException { try { - Map<String, String> result = new HashMap<String, String>(); + Map<String, String> result = new HashMap<>(); Properties props = (Properties) java.lang.System.getProperties().clone(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java index a2d2418..9d285d4 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/AssemblyMojo.java @@ -574,7 +574,7 @@ public class AssemblyMojo extends MojoSupport { } private List<String> nonNullList(List<String> list) { - return list == null ? new ArrayList<String>() : list; + return list == null ? new ArrayList<>() : list; } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java index 6768378..e18fedd 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/KarMojo.java @@ -199,7 +199,7 @@ public class KarMojo extends MojoSupport { * @throws MojoExecutionException */ private List<Artifact> readResources(File featuresFile) throws MojoExecutionException { - List<Artifact> resources = new ArrayList<Artifact>(); + List<Artifact> resources = new ArrayList<>(); try { Features features = JaxbUtil.unmarshal(featuresFile.toURI().toASCIIString(), false); for (Feature feature : features.getFeature()) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java index c2699b8..eb5c7c0 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/AsciiDoctorCommandHelpPrinter.java @@ -37,7 +37,7 @@ public class AsciiDoctorCommandHelpPrinter extends AbstractCommandHelpPrinter { public void printHelp(Action action, PrintStream out, boolean includeHelpOption) { Command command = action.getClass().getAnnotation(Command.class); Set<Option> options = new HashSet<>(); - List<Argument> arguments = new ArrayList<Argument>(); + List<Argument> arguments = new ArrayList<>(); Map<Argument, Field> argFields = new HashMap<>(); Map<Option, Field> optFields = new HashMap<>(); for (Class<?> type = action.getClass(); type != null; type = type.getSuperclass()) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java index 7d729b6..4ad9549 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/DocBookCommandHelpPrinter.java @@ -42,7 +42,7 @@ public class DocBookCommandHelpPrinter extends AbstractCommandHelpPrinter { public void printHelp(Action action, PrintStream out, boolean includeHelpOption) { Command command = action.getClass().getAnnotation(Command.class); Set<Option> options = new HashSet<>(); - List<Argument> arguments = new ArrayList<Argument>(); + List<Argument> arguments = new ArrayList<>(); Map<Argument, Field> argFields = new HashMap<>(); Map<Option, Field> optFields = new HashMap<>(); for (Class<?> type = action.getClass(); type != null; type = type.getSuperclass()) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java index aceea70..fec7490 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/GenerateHelpMojo.java @@ -111,7 +111,7 @@ public class GenerateHelpMojo extends AbstractMojo { helpPrinter = new DocBookCommandHelpPrinter(); } - Map<String, Set<String>> commands = new TreeMap<String, Set<String>>(); + Map<String, Set<String>> commands = new TreeMap<>(); String commandSuffix = null; if (FORMAT_ASCIIDOC.equals(format)) { @@ -167,7 +167,7 @@ public class GenerateHelpMojo extends AbstractMojo { Exception, MojoFailureException { ClassFinder finder; if ("project".equals(classloaderType)) { - List<URL> urls = new ArrayList<URL>(); + List<URL> urls = new ArrayList<>(); for (Object object : project.getCompileClasspathElements()) { String path = (String) object; urls.add(new File(path).toURI().toURL()); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java index 669f5b2..d4aa9a1 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/commands/UserConfCommandHelpPrinter.java @@ -42,7 +42,7 @@ public class UserConfCommandHelpPrinter extends AbstractCommandHelpPrinter { public void printHelp(Action action, PrintStream out, boolean includeHelpOption) { Command command = action.getClass().getAnnotation(Command.class); Set<Option> options = new HashSet<>(); - List<Argument> arguments = new ArrayList<Argument>(); + List<Argument> arguments = new ArrayList<>(); Map<Argument, Field> argFields = new HashMap<>(); Map<Option, Field> optFields = new HashMap<>(); for (Class<?> type = action.getClass(); type != null; type = type.getSuperclass()) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java index dda4350..af311d4 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/AbstractFeatureMojo.java @@ -90,7 +90,7 @@ public abstract class AbstractFeatureMojo extends MojoSupport { public AbstractFeatureMojo() { super(); - descriptorArtifacts = new HashSet<Artifact>(); + descriptorArtifacts = new HashSet<>(); } protected void addFeatureRepo(String featureUrl) throws MojoExecutionException { @@ -228,17 +228,17 @@ public abstract class AbstractFeatureMojo extends MojoSupport { } protected Set<Feature> resolveFeatures() throws MojoExecutionException { - Set<Feature> featuresSet = new HashSet<Feature>(); + Set<Feature> featuresSet = new HashSet<>(); try { - Set<String> artifactsToCopy = new HashSet<String>(); - Map<String, Feature> featuresMap = new HashMap<String, Feature>(); + Set<String> artifactsToCopy = new HashSet<>(); + Map<String, Feature> featuresMap = new HashMap<>(); for (String uri : descriptors) { retrieveDescriptorsRecursively(uri, artifactsToCopy, featuresMap); } // no features specified, handle all of them if (features == null) { - features = new ArrayList<String>(featuresMap.keySet()); + features = new ArrayList<>(featuresMap.keySet()); } addFeatures(features, featuresSet, featuresMap, addTransitiveFeatures); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java index 71e8082..e421d98 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/ExportFeatureMetaDataMojo.java @@ -72,7 +72,7 @@ public class ExportFeatureMetaDataMojo extends AbstractFeatureMojo { Set<Feature> featuresSet = resolveFeatures(); if (mergedFeature) { Feature feature = oneVersion ? mergeFeatureOneVersion(featuresSet) : mergeFeature(featuresSet); - featuresSet = new HashSet<Feature>(); + featuresSet = new HashSet<>(); featuresSet.add(feature); } try { @@ -89,7 +89,7 @@ public class ExportFeatureMetaDataMojo extends AbstractFeatureMojo { private Feature mergeFeature(Set<Feature> featuresSet) throws MojoExecutionException { Feature merged = new Feature("merged"); - Set<String> bundleIds = new HashSet<String>(); + Set<String> bundleIds = new HashSet<>(); for (Feature feature : featuresSet) { for (Bundle bundle : feature.getBundle()) { String symbolicName = getBundleSymbolicName(bundle); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java index c6dc9fc..c9349ff 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java @@ -130,7 +130,7 @@ public class GenerateDescriptorMojo extends MojoSupport { * */ @Parameter - private List<String> excludedArtifactIds = new ArrayList<String>(); + private List<String> excludedArtifactIds = new ArrayList<>(); /** * The resolver to use for the feature. Normally null or "OBR" or "(OBR)" @@ -459,7 +459,7 @@ public class GenerateDescriptorMojo extends MojoSupport { // the feature's Maven artifact to allow for multi-feature repositories) // TODO Initialise the repositories from the existing feature file if any Map<Dependency, Feature> otherFeatures = new HashMap<>(); - Map<Feature, String> featureRepositories = new HashMap<Feature, String>(); + Map<Feature, String> featureRepositories = new HashMap<>(); for (final LocalDependency entry : localDependencies) { Object artifact = entry.getArtifact(); @@ -793,8 +793,8 @@ public class GenerateDescriptorMojo extends MojoSupport { Features oldfeatures = readFeaturesFile(filteredDependencyCache); Feature oldFeature = oldfeatures.getFeature().get(0); - List<Bundle> addedBundles = new ArrayList<Bundle>(feature.getBundle()); - List<Bundle> removedBundles = new ArrayList<Bundle>(); + List<Bundle> addedBundles = new ArrayList<>(feature.getBundle()); + List<Bundle> removedBundles = new ArrayList<>(); for (Bundle test : oldFeature.getBundle()) { boolean t1 = addedBundles.contains(test); int s1 = addedBundles.size(); @@ -811,8 +811,8 @@ public class GenerateDescriptorMojo extends MojoSupport { } } - List<Dependency> addedDependencys = new ArrayList<Dependency>(feature.getFeature()); - List<Dependency> removedDependencys = new ArrayList<Dependency>(); + List<Dependency> addedDependencys = new ArrayList<>(feature.getFeature()); + List<Dependency> removedDependencys = new ArrayList<>(); for (Dependency test : oldFeature.getFeature()) { boolean t1 = addedDependencys.contains(test); int s1 = addedDependencys.size(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java index 8deeeb2..533eb26 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java @@ -339,7 +339,7 @@ public class Dependency30Helper implements DependencyHelper { id = MavenUtil.mvnToAether(id); ArtifactRequest request = new ArtifactRequest(); request.setArtifact(new DefaultArtifact(id)); - request.setRepositories((List<RemoteRepository>) projectRepositories); + request.setRepositories(projectRepositories); log.debug("Resolving artifact " + id + " from " + projectRepositories); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java ---------------------------------------------------------------------- diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java index 3e93624..63b5a60 100644 --- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java +++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/ManifestUtils.java @@ -45,7 +45,7 @@ public class ManifestUtils { * @return the list of imports */ public static List<Clause> getImports(Manifest manifest) { - List<Clause> result = new LinkedList<Clause>(); + List<Clause> result = new LinkedList<>(); Clause[] clauses = Parser.parseHeader(getHeader(Constants.IMPORT_PACKAGE, manifest)); for (Clause clause : clauses) { result.add(clause); @@ -60,7 +60,7 @@ public class ManifestUtils { * @return the list of non-optional imports */ public static List<Clause> getMandatoryImports(Manifest manifest) { - List<Clause> result = new LinkedList<Clause>(); + List<Clause> result = new LinkedList<>(); for (Clause clause : getImports(manifest)) { if (!isOptional(clause)) { result.add(clause); @@ -76,7 +76,7 @@ public class ManifestUtils { * @return the list of exports */ public static List<Clause> getExports(Manifest manifest) { - List<Clause> result = new LinkedList<Clause>(); + List<Clause> result = new LinkedList<>(); Clause[] clauses = Parser.parseHeader(getHeader(Constants.EXPORT_PACKAGE, manifest)); for (Clause clause : clauses) { result.add(clause); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/util/src/main/java/org/apache/karaf/util/XmlUtils.java ---------------------------------------------------------------------- diff --git a/util/src/main/java/org/apache/karaf/util/XmlUtils.java b/util/src/main/java/org/apache/karaf/util/XmlUtils.java index adfc2e6..975e556 100644 --- a/util/src/main/java/org/apache/karaf/util/XmlUtils.java +++ b/util/src/main/java/org/apache/karaf/util/XmlUtils.java @@ -41,9 +41,9 @@ import org.xml.sax.XMLReader; */ public class XmlUtils { - private static final ThreadLocal<DocumentBuilderFactory> DOCUMENT_BUILDER_FACTORY = new ThreadLocal<DocumentBuilderFactory>(); - private static final ThreadLocal<TransformerFactory> TRANSFORMER_FACTORY = new ThreadLocal<TransformerFactory>(); - private static final ThreadLocal<SAXParserFactory> SAX_PARSER_FACTORY = new ThreadLocal<SAXParserFactory>(); + private static final ThreadLocal<DocumentBuilderFactory> DOCUMENT_BUILDER_FACTORY = new ThreadLocal<>(); + private static final ThreadLocal<TransformerFactory> TRANSFORMER_FACTORY = new ThreadLocal<>(); + private static final ThreadLocal<SAXParserFactory> SAX_PARSER_FACTORY = new ThreadLocal<>(); public static Document parse(String uri) throws TransformerException, IOException, SAXException, ParserConfigurationException { DocumentBuilder db = documentBuilder(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java ---------------------------------------------------------------------- diff --git a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java index c1b00da..a314aba 100644 --- a/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java +++ b/util/src/main/java/org/apache/karaf/util/tracker/BaseActivator.java @@ -49,7 +49,7 @@ public class BaseActivator implements BundleActivator, Runnable { protected BundleContext bundleContext; protected ExecutorService executor = new ThreadPoolExecutor(0, 1, 0L, TimeUnit.MILLISECONDS, - new LinkedBlockingQueue<Runnable>()); + new LinkedBlockingQueue<>()); private AtomicBoolean scheduled = new AtomicBoolean(); private long schedulerStopTimeout = TimeUnit.MILLISECONDS.convert(30, TimeUnit.SECONDS); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java ---------------------------------------------------------------------- diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java index c3a81ed..77a47f5 100644 --- a/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java +++ b/web/src/main/java/org/apache/karaf/web/internal/WebContainerServiceImpl.java @@ -68,13 +68,13 @@ public class WebContainerServiceImpl implements WebContainerService, BundleListe public List<WebBundle> list() throws Exception { Bundle[] bundles = bundleContext.getBundles(); Map<Long, WebEvent> bundleEvents = webEventHandler.getBundleEvents(); - List<WebBundle> webBundles = new ArrayList<WebBundle>(); + List<WebBundle> webBundles = new ArrayList<>(); if (bundles != null) { for (Bundle bundle : bundles) { // first check if the bundle is a web bundle - String contextPath = (String) bundle.getHeaders().get("Web-ContextPath"); + String contextPath = bundle.getHeaders().get("Web-ContextPath"); if (contextPath == null) { - contextPath = (String) bundle.getHeaders().get("Webapp-Context"); // this one used by pax-web but is deprecated + contextPath = bundle.getHeaders().get("Webapp-Context"); // this one used by pax-web but is deprecated } if (contextPath == null) { // the bundle is not a web bundle @@ -85,13 +85,13 @@ public class WebContainerServiceImpl implements WebContainerService, BundleListe contextPath = contextPath.trim(); // get the bundle name - String name = (String) bundle.getHeaders().get(Constants.BUNDLE_NAME); + String name = bundle.getHeaders().get(Constants.BUNDLE_NAME); // if there is no name, then default to symbolic name name = (name == null) ? bundle.getSymbolicName() : name; // if there is no symbolic name, resort to location name = (name == null) ? bundle.getLocation() : name; // get the bundle version - String version = (String) bundle.getHeaders().get(Constants.BUNDLE_VERSION); + String version = bundle.getHeaders().get(Constants.BUNDLE_VERSION); name = ((version != null)) ? name + " (" + version + ")" : name; long bundleId = bundle.getBundleId(); int level = bundle.adapt(BundleStartLevel.class).getStartLevel(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java ---------------------------------------------------------------------- diff --git a/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java b/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java index 01ef52e..e91395c 100644 --- a/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java +++ b/web/src/main/java/org/apache/karaf/web/internal/WebEventHandler.java @@ -27,7 +27,7 @@ import java.util.Map; */ public class WebEventHandler implements WebListener { - private final Map<Long, WebEvent> bundleEvents = new HashMap<Long, WebEvent>(); + private final Map<Long, WebEvent> bundleEvents = new HashMap<>(); public Map<Long, WebEvent> getBundleEvents() { return bundleEvents; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java ---------------------------------------------------------------------- diff --git a/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java b/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java index dd91579..597f4e6 100644 --- a/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java +++ b/web/src/main/java/org/apache/karaf/web/management/internal/WebMBeanImpl.java @@ -79,7 +79,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean { public void start(Long bundleId) throws MBeanException { try { - List<Long> list = new ArrayList<Long>(); + List<Long> list = new ArrayList<>(); list.add(bundleId); webContainerService.start(list); } catch (Exception e) { @@ -97,7 +97,7 @@ public class WebMBeanImpl extends StandardMBean implements WebMBean { public void stop(Long bundleId) throws MBeanException { try { - List<Long> list = new ArrayList<Long>(); + List<Long> list = new ArrayList<>(); list.add(bundleId); webContainerService.stop(list); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java index ff87782..1df402a 100644 --- a/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java +++ b/webconsole/features/src/main/java/org/apache/karaf/webconsole/features/FeaturesPlugin.java @@ -302,7 +302,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { } private List<Repository> getRepositories() { - List<Repository> repositories = new ArrayList<Repository>(); + List<Repository> repositories = new ArrayList<>(); if (featuresService == null) { this.log.error("Features service is not available"); @@ -321,7 +321,7 @@ public class FeaturesPlugin extends AbstractWebConsolePlugin { } private List<ExtendedFeature> getFeatures(List<Repository> repositories) { - List<ExtendedFeature> features = new ArrayList<ExtendedFeature>(); + List<ExtendedFeature> features = new ArrayList<>(); if (featuresService == null) { this.log.error("Features service is not available"); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java ---------------------------------------------------------------------- diff --git a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java index 0fd0631..deb787e 100644 --- a/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java +++ b/webconsole/gogo/src/main/java/org/apache/karaf/webconsole/gogo/Terminal.java @@ -182,7 +182,7 @@ public class Terminal { cx = 0; cy = 0; // Tab stops - tab_stops = new ArrayList<Integer>(); + tab_stops = new ArrayList<>(); for (int i = 7; i < width; i += 8) { tab_stops.add(i); } @@ -654,7 +654,7 @@ public class Terminal { } private void esc_DECSC() { - vt100_saved = new HashMap<String, Object>(); + vt100_saved = new HashMap<>(); vt100_saved.put("cx", cx); vt100_saved.put("cy", cy); vt100_saved.put("attr", attr); @@ -851,7 +851,7 @@ public class Terminal { } else if ("2".equals(m)) { tab_stops.remove(Integer.valueOf(cx)); } else if ("5".equals(m)) { - tab_stops = new ArrayList<Integer>(); + tab_stops = new ArrayList<>(); } } } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java index 0c1ea49..8692157 100644 --- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java +++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/HttpPlugin.java @@ -199,7 +199,7 @@ public class HttpPlugin extends AbstractWebConsolePlugin { protected List<ServletDetails> getServletDetails() { Collection<ServletEvent> events = servletEventHandler.getServletEvents(); - List<ServletDetails> result = new ArrayList<ServletDetails>(events.size()); + List<ServletDetails> result = new ArrayList<>(events.size()); for (ServletEvent event : events) { Servlet servlet = event.getServlet(); @@ -215,7 +215,7 @@ public class HttpPlugin extends AbstractWebConsolePlugin { String alias = event.getAlias() != null ? event.getAlias() : " "; - String[] urls = (String[]) (event.getUrlParameter() != null ? event.getUrlParameter() : new String[]{""}); + String[] urls = event.getUrlParameter() != null ? event.getUrlParameter() : new String[]{""}; ServletDetails details = new ServletDetails(); details.setId(event.getBundle().getBundleId()); @@ -232,7 +232,7 @@ public class HttpPlugin extends AbstractWebConsolePlugin { protected List<WebDetail> getWebDetails() { Map<Long, WebEvent> bundleEvents = webEventHandler.getBundleEvents(); - List<WebDetail> result = new ArrayList<WebDetail>(); + List<WebDetail> result = new ArrayList<>(); for (WebEvent event : bundleEvents.values()) { @@ -264,7 +264,7 @@ public class HttpPlugin extends AbstractWebConsolePlugin { } public String getStatusLine(List<ServletDetails> servlets, List<WebDetail> web) { - Map<String, Integer> states = new HashMap<String, Integer>(); + Map<String, Integer> states = new HashMap<>(); for (ServletDetails servlet : servlets) { states.merge(servlet.getState(), 1, (a, b) -> a + b); } http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java ---------------------------------------------------------------------- diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java index 6d7b6b3..0702bae 100644 --- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java +++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/ServletEventHandler.java @@ -32,7 +32,7 @@ import org.osgi.framework.BundleListener; public class ServletEventHandler implements ServletListener, BundleListener { BundleContext bundleContext; - Map<String, ServletEvent> servletEvents = new HashMap<String, ServletEvent>(); + Map<String, ServletEvent> servletEvents = new HashMap<>(); public void setBundleContext(BundleContext bundleContext) { this.bundleContext = bundleContext; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java ---------------------------------------------------------------------- diff --git a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java index fa81e4c..adfcf40 100644 --- a/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java +++ b/webconsole/http/src/main/java/org/apache/karaf/webconsole/http/WebEventHandler.java @@ -29,7 +29,7 @@ import org.osgi.framework.BundleListener; public class WebEventHandler implements WebListener, BundleListener { BundleContext bundleContext; - private final Map<Long, WebEvent> bundleEvents = new HashMap<Long, WebEvent>(); + private final Map<Long, WebEvent> bundleEvents = new HashMap<>(); public void setBundleContext(BundleContext bundleContext) { this.bundleContext = bundleContext; http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java ---------------------------------------------------------------------- diff --git a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java index 004803e..60bca0c 100644 --- a/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java +++ b/webconsole/instance/src/main/java/org/apache/karaf/webconsole/instance/InstancePlugin.java @@ -150,7 +150,7 @@ public class InstancePlugin extends AbstractWebConsolePlugin { } private List<String> parseStringList(String value) { - List<String> list = new ArrayList<String>(); + List<String> list = new ArrayList<>(); if (value != null) { for (String el : value.split(",")) { String trimmed = el.trim(); http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java ---------------------------------------------------------------------- diff --git a/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java b/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java index 462de0b..88e243f 100644 --- a/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java +++ b/webconsole/instance/src/test/java/org/apache/karaf/webconsole/instance/InstancePluginTest.java @@ -63,7 +63,7 @@ public class InstancePluginTest extends TestCase { InstancePlugin ap = new InstancePlugin(); ap.setInstanceService(instanceService); - final Map<String, String> params = new HashMap<String, String>(); + final Map<String, String> params = new HashMap<>(); params.put("action", "create"); params.put("name", "instance1"); params.put("sshPort", "123"); @@ -72,7 +72,7 @@ public class InstancePluginTest extends TestCase { params.put("featureURLs", "http://someURL";); params.put("features", "abc,def"); HttpServletRequest req = EasyMock.createMock(HttpServletRequest.class); - EasyMock.expect(req.getParameter((String) EasyMock.anyObject())).andAnswer(new IAnswer<String>() { + EasyMock.expect(req.getParameter(EasyMock.anyObject())).andAnswer(new IAnswer<String>() { public String answer() throws Throwable { return params.get(EasyMock.getCurrentArguments()[0]); }
