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
a3a5057a
Commit
a3a5057a
authored
4 years ago
by
rheafernandes
Browse files
Options
Download
Patches
Plain Diff
Removed extra code changes
parent
4f627d3c
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.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.2.0_RC1
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
ontology-engine/graph-dac-api/src/main/java/org/sunbird/graph/service/operation/NodeAsyncOperations.java
+1
-1
.../sunbird/graph/service/operation/NodeAsyncOperations.java
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/nodes/DataNode.scala
+0
-1
....11/src/main/scala/org/sunbird/graph/nodes/DataNode.scala
platform-modules/mimetype-manager/src/test/resources/h5p_valid_12_mb.h5p
+0
-0
...s/mimetype-manager/src/test/resources/h5p_valid_12_mb.h5p
platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImplTest.scala
+0
-31
...rg/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImplTest.scala
with
1 addition
and
33 deletions
+1
-33
ontology-engine/graph-dac-api/src/main/java/org/sunbird/graph/service/operation/NodeAsyncOperations.java
+
1
−
1
View file @
a3a5057a
...
...
@@ -281,7 +281,7 @@ public class NodeAsyncOperations {
}
}
private
static
Node
setPrimitiveData
(
Node
node
)
throws
Exception
{
private
static
Node
setPrimitiveData
(
Node
node
)
{
Map
<
String
,
Object
>
metadata
=
node
.
getMetadata
();
metadata
.
entrySet
().
stream
()
.
map
(
entry
->
{
...
...
This diff is collapsed.
Click to expand it.
ontology-engine/graph-engine_2.11/src/main/scala/org/sunbird/graph/nodes/DataNode.scala
+
0
−
1
View file @
a3a5057a
...
...
@@ -14,7 +14,6 @@ import org.sunbird.graph.dac.model.{Filter, MetadataCriterion, Node, Relation, S
import
org.sunbird.graph.external.ExternalPropsManager
import
org.sunbird.graph.schema.DefinitionNode
import
org.sunbird.graph.service.operation.
{
GraphAsyncOperations
,
NodeAsyncOperations
,
SearchAsyncOperations
}
import
org.sunbird.graph.utils.ScalaJsonUtils
import
org.sunbird.parseq.Task
import
scala.collection.JavaConversions._
...
...
This diff is collapsed.
Click to expand it.
platform-modules/mimetype-manager/src/test/resources/h5p_valid_12_mb.h5p
deleted
100644 → 0
+
0
−
0
View file @
4f627d3c
File deleted
This diff is collapsed.
Click to expand it.
platform-modules/mimetype-manager/src/test/scala/org/sunbird/mimetype/mgr/impl/H5PMimeTypeMgrImplTest.scala
+
0
−
31
View file @
a3a5057a
...
...
@@ -68,37 +68,6 @@ class H5PMimeTypeMgrImplTest extends AsyncFlatSpec with Matchers with AsyncMockF
})
}
it
should
"upload valid H5P zip file less than 1mb and return public url"
in
{
val
node
=
getNode
()
val
identifier
=
"do_1234"
implicit
val
ss
=
new
StorageService
val
startTime
=
System
.
currentTimeMillis
()
val
resFuture
=
new
H5PMimeTypeMgrImpl
().
upload
(
identifier
,
node
,
new
File
(
Resources
.
getResource
(
"valid_h5p_content.h5p"
).
toURI
),
None
)
resFuture
.
map
(
result
=>
{
val
endTime
=
System
.
currentTimeMillis
()
assert
(
endTime
-
startTime
<
30000
)
assert
(
"do_1234"
==
result
.
getOrElse
(
"identifier"
,
""
))
assert
(
result
.
get
(
"artifactUrl"
)
!=
null
)
assert
(
result
.
get
(
"s3Key"
)
!=
null
)
assert
(
result
.
get
(
"size"
)
!=
null
)
})
}
it
should
"upload valid H5P zip file 12 mb and return public url"
in
{
val
node
=
getNode
()
val
identifier
=
"do_1234"
implicit
val
ss
=
new
StorageService
val
startTime
=
System
.
currentTimeMillis
()
val
resFuture
=
new
H5PMimeTypeMgrImpl
().
upload
(
identifier
,
node
,
new
File
(
Resources
.
getResource
(
"h5p_valid_12_mb.h5p"
).
toURI
),
None
)
resFuture
.
map
(
result
=>
{
val
endTime
=
System
.
currentTimeMillis
()
assert
(
endTime
-
startTime
<
30000
)
assert
(
"do_1234"
==
result
.
getOrElse
(
"identifier"
,
""
))
assert
(
result
.
get
(
"artifactUrl"
)
!=
null
)
assert
(
result
.
get
(
"s3Key"
)
!=
null
)
assert
(
result
.
get
(
"size"
)
!=
null
)
})
}
def
getNode
()
:
Node
=
{
val
node
=
new
Node
()
...
...
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