From b4c5d295f41487b7b609649340f6e5bc3208efe2 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Thu, 4 Dec 2025 09:50:39 +0530 Subject: [PATCH 1/2] feat: Introduce centralized error messages for improved consistency and maintainability across the codebase --- .../contentstack/cms/core/ErrorMessages.java | 51 +++++++++++++++++++ .../java/com/contentstack/cms/core/Util.java | 39 +++++++------- .../cms/organization/Organization.java | 4 +- .../com/contentstack/cms/stack/Alias.java | 6 ++- .../com/contentstack/cms/stack/Asset.java | 26 +++++----- .../com/contentstack/cms/stack/AuditLog.java | 4 +- .../com/contentstack/cms/stack/Branch.java | 4 +- .../contentstack/cms/stack/DeliveryToken.java | 4 +- .../com/contentstack/cms/stack/Entry.java | 4 +- .../contentstack/cms/stack/Environment.java | 6 ++- .../contentstack/cms/stack/Extensions.java | 4 +- .../contentstack/cms/stack/FileUploader.java | 4 +- .../com/contentstack/cms/stack/Folder.java | 4 +- .../contentstack/cms/stack/GlobalField.java | 4 +- .../com/contentstack/cms/stack/Label.java | 4 +- .../com/contentstack/cms/stack/Locale.java | 4 +- .../cms/stack/ManagementToken.java | 4 +- .../contentstack/cms/stack/PublishQueue.java | 4 +- .../com/contentstack/cms/stack/Release.java | 4 +- .../contentstack/cms/stack/ReleaseItem.java | 4 +- .../com/contentstack/cms/stack/Roles.java | 4 +- .../com/contentstack/cms/stack/Terms.java | 4 +- .../contentstack/cms/stack/VariantGroup.java | 4 +- .../com/contentstack/cms/stack/Webhook.java | 4 +- .../com/contentstack/cms/stack/Workflow.java | 6 ++- .../com/contentstack/cms/core/TestUtils.java | 4 +- 26 files changed, 156 insertions(+), 58 deletions(-) create mode 100644 src/main/java/com/contentstack/cms/core/ErrorMessages.java diff --git a/src/main/java/com/contentstack/cms/core/ErrorMessages.java b/src/main/java/com/contentstack/cms/core/ErrorMessages.java new file mode 100644 index 00000000..89b64cdc --- /dev/null +++ b/src/main/java/com/contentstack/cms/core/ErrorMessages.java @@ -0,0 +1,51 @@ +package com.contentstack.cms.core; + +public final class ErrorMessages { + + private ErrorMessages() { + throw new AssertionError("This class cannot be instantiated. Use the static constants to continue."); + } + + public static final String NOT_LOGGED_IN = "You are not logged in. Login to continue."; + public static final String ALREADY_LOGGED_IN = "Operation not allowed. You are already logged in."; + public static final String OAUTH_LOGIN_REQUIRED = "Login or configure OAuth to continue."; + public static final String OAUTH_NO_TOKENS = "No OAuth tokens available. Please authenticate first."; + public static final String OAUTH_NO_REFRESH_TOKEN = "No refresh token available"; + public static final String OAUTH_EMPTY_CODE = "Authorization code cannot be null or empty"; + public static final String OAUTH_CONFIG_MISSING = "OAuth is not configured. Use Builder.setOAuth() with or without clientSecret for PKCE flow"; + public static final String OAUTH_REFRESH_FAILED = "Failed to refresh access token"; + public static final String OAUTH_REVOKE_FAILED = "Failed to revoke authorization"; + public static final String OAUTH_STATUS_FAILED = "Failed to get authorization status"; + public static final String OAUTH_ORG_EMPTY = "organizationUid can not be empty"; + + public static final String PRIVATE_CONSTRUCTOR = "This class cannot be instantiated. Use the static methods to continue."; + public static final String PRIVATE_CONSTRUCTOR_DETAILED = "This private constructor cannot be accessed outside the class. Use the public methods instead."; + + public static final String ASSET_UID_REQUIRED = "Asset UID is required. Provide a valid Asset UID and try again."; + public static final String LOG_ITEM_UID_REQUIRED = "Log Item UID is required. Provide a valid Log Item UID and try again."; + public static final String BRANCH_UID_REQUIRED = "Branch UID is required. Provide a valid Branch UID and try again."; + public static final String CUSTOM_FIELD_UID_REQUIRED = "Custom Field UID is required. Provide a valid Custom Field UID and try again."; + public static final String DELIVERY_TOKEN_UID_REQUIRED = "Delivery Token UID is required. Provide a valid Delivery Token UID and try again."; + public static final String ENVIRONMENT_REQUIRED = "Environment is required. Provide a valid Environment and try again."; + public static final String FOLDER_UID_REQUIRED = "Folder UID is required. Provide a valid Folder UID and try again."; + public static final String GLOBAL_FIELD_UID_REQUIRED = "Global Field UID is required. Provide a valid Global Field UID and try again."; + public static final String LABEL_UID_REQUIRED = "Label UID is required. Provide a valid Label UID and try again."; + public static final String LOCALE_CODE_REQUIRED = "Locale Code is required. Provide a valid Locale Code and try again."; + public static final String MANAGEMENT_TOKEN_UID_REQUIRED = "Management Token UID is required. Provide a valid Management Token UID and try again."; + public static final String ORGANIZATION_UID_REQUIRED = "Organization UID is required. Provide a valid Organization UID and try again."; + public static final String PUBLISH_QUEUE_UID_REQUIRED = "Publish Queue UID is required. Provide a valid Publish Queue UID and try again."; + public static final String RELEASE_UID_REQUIRED = "Release UID is required. Provide a valid Release UID and try again."; + public static final String ROLE_UID_REQUIRED = "Role UID is required. Provide a valid Role UID and try again."; + public static final String VARIANT_GROUP_UID_REQUIRED = "Variant Group UID is required. Provide a valid Variant Group UID and try again."; + public static final String WEBHOOK_UID_REQUIRED = "Webhook UID is required. Provide a valid Webhook UID and try again."; + public static final String WORKFLOW_UID_REQUIRED = "Workflow UID is required. Provide a valid Workflow UID and try again."; + + public static final String CONTENT_TYPE_REQUIRED = "Content Type is required. Provide a valid Content Type and try again."; + public static final String REFERENCE_FIELDS_INVALID = "Reference Fields must be a string or an array of strings. Provide valid values and try again."; + public static final String TERM_STRING_REQUIRED = "Term String is required. Provide a valid Term String and try again."; + + public static final String FILE_CONTENT_TYPE_UNKNOWN = "The file's content type could not be determined. Provide a valid file and try again."; + + public static final String MISSING_INSTALLATION_ID = "installation uid is required"; + public static final String MISSING_ORG_ID = "organization uid is required"; +} diff --git a/src/main/java/com/contentstack/cms/core/Util.java b/src/main/java/com/contentstack/cms/core/Util.java index a07b302e..f3434201 100644 --- a/src/main/java/com/contentstack/cms/core/Util.java +++ b/src/main/java/com/contentstack/cms/core/Util.java @@ -20,7 +20,7 @@ public class Util { // "1.2.0". public static final String SDK_VERSION = "1.3.1"; - static final String PRIVATE_CONSTRUCTOR = "private constructor can't be accessed outside the class"; + static final String PRIVATE_CONSTRUCTOR = ErrorMessages.PRIVATE_CONSTRUCTOR; public static final Boolean RETRY_ON_FAILURE = true; public static final String PROTOCOL = "https"; public static final String HOST = "api.contentstack.io"; @@ -28,11 +28,10 @@ public class Util { public static final String VERSION = "v3"; public static final int TIMEOUT = 30; public static final String SDK_NAME = "contentstack-management-java"; - public static final String ILLEGAL_USER = "Please Login to access stack instance"; - public static final String USER_ALREADY_LOGGED_IN = "User is already loggedIn, " - + "Please logout then try to login again"; - public static final String LOGIN_FLAG = "Please login to access user instance"; - public static final String PLEASE_LOGIN = "Please Login to access stack instance"; + public static final String ILLEGAL_USER = ErrorMessages.NOT_LOGGED_IN; + public static final String USER_ALREADY_LOGGED_IN = ErrorMessages.ALREADY_LOGGED_IN; + public static final String LOGIN_FLAG = ErrorMessages.NOT_LOGGED_IN; + public static final String PLEASE_LOGIN = ErrorMessages.NOT_LOGGED_IN; // CONSTANT KEYS public static final String API_KEY = "api_key"; @@ -47,9 +46,9 @@ public class Util { public static final String CONTENT_TYPE_VALUE = "application/json"; // Error Messages - public static final String MISSING_INSTALLATION_ID = "installation uid is required"; - public static final String ERROR_INSTALLATION = "installation uid is required"; - public static final String MISSING_ORG_ID = "organization uid is required"; + public static final String MISSING_INSTALLATION_ID = ErrorMessages.MISSING_INSTALLATION_ID; + public static final String ERROR_INSTALLATION = ErrorMessages.MISSING_INSTALLATION_ID; + public static final String MISSING_ORG_ID = ErrorMessages.MISSING_ORG_ID; // OAuth Constants public static final String OAUTH_APP_HOST = "app.contentstack.com"; @@ -58,15 +57,15 @@ public class Util { public static final String OAUTH_AUTHORIZE_ENDPOINT = "/#!/apps/%s/authorize"; // OAuth Error Messages - public static final String OAUTH_NO_TOKENS = "No OAuth tokens available. Please authenticate first."; - public static final String OAUTH_NO_REFRESH_TOKEN = "No refresh token available"; - public static final String OAUTH_EMPTY_CODE = "Authorization code cannot be null or empty"; - public static final String OAUTH_CONFIG_MISSING = "OAuth is not configured. Use Builder.setOAuth() with or without clientSecret for PKCE flow"; - public static final String OAUTH_REFRESH_FAILED = "Failed to refresh access token"; - public static final String OAUTH_REVOKE_FAILED = "Failed to revoke authorization"; - public static final String OAUTH_STATUS_FAILED = "Failed to get authorization status"; - public static final String OAUTH_LOGIN_REQUIRED = "Please login or configure OAuth to access"; - public static final String OAUTH_ORG_EMPTY = "organizationUid can not be empty"; + public static final String OAUTH_NO_TOKENS = ErrorMessages.OAUTH_NO_TOKENS; + public static final String OAUTH_NO_REFRESH_TOKEN = ErrorMessages.OAUTH_NO_REFRESH_TOKEN; + public static final String OAUTH_EMPTY_CODE = ErrorMessages.OAUTH_EMPTY_CODE; + public static final String OAUTH_CONFIG_MISSING = ErrorMessages.OAUTH_CONFIG_MISSING; + public static final String OAUTH_REFRESH_FAILED = ErrorMessages.OAUTH_REFRESH_FAILED; + public static final String OAUTH_REVOKE_FAILED = ErrorMessages.OAUTH_REVOKE_FAILED; + public static final String OAUTH_STATUS_FAILED = ErrorMessages.OAUTH_STATUS_FAILED; + public static final String OAUTH_LOGIN_REQUIRED = ErrorMessages.OAUTH_LOGIN_REQUIRED; + public static final String OAUTH_ORG_EMPTY = ErrorMessages.OAUTH_ORG_EMPTY; // The code `Util() throws IllegalAccessException` is a constructor for the // `Util` class that throws an @@ -76,7 +75,7 @@ public class Util { // `IllegalAccessException` is to prevent // the instantiation of the `Util` class from outside the class itself. Util() throws IllegalAccessException { - throw new IllegalAccessException("private=modifier"); + throw new IllegalAccessException(ErrorMessages.PRIVATE_CONSTRUCTOR_DETAILED); } /** @@ -109,7 +108,7 @@ public static void nullEmptyThrowsException(@NotNull String field) { try { throw new CMARuntimeException(field + " cannot take in an empty String or null value"); } catch (CMARuntimeException e) { - System.out.println("Exception: " + e.getLocalizedMessage()); + System.out.println("An error occurred due to " + e.getLocalizedMessage() + "."); } } diff --git a/src/main/java/com/contentstack/cms/organization/Organization.java b/src/main/java/com/contentstack/cms/organization/Organization.java index dfdae44d..58321d3e 100644 --- a/src/main/java/com/contentstack/cms/organization/Organization.java +++ b/src/main/java/com/contentstack/cms/organization/Organization.java @@ -1,5 +1,7 @@ package com.contentstack.cms.organization; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -26,7 +28,7 @@ public class Organization implements BaseImplementation { protected HashMap headers; protected HashMap params; private String organizationUid; - final String ERROR_MSG = "OrganizationUid Can Not Be Null OR Empty"; + final String ERROR_MSG = ErrorMessages.ORGANIZATION_UID_REQUIRED; /** diff --git a/src/main/java/com/contentstack/cms/stack/Alias.java b/src/main/java/com/contentstack/cms/stack/Alias.java index c074fc1d..499e1275 100644 --- a/src/main/java/com/contentstack/cms/stack/Alias.java +++ b/src/main/java/com/contentstack/cms/stack/Alias.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -160,7 +162,7 @@ public Call find() { * @since 2022-10-20 */ public Call fetch() { - Objects.requireNonNull(this.uid, "Global Field Uid can not be null or empty"); + Objects.requireNonNull(this.uid, "ErrorMessages.GLOBAL_FIELD_UID_REQUIRED"); return this.service.single(this.headers, this.uid); } @@ -206,7 +208,7 @@ public Call update(@NotNull JSONObject body) { * @since 2022-10-20 */ public Call delete() { - Objects.requireNonNull(this.uid, "Global Field Uid can not be null or empty"); + Objects.requireNonNull(this.uid, "ErrorMessages.GLOBAL_FIELD_UID_REQUIRED"); return this.service.delete(this.headers, this.uid, this.params); } diff --git a/src/main/java/com/contentstack/cms/stack/Asset.java b/src/main/java/com/contentstack/cms/stack/Asset.java index a2ee4a1c..c0502978 100644 --- a/src/main/java/com/contentstack/cms/stack/Asset.java +++ b/src/main/java/com/contentstack/cms/stack/Asset.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.MediaType; import okhttp3.MultipartBody; @@ -225,12 +227,12 @@ public Call findAsPojo() { * @since 2022-10-20 */ public Call fetch() { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.single(this.headers, this.assetUid, this.params); } public Call fetchAsPojo() { // New method for POJO conversion - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.singlePojo(this.headers, this.assetUid, this.params); } @@ -390,7 +392,7 @@ private MultipartBody createMultipartBody(String filePath, String parentUid, Str * @since 2022-10-20 */ public Call replace(@NotNull String filePath, @NotNull String description) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); MultipartBody.Part assetPath = uploadFile(filePath); RequestBody body = RequestBody.create(Objects.requireNonNull(MediaType.parse(String.valueOf(MultipartBody.FORM))), description); return this.service.replace(this.headers, this.assetUid, assetPath, body, this.params); @@ -443,7 +445,7 @@ private MultipartBody.Part uploadFile(@NotNull String filePath) { * @since 2022-10-20 */ public Call generatePermanentUrl(JSONObject body) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.generatePermanentUrl(this.headers, this.assetUid, body); } @@ -473,7 +475,7 @@ public Call generatePermanentUrl(JSONObject body) { * @since 2022-10-20 */ public Call getPermanentUrl(String slugUrl) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.downloadPermanentUrl(this.headers, this.assetUid, slugUrl, this.params); } @@ -490,7 +492,7 @@ public Call getPermanentUrl(String slugUrl) { * @since 0.1.0 */ public Call delete() { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.delete(this.headers, this.assetUid); } @@ -580,7 +582,7 @@ public Call setVersionName(int versionNumber, * @since 0.1.0 */ public Call getVersionNameDetails() { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.getVersionNameDetails(this.headers, this.assetUid, this.params); } @@ -601,7 +603,7 @@ public Call getVersionNameDetails() { * @since 0.1.0 */ public Call deleteVersionName(int versionNumber) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.deleteVersionName(this.headers, this.assetUid, versionNumber); } @@ -618,7 +620,7 @@ public Call deleteVersionName(int versionNumber) { * @since 0.1.0 */ public Call getReferences() { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.getReferences(this.headers, this.assetUid); } @@ -676,7 +678,7 @@ public Call getByType(@NotNull String assetType) { * @since 0.1.0 */ public Call updateDetails(JSONObject requestBody) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.updateDetails(this.headers, this.assetUid, this.params, requestBody); } @@ -702,7 +704,7 @@ public Call updateDetails(JSONObject requestBody) { * @since 0.1.0 */ public Call publish(@NotNull JSONObject requestBody) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.publish(this.headers, this.assetUid, requestBody); } @@ -728,7 +730,7 @@ public Call publish(@NotNull JSONObject requestBody) { */ public Call unpublish( @NotNull JSONObject requestBody) { - Objects.requireNonNull(this.assetUid, "Asset Uid Can Not Be Null OR Empty"); + Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); return this.service.unpublish(this.headers, this.assetUid, requestBody); } diff --git a/src/main/java/com/contentstack/cms/stack/AuditLog.java b/src/main/java/com/contentstack/cms/stack/AuditLog.java index d7ce42d3..2ff0c188 100644 --- a/src/main/java/com/contentstack/cms/stack/AuditLog.java +++ b/src/main/java/com/contentstack/cms/stack/AuditLog.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -112,7 +114,7 @@ public Call find() { * @return Call */ public Call fetch() { - Objects.requireNonNull(this.logItemUid, "Log Item uid can not be null or empty"); + Objects.requireNonNull(this.logItemUid, "ErrorMessages.LOG_ITEM_UID_REQUIRED"); return this.service.fetch(this.headers, this.logItemUid); } diff --git a/src/main/java/com/contentstack/cms/stack/Branch.java b/src/main/java/com/contentstack/cms/stack/Branch.java index f4572d57..fdf93b52 100644 --- a/src/main/java/com/contentstack/cms/stack/Branch.java +++ b/src/main/java/com/contentstack/cms/stack/Branch.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -53,7 +55,7 @@ protected Branch(Retrofit instance,Map headers, String uid) { } void validate() { - final String ERROR_MESSAGE = "The Branch UID Can Not Be Null ORr Empty"; + final String ERROR_MESSAGE = ErrorMessages.BRANCH_UID_REQUIRED; Objects.requireNonNull(this.baseBranchId, ERROR_MESSAGE); if (this.baseBranchId.isEmpty()) throw new IllegalStateException(ERROR_MESSAGE); diff --git a/src/main/java/com/contentstack/cms/stack/DeliveryToken.java b/src/main/java/com/contentstack/cms/stack/DeliveryToken.java index f0aa8cc5..7e5e6d8e 100644 --- a/src/main/java/com/contentstack/cms/stack/DeliveryToken.java +++ b/src/main/java/com/contentstack/cms/stack/DeliveryToken.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -30,7 +32,7 @@ public class DeliveryToken implements BaseImplementation { protected HashMap headers; protected HashMap params; private String tokenUid; - String ERROR = "Token UID Can Not Be Null OR Empty"; + String ERROR = ErrorMessages.DELIVERY_TOKEN_UID_REQUIRED; protected DeliveryToken(TokenService service, Map headers) { this.headers = new HashMap<>(); diff --git a/src/main/java/com/contentstack/cms/stack/Entry.java b/src/main/java/com/contentstack/cms/stack/Entry.java index 818229a9..1f74c5dc 100644 --- a/src/main/java/com/contentstack/cms/stack/Entry.java +++ b/src/main/java/com/contentstack/cms/stack/Entry.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -145,7 +147,7 @@ public Call includeReference(@NotNull Object referenceField){ if (referenceField instanceof String || referenceField instanceof String[]) { addToParams("include[]", referenceField); } else { - throw new IllegalArgumentException("Reference fields must be a String or an array of Strings"); + throw new IllegalArgumentException(ErrorMessages.REFERENCE_FIELDS_INVALID); } validateCT(); return this.service.fetch(this.headers, this.contentTypeUid, this.params); diff --git a/src/main/java/com/contentstack/cms/stack/Environment.java b/src/main/java/com/contentstack/cms/stack/Environment.java index 8ef0c9d2..e2e16841 100644 --- a/src/main/java/com/contentstack/cms/stack/Environment.java +++ b/src/main/java/com/contentstack/cms/stack/Environment.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -43,10 +45,10 @@ protected Environment(Retrofit instance, Map headers, String env } void validate() { - String ERROR = "Environment Can Not Be Null OR Empty"; + String ERROR = ErrorMessages.ENVIRONMENT_REQUIRED; Objects.requireNonNull(this.environment, ERROR); if (this.environment.isEmpty()) - throw new IllegalStateException("Environment can not be null or empty"); + throw new IllegalStateException(ErrorMessages.ENVIRONMENT_REQUIRED); } /** diff --git a/src/main/java/com/contentstack/cms/stack/Extensions.java b/src/main/java/com/contentstack/cms/stack/Extensions.java index 437c8cab..f1d619c1 100644 --- a/src/main/java/com/contentstack/cms/stack/Extensions.java +++ b/src/main/java/com/contentstack/cms/stack/Extensions.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import com.contentstack.cms.core.Util; import okhttp3.RequestBody; @@ -53,7 +55,7 @@ protected Extensions(Retrofit retrofit,Map headers, String field void validate() { if (this.customFieldUid == null || this.customFieldUid.isEmpty()) - throw new IllegalAccessError("Custom Field UID Can Not Be Null OR Empty"); + throw new IllegalAccessError(ErrorMessages.CUSTOM_FIELD_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/FileUploader.java b/src/main/java/com/contentstack/cms/stack/FileUploader.java index 84cd9f30..522b5328 100644 --- a/src/main/java/com/contentstack/cms/stack/FileUploader.java +++ b/src/main/java/com/contentstack/cms/stack/FileUploader.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import okhttp3.MediaType; import okhttp3.MultipartBody; import okhttp3.RequestBody; @@ -81,7 +83,7 @@ private String getContentType(File file) { javax.activation.MimetypesFileTypeMap m = new javax.activation.MimetypesFileTypeMap(source.toString()); return m.getContentType(file); } catch (IOException e) { - throw new RuntimeException("Failed to determine content type of file", e); + throw new RuntimeException(ErrorMessages.FILE_CONTENT_TYPE_UNKNOWN, e); } } diff --git a/src/main/java/com/contentstack/cms/stack/Folder.java b/src/main/java/com/contentstack/cms/stack/Folder.java index a249b598..1a89438f 100644 --- a/src/main/java/com/contentstack/cms/stack/Folder.java +++ b/src/main/java/com/contentstack/cms/stack/Folder.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -35,7 +37,7 @@ protected Folder(Retrofit instance,Map headers, String folderUid void validate() { if (this.folderUid == null || this.folderUid.isEmpty()) - throw new IllegalAccessError("Folder uid uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.FOLDER_UID_REQUIRED); } /** diff --git a/src/main/java/com/contentstack/cms/stack/GlobalField.java b/src/main/java/com/contentstack/cms/stack/GlobalField.java index 681e2e16..6f05371a 100644 --- a/src/main/java/com/contentstack/cms/stack/GlobalField.java +++ b/src/main/java/com/contentstack/cms/stack/GlobalField.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -55,7 +57,7 @@ protected GlobalField(Retrofit retrofit,Map headers, String uid) void validate() { if (this.globalFiledUid == null) - throw new IllegalAccessError("Global Field Uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.GLOBAL_FIELD_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/Label.java b/src/main/java/com/contentstack/cms/stack/Label.java index d6b3943c..e550b041 100644 --- a/src/main/java/com/contentstack/cms/stack/Label.java +++ b/src/main/java/com/contentstack/cms/stack/Label.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -50,7 +52,7 @@ protected Label(Retrofit retrofit,Map headers, String labelUid) void validate() { if (this.labelUid == null || this.labelUid.isEmpty()) - throw new IllegalAccessError("Label Uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.LABEL_UID_REQUIRED); } @Override diff --git a/src/main/java/com/contentstack/cms/stack/Locale.java b/src/main/java/com/contentstack/cms/stack/Locale.java index e8231b09..64946e66 100644 --- a/src/main/java/com/contentstack/cms/stack/Locale.java +++ b/src/main/java/com/contentstack/cms/stack/Locale.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -54,7 +56,7 @@ public Locale(Retrofit client,Map headers, String code) { } void validate() { - if (this.code == null) throw new IllegalAccessError("The Locale Code Can Not Be Null OR Empty"); + if (this.code == null) throw new IllegalAccessError(ErrorMessages.LOCALE_CODE_REQUIRED); } /** diff --git a/src/main/java/com/contentstack/cms/stack/ManagementToken.java b/src/main/java/com/contentstack/cms/stack/ManagementToken.java index dda8a3eb..a8a12ec6 100644 --- a/src/main/java/com/contentstack/cms/stack/ManagementToken.java +++ b/src/main/java/com/contentstack/cms/stack/ManagementToken.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -42,7 +44,7 @@ protected ManagementToken(TokenService service,Map headers, Stri void validate() { if (this.tokenUid == null || this.tokenUid.isEmpty()) - throw new IllegalAccessError("Token uid Can Not Be Null OR Empty"); + throw new IllegalAccessError(ErrorMessages.MANAGEMENT_TOKEN_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/PublishQueue.java b/src/main/java/com/contentstack/cms/stack/PublishQueue.java index 0da7c651..9873a3ec 100644 --- a/src/main/java/com/contentstack/cms/stack/PublishQueue.java +++ b/src/main/java/com/contentstack/cms/stack/PublishQueue.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -64,7 +66,7 @@ protected PublishQueue(Retrofit retrofit,Map headers, String uid void validate() { if (this.publishQueueUid == null || this.publishQueueUid.isEmpty()) - throw new IllegalAccessError("Publish Queue Uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.PUBLISH_QUEUE_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/Release.java b/src/main/java/com/contentstack/cms/stack/Release.java index bba9bbdb..6c53a390 100644 --- a/src/main/java/com/contentstack/cms/stack/Release.java +++ b/src/main/java/com/contentstack/cms/stack/Release.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -58,7 +60,7 @@ protected Release(Retrofit retrofit,Map headers, String uid) { void validate() { if (this.releaseUid == null || this.releaseUid.isEmpty()) - throw new IllegalAccessError("Release Uid Can Not Be Null OR Empty"); + throw new IllegalAccessError(ErrorMessages.RELEASE_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/ReleaseItem.java b/src/main/java/com/contentstack/cms/stack/ReleaseItem.java index 8dbf44f7..00ff92d9 100644 --- a/src/main/java/com/contentstack/cms/stack/ReleaseItem.java +++ b/src/main/java/com/contentstack/cms/stack/ReleaseItem.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -40,7 +42,7 @@ protected ReleaseItem(Retrofit retrofit, Map headers, String rel void validate() { if (this.releaseUid == null || this.releaseUid.isEmpty()) - throw new IllegalAccessError("Release Uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.RELEASE_UID_REQUIRED); } /** diff --git a/src/main/java/com/contentstack/cms/stack/Roles.java b/src/main/java/com/contentstack/cms/stack/Roles.java index a3a51404..9d10ac6e 100644 --- a/src/main/java/com/contentstack/cms/stack/Roles.java +++ b/src/main/java/com/contentstack/cms/stack/Roles.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -45,7 +47,7 @@ protected Roles(Retrofit retrofit,Map headers, String roleUid) { void validate() { if (this.roleUid == null || this.roleUid.isEmpty()) - throw new IllegalAccessError("Role uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.ROLE_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/Terms.java b/src/main/java/com/contentstack/cms/stack/Terms.java index e9e2a154..8f3a3a0c 100644 --- a/src/main/java/com/contentstack/cms/stack/Terms.java +++ b/src/main/java/com/contentstack/cms/stack/Terms.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -289,7 +291,7 @@ public Call reorder(@NotNull String termUid, @NotNull JSONObject b */ public Call search(@NotNull String termString) { if (termString.isEmpty()) { - throw new IllegalArgumentException("termString must not be empty"); + throw new IllegalArgumentException(ErrorMessages.TERM_STRING_REQUIRED); } return this.taxonomyService.searchTerm(this.headers, termString); } diff --git a/src/main/java/com/contentstack/cms/stack/VariantGroup.java b/src/main/java/com/contentstack/cms/stack/VariantGroup.java index 17b2f557..87b8dc03 100644 --- a/src/main/java/com/contentstack/cms/stack/VariantGroup.java +++ b/src/main/java/com/contentstack/cms/stack/VariantGroup.java @@ -1,4 +1,6 @@ package com.contentstack.cms.stack; + +import com.contentstack.cms.core.ErrorMessages; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -69,7 +71,7 @@ protected VariantGroup(Retrofit instance, Map headers, String va */ void validate() { if (this.variantGroupUid == null || this.variantGroupUid.isEmpty()) - throw new IllegalAccessError("Variant group uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.VARIANT_GROUP_UID_REQUIRED); } /** diff --git a/src/main/java/com/contentstack/cms/stack/Webhook.java b/src/main/java/com/contentstack/cms/stack/Webhook.java index d360ffbe..c2034e2c 100644 --- a/src/main/java/com/contentstack/cms/stack/Webhook.java +++ b/src/main/java/com/contentstack/cms/stack/Webhook.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import com.contentstack.cms.core.Util; import okhttp3.MediaType; @@ -56,7 +58,7 @@ protected Webhook(Retrofit retrofit,Map headers, String uid) { void validate() { if (this.webhookUid == null || this.webhookUid.isEmpty()) - throw new IllegalAccessError("Webhook uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.WEBHOOK_UID_REQUIRED); } diff --git a/src/main/java/com/contentstack/cms/stack/Workflow.java b/src/main/java/com/contentstack/cms/stack/Workflow.java index c43fde9e..a62d9d92 100644 --- a/src/main/java/com/contentstack/cms/stack/Workflow.java +++ b/src/main/java/com/contentstack/cms/stack/Workflow.java @@ -1,5 +1,7 @@ package com.contentstack.cms.stack; +import com.contentstack.cms.core.ErrorMessages; + import com.contentstack.cms.BaseImplementation; import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; @@ -49,7 +51,7 @@ protected Workflow(Retrofit retrofit,Map headers, @NotNull Strin void validate() { if (this.workflowUid == null || this.workflowUid.isEmpty()) - throw new IllegalAccessError("Workflow uid can not be null or empty"); + throw new IllegalAccessError(ErrorMessages.WORKFLOW_UID_REQUIRED); } @@ -375,7 +377,7 @@ public Call fetchPublishRule(@NotNull String ruleUid) { */ public Call fetchPublishRuleContentType(@NotNull String contentTypeUid) { if (contentTypeUid.isEmpty()) { - throw new IllegalArgumentException("Content Type can not be empty"); + throw new IllegalArgumentException(ErrorMessages.CONTENT_TYPE_REQUIRED); } return this.service.fetchPublishRuleContentType(this.headers, contentTypeUid, this.params); } diff --git a/src/test/java/com/contentstack/cms/core/TestUtils.java b/src/test/java/com/contentstack/cms/core/TestUtils.java index 4dd0ccb0..76befd90 100644 --- a/src/test/java/com/contentstack/cms/core/TestUtils.java +++ b/src/test/java/com/contentstack/cms/core/TestUtils.java @@ -1,5 +1,7 @@ package com.contentstack.cms.core; +import static com.contentstack.cms.core.ErrorMessages.PRIVATE_CONSTRUCTOR; + import org.jetbrains.annotations.Contract; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Tag; @@ -61,7 +63,7 @@ void testAssertionError() { Util.assertionError(); } catch (AssertionError e) { Assertions.assertEquals( - "private constructor can't be accessed outside the class", + PRIVATE_CONSTRUCTOR, e.getMessage()); } } From 306f774319efd63a389f7591a1a88bdff3f71303 Mon Sep 17 00:00:00 2001 From: reeshika-h Date: Thu, 4 Dec 2025 10:12:23 +0530 Subject: [PATCH 2/2] refactor: Update error message handling in Alias, Asset, and AuditLog classes to use centralized error messages for consistency --- .../contentstack/cms/core/ErrorMessages.java | 2 +- .../java/com/contentstack/cms/core/Util.java | 2 +- .../com/contentstack/cms/stack/Alias.java | 19 ++++++++------- .../com/contentstack/cms/stack/Asset.java | 24 +++++++++---------- .../com/contentstack/cms/stack/AuditLog.java | 2 +- .../com/contentstack/cms/core/TestUtils.java | 2 +- 6 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/contentstack/cms/core/ErrorMessages.java b/src/main/java/com/contentstack/cms/core/ErrorMessages.java index 89b64cdc..477809fa 100644 --- a/src/main/java/com/contentstack/cms/core/ErrorMessages.java +++ b/src/main/java/com/contentstack/cms/core/ErrorMessages.java @@ -19,8 +19,8 @@ private ErrorMessages() { public static final String OAUTH_ORG_EMPTY = "organizationUid can not be empty"; public static final String PRIVATE_CONSTRUCTOR = "This class cannot be instantiated. Use the static methods to continue."; - public static final String PRIVATE_CONSTRUCTOR_DETAILED = "This private constructor cannot be accessed outside the class. Use the public methods instead."; + public static final String ALIAS_UID_REQUIRED = "Alias UID is required. Provide a valid Alias UID and try again."; public static final String ASSET_UID_REQUIRED = "Asset UID is required. Provide a valid Asset UID and try again."; public static final String LOG_ITEM_UID_REQUIRED = "Log Item UID is required. Provide a valid Log Item UID and try again."; public static final String BRANCH_UID_REQUIRED = "Branch UID is required. Provide a valid Branch UID and try again."; diff --git a/src/main/java/com/contentstack/cms/core/Util.java b/src/main/java/com/contentstack/cms/core/Util.java index f3434201..9e2d5130 100644 --- a/src/main/java/com/contentstack/cms/core/Util.java +++ b/src/main/java/com/contentstack/cms/core/Util.java @@ -75,7 +75,7 @@ public class Util { // `IllegalAccessException` is to prevent // the instantiation of the `Util` class from outside the class itself. Util() throws IllegalAccessException { - throw new IllegalAccessException(ErrorMessages.PRIVATE_CONSTRUCTOR_DETAILED); + throw new IllegalAccessException(ErrorMessages.PRIVATE_CONSTRUCTOR); } /** diff --git a/src/main/java/com/contentstack/cms/stack/Alias.java b/src/main/java/com/contentstack/cms/stack/Alias.java index 499e1275..3818aac7 100644 --- a/src/main/java/com/contentstack/cms/stack/Alias.java +++ b/src/main/java/com/contentstack/cms/stack/Alias.java @@ -1,18 +1,19 @@ package com.contentstack.cms.stack; -import com.contentstack.cms.core.ErrorMessages; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; -import com.contentstack.cms.BaseImplementation; -import okhttp3.ResponseBody; import org.jetbrains.annotations.NotNull; import org.json.simple.JSONObject; + +import com.contentstack.cms.BaseImplementation; +import com.contentstack.cms.core.ErrorMessages; + +import okhttp3.ResponseBody; import retrofit2.Call; import retrofit2.Retrofit; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; - /** * An alias acts as a pointer to a particular branch. You can specify the alias * ID in your frontend code to pull content @@ -162,7 +163,7 @@ public Call find() { * @since 2022-10-20 */ public Call fetch() { - Objects.requireNonNull(this.uid, "ErrorMessages.GLOBAL_FIELD_UID_REQUIRED"); + Objects.requireNonNull(this.uid, ErrorMessages.ALIAS_UID_REQUIRED); return this.service.single(this.headers, this.uid); } @@ -208,7 +209,7 @@ public Call update(@NotNull JSONObject body) { * @since 2022-10-20 */ public Call delete() { - Objects.requireNonNull(this.uid, "ErrorMessages.GLOBAL_FIELD_UID_REQUIRED"); + Objects.requireNonNull(this.uid, ErrorMessages.ALIAS_UID_REQUIRED); return this.service.delete(this.headers, this.uid, this.params); } diff --git a/src/main/java/com/contentstack/cms/stack/Asset.java b/src/main/java/com/contentstack/cms/stack/Asset.java index c0502978..6a0d5021 100644 --- a/src/main/java/com/contentstack/cms/stack/Asset.java +++ b/src/main/java/com/contentstack/cms/stack/Asset.java @@ -227,12 +227,12 @@ public Call findAsPojo() { * @since 2022-10-20 */ public Call fetch() { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.single(this.headers, this.assetUid, this.params); } public Call fetchAsPojo() { // New method for POJO conversion - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.singlePojo(this.headers, this.assetUid, this.params); } @@ -392,7 +392,7 @@ private MultipartBody createMultipartBody(String filePath, String parentUid, Str * @since 2022-10-20 */ public Call replace(@NotNull String filePath, @NotNull String description) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); MultipartBody.Part assetPath = uploadFile(filePath); RequestBody body = RequestBody.create(Objects.requireNonNull(MediaType.parse(String.valueOf(MultipartBody.FORM))), description); return this.service.replace(this.headers, this.assetUid, assetPath, body, this.params); @@ -445,7 +445,7 @@ private MultipartBody.Part uploadFile(@NotNull String filePath) { * @since 2022-10-20 */ public Call generatePermanentUrl(JSONObject body) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.generatePermanentUrl(this.headers, this.assetUid, body); } @@ -475,7 +475,7 @@ public Call generatePermanentUrl(JSONObject body) { * @since 2022-10-20 */ public Call getPermanentUrl(String slugUrl) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.downloadPermanentUrl(this.headers, this.assetUid, slugUrl, this.params); } @@ -492,7 +492,7 @@ public Call getPermanentUrl(String slugUrl) { * @since 0.1.0 */ public Call delete() { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.delete(this.headers, this.assetUid); } @@ -582,7 +582,7 @@ public Call setVersionName(int versionNumber, * @since 0.1.0 */ public Call getVersionNameDetails() { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.getVersionNameDetails(this.headers, this.assetUid, this.params); } @@ -603,7 +603,7 @@ public Call getVersionNameDetails() { * @since 0.1.0 */ public Call deleteVersionName(int versionNumber) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.deleteVersionName(this.headers, this.assetUid, versionNumber); } @@ -620,7 +620,7 @@ public Call deleteVersionName(int versionNumber) { * @since 0.1.0 */ public Call getReferences() { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.getReferences(this.headers, this.assetUid); } @@ -678,7 +678,7 @@ public Call getByType(@NotNull String assetType) { * @since 0.1.0 */ public Call updateDetails(JSONObject requestBody) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.updateDetails(this.headers, this.assetUid, this.params, requestBody); } @@ -704,7 +704,7 @@ public Call updateDetails(JSONObject requestBody) { * @since 0.1.0 */ public Call publish(@NotNull JSONObject requestBody) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.publish(this.headers, this.assetUid, requestBody); } @@ -730,7 +730,7 @@ public Call publish(@NotNull JSONObject requestBody) { */ public Call unpublish( @NotNull JSONObject requestBody) { - Objects.requireNonNull(this.assetUid, "ErrorMessages.ASSET_UID_REQUIRED"); + Objects.requireNonNull(this.assetUid, ErrorMessages.ASSET_UID_REQUIRED); return this.service.unpublish(this.headers, this.assetUid, requestBody); } diff --git a/src/main/java/com/contentstack/cms/stack/AuditLog.java b/src/main/java/com/contentstack/cms/stack/AuditLog.java index 2ff0c188..d28db581 100644 --- a/src/main/java/com/contentstack/cms/stack/AuditLog.java +++ b/src/main/java/com/contentstack/cms/stack/AuditLog.java @@ -114,7 +114,7 @@ public Call find() { * @return Call */ public Call fetch() { - Objects.requireNonNull(this.logItemUid, "ErrorMessages.LOG_ITEM_UID_REQUIRED"); + Objects.requireNonNull(this.logItemUid, ErrorMessages.LOG_ITEM_UID_REQUIRED); return this.service.fetch(this.headers, this.logItemUid); } diff --git a/src/test/java/com/contentstack/cms/core/TestUtils.java b/src/test/java/com/contentstack/cms/core/TestUtils.java index 76befd90..f6242caf 100644 --- a/src/test/java/com/contentstack/cms/core/TestUtils.java +++ b/src/test/java/com/contentstack/cms/core/TestUtils.java @@ -30,7 +30,7 @@ void testUtilConstructor() { try { new Util(); } catch (IllegalAccessException e) { - Assertions.assertEquals("private=modifier", e.getMessage()); + Assertions.assertEquals(PRIVATE_CONSTRUCTOR, e.getMessage()); } }