Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
48246f1
cleanup: delete old elasticsearch utility implementation
chethann007 Jan 24, 2026
80679cb
feat: add rewritten standardized ES utility to core module
chethann007 Jan 24, 2026
c11c65e
build: integrate sunbird-es-utils into core module hierarchy
chethann007 Jan 24, 2026
4ff92a3
build: unregister legacy ES utils from service and add new ES utils t…
chethann007 Jan 24, 2026
2376e46
build: integrate standardized Elasticsearch utility and update module…
chethann007 Jan 24, 2026
5fc7ef9
feat: integrate course indices and add invalidData error handling in …
chethann007 Jan 24, 2026
6daad6a
feat: Update Elasticsearch health check to query multiple indices and…
chethann007 Jan 27, 2026
a86dfb5
refactor: extract telemetry utilities into new sunbird-event-utils mo…
chethann007 Jan 27, 2026
d2dbe47
refactor: remove legacy platform-common entries
chethann007 Feb 5, 2026
c355f4c
refactor: remove legacy sunbird-event-utils module
chethann007 Feb 5, 2026
a10248c
feat: implement unified sunbird-platform-common
chethann007 Feb 5, 2026
a437c2e
build: update project structure for sunbird-platform-common integration
chethann007 Feb 5, 2026
451bc7e
refactor(controller): update controllers and tests for unified sunbir…
chethann007 Feb 5, 2026
8d9bfb2
refactor(core): update actor-core and notification-utils for sunbird-…
chethann007 Feb 5, 2026
6ed20cf
refactor(service): update service layer for sunbird-platform-common i…
chethann007 Feb 5, 2026
fa24768
refactor(cassandra): update cassandra-utils and add unit tests
chethann007 Feb 5, 2026
e947af0
refactor(es-utils): update elasticsearch utilities and add unit tests
chethann007 Feb 5, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 12 additions & 9 deletions controller/app/controllers/BaseController.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,17 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.http.HttpHeaders;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.logging.LoggerUtil;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.HeaderParam;
import org.sunbird.request.RequestContext;
import org.sunbird.response.ClientErrorResponse;
import org.sunbird.response.Response;
import org.sunbird.telemetry.util.TelemetryEvents;
import org.sunbird.telemetry.util.TelemetryWriter;
import org.sunbird.util.ProjectUtil;
import org.sunbird.common.ProjectUtil;
import play.libs.Json;
import play.mvc.Controller;
import play.mvc.Http;
Expand Down Expand Up @@ -449,6 +449,9 @@ public static Response createResponseOnException(
response.setTs(ProjectUtil.getFormattedDate());
response.setResponseCode(ResponseCode.getResponseCodeByCode(exception.getErrorResponseCode()));
ResponseCode code = exception.getResponseCode();
if (code == null) {
code = ResponseCode.getResponseCodeByCode(exception.getErrorResponseCode());
}
if (code == null) {
code = ResponseCode.SERVER_ERROR;
}
Expand All @@ -470,36 +473,36 @@ private static void handleBackwardCompatibility(
Request request, ProjectCommonException exception, Response response) {
// This code is for backwards compatibility
if (request.path() != null && request.path().startsWith("/v1/otp/generate")) {
if ("errorRateLimitExceeded".equalsIgnoreCase(exception.getResponseCode().name())) {
if (exception.getResponseCode() != null && "errorRateLimitExceeded".equalsIgnoreCase(exception.getResponseCode().name())) {

Copilot AI Feb 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Multiple null checks for exception.getResponseCode() are repeated throughout this method. Consider extracting exception.getResponseCode() to a local variable at the beginning of the method to improve readability and avoid redundant method calls.

Copilot uses AI. Check for mistakes.
response.getParams().setErr("ERROR_RATE_LIMIT_EXCEEDED");
response.getParams().setStatus("ERROR_RATE_LIMIT_EXCEEDED");
}
}

if (request.path() != null
&& request.path().startsWith("/v1/otp/verify")
&& ("otpVerificationFailed".equalsIgnoreCase(exception.getResponseCode().name()))) {
&& (exception.getResponseCode() != null && "otpVerificationFailed".equalsIgnoreCase(exception.getResponseCode().name()))) {
response.getParams().setErr("OTP_VERIFICATION_FAILED");
response.getParams().setStatus("OTP_VERIFICATION_FAILED");
}

if (request.path() != null
&& (request.path().startsWith("/v1/manageduser/create")
|| request.path().startsWith("/v4/user/create"))
&& ("managedUserLimitExceeded".equalsIgnoreCase(exception.getResponseCode().name()))) {
&& (exception.getResponseCode() != null && "managedUserLimitExceeded".equalsIgnoreCase(exception.getResponseCode().name()))) {
response.getParams().setErr("MANAGED_USER_LIMIT_EXCEEDED");
response.getParams().setStatus("MANAGED_USER_LIMIT_EXCEEDED");
}

if (request.path() != null
&& (request.path().startsWith("/v1/user/consent/read"))
&& ("resourceNotFound".equalsIgnoreCase(exception.getResponseCode().name()))) {
&& (exception.getResponseCode() != null && "resourceNotFound".equalsIgnoreCase(exception.getResponseCode().name()))) {
response.getParams().setErr("USER_CONSENT_NOT_FOUND");
response.getParams().setStatus("USER_CONSENT_NOT_FOUND");
}
if (request.path() != null
&& (request.path().startsWith("/v1/user/get/"))
&& ("resourceNotFound".equalsIgnoreCase(exception.getResponseCode().name()))) {
&& (exception.getResponseCode() != null && "resourceNotFound".equalsIgnoreCase(exception.getResponseCode().name()))) {
response.getParams().setErr("USER_NOT_FOUND");
response.getParams().setStatus("USER_NOT_FOUND");
}
Expand All @@ -517,7 +520,7 @@ public static Response createResponseOnException(
response.setVer(getApiVersion(path));
response.setId(getApiResponseId(path, method));
response.setTs(ProjectUtil.getFormattedDate());
response.setResponseCode(exception.getResponseCode());
response.setResponseCode(exception.getResponseCode() != null ? exception.getResponseCode() : ResponseCode.getResponseCodeByCode(exception.getErrorResponseCode()));
ResponseCode code = exception.getResponseCode();
response.setParams(createResponseParamObj(code, exception.getMessage(), null));
return response;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.util.ProjectUtil;
import org.sunbird.common.ProjectUtil;
import play.libs.Files;
import play.mvc.Http;
import play.mvc.Http.MultipartFormData;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import javax.inject.Named;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.validators.BaseRequestValidator;
import play.mvc.Http;
import play.mvc.Result;

Expand Down
2 changes: 1 addition & 1 deletion controller/app/controllers/feed/FeedController.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
import com.typesafe.config.ConfigFactory;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.validators.BaseRequestValidator;

/** This call will validate the Feed API request */
public class FeedRequestValidator extends BaseRequestValidator {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
import javax.inject.Named;
import modules.SignalHandler;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.response.Response;
import org.sunbird.util.ProjectUtil;
import org.sunbird.common.ProjectUtil;
import play.mvc.Http;
import play.mvc.Result;
import util.Attrs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.sunbird.actor.location.validator.BaseLocationRequestValidator;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
import java.util.List;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.validators.BaseRequestValidator;

public class NoteRequestValidator extends BaseRequestValidator {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import javax.inject.Named;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.validator.RequestValidator;
import org.sunbird.validators.RequestValidator;
import play.mvc.Http;
import play.mvc.Result;
import util.Attrs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.validator.orgvalidator.KeyManagementValidator;
import org.sunbird.validators.orgvalidator.KeyManagementValidator;
import play.mvc.Http;
import play.mvc.Result;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.util.ProjectUtil;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.validator.orgvalidator.OrgRequestValidator;
import org.sunbird.common.ProjectUtil;
import org.sunbird.validators.BaseRequestValidator;
import org.sunbird.validators.orgvalidator.OrgRequestValidator;
import play.mvc.Http;
import play.mvc.Result;

Expand Down
2 changes: 1 addition & 1 deletion controller/app/controllers/otp/OtpController.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.exception.ResponseMessage;
import org.sunbird.response.ResponseCode;
import org.sunbird.response.ResponseMessage;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
import org.sunbird.util.ProjectUtil;
import org.sunbird.util.StringFormatter;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.common.ProjectUtil;
import org.sunbird.utils.StringFormatter;
import org.sunbird.validators.BaseRequestValidator;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
4 changes: 2 additions & 2 deletions controller/app/controllers/storage/FileStorageController.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import javax.inject.Named;
import org.apache.commons.io.IOUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.libs.Files;
import play.mvc.Http;
Expand Down
4 changes: 2 additions & 2 deletions controller/app/controllers/sync/SyncController.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import javax.inject.Named;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.validator.RequestValidator;
import org.sunbird.validators.RequestValidator;
import play.mvc.Http;
import play.mvc.Result;
import util.Attrs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import javax.inject.Named;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.validator.systemsettings.SystemSettingsRequestValidator;
import play.mvc.Http;
Expand Down
2 changes: 1 addition & 1 deletion controller/app/controllers/tac/UserTnCController.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
import java.text.MessageFormat;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
import org.sunbird.util.ProjectUtil;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.common.ProjectUtil;
import org.sunbird.validators.BaseRequestValidator;

public class UserTnCRequestValidator extends BaseRequestValidator {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import play.mvc.Http;
import play.mvc.Result;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.sunbird.exception.ProjectCommonException;
import org.sunbird.exception.ResponseCode;
import org.sunbird.response.ResponseCode;
import org.sunbird.keys.JsonKey;
import org.sunbird.request.Request;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.validators.BaseRequestValidator;

public class TenantPreferenceValidator extends BaseRequestValidator {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.validator.UserFreeUpRequestValidator;
import org.sunbird.validators.UserFreeUpRequestValidator;
import play.mvc.Http;
import play.mvc.Result;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
6 changes: 3 additions & 3 deletions controller/app/controllers/usermanagement/UserController.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import javax.inject.Named;
import org.sunbird.actor.user.validator.UserRequestValidator;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import org.sunbird.util.ProjectUtil;
import org.sunbird.validator.BaseRequestValidator;
import org.sunbird.common.ProjectUtil;
import org.sunbird.validators.BaseRequestValidator;
import play.mvc.Http;
import play.mvc.Result;
import util.Attrs;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.concurrent.CompletionStage;
import javax.inject.Inject;
import javax.inject.Named;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import play.mvc.Http;
import play.mvc.Result;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import javax.inject.Named;
import org.sunbird.actor.user.validator.UserRequestValidator;
import org.sunbird.keys.JsonKey;
import org.sunbird.operations.ActorOperations;
import org.sunbird.operations.userorg.ActorOperations;
import org.sunbird.request.Request;
import play.mvc.Http;
import play.mvc.Result;
Expand Down
Loading
Loading