Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
UPSMF
knowledge-platform
Commits
7578168e
Commit
7578168e
authored
4 years ago
by
rheafernandes
Browse files
Options
Download
Patches
Plain Diff
SB-19716 - Added fix for online mimetypes going through asset mimetype flow
parent
703c08bf
schema-updates
3.9.0-prod-fix
4.1.0_fixes
AmiableAnil-patch-1
Gcloud_copy
Gcloud_fix
Remove_unwantedCode_Gcloud_fix
actors-test
bulk-upload-comptenecy-mapping
bulk-upload-excelsheet
bulk-upload-test_excel
bulk_upload
code-cleanup
csp-migration
dependabot/maven/platform-core/platform-telemetry/ch.qos.logback-logback-core-1.2.9
dependabot/maven/search-api/search-core/org.apache.httpcomponents-httpclient-4.5.13
ft-spike
knowlg-friday
knowlg-oneclick
local-setup-fix
local-setup-kube
m-4.2.0
master
master-data
new_objecttype
org-target-enhancement
patch-1
patch-2
patch-3
poc_bulk_upload
qs-schema
rahul_bulk_upload_postgres
release-3.0.0
release-3.1.0
release-3.2.0
release-3.3.0
release-3.4.0
release-3.5.0
release-3.6.0
release-3.6.0.1
release-3.7.0
release-3.8.0
release-3.9.0
release-4.0.0
release-4.1.0
release-4.10.0
release-4.10.1
release-4.2.0
release-4.3.0
release-4.4.0
release-4.5.0
release-4.6.0
release-4.7.0
release-4.7.0-debug
release-4.8.0
release-4.8.0-debug
release-4.9.0
release-4.9.1
release-5.0.0
release-5.0.1
release-5.1.0
release-5.1.0-content
release-5.2.0
release-5.3.0
revert-718-visiblity-private-api
revert-719-assessment-private-read-api
revert-720-visiblity-public-search-api
revert-721-visiblity-private-search-api
review-4.1.0
s-debug
schema-update-4.0
release-5.2.0_RC2
release-5.2.0_RC1
release-5.1.0_RC1
release-5.0.0_RC2
release-5.0.0_RC1
release-4.10.0_RC2
release-4.10.0_RC1
release-4.9.1_RC1
release-4.9.0_RC8
release-4.9.0_RC7
release-4.9.0_RC6
release-4.9.0_RC5
release-4.9.0_RC4
release-4.9.0_RC3
release-4.9.0_RC2
release-4.9.0_RC1
release-4.8.0_RC5
release-4.8.0_RC4
release-4.8.0_RC3
release-4.8.0_RC2
release-4.8.0_RC1
release-4.7.0_RC6
release-4.7.0_RC5
release-4.7.0_RC4
release-4.7.0_RC3
release-4.7.0_RC2
release-4.7.0_RC1
release-4.6.0_RC2
release-4.6.0_RC1
release-4.5.0_RC2
release-4.5.0_RC1
release-4.4.0_RC6
release-4.4.0_RC5
release-4.4.0_RC4
release-4.4.0_RC3
release-4.4.0_RC2
release-4.4.0_RC1
release-4.3.0_RC10
release-4.3.0_RC9
release-4.3.0_RC8
release-4.3.0_RC7
release-4.3.0_RC6
release-4.3.0_RC5
release-4.3.0_RC4
release-4.3.0_RC3
release-4.3.0_RC2
release-4.3.0_RC1
release-4.2.0_RC13
release-4.2.0_RC12
release-4.2.0_RC11
release-4.2.0_RC10
release-4.2.0_RC9
release-4.2.0_RC8
release-4.2.0_RC7
release-4.2.0_RC6
release-4.2.0_RC5
release-4.2.0_RC4
release-4.2.0_RC3
release-4.2.0_RC2
release-4.2.0_RC1
release-4.1.0_RC13
release-4.1.0_RC12
release-4.1.0_RC11
release-4.1.0_RC10
release-4.1.0_RC9
release-4.1.0_RC8
release-4.1.0_RC7
release-4.1.0_RC6
release-4.1.0_RC5
release-4.1.0_RC4
release-4.1.0_RC3
release-4.1.0_RC2
release-4.1.0_RC1
release-4.0.0_RC9
release-4.0.0_RC8
release-4.0.0_RC7
release-4.0.0_RC6
release-4.0.0_RC5
release-4.0.0_RC4
release-4.0.0_RC3
release-4.0.0_RC2
release-4.0.0_RC1
release-3.9.0_RC12
release-3.9.0_RC11
release-3.9.0_RC10
release-3.9.0_RC9
release-3.9.0_RC8
release-3.9.0_RC7
release-3.9.0_RC6
release-3.9.0_RC5
release-3.9.0_RC4
release-3.9.0_RC3
release-3.9.0_RC2
release-3.9.0_RC1
release-3.8.0_RC9
release-3.8.0_RC8
release-3.8.0_RC7
release-3.8.0_RC6
release-3.8.0_RC5
release-3.8.0_RC4
release-3.8.0_RC3
release-3.8.0_RC2
release-3.8.0_RC1
release-3.7.0_RC1
release-3.6.0_RC5
release-3.6.0_RC4
release-3.6.0_RC3
release-3.6.0_RC2
release-3.6.0_RC1
release-3.5.0
release-3.5.0_RC2
release-3.5.0_RC1
release-3.4.0
release-3.4.0_RC2
release-3.4.0_RC1
release-3.3.0_RC10
release-3.3.0_RC9
release-3.3.0_RC8
release-3.3.0_RC7
release-3.3.0_RC6
release-3.3.0_RC5
release-3.3.0_RC4
release-3.3.0_RC3
release-3.3.0_RC2
release-3.3.0_RC1
release-3.2.0_RC9
release-3.2.0_RC8
release-3.2.0_RC7
release-3.2.0_RC6
release-3.2.0_RC5
release-3.2.0_RC4
release-3.2.0_RC3
release-3.2.0_RC2
release-3.1.0
release-3.1.0_RC8
release-3.1.0_RC7
release-3.1.0_RC6
release-3.1.0_RC5
release-3.0.0_RC11
release-3.0.0_RC10
release-3.0.0_RC9
release-3.0.0_RC8
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactory.scala
+6
-2
...org/sunbird/mimetype/factory/MimeTypeManagerFactory.scala
platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactoryTest.scala
+18
-0
...sunbird/mimetype/factory/MimeTypeManagerFactoryTest.scala
with
24 additions
and
2 deletions
+24
-2
platform-modules/mimetype-manager/src/main/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactory.scala
+
6
−
2
View file @
7578168e
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/factory/MimeTypeManagerFactoryTest.scala
+
18
−
0
View file @
7578168e
...
...
@@ -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
])
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets