You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/08/15 03:10:12 UTC
[04/15] git commit: SLIDER-322 move all <> constructors to typed
SLIDER-322 move all <> constructors to typed
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/daba289e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/daba289e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/daba289e
Branch: refs/heads/feature/SLIDER-280_Restart_AM_fun_tests
Commit: daba289e9327150078f3a38724db2dcbaec2ab12
Parents: 52f1f6f
Author: Steve Loughran <st...@apache.org>
Authored: Thu Aug 14 16:47:45 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Thu Aug 14 16:47:45 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/slider/Slider.java | 2 +-
.../apache/slider/api/ClusterDescription.java | 14 ++---
.../org/apache/slider/client/SliderClient.java | 6 +--
.../slider/client/SliderYarnClientImpl.java | 8 +--
.../common/params/AbstractActionArgs.java | 6 +--
.../params/AppAndResouceOptionArgsDelegate.java | 8 +--
.../org/apache/slider/common/params/ArgOps.java | 8 +--
.../apache/slider/common/params/CommonArgs.java | 4 +-
.../common/params/DontSplitArguments.java | 2 +-
.../slider/common/tools/ConfigHelper.java | 4 +-
.../slider/common/tools/CoreFileSystem.java | 2 +-
.../apache/slider/common/tools/SliderUtils.java | 10 ++--
.../org/apache/slider/core/conf/ConfTree.java | 6 +--
.../slider/core/conf/ConfTreeOperations.java | 4 +-
.../apache/slider/core/conf/MapOperations.java | 2 +-
.../slider/core/launch/AbstractLauncher.java | 10 ++--
.../core/launch/ClasspathConstructor.java | 2 +-
.../slider/core/launch/CommandLineBuilder.java | 2 +-
.../slider/core/main/ServiceLauncher.java | 2 +-
.../registry/docstore/PublishedConfigSet.java | 2 +-
.../docstore/PublishedConfiguration.java | 4 +-
.../slider/core/registry/docstore/UriMap.java | 2 +-
.../slider/core/registry/info/RegistryView.java | 3 +-
.../core/registry/info/ServiceInstanceData.java | 4 +-
.../apache/slider/core/zk/ZKIntegration.java | 2 +-
.../apache/slider/core/zk/ZookeeperUtils.java | 6 +--
.../providers/AbstractProviderService.java | 4 +-
.../apache/slider/providers/ProviderUtils.java | 2 +-
.../providers/agent/AgentClientProvider.java | 2 +-
.../providers/agent/AgentLaunchParameter.java | 2 +-
.../providers/agent/AgentProviderService.java | 47 ++++++++--------
.../providers/agent/ComponentCommandOrder.java | 9 ++--
.../agent/application/metadata/Application.java | 8 +--
.../agent/application/metadata/Component.java | 2 +-
.../slideram/SliderAMClientProvider.java | 4 +-
.../slideram/SliderAMProviderService.java | 2 +-
.../server/appmaster/SliderAppMaster.java | 18 +++----
.../appmaster/actions/ActionKillContainer.java | 2 +-
.../server/appmaster/actions/QueueService.java | 6 +--
.../appmaster/monkey/ChaosMonkeyService.java | 2 +-
.../slider/server/appmaster/state/AppState.java | 56 ++++++++++----------
.../MostRecentContainerReleaseSelector.java | 2 +-
.../server/appmaster/state/NodeInstance.java | 2 +-
.../slider/server/appmaster/state/NodeMap.java | 2 +-
.../state/OutstandingRequestTracker.java | 6 +--
.../appmaster/state/ProviderAppState.java | 4 +-
.../server/appmaster/state/RoleHistory.java | 15 +++---
.../server/appmaster/state/RoleStatus.java | 2 +-
.../server/appmaster/web/SliderAMWebApp.java | 2 +-
.../web/SliderAmFilterInitializer.java | 2 +-
.../server/appmaster/web/SliderAmIpFilter.java | 2 +-
.../server/appmaster/web/WebAppApiImpl.java | 2 +-
.../web/rest/publisher/PublisherResource.java | 4 +-
.../slider/server/avro/RoleHistoryWriter.java | 6 +--
.../server/servicemonitor/MonitorUtils.java | 2 +-
.../services/curator/RegistryBinderService.java | 6 +--
.../registry/RegistryRestResources.java | 3 +-
.../registry/SliderRegistryService.java | 2 +-
58 files changed, 181 insertions(+), 174 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/Slider.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/Slider.java b/slider-core/src/main/java/org/apache/slider/Slider.java
index 0d25f00..5fc8618 100644
--- a/slider-core/src/main/java/org/apache/slider/Slider.java
+++ b/slider-core/src/main/java/org/apache/slider/Slider.java
@@ -42,7 +42,7 @@ public class Slider extends SliderClient {
//turn the args to a list
List<String> argsList = Arrays.asList(args);
//create a new list, as the ArrayList type doesn't push() on an insert
- List<String> extendedArgs = new ArrayList<>(argsList);
+ List<String> extendedArgs = new ArrayList<String>(argsList);
//insert the service name
extendedArgs.add(0, SERVICE_CLASSNAME);
//now have the service launcher do its work
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/api/ClusterDescription.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/api/ClusterDescription.java b/slider-core/src/main/java/org/apache/slider/api/ClusterDescription.java
index d5869a6..d875d66 100644
--- a/slider-core/src/main/java/org/apache/slider/api/ClusterDescription.java
+++ b/slider-core/src/main/java/org/apache/slider/api/ClusterDescription.java
@@ -165,40 +165,40 @@ public class ClusterDescription implements Cloneable {
* the Slider AM and the application that it deploys
*/
public Map<String, String> options =
- new HashMap<>();
+ new HashMap<String, String>();
/**
* cluster information
* This is only valid when querying the cluster status.
*/
public Map<String, String> info =
- new HashMap<>();
+ new HashMap<String, String>();
/**
* Statistics. This is only relevant when querying the cluster status
*/
public Map<String, Map<String, Integer>> statistics =
- new HashMap<>();
+ new HashMap<String, Map<String, Integer>>();
/**
* Instances: role->count
*/
public Map<String, List<String>> instances =
- new HashMap<>();
+ new HashMap<String, List<String>>();
/**
* Role options,
* role -> option -> value
*/
public Map<String, Map<String, String>> roles =
- new HashMap<>();
+ new HashMap<String, Map<String, String>>();
/**
* List of key-value pairs to add to a client config to set up the client
*/
public Map<String, String> clientProperties =
- new HashMap<>();
+ new HashMap<String, String>();
/**
* Status information
@@ -569,7 +569,7 @@ public class ClusterDescription implements Cloneable {
*/
@JsonIgnore
public Set<String> getRoleNames() {
- return new HashSet<>(roles.keySet());
+ return new HashSet<String>(roles.keySet());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
index 1337570..356f99f 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderClient.java
@@ -1381,7 +1381,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
verifyBindingsDefined();
SliderUtils.validateClusterName(name);
log.debug("actionFlex({})", name);
- Map<String, Integer> roleInstances = new HashMap<>();
+ Map<String, Integer> roleInstances = new HashMap<String, Integer>();
Map<String, String> roleMap = args.getComponentMap();
for (Map.Entry<String, String> roleEntry : roleMap.entrySet()) {
String key = roleEntry.getKey();
@@ -1934,7 +1934,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
if (uuids.length == 0) {
// short cut on an empty list
- return new LinkedList<>();
+ return new LinkedList<ClusterNode>();
}
return createClusterOperations().listClusterNodes(uuids);
}
@@ -2133,7 +2133,7 @@ public class SliderClient extends AbstractSliderLaunchedService implements RunSe
+ serviceType
+ " name " + name);
}
- List<ServiceInstanceData> sids = new ArrayList<>(size);
+ List<ServiceInstanceData> sids = new ArrayList<ServiceInstanceData>(size);
for (CuratorServiceInstance<ServiceInstanceData> instance : instances) {
ServiceInstanceData payload = instance.payload;
logInstance(payload, registryArgs.verbose);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java b/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
index e7b492b..3151a09 100644
--- a/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
+++ b/slider-core/src/main/java/org/apache/slider/client/SliderYarnClientImpl.java
@@ -70,10 +70,10 @@ public class SliderYarnClientImpl extends YarnClientImpl {
*/
public List<ApplicationReport> listInstances(String user)
throws YarnException, IOException {
- Set<String> types = new HashSet<>(1);
+ Set<String> types = new HashSet<String>(1);
types.add(SliderKeys.APP_TYPE);
List<ApplicationReport> allApps = getApplications(types);
- List<ApplicationReport> results = new ArrayList<>();
+ List<ApplicationReport> results = new ArrayList<ApplicationReport>();
for (ApplicationReport report : allApps) {
if (StringUtils.isEmpty(user) || user.equals(report.getUser())) {
results.add(report);
@@ -97,7 +97,7 @@ public class SliderYarnClientImpl extends YarnClientImpl {
YarnException {
List<ApplicationReport> instances = listInstances(user);
List<ApplicationReport> results =
- new ArrayList<>(instances.size());
+ new ArrayList<ApplicationReport>(instances.size());
for (ApplicationReport report : instances) {
if (report.getName().equals(appname)) {
results.add(report);
@@ -240,7 +240,7 @@ public class SliderYarnClientImpl extends YarnClientImpl {
IOException {
List<ApplicationReport> instances = listInstances(user);
List<ApplicationReport> results =
- new ArrayList<>(instances.size());
+ new ArrayList<ApplicationReport>(instances.size());
for (ApplicationReport app : instances) {
if (app.getName().equals(appname)
&& isApplicationLive(app)) {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java
index 3a8cea4..f4a4569 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/AbstractActionArgs.java
@@ -55,7 +55,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments {
* This is the default parameter
*/
@Parameter
- public final List<String> parameters = new ArrayList<>();
+ public final List<String> parameters = new ArrayList<String>();
/**
* get the name: relies on arg 1 being the cluster name in all operations
@@ -76,7 +76,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments {
*/
@Parameter(names = ARG_DEFINE, arity = 1, description = "Definitions")
- public final List<String> definitions = new ArrayList<>();
+ public final List<String> definitions = new ArrayList<String>();
/**
* System properties
@@ -84,7 +84,7 @@ public abstract class AbstractActionArgs extends ArgOps implements Arguments {
@Parameter(names = {ARG_SYSPROP}, arity = 1,
description = "system properties in the form name value" +
" These are set after the JVM is started.")
- public final List<String> sysprops = new ArrayList<>(0);
+ public final List<String> sysprops = new ArrayList<String>(0);
@Parameter(names = {ARG_MANAGER_SHORT, ARG_MANAGER},
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java b/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
index 248e4c2..1f07de3 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/AppAndResouceOptionArgsDelegate.java
@@ -37,7 +37,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate {
@Parameter(names = {ARG_OPTION, ARG_OPTION_SHORT}, arity = 2,
description = ARG_OPTION + "<name> <value>",
splitter = DontSplitArguments.class)
- public List<String> optionTuples = new ArrayList<>(0);
+ public List<String> optionTuples = new ArrayList<String>(0);
/**
@@ -47,7 +47,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate {
description = "Component option " + ARG_COMP_OPT +
" <component> <name> <option>",
splitter = DontSplitArguments.class)
- public List<String> compOptTriples = new ArrayList<>(0);
+ public List<String> compOptTriples = new ArrayList<String>(0);
/**
* Resource Options
@@ -55,7 +55,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate {
@Parameter(names = {ARG_RESOURCE_OPT, ARG_RESOURCE_OPT_SHORT}, arity = 2,
description = "Resource option "+ ARG_RESOURCE_OPT + "<name> <value>",
splitter = DontSplitArguments.class)
- public List<String> resOptionTuples = new ArrayList<>(0);
+ public List<String> resOptionTuples = new ArrayList<String>(0);
/**
@@ -65,7 +65,7 @@ public class AppAndResouceOptionArgsDelegate extends AbstractArgsDelegate {
description = "Component resource option " + ARG_RES_COMP_OPT +
" <component> <name> <option>",
splitter = DontSplitArguments.class)
- public List<String> resCompOptTriples = new ArrayList<>(0);
+ public List<String> resCompOptTriples = new ArrayList<String>(0);
public Map<String, String> getOptionsMap() throws
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java b/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java
index b53ebd3..83754b3 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/ArgOps.java
@@ -44,7 +44,7 @@ public class ArgOps {
* create a 3-tuple
*/
public static List<Object> triple(String msg, int min, int max) {
- List<Object> l = new ArrayList<>(3);
+ List<Object> l = new ArrayList<Object>(3);
l.add(msg);
l.add(min);
l.add(max);
@@ -100,7 +100,7 @@ public class ArgOps {
public static Map<String, String> convertTupleListToMap(String description,
List<String> list) throws
BadCommandArgumentsException {
- Map<String, String> results = new HashMap<>();
+ Map<String, String> results = new HashMap<String, String>();
if (list != null && !list.isEmpty()) {
int size = list.size();
if (size % 2 != 0) {
@@ -134,7 +134,7 @@ public class ArgOps {
List<String> list) throws
BadCommandArgumentsException {
Map<String, Map<String, String>> results =
- new HashMap<>();
+ new HashMap<String, Map<String, String>>();
if (list != null && !list.isEmpty()) {
int size = list.size();
if (size % 3 != 0) {
@@ -149,7 +149,7 @@ public class ArgOps {
Map<String, String> roleMap = results.get(role);
if (roleMap == null) {
//demand create new role map
- roleMap = new HashMap<>();
+ roleMap = new HashMap<String, String>();
results.put(role, roleMap);
}
if (roleMap.get(key) != null) {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java
index 83e658d..5d94182 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/CommonArgs.java
@@ -62,11 +62,11 @@ public abstract class CommonArgs extends ArgOps implements SliderActions,
*/
- public Map<String, String> definitionMap = new HashMap<>();
+ public Map<String, String> definitionMap = new HashMap<String, String>();
/**
* System properties
*/
- public Map<String, String> syspropsMap = new HashMap<>();
+ public Map<String, String> syspropsMap = new HashMap<String, String>();
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java b/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java
index 0344305..3225133 100644
--- a/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java
+++ b/slider-core/src/main/java/org/apache/slider/common/params/DontSplitArguments.java
@@ -27,7 +27,7 @@ public class DontSplitArguments implements IParameterSplitter {
@Override
public List<String> split(String value) {
- List<String> list = new ArrayList<>(1);
+ List<String> list = new ArrayList<String>(1);
list.add(value);
return list;
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java b/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
index 2f0b9ac..f8fd226 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/ConfigHelper.java
@@ -81,7 +81,7 @@ public class ConfigHelper {
*/
public static TreeSet<String> sortedConfigKeys(Iterable<Map.Entry<String, String>> conf) {
- TreeSet<String> sorted = new TreeSet<>();
+ TreeSet<String> sorted = new TreeSet<String>();
for (Map.Entry<String, String> entry : conf) {
sorted.add(entry.getKey());
}
@@ -510,7 +510,7 @@ public class ConfigHelper {
* @return hash map
*/
public static Map<String, String> buildMapFromConfiguration(Configuration conf) {
- Map<String, String> map = new HashMap<>();
+ Map<String, String> map = new HashMap<String, String>();
return SliderUtils.mergeEntries(map, conf);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java b/slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java
index 9718be9..2381a82 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/CoreFileSystem.java
@@ -442,7 +442,7 @@ public class CoreFileSystem {
//copied to the destination
FileStatus[] fileset = fileSystem.listStatus(srcDir);
Map<String, LocalResource> localResources =
- new HashMap<>(fileset.length);
+ new HashMap<String, LocalResource>(fileset.length);
for (FileStatus entry : fileset) {
LocalResource resource = createAmResource(entry.getPath(),
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
index 7a80f24..188b7d9 100644
--- a/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/common/tools/SliderUtils.java
@@ -440,7 +440,7 @@ public final class SliderUtils {
* @return a stringified list
*/
public static List<String> collectionToStringList(Collection c) {
- List<String> l = new ArrayList<>(c.size());
+ List<String> l = new ArrayList<String>(c.size());
for (Object o : c) {
l.add(o.toString());
}
@@ -839,7 +839,7 @@ public final class SliderUtils {
* @return a possibly empty map of environment variables.
*/
public static Map<String, String> buildEnvMap(Map<String, String> roleOpts) {
- Map<String, String> env = new HashMap<>();
+ Map<String, String> env = new HashMap<String, String>();
if (roleOpts != null) {
for (Map.Entry<String, String> entry: roleOpts.entrySet()) {
String key = entry.getKey();
@@ -866,7 +866,7 @@ public final class SliderUtils {
Map<String, String> optionMap = entry.getValue();
Map<String, String> existingMap = clusterRoleMap.get(key);
if (existingMap == null) {
- existingMap = new HashMap<>();
+ existingMap = new HashMap<String, String>();
}
log.debug("Overwriting role options with command line values {}",
stringifyMap(optionMap));
@@ -1031,7 +1031,7 @@ public final class SliderUtils {
}
public static Map<String, Map<String, String>> deepClone(Map<String, Map<String, String>> src) {
- Map<String, Map<String, String>> dest = new HashMap<>();
+ Map<String, Map<String, String>> dest = new HashMap<String, Map<String, String>>();
for (Map.Entry<String, Map<String, String>> entry : src.entrySet()) {
dest.put(entry.getKey(), stringMapClone(entry.getValue()));
}
@@ -1039,7 +1039,7 @@ public final class SliderUtils {
}
public static Map<String, String> stringMapClone(Map<String, String> src) {
- Map<String, String> dest = new HashMap<>();
+ Map<String, String> dest = new HashMap<String, String>();
return mergeEntries(dest, src.entrySet());
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java b/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java
index 2cbfd54..5517771 100644
--- a/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java
+++ b/slider-core/src/main/java/org/apache/slider/core/conf/ConfTree.java
@@ -55,14 +55,14 @@ public final class ConfTree {
/**
* Metadata
*/
- public Map<String, Object> metadata = new HashMap<>(INITAL_MAP_CAPACITY);
+ public Map<String, Object> metadata = new HashMap<String, Object >(INITAL_MAP_CAPACITY);
/**
* Global options
*/
public Map<String, String> global =
- new HashMap<>(INITAL_MAP_CAPACITY);
+ new HashMap<String, String>(INITAL_MAP_CAPACITY);
/**
@@ -70,7 +70,7 @@ public final class ConfTree {
* role -> option -> value
*/
public Map<String, Map<String, String>> components =
- new HashMap<>(INITAL_MAP_CAPACITY);
+ new HashMap<String, Map<String, String>>(INITAL_MAP_CAPACITY);
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/conf/ConfTreeOperations.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/ConfTreeOperations.java b/slider-core/src/main/java/org/apache/slider/core/conf/ConfTreeOperations.java
index 1cb537a..bb17547 100644
--- a/slider-core/src/main/java/org/apache/slider/core/conf/ConfTreeOperations.java
+++ b/slider-core/src/main/java/org/apache/slider/core/conf/ConfTreeOperations.java
@@ -148,7 +148,7 @@ public class ConfTreeOperations {
return operations;
}
//create a new instances
- Map<String, String> map = new HashMap<>();
+ Map<String, String> map = new HashMap<String, String>();
confTree.components.put(name, map);
return new MapOperations(name, map);
}
@@ -159,7 +159,7 @@ public class ConfTreeOperations {
*/
@JsonIgnore
public Set<String> getComponentNames() {
- return new HashSet<>(confTree.components.keySet());
+ return new HashSet<String>(confTree.components.keySet());
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java b/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java
index 98a51bc..4b1b44f 100644
--- a/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java
+++ b/slider-core/src/main/java/org/apache/slider/core/conf/MapOperations.java
@@ -47,7 +47,7 @@ public class MapOperations implements Map<String, String> {
public final String name;
public MapOperations() {
- options = new HashMap<>();
+ options = new HashMap<String, String>();
name = "";
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java b/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
index 8652b4c..644f627 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/AbstractLauncher.java
@@ -58,15 +58,15 @@ public abstract class AbstractLauncher extends Configured {
/**
* Env vars; set up at final launch stage
*/
- protected final Map<String, String> envVars = new HashMap<>();
+ protected final Map<String, String> envVars = new HashMap<String, String>();
protected final MapOperations env = new MapOperations("env", envVars);
protected final ContainerLaunchContext containerLaunchContext =
Records.newRecord(ContainerLaunchContext.class);
- protected final List<String> commands = new ArrayList<>(20);
+ protected final List<String> commands = new ArrayList<String>(20);
protected final Map<String, LocalResource> localResources =
- new HashMap<>();
+ new HashMap<String, LocalResource>();
private final Map<String, ByteBuffer> serviceData =
- new HashMap<>();
+ new HashMap<String, ByteBuffer>();
// security
Credentials credentials = new Credentials();
@@ -269,7 +269,7 @@ public abstract class AbstractLauncher extends Configured {
public String[] dumpEnvToString() {
- List<String> nodeEnv = new ArrayList<>();
+ List<String> nodeEnv = new ArrayList<String>();
for (Map.Entry<String, String> entry : env.entrySet()) {
String envElt = String.format("%s=\"%s\"",
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
index 3527149..8e49435 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/ClasspathConstructor.java
@@ -39,7 +39,7 @@ public class ClasspathConstructor {
public static final String CLASS_PATH_SEPARATOR = ApplicationConstants.CLASS_PATH_SEPARATOR;
// public static final String CLASS_PATH_SEPARATOR = File.pathSeparator;
- private final List<String> pathElements = new ArrayList<>();
+ private final List<String> pathElements = new ArrayList<String>();
public ClasspathConstructor() {
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/launch/CommandLineBuilder.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/launch/CommandLineBuilder.java b/slider-core/src/main/java/org/apache/slider/core/launch/CommandLineBuilder.java
index dbaa981..f50bb48 100644
--- a/slider-core/src/main/java/org/apache/slider/core/launch/CommandLineBuilder.java
+++ b/slider-core/src/main/java/org/apache/slider/core/launch/CommandLineBuilder.java
@@ -30,7 +30,7 @@ import java.util.List;
* Special support for JVM command buildup.
*/
public class CommandLineBuilder {
- protected final List<String> argumentList = new ArrayList<>(20);
+ protected final List<String> argumentList = new ArrayList<String>(20);
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
index 846aca1..df12849 100644
--- a/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
+++ b/slider-core/src/main/java/org/apache/slider/core/main/ServiceLauncher.java
@@ -419,7 +419,7 @@ public class ServiceLauncher<S extends Service>
if (argCount <= 1 ) {
return new String[0];
}
- List<String> argsList = new ArrayList<>(argCount);
+ List<String> argsList = new ArrayList<String>(argCount);
ListIterator<String> arguments = args.listIterator();
//skip that first entry
arguments.next();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java
index f498916..eac34c0 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java
@@ -41,7 +41,7 @@ public class PublishedConfigSet {
RestPaths.PUBLISHED_CONFIGURATION_REGEXP);
public Map<String, PublishedConfiguration> configurations =
- new HashMap<>();
+ new HashMap<String, PublishedConfiguration>();
public PublishedConfigSet() {
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
index 93282cc..f76b93b 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
@@ -46,7 +46,7 @@ public class PublishedConfiguration {
public String updatedTime;
- public Map<String, String> entries = new HashMap<>();
+ public Map<String, String> entries = new HashMap<String, String>();
public PublishedConfiguration() {
}
@@ -112,7 +112,7 @@ public class PublishedConfiguration {
* @param entries entries to put
*/
public void putValues(Iterable<Map.Entry<String, String>> entries) {
- this.entries = new HashMap<>();
+ this.entries = new HashMap<String, String>();
for (Map.Entry<String, String> entry : entries) {
this.entries.put(entry.getKey(), entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/registry/docstore/UriMap.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/UriMap.java b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/UriMap.java
index 120966f..a76e28d 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/docstore/UriMap.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/docstore/UriMap.java
@@ -29,7 +29,7 @@ import java.util.Map;
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
public class UriMap {
- public Map<String, String> uris = new HashMap<>();
+ public Map<String, String> uris = new HashMap<String, String>();
@JsonIgnore
public void put(String key, String value) {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java b/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java
index 07e4981..bdf70a2 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java
@@ -31,7 +31,8 @@ public class RegistryView {
/**
* Endpoints
*/
- public Map<String, RegisteredEndpoint> endpoints = new HashMap<>(2);
+ public Map<String, RegisteredEndpoint> endpoints =
+ new HashMap<String, RegisteredEndpoint>(2);
public String configurationsURL;
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java b/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
index 80f0b34..c3c7e63 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/info/ServiceInstanceData.java
@@ -124,13 +124,13 @@ public class ServiceInstanceData implements Serializable {
public Map<String, RegisteredEndpoint> listEndpoints(boolean external) {
RegistryView view = getRegistryView(external);
if (view == null) {
- return new HashMap<>(0);
+ return new HashMap<String, RegisteredEndpoint>(0);
}
Map<String, RegisteredEndpoint> endpoints = view.endpoints;
if (endpoints != null) {
return endpoints;
} else {
- return new HashMap<>(0);
+ return new HashMap<String, RegisteredEndpoint>(0);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java b/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
index 54aeb4f..0d96559 100644
--- a/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
+++ b/slider-core/src/main/java/org/apache/slider/core/zk/ZKIntegration.java
@@ -49,7 +49,7 @@ public class ZKIntegration implements Watcher {
public static String SVC_SLIDER = "/" + ZK_SERVICES + "/" + ZK_SLIDER;
public static String SVC_SLIDER_USERS = SVC_SLIDER + "/" + ZK_USERS;
- public static final List<String> ZK_USERS_PATH_LIST = new ArrayList<>();
+ public static final List<String> ZK_USERS_PATH_LIST = new ArrayList<String>();
static {
ZK_USERS_PATH_LIST.add(ZK_SERVICES);
ZK_USERS_PATH_LIST.add(ZK_SLIDER);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java b/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
index 8bf25f9..61b1ff0 100644
--- a/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/core/zk/ZookeeperUtils.java
@@ -49,7 +49,7 @@ public class ZookeeperUtils {
if (strings != null) {
len = strings.length;
}
- List<String> tuples = new ArrayList<>(len);
+ List<String> tuples = new ArrayList<String>(len);
if (strings != null) {
for (String s : strings) {
tuples.add(s.trim());
@@ -70,7 +70,7 @@ public class ZookeeperUtils {
if (strings != null) {
len = strings.length;
}
- List<HostAndPort> list = new ArrayList<>(len);
+ List<HostAndPort> list = new ArrayList<HostAndPort>(len);
if (strings != null) {
for (String s : strings) {
list.add(HostAndPort.fromString(s.trim()));
@@ -113,7 +113,7 @@ public class ZookeeperUtils {
* @return
*/
public static String buildQuorum(List<HostAndPort> hostAndPorts, int defaultPort) {
- List<String> entries = new ArrayList<>(hostAndPorts.size());
+ List<String> entries = new ArrayList<String>(hostAndPorts.size());
for (HostAndPort hostAndPort : hostAndPorts) {
entries.add(buildQuorumEntry(hostAndPort, defaultPort));
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
index a4a71dd..3fbd3cf 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/AbstractProviderService.java
@@ -291,7 +291,7 @@ public abstract class AbstractProviderService
*/
@Override
public Map<String, String> buildProviderStatus() {
- return new HashMap<>();
+ return new HashMap<String, String>();
}
/*
@@ -300,7 +300,7 @@ public abstract class AbstractProviderService
*/
@Override
public Map<String, String> buildMonitorDetails(ClusterDescription clusterDesc) {
- Map<String, String> details = new LinkedHashMap<>();
+ Map<String, String> details = new LinkedHashMap<String, String>();
// add in all the
buildEndpointDetails(details);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java b/slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
index db9f494..4b8724a 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/ProviderUtils.java
@@ -419,7 +419,7 @@ public class ProviderUtils implements RoleKeys {
}
log.debug("Found {} entries in {}", ls.length, base);
- List<File> directories = new LinkedList<>();
+ List<File> directories = new LinkedList<File>();
StringBuilder dirs = new StringBuilder();
for (File file : ls) {
log.debug("{}", false);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
index 72b0a42..8f92ffa 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentClientProvider.java
@@ -216,7 +216,7 @@ public class AgentClientProvider extends AbstractClientProvider
}
Application application = metainfo.getApplication();
- tags = new HashSet<>();
+ tags = new HashSet<String>();
tags.add("Name: " + application.getName());
tags.add("Version: " + application.getVersion());
tags.add("Description: " + SliderUtils.truncate(application.getComment(), 80));
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/agent/AgentLaunchParameter.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentLaunchParameter.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentLaunchParameter.java
index b839e58..c8b0e1d 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentLaunchParameter.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentLaunchParameter.java
@@ -94,7 +94,7 @@ class AgentLaunchParameter {
}
if (trackers == null) {
- trackers = new HashMap<>(10);
+ trackers = new HashMap<String, CommandTracker>(10);
}
String componentName = parameters[0];
CommandTracker tracker = new CommandTracker(Arrays.copyOfRange(parameters, 1, parameters.length));
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
index 43ee7a6..3225066 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/AgentProviderService.java
@@ -132,9 +132,12 @@ public class AgentProviderService extends AbstractProviderService implements
private Boolean canAnyMasterPublish = null;
private AgentLaunchParameter agentLaunchParameter = null;
- private final Map<String, ComponentInstanceState> componentStatuses = new ConcurrentHashMap<>();
- private final Map<String, Map<String, String>> componentInstanceData = new ConcurrentHashMap<>();
- private final Map<String, Map<String, String>> allocatedPorts = new ConcurrentHashMap<>();
+ private final Map<String, ComponentInstanceState> componentStatuses =
+ new ConcurrentHashMap<String, ComponentInstanceState>();
+ private final Map<String, Map<String, String>> componentInstanceData =
+ new ConcurrentHashMap<String, Map<String, String>>();
+ private final Map<String, Map<String, String>> allocatedPorts =
+ new ConcurrentHashMap<String, Map<String, String>>();
private final Map<String, String> workFolders =
Collections.synchronizedMap(new LinkedHashMap<String, String>(MAX_LOG_ENTRIES, 0.75f, false) {
protected boolean removeEldestEntry(Map.Entry eldest) {
@@ -691,7 +694,7 @@ public class AgentProviderService extends AbstractProviderService implements
* @return the provider status - map of entries to add to the info section
*/
public Map<String, String> buildProviderStatus() {
- Map<String, String> stats = new HashMap<>();
+ Map<String, String> stats = new HashMap<String, String>();
return stats;
}
@@ -707,7 +710,8 @@ public class AgentProviderService extends AbstractProviderService implements
workFolders.put(String.format("%s-%s-%s", hostFqdn, containerId, key), folders.get(key));
}
- publishApplicationInstanceData(LOG_FOLDERS_TAG, LOG_FOLDERS_TAG, (new HashMap<>(this.workFolders)).entrySet());
+ publishApplicationInstanceData(LOG_FOLDERS_TAG, LOG_FOLDERS_TAG,
+ (new HashMap<String, String>(this.workFolders)).entrySet());
}
@@ -750,7 +754,7 @@ public class AgentProviderService extends AbstractProviderService implements
String hostKeyFormat = "${%s_HOST}";
// publish export groups if any
- Map<String, String> replaceTokens = new HashMap<>();
+ Map<String, String> replaceTokens = new HashMap<String, String>();
for (Map.Entry<String, Map<String, ClusterNode>> entry : getRoleClusterNodeMapping().entrySet()) {
String hostName = getHostsList(entry.getValue().values(), true).iterator().next();
replaceTokens.put(String.format(hostKeyFormat, entry.getKey().toUpperCase(Locale.ENGLISH)), hostName);
@@ -768,7 +772,7 @@ public class AgentProviderService extends AbstractProviderService implements
List<Export> exports = exportGroup.getExports();
if (exports != null && !exports.isEmpty()) {
String exportGroupName = exportGroup.getName();
- Map<String, String> map = new HashMap<>();
+ Map<String, String> map = new HashMap<String, String>();
for (Export export : exports) {
String value = export.getValue();
// replace host names
@@ -797,7 +801,7 @@ public class AgentProviderService extends AbstractProviderService implements
String roleName) {
String portVarFormat = "${site.%s}";
String hostNamePattern = "${THIS_HOST}";
- Map<String, String> toPublish = new HashMap<>();
+ Map<String, String> toPublish = new HashMap<String, String>();
Application application = getMetainfo().getApplication();
for (Component component : application.getComponents()) {
@@ -831,7 +835,7 @@ public class AgentProviderService extends AbstractProviderService implements
if (toPublish.size() > 0) {
Map<String, String> perContainerData = null;
if (!getComponentInstanceData().containsKey(containerId)) {
- perContainerData = new ConcurrentHashMap<>();
+ perContainerData = new ConcurrentHashMap<String, String>();
} else {
perContainerData = getComponentInstanceData().get(containerId);
}
@@ -842,7 +846,7 @@ public class AgentProviderService extends AbstractProviderService implements
}
private void publishComponentInstanceData() {
- Map<String, String> dataToPublish = new HashMap<>();
+ Map<String, String> dataToPublish = new HashMap<String, String>();
synchronized (this.componentInstanceData) {
for (String container : getComponentInstanceData().keySet()) {
for (String prop : getComponentInstanceData().get(container).keySet()) {
@@ -979,7 +983,7 @@ public class AgentProviderService extends AbstractProviderService implements
cmd.setServiceName(clusterName);
cmd.setComponentName(roleName);
cmd.setRole(roleName);
- Map<String, String> hostLevelParams = new TreeMap<>();
+ Map<String, String> hostLevelParams = new TreeMap<String, String>();
hostLevelParams.put(JAVA_HOME, appConf.getGlobalOptions().getMandatoryOption(JAVA_HOME));
hostLevelParams.put(PACKAGE_LIST, getPackageList());
hostLevelParams.put(CONTAINER_ID, containerId);
@@ -1024,7 +1028,7 @@ public class AgentProviderService extends AbstractProviderService implements
}
private Map<String, String> setCommandParameters(String scriptPath, boolean recordConfig) {
- Map<String, String> cmdParams = new TreeMap<>();
+ Map<String, String> cmdParams = new TreeMap<String, String>();
cmdParams.put("service_package_folder",
"${AGENT_WORK_ROOT}/work/app/definition/package");
cmdParams.put("script", scriptPath);
@@ -1057,7 +1061,7 @@ public class AgentProviderService extends AbstractProviderService implements
cmd.setClusterName(clusterName);
cmd.setRoleCommand(StatusCommand.STATUS_COMMAND);
- Map<String, String> hostLevelParams = new TreeMap<>();
+ Map<String, String> hostLevelParams = new TreeMap<String, String>();
hostLevelParams.put(JAVA_HOME, appConf.getGlobalOptions().getMandatoryOption(JAVA_HOME));
hostLevelParams.put(CONTAINER_ID, containerId);
cmd.setHostLevelParams(hostLevelParams);
@@ -1085,7 +1089,7 @@ public class AgentProviderService extends AbstractProviderService implements
cmd.setServiceName(clusterName);
cmd.setClusterName(clusterName);
cmd.setRoleCommand(StatusCommand.GET_CONFIG_COMMAND);
- Map<String, String> hostLevelParams = new TreeMap<>();
+ Map<String, String> hostLevelParams = new TreeMap<String, String>();
hostLevelParams.put(CONTAINER_ID, containerId);
cmd.setHostLevelParams(hostLevelParams);
@@ -1112,7 +1116,7 @@ public class AgentProviderService extends AbstractProviderService implements
cmd.setServiceName(clusterName);
cmd.setComponentName(roleName);
cmd.setRole(roleName);
- Map<String, String> hostLevelParams = new TreeMap<>();
+ Map<String, String> hostLevelParams = new TreeMap<String, String>();
hostLevelParams.put(JAVA_HOME, appConf.getGlobalOptions().getMandatoryOption(JAVA_HOME));
hostLevelParams.put(CONTAINER_ID, containerId);
cmd.setHostLevelParams(hostLevelParams);
@@ -1149,7 +1153,8 @@ public class AgentProviderService extends AbstractProviderService implements
ConfTreeOperations appConf, String containerId)
throws SliderException {
- Map<String, Map<String, String>> configurations = new TreeMap<>();
+ Map<String, Map<String, String>> configurations =
+ new TreeMap<String, Map<String, String>>();
Map<String, String> tokens = getStandardTokenMap(appConf);
List<String> configs = getApplicationConfigurationTypes(appConf);
@@ -1164,7 +1169,7 @@ public class AgentProviderService extends AbstractProviderService implements
}
private Map<String, String> getStandardTokenMap(ConfTreeOperations appConf) throws SliderException {
- Map<String, String> tokens = new HashMap<>();
+ Map<String, String> tokens = new HashMap<String, String>();
String nnuri = appConf.get("site.fs.defaultFS");
tokens.put("${NN_URI}", nnuri);
tokens.put("${NN_HOST}", URI.create(nnuri).getHost());
@@ -1180,7 +1185,7 @@ public class AgentProviderService extends AbstractProviderService implements
private List<String> getApplicationConfigurationTypes(ConfTreeOperations appConf) {
// for now, reading this from appConf. In the future, modify this method to
// process metainfo.xml
- List<String> configList = new ArrayList<>();
+ List<String> configList = new ArrayList<String>();
configList.add(GLOBAL_CONFIG_TAG);
String configTypes = appConf.get("config_types");
@@ -1190,13 +1195,13 @@ public class AgentProviderService extends AbstractProviderService implements
}
// remove duplicates. mostly worried about 'global' being listed
- return new ArrayList<>(new HashSet<>(configList));
+ return new ArrayList<String>(new HashSet<String>(configList));
}
private void addNamedConfiguration(String configName, Map<String, String> sourceConfig,
Map<String, Map<String, String>> configurations,
Map<String, String> tokens, String containerId) {
- Map<String, String> config = new HashMap<>();
+ Map<String, String> config = new HashMap<String, String>();
if (configName.equals(GLOBAL_CONFIG_TAG)) {
addDefaultGlobalConfig(config);
}
@@ -1235,7 +1240,7 @@ public class AgentProviderService extends AbstractProviderService implements
private Iterable<String> getHostsList(Collection<ClusterNode> values,
boolean hostOnly) {
- List<String> hosts = new ArrayList<>();
+ List<String> hosts = new ArrayList<String>();
for (ClusterNode cn : values) {
hosts.add(hostOnly ? cn.host : cn.host + "/" + cn.name);
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentCommandOrder.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentCommandOrder.java b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentCommandOrder.java
index a23cc38..f4ace5f 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentCommandOrder.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/ComponentCommandOrder.java
@@ -37,7 +37,8 @@ public class ComponentCommandOrder {
public static final Logger log =
LoggerFactory.getLogger(ComponentCommandOrder.class);
private static char SPLIT_CHAR = '-';
- Map<Command, Map<String, List<ComponentState>>> dependencies = new HashMap<>();
+ Map<Command, Map<String, List<ComponentState>>> dependencies =
+ new HashMap<Command, Map<String, List<ComponentState>>>();
public ComponentCommandOrder(List<CommandOrder> commandOrders) {
if (commandOrders != null && commandOrders.size() > 0) {
@@ -48,13 +49,13 @@ public class ComponentCommandOrder {
if (requiredStates.size() > 0) {
Map<String, List<ComponentState>> compDep = dependencies.get(componentCmd.command);
if (compDep == null) {
- compDep = new HashMap<>();
+ compDep = new HashMap<String, List<ComponentState>>();
dependencies.put(componentCmd.command, compDep);
}
List<ComponentState> requirements = compDep.get(componentCmd.componentName);
if (requirements == null) {
- requirements = new ArrayList<>();
+ requirements = new ArrayList<ComponentState>();
compDep.put(componentCmd.componentName, requirements);
}
@@ -70,7 +71,7 @@ public class ComponentCommandOrder {
}
String[] componentStates = requires.split(",");
- List<ComponentState> retList = new ArrayList<>();
+ List<ComponentState> retList = new ArrayList<ComponentState>();
for (String componentStateStr : componentStates) {
retList.add(getComponentState(componentStateStr));
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
index 016b4d4..d994e33 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Application.java
@@ -34,10 +34,10 @@ public class Application {
ConfigurationDependencies configDependencies;
public Application() {
- exportGroups = new ArrayList<>();
- components = new ArrayList<>();
- osSpecifics = new ArrayList<>();
- commandOrders = new ArrayList<>();
+ exportGroups = new ArrayList<ExportGroup>();
+ components = new ArrayList<Component>();
+ osSpecifics = new ArrayList<OSSpecific>();
+ commandOrders = new ArrayList<CommandOrder>();
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Component.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Component.java b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Component.java
index 9dba87c..f7b77ff 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Component.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/agent/application/metadata/Component.java
@@ -33,7 +33,7 @@ public class Component {
public Component() {
publishConfig = Boolean.FALSE.toString();
- exports = new ArrayList<>();
+ exports = new ArrayList<Export>();
}
public String getName() {
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
index c3870b8..ffff76c 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMClientProvider.java
@@ -83,7 +83,7 @@ public class SliderAMClientProvider extends AbstractClientProvider implements
* List of roles
*/
public static final List<ProviderRole> ROLES =
- new ArrayList<>();
+ new ArrayList<ProviderRole>();
public static final int KEY_AM = ROLE_AM_PRIORITY_INDEX;
@@ -147,7 +147,7 @@ public class SliderAMClientProvider extends AbstractClientProvider implements
throws IOException, SliderException {
Map<String, LocalResource> providerResources =
- new HashMap<>();
+ new HashMap<String, LocalResource>();
ProviderUtils.addProviderJar(providerResources,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java
index 184c25a..071fc19 100644
--- a/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java
+++ b/slider-core/src/main/java/org/apache/slider/providers/slideram/SliderAMProviderService.java
@@ -100,7 +100,7 @@ public class SliderAMProviderService extends AbstractProviderService implements
@Override
public List<ProviderRole> getRoles() {
- return new ArrayList<>(0);
+ return new ArrayList<ProviderRole>(0);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
index 7825e24..4a5c9b9 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/SliderAppMaster.java
@@ -401,7 +401,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
//look at settings of Hadoop Auth, to pick up a problem seen once
checkAndWarnForAuthTokenProblems();
- executorService = new WorkflowExecutorService<>("AmExecutor",
+ executorService = new WorkflowExecutorService<ExecutorService>("AmExecutor",
Executors.newCachedThreadPool(
new ServiceThreadFactory("AmExecutor", true)));
addService(executorService);
@@ -642,7 +642,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
//build the role map
List<ProviderRole> providerRoles =
- new ArrayList<>(providerService.getRoles());
+ new ArrayList<ProviderRole>(providerService.getRoles());
providerRoles.addAll(SliderAMClientProvider.ROLES);
// Start up the WebApp and track the URL for it
@@ -664,7 +664,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
.start(webApp);
appMasterTrackingUrl = "http://" + appMasterHostname + ":" + webApp.port();
WebAppService<SliderAMWebApp> webAppService =
- new WebAppService<>("slider", webApp);
+ new WebAppService<SliderAMWebApp>("slider", webApp);
webAppService.init(serviceConf);
webAppService.start();
@@ -744,7 +744,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
// build up environment variables that the AM wants set in every container
// irrespective of provider and role.
- envVars = new HashMap<>();
+ envVars = new HashMap<String, String>();
if (hadoop_user_name != null) {
envVars.put(HADOOP_USER_NAME, hadoop_user_name);
}
@@ -1106,8 +1106,8 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
@Override //AMRMClientAsync
public void onContainersAllocated(List<Container> allocatedContainers) {
LOG_YARN.info("onContainersAllocated({})", allocatedContainers.size());
- List<ContainerAssignment> assignments = new ArrayList<>();
- List<AbstractRMOperation> operations = new ArrayList<>();
+ List<ContainerAssignment> assignments = new ArrayList<ContainerAssignment>();
+ List<AbstractRMOperation> operations = new ArrayList<AbstractRMOperation>();
//app state makes all the decisions
appState.onContainersAllocated(allocatedContainers, assignments, operations);
@@ -1203,7 +1203,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
log.info(
"Scheduling the failure window reset interval to every {} seconds",
seconds);
- RenewingAction<ResetFailureWindow> renew = new RenewingAction<>(
+ RenewingAction<ResetFailureWindow> renew = new RenewingAction<ResetFailureWindow>(
reset, seconds, seconds, TimeUnit.SECONDS, 0);
actionQueues.renewing("failures", renew);
} else {
@@ -1504,7 +1504,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
protected synchronized void launchProviderService(AggregateConf instanceDefinition,
File confDir)
throws IOException, SliderException {
- Map<String, String> env = new HashMap<>();
+ Map<String, String> env = new HashMap<String, String>();
boolean execStarted = providerService.exec(instanceDefinition, confDir, env, this);
if (execStarted) {
providerService.registerServiceListener(this);
@@ -1793,7 +1793,7 @@ public class SliderAppMaster extends AbstractSliderLaunchedService
//turn the args to a list
List<String> argsList = Arrays.asList(args);
//create a new list, as the ArrayList type doesn't push() on an insert
- List<String> extendedArgs = new ArrayList<>(argsList);
+ List<String> extendedArgs = new ArrayList<String>(argsList);
//insert the service name
extendedArgs.add(0, SERVICE_CLASSNAME);
//now have the service launcher do its work
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/ActionKillContainer.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/ActionKillContainer.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/ActionKillContainer.java
index 95edca4..c1e7e6e 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/ActionKillContainer.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/ActionKillContainer.java
@@ -58,7 +58,7 @@ public class ActionKillContainer extends AsyncAction {
public void execute(SliderAppMaster appMaster,
QueueAccess queueService,
AppState appState) throws Exception {
- List<AbstractRMOperation> opsList = new LinkedList<>();
+ List<AbstractRMOperation> opsList = new LinkedList<AbstractRMOperation>();
ContainerReleaseOperation release = new ContainerReleaseOperation(containerId);
opsList.add(release);
//now apply the operations
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/QueueService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/QueueService.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/QueueService.java
index ac59096..6ad579d 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/QueueService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/actions/QueueService.java
@@ -57,19 +57,19 @@ implements Runnable, QueueAccess {
* Immediate actions.
*/
public final BlockingDeque<AsyncAction> actionQueue =
- new LinkedBlockingDeque<>();
+ new LinkedBlockingDeque<AsyncAction>();
/**
* Actions to be scheduled in the future
*/
- public final DelayQueue<AsyncAction> scheduledActions = new DelayQueue<>();
+ public final DelayQueue<AsyncAction> scheduledActions = new DelayQueue<AsyncAction>();
/**
* Map of renewing actions by name ... this is to allow them to
* be cancelled by name
*/
private final Map<String, RenewingAction<? extends AsyncAction>> renewingActions
- = new ConcurrentHashMap<>();
+ = new ConcurrentHashMap<String, RenewingAction<? extends AsyncAction>>();
/**
* Create a queue instance with a single thread executor
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
index cd4b46b..592889c 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/monkey/ChaosMonkeyService.java
@@ -74,7 +74,7 @@ public class ChaosMonkeyService extends AbstractService {
}
public RenewingAction<MonkeyPlayAction> getChaosAction(long time, TimeUnit timeUnit) {
- RenewingAction<MonkeyPlayAction> action = new RenewingAction<>(
+ RenewingAction<MonkeyPlayAction> action = new RenewingAction<MonkeyPlayAction>(
new MonkeyPlayAction(this, 0, TimeUnit.MILLISECONDS),
time,
time,
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
index d22c716..0d2afcc 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/AppState.java
@@ -135,7 +135,7 @@ public class AppState {
* Client properties created via the provider -static for the life
* of the application
*/
- private Map<String, String> clientProperties = new HashMap<>();
+ private Map<String, String> clientProperties = new HashMap<String, String>();
/**
The cluster description published to callers
@@ -146,13 +146,13 @@ public class AppState {
private ClusterDescription clusterSpec = new ClusterDescription();
private final Map<Integer, RoleStatus> roleStatusMap =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<Integer, RoleStatus>();
private final Map<String, ProviderRole> roles =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<String, ProviderRole>();
private final Map<Integer, ProviderRole> rolePriorityMap =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<Integer, ProviderRole>();
/**
* The master node.
@@ -164,7 +164,7 @@ public class AppState {
* been allocated but are not live; it is a superset of the live list
*/
private final ConcurrentMap<ContainerId, RoleInstance> activeContainers =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<ContainerId, RoleInstance>();
/**
* Hash map of the containers we have released, but we
@@ -172,7 +172,7 @@ public class AppState {
* containers is treated as a successful outcome
*/
private final ConcurrentMap<ContainerId, Container> containersBeingReleased =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<ContainerId, Container>();
/**
* Counter for completed containers ( complete denotes successful or failed )
@@ -207,34 +207,34 @@ public class AppState {
* the node is promoted from here to the containerMap
*/
private final Map<ContainerId, RoleInstance> startingNodes =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<ContainerId, RoleInstance>();
/**
* List of completed nodes. This isn't kept in the CD as it gets too
* big for the RPC responses. Indeed, we should think about how deep to get this
*/
private final Map<ContainerId, RoleInstance> completedNodes
- = new ConcurrentHashMap<>();
+ = new ConcurrentHashMap<ContainerId, RoleInstance>();
/**
* Nodes that failed to start.
* Again, kept out of the CD
*/
private final Map<ContainerId, RoleInstance> failedNodes =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<ContainerId, RoleInstance>();
/**
* Nodes that came assigned to a role above that
* which were asked for -this appears to happen
*/
- private final Set<ContainerId> surplusNodes = new HashSet<>();
+ private final Set<ContainerId> surplusNodes = new HashSet<ContainerId>();
/**
* Map of containerID -> cluster nodes, for status reports.
* Access to this should be synchronized on the clusterDescription
*/
private final Map<ContainerId, RoleInstance> liveNodes =
- new ConcurrentHashMap<>();
+ new ConcurrentHashMap<ContainerId, RoleInstance>();
private final AtomicInteger completionOfNodeNotInLiveListEvent =
new AtomicInteger();
private final AtomicInteger completionOfUnknownContainerEvent =
@@ -472,7 +472,7 @@ public class AppState {
this.applicationInfo = applicationInfo != null ? applicationInfo
: new HashMap<String, String>();
- clientProperties = new HashMap<>();
+ clientProperties = new HashMap<String, String>();
containerReleaseSelector = releaseSelector;
@@ -794,7 +794,7 @@ public class AppState {
public synchronized List<RoleInstance> cloneActiveContainerList() {
Collection<RoleInstance> values = activeContainers.values();
- return new ArrayList<>(values);
+ return new ArrayList<RoleInstance>(values);
}
@@ -818,7 +818,7 @@ public class AppState {
public synchronized List<RoleInstance> cloneLiveContainerInfoList() {
List<RoleInstance> allRoleInstances;
Collection<RoleInstance> values = getLiveNodes().values();
- allRoleInstances = new ArrayList<>(values);
+ allRoleInstances = new ArrayList<RoleInstance>(values);
return allRoleInstances;
}
@@ -845,7 +845,7 @@ public class AppState {
Collection<String> containerIDs) {
//first, a hashmap of those containerIDs is built up
Set<String> uuidSet = new HashSet<String>(containerIDs);
- List<RoleInstance> nodes = new ArrayList<>(uuidSet.size());
+ List<RoleInstance> nodes = new ArrayList<RoleInstance>(uuidSet.size());
Collection<RoleInstance> clusterNodes = getLiveNodes().values();
for (RoleInstance node : clusterNodes) {
@@ -863,7 +863,7 @@ public class AppState {
* @return a list of nodes, may be empty
*/
public synchronized List<RoleInstance> enumLiveNodesInRole(String role) {
- List<RoleInstance> nodes = new ArrayList<>();
+ List<RoleInstance> nodes = new ArrayList<RoleInstance>();
Collection<RoleInstance> allRoleInstances = getLiveNodes().values();
for (RoleInstance node : allRoleInstances) {
if (role.isEmpty() || role.equals(node.role)) {
@@ -883,7 +883,7 @@ public class AppState {
*/
public synchronized List<RoleInstance> enumNodesWithRoleId(int roleId,
boolean active) {
- List<RoleInstance> nodes = new ArrayList<>();
+ List<RoleInstance> nodes = new ArrayList<RoleInstance>();
Collection<RoleInstance> allRoleInstances;
allRoleInstances = active? activeContainers.values() : liveNodes.values();
for (RoleInstance node : allRoleInstances) {
@@ -900,11 +900,11 @@ public class AppState {
* @return the map of Role name to list of role instances
*/
private synchronized Map<String, List<String>> createRoleToInstanceMap() {
- Map<String, List<String>> map = new HashMap<>();
+ Map<String, List<String>> map = new HashMap<String, List<String>>();
for (RoleInstance node : getLiveNodes().values()) {
List<String> containers = map.get(node.role);
if (containers == null) {
- containers = new ArrayList<>();
+ containers = new ArrayList<String>();
map.put(node.role, containers);
}
containers.add(node.id);
@@ -916,12 +916,12 @@ public class AppState {
* @return the map of Role name to list of Cluster Nodes, ready
*/
private synchronized Map<String, Map<String, ClusterNode>> createRoleToClusterNodeMap() {
- Map<String, Map<String, ClusterNode>> map = new HashMap<>();
+ Map<String, Map<String, ClusterNode>> map = new HashMap<String, Map<String, ClusterNode>>();
for (RoleInstance node : getLiveNodes().values()) {
Map<String, ClusterNode> containers = map.get(node.role);
if (containers == null) {
- containers = new HashMap<>();
+ containers = new HashMap<String, ClusterNode>();
map.put(node.role, containers);
}
Messages.RoleInstanceState pbuf = node.toProtobuf();
@@ -1401,7 +1401,7 @@ public class AppState {
MapOperations infoOps = new MapOperations("info", cd.info);
infoOps.mergeWithoutOverwrite(applicationInfo);
SliderUtils.addBuildInfo(infoOps, "status");
- cd.statistics = new HashMap<>();
+ cd.statistics = new HashMap<String, Map<String, Integer>>();
// build the map of node -> container IDs
Map<String, List<String>> instanceMap = createRoleToInstanceMap();
@@ -1410,7 +1410,7 @@ public class AppState {
//build the map of node -> containers
Map<String, Map<String, ClusterNode>> clusterNodes =
createRoleToClusterNodeMap();
- cd.status = new HashMap<>();
+ cd.status = new HashMap<String, Object>();
cd.status.put(ClusterDescriptionKeys.KEY_CLUSTER_LIVE, clusterNodes);
@@ -1429,7 +1429,7 @@ public class AppState {
cd.statistics.put(rolename, stats);
}
- Map<String, Integer> sliderstats = new HashMap<>();
+ Map<String, Integer> sliderstats = new HashMap<String, Integer>();
sliderstats.put(StatusKeys.STATISTICS_CONTAINERS_COMPLETED,
completedContainerCount.get());
sliderstats.put(StatusKeys.STATISTICS_CONTAINERS_FAILED,
@@ -1453,7 +1453,7 @@ public class AppState {
public synchronized List<AbstractRMOperation> reviewRequestAndReleaseNodes()
throws SliderInternalStateException, TriggerClusterTeardownException {
log.debug("in reviewRequestAndReleaseNodes()");
- List<AbstractRMOperation> allOperations = new ArrayList<>();
+ List<AbstractRMOperation> allOperations = new ArrayList<AbstractRMOperation>();
for (RoleStatus roleStatus : getRoleStatusMap().values()) {
if (!roleStatus.getExcludeFromFlexing()) {
List<AbstractRMOperation> operations = reviewOneRole(roleStatus);
@@ -1527,7 +1527,7 @@ public class AppState {
@SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
private List<AbstractRMOperation> reviewOneRole(RoleStatus role)
throws SliderInternalStateException, TriggerClusterTeardownException {
- List<AbstractRMOperation> operations = new ArrayList<>();
+ List<AbstractRMOperation> operations = new ArrayList<AbstractRMOperation>();
int delta;
String details;
int expected;
@@ -1622,7 +1622,7 @@ public class AppState {
*/
public List<AbstractRMOperation> releaseContainer(ContainerId containerId)
throws SliderInternalStateException {
- List<AbstractRMOperation> operations = new ArrayList<>();
+ List<AbstractRMOperation> operations = new ArrayList<AbstractRMOperation>();
List<RoleInstance> activeRoleInstances = cloneActiveContainerList();
for (RoleInstance role : activeRoleInstances) {
if (role.container.getId().equals(containerId)) {
@@ -1666,7 +1666,7 @@ public class AppState {
Collection<RoleInstance> targets = cloneActiveContainerList();
log.info("Releasing {} containers", targets.size());
List<AbstractRMOperation> operations =
- new ArrayList<>(targets.size());
+ new ArrayList<AbstractRMOperation>(targets.size());
for (RoleInstance instance : targets) {
Container possible = instance.container;
ContainerId id = possible.getId();
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/MostRecentContainerReleaseSelector.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/MostRecentContainerReleaseSelector.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/MostRecentContainerReleaseSelector.java
index 9d936a1..841dda3 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/MostRecentContainerReleaseSelector.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/MostRecentContainerReleaseSelector.java
@@ -40,7 +40,7 @@ public class MostRecentContainerReleaseSelector implements ContainerReleaseSelec
private static class newerThan implements Comparator<RoleInstance>, Serializable {
private final Comparator<Long> innerComparator =
- new Comparators.ComparatorReverser<>(new Comparators.LongComparator());
+ new Comparators.ComparatorReverser<Long>(new Comparators.LongComparator());
public int compare(RoleInstance o1, RoleInstance o2) {
return innerComparator.compare(o1.createTime, o2.createTime);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java
index fad60f2..1ba2282 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeInstance.java
@@ -41,7 +41,7 @@ public class NodeInstance {
*/
public NodeInstance(String hostname, int roles) {
this.hostname = hostname;
- nodeEntries = new ArrayList<>(roles);
+ nodeEntries = new ArrayList<NodeEntry>(roles);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeMap.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeMap.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeMap.java
index 372a0a5..570c194 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeMap.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/NodeMap.java
@@ -73,7 +73,7 @@ public class NodeMap extends HashMap<String, NodeInstance> {
* in that role
*/
public List<NodeInstance> listActiveNodes(int role) {
- List<NodeInstance> nodes = new ArrayList<>();
+ List<NodeInstance> nodes = new ArrayList<NodeInstance>();
for (NodeInstance instance : values()) {
if (instance.getActiveRoleInstances(role) > 0) {
nodes.add(instance);
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java
index fa2c754..d847962 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/OutstandingRequestTracker.java
@@ -43,7 +43,7 @@ public class OutstandingRequestTracker {
LoggerFactory.getLogger(OutstandingRequestTracker.class);
private Map<OutstandingRequest, OutstandingRequest> requests =
- new HashMap<>();
+ new HashMap<OutstandingRequest, OutstandingRequest>();
/**
* Create a new request for the specific role. If a
@@ -161,7 +161,7 @@ public class OutstandingRequestTracker {
* @return possibly empty list of hostnames
*/
public synchronized List<NodeInstance> cancelOutstandingRequests(int role) {
- List<NodeInstance> hosts = new ArrayList<>();
+ List<NodeInstance> hosts = new ArrayList<NodeInstance>();
Iterator<Map.Entry<OutstandingRequest,OutstandingRequest>> iterator =
requests.entrySet().iterator();
while (iterator.hasNext()) {
@@ -178,6 +178,6 @@ public class OutstandingRequestTracker {
}
public synchronized List<OutstandingRequest> listOutstandingRequests() {
- return new ArrayList<>(requests.values());
+ return new ArrayList<OutstandingRequest>(requests.values());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
index 6caf1a9..a5b36d4 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/ProviderAppState.java
@@ -39,7 +39,7 @@ public class ProviderAppState implements StateAccessForProviders {
private final Map<String, PublishedConfigSet> publishedConfigSets =
- new ConcurrentHashMap<>(5);
+ new ConcurrentHashMap<String, PublishedConfigSet>(5);
private static final PatternValidator validator = new PatternValidator(
RestPaths.PUBLISHED_CONFIGURATION_SET_REGEXP);
private String applicationName;
@@ -92,7 +92,7 @@ public class ProviderAppState implements StateAccessForProviders {
public List<String> listConfigSets() {
synchronized (publishedConfigSets) {
- List<String> sets = new ArrayList<>(publishedConfigSets.keySet());
+ List<String> sets = new ArrayList<String>(publishedConfigSets.keySet());
return sets;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/daba289e/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
index 2338103..edcf7ea 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/state/RoleHistory.java
@@ -60,7 +60,7 @@ public class RoleHistory {
LoggerFactory.getLogger(RoleHistory.class);
private final List<ProviderRole> providerRoles;
private final Map<String, ProviderRole> providerRoleMap =
- new HashMap<>();
+ new HashMap<String, ProviderRole>();
private long startTime;
/**
* Time when saved
@@ -107,9 +107,8 @@ public class RoleHistory {
nodemap = new NodeMap(roleSize);
resetAvailableNodeLists();
- resetAvailableNodeLists();
outstandingRequests = new OutstandingRequestTracker();
- Map<Integer, RoleStatus> roleStats = new HashMap<>();
+ Map<Integer, RoleStatus> roleStats = new HashMap<Integer, RoleStatus>();
for (ProviderRole providerRole : providerRoles) {
@@ -141,7 +140,7 @@ public class RoleHistory {
*/
public void addNewProviderRole(ProviderRole providerRole)
throws BadConfigException {
- Map<Integer, RoleStatus> roleStats = new HashMap<>();
+ Map<Integer, RoleStatus> roleStats = new HashMap<Integer, RoleStatus>();
for (ProviderRole role : providerRoles) {
@@ -155,7 +154,7 @@ public class RoleHistory {
* Clear the lists of available nodes
*/
private synchronized void resetAvailableNodeLists() {
- availableNodes = new HashMap<>(roleSize);
+ availableNodes = new HashMap<Integer, LinkedList<NodeInstance>>(roleSize);
}
/**
@@ -433,7 +432,7 @@ public class RoleHistory {
private LinkedList<NodeInstance> getOrCreateNodesForRoleId(int id) {
LinkedList<NodeInstance> instances = availableNodes.get(id);
if (instances == null) {
- instances = new LinkedList<>();
+ instances = new LinkedList<NodeInstance>();
availableNodes.put(id, instances);
}
return instances;
@@ -569,7 +568,7 @@ public class RoleHistory {
List<Container> requested =
new ArrayList<Container>(allocatedContainers.size());
List<Container> unrequested =
- new ArrayList<>(allocatedContainers.size());
+ new ArrayList<Container>(allocatedContainers.size());
outstandingRequests.partitionRequests(this, allocatedContainers, requested, unrequested);
//give the unrequested ones lower priority
@@ -748,7 +747,7 @@ public class RoleHistory {
*/
@VisibleForTesting
public List<NodeInstance> cloneAvailableList(int role) {
- return new LinkedList<>(getOrCreateNodesForRoleId(role));
+ return new LinkedList<NodeInstance>(getOrCreateNodesForRoleId(role));
}
/**