Merge pull request #324 from rheafernandes/release-3.0.0

SB-19716 - Added fix for online mimetypes going through asset mimetyp…

platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactory.scala

@@ -2,13 +2,15 @@ package org.sunbird.mimetype.factory
 
 import org.apache.commons.lang3.StringUtils
 import org.sunbird.cloudstore.StorageService
+import org.sunbird.common.Platform
 import org.sunbird.mimetype.mgr.MimeTypeManager
 import org.sunbird.mimetype.mgr.impl.{ApkMimeTypeMgrImpl, AssetMimeTypeMgrImpl, CollectionMimeTypeMgrImpl, DefaultMimeTypeMgrImpl, DocumentMimeTypeMgrImpl, EcmlMimeTypeMgrImpl, H5PMimeTypeMgrImpl, HtmlMimeTypeMgrImpl, PluginMimeTypeMgrImpl, YouTubeMimeTypeMgrImpl}
 
 object MimeTypeManagerFactory {
 
 	implicit val ss: StorageService = new StorageService
-	
+	val ONLINE_MIMETYPES: java.util.List[String] = Platform.getStringList("content.mimeType.online", java.util.Arrays.asList("video/youtube", "video/x-youtube", "text/x-url"))
+
 	val defaultMimeTypeMgrImpl = new DefaultMimeTypeMgrImpl
 	val mimeTypeMgr = Map[String, MimeTypeManager](
 		"video/youtube" -> new YouTubeMimeTypeMgrImpl,"video/x-youtube" -> new YouTubeMimeTypeMgrImpl,
@@ -25,7 +27,9 @@ object MimeTypeManagerFactory {
 	)
 
 	def getManager(contentType: String, mimeType: String): MimeTypeManager = {
-		if (StringUtils.equalsIgnoreCase("Asset", contentType)) {
+		if(ONLINE_MIMETYPES.contains(mimeType))
+			mimeTypeMgr.getOrElse(mimeType.toLowerCase(), defaultMimeTypeMgrImpl)
+		else if (StringUtils.equalsIgnoreCase("Asset", contentType)) {
 			mimeTypeMgr.get("assets").get
 		} else {
 			if(null != mimeType)

platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactoryTest.scala

@@ -89,4 +89,22 @@ class MimeTypeManagerFactoryTest extends FlatSpec with Matchers {
 		assert(mgr.isInstanceOf[DefaultMimeTypeMgrImpl])
 	}
 
+	"getManager with mimeType text/x-url and contentType Asset" should "give instance of YouTubeMimeTypeMgrImpl" in {
+		val mgr = MimeTypeManagerFactory.getManager("Asset", "text/x-url")
+		assert(null != mgr)
+		assert(mgr.isInstanceOf[YouTubeMimeTypeMgrImpl])
+	}
+
+	"getManager with mimeType video/x-youtube and contentType Asset" should "give instance of YouTubeMimeTypeMgrImpl" in {
+		val mgr = MimeTypeManagerFactory.getManager("Asset", "video/x-youtube")
+		assert(null != mgr)
+		assert(mgr.isInstanceOf[YouTubeMimeTypeMgrImpl])
+	}
+
+	"getManager with mimeType video/youtube and contentType Asset" should "give instance of YouTubeMimeTypeMgrImpl" in {
+		val mgr = MimeTypeManagerFactory.getManager("Asset", "video/youtube")
+		assert(null != mgr)
+		assert(mgr.isInstanceOf[YouTubeMimeTypeMgrImpl])
+	}
+
 }