diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java index 3af7e3815..98f240bcf 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import javax.transaction.Transactional; +import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -101,11 +102,11 @@ public class DictionaryController implements DictionaryResource { var entity = dictionaryPersistenceService.getType(typeId); var target = convert(entity, Type.class); target.setEntries(convert(entryPersistenceService.getEntries(typeId, DictionaryEntryType.ENTRY, fromVersion), DictionaryEntry.class) - .stream().sorted(Comparator.comparing(DictionaryEntry::getValue)).collect(Collectors.toList())); + .stream().sorted(Comparator.comparing(input -> StringUtils.lowerCase(input.getValue()))).collect(Collectors.toList())); target.setFalsePositiveEntries(convert(entryPersistenceService.getEntries(typeId, DictionaryEntryType.FALSE_POSITIVE, fromVersion), DictionaryEntry.class) - .stream().sorted(Comparator.comparing(DictionaryEntry::getValue)).collect(Collectors.toList())); + .stream().sorted(Comparator.comparing(input -> StringUtils.lowerCase(input.getValue()))).collect(Collectors.toList())); target.setFalseRecommendationEntries(convert(entryPersistenceService.getEntries(typeId, DictionaryEntryType.FALSE_RECOMMENDATION, fromVersion), DictionaryEntry.class) - .stream().sorted(Comparator.comparing(DictionaryEntry::getValue)).collect(Collectors.toList())); + .stream().sorted(Comparator.comparing(input -> StringUtils.lowerCase(input.getValue()))).collect(Collectors.toList())); return target; } diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java index 67f1fb918..ec195f7c9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java @@ -351,7 +351,7 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest { var createdType = dictionaryClient.addType(type); var word1 = "Luke Skywalker"; - var word2 = "Anakin Skywalker"; + var word2 = "anakin Skywalker"; var word3 = "Yoda"; // Act & Assert: Add different words; All three should exist