You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/05/06 13:01:09 UTC
svn commit: r1592710 - in
/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry:
docstore/PublishedConfigSet.java docstore/PublishedConfiguration.java
info/RegistryView.java zk/ZKIntegration.java zk/ZookeeperUtils.java
Author: stevel
Date: Tue May 6 11:01:09 2014
New Revision: 1592710
URL: http://svn.apache.org/r1592710
Log:
SLIDER-13 move registry code to diamond <> generic ctors
Modified:
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java
incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java?rev=1592710&r1=1592709&r2=1592710&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfigSet.java Tue May 6 11:01:09 2014
@@ -35,7 +35,7 @@ import java.util.TreeSet;
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);
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java?rev=1592710&r1=1592709&r2=1592710&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/docstore/PublishedConfiguration.java Tue May 6 11:01:09 2014
@@ -55,7 +55,7 @@ public class PublishedConfiguration {
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 @@ public class PublishedConfiguration {
* @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());
}
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java?rev=1592710&r1=1592709&r2=1592710&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/info/RegistryView.java Tue May 6 11:01:09 2014
@@ -31,7 +31,7 @@ public class RegistryView {
/**
* Endpoints
*/
- public Map<String, RegisteredEndpoint> endpoints = new HashMap<String, RegisteredEndpoint>(2);
+ public Map<String, RegisteredEndpoint> endpoints = new HashMap<>(2);
public String configurationsURL;
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java?rev=1592710&r1=1592709&r2=1592710&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZKIntegration.java Tue May 6 11:01:09 2014
@@ -49,7 +49,7 @@ public class ZKIntegration implements Wa
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);
Modified: incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java
URL: http://svn.apache.org/viewvc/incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java?rev=1592710&r1=1592709&r2=1592710&view=diff
==============================================================================
--- incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java (original)
+++ incubator/slider/trunk/slider-core/src/main/java/org/apache/slider/core/registry/zk/ZookeeperUtils.java Tue May 6 11:01:09 2014
@@ -47,7 +47,7 @@ public class ZookeeperUtils {
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 class ZookeeperUtils {
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 @@ public class ZookeeperUtils {
* @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));
}