Merge branch 'master' into tokenBlacklist

Author: lastpeony

pom.xml

@@ -600,6 +600,18 @@
             <version>${mockito-core.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-module-junit4</artifactId>
+            <version>2.0.9</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.powermock</groupId>
+            <artifactId>powermock-api-mockito2</artifactId>
+            <version>2.0.9</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>javax.websocket</groupId>
             <artifactId>javax.websocket-api</artifactId>

src/main/java/io/antmedia/AntMediaApplicationAdapter.java

@@ -8,19 +8,14 @@
 import java.lang.reflect.Modifier;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.regex.Pattern;
-import java.util.Queue;
-import java.util.Set;
 
 import javax.validation.constraints.NotNull;
 
+import io.antmedia.statistic.*;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -72,9 +67,6 @@
 import io.antmedia.settings.ServerSettings;
 import io.antmedia.shutdown.AMSShutdownManager;
 import io.antmedia.shutdown.IShutdownListener;
-import io.antmedia.statistic.DashViewerStats;
-import io.antmedia.statistic.HlsViewerStats;
-import io.antmedia.statistic.ViewerStats;
 import io.antmedia.statistic.type.RTMPToWebRTCStats;
 import io.antmedia.statistic.type.WebRTCAudioReceiveStats;
 import io.antmedia.statistic.type.WebRTCAudioSendStats;
@@ -97,6 +89,7 @@ public class AntMediaApplicationAdapter  extends MultiThreadedApplicationAdapter
 	public static final String HOOK_ACTION_END_LIVE_STREAM = "liveStreamEnded";
 	public static final String HOOK_ACTION_START_LIVE_STREAM = "liveStreamStarted";
 	public static final String HOOK_ACTION_VOD_READY = "vodReady";
+
 	public static final String HOOK_ACTION_PUBLISH_TIMEOUT_ERROR = "publishTimeoutError";
 	public static final String HOOK_ACTION_ENCODER_NOT_OPENED_ERROR =  "encoderNotOpenedError";
 	public static final String HOOK_ACTION_ENDPOINT_FAILED = "endpointFailed";
@@ -151,7 +144,7 @@ public class AntMediaApplicationAdapter  extends MultiThreadedApplicationAdapter
 
 	protected StorageClient storageClient;
 
-	protected ArrayList<IStreamListener> streamListeners = new ArrayList<>();
+	protected Queue<IStreamListener> streamListeners = new ConcurrentLinkedQueue<>();
 
 	IClusterStreamFetcher clusterStreamFetcher;
 
@@ -176,6 +169,7 @@ public boolean appStart(IScope app) {
 		if (!result.isSuccess()) {
 			//Save App Setting
 			this.shutdownProperly = false;
+
 			// Reset Broadcast Stats
 			resetBroadcasts();
 		}
@@ -241,7 +235,6 @@ else if (getServerSettings().getHostAddress().equals(storedSettings.getWarFileOr
 
 		setStorageclientSettings(appSettings);
 
-
 		logger.info("{} started", app.getName());
 
 		return true;
@@ -357,7 +350,6 @@ public Result importVoDFolder(String vodFolderPath) {
 		return result;
 	}
 
-
 	public Result unlinksVoD(String directory) 
 	{
 		//check the directory exist
@@ -1616,6 +1608,7 @@ public void setStorageclientSettings(AppSettings settings) {
 		storageClient.setEnabled(settings.isS3RecordingEnabled());
 		storageClient.setPermission(settings.getS3Permission());
 		storageClient.setStorageClass(settings.getS3StorageClass());
+		storageClient.setCacheControl(settings.getS3CacheControl());
 		storageClient.reset();
 	}
 

src/main/java/io/antmedia/AppSettings.java

@@ -309,6 +309,7 @@ public class AppSettings implements Serializable{
 	public static final String SETTINGS_S3_BUCKET_NAME = "settings.s3BucketName";
 	public static final String SETTINGS_S3_ENDPOINT = "settings.s3Endpoint";
 	public static final String SETTINGS_S3_PERMISSION = "settings.s3Permission";
+	public static final String SETTINGS_S3_CACHE_CONTROL = "settings.s3CacheControl";
 	public static final String SETTINGS_ENABLE_TIME_TOKEN_PLAY = "settings.enableTimeTokenForPlay";
 	public static final String SETTINGS_ENABLE_TIME_TOKEN_PUBLISH = "settings.enableTimeTokenForPublish";
 
@@ -1424,6 +1425,12 @@ public class AppSettings implements Serializable{
 	@Value( "${"+SETTINGS_S3_ENDPOINT+":#{null}}" )
 	private String s3Endpoint;
 
+	/**
+	 * S3 Cache Control Metadata
+	 */
+	@Value( "${"+SETTINGS_S3_CACHE_CONTROL+":no-store, no-cache, must-revalidate, max-age=0}" )
+	private String s3CacheControl = "no-store, no-cache, must-revalidate, max-age=0";
+
 	/*
 	 * The permission to use in uploading the files to the S3. 
 	 * Following values are accepted. Default value is public-read
@@ -1610,7 +1617,7 @@ public boolean isWriteStatsToDatastore() {
 	 * 
 	 * In initialization no matter if spring or field definition is effective, the important thing is that having some random value
 	 */
-	@Value( "${"+SETTINGS_CLUSTER_COMMUNICATION_KEY+ ":+ #{ T(org.apache.commons.lang3.RandomStringUtils).randomAlphanumeric(32)}" )
+	@Value( "${"+SETTINGS_CLUSTER_COMMUNICATION_KEY+ ":#{ T(org.apache.commons.lang3.RandomStringUtils).randomAlphanumeric(32)}" )
 	private String clusterCommunicationKey = RandomStringUtils.randomAlphanumeric(32);
 
 	public void setWriteStatsToDatastore(boolean writeStatsToDatastore) {
@@ -2840,6 +2847,14 @@ public void setS3Endpoint(String s3Endpoint) {
 		this.s3Endpoint = s3Endpoint;
 	}
 
+	public String getS3CacheControl() {
+		return s3CacheControl;
+	}
+
+	public void setS3CacheControl(String s3CacheControl) {
+		this.s3CacheControl = s3CacheControl;
+	}
+
 	public void setDashHttpEndpoint(String dashHttpEndpoint) {
 		this.dashHttpEndpoint = dashHttpEndpoint;
 	}