Skip to content

Address review comments. #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ImalshaD wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Address review comments. #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 12 additions & 27 deletions ...va/org/wso2/carbon/identity/api/server/configs/v1/core/ServerConfigManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2516,8 +2516,8 @@ public CompatibilitySettings getCompatibilitySettings() {
CompatibilitySetting setting = compatibilitySettingsService.getCompatibilitySettings(tenantDomain);
return CompatibilitySettingUtil.toCompatibilitySettings(setting);
} catch (CompatibilitySettingException e) {
throw handleCompatibilitySettingsError(e, Constants.ErrorMessage.ERROR_CODE_COMPATIBILITY_SETTINGS_RETRIEVE,
null);
throw CompatibilitySettingUtil.handleCompatibilitySettingsException(e,
Constants.ErrorMessage.ERROR_CODE_COMPATIBILITY_SETTINGS_RETRIEVE, null);
}
}

Expand All @@ -2536,8 +2536,8 @@ public CompatibilitySettings patchCompatibilitySettings(CompatibilitySettings co
compatibilitySettingsService.updateCompatibilitySettings(tenantDomain, setting);
return CompatibilitySettingUtil.toCompatibilitySettings(updatedSetting);
} catch (CompatibilitySettingException e) {
throw handleCompatibilitySettingsError(e, Constants.ErrorMessage.ERROR_CODE_COMPATIBILITY_SETTINGS_UPDATE,
null);
throw CompatibilitySettingUtil.handleCompatibilitySettingsException(e,
Constants.ErrorMessage.ERROR_CODE_COMPATIBILITY_SETTINGS_UPDATE, null);
}
}

Expand All @@ -2550,11 +2550,10 @@ public CompatibilitySettings patchCompatibilitySettings(CompatibilitySettings co
public CompatibilitySettingsGroup getCompatibilitySettingsByGroup(String settingGroup) {

if (!CompatibilitySettingUtil.isValidSettingGroupName(settingGroup)) {
throw handleCompatibilitySettingsError(
new IllegalArgumentException("Invalid setting group name: " + settingGroup),
throw CompatibilitySettingUtil.handleCompatibilitySettingsException(
Response.Status.BAD_REQUEST,
Constants.ErrorMessage.ERROR_CODE_INVALID_INPUT,
settingGroup
);
settingGroup);
}

try {
Expand All @@ -2563,30 +2562,16 @@ public CompatibilitySettingsGroup getCompatibilitySettingsByGroup(String setting
compatibilitySettingsService.getCompatibilitySettingsByGroup(tenantDomain, settingGroup);

if (!CompatibilitySettingUtil.hasSettingGroup(setting, settingGroup)) {
throw handleCompatibilitySettingsError(
new IllegalArgumentException("Setting group not found: " + settingGroup),
throw CompatibilitySettingUtil.handleCompatibilitySettingsException(
Response.Status.NOT_FOUND,
Constants.ErrorMessage.ERROR_CODE_SETTING_GROUP_NOT_FOUND,
settingGroup
);
settingGroup);
}

return CompatibilitySettingUtil.toCompatibilitySettingsGroup(setting, settingGroup);
} catch (CompatibilitySettingException e) {
throw handleCompatibilitySettingsError(e, Constants.ErrorMessage.ERROR_CODE_COMPATIBILITY_SETTINGS_RETRIEVE,
settingGroup);
throw CompatibilitySettingUtil.handleCompatibilitySettingsException(e,
Constants.ErrorMessage.ERROR_CODE_COMPATIBILITY_SETTINGS_RETRIEVE, settingGroup);
}
}

/**
* Handle compatibility settings errors.
*
* @param e Exception.
* @param errorEnum Error enum.
* @param data Additional data.
* @return APIError.
*/
private APIError handleCompatibilitySettingsError(Exception e, Constants.ErrorMessage errorEnum, String data) {

return CompatibilitySettingUtil.handleCompatibilitySettingsException(e, errorEnum, data);
}
}
26 changes: 19 additions & 7 deletions ...ava/org/wso2/carbon/identity/api/server/configs/v1/function/CompatibilitySettingUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,24 @@ public static APIError handleCompatibilitySettingsException(Exception e, Constan
return new APIError(status, errorResponse);
}

/**
* Build an APIError for compatibility settings flows where the HTTP status is known up-front
* (e.g., NOT_FOUND for a missing setting group or BAD_REQUEST for invalid input) and there is no
* underlying exception to extract details from.
*
* @param status HTTP response status.
* @param errorEnum Error Message enum.
* @param data Extra data.
* @return APIError.
*/
public static APIError handleCompatibilitySettingsException(Response.Status status,
Constants.ErrorMessage errorEnum,
String data) {
Comment thread
ImalshaD marked this conversation as resolved.
Comment on lines +212 to +214

ErrorResponse errorResponse = getErrorBuilder(errorEnum, data).build(LOG, errorEnum.description());
return new APIError(status, errorResponse);
Comment on lines +216 to +217
}

/**
* Return error builder with given error message enum and data.
*
Expand All @@ -223,12 +241,6 @@ private static ErrorResponse.Builder getErrorBuilder(Constants.ErrorMessage erro
*/
private static String includeData(Constants.ErrorMessage error, String data) {

String message;
if (StringUtils.isNotBlank(data)) {
message = String.format(error.description(), data);
} else {
message = error.description();
}
return message;
return StringUtils.isNotBlank(data) ? String.format(error.description(), data) : error.description();
}
}
Loading