1 files changed, 68 insertions, 24 deletions

diff --git a/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java b/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java
index c6a764ce..416a4cb5 100644
--- a/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java
+++ b/modules/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java
@@ -29,15 +29,20 @@ import java.util.MissingResourceException;
 import java.util.ResourceBundle;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.MessageSource;
+import org.springframework.context.MessageSourceAware;
+import org.springframework.context.NoSuchMessageException;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eaaf.core.api.IStatusMessenger;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.logging.LogMessageProviderFactory;
 import lombok.extern.slf4j.Slf4j;
 
 @Service("StatusMessageProvider")
 @Slf4j
-public class StatusMessageProvider implements IStatusMessenger {
+public class StatusMessageProvider implements IStatusMessenger, MessageSourceAware {
 
   private static final String ERROR_MESSAGES_UNAVAILABLE =
       "Error messages can NOT be load from application. Only errorCode: {0} is availabe";
@@ -48,45 +53,75 @@ public class StatusMessageProvider implements IStatusMessenger {
   private static final String ERROR_NO_EXTERNALERROR_CODE =
       "No external error for internal error with number.={0}";
 
-  // internal messanges
-  private static final String DEFAULT_MESSAGE_RESOURCES = "properties/status_messages_en";
-  private static final Locale DEFAULT_MESSAGE_LOCALES = new Locale("en", "GB");
-  private ResourceBundle messages;
-
+  private static final String MSG_WARN_NO_SOURCE = "MessageCode: {} is NOT SET for locale: {}";
+  private static final String MSG_INFO = "Use locale: {} as default";
+  
+  private MessageSource messageSource;
+  
+  
   // external error codes
   private static final String DEFAULT_EXTERNALERROR_RESOURCES = "properties/external_statuscodes_map";
   private static final Locale DEFAULT_EXTERNALERROR_LOCALES = new Locale("en", "GB");
   private ResourceBundle externalError = null;
 
   @Override
-  public String getMessageWithoutDefault(String messageId, Object[] parameters) {
-    // initialize messages
-    if (messages == null) {
-      this.messages = ResourceBundle.getBundle(
-          DEFAULT_MESSAGE_RESOURCES,
-          DEFAULT_MESSAGE_LOCALES);
+  public String getMessageWithoutDefault(final String messageId, final Object[] parameters) {
+    if (messageSource == null) {
+      return null;
 
-    }
+    } else {
+      try {
+        final Locale locale = LocaleContextHolder.getLocale();
+        return messageSource.getMessage(messageId, parameters, locale);
 
-    // create the message
-    if (messages == null) {
-      return MessageFormat.format(ERROR_MESSAGES_UNAVAILABLE, new Object[] { messageId });
+      } catch (final NoSuchMessageException e) {
+        log.info(MSG_WARN_NO_SOURCE, messageId, LocaleContextHolder.getLocale());
+        log.debug(MSG_INFO, Locale.ENGLISH);
 
-    } else {
-      final String rawMessage = messages.getString(messageId);
-      return MessageFormat.format(rawMessage, parameters);
+        try {
+          return messageSource.getMessage(messageId, parameters, Locale.ENGLISH);
+
+        } catch (final NoSuchMessageException e2) {
+          log.info(MSG_WARN_NO_SOURCE, messageId, Locale.ENGLISH);
 
+        }
+
+      } catch (final MissingResourceException e2) {
+        log.warn("No message source", e2);
+
+      }
     }
+
+    return null;
+
   }
 
   @Override
-  public String getMessage(String messageId, Object[] parameters) {
-    try {
-      return getMessageWithoutDefault(messageId, parameters);
+  public String getMessage(final String messageId, final Object[] parameters) {
+    if (messageSource == null) {
+      return MessageFormat.format(ERROR_MESSAGES_UNAVAILABLE, new Object[]{messageId});
 
-    } catch (final MissingResourceException e2) {
-      return MessageFormat.format(ERROR_NO_MESSAGE, new Object[] { messageId });
+    } else {
+      try {
+        final Locale locale = LocaleContextHolder.getLocale();
+        return messageSource.getMessage(messageId, parameters, locale);
+
+      } catch (final NoSuchMessageException e) {
+        log.info(MSG_WARN_NO_SOURCE, messageId, LocaleContextHolder.getLocale());
+        log.debug(MSG_INFO, Locale.ENGLISH);
+
+        try {
+          return messageSource.getMessage(messageId, parameters, Locale.ENGLISH);
+
+        } catch (final NoSuchMessageException e2) {
+          return MessageFormat.format(ERROR_NO_MESSAGE, new Object[]{messageId});
+
+        }
 
+      } catch (final MissingResourceException e2) {
+        return MessageFormat.format(ERROR_NO_MESSAGE, new Object[]{messageId});
+
+      }
     }
   }
 
@@ -133,4 +168,13 @@ public class StatusMessageProvider implements IStatusMessenger {
     }
   }
 
+  @Override
+  public void setMessageSource(MessageSource messageSource) {
+    this.messageSource = messageSource;
+
+    log.info("Injecting 'StatusMessanger' into 'LogMessageProviderFactory'");
+    LogMessageProviderFactory.setStatusMessager(this);
+    
+  }
+
 }