From ba6e7ad0f3aa8582d74b24dca62063aca92975eb Mon Sep 17 00:00:00 2001
From: Ghazi Triki <ghazi.triki@riadvice.tn>
Date: Tue, 7 Aug 2018 10:02:26 +0100
Subject: [PATCH] Minor java improvements.
---
.../org/bigbluebutton/api/MeetingService.java | 6 +----
.../api/ParamsProcessorUtil.java | 20 ++++++++---------
.../bigbluebutton/api/RecordingService.java | 2 +-
.../services/callback/CallbackUrlService.java | 22 +++++++++----------
4 files changed, 22 insertions(+), 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
index 5ac854fd0a..7e93392a34 100755
--- 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 @@ package org.bigbluebutton.api;
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 class MeetingService implements MessageListener {
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 class MeetingService implements MessageListener {
} 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
index f12134b523..c2799bab3c 100755
--- 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 class ParamsProcessorUtil {
// 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 class ParamsProcessorUtil {
Matcher metaMatcher = META_VAR_PATTERN.matcher(param);
if (metaMatcher.matches()) {
return true;
- }
+ }
return false;
}
@@ -194,12 +194,12 @@ public class ParamsProcessorUtil {
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 class ParamsProcessorUtil {
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
index 6cae0aee06..57d5f2761a 100755
--- 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 class RecordingService {
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
index 3bcb1758b1..f918896f51 100755
--- 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);
--
GitLab