Tidied up warnings highlighted by IntelliJ

Author: SMadani

sample/Archiving/src/main/java/com/example/ArchivingServer.java

@@ -4,8 +4,6 @@
 
 import com.opentok.*;
 import com.opentok.Archive.OutputMode;
-import com.opentok.ArchiveLayout;
-import com.opentok.ArchiveProperties;
 
 import spark.*;
 
@@ -56,7 +54,7 @@ public ModelAndView handle(Request request, Response response) {
             public ModelAndView handle(Request request, Response response) {
 
                 String token = null;
-                ArrayList<String> layoutClassList = new ArrayList<String>();
+                ArrayList<String> layoutClassList = new ArrayList<>();
                 layoutClassList.add("focus");
                 try {
                     token = opentok.generateToken(sessionId, new TokenOptions.Builder()
@@ -67,7 +65,7 @@ public ModelAndView handle(Request request, Response response) {
                     e.printStackTrace();
                 }
 
-                Map<String, Object> attributes = new HashMap<String, Object>();
+                Map<String, Object> attributes = new HashMap<>();
                 attributes.put("apiKey", apiKey);
                 attributes.put("sessionId", sessionId);
                 attributes.put("token", token);
@@ -91,7 +89,7 @@ public ModelAndView handle(Request request, Response response) {
                     e.printStackTrace();
                 }
 
-                Map<String, Object> attributes = new HashMap<String, Object>();
+                Map<String, Object> attributes = new HashMap<>();
                 attributes.put("apiKey", apiKey);
                 attributes.put("sessionId", sessionId);
                 attributes.put("token", token);
@@ -122,7 +120,7 @@ public ModelAndView handle(Request request, Response response) {
                     e.printStackTrace();
                 }
 
-                Map<String, Object> attributes = new HashMap<String, Object>();
+                Map<String, Object> attributes = new HashMap<>();
                 attributes.put("archives", archives);
                 attributes.put("showPrevious", null);
                 // TODO: we don't have a total count, how do we know if there is a next page?
@@ -140,7 +138,7 @@ public ModelAndView handle(Request request, Response response) {
             @Override
             public Object handle(Request request, Response response) {
 
-                Archive archive = null;
+                Archive archive;
                 try {
                     archive = opentok.getArchive(request.params("archiveId"));
                 } catch (OpenTokException e) {
@@ -157,7 +155,7 @@ public Object handle(Request request, Response response) {
             @Override
             public Object handle(Request request, Response response) {
 
-                Archive archive = null;
+                Archive archive;
                 HttpServletRequest req = request.raw();
                 boolean hasAudio = req.getParameterMap().containsKey("hasAudio");
                 boolean hasVideo = req.getParameterMap().containsKey("hasVideo");
@@ -188,7 +186,7 @@ public Object handle(Request request, Response response) {
             @Override
             public Object handle(Request request, Response response) {
 
-                Archive archive = null;
+                Archive archive;
                 try {
                     archive = opentok.stopArchive(request.params("archiveId"));
                 } catch (OpenTokException e) {
@@ -240,7 +238,7 @@ public Object handle(Request request, Response response) {
         post(new Route("/focus") {
             @Override
             public Object handle(Request request, Response response) {
-                ArrayList<String> otherStreams = new ArrayList<String>();
+                ArrayList<String> otherStreams = new ArrayList<>();
                 HttpServletRequest req = request.raw();
                 String newFocusStreamId = req.getParameterMap().get("focus")[0];
 

sample/Archiving/src/main/java/com/example/FreeMarkerTemplateView.java

@@ -33,9 +33,7 @@ public String render(ModelAndView modelAndView) {
 
             return stringWriter.toString();
 
-        } catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        } catch (TemplateException e) {
+        } catch (IOException | TemplateException e) {
             throw new IllegalArgumentException(e);
         }
     }

sample/HelloWorld/src/main/java/com/example/FreeMarkerTemplateView.java

@@ -33,9 +33,7 @@ public String render(ModelAndView modelAndView) {
 
             return stringWriter.toString();
 
-        } catch (IOException e) {
-            throw new IllegalArgumentException(e);
-        } catch (TemplateException e) {
+        } catch (IOException | TemplateException e) {
             throw new IllegalArgumentException(e);
         }
     }

sample/HelloWorld/src/main/java/com/example/HelloWorldServer.java

@@ -40,7 +40,7 @@ public ModelAndView handle(Request request, Response response) {
                     e.printStackTrace();
                 }
 
-                Map<String, Object> attributes = new HashMap<String, Object>();
+                Map<String, Object> attributes = new HashMap<>();
                 attributes.put("apiKey", apiKey);
                 attributes.put("sessionId", sessionId);
                 attributes.put("token", token);

src/main/java/com/opentok/ArchiveLayout.java

@@ -74,7 +74,7 @@ public enum Type {
 
         private String serialized;
 
-        private Type(String s) {
+        Type(String s) {
             serialized = s;
         }
 

src/main/java/com/opentok/ArchiveMode.java

@@ -27,7 +27,7 @@ public enum ArchiveMode {
 
     private String serialized;
 
-    private ArchiveMode(String s) {
+    ArchiveMode(String s) {
         serialized = s;
     }
 

src/main/java/com/opentok/ArchiveProperties.java

@@ -25,8 +25,8 @@
 public class ArchiveProperties {
 
 
-    private String name = null;
-    private String resolution = null;
+    private String name;
+    private String resolution;
     private boolean hasAudio;
     private boolean hasVideo;
     private OutputMode outputMode;
@@ -219,40 +219,40 @@ public ArchiveLayout layout() {
      * Returns the archive properties as a Map.
      */
     public Map<String, Collection<String>> toMap() {
-        Map<String, Collection<String>> params = new HashMap<String, Collection<String>>();
+        Map<String, Collection<String>> params = new HashMap<>();
         if (name != null) {
-            ArrayList<String> valueList = new ArrayList<String>();
+            ArrayList<String> valueList = new ArrayList<>();
             valueList.add(name);
             params.put("name", valueList);
         }
         if (resolution != null) {
-            ArrayList<String> valueList = new ArrayList<String>();
+            ArrayList<String> valueList = new ArrayList<>();
             valueList.add(resolution);
             params.put("resolution", valueList);
         }
-        ArrayList<String> valueList = new ArrayList<String>();
+        ArrayList<String> valueList = new ArrayList<>();
         valueList.add(Boolean.toString(hasAudio));
         params.put("hasAudio", valueList);
 
-        valueList = new ArrayList<String>();
+        valueList = new ArrayList<>();
         valueList.add(Boolean.toString(hasVideo));
         params.put("hasVideo", valueList);
 
-        valueList = new ArrayList<String>();
+        valueList = new ArrayList<>();
         valueList.add(outputMode.toString());
         params.put("outputMode", valueList);
 
-        valueList = new ArrayList<String>();
+        valueList = new ArrayList<>();
         valueList.add(streamMode.toString());
         params.put("streamMode", valueList);
 
         if (layout != null) {
-            valueList = new ArrayList<String>();
+            valueList = new ArrayList<>();
             valueList.add(layout.toString());
             params.put("layout", valueList);
         }
 
         return params;
     }
 
-};
+}

src/main/java/com/opentok/Broadcast.java

@@ -14,7 +14,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 

src/main/java/com/opentok/BroadcastProperties.java

@@ -114,7 +114,7 @@ public Builder hls(Hls hls) {
          * @return The BroadcastProperties.Builder object with the list of RtmpProperties setting.
          */
         public Builder addRtmpProperties (RtmpProperties rtmpProps) throws InvalidArgumentException {
-            if(this.rtmpList.size() >= 5) {
+            if (this.rtmpList.size() >= 5) {
                 throw new InvalidArgumentException("Cannot add more than 5 RtmpProperties properties");
             }
             this.rtmpList.add(rtmpProps);

src/main/java/com/opentok/MediaMode.java

@@ -25,7 +25,7 @@ public enum MediaMode {
 
     private String serialized;
 
-    private MediaMode(String s) {
+    MediaMode(String s) {
         serialized = s;
     }