You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/06/01 06:02:24 UTC
[2/7] karaf git commit: [KARAF-5169] remove redundant type specifiers
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/service/guard/src/test/java/org/apache/karaf/service/guard/tools/ACLConfigurationParserTest.java
----------------------------------------------------------------------
diff --git a/service/guard/src/test/java/org/apache/karaf/service/guard/tools/ACLConfigurationParserTest.java b/service/guard/src/test/java/org/apache/karaf/service/guard/tools/ACLConfigurationParserTest.java
index cf0c15d..edfcc5f 100644
--- a/service/guard/src/test/java/org/apache/karaf/service/guard/tools/ACLConfigurationParserTest.java
+++ b/service/guard/src/test/java/org/apache/karaf/service/guard/tools/ACLConfigurationParserTest.java
@@ -41,7 +41,7 @@ public class ACLConfigurationParserTest {
@Test
public void testGetRolesForInvocation() {
- Dictionary<String, Object> config = new Hashtable<String, Object>();
+ Dictionary<String, Object> config = new Hashtable<>();
config.put("foo", "r1, r2");
config.put("bar(java.lang.String, int)[/aa/,/42/]", "ra");
config.put("bar(java.lang.String, int)[/bb/,/42/]", "rb");
@@ -51,52 +51,52 @@ public class ACLConfigurationParserTest {
config.put("bar", "rf");
config.put("ba*", "rg #Wildcard");
- List<String> roles1 = new ArrayList<String>();
+ List<String> roles1 = new ArrayList<>();
assertEquals(Specificity.NAME_MATCH,
ACLConfigurationParser.getRolesForInvocation("foo", new Object [] {}, new String [] {}, config, roles1));
assertEquals(Arrays.asList("r1", "r2"), roles1);
- List<String> roles2 = new ArrayList<String>();
+ List<String> roles2 = new ArrayList<>();
assertEquals(Specificity.NAME_MATCH,
ACLConfigurationParser.getRolesForInvocation("foo", new Object [] {"test"}, new String [] {"java.lang.String"}, config, roles2));
assertEquals(Arrays.asList("r1", "r2"), roles2);
- List<String> roles3 = new ArrayList<String>();
+ List<String> roles3 = new ArrayList<>();
assertEquals(Specificity.NO_MATCH,
ACLConfigurationParser.getRolesForInvocation("test", new Object [] {}, new String [] {}, config, roles3));
assertEquals(0, roles3.size());
- List<String> roles4 = new ArrayList<String>();
+ List<String> roles4 = new ArrayList<>();
assertEquals(Specificity.ARGUMENT_MATCH,
ACLConfigurationParser.getRolesForInvocation("bar", new Object [] {"aa", 42}, new String [] {"java.lang.String", "int"}, config, roles4));
assertEquals(Arrays.asList("ra"), roles4);
- List<String> roles5 = new ArrayList<String>();
+ List<String> roles5 = new ArrayList<>();
assertEquals(Specificity.ARGUMENT_MATCH,
ACLConfigurationParser.getRolesForInvocation("bar", new Object [] {"bb", 42}, new String [] {"java.lang.String", "int"}, config, roles5));
assertEquals(Arrays.asList("rb"), roles5);
- List<String> roles6 = new ArrayList<String>();
+ List<String> roles6 = new ArrayList<>();
assertEquals(Specificity.ARGUMENT_MATCH,
ACLConfigurationParser.getRolesForInvocation("bar", new Object [] {"cc", 17}, new String [] {"java.lang.String", "int"}, config, roles6));
assertEquals(Arrays.asList("rc"), roles6);
- List<String> roles7 = new ArrayList<String>();
+ List<String> roles7 = new ArrayList<>();
assertEquals(Specificity.SIGNATURE_MATCH,
ACLConfigurationParser.getRolesForInvocation("bar", new Object [] {"aaa", 42}, new String [] {"java.lang.String", "int"}, config, roles7));
assertEquals(Arrays.asList("rd"), roles7);
- List<String> roles8 = new ArrayList<String>();
+ List<String> roles8 = new ArrayList<>();
assertEquals(Specificity.SIGNATURE_MATCH,
ACLConfigurationParser.getRolesForInvocation("bar", new Object [] {"aa"}, new String [] {"java.lang.String"}, config, roles8));
assertEquals(Arrays.asList("re"), roles8);
- List<String> roles9 = new ArrayList<String>();
+ List<String> roles9 = new ArrayList<>();
assertEquals(Specificity.NAME_MATCH,
ACLConfigurationParser.getRolesForInvocation("bar", new Object [] {42}, new String [] {"int"}, config, roles9));
assertEquals(Arrays.asList("rf"), roles9);
- List<String> roles10 = new ArrayList<String>();
+ List<String> roles10 = new ArrayList<>();
assertEquals(Specificity.WILDCARD_MATCH,
ACLConfigurationParser.getRolesForInvocation("barr", new Object [] {42}, new String [] {"int"}, config, roles10));
assertEquals(Arrays.asList("rg"), roles10);
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
----------------------------------------------------------------------
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
index d1abc70..c732ae7 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java
@@ -179,7 +179,7 @@ public class Configuration
interfaceNames = new String[] {ManagedService.class.getName(), MetaTypeProvider.class.getName()};
service = enhancedService;
}
- Dictionary<String, Object> props = new Hashtable<String, Object>();
+ Dictionary<String, Object> props = new Hashtable<>();
props.put( Constants.SERVICE_PID, PID );
m_managedServiceReg = m_bundleContext.registerService( interfaceNames, service, props );
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
----------------------------------------------------------------------
diff --git a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
index 85a140d..0b9f481 100644
--- a/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
+++ b/services/eventadmin/src/main/java/org/apache/felix/eventadmin/impl/handler/EventAdminImpl.java
@@ -148,7 +148,7 @@ public class EventAdminImpl implements EventAdmin
}
if (needTimeStamp || needSubject) {
String[] names = event.getPropertyNames();
- HashMap<String, Object> map = new HashMap<String, Object>(names.length + 1);
+ HashMap<String, Object> map = new HashMap<>(names.length + 1);
for (String name : names) {
if (!EventConstants.EVENT_TOPIC.equals(name)) {
map.put(name, event.getProperty(name));
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/Configurations.java
----------------------------------------------------------------------
diff --git a/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/Configurations.java b/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/Configurations.java
index 6b4c11c..dd33b45 100644
--- a/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/Configurations.java
+++ b/services/staticcm/src/main/java/org/apache/karaf/services/staticcm/Configurations.java
@@ -72,7 +72,7 @@ public class Configurations {
Map<String, String> cfg = entry.getValue();
InterpolationHelper.performSubstitution(cfg, context);
cfg.put(Constants.SERVICE_PID, pid[0]);
- configurations.add(new StaticConfigurationImpl(pid[0], pid[1], new Hashtable<String, Object>(cfg)));
+ configurations.add(new StaticConfigurationImpl(pid[0], pid[1], new Hashtable<>(cfg)));
}
return configurations;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
index df52a8b..18c5f73 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/InfoAction.java
@@ -127,7 +127,7 @@ public class InfoAction implements Action {
}
//Display Information from external information providers.
- Map<String, Map<Object, Object>> properties = new HashMap<String, Map<Object, Object>>();
+ Map<String, Map<Object, Object>> properties = new HashMap<>();
if (infoProviders != null) {
// dump all properties to Map, KARAF-425
for (InfoProvider provider : infoProviders) {
@@ -137,10 +137,10 @@ public class InfoAction implements Action {
properties.get(provider.getName()).putAll(provider.getProperties());
}
- List<String> sections = new ArrayList<String>(properties.keySet());
+ List<String> sections = new ArrayList<>(properties.keySet());
Collections.sort(sections);
for (String section : sections) {
- List<Object> keys = new ArrayList<Object>(properties.get(section).keySet());
+ List<Object> keys = new ArrayList<>(properties.get(section).keySet());
if (keys.size() > 0) {
System.out.println(section);
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java
index 172eeac..0b11964 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/ThreadsAction.java
@@ -71,7 +71,7 @@ public class ThreadsAction implements Action {
@Override
public Object execute() throws Exception {
- Map<Long, ThreadInfo> threadInfos = new TreeMap<Long, ThreadInfo>();
+ Map<Long, ThreadInfo> threadInfos = new TreeMap<>();
ThreadMXBean threadsBean = ManagementFactory.getThreadMXBean();
ThreadInfo[] infos;
if (threadsBean.isObjectMonitorUsageSupported() && threadsBean.isSynchronizerUsageSupported()) {
@@ -139,7 +139,7 @@ public class ThreadsAction implements Action {
break;
}
}
- groups = new ArrayList<ThreadGroupData>();
+ groups = new ArrayList<>();
for (ThreadGroup tg : childGroups) {
if (tg != null) {
groups.add(new ThreadGroupData(tg, infos));
@@ -154,7 +154,7 @@ public class ThreadsAction implements Action {
break;
}
}
- threads = new ArrayList<ThreadData>();
+ threads = new ArrayList<>();
for (Thread t : childThreads) {
if (t != null) {
threads.add(new ThreadData(t, infos.get(t.getId())));
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/Activator.java
----------------------------------------------------------------------
diff --git a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/Activator.java b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/Activator.java
index 14dda54..eacdd32 100644
--- a/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/Activator.java
+++ b/shell/commands/src/main/java/org/apache/karaf/shell/commands/impl/info/Activator.java
@@ -29,7 +29,7 @@ public class Activator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
- tracker = new BundleTracker<ServiceRegistration<InfoProvider>>(context, Bundle.ACTIVE, new InfoBundleTrackerCustomizer());
+ tracker = new BundleTracker<>(context, Bundle.ACTIVE, new InfoBundleTrackerCustomizer());
tracker.open();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/jline/console/completer/StringsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/jline/console/completer/StringsCompleter.java b/shell/console/src/main/java/jline/console/completer/StringsCompleter.java
index 7161f1d..91a339c 100644
--- a/shell/console/src/main/java/jline/console/completer/StringsCompleter.java
+++ b/shell/console/src/main/java/jline/console/completer/StringsCompleter.java
@@ -25,7 +25,7 @@ import static jline.internal.Preconditions.checkNotNull;
public class StringsCompleter
implements Completer
{
- private final SortedSet<String> strings = new TreeSet<String>();
+ private final SortedSet<String> strings = new TreeSet<>();
public StringsCompleter() {
// empty
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
index 6b7865e..edcfff1 100644
--- a/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
+++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/basic/DefaultActionPreparator.java
@@ -80,9 +80,9 @@ public class DefaultActionPreparator implements ActionPreparator {
};
public boolean prepare(Action action, CommandSession session, List<Object> params) throws Exception {
- Map<Option, Field> options = new HashMap<Option, Field>();
- Map<Argument, Field> arguments = new HashMap<Argument, Field>();
- List<Argument> orderedArguments = new ArrayList<Argument>();
+ Map<Option, Field> options = new HashMap<>();
+ Map<Argument, Field> arguments = new HashMap<>();
+ List<Argument> orderedArguments = new ArrayList<>();
// Introspect
for (Class type = action.getClass(); type != null; type = type.getSuperclass()) {
for (Field field : type.getDeclaredFields()) {
@@ -144,8 +144,8 @@ public class DefaultActionPreparator implements ActionPreparator {
}
}
// Populate
- Map<Option, Object> optionValues = new HashMap<Option, Object>();
- Map<Argument, Object> argumentValues = new HashMap<Argument, Object>();
+ Map<Option, Object> optionValues = new HashMap<>();
+ Map<Argument, Object> argumentValues = new HashMap<>();
boolean processOptions = true;
int argIndex = 0;
for (Iterator<Object> it = params.iterator(); it.hasNext(); ) {
@@ -214,7 +214,7 @@ public class DefaultActionPreparator implements ActionPreparator {
if (option.multiValued()) {
List<Object> l = (List<Object>) optionValues.get(option);
if (l == null) {
- l = new ArrayList<Object>();
+ l = new ArrayList<>();
optionValues.put(option, l);
}
l.add(value);
@@ -246,7 +246,7 @@ public class DefaultActionPreparator implements ActionPreparator {
if (argument.multiValued()) {
List<Object> l = (List<Object>) argumentValues.get(argument);
if (l == null) {
- l = new ArrayList<Object>();
+ l = new ArrayList<>();
argumentValues.put(argument, l);
}
l.add(param);
@@ -362,13 +362,13 @@ public class DefaultActionPreparator implements ActionPreparator {
Command command = action.getClass().getAnnotation(Command.class);
if (command != null) {
- List<Argument> arguments = new ArrayList<Argument>(argsMap.keySet());
+ List<Argument> arguments = new ArrayList<>(argsMap.keySet());
Collections.sort(arguments, new Comparator<Argument>() {
public int compare(Argument o1, Argument o2) {
return Integer.valueOf(o1.index()).compareTo(Integer.valueOf(o2.index()));
}
});
- Set<Option> options = new HashSet<Option>(optionsMap.keySet());
+ Set<Option> options = new HashSet<>(optionsMap.keySet());
options.add(HELP);
boolean globalScope = NameScoping.isGlobalScope(session, command.scope());
if (command != null && (command.description() != null || command.name() != null)) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
index e7a4424..fa8f33c 100644
--- a/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
+++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/DefaultConverter.java
@@ -384,7 +384,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/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java b/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
index dae6651..9f71707 100644
--- a/shell/console/src/main/java/org/apache/felix/gogo/commands/converter/GenericType.java
+++ b/shell/console/src/main/java/org/apache/felix/gogo/commands/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/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
index 9fc389c..43335aa 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/basic/SimpleCommand.java
@@ -71,7 +71,7 @@ public class SimpleCommand extends AbstractCommand {
{
throw new IllegalArgumentException("Action class is not annotated with @Command");
}
- Hashtable<String, String> props = new Hashtable<String, String>();
+ Hashtable<String, String> props = new Hashtable<>();
props.put("osgi.command.scope", cmd.scope());
props.put("osgi.command.function", cmd.name());
SimpleCommand command = new SimpleCommand(actionClass);
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
index 3f3aad9..4e87006 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/DefaultConverter.java
@@ -384,7 +384,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/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
index a8d1718..003d7b2 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/converter/GenericType.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/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/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
index e0bd11a..fd97055 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaData.java
@@ -92,13 +92,13 @@ public class ActionMetaData {
public void printUsage(Action action, PrintStream out, boolean globalScope, int termWidth) {
if (command != null) {
- List<Argument> argumentsSet = new ArrayList<Argument>(arguments.keySet());
+ List<Argument> argumentsSet = new ArrayList<>(arguments.keySet());
Collections.sort(argumentsSet, new Comparator<Argument>() {
public int compare(Argument o1, Argument o2) {
return Integer.valueOf(o1.index()).compareTo(Integer.valueOf(o2.index()));
}
});
- Set<Option> optionsSet = new HashSet<Option>(options.keySet());
+ Set<Option> optionsSet = new HashSet<>(options.keySet());
optionsSet.add(HelpOption.HELP);
if (command != null && (command.description() != null || command.name() != null)) {
out.println(INTENSITY_BOLD + "DESCRIPTION" + INTENSITY_NORMAL);
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java
index 91bc48f..9887356 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/commands/meta/ActionMetaDataFactory.java
@@ -34,9 +34,9 @@ public class ActionMetaDataFactory {
public ActionMetaData create(Class<? extends Action> actionClass) {
Command command = getCommand(actionClass);
- Map<Option, Field> options = new HashMap<Option, Field>();
- Map<Argument, Field> arguments = new HashMap<Argument, Field>();
- List<Argument> orderedArguments = new ArrayList<Argument>();
+ Map<Option, Field> options = new HashMap<>();
+ Map<Argument, Field> arguments = new HashMap<>();
+ List<Argument> orderedArguments = new ArrayList<>();
for (Class<?> type = actionClass; type != null; type = type.getSuperclass()) {
for (Field field : type.getDeclaredFields()) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
index df534aa..4ca0d6b 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/compat/ArgumentCompleter.java
@@ -69,9 +69,9 @@ public class ArgumentCompleter {
final List<Completer> argsCompleters;
final Map<String, Completer> optionalCompleters;
final CommandWithAction function;
- final Map<Option, Field> fields = new HashMap<Option, Field>();
- final Map<String, Option> options = new HashMap<String, Option>();
- final Map<Integer, Field> arguments = new HashMap<Integer, Field>();
+ final Map<Option, Field> fields = new HashMap<>();
+ final Map<String, Option> options = new HashMap<>();
+ final Map<Integer, Field> arguments = new HashMap<>();
boolean strict = true;
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -118,7 +118,7 @@ public class ArgumentCompleter {
Map<String, Completer> focl = ((CompletableFunction) function).getOptionalCompleters();
List<Completer> fcl = ((CompletableFunction) function).getCompleters();
if (focl != null || fcl != null) {
- argsCompleters = new ArrayList<Completer>();
+ argsCompleters = new ArrayList<>();
if (fcl != null) {
for (Completer c : fcl) {
argsCompleters.add(c == null ? NullCompleter.INSTANCE : c);
@@ -129,7 +129,7 @@ public class ArgumentCompleter {
}
if (argsCompleters == null) {
final Map<Integer, Object> values = getCompleterValues(function);
- argsCompleters = new ArrayList<Completer>();
+ argsCompleters = new ArrayList<>();
boolean multi = false;
for (int key = 0; key < arguments.size(); key++) {
Completer completer = null;
@@ -170,7 +170,7 @@ public class ArgumentCompleter {
if (argsCompleters.isEmpty() || !multi) {
argsCompleters.add(NullCompleter.INSTANCE);
}
- optionalCompleters = new HashMap<String, Completer>();
+ optionalCompleters = new HashMap<>();
for (Option option : fields.keySet()) {
Completer completer = null;
Field field = fields.get(option);
@@ -205,7 +205,7 @@ public class ArgumentCompleter {
}
private Map<Integer, Object> getCompleterValues(CommandWithAction function) {
- final Map<Integer, Object> values = new HashMap<Integer, Object>();
+ final Map<Integer, Object> values = new HashMap<>();
Action action = null;
try {
for (Class<?> type = function.getActionClass(); type != null; type = type.getSuperclass()) {
@@ -263,7 +263,7 @@ public class ArgumentCompleter {
} else if (type.isAssignableFrom(Boolean.class) || type.isAssignableFrom(boolean.class)) {
completer = new StringsCompleter(new String[] {"false", "true"}, false);
} else if (type.isAssignableFrom(Enum.class)) {
- Set<String> values = new HashSet<String>();
+ Set<String> values = new HashSet<>();
for (Object o : EnumSet.allOf((Class<Enum>) type)) {
values.add(o.toString());
}
@@ -425,7 +425,7 @@ public class ArgumentCompleter {
}
protected boolean verifyCompleter(Completer completer, String argument) {
- List<String> candidates = new ArrayList<String>();
+ List<String> candidates = new ArrayList<>();
return completer.complete(argument, argument.length(), candidates) != -1 && !candidates.isEmpty();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java b/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
index e079ab9..742612c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/compat/CommandTracker.java
@@ -55,7 +55,7 @@ public class CommandTracker implements ServiceTrackerCustomizer<Object, Object>
CommandProcessor.COMMAND_SCOPE, CommandProcessor.COMMAND_FUNCTION,
Constants.OBJECTCLASS, CommandWithAction.class.getName(),
Constants.OBJECTCLASS, org.apache.felix.gogo.commands.CommandWithAction.class.getName()));
- this.tracker = new ServiceTracker<Object, Object>(context, filter, this);
+ this.tracker = new ServiceTracker<>(context, filter, this);
this.tracker.open();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/compat/OldArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/compat/OldArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/compat/OldArgumentCompleter.java
index 27d4e34..bd1214b 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/compat/OldArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/compat/OldArgumentCompleter.java
@@ -62,9 +62,9 @@ public class OldArgumentCompleter {
final List<Completer> argsCompleters;
final Map<String, Completer> optionalCompleters;
final CommandWithAction function;
- final Map<Option, Field> fields = new HashMap<Option, Field>();
- final Map<String, Option> options = new HashMap<String, Option>();
- final Map<Integer, Field> arguments = new HashMap<Integer, Field>();
+ final Map<Option, Field> fields = new HashMap<>();
+ final Map<String, Option> options = new HashMap<>();
+ final Map<Integer, Field> arguments = new HashMap<>();
boolean strict = true;
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -103,7 +103,7 @@ public class OldArgumentCompleter {
// options.put(HelpOption.HELP.name(), HelpOption.HELP);
optionsCompleter = new StringsCompleter(options.keySet());
// Build arguments completers
- argsCompleters = new ArrayList<Completer>();
+ argsCompleters = new ArrayList<>();
if (function instanceof CompletableFunction) {
Map<String, Completer> opt;
@@ -111,7 +111,7 @@ public class OldArgumentCompleter {
//
opt = ((CompletableFunction) function).getOptionalCompleters();
} catch (Throwable t) {
- opt = new HashMap<String, Completer>();
+ opt = new HashMap<>();
}
optionalCompleters = opt;
List<Completer> fcl = ((CompletableFunction) function).getCompleters();
@@ -123,8 +123,8 @@ public class OldArgumentCompleter {
argsCompleters.add(NullCompleter.INSTANCE);
}
} else {
- optionalCompleters = new HashMap<String, Completer>();
- final Map<Integer, Method> methods = new HashMap<Integer, Method>();
+ optionalCompleters = new HashMap<>();
+ final Map<Integer, Method> methods = new HashMap<>();
for (Class<?> type = function.getActionClass(); type != null; type = type.getSuperclass()) {
for (Method method : type.getDeclaredMethods()) {
CompleterValues completerMethod = method.getAnnotation(CompleterValues.class);
@@ -180,7 +180,7 @@ public class OldArgumentCompleter {
} else if (type.isAssignableFrom(Boolean.class) || type.isAssignableFrom(boolean.class)) {
argCompleter = new StringsCompleter(new String[] {"false", "true"}, false);
} else if (type.isAssignableFrom(Enum.class)) {
- Set<String> values = new HashSet<String>();
+ Set<String> values = new HashSet<>();
for (Object o : EnumSet.allOf((Class<Enum>) type)) {
values.add(o.toString());
}
@@ -355,7 +355,7 @@ public class OldArgumentCompleter {
}
protected boolean verifyCompleter(Completer completer, String argument) {
- List<String> candidates = new ArrayList<String>();
+ List<String> candidates = new ArrayList<>();
return completer.complete(argument, argument.length(), candidates) != -1 && !candidates.isEmpty();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java b/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
index 679c2d8..0c7fc18 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/CommandSessionHolder.java
@@ -23,7 +23,7 @@ import org.apache.felix.service.command.CommandSession;
@Deprecated
public class CommandSessionHolder {
- private static final ThreadLocal<CommandSession> session = new ThreadLocal<CommandSession>();
+ private static final ThreadLocal<CommandSession> session = new ThreadLocal<>();
public static CommandSession getSession() {
return session.get();
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java b/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
index cef676d..9638980 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/MultiException.java
@@ -25,7 +25,7 @@ import java.util.List;
@Deprecated
public class MultiException extends Exception {
- private List<Exception> exceptions = new ArrayList<Exception>();
+ private List<Exception> exceptions = new ArrayList<>();
public MultiException(String message) {
super(message);
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java b/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
index ed7e67e..b1cccd4 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/OsgiCommandSupport.java
@@ -63,7 +63,7 @@ public abstract class OsgiCommandSupport extends AbstractAction implements Actio
protected <T> List<T> getAllServices(Class<T> clazz, String filter) throws InvalidSyntaxException {
Collection<ServiceReference<T>> references = getBundleContext().getServiceReferences(clazz, filter);
- List<T> services = new ArrayList<T>();
+ List<T> services = new ArrayList<>();
if (references != null) {
for (ServiceReference<T> ref : references) {
T t = getService(clazz, ref);
@@ -86,7 +86,7 @@ public abstract class OsgiCommandSupport extends AbstractAction implements Actio
T t = getBundleContext().getService(reference);
if (t != null) {
if (usedReferences == null) {
- usedReferences = new ArrayList<ServiceReference<?>>();
+ usedReferences = new ArrayList<>();
}
usedReferences.add(reference);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
index d71c15c..7e15971 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/GenericType.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/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/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
index f037cf6..2dd66e2 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/commands/NamespaceHandler.java
@@ -88,9 +88,9 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan
}
public Set<Class> getManagedClasses() {
- return new HashSet<Class>(Arrays.asList(
- BlueprintCommand.class
- ));
+ return new HashSet<>(Arrays.asList(
+ BlueprintCommand.class
+ ));
}
public ComponentMetadata decorate(Node node, ComponentMetadata component, ParserContext context) {
@@ -268,7 +268,7 @@ public class NamespaceHandler implements org.apache.aries.blueprint.NamespaceHan
}
private Metadata parseOptionalCompleters(ParserContext context, ComponentMetadata enclosingComponent, Element element) {
- Metadata metadata = context.parseElement(MapMetadata.class, context.getEnclosingComponent(), (Element) element);
+ Metadata metadata = context.parseElement(MapMetadata.class, context.getEnclosingComponent(), element);
return metadata;
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
index 37eee53..9958967 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/AggregateCompleter.java
@@ -44,7 +44,7 @@ public class AggregateCompleter implements Completer
// buffer could be null
assert candidates != null;
- List<Completion> completions = new ArrayList<Completion>(completers.size());
+ List<Completion> completions = new ArrayList<>(completers.size());
// Run each completer, saving its completion results
int max = -1;
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
index 6e7dea5..ccd189a 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/ArgumentCompleter.java
@@ -66,9 +66,9 @@ public class ArgumentCompleter implements Completer {
final List<Completer> argsCompleters;
final Map<String, Completer> optionalCompleters;
final CommandWithAction function;
- final Map<Option, Field> fields = new HashMap<Option, Field>();
- final Map<String, Option> options = new HashMap<String, Option>();
- final Map<Integer, Field> arguments = new HashMap<Integer, Field>();
+ final Map<Option, Field> fields = new HashMap<>();
+ final Map<String, Option> options = new HashMap<>();
+ final Map<Integer, Field> arguments = new HashMap<>();
boolean strict = true;
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -112,7 +112,7 @@ public class ArgumentCompleter implements Completer {
Map<String, Completer> focl = ((CompletableFunction) function).getOptionalCompleters();
List<Completer> fcl = ((CompletableFunction) function).getCompleters();
if (focl != null || fcl != null) {
- argsCompleters = new ArrayList<Completer>();
+ argsCompleters = new ArrayList<>();
if (fcl != null) {
for (Completer c : fcl) {
argsCompleters.add(c == null ? NullCompleter.INSTANCE : c);
@@ -123,7 +123,7 @@ public class ArgumentCompleter implements Completer {
}
if (argsCompleters == null) {
final Map<Integer, Object> values = getCompleterValues(function);
- argsCompleters = new ArrayList<Completer>();
+ argsCompleters = new ArrayList<>();
boolean multi = false;
for (int key = 0; key < arguments.size(); key++) {
Completer completer = null;
@@ -164,7 +164,7 @@ public class ArgumentCompleter implements Completer {
if (argsCompleters.isEmpty() || !multi) {
argsCompleters.add(NullCompleter.INSTANCE);
}
- optionalCompleters = new HashMap<String, Completer>();
+ optionalCompleters = new HashMap<>();
for (Option option : fields.keySet()) {
Completer completer = null;
Field field = fields.get(option);
@@ -199,7 +199,7 @@ public class ArgumentCompleter implements Completer {
}
private Map<Integer, Object> getCompleterValues(CommandWithAction function) {
- final Map<Integer, Object> values = new HashMap<Integer, Object>();
+ final Map<Integer, Object> values = new HashMap<>();
Action action = null;
try {
for (Class<?> type = function.getActionClass(); type != null; type = type.getSuperclass()) {
@@ -257,7 +257,7 @@ public class ArgumentCompleter implements Completer {
} else if (type.isAssignableFrom(Boolean.class) || type.isAssignableFrom(boolean.class)) {
completer = new StringsCompleter(new String[] {"false", "true"}, false);
} else if (type.isAssignableFrom(Enum.class)) {
- Set<String> values = new HashSet<String>();
+ Set<String> values = new HashSet<>();
for (Object o : EnumSet.allOf((Class<Enum>) type)) {
values.add(o.toString());
}
@@ -436,7 +436,7 @@ public class ArgumentCompleter implements Completer {
}
protected boolean verifyCompleter(Completer completer, String argument) {
- List<String> candidates = new ArrayList<String>();
+ List<String> candidates = new ArrayList<>();
return completer.complete(argument, argument.length(), candidates) != -1 && !candidates.isEmpty();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
index 1749acc..4bd09c6 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandNamesCompleter.java
@@ -42,7 +42,7 @@ public class CommandNamesCompleter implements Completer {
public static final String COMMANDS = ".commands";
private CommandSession session;
- private final Set<String> commands = new CopyOnWriteArraySet<String>();
+ private final Set<String> commands = new CopyOnWriteArraySet<>();
public CommandNamesCompleter() {
this(CommandSessionHolder.getSession());
@@ -72,7 +72,7 @@ public class CommandNamesCompleter implements Completer {
@SuppressWarnings("unchecked")
protected void checkData() {
if (commands.isEmpty()) {
- Set<String> names = new HashSet<String>((Set<String>) session.get(COMMANDS));
+ Set<String> names = new HashSet<>((Set<String>) session.get(COMMANDS));
for (String name : names) {
commands.add(name);
if (name.indexOf(':') > 0) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
index ba1ffde..3b7be82 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/CommandsCompleter.java
@@ -56,9 +56,9 @@ public class CommandsCompleter implements Completer {
private static final Logger LOGGER = LoggerFactory.getLogger(CommandsCompleter.class);
private CommandSession session;
- private final Map<String, Completer> globalCompleters = new HashMap<String, Completer>();
- private final Map<String, Completer> localCompleters = new HashMap<String, Completer>();
- private final Set<String> commands = new HashSet<String>();
+ private final Map<String, Completer> globalCompleters = new HashMap<>();
+ private final Map<String, Completer> localCompleters = new HashMap<>();
+ private final Set<String> commands = new HashSet<>();
private CommandTracker tracker;
public CommandsCompleter() {
@@ -97,7 +97,7 @@ public class CommandsCompleter implements Completer {
if (subShell.isEmpty()) {
subShell = "*";
}
- List<Completer> completers = new ArrayList<Completer>();
+ List<Completer> completers = new ArrayList<>();
for (String name : allCompleters[1].keySet()) {
if (name.startsWith(subShell + ":")) {
completers.add(allCompleters[1].get(name));
@@ -113,7 +113,7 @@ public class CommandsCompleter implements Completer {
if ("FIRST".equalsIgnoreCase(completion)) {
if (!subShell.isEmpty()) {
- List<Completer> completers = new ArrayList<Completer>();
+ List<Completer> completers = new ArrayList<>();
for (String name : allCompleters[1].keySet()) {
if (name.startsWith(subShell + ":")) {
completers.add(allCompleters[1].get(name));
@@ -125,7 +125,7 @@ public class CommandsCompleter implements Completer {
return res;
}
}
- List<Completer> compl = new ArrayList<Completer>();
+ List<Completer> compl = new ArrayList<>();
compl.add(new StringsCompleter(getAliases()));
compl.addAll(allCompleters[0].values());
int res = new AggregateCompleter(compl).complete(buffer, cursor, candidates);
@@ -133,7 +133,7 @@ public class CommandsCompleter implements Completer {
return res;
}
- List<Completer> compl = new ArrayList<Completer>();
+ List<Completer> compl = new ArrayList<>();
compl.add(new StringsCompleter(getAliases()));
compl.addAll(allCompleters[0].values());
int res = new AggregateCompleter(compl).complete(buffer, cursor, candidates);
@@ -144,7 +144,7 @@ public class CommandsCompleter implements Completer {
protected void sort(Map<String, Completer>[] completers, List<String> scopes) {
ScopeComparator comparator = new ScopeComparator(scopes);
for (int i = 0; i < completers.length; i++) {
- Map<String, Completer> map = new TreeMap<String, Completer>(comparator);
+ Map<String, Completer> map = new TreeMap<>(comparator);
map.putAll(completers[i]);
completers[i] = map;
}
@@ -223,14 +223,14 @@ public class CommandsCompleter implements Completer {
Set<String> names;
boolean update;
synchronized (this) {
- names = new HashSet<String>((Set<String>) session.get(COMMANDS));
+ names = new HashSet<>((Set<String>) session.get(COMMANDS));
update = !names.equals(commands);
}
if (update) {
// get command aliases
- Set<String> commands = new HashSet<String>();
- Map<String, Completer> global = new HashMap<String, Completer>();
- Map<String, Completer> local = new HashMap<String, Completer>();
+ Set<String> commands = new HashSet<>();
+ Map<String, Completer> global = new HashMap<>();
+ Map<String, Completer> local = new HashMap<>();
// add argument completers for each command
for (String command : names) {
@@ -267,8 +267,8 @@ public class CommandsCompleter implements Completer {
}
synchronized (this) {
return new Map[] {
- new HashMap<String, Completer>(this.globalCompleters),
- new HashMap<String, Completer>(this.localCompleters)
+ new HashMap<>(this.globalCompleters),
+ new HashMap<>(this.localCompleters)
};
}
}
@@ -281,7 +281,7 @@ public class CommandsCompleter implements Completer {
@SuppressWarnings("unchecked")
private Set<String> getAliases() {
Set<String> vars = ((Set<String>) session.get(null));
- Set<String> aliases = new HashSet<String>();
+ Set<String> aliases = new HashSet<>();
for (String var : vars) {
Object content = session.get(var);
if (content != null && "org.apache.felix.gogo.runtime.Closure".equals(content.getClass().getName())) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
index 0cc7252..f112c35 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/OldArgumentCompleter.java
@@ -56,9 +56,9 @@ public class OldArgumentCompleter implements Completer {
final List<Completer> argsCompleters;
final Map<String, Completer> optionalCompleters;
final CommandWithAction function;
- final Map<Option, Field> fields = new HashMap<Option, Field>();
- final Map<String, Option> options = new HashMap<String, Option>();
- final Map<Integer, Field> arguments = new HashMap<Integer, Field>();
+ final Map<Option, Field> fields = new HashMap<>();
+ final Map<String, Option> options = new HashMap<>();
+ final Map<Integer, Field> arguments = new HashMap<>();
boolean strict = true;
@SuppressWarnings({ "unchecked", "rawtypes" })
@@ -94,7 +94,7 @@ public class OldArgumentCompleter implements Completer {
// options.put(HelpOption.HELP.name(), HelpOption.HELP);
optionsCompleter = new StringsCompleter(options.keySet());
// Build arguments completers
- argsCompleters = new ArrayList<Completer>();
+ argsCompleters = new ArrayList<>();
if (function instanceof CompletableFunction) {
Map<String, Completer> opt;
@@ -102,7 +102,7 @@ public class OldArgumentCompleter implements Completer {
//
opt = ((CompletableFunction) function).getOptionalCompleters();
} catch (Throwable t) {
- opt = new HashMap<String, Completer>();
+ opt = new HashMap<>();
}
optionalCompleters = opt;
List<Completer> fcl = ((CompletableFunction) function).getCompleters();
@@ -114,8 +114,8 @@ public class OldArgumentCompleter implements Completer {
argsCompleters.add(NullCompleter.INSTANCE);
}
} else {
- optionalCompleters = new HashMap<String, Completer>();
- final Map<Integer, Method> methods = new HashMap<Integer, Method>();
+ optionalCompleters = new HashMap<>();
+ final Map<Integer, Method> methods = new HashMap<>();
for (Class<?> type = function.getActionClass(); type != null; type = type.getSuperclass()) {
for (Method method : type.getDeclaredMethods()) {
CompleterValues completerMethod = method.getAnnotation(CompleterValues.class);
@@ -171,7 +171,7 @@ public class OldArgumentCompleter implements Completer {
} else if (type.isAssignableFrom(Boolean.class) || type.isAssignableFrom(boolean.class)) {
argCompleter = new StringsCompleter(new String[] {"false", "true"}, false);
} else if (type.isAssignableFrom(Enum.class)) {
- Set<String> values = new HashSet<String>();
+ Set<String> values = new HashSet<>();
for (Object o : EnumSet.allOf((Class<Enum>) type)) {
values.add(o.toString());
}
@@ -343,7 +343,7 @@ public class OldArgumentCompleter implements Completer {
}
protected boolean verifyCompleter(Completer completer, String argument) {
- List<String> candidates = new ArrayList<String>();
+ List<String> candidates = new ArrayList<>();
return completer.complete(argument, argument.length(), candidates) != -1 && !candidates.isEmpty();
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
index 4018efa..7b50647 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/Parser.java
@@ -136,7 +136,7 @@ public class Parser {
}
public List<List<List<String>>> program() {
- program = new ArrayList<List<List<String>>>();
+ program = new ArrayList<>();
ws();
if (!eof()) {
program.add(pipeline());
@@ -161,7 +161,7 @@ public class Parser {
}
public List<List<String>> pipeline() {
- statements = new ArrayList<List<String>>();
+ statements = new ArrayList<>();
statements.add(statement());
while (peek() == '|') {
current++;
@@ -170,7 +170,7 @@ public class Parser {
statements.add(statement());
}
else {
- statements.add(new ArrayList<String>());
+ statements.add(new ArrayList<>());
break;
}
}
@@ -180,7 +180,7 @@ public class Parser {
}
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/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
index d8296bd..7095cdd 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/console/completer/StringsCompleter.java
@@ -33,7 +33,7 @@ import org.apache.karaf.shell.console.Completer;
public class StringsCompleter
implements Completer
{
- private final SortedSet<String> strings = new TreeSet<String>();
+ private final SortedSet<String> strings = new TreeSet<>();
private final boolean caseSensitive;
public StringsCompleter() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
index d0be93d..ef859dd 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandConfigTransformer.java
@@ -77,7 +77,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
Dictionary<String, Object> configProps = config.getProperties();
- Map<String, Dictionary<String, Object>> configMaps = new HashMap<String, Dictionary<String, Object>>();
+ Map<String, Dictionary<String, Object>> configMaps = new HashMap<>();
for (Enumeration<String> e = configProps.keys(); e.hasMoreElements(); ) {
String key = e.nextElement();
String bareCommand = key;
@@ -96,7 +96,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
String pid = PROXY_SERVICE_ACL_PID_PREFIX + scopeName + "." + bareCommand;
Dictionary<String, Object> map;
if (!configMaps.containsKey(pid)) {
- map = new Hashtable<String, Object>();
+ map = new Hashtable<>();
map.put("service.guard", "(&(" +
CommandProcessor.COMMAND_SCOPE + "=" + scopeName + ")(" +
CommandProcessor.COMMAND_FUNCTION + "=" + bareCommand + "))");
@@ -232,7 +232,7 @@ public class SecuredCommandConfigTransformer implements ConfigurationListener {
}
private Map<String, String> loadScopeBundleMaps() {
- Map<String, String> scopeBundleMaps = new HashMap<String, String>();
+ Map<String, String> scopeBundleMaps = new HashMap<>();
try {
for (Configuration config : configAdmin.listConfigurations("(service.pid=" + ACL_SCOPE_BUNDLE_MAP + ")")) {
Enumeration<String> keys = config.getProperties().keys();
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
index 642d8bb..8ae524c 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/security/impl/SecuredCommandProcessorImpl.java
@@ -116,7 +116,7 @@ public class SecuredCommandProcessorImpl extends CommandProcessorImpl {
public Object addingService(ServiceReference<Object> reference) {
Object scope = reference.getProperty(CommandProcessor.COMMAND_SCOPE);
Object function = reference.getProperty(CommandProcessor.COMMAND_FUNCTION);
- List<Object> commands = new ArrayList<Object>();
+ List<Object> commands = new ArrayList<>();
if (scope != null && function != null) {
if (function.getClass().isArray()) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
----------------------------------------------------------------------
diff --git a/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java b/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
index 41c6b3c..a8f3de5 100644
--- a/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
+++ b/shell/console/src/main/java/org/apache/karaf/shell/util/ShellUtil.java
@@ -48,7 +48,7 @@ public class ShellUtil {
public static String getBundleName(Bundle bundle) {
if (bundle != null) {
- String name = (String) bundle.getHeaders().get(Constants.BUNDLE_NAME);
+ String name = bundle.getHeaders().get(Constants.BUNDLE_NAME);
return (name == null)
? "Bundle " + Long.toString(bundle.getBundleId())
: name + " (" + Long.toString(bundle.getBundleId()) + ")";
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java b/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
index 1e4a563..a4b59af 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/api/console/Signal.java
@@ -54,7 +54,7 @@ public enum Signal {
IO(29),
PWR(30);
- private static final Map<String, Signal> lookupTable = new HashMap<String, Signal>(40);
+ private static final Map<String, Signal> lookupTable = new HashMap<>(40);
static {
// registering the signals in the lookup table to allow faster
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
index 88d6d5f..a1f3c60 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/DefaultActionPreparator.java
@@ -61,9 +61,9 @@ public class DefaultActionPreparator {
public boolean prepare(Action action, Session session, List<Object> params) throws Exception {
Command command = action.getClass().getAnnotation(Command.class);
- Map<Option, Field> options = new HashMap<Option, Field>();
- Map<Argument, Field> arguments = new HashMap<Argument, Field>();
- List<Argument> orderedArguments = new ArrayList<Argument>();
+ Map<Option, Field> options = new HashMap<>();
+ Map<Argument, Field> arguments = new HashMap<>();
+ List<Argument> orderedArguments = new ArrayList<>();
for (Class<?> type = action.getClass(); type != null; type = type.getSuperclass()) {
for (Field field : type.getDeclaredFields()) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java
index d5af294..2ccfa84 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/command/ManagerImpl.java
@@ -43,7 +43,7 @@ public class ManagerImpl implements Manager {
private final Registry dependencies;
private final Registry registrations;
- private final Map<Class<?>, Object> instances = new HashMap<Class<?>, Object>();
+ private final Map<Class<?>, Object> instances = new HashMap<>();
private final boolean allowCustomServices;
public ManagerImpl(Registry dependencies, Registry registrations) {
@@ -76,12 +76,12 @@ public class ManagerImpl implements Manager {
GenericType type = new GenericType(field.getGenericType());
Object value;
if (type.getRawClass() == List.class) {
- Set<Object> set = new HashSet<Object>();
+ Set<Object> set = new HashSet<>();
set.addAll(registry.getServices(type.getActualTypeArgument(0).getRawClass()));
if (registry != this.dependencies) {
set.addAll(this.dependencies.getServices(type.getActualTypeArgument(0).getRawClass()));
}
- value = new ArrayList<Object>(set);
+ value = new ArrayList<>(set);
} else {
value = registry.getService(type.getRawClass());
if (value == null && registry != this.dependencies) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
index aaad93c..879ecb7 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/AggregateServiceTracker.java
@@ -129,8 +129,8 @@ public abstract class AggregateServiceTracker {
public class State {
- private final Map<Class, List> multi = new HashMap<Class, List>();
- private final Map<Class, Object> single = new HashMap<Class, Object>();
+ private final Map<Class, List> multi = new HashMap<>();
+ private final Map<Class, Object> single = new HashMap<>();
public boolean isSatisfied() {
return singleTrackers.keySet().stream()
@@ -146,7 +146,7 @@ public abstract class AggregateServiceTracker {
}
public List<String> getMissingServices() {
- List<String> missing = new ArrayList<String>();
+ List<String> missing = new ArrayList<>();
for (SingleServiceTracker tracker : singleTrackers.values()) {
if (!single.containsKey(tracker.getTrackedClass())) {
missing.add(tracker.getTrackedClass().getName());
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
index 33d17ca..167b4e2 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java
@@ -58,7 +58,7 @@ public class CommandExtension implements Extension {
private final Registry registry;
private final CountDownLatch started;
private final AggregateServiceTracker tracker;
- private final List<Class> classes = new ArrayList<Class>();
+ private final List<Class> classes = new ArrayList<>();
private Manager manager;
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java
index ad46b66..acf48db 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/MultiServiceTracker.java
@@ -42,7 +42,7 @@ public abstract class MultiServiceTracker<T> {
private final BundleContext ctx;
private final Class<T> clazz;
- private final Map<ServiceReference<T>, T> refs = new HashMap<ServiceReference<T>, T>();
+ private final Map<ServiceReference<T>, T> refs = new HashMap<>();
private final AtomicBoolean open = new AtomicBoolean(false);
private final ServiceListener listener = new ServiceListener() {
@@ -91,7 +91,7 @@ public abstract class MultiServiceTracker<T> {
List<ServiceReference> oldRefs;
synchronized (refs) {
- oldRefs = new ArrayList<ServiceReference>(refs.keySet());
+ oldRefs = new ArrayList<>(refs.keySet());
refs.clear();
}
for (ServiceReference ref : oldRefs) {
@@ -101,7 +101,7 @@ public abstract class MultiServiceTracker<T> {
}
private void updateState() {
- List<T> svcs = new ArrayList<T>();
+ List<T> svcs = new ArrayList<>();
synchronized (refs) {
svcs.addAll(refs.values());
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/RegistryImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/RegistryImpl.java
index 07b000e..97c6aa2 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/RegistryImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/RegistryImpl.java
@@ -31,8 +31,8 @@ import org.apache.karaf.shell.api.console.Registry;
public class RegistryImpl implements Registry {
private final Registry parent;
- private final Map<Object, Object> services = new LinkedHashMap<Object, Object>();
- private final Map<String, List<Command>> commands = new HashMap<String, List<Command>>();
+ private final Map<Object, Object> services = new LinkedHashMap<>();
+ private final Map<String, List<Command>> commands = new HashMap<>();
public RegistryImpl(Registry parent) {
this.parent = parent;
@@ -63,7 +63,7 @@ public class RegistryImpl implements Registry {
@Override
public <T> void register(Callable<T> factory, Class<T> clazz) {
synchronized (services) {
- services.put(clazz, new Factory<T>(clazz, factory));
+ services.put(clazz, new Factory<>(clazz, factory));
}
}
@@ -133,7 +133,7 @@ public class RegistryImpl implements Registry {
@Override
public <T> List<T> getServices(Class<T> clazz) {
- List<T> list = new ArrayList<T>();
+ List<T> list = new ArrayList<>();
synchronized (services) {
for (Object service : services.values()) {
if (service instanceof Factory) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/SingleServiceTracker.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/SingleServiceTracker.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/SingleServiceTracker.java
index 6c15d48..7e4db91 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/SingleServiceTracker.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/SingleServiceTracker.java
@@ -38,8 +38,8 @@ public abstract class SingleServiceTracker<T> {
private final BundleContext ctx;
private final Class<T> clazz;
- private final AtomicReference<T> service = new AtomicReference<T>();
- private final AtomicReference<ServiceReference<T>> ref = new AtomicReference<ServiceReference<T>>();
+ private final AtomicReference<T> service = new AtomicReference<>();
+ private final AtomicReference<ServiceReference<T>> ref = new AtomicReference<>();
private final AtomicBoolean open = new AtomicBoolean(false);
private final ServiceListener listener = new ServiceListener() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandNamesCompleter.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandNamesCompleter.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandNamesCompleter.java
index 377bdcc..ba302e6 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandNamesCompleter.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/CommandNamesCompleter.java
@@ -34,7 +34,7 @@ public class CommandNamesCompleter extends org.apache.karaf.shell.support.comple
public int complete(Session session, CommandLine commandLine, List<String> candidates) {
// TODO: optimize
List<Command> list = session.getRegistry().getCommands();
- Set<String> names = new HashSet<String>();
+ Set<String> names = new HashSet<>();
for (Command command : list) {
names.add(command.getScope() + ":" + command.getName());
names.add(command.getName());
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/RegistryImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/RegistryImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/RegistryImpl.java
index e8ad391..06e2456 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/RegistryImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/RegistryImpl.java
@@ -31,8 +31,8 @@ import org.apache.karaf.shell.api.console.Registry;
public class RegistryImpl implements Registry {
protected final Registry parent;
- protected final Map<Object, Object> services = new LinkedHashMap<Object, Object>();
- private final Map<String, List<Command>> commands = new HashMap<String, List<Command>>();
+ protected final Map<Object, Object> services = new LinkedHashMap<>();
+ private final Map<String, List<Command>> commands = new HashMap<>();
public RegistryImpl(Registry parent) {
this.parent = parent;
@@ -63,7 +63,7 @@ public class RegistryImpl implements Registry {
@Override
public <T> void register(Callable<T> factory, Class<T> clazz) {
synchronized (services) {
- services.put(factory, new Factory<T>(clazz, factory));
+ services.put(factory, new Factory<>(clazz, factory));
}
}
@@ -126,7 +126,7 @@ public class RegistryImpl implements Registry {
@Override
public <T> List<T> getServices(Class<T> clazz) {
- List<T> list = new ArrayList<T>();
+ List<T> list = new ArrayList<>();
synchronized (services) {
for (Object service : services.values()) {
if (service instanceof Factory) {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/SubShellCommand.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/SubShellCommand.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/SubShellCommand.java
index 1dc46a9..d69504d 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/SubShellCommand.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/SubShellCommand.java
@@ -61,7 +61,7 @@ public class SubShellCommand extends TopLevelCommand {
@Override
protected void printHelp(Session session, PrintStream out) {
try {
- new HelpCommand(session.getFactory()).execute(session, Arrays.<Object>asList("shell|" + name));
+ new HelpCommand(session.getFactory()).execute(session, Arrays.asList("shell|" + name));
} catch (Exception e) {
throw new RuntimeException("Unable to print subshell help", e);
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java
index 3402f8a..1be156e 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/HelpCommand.java
@@ -134,7 +134,7 @@ public class HelpCommand implements Command {
return -1;
}
protected boolean verifyCompleter(Session session, Completer completer, String argument) {
- List<String> candidates = new ArrayList<String>();
+ List<String> candidates = new ArrayList<>();
return completer.complete(session, new ArgumentCommandLine(argument, argument.length()), candidates) != -1 && !candidates.isEmpty();
}
};
@@ -175,7 +175,7 @@ public class HelpCommand implements Command {
if (path == null) {
path = "%root%";
}
- Map<String,String> props = new HashMap<String,String>();
+ Map<String,String> props = new HashMap<>();
props.put("data", "${" + path + "}");
final List<HelpProvider> providers = session.getRegistry().getServices(HelpProvider.class);
InterpolationHelper.performSubstitution(props, new InterpolationHelper.SubstitutionCallback() {
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/SimpleHelpProvider.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/SimpleHelpProvider.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/SimpleHelpProvider.java
index 90ad506..6665235 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/SimpleHelpProvider.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/commands/help/SimpleHelpProvider.java
@@ -28,7 +28,7 @@ public class SimpleHelpProvider implements HelpProvider {
private final Map<String, String> help;
public SimpleHelpProvider() {
- help = new HashMap<String, String>();
+ help = new HashMap<>();
help.put("%root%", "${command-list|}");
help.put("all", "${command-list|}");
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/EventAdminListener.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/EventAdminListener.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/EventAdminListener.java
index 820cace..b7b805e 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/EventAdminListener.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/EventAdminListener.java
@@ -36,7 +36,7 @@ public class EventAdminListener implements CommandSessionListener, Closeable
public EventAdminListener(BundleContext bundleContext)
{
- tracker = new ServiceTracker<EventAdmin, EventAdmin>(bundleContext, EventAdmin.class.getName(), null);
+ tracker = new ServiceTracker<>(bundleContext, EventAdmin.class.getName(), null);
tracker.open();
}
@@ -48,7 +48,7 @@ public class EventAdminListener implements CommandSessionListener, Closeable
if (command.toString().trim().length() > 0) {
EventAdmin admin = tracker.getService();
if (admin != null) {
- Map<String, Object> props = new HashMap<String, Object>();
+ Map<String, Object> props = new HashMap<>();
props.put("command", command.toString());
Event event = new Event("org/apache/karaf/shell/console/EXECUTING", props);
admin.postEvent(event);
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
index 16e5553..cf12f18 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/osgi/secured/SecuredSessionFactoryImpl.java
@@ -58,7 +58,7 @@ public class SecuredSessionFactoryImpl extends SessionFactoryImpl implements Con
private static final Logger LOGGER = LoggerFactory.getLogger(SecuredSessionFactoryImpl.class);
private BundleContext bundleContext;
- private Map<String, Dictionary<String, Object>> scopes = new HashMap<String, Dictionary<String, Object>>();
+ private Map<String, Dictionary<String, Object>> scopes = new HashMap<>();
private SingleServiceTracker<ConfigurationAdmin> configAdminTracker;
private ServiceRegistration<ConfigurationListener> registration;
@@ -93,7 +93,7 @@ public class SecuredSessionFactoryImpl extends SessionFactoryImpl implements Con
protected boolean isVisible(Command command) {
Dictionary<String, Object> config = getScopeConfig(command.getScope());
if (config != null) {
- List<String> roles = new ArrayList<String>();
+ List<String> roles = new ArrayList<>();
ACLConfigurationParser.getRolesForInvocation(command.getName(), null, null, config, roles);
if (roles.isEmpty()) {
return true;
@@ -115,7 +115,7 @@ public class SecuredSessionFactoryImpl extends SessionFactoryImpl implements Con
if (!isVisible(command)) {
throw new CommandNotFoundException(command.getScope() + ":" + command.getName());
}
- List<String> roles = new ArrayList<String>();
+ List<String> roles = new ArrayList<>();
ACLConfigurationParser.Specificity s = ACLConfigurationParser.getRolesForInvocation(command.getName(), new Object[] { arguments.toString() }, null, config, roles);
if (s == ACLConfigurationParser.Specificity.NO_MATCH) {
return;
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
index ccdb949..6c0cad4 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/parsing/KarafParser.java
@@ -111,7 +111,7 @@ public class KarafParser implements org.jline.reader.Parser {
return new ParsedLineImpl(program, statement, cursor, statement.tokens());
} else {
// TODO:
- return new ParsedLineImpl(program, program, cursor, Collections.<Token>singletonList(program));
+ return new ParsedLineImpl(program, program, cursor, Collections.singletonList(program));
}
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/67232b63/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
----------------------------------------------------------------------
diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
index f1607bf..e3be511 100644
--- a/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
+++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/console/standalone/Main.java
@@ -244,7 +244,7 @@ public class Main {
}
private static List<URL> getFiles(File base) throws MalformedURLException {
- List<URL> urls = new ArrayList<URL>();
+ List<URL> urls = new ArrayList<>();
getFiles(base, urls);
return urls;
}