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
sunbird-lms-service
Commits
8f4c4de6
Unverified
Commit
8f4c4de6
authored
3 years ago
by
reshmi-nair
Committed by
GitHub
3 years ago
Browse files
Options
Download
Patches
Plain Diff
Merging from 3.9.0 to master (#820)
merge 3.9 to master
parent
20c76dee
No related merge requests found
Changes
25
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
actors/sunbird-lms-mw/actors/common/src/main/java/org/sunbird/learner/actors/search/SearchHandlerActor.java
+9
-0
...org/sunbird/learner/actors/search/SearchHandlerActor.java
actors/sunbird-lms-mw/actors/common/src/main/java/org/sunbird/learner/util/DataCacheHandler.java
+15
-3
.../main/java/org/sunbird/learner/util/DataCacheHandler.java
actors/sunbird-lms-mw/actors/common/src/main/java/org/sunbird/learner/util/FormApiUtil.java
+3
-1
...n/src/main/java/org/sunbird/learner/util/FormApiUtil.java
actors/sunbird-lms-mw/actors/common/src/main/java/org/sunbird/learner/util/Util.java
+6
-4
...s/common/src/main/java/org/sunbird/learner/util/Util.java
actors/sunbird-lms-mw/actors/common/src/test/java/org/sunbird/learner/actors/SearchHandlerActorTest.java
+1
-0
...va/org/sunbird/learner/actors/SearchHandlerActorTest.java
actors/sunbird-lms-mw/actors/common/src/test/java/org/sunbird/learner/util/FormApiUtilHandlerEmptyConfigTest.java
+2
-2
...nbird/learner/util/FormApiUtilHandlerEmptyConfigTest.java
actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/HttpClientUtil.java
+31
-5
...n/java/org/sunbird/common/models/util/HttpClientUtil.java
actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/JsonKey.java
+4
-0
...src/main/java/org/sunbird/common/models/util/JsonKey.java
actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/ProjectUtil.java
+1
-1
...main/java/org/sunbird/common/models/util/ProjectUtil.java
actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/src/main/resources/welcomeSmsTemplate.vm
+1
-2
...core/common-util/src/main/resources/welcomeSmsTemplate.vm
actors/sunbird-lms-mw/actors/sunbird-utils/sunbird-platform-core/common-util/src/test/java/org/sunbird/common/models/util/HttpClientUtilTest.java
+11
-11
...va/org/sunbird/common/models/util/HttpClientUtilTest.java
actors/sunbird-lms-mw/actors/user/src/main/java/org/sunbird/user/actors/UserBaseActor.java
+8
-3
.../src/main/java/org/sunbird/user/actors/UserBaseActor.java
actors/sunbird-lms-mw/actors/user/src/main/java/org/sunbird/user/actors/UserManagementActor.java
+64
-27
...ain/java/org/sunbird/user/actors/UserManagementActor.java
actors/sunbird-lms-mw/actors/user/src/main/java/org/sunbird/user/actors/UserMergeActor.java
+4
-33
...src/main/java/org/sunbird/user/actors/UserMergeActor.java
actors/sunbird-lms-mw/actors/user/src/main/java/org/sunbird/user/service/UserMergeService.java
+8
-0
.../main/java/org/sunbird/user/service/UserMergeService.java
actors/sunbird-lms-mw/actors/user/src/main/java/org/sunbird/user/service/UserProfileReadService.java
+2
-2
...java/org/sunbird/user/service/UserProfileReadService.java
actors/sunbird-lms-mw/actors/user/src/main/java/org/sunbird/user/service/impl/UserMergeServiceImpl.java
+63
-0
...a/org/sunbird/user/service/impl/UserMergeServiceImpl.java
actors/sunbird-lms-mw/actors/user/src/test/java/org/sunbird/user/UserManagementActorTest.java
+24
-2
...c/test/java/org/sunbird/user/UserManagementActorTest.java
actors/sunbird-lms-mw/actors/user/src/test/java/org/sunbird/user/UserManagementActorTestBase.java
+0
-1
...st/java/org/sunbird/user/UserManagementActorTestBase.java
actors/sunbird-lms-mw/actors/user/src/test/java/org/sunbird/user/service/UserMergeServiceImplTest.java
+14
-0
...va/org/sunbird/user/service/UserMergeServiceImplTest.java
with
271 additions
and
97 deletions
+271
-97
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
