fixes issue for deleting keys that did not have a translation yet

orbinson · Sep 16, 2024 · ccfaa6f · ccfaa6f
1 parent 69a91f6
commit ccfaa6f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...rbinson/aem/dictionarytranslator/services/impl/CombiningMessageEntryResourceProvider.java b/...rbinson/aem/dictionarytranslator/services/impl/CombiningMessageEntryResourceProvider.java
@@ -17,6 +17,8 @@
 
 import java.util.*;
 
+import static be.orbinson.aem.dictionarytranslator.utils.DictionaryConstants.SLING_MESSAGEENTRY;
+
 @Component(
         service = ResourceProvider.class,
         property = {
@@ -45,8 +47,8 @@ private Map<String, Object> getValuesAndMessageEntryPaths(Resource dictionaryRes
             Resource languageResource = dictionaryService.getLanguageResource(dictionaryResource, language);
             if (languageResource != null) {
                 Resource messageEntryResource = dictionaryService.getMessageEntryResource(languageResource, key);
-                if (messageEntryResource != null && (messageEntryResource.getValueMap().containsKey(DictionaryConstants.SLING_MESSAGE))) {
-                    properties.put(language, messageEntryResource.getValueMap().get(DictionaryConstants.SLING_MESSAGE, String.class));
+                if (messageEntryResource != null && messageEntryResource.isResourceType(DictionaryConstants.SLING_MESSAGEENTRY)) {
+                    properties.put(language, messageEntryResource.getValueMap().get(DictionaryConstants.SLING_MESSAGE, ""));
                     messageEntryPaths.add(messageEntryResource.getPath());
                 }
             }
@@ -96,7 +98,7 @@ private boolean isMessageEntry(Resource dictionaryResource, String key) {
                 Resource languageResource = dictionaryService.getLanguageResource(dictionaryResource, language);
                 if (languageResource != null) {
                     Resource messageEntryResource = dictionaryService.getMessageEntryResource(languageResource, key);
-                    if (messageEntryResource != null && messageEntryResource.isResourceType(DictionaryConstants.SLING_MESSAGEENTRY)) {
+                    if (messageEntryResource != null && messageEntryResource.isResourceType(SLING_MESSAGEENTRY)) {
                         return true;
                     }
                 }