Skip to content

Whitespace test #261

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
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Whitespace test #261

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
bd72d3a
[Added]: Integration Test for Whitespace
akshatjain-official Aug 4, 2025
6716e67
[Added]: Unit Test
akshatjain-official Aug 7, 2025
3d014ff
[Added]: Whitespace Changes
akshatjain-official Aug 7, 2025
b0f7ed8
POM version Changed
akshatjain-official Aug 7, 2025
83eda4c
Revert "POM version Changed"
akshatjain-official Aug 11, 2025
59a4536
Merge branch 'develop' into WhitespaceTest
rashmiangadi11 Aug 11, 2025
40dacd8
Update pom.xml
akshatjain-official Aug 11, 2025
41da302
Merge branch 'develop' into WhitespaceTest
akshatjain-official Aug 13, 2025
2ad9a0b
Merge branch 'develop' into WhitespaceTest
akshatjain-official Aug 22, 2025
ee0df6c
[CHANGED]:Warning Message Suggested by UA
akshatjain-official Aug 26, 2025
f820055
Merge branch 'develop' into WhitespaceTest
akshatjain-official Aug 26, 2025
712997b
Cds-dk upgrade
akshatjain-official Aug 26, 2025
e98a20e
Merge branch 'WhitespaceTest' of https://www.github.com/cap-java/sdm …
akshatjain-official Aug 26, 2025
1b63337
Merge branch 'develop' into WhitespaceTest
akshatjain-official Aug 28, 2025
4f3a955
Draft Created
akshatjain-official Oct 15, 2025
f533658
[UPDATE]:UpdateHandler
akshatjain-official Oct 21, 2025
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
2 changes: 2 additions & 0 deletions sdm/src/main/java/com/sap/cds/sdm/constants/SDMConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ private SDMConstants() {
public static final String FAILED_TO_FETCH_UP_ID = "Failed to fetch up_id";
public static final String FAILED_TO_FETCH_FACET =
"Invalid facet format, unable to extract required information.";
public static final String FILENAME_WHITESPACE_WARNING_MESSAGE =
"The following file(s) could not be updated because the filename(s) cannot be empty.";

public static String nameConstraintMessage(
List<String> fileNameWithRestrictedCharacters, String operation) {
Expand Down
34 changes: 26 additions & 8 deletions ...src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMCreateAttachmentsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public void updateName(CdsCreateEventContext context, List<CdsData> data, String
List<String> filesNotFound = new ArrayList<>();
List<String> filesWithUnsupportedProperties = new ArrayList<>();
Map<String, String> badRequest = new HashMap<>();
List<String> fileWithWhiteSpace = new ArrayList<>();
List<String> noSDMRoles = new ArrayList<>();
for (Map<String, Object> entity : data) {
List<Map<String, Object>> attachments = (List<Map<String, Object>>) entity.get(composition);
Expand All @@ -95,7 +96,8 @@ public void updateName(CdsCreateEventContext context, List<CdsData> data, String
composition,
attachmentEntity,
secondaryPropertiesWithInvalidDefinitions,
noSDMRoles);
noSDMRoles,
fileWithWhiteSpace);
handleWarnings(
context,
fileNameWithRestrictedCharacters,
Expand All @@ -104,7 +106,8 @@ public void updateName(CdsCreateEventContext context, List<CdsData> data, String
filesWithUnsupportedProperties,
badRequest,
propertyTitles,
noSDMRoles);
noSDMRoles,
fileWithWhiteSpace);
}
}
}
Expand All @@ -130,7 +133,8 @@ private void processEntity(
String composition,
Optional<CdsEntity> attachmentEntity,
Map<String, String> secondaryPropertiesWithInvalidDefinitions,
List<String> noSDMRoles)
List<String> noSDMRoles,
List<String> fileWithWhiteSpace)
throws IOException {
List<Map<String, Object>> attachments = (List<Map<String, Object>>) entity.get(composition);
if (attachments != null) {
Expand All @@ -146,7 +150,8 @@ private void processEntity(
composition,
attachmentEntity,
secondaryPropertiesWithInvalidDefinitions,
noSDMRoles);
noSDMRoles,
fileWithWhiteSpace);
}
SecondaryPropertiesKey secondaryPropertiesKey =
new SecondaryPropertiesKey(); // Emptying cache after attachments are updated in loop
Expand All @@ -166,7 +171,8 @@ private void processAttachment(
String composition,
Optional<CdsEntity> attachmentEntity,
Map<String, String> secondaryPropertiesWithInvalidDefinitions,
List<String> noSDMRoles)
List<String> noSDMRoles,
List<String> fileWithWhiteSpace)
throws IOException {
String id = (String) attachment.get("ID");
String fileNameInDB;
Expand Down Expand Up @@ -230,8 +236,11 @@ private void processAttachment(
throw new ServiceException("Filename cannot be empty");
}
} else {
if (filenameInRequest == null) {
throw new ServiceException("Filename cannot be empty");
if (filenameInRequest == null || filenameInRequest.trim().length() == 0) {
fileWithWhiteSpace.add(fileNameInDB);
replacePropertiesInAttachment(
attachment, fileNameInDB, propertiesInDB, secondaryTypeProperties);

} else if (!fileNameInDB.equals(
filenameInRequest)) { // If the file name in DB is not equal to the file name in
// request, it means that the file name has been modified
Expand Down Expand Up @@ -322,7 +331,8 @@ private void handleWarnings(
List<String> filesWithUnsupportedProperties,
Map<String, String> badRequest,
Map<String, String> propertyTitles,
List<String> noSDMRoles) {
List<String> noSDMRoles,
List<String> fileWithWhiteSpace) {
if (!fileNameWithRestrictedCharacters.isEmpty()) {
context
.getMessages()
Expand Down Expand Up @@ -363,6 +373,14 @@ private void handleWarnings(
if (!noSDMRoles.isEmpty()) {
context.getMessages().warn(SDMConstants.noSDMRolesMessage(noSDMRoles, "create"));
}
if (!fileWithWhiteSpace.isEmpty()) {
context
.getMessages()
.warn(
String.format(
SDMConstants.FILENAME_WHITESPACE_WARNING_MESSAGE,
String.join(", ", fileWithWhiteSpace)));
}
}

private List<String> getEntityCompositions(CdsCreateEventContext context) {
Expand Down
33 changes: 25 additions & 8 deletions ...src/main/java/com/sap/cds/sdm/handler/applicationservice/SDMUpdateAttachmentsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ private void renameDocument(
Map<String, String> badRequest = new HashMap<>();
Map<String, String> propertyTitles = new HashMap<>();
List<String> noSDMRoles = new ArrayList<>();
List<String> fileWithWhiteSpace = new ArrayList<>();
for (Map<String, Object> entity : data) {
List<Map<String, Object>> attachments = (List<Map<String, Object>>) entity.get(composition);
if (attachments != null && !attachments.isEmpty()) {
Expand All @@ -109,7 +110,8 @@ private void renameDocument(
filesWithUnsupportedProperties,
badRequest,
secondaryPropertiesWithInvalidDefinitions,
noSDMRoles);
noSDMRoles,
fileWithWhiteSpace);
}
}
handleWarnings(
Expand All @@ -120,7 +122,8 @@ private void renameDocument(
filesWithUnsupportedProperties,
badRequest,
propertyTitles,
noSDMRoles);
noSDMRoles,
fileWithWhiteSpace);
}

private void processAttachments(
Expand All @@ -133,7 +136,8 @@ private void processAttachments(
List<String> filesWithUnsupportedProperties,
Map<String, String> badRequest,
Map<String, String> secondaryPropertiesWithInvalidDefinitions,
List<String> noSDMRoles)
List<String> noSDMRoles,
List<String> fileWithWhiteSpace)
throws IOException {
Iterator<Map<String, Object>> iterator = attachments.iterator();
while (iterator.hasNext()) {
Expand All @@ -148,7 +152,8 @@ private void processAttachments(
filesWithUnsupportedProperties,
badRequest,
secondaryPropertiesWithInvalidDefinitions,
noSDMRoles);
noSDMRoles,
fileWithWhiteSpace);
}
SecondaryPropertiesKey secondaryPropertiesKey = new SecondaryPropertiesKey();
secondaryPropertiesKey.setRepositoryId(SDMConstants.REPOSITORY_ID);
Expand All @@ -168,7 +173,8 @@ public void processAttachment(
List<String> filesWithUnsupportedProperties,
Map<String, String> badRequest,
Map<String, String> secondaryPropertiesWithInvalidDefinitions,
List<String> noSDMRoles)
List<String> noSDMRoles,
List<String> fileWithWhiteSpace)
throws IOException {
String id = (String) attachment.get("ID");
Map<String, String> secondaryTypeProperties =
Expand Down Expand Up @@ -222,8 +228,10 @@ public void processAttachment(
throw new ServiceException("Filename cannot be empty");
}
} else {
if (filenameInRequest == null) {
throw new ServiceException("Filename cannot be empty");
if (filenameInRequest == null || filenameInRequest.trim().length() == 0) {
fileWithWhiteSpace.add(fileNameInDB);
replacePropertiesInAttachment(
attachment, fileNameInDB, propertiesInDB, secondaryTypeProperties);
} else if (!fileNameInDB.equals(filenameInRequest)) {
updatedSecondaryProperties.put("filename", filenameInRequest);
}
Expand Down Expand Up @@ -313,7 +321,8 @@ private void handleWarnings(
List<String> filesWithUnsupportedProperties,
Map<String, String> badRequest,
Map<String, String> propertyTitles,
List<String> noSDMRoles) {
List<String> noSDMRoles,
List<String> fileWithWhiteSpace) {
if (!fileNameWithRestrictedCharacters.isEmpty()) {
context
.getMessages()
Expand Down Expand Up @@ -353,6 +362,14 @@ private void handleWarnings(
if (!noSDMRoles.isEmpty()) {
context.getMessages().warn(SDMConstants.noSDMRolesMessage(noSDMRoles, "update"));
}
if (!fileWithWhiteSpace.isEmpty()) {
context
.getMessages()
.warn(
String.format(
SDMConstants.FILENAME_WHITESPACE_WARNING_MESSAGE,
String.join(", ", fileWithWhiteSpace)));
}
}

private List<String> getEntityCompositions(CdsUpdateEventContext context) {
Expand Down
Loading
Loading