-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merging release-3.7.0 to master
- Loading branch information
AMIT KUMAR
authored
Mar 8, 2021
1 parent
95b94c8
commit 1859ea8
Showing
45 changed files
with
523 additions
and
156 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
group-actors/src/main/java/org/sunbird/models/ClientErrorResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package org.sunbird.models; | ||
|
|
||
| import org.sunbird.exception.BaseException; | ||
| import org.sunbird.response.Response; | ||
|
|
||
| public class ClientErrorResponse extends Response { | ||
|
|
||
| private BaseException exception = null; | ||
|
|
||
| public ClientErrorResponse() {} | ||
|
|
||
| public BaseException getException() { | ||
| return exception; | ||
| } | ||
|
|
||
| public void setException(BaseException exception) { | ||
| this.exception = exception; | ||
| } | ||
| } |
52 changes: 52 additions & 0 deletions
52
group-actors/src/main/java/org/sunbird/models/EntryExitLogEvent.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package org.sunbird.models; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import org.sunbird.telemetry.JsonKey; | ||
|
|
||
| public class EntryExitLogEvent { | ||
| private String eid; | ||
|
|
||
| private Map<String, Object> edata = new HashMap<>(); | ||
|
|
||
| public String getEid() { | ||
| return eid; | ||
| } | ||
|
|
||
| public void setEid(String eid) { | ||
| this.eid = eid; | ||
| } | ||
|
|
||
| public Map<String, Object> getEdata() { | ||
| return edata; | ||
| } | ||
|
|
||
| public void setEdata( | ||
| String type, | ||
| String level, | ||
| String requestid, | ||
| String message, | ||
| List<Map<String, Object>> params, | ||
| Map<String, Object> context) { | ||
| this.edata.put(JsonKey.TYPE, type); | ||
| this.edata.put(JsonKey.LEVEL, level); | ||
| this.edata.put(JsonKey.REQUEST_ID, requestid); | ||
| this.edata.put(JsonKey.MESSAGE, message); | ||
| this.edata.put(JsonKey.PARAMS, params); | ||
| this.edata.put(JsonKey.CONTEXT, context); | ||
| } | ||
|
|
||
| public void setEdataParams(List<Map<String, Object>> params) { | ||
| this.edata.put(JsonKey.PARAMS, params); | ||
| } | ||
|
|
||
| public void setEdataContext(Map<String, Object> context) { | ||
| this.edata.put(JsonKey.CONTEXT, context); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "{" + "eid='" + eid + '\'' + ", edata=" + edata + '}'; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.