Minor java improvements.

bigbluebutton · Aug 7, 2018 · ba6e7ad · ba6e7ad
1 parent cb152bf
commit ba6e7ad
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 28 deletions.
diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
@@ -20,7 +20,6 @@
 
 import java.io.File;
 import java.util.AbstractMap;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -414,7 +413,7 @@ public String getCaptionTrackInboxDir() {
   	return recordingService.getCaptionTrackInboxDir();
 	}
 
-  public String getRecordings2x(ArrayList<String> idList, ArrayList<String> states, Map<String, String> metadataFilters) {
+  public String getRecordings2x(List<String> idList, List<String> states, Map<String, String> metadataFilters) {
     return recordingService.getRecordings2x(idList, states, metadataFilters);
   }
 
@@ -771,10 +770,7 @@ public void userLeftVoice(UserLeftVoice message) {
         } else {
           user.setVoiceJoined(false);
         }
-
-        return;
       }
-      return;
     }
   }
 

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/ParamsProcessorUtil.java
@@ -163,11 +163,11 @@ public Map<String, Object> processUpdateCreateParams(Map<String, String> params)
 
 	    // Collect metadata for this meeting that the third-party application wants to store if meeting is recorded.
 	    Map<String, String> meetingInfo = new HashMap<>();
-	    for (String key: params.keySet()) {
-	    	if (key.contains(ApiParams.META)){
-	    		String[] meta = key.split("_");
+	    for (Map.Entry<String, String> entry : params.entrySet()) {
+	    	if (entry.getKey().contains(ApiParams.META)){
+	    		String[] meta = entry.getKey().split("_");
 			    if(meta.length == 2){
-			    	meetingInfo.put(meta[1], params.get(key));
+			    	meetingInfo.put(meta[1], entry.getValue());
 			    }
 			}   
 	    }
@@ -184,7 +184,7 @@ public static Boolean isMetaValid(String param) {
 		Matcher metaMatcher = META_VAR_PATTERN.matcher(param);
     if (metaMatcher.matches()) {
     	return true;
-    }	
+    }
 		return false;
 	}
 
@@ -194,12 +194,12 @@ public static String removeMetaString(String param) {
 
     public static Map<String, String> processMetaParam(Map<String, String> params) {
         Map<String, String> metas = new HashMap<>();
-        for (String key : params.keySet()) {
-            if (isMetaValid(key)) {
+        for (Map.Entry<String, String> entry : params.entrySet()) {
+            if (isMetaValid(entry.getKey())) {
                 // Need to lowercase to maintain backward compatibility with
                 // 0.81
-                String metaName = removeMetaString(key).toLowerCase();
-                metas.put(metaName, params.get(key));
+                String metaName = removeMetaString(entry.getKey()).toLowerCase();
+                metas.put(metaName, params.get(entry.getValue()));
             }
         }
 
@@ -643,7 +643,7 @@ public boolean isChecksumSame(String apiCall, String checksum, String queryStrin
 		return true; 
 	}
 
-	public boolean isPostChecksumSame(String apiCall, HashMap<String, String[]> params) {
+	public boolean isPostChecksumSame(String apiCall, Map<String, String[]> params) {
 		if (StringUtils.isEmpty(securitySalt)) {
 			log.warn("Security is disabled in this service. Make sure this is intentional.");
 			return true;

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java b/bbb-common-web/src/main/java/org/bigbluebutton/api/RecordingService.java
@@ -159,7 +159,7 @@ public String putRecordingTextTrack(UploadedTrack track) {
         return recordingServiceHelper.putRecordingTextTrack(track);
     }
 
-    public String getRecordings2x(ArrayList<String> idList, ArrayList<String> states, Map<String, String> metadataFilters) {
+    public String getRecordings2x(List<String> idList, List<String> states, Map<String, String> metadataFilters) {
         List<RecordingMetadata> recsList = getRecordingsMetadata(idList, states);
         ArrayList<RecordingMetadata> recs = filterRecordingsByMetadata(recsList, metadataFilters);
         return recordingServiceHelper.getRecordings2x(recs);

diff --git a/bbb-common-web/src/main/java/org/bigbluebutton/web/services/callback/CallbackUrlService.java b/bbb-common-web/src/main/java/org/bigbluebutton/web/services/callback/CallbackUrlService.java
@@ -1,24 +1,22 @@
 package org.bigbluebutton.web.services.callback;
 
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.LinkedBlockingQueue;
+
 import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.HttpGet;
-import org.apache.http.entity.ContentType;
 import org.apache.http.impl.nio.client.CloseableHttpAsyncClient;
 import org.apache.http.impl.nio.client.HttpAsyncClients;
-import org.apache.http.nio.client.methods.HttpAsyncMethods;
-import org.apache.http.nio.client.methods.ZeroCopyConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.concurrent.*;
-
 public class CallbackUrlService {
 	private static Logger log = LoggerFactory.getLogger(CallbackUrlService.class);