SLIDER-13 move registry code to diamond <> generic ctors
git-svn-id: https://svn.apache.org/repos/asf/incubator/slider/trunk@1592710 13f79535-47bb-0310-9956-ffa450edef68
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 41b3619..407a1da 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
@@ -35,7 +35,7 @@
public class PublishedConfigSet {
public Map<String, PublishedConfiguration> configurations =
- new HashMap<String, PublishedConfiguration>();
+ new HashMap<>();
public void put(String name, PublishedConfiguration conf) {
configurations.put(name, conf);
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 00bdeb5..d90be7d 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
@@ -55,7 +55,7 @@
return updated;
}
- public Map<String, String> entries = new HashMap<String, String>();
+ public Map<String, String> entries = new HashMap<>();
/**
* Is the configuration empty. This means either that it has not
@@ -74,7 +74,7 @@
* @param entries entries to put
*/
public void putValues(Iterable<Map.Entry<String, String>> entries) {
- this.entries = new HashMap<String, String>();
+ this.entries = new HashMap<>();
for (Map.Entry<String, String> entry : entries) {
this.entries.put(entry.getKey(), entry.getValue());
}
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 61167e0..07e4981 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,7 @@
/**
* Endpoints
*/
- public Map<String, RegisteredEndpoint> endpoints = new HashMap<String, RegisteredEndpoint>(2);
+ public Map<String, RegisteredEndpoint> endpoints = new HashMap<>(2);
public String configurationsURL;
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java b/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java
index d039b2e..7e044b5 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java
@@ -49,7 +49,7 @@
public static String SVC_SLIDER = "/" + ZK_SERVICES + "/" + ZK_SLIDER;
public static String SVC_SLIDER_USERS = SVC_SLIDER + "/" + ZK_USERS;
- public static List<String> ZK_USERS_PATH_LIST = new ArrayList<String>();
+ public static List<String> ZK_USERS_PATH_LIST = new ArrayList<>();
static {
ZK_USERS_PATH_LIST.add(ZK_SERVICES);
ZK_USERS_PATH_LIST.add(ZK_SLIDER);
diff --git a/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java b/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java
index a998cf1..84a9321 100644
--- a/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java
+++ b/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java
@@ -47,7 +47,7 @@
public static List<String> splitToPairs(String hostPortQuorumList) {
// split an address hot
String[] strings = StringUtils.getStrings(hostPortQuorumList);
- List<String> tuples = new ArrayList<String>(strings.length);
+ List<String> tuples = new ArrayList<>(strings.length);
for (String s : strings) {
tuples.add(s.trim());
}
@@ -62,7 +62,7 @@
public static List<HostAndPort> splitToHostsAndPorts(String hostPortQuorumList) {
// split an address hot
String[] strings = StringUtils.getStrings(hostPortQuorumList);
- List<HostAndPort> list = new ArrayList<HostAndPort>(strings.length);
+ List<HostAndPort> list = new ArrayList<>(strings.length);
for (String s : strings) {
list.add(HostAndPort.fromString(s.trim()));
}
@@ -103,7 +103,7 @@
* @return
*/
public static String buildQuorum(List<HostAndPort> hostAndPorts, int defaultPort) {
- List<String> entries = new ArrayList<String>(hostAndPorts.size());
+ List<String> entries = new ArrayList<>(hostAndPorts.size());
for (HostAndPort hostAndPort : hostAndPorts) {
entries.add(buildQuorumEntry(hostAndPort, defaultPort));
}
