From 3f2032efba5469589d5317b1796a0aec74457847 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 16 Mar 2021 15:13:22 +0100
Subject: update MOA-SPSS initialization to mitigate suspect behavior in
EAAF-Components module
---
.../at/gv/egovernment/moa/spss/api/Configurator.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
(limited to 'moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java')
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
index 59db7b5..bc0acbe 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
@@ -26,6 +26,7 @@ package at.gv.egovernment.moa.spss.api;
import at.gv.egovernment.moa.spss.MOAException;
import at.gv.egovernment.moa.spss.server.init.ConfiguratorImpl;
+import at.gv.egovernment.moa.spss.server.init.StartupConfigurationHolder;
/**
* Configures the SP/SS API.
@@ -61,15 +62,24 @@ public abstract class Configurator {
return instance;
}
+ /**
+ * Get current configuration object.
+ *
+ * @return Configuration or null if it was not initialized yet
+ */
+ public abstract StartupConfigurationHolder getCurrentConfiguration();
+
/**
* Initialize the SP/SS configuration.
*
* Only a single call to this method will have an effect. Use
* update() for reflecting changes in the configuration instead.
*
+ * @return Configuration holder
+ *
* @throws MOAException An error occurred updating the SP/SS configuration.
*/
- public abstract void init() throws MOAException;
+ public abstract StartupConfigurationHolder init() throws MOAException;
/**
* Update the SP/SS configuration.
@@ -77,8 +87,10 @@ public abstract class Configurator {
* This will only have an effect after the system has been initialized once
* using init().
*
+ * @return Updated Configuration holder, or null if it was not initialized
+ *
* @throws MOAException An error occurred updating the SP/SS configuration.
*/
- public abstract void update() throws MOAException;
+ public abstract StartupConfigurationHolder update() throws MOAException;
}
--
cgit v1.2.3
From 578ad0d6bc408edf9e6c875156054374f5fd8337 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Mon, 22 Mar 2021 18:40:26 +0100
Subject: change to EGIZ codestyle
---
.../gv/egovernment/moa/spss/api/Configurator.java | 51 +++++++++++-----------
1 file changed, 25 insertions(+), 26 deletions(-)
(limited to 'moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java')
diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
index bc0acbe..f2d3b89 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/api/Configurator.java
@@ -21,7 +21,6 @@
* that you distribute must include a readable copy of the "NOTICE" text file.
*/
-
package at.gv.egovernment.moa.spss.api;
import at.gv.egovernment.moa.spss.MOAException;
@@ -30,9 +29,9 @@ import at.gv.egovernment.moa.spss.server.init.StartupConfigurationHolder;
/**
* Configures the SP/SS API.
- *
- * Also handles dynamic configuration updates.
- *
+ *
+ * Also handles dynamic configuration updates.
+ *
* @author Patrick Peck
* @version $Id$
*/
@@ -40,7 +39,7 @@ public abstract class Configurator {
/** The default implementation class. */
private static final String DEFAULT_IMPLEMENTATION =
- "at.gv.egovernment.moa.spss.server.init.ConfiguratorImpl";
+ "at.gv.egovernment.moa.spss.server.init.ConfiguratorImpl";
/** The single instance of this class. */
private static Configurator instance = null;
@@ -48,14 +47,13 @@ public abstract class Configurator {
public static synchronized Configurator getInstance() {
if (instance == null) {
try {
- /*DiscoverClass discover = new DiscoverClass();
- instance =
- (Configurator) discover.newInstance(
- Configurator.class,
- DEFAULT_IMPLEMENTATION);*/
- instance = new ConfiguratorImpl();
- } catch (Exception e) {
- // this can not happen since we provide a valid default
+ /*
+ * DiscoverClass discover = new DiscoverClass(); instance = (Configurator)
+ * discover.newInstance( Configurator.class, DEFAULT_IMPLEMENTATION);
+ */
+ instance = new ConfiguratorImpl();
+ } catch (final Exception e) {
+ // this can not happen since we provide a valid default
// implementation
}
}
@@ -64,31 +62,32 @@ public abstract class Configurator {
/**
* Get current configuration object.
- *
+ *
* @return Configuration or null if it was not initialized yet
*/
public abstract StartupConfigurationHolder getCurrentConfiguration();
-
+
/**
* Initialize the SP/SS configuration.
- *
- * Only a single call to this method will have an effect. Use
- * update() for reflecting changes in the configuration instead.
- *
+ *
+ * Only a single call to this method will have an effect. Use
+ * update() for reflecting changes in the configuration instead.
+ *
* @return Configuration holder
- *
+ *
* @throws MOAException An error occurred updating the SP/SS configuration.
- */
+ */
public abstract StartupConfigurationHolder init() throws MOAException;
-
+
/**
* Update the SP/SS configuration.
- *
+ *
* This will only have an effect after the system has been initialized once
* using init().
- *
- * @return Updated Configuration holder, or null if it was not initialized
- *
+ *
+ * @return Updated Configuration holder, or null if it was not
+ * initialized
+ *
* @throws MOAException An error occurred updating the SP/SS configuration.
*/
public abstract StartupConfigurationHolder update() throws MOAException;
--
cgit v1.2.3