Merge pull request #2280 from desmorto/refactor-diamond-operator

(refactor) some opportunities to use diamond operator
Atmosphere · Jul 19, 2017 · d51726d · d51726d
2 parents 0ae9da2 + 62c6302
commit d51726d
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/...es/runtime/src/main/java/org/atmosphere/annotation/AtmosphereHandlerServiceProcessor.java b/...es/runtime/src/main/java/org/atmosphere/annotation/AtmosphereHandlerServiceProcessor.java
@@ -47,7 +47,7 @@ public void handle(AtmosphereFramework framework, Class<AtmosphereHandler> annot
             filters(a.broadcastFilters(), framework);
 
             Class<?>[] interceptors = a.interceptors();
-            LinkedList<AtmosphereInterceptor> l = new LinkedList<AtmosphereInterceptor>();
+            LinkedList<AtmosphereInterceptor> l = new LinkedList<>();
             for (Class i : interceptors) {
                 try {
                     AtmosphereInterceptor ai = (AtmosphereInterceptor) framework.newClassInstance(AtmosphereHandler.class, i);

diff --git a/modules/runtime/src/main/java/org/atmosphere/annotation/MeteorServiceProcessor.java b/modules/runtime/src/main/java/org/atmosphere/annotation/MeteorServiceProcessor.java
@@ -43,7 +43,7 @@ public void handle(AtmosphereFramework framework, Class<Servlet> annotatedClass)
         try {
             ReflectorServletProcessor r = framework.newClassInstance(ReflectorServletProcessor.class, ReflectorServletProcessor.class);
             r.setServletClassName(annotatedClass.getName());
-            LinkedList<AtmosphereInterceptor> l = new LinkedList<AtmosphereInterceptor>();
+            LinkedList<AtmosphereInterceptor> l = new LinkedList<>();
 
             MeteorService m = annotatedClass.getAnnotation(MeteorService.class);
             framework.setBroadcasterCacheClassName(m.broadcasterCache().getName());

diff --git a/modules/runtime/src/main/java/org/atmosphere/cache/SessionBroadcasterCache.java b/modules/runtime/src/main/java/org/atmosphere/cache/SessionBroadcasterCache.java
@@ -68,7 +68,7 @@ public List<Object> retrieveFromCache(String broadcasterId, String uuid) {
             throw new IllegalArgumentException("AtmosphereResource can't be null");
         }
 
-        List<Object> result = new ArrayList<Object>();
+        List<Object> result = new ArrayList<>();
         try {
             AtmosphereResource r = config.resourcesFactory().find(uuid);
 

diff --git a/modules/runtime/src/main/java/org/atmosphere/config/managed/ManagedAtmosphereHandler.java b/modules/runtime/src/main/java/org/atmosphere/config/managed/ManagedAtmosphereHandler.java
@@ -88,8 +88,8 @@ public class ManagedAtmosphereHandler extends AbstractReflectorAtmosphereHandler
     protected boolean pathParams;
     protected AtmosphereResourceFactory resourcesFactory;
 
-    final Map<Method, List<Encoder<?, ?>>> encoders = new HashMap<Method, List<Encoder<?, ?>>>();
-    final Map<Method, List<Decoder<?, ?>>> decoders = new HashMap<Method, List<Decoder<?, ?>>>();
+    final Map<Method, List<Encoder<?, ?>>> encoders = new HashMap<>();
+    final Map<Method, List<Decoder<?, ?>>> decoders = new HashMap<>();
 
     public ManagedAtmosphereHandler() {
     }
@@ -269,7 +269,7 @@ protected Method populate(Object c, Class<? extends Annotation> annotation) {
     }
 
     protected List<MethodInfo> populateMessage(Object c, Class<? extends Annotation> annotation) {
-        ArrayList<MethodInfo> methods = new ArrayList<MethodInfo>();
+        ArrayList<MethodInfo> methods = new ArrayList<>();
         for (Method m : c.getClass().getMethods()) {
             if (m.isAnnotationPresent(annotation)) {
                 methods.add(new MethodInfo(m));
@@ -293,7 +293,7 @@ private void scanForReaderOrInputStream() {
 
     private void populateEncoders() {
         for (MethodInfo m : onRuntimeMethod) {
-            List<Encoder<?, ?>> l = new CopyOnWriteArrayList<Encoder<?, ?>>();
+            List<Encoder<?, ?>> l = new CopyOnWriteArrayList<>();
             for (Class<? extends Encoder> s : m.method.getAnnotation(Message.class).encoders()) {
                 try {
                     l.add(config.framework().newClassInstance(Encoder.class, s));
@@ -305,7 +305,7 @@ private void populateEncoders() {
         }
 
         if (onReadyMethod != null) {
-            List<Encoder<?, ?>> l = new CopyOnWriteArrayList<Encoder<?, ?>>();
+            List<Encoder<?, ?>> l = new CopyOnWriteArrayList<>();
             for (Class<? extends Encoder> s : onReadyMethod.getAnnotation(Ready.class).encoders()) {
                 try {
                     l.add(config.framework().newClassInstance(Encoder.class, s));
@@ -319,7 +319,7 @@ private void populateEncoders() {
 
     private void populateDecoders() {
         for (MethodInfo m : onRuntimeMethod) {
-            List<Decoder<?, ?>> l = new CopyOnWriteArrayList<Decoder<?, ?>>();
+            List<Decoder<?, ?>> l = new CopyOnWriteArrayList<>();
             for (Class<? extends Decoder> s : m.method.getAnnotation(Message.class).decoders()) {
                 try {
                     l.add(config.framework().newClassInstance(Decoder.class, s));

diff --git a/modules/runtime/src/main/java/org/atmosphere/runtime/AnnotationHandler.java b/modules/runtime/src/main/java/org/atmosphere/runtime/AnnotationHandler.java
@@ -46,7 +46,7 @@ public AnnotationHandler() {
     }
 
     public AnnotationHandler flushCoreAnnotations(Set<Class<?>> classes){
-        List<Class<? extends Annotation>> l = new ArrayList<Class<? extends Annotation>>();
+        List<Class<? extends Annotation>> l = new ArrayList<>();
         for (Map.Entry<Class<? extends Annotation>, Class<? extends Processor>> e : annotations.entrySet()) {
             if (e.getValue().getPackage().getName().equals("org.atmosphere.annotation") && classes.contains(e.getValue())) {
                 l.add(e.getKey());

diff --git a/modules/runtime/src/test/java/org/atmosphere/runtime/AtmosphereResourceListenerTest.java b/modules/runtime/src/test/java/org/atmosphere/runtime/AtmosphereResourceListenerTest.java
@@ -75,11 +75,11 @@ public void destroy() {
 
         AtmosphereRequest request = new AtmosphereRequestImpl.Builder().pathInfo("/a").build();
 
-        final AtomicReference<Boolean> suspended = new AtomicReference<Boolean>();
-        final AtomicReference<Boolean> resumed = new AtomicReference<Boolean>();
-        final AtomicReference<Boolean> disconnected = new AtomicReference<Boolean>();
-        final AtomicReference<Boolean> preSuspended = new AtomicReference<Boolean>();
-        final AtomicReference<Boolean> broadcasted = new AtomicReference<Boolean>();
+        final AtomicReference<Boolean> suspended = new AtomicReference<>();
+        final AtomicReference<Boolean> resumed = new AtomicReference<>();
+        final AtomicReference<Boolean> disconnected = new AtomicReference<>();
+        final AtomicReference<Boolean> preSuspended = new AtomicReference<>();
+        final AtomicReference<Boolean> broadcasted = new AtomicReference<>();
 
         final AtmosphereResourceEventListener listener = new AtmosphereResourceEventListener() {
 
@@ -167,7 +167,7 @@ public void destroy() {
 
         AtmosphereRequest request = new AtmosphereRequestImpl.Builder().pathInfo("/a").build();
 
-        final AtomicReference<Boolean> closed = new AtomicReference<Boolean>();
+        final AtomicReference<Boolean> closed = new AtomicReference<>();
 
         final AtmosphereResourceEventListener listener = new AtmosphereResourceEventListenerAdapter() {
             @Override

diff --git a/...les/runtime/src/test/java/org/atmosphere/runtime/AtmosphereResourceStateRecoveryTest.java b/...les/runtime/src/test/java/org/atmosphere/runtime/AtmosphereResourceStateRecoveryTest.java
@@ -149,7 +149,7 @@ public void restorePartialStateTest() throws ServletException, IOException {
 
     @Test(enabled = false)
     public void longPollingAggregatedTest() throws ServletException, IOException, ExecutionException, InterruptedException {
-        final AtomicReference<Object> ref = new AtomicReference<Object>();
+        final AtomicReference<Object> ref = new AtomicReference<>();
         AtmosphereResourceImpl r = (AtmosphereResourceImpl) config.resourcesFactory().create(config, "1234567");
         r.setBroadcaster(config.getBroadcasterFactory().lookup("/1", true));
 

diff --git a/modules/runtime/src/test/java/org/atmosphere/runtime/AtmosphereResourceTest.java b/modules/runtime/src/test/java/org/atmosphere/runtime/AtmosphereResourceTest.java
@@ -94,8 +94,8 @@ public void destroy() {
 
         AtmosphereRequest request = new AtmosphereRequestImpl.Builder().pathInfo("/a").build();
 
-        final AtomicReference<String> e = new AtomicReference<String>();
-        final AtomicReference<String> e2 = new AtomicReference<String>();
+        final AtomicReference<String> e = new AtomicReference<>();
+        final AtomicReference<String> e2 = new AtomicReference<>();
 
         framework.interceptor(new AtmosphereInterceptor() {
             @Override
@@ -180,7 +180,7 @@ public void run() {
         }.start();
 
         suspended.await();
-        Map<String, Object> m = new HashMap<String, Object>();
+        Map<String, Object> m = new HashMap<>();
         m.put(SUSPENDED_ATMOSPHERE_RESOURCE_UUID, parentRequest.resource().uuid());
 
         AtmosphereRequest request = new AtmosphereRequestImpl.Builder().attributes(m).pathInfo("/a").queryString(HeaderConfig.WEBSOCKET_X_ATMOSPHERE_TRANSPORT).build();

diff --git a/modules/runtime/src/test/java/org/atmosphere/runtime/BroadcasterListenerTest.java b/modules/runtime/src/test/java/org/atmosphere/runtime/BroadcasterListenerTest.java
@@ -128,7 +128,7 @@ public void testOnRemove() throws IOException, ServletException {
     public void testLongPollingOnBroadcast() throws IOException, ServletException {
         framework.addAtmosphereHandler("/*", new BAR()).init();
 
-        Map<String, String> m = new HashMap<String, String>();
+        Map<String, String> m = new HashMap<>();
         m.put(HeaderConfig.X_ATMOSPHERE_TRANSPORT, HeaderConfig.LONG_POLLING_TRANSPORT);
         AtmosphereRequest request = new AtmosphereRequestImpl.Builder().headers(m).pathInfo("/a").method("GET").build();
         framework.doCometSupport(request, AtmosphereResponseImpl.newInstance());
@@ -140,7 +140,7 @@ public void testLongPollingOnBroadcast() throws IOException, ServletException {
     public void testCachedOnBroadcast() throws IOException, ServletException {
         framework.setBroadcasterCacheClassName(UUIDBroadcasterCache.class.getName()).addAtmosphereHandler("/*", new CachedAR()).init();
 
-        Map<String, String> m = new HashMap<String, String>();
+        Map<String, String> m = new HashMap<>();
         m.put(HeaderConfig.X_ATMOSPHERE_TRACKING_ID, UUID.randomUUID().toString());
         m.put(HeaderConfig.X_ATMOSPHERE_TRANSPORT, HeaderConfig.LONG_POLLING_TRANSPORT);
         AtmosphereRequest request = new AtmosphereRequestImpl.Builder().headers(m).pathInfo("/a").method("GET").build();

diff --git a/modules/runtime/src/test/java/org/atmosphere/runtime/TrackMessageSizeInterceptorTest.java b/modules/runtime/src/test/java/org/atmosphere/runtime/TrackMessageSizeInterceptorTest.java
@@ -122,7 +122,7 @@ public void destroy() {
             }
         });
 
-        Map<String, String> reqheaders = new HashMap<String, String>();
+        Map<String, String> reqheaders = new HashMap<>();
         if (enabled) {
             reqheaders.put(HeaderConfig.X_ATMOSPHERE_TRACKMESSAGESIZE, "true");
         }