switch from Spring to Spring-Boot

6 files changed, 421 insertions, 44 deletions

diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificEidasNodeSpringResourceProvider.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificEidasNodeSpringResourceProvider.java
index 6e8e06ef..40ed283b 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificEidasNodeSpringResourceProvider.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificEidasNodeSpringResourceProvider.java
@@ -32,11 +32,15 @@ public class MsSpecificEidasNodeSpringResourceProvider implements SpringResource
 
   @Override
   public Resource[] getResourcesToLoad() {
-    final ClassPathResource msEidasNode = new ClassPathResource("/specific_eIDAS_connector.beans.xml",
-        MsSpecificEidasNodeSpringResourceProvider.class);
+    final ClassPathResource generic =
+        new ClassPathResource("/applicationContext.xml", MsSpecificEidasNodeSpringResourceProvider.class);
+    
+    final ClassPathResource msEidasNode = new ClassPathResource(
+        "/specific_eIDAS_connector.beans.xml", MsSpecificEidasNodeSpringResourceProvider.class);
+    
     final ClassPathResource msEidasNodeStorage = new ClassPathResource(
         "/specific_eIDAS_connector.storage.beans.xml", MsSpecificEidasNodeSpringResourceProvider.class);
-    return new Resource[] { msEidasNode, msEidasNodeStorage };
+    return new Resource[] { generic, msEidasNode, msEidasNodeStorage };
   }
 
   @Override
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificSpringBootApplicationContextInitializer.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificSpringBootApplicationContextInitializer.java
new file mode 100644
index 00000000..5160bdf5
--- /dev/null
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/MsSpecificSpringBootApplicationContextInitializer.java
@@ -0,0 +1,82 @@
+package at.asitplus.eidas.specific.connector;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Properties;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertiesPropertySource;
+
+import at.gv.egiz.components.spring.api.SpringBootApplicationContextInitializer;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class MsSpecificSpringBootApplicationContextInitializer extends
+    SpringBootApplicationContextInitializer {
+
+  private static final String SYSTEMD_PROP_NAME = "eidas.ms.configuration";
+  private static final String PATH_FILE_PREFIX = "file:";
+  
+  @Override
+  public void initialize(ConfigurableApplicationContext applicationContext) {    
+    String configPath = System.getProperty(SYSTEMD_PROP_NAME);
+    if (StringUtils.isNotEmpty(configPath)) {
+      log.debug("Find configuration-source from SystemD Property: '{}' ...", SYSTEMD_PROP_NAME);      
+      if (configPath.startsWith(PATH_FILE_PREFIX)) {
+        configPath = configPath.substring(PATH_FILE_PREFIX.length());
+        
+      }      
+      injectConfiguration(configPath, applicationContext);            
+
+    } else {
+      log.info("Find NO SystemD Property: '{}' Maybe no configuration available", SYSTEMD_PROP_NAME);
+      
+    }
+    
+    super.initialize(applicationContext);
+    
+  }
+  
+  private void injectConfiguration(String configPath, ConfigurableApplicationContext applicationContext) {
+    InputStream is = null;
+    try {
+      Path path = Paths.get(configPath);
+      if (Files.exists(path)) {
+        File file = new File(configPath);             
+        Properties props = new Properties();
+        is = new FileInputStream(file);
+        props.load(is);      
+        MutablePropertySources sources = applicationContext.getEnvironment().getPropertySources();       
+        sources.addFirst(new PropertiesPropertySource(SYSTEMD_PROP_NAME, props));
+        log.info("Set configuration-source from SystemD-Property: {}", SYSTEMD_PROP_NAME);
+      
+      } else {
+        log.error("Configuration from SystemD Property: '{}' at Location: {} DOES NOT exist", 
+            SYSTEMD_PROP_NAME, configPath);
+        
+      }
+      
+    } catch (IOException e) {
+      log.error("Configuration from SystemD Property: '{}' at Location: {} CAN NOT be loaded", 
+          SYSTEMD_PROP_NAME, configPath, e);
+      
+    } finally {
+      try {
+        if (is != null) {
+          is.close();
+          
+        }        
+      } catch (IOException e) {
+        log.error("Can not close InputStream of configLoader: {}", configPath, e);
+        
+      }
+    }        
+  }
+}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java
new file mode 100644
index 00000000..0d3226bf
--- /dev/null
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringBootApplicationInitializer.java
@@ -0,0 +1,60 @@
+package at.asitplus.eidas.specific.connector;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import at.gv.egiz.eaaf.core.impl.logging.LogMessageProviderFactory;
+import at.gv.egiz.eaaf.core.impl.logging.SimpleStatusMessager;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@SpringBootApplication(scanBasePackages = {"at.gv.egiz.eaaf.utils.springboot.ajp"})
+public class SpringBootApplicationInitializer {
+
+  private static ConfigurableApplicationContext ctx;
+
+  /**
+   * Starts MS-specific eIDAS-Implementation SpringBoot application.
+   *
+   * @param args Starting parameters
+   */
+  public static void main(final String[] args) {
+    try {
+      log.info("=============== Initializing Spring-Boot context! ===============");
+      LogMessageProviderFactory.setStatusMessager(new SimpleStatusMessager());
+      final SpringApplication springApp =
+          new SpringApplication(SpringBootApplicationInitializer.class);
+      springApp.addInitializers(new MsSpecificSpringBootApplicationContextInitializer());
+
+      log.debug("Run SpringBoot initialization process ... ");
+      ctx = springApp.run(args);
+
+      log.info("Initialization of MS-specific eIDAS-Implementation finished.");
+
+    } catch (final Throwable e) {
+      log.error("MS-specific eIDAS-Implementation initialization FAILED!", e);
+      throw e;
+
+    }
+
+  }
+
+  /**
+   * Stops SpringBoot application of MS-specific eIDAS-Implementation.
+   * 
+   */
+  public static void exit() {
+    if (ctx != null) {
+      log.info("Stopping SpringBoot application ... ");
+      SpringApplication.exit(ctx, () -> 0);
+      ctx = null;
+      
+    } else {
+      log.info("No SpringBoot context. Nothing todo");
+      
+    }
+
+  }
+
+}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringContextCloseHandler.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringContextCloseHandler.java
new file mode 100644
index 00000000..2a3b659a
--- /dev/null
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/SpringContextCloseHandler.java
@@ -0,0 +1,224 @@
+package at.asitplus.eidas.specific.connector;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.slf4j.Logger;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+import at.gv.egiz.components.spring.api.IDestroyableObject;
+import eu.eidas.auth.cache.IgniteInstanceInitializerSpecificCommunication;
+
+/**
+ * SpringContext CloseHandler.
+ *
+ * @author tlenz
+ *
+ */
+
+public class SpringContextCloseHandler
+    implements ApplicationListener<ContextClosedEvent>, ApplicationContextAware, BeanPostProcessor {
+
+  private static final Logger log =
+      org.slf4j.LoggerFactory.getLogger(SpringContextCloseHandler.class);
+
+  private ApplicationContext context;
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.
+   * springframework.context. ApplicationEvent)
+   */
+  @Override
+  @EventListener
+  public void onApplicationEvent(final ContextClosedEvent arg0) {
+    log.info("MS-specific eIDAS-Node shutdown process started ...");
+
+    try {
+      log.debug("CleanUp objects with implements the IDestroyable interface ... ");
+      final Map<String, IDestroyableObject> objectsToDestroy =
+          context.getBeansOfType(IDestroyableObject.class);
+      internalIDestroyableObject(objectsToDestroy);
+      log.info("Object cleanUp complete");
+
+      log.debug("Stopping Spring Thread-Pools ... ");
+      // shut-down task schedulers
+      final Map<String, ThreadPoolTaskScheduler> schedulers =
+          context.getBeansOfType(ThreadPoolTaskScheduler.class);
+      internalThreadPoolTaskScheduler(schedulers);
+
+      // shut-down task executors
+      final Map<String, ThreadPoolTaskExecutor> executers =
+          context.getBeansOfType(ThreadPoolTaskExecutor.class);
+      internalThreadPoolTaskExecutor(executers);
+      log.debug("Spring Thread-Pools stopped");
+      
+      
+      //clean-up eIDAS node
+      Map<String, IgniteInstanceInitializerSpecificCommunication> nodeIgnite = 
+          context.getBeansOfType(IgniteInstanceInitializerSpecificCommunication.class);
+      log.info("Find #{} Apache Ignite instances from eIDAS Ref. impl.", nodeIgnite.size());
+      for (Entry<String, IgniteInstanceInitializerSpecificCommunication> el : nodeIgnite.entrySet()) {
+        if (el.getValue().getInstance() != null) {
+          el.getValue().getInstance().close();
+          el.getValue().destroyInstance();
+          log.debug("Shutdown Apache-Ignite: {}", el.getKey());
+          
+        }        
+      }
+            
+      log.info("MS-specific eIDAS-Node shutdown process finished");
+
+    } catch (final Exception e) {
+      log.warn("MS-specific eIDAS-Node shutdown process has an error.", e);
+
+    }
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.springframework.beans.factory.config.BeanPostProcessor#
+   * postProcessAfterInitialization(java. lang.Object, java.lang.String)
+   */
+  @Override
+  public Object postProcessAfterInitialization(final Object arg0, final String arg1)
+      throws BeansException {
+    if (arg0 instanceof ThreadPoolTaskScheduler) {
+      ((ThreadPoolTaskScheduler) arg0).setWaitForTasksToCompleteOnShutdown(true);
+    }
+    if (arg0 instanceof ThreadPoolTaskExecutor) {
+      ((ThreadPoolTaskExecutor) arg0).setWaitForTasksToCompleteOnShutdown(true);
+    }
+    return arg0;
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see org.springframework.beans.factory.config.BeanPostProcessor#
+   * postProcessBeforeInitialization(java .lang.Object, java.lang.String)
+   */
+  @Override
+  public Object postProcessBeforeInitialization(final Object arg0, final String arg1)
+      throws BeansException {
+    return arg0;
+
+  }
+
+  /*
+   * (non-Javadoc)
+   *
+   * @see
+   * org.springframework.context.ApplicationContextAware#setApplicationContext(org
+   * .springframework. context.ApplicationContext)
+   */
+  @Override
+  public void setApplicationContext(final ApplicationContext arg0) throws BeansException {
+    this.context = arg0;
+
+  }
+
+  private void internalThreadPoolTaskExecutor(final Map<String, ThreadPoolTaskExecutor> executers) {
+    for (final ThreadPoolTaskExecutor executor : executers.values()) {
+      // Not needed yet
+      // int retryCount = 0;
+      // while(executor.getActiveCount()>0 && ++retryCount<51){
+      // try {
+      // log.debug("Executer {} is still working with active {} work. Retry count is
+      // {}",
+      // executor.getThreadNamePrefix(),
+      // executor.getActiveCount(),
+      // retryCount);
+      // Thread.sleep(1000);
+      //
+      // } catch (final InterruptedException e) {
+      // e.printStackTrace();
+      // }
+      // }
+      //
+      // if(!(retryCount<51))
+      // log.debug("Executer {} is still working. Since Retry count exceeded max value
+      // {}, will be
+      // killed immediately",
+      // executor.getThreadNamePrefix(),
+      // retryCount);
+
+      executor.shutdown();
+      log.debug("Executer {} with active {} work has killed", executor.getThreadNamePrefix(),
+          executor.getActiveCount());
+
+    }
+
+  }
+
+  // Not required at the moment
+  private void internalThreadPoolTaskScheduler(
+      final Map<String, ThreadPoolTaskScheduler> schedulers) {
+    log.trace("Stopping #{} task-schedulers", schedulers.size());
+
+    // for (final ThreadPoolTaskScheduler scheduler : schedulers.values()) {
+    // scheduler.getScheduledExecutor().shutdown();
+    // try {
+    // scheduler.getScheduledExecutor().awaitTermination(20000,
+    // TimeUnit.MILLISECONDS);
+    // if(scheduler.getScheduledExecutor().isTerminated() ||
+    // scheduler.getScheduledExecutor().isShutdown())
+    // log.debug("Scheduler {} has stoped", scheduler.getThreadNamePrefix());
+    //
+    // else{
+    // log.debug("Scheduler {} has not stoped normally and will be shut down
+    // immediately",
+    // scheduler.getThreadNamePrefix());
+    // scheduler.getScheduledExecutor().shutdownNow();
+    // log.info("Scheduler {} has shut down immediately",
+    // scheduler.getThreadNamePrefix());
+    //
+    // }
+    //
+    // } catch (final IllegalStateException e) {
+    // e.printStackTrace();
+    //
+    // } catch (final InterruptedException e) {
+    // e.printStackTrace();
+    //
+    // } finally {
+    // scheduler.shutdown();
+    //
+    // }
+    // }
+
+  }
+
+  private void internalIDestroyableObject(final Map<String, IDestroyableObject> objectsToDestroy) {
+    if (objectsToDestroy != null) {
+      final Iterator<Entry<String, IDestroyableObject>> interator =
+          objectsToDestroy.entrySet().iterator();
+      while (interator.hasNext()) {
+        final Entry<String, IDestroyableObject> object = interator.next();
+        try {
+          object.getValue().fullyDestroy();
+          log.debug("Object with ID: {} is destroyed", object.getKey());
+
+        } catch (final Exception e) {
+          log.warn("Destroing object with ID: {} FAILED!", object.getKey(), null, e);
+
+        }
+      }
+    }
+
+  }
+
+}
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
index 2a10031b..a1e953f1 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/config/StaticResourceConfiguration.java
@@ -24,6 +24,7 @@
 package at.asitplus.eidas.specific.connector.config;
 
 import java.net.MalformedURLException;
+import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -35,11 +36,11 @@ import org.springframework.context.support.ReloadableResourceBundleMessageSource
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.CookieLocaleResolver;
 import org.thymeleaf.templateresolver.FileTemplateResolver;
 
 import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
 import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.logging.IMessageSourceLocation;
 import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
 
 /**
@@ -90,43 +91,63 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
   }
 
   /**
-   * Internal i18n message source.
-   * 
+   * Get a message source with only internal message properties.
+   *
+   * @param ressourceLocations List of source-locations
    * @return
    */
   @Bean
-  public ReloadableResourceBundleMessageSource internalMessageSource() {
-    final ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
+  public ReloadableResourceBundleMessageSource internalMessageSource(
+      @Autowired(required = false) final List<IMessageSourceLocation> ressourceLocations) {
+    final ReloadableResourceBundleMessageSource messageSource =
+        new ReloadableResourceBundleMessageSource();
 
     // add default message source
     messageSource.setBasename(DEFAULT_MESSAGE_SOURCE);
+
+    if (ressourceLocations != null) {
+      // load more message sources
+      for (final IMessageSourceLocation el : ressourceLocations) {
+        if (el.getMessageSourceLocation() != null) {
+          for (final String source : el.getMessageSourceLocation()) {
+            messageSource.addBasenames(source);
+            log.debug("Add additional messageSources: {}", el.getMessageSourceLocation().toArray());
+
+          }
+        }
+      }
+    }
+
     messageSource.setDefaultEncoding("UTF-8");
     return messageSource;
 
   }
 
   /**
-   * External i18n message source.
-   * 
+   * Get full message source with internal and external message-properties files.
+   *
+   * @param ressourceLocations List of source-locations
    * @return
    */
   @Bean
-  public ReloadableResourceBundleMessageSource messageSource() {
-    final ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
+  public ReloadableResourceBundleMessageSource messageSource(
+      @Autowired(required = false) final List<IMessageSourceLocation> ressourceLocations) {
+    final ReloadableResourceBundleMessageSource messageSource =
+        new ReloadableResourceBundleMessageSource();
     messageSource.setDefaultEncoding("UTF-8");
-    messageSource.setParentMessageSource(internalMessageSource());
+    messageSource.setParentMessageSource(internalMessageSource(ressourceLocations));
 
-    final String staticResources = basicConfig.getBasicConfiguration(
-        MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_PROPERTIES_PATH);
+    final String staticResources = basicConfig
+        .getBasicConfiguration(MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_PROPERTIES_PATH);
     try {
       if (StringUtils.isNotEmpty(staticResources)) {
-        final String absPath = FileUtils.makeAbsoluteUrl(staticResources, basicConfig
-            .getConfigurationRootDirectory());
+        final String absPath =
+            FileUtils.makeAbsoluteUrl(staticResources, basicConfig.getConfigurationRootDirectory());
         messageSource.setBasename(absPath);
-        messageSource.setFallbackToSystemLocale(false);
 
       } else {
         log.debug("No Ressourcefolder for dynamic Web content templates");
+
       }
 
     } catch (final MalformedURLException e) {
@@ -137,40 +158,28 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
     return messageSource;
 
   }
-
+    
   /**
-   * Cookie based i18n language selector.
-   * 
-   * @return
-   */
-  @Bean
-  public CookieLocaleResolver localeResolver() {
-    final CookieLocaleResolver localeResolver = new CookieLocaleResolver();
-    localeResolver.setCookieName("currentLanguage");
-    localeResolver.setCookieMaxAge(3600);
-    return localeResolver;
-  }
-  
-  
-  /**
-   * Thymeleaf based template resolver.
-   * 
+   * Get a Tyhmeleaf Template-Resolver with external configuration path.
+   *
    * @return
    */
   @Bean(name = "templateResolver")
   public FileTemplateResolver templateResolver() {
-    final String staticResources = basicConfig.getBasicConfiguration(
-        MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH);
+    final String staticResources = basicConfig
+        .getBasicConfiguration(MsEidasNodeConstants.PROP_CONFIG_WEBCONTENT_TEMPLATES_PATH);
     try {
       if (StringUtils.isNotEmpty(staticResources)) {
-        String absPath = FileUtils.makeAbsoluteUrl(staticResources, basicConfig
-            .getConfigurationRootDirectory());
+        String absPath =
+            FileUtils.makeAbsoluteUrl(staticResources, basicConfig.getConfigurationRootDirectory());
         if (!absPath.endsWith("/")) {
           absPath += "/";
+
         }
 
         if (absPath.startsWith("file:")) {
           absPath = absPath.substring("file:".length());
+
         }
 
         final FileTemplateResolver viewResolver = new FileTemplateResolver();
@@ -179,11 +188,12 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
         viewResolver.setTemplateMode("HTML");
         viewResolver.setCacheable(false);
 
-        log.info("Add Ressourcefolder: " + absPath + " for dynamic Web content templates");
+        log.info("Add Ressourcefolder: {} for dynamic Web content templates", absPath);
         return viewResolver;
 
       } else {
         log.debug("No Ressourcefolder for dynamic Web content templates");
+
       }
 
     } catch (final MalformedURLException e) {
@@ -191,8 +201,7 @@ public class StaticResourceConfiguration implements WebMvcConfigurer {
 
     }
 
-    // TODO: implement some backup solution
-    return null;
+    throw new RuntimeException("Can NOT initialize HTML template resolver");
 
   }
 }
diff --git a/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
index 26d442cb..3bda2932 100644
--- a/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
+++ b/connector/src/main/java/at/asitplus/eidas/specific/connector/storage/SimpleInMemoryTransactionStorage.java
@@ -33,13 +33,11 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 
 import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
 import at.gv.egiz.eaaf.core.exceptions.EaafException;
 import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
 
-@Service("SimpleInMemoryTransactionStorage")
 public class SimpleInMemoryTransactionStorage implements ITransactionStorage {
   private static final Logger log = LoggerFactory.getLogger(SimpleInMemoryTransactionStorage.class);