svn commit: r1800671 - in /sling/trunk/bundles/extensions/discovery/commons: ./ src/main/java/org/apache/sling/discovery/commons/providers/spi/base/

[stefanegli]

Author: stefanegli
Date: Mon Jul  3 12:47:07 2017
New Revision: 1800671

URL: http://svn.apache.org/viewvc?rev=1800671&view=rev
Log:
SLING-6992 : reverting 1800639 due to johnzon anyway requiring JRE 7, thus it 
doesn't really make sense to restrict discovery.commons to 6 as it wont run on 
6 anymore anyway

Modified:
    sling/trunk/bundles/extensions/discovery/commons/pom.xml
    
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/IdMapService.java
    
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java

Modified: sling/trunk/bundles/extensions/discovery/commons/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/pom.xml?rev=1800671&r1=1800670&r2=1800671&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/commons/pom.xml (original)
+++ sling/trunk/bundles/extensions/discovery/commons/pom.xml Mon Jul  3 
12:47:07 2017
@@ -45,8 +45,6 @@
       <oak.version>1.4.4</oak.version>
         <!-- by default Slow tests are excluded - use -PincludeSlowTests to 
include them -->
        
<sling.excluded.surefire.groups>org.apache.sling.commons.testing.junit.categories.Slow</sling.excluded.surefire.groups>
-      <!-- SLING-6992 stick with JRE 6 for now -->
-      <sling.java.version>6</sling.java.version>
     </properties>
 
     <build>

Modified: 
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/IdMapService.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/IdMapService.java?rev=1800671&r1=1800670&r2=1800671&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/IdMapService.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/IdMapService.java
 Mon Jul  3 12:47:07 2017
@@ -74,8 +74,8 @@ public class IdMapService extends Abstra
 
     private long me;
 
-    private final Map<Integer, String> oldIdMapCache = new HashMap<Integer, 
String>();
-    private final Map<Integer, String> idMapCache = new HashMap<Integer, 
String>();
+    private final Map<Integer, String> oldIdMapCache = new HashMap<>();
+    private final Map<Integer, String> idMapCache = new HashMap<>();
 
     private long lastCacheInvalidation = -1;
 
@@ -130,7 +130,7 @@ public class IdMapService extends Abstra
             logger.info("registerEventHandler: bundleContext is null - cannot 
register");
             return;
         }
-        Dictionary<String,Object> properties = new Hashtable<String,Object>();
+        Dictionary<String,Object> properties = new Hashtable<>();
         properties.put(Constants.SERVICE_DESCRIPTION, "IdMap Change 
Listener.");
         properties.put(Constants.SERVICE_VENDOR, "The Apache Software 
Foundation");
         String[] topics = new String[] {
@@ -198,7 +198,7 @@ public class IdMapService extends Abstra
             // or when my clusterNodeId is already mapped to another slingId
             // in both cases: clean that up
             boolean foundMe = false;
-            for (String aKey : new HashSet<String>(idmap.keySet())) {
+            for (String aKey : new HashSet<>(idmap.keySet())) {
                 Object value = idmap.get(aKey);
                 if (value instanceof Number) {
                     Number n = (Number)value;
@@ -301,7 +301,7 @@ public class IdMapService extends Abstra
     private Map<Integer, String> readIdMap(ResourceResolver resourceResolver) 
throws PersistenceException {
         Resource resource = 
ResourceHelper.getOrCreateResource(resourceResolver, getIdMapPath());
         ValueMap idmapValueMap = resource.adaptTo(ValueMap.class);
-        Map<Integer, String> idmap = new HashMap<Integer, String>();
+        Map<Integer, String> idmap = new HashMap<>();
         for (String slingId : idmapValueMap.keySet()) {
             Object value = idmapValueMap.get(slingId);
             if (value instanceof Number) {

Modified: 
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java?rev=1800671&r1=1800670&r2=1800671&view=diff
==============================================================================
--- 
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java
 (original)
+++ 
sling/trunk/bundles/extensions/discovery/commons/src/main/java/org/apache/sling/discovery/commons/providers/spi/base/OakBacklogClusterSyncService.java
 Mon Jul  3 12:47:07 2017
@@ -206,7 +206,7 @@ public class OakBacklogClusterSyncServic
             }
 
             ClusterView cluster = view.getLocalInstance().getClusterView();
-            Set<String> slingIds = new HashSet<String>();
+            Set<String> slingIds = new HashSet<>();
             for (InstanceDescription instance : cluster.getInstances()) {
                 slingIds.add(instance.getSlingId());
             }