refactor(core): split 'ms-connector' WebApp into 'core' and 'ms-connector' to reuse some code for 'ms-proxy' WebApp

# Conflicts:
#	connector/src/main/resources/specific_eIDAS_connector.beans.xml
#	connector/src/test/resources/spring/SpringTest_connector.beans.xml
#	core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
#	core_common_webapp/src/test/java/at/asitplus/eidas/specific/core/test/utils/AuthenticationDataBuilderTest.java
#	eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java
#	eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
#	eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/controller/IdAustriaAuthMetadataControllerFirstTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/ReceiveAuthnResponseTaskTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/utils/IdAustriaAuthCredentialProviderTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/utils/IdAustriaAuthMetadataProviderFirstTest.java
#	eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_mapConfig.xml
#	eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
#	eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
#	eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
#	eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
#	eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
#	eidas_modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_mapConfig.xml

1 files changed, 139 insertions, 0 deletions

diff --git a/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java b/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java
new file mode 100644
index 00000000..e86d50d3
--- /dev/null
+++ b/core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/provider/StatusMessageProvider.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.core.provider;
+
+import java.text.MessageFormat;
+import java.util.Locale;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import at.gv.egiz.eaaf.core.api.IStatusMessenger;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+
+@Service("StatusMessageProvider")
+public class StatusMessageProvider implements IStatusMessenger {
+  private static final Logger log = LoggerFactory.getLogger(StatusMessageProvider.class);
+
+  private static final String ERROR_MESSAGES_UNAVAILABLE =
+      "Error messages can NOT be load from application. Only errorCode: {0} is availabe";
+  private static final String ERROR_NO_MESSAGE = "No errormesseage for error with number.={0}";
+
+  private static final String ERROR_EXTERNALERROR_CODES_UNAVAILABLE =
+      "External error-codes can NOT be load from application. Only internal errorCode: {0} is availabe";
+  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;
+
+  // 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);
+
+    }
+
+    // create the message
+    if (messages == null) {
+      return MessageFormat.format(ERROR_MESSAGES_UNAVAILABLE, new Object[] { messageId });
+
+    } else {
+      final String rawMessage = messages.getString(messageId);
+      return MessageFormat.format(rawMessage, parameters);
+
+    }
+  }
+
+  @Override
+  public String getMessage(String messageId, Object[] parameters) {
+    try {
+      return getMessageWithoutDefault(messageId, parameters);
+
+    } catch (final MissingResourceException e2) {
+      return MessageFormat.format(ERROR_NO_MESSAGE, new Object[] { messageId });
+
+    }
+  }
+
+  @Override
+  public String getResponseErrorCode(Throwable throwable) {
+    String errorCode = IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
+    if (throwable instanceof EaafException) {
+      errorCode = ((EaafException) throwable).getErrorId();
+      
+    }
+        
+    return errorCode;
+
+  }
+
+  @Override
+  public String mapInternalErrorToExternalError(String intErrorCode) {
+    // initialize messages
+    if (externalError == null) {
+      this.externalError = ResourceBundle.getBundle(
+          DEFAULT_EXTERNALERROR_RESOURCES,
+          DEFAULT_EXTERNALERROR_LOCALES);
+
+    }
+
+    // create the message
+    if (externalError == null) {
+      log.warn(MessageFormat.format(ERROR_EXTERNALERROR_CODES_UNAVAILABLE, new Object[] { intErrorCode }));
+      return IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
+
+    } else {
+      try {
+        if (StringUtils.isNotEmpty(intErrorCode)) {
+          return externalError.getString(intErrorCode);
+
+        } else {
+          return IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
+
+        }
+
+      } catch (final MissingResourceException e2) {
+        log.info(MessageFormat.format(ERROR_NO_EXTERNALERROR_CODE, new Object[] { intErrorCode }));
+        return IStatusMessenger.CODES_EXTERNAL_ERROR_GENERIC;
+
+      }
+    }
+  }
+
+}