Skip to content

Commit 79914a7

Browse files
committed
sonar fixes
1 parent 658d676 commit 79914a7

3 files changed

Lines changed: 20 additions & 10 deletions

File tree

sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorKeys.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.sap.cds.sdm.constants;
22

3+
import com.sap.cds.sdm.utilities.SDMUtils;
4+
import com.sap.cds.services.ServiceException;
35
import java.lang.reflect.Field;
46
import java.lang.reflect.Modifier;
57
import java.util.Collections;
@@ -20,7 +22,6 @@ private SDMErrorKeys() {
2022
public static final String VIRUS_REPO_ERROR_MORE_THAN_400MB_KEY =
2123
"SDM.virusRepoErrorMoreThan400MB";
2224
public static final String VIRUS_ERROR_KEY = "SDM.virusError";
23-
public static final String SDM_DUPLICATE_ATTACHMENT_KEY = "SDM.sdmDuplicateAttachment";
2425
public static final String REPOSITORY_ERROR_KEY = "SDM.repositoryError";
2526
public static final String SDM_MISSING_ROLES_EXCEPTION_KEY = "SDM.sdmMissingRolesException";
2627
public static final String SDM_SERVER_ERROR_KEY = "SDM.sdmServerError";
@@ -105,12 +106,10 @@ private SDMErrorKeys() {
105106
public static final String INVALID_SECONDARY_PROPERTIES_FOR_MOVE_SUFFIX_KEY =
106107
"SDM.invalidSecondaryPropertiesForMoveSuffix";
107108
public static final String SDM_MOVE_OPERATION_FAILED_KEY = "SDM.sdmMoveOperationFailed";
108-
109-
// public static final String FILENAME_EMPTY_ERROR_MSG = "SDM.File.filenameEmptyError";
110-
// public static final String SDM_ROLES_ERROR_MSG = "SDM.Authorization.sdmRolesError";
111-
// public static final String USER_NOT_AUTHORISED_ERROR_OPEN_ATTACHMENT_MSG =
112-
// "SDM.Authorization.userNotAuthorizedAttachmentError";
113-
// public static final String FAILED_TO_FETCH_FACET_MSG = "SDM.Facet.failedToFetchFacetError";
109+
public static final String FAILED_TO_ACCESS_ERROR_KEY_FIELDS_KEY =
110+
"SDM.failedToAccessErrorKeyFields";
111+
public static final String FAILED_TO_ACCESS_ERROR_MESSAGES_FIELDS_KEY =
112+
"SDM.failedToAccessErrorMessagesFields";
114113

115114
public static Map<String, Object> getAllErrorKeys() {
116115
Map<String, Object> out = new LinkedHashMap<>();
@@ -120,6 +119,8 @@ public static Map<String, Object> getAllErrorKeys() {
120119
try {
121120
out.put(f.getName(), f.get(null));
122121
} catch (IllegalAccessException ignored) {
122+
throw new ServiceException(
123+
SDMUtils.getErrorMessage("FAILED_TO_ACCESS_ERROR_KEY_FIELDS"), ignored);
123124
}
124125
}
125126
}

sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorMessages.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sap.cds.sdm.constants;
22

33
import com.sap.cds.sdm.utilities.SDMUtils;
4+
import com.sap.cds.services.ServiceException;
45
import java.lang.reflect.Field;
56
import java.lang.reflect.Modifier;
67
import java.util.Collection;
@@ -26,7 +27,6 @@ private SDMErrorMessages() {
2627
public static final String VIRUS_REPO_ERROR_MORE_THAN_400MB =
2728
"You cannot upload files that are larger than 400 MB";
2829
public static final String VIRUS_ERROR = "%s contains potential malware and cannot be uploaded.";
29-
// public static final String SDM_DUPLICATE_ATTACHMENT = "SDM.DuplicateAttachment";
3030
public static final String REPOSITORY_ERROR = "Failed to get repository info.";
3131
public static final String SDM_MISSING_ROLES_EXCEPTION =
3232
"You do not have the required permissions to update attachments. Kindly contact the admin";
@@ -124,6 +124,10 @@ private SDMErrorMessages() {
124124
public static final String INVALID_SECONDARY_PROPERTIES_FOR_MOVE_SUFFIX =
125125
". Attachment rolled back to source.";
126126
public static final String SDM_MOVE_OPERATION_FAILED = "SDM move operation failed";
127+
public static final String FAILED_TO_ACCESS_ERROR_KEY_FIELDS =
128+
"Failed to access SDM error key fields";
129+
public static final String FAILED_TO_ACCESS_ERROR_MESSAGES_FIELDS =
130+
"Failed to access SDM error messages fields";
127131

128132
// Helper Methods to create error/warning messages
129133
public static String buildErrorMessage(
@@ -255,6 +259,8 @@ public static Map<String, Object> getAllErrorMessages() {
255259
try {
256260
out.put(f.getName(), f.get(null));
257261
} catch (IllegalAccessException ignored) {
262+
throw new ServiceException(
263+
SDMUtils.getErrorMessage("FAILED_TO_ACCESS_ERROR_MESSAGES_FIELDS"), ignored);
258264
}
259265
}
260266
}

sdm/src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMReadAttachmentsHandler.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,17 @@ private void setErrorMessagesInCache(CdsReadEventContext context) {
6363
String cacheValue = errorMessageCache.get(cacheCheckKey);
6464

6565
if ("true".equals(cacheValue)) {
66+
System.out.println("Localized error messages already cached.");
6667
return; // Skip processing if already cached
6768
}
6869

6970
Map<String, Object> errorMessages = SDMErrorMessages.getAllErrorMessages();
7071
Map<String, Object> errorKeys = SDMErrorKeys.getAllErrorKeys();
7172
String localizedMessage;
7273
String localizedErrorMessageKey;
73-
for (String errorMessage : errorMessages.keySet()) {
74+
for (Map.Entry<String, Object> entry : errorMessages.entrySet()) {
75+
String errorMessage = entry.getKey();
76+
Object errorValue = entry.getValue();
7477
localizedErrorMessageKey = String.valueOf(errorKeys.get(errorMessage + "_KEY"));
7578
localizedMessage =
7679
context
@@ -82,7 +85,7 @@ private void setErrorMessagesInCache(CdsReadEventContext context) {
8285
errorMessageCache.put(
8386
errorMessageKey,
8487
java.util.Objects.equals(localizedMessage, localizedErrorMessageKey)
85-
? String.valueOf(errorMessages.get(errorMessage))
88+
? String.valueOf(errorValue)
8689
: localizedMessage);
8790
}
8891

0 commit comments

Comments
 (0)