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
efa507e7
Unverified
Commit
efa507e7
authored
3 years ago
by
Amit Priyadarshi
Committed by
GitHub
3 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #607 from krgauraw/4.0.0_SB-23804
Issue #SB-23804 fix: added enhancement for import api
parents
78543011
2784129d
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
knowlg-friday
knowlg-oneclick
local-setup-fix
local-setup-kube
m-4.2.0
master
master-data
org-target-enhancement
patch-1
patch-2
patch-3
poc_bulk_upload
qs-schema
rahul_bulk_upload_postgres
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
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
platform-modules/import-manager/src/main/scala/org/sunbird/object/importer/ImportManager.scala
+4
-1
...ain/scala/org/sunbird/object/importer/ImportManager.scala
with
4 additions
and
1 deletion
+4
-1
platform-modules/import-manager/src/main/scala/org/sunbird/object/importer/ImportManager.scala
+
4
−
1
View file @
efa507e7
...
...
@@ -32,7 +32,8 @@ class ImportManager(config: ImportConfig) {
throw
new
ClientException
(
ImportErrors
.
ERR_INVALID_IMPORT_REQUEST
,
ImportErrors
.
ERR_INVALID_IMPORT_REQUEST_MSG
)
else
if
(
CollectionUtils
.
isNotEmpty
(
reqList
)
&&
reqList
.
size
>
config
.
requestLimit
)
throw
new
ClientException
(
ImportErrors
.
ERR_REQUEST_LIMIT_EXCEED
,
ImportErrors
.
ERR_REQUEST_LIMIT_EXCEED_MSG
+
config
.
requestLimit
)
val
processId
:
String
=
UUID
.
randomUUID
().
toString
val
reqPid
=
request
.
getRequest
.
getOrDefault
(
ImportConstants
.
PROCESS_ID
,
""
).
asInstanceOf
[
String
]
val
processId
:
String
=
if
(
StringUtils
.
isNotBlank
(
reqPid
))
reqPid
else
UUID
.
randomUUID
().
toString
val
invalidCodes
:
util.List
[
String
]
=
new
util
.
ArrayList
[
String
]()
val
invalidStage
:
util.List
[
String
]
=
new
util
.
ArrayList
[
String
]()
validateAndGetRequest
(
reqList
,
processId
,
invalidCodes
,
invalidStage
,
request
).
map
(
objects
=>
{
...
...
@@ -68,6 +69,8 @@ class ImportManager(config: ImportConfig) {
if
(!
validateMetadata
(
finalMetadata
,
config
.
requiredProps
.
asJava
))
invalidCodes
.
add
(
finalMetadata
.
getOrDefault
(
ImportConstants
.
CODE
,
""
).
asInstanceOf
[
String
])
if
(!
validateStage
(
stage
,
config
.
validContentStage
.
asJava
))
invalidStages
.
add
(
finalMetadata
.
getOrDefault
(
ImportConstants
.
CODE
,
""
).
asInstanceOf
[
String
])
if
(
StringUtils
.
isBlank
(
finalMetadata
.
getOrDefault
(
ImportConstants
.
OBJECT_TYPE
,
""
).
asInstanceOf
[
String
]))
finalMetadata
.
put
(
ImportConstants
.
OBJECT_TYPE
,
request
.
getObjectType
)
obj
.
put
(
ImportConstants
.
METADATA
,
finalMetadata
)
obj
.
put
(
ImportConstants
.
ORIGIN_DATA
,
originData
)
obj
...
...
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