Merge branch 'feature/codestyle_and_gitlab_ci' into 'master'

Feature/codestyle and gitlab ci

See merge request egiz/moa-sig!1

1 files changed, 31 insertions, 12 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
index 8ab01d6..5726220 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/init/ConfiguratorImpl.java
@@ -21,7 +21,6 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  */
 
-
 package at.gv.egovernment.moa.spss.server.init;
 
 import at.gv.egovernment.moa.spss.MOAException;
@@ -29,10 +28,11 @@ import at.gv.egovernment.moa.spss.api.Configurator;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationException;
 import at.gv.egovernment.moa.spss.server.config.ConfigurationProvider;
 import at.gv.egovernment.moa.spss.server.iaik.config.IaikConfigurator;
+import iaik.server.ConfigurationData;
 
 /**
  * Default implementation of <code>Configurator</code>.
- * 
+ *
  * @author Patrick Peck
  * @version $Id$
  */
@@ -40,26 +40,45 @@ public class ConfiguratorImpl extends Configurator {
   /** whether the configuration has been initialized */
   private boolean initialized = false;
 
-  public void init() throws MOAException {
+  StartupConfigurationHolder result;
+
+  @Override
+  public StartupConfigurationHolder getCurrentConfiguration() {
+    return result;
+
+  }
+
+  @Override
+  public StartupConfigurationHolder init() throws MOAException {
     if (!initialized) {
-      SystemInitializer.init();
+      result = SystemInitializer.init();
       initialized = true;
+
     }
+
+    return result;
+
   }
 
-  public void update() throws MOAException {
+  @Override
+  public StartupConfigurationHolder update() throws MOAException {
     if (!initialized) {
-      return;
+      return null;
     }
-    
+
     try {
       // reconfigure the system
-      ConfigurationProvider config = ConfigurationProvider.reload();
-      new IaikConfigurator().configure(config);
-    } catch (MOAException e) {
+      final ConfigurationProvider config = ConfigurationProvider.reload();
+      final ConfigurationData iaikConfig = new IaikConfigurator().configure(config);
+      result = new StartupConfigurationHolder(config, iaikConfig);
+      return result;
+
+    } catch (final MOAException e) {
       throw e;
-    } catch (Throwable t) {
-      throw new ConfigurationException("", null, t);
+
+    } catch (final Throwable t) {
+      throw new ConfigurationException("MOA-SPSS initialization FAILED with a generic error", null, t);
+
     }
   }