summaryrefslogtreecommitdiff
path: root/eaaf_core_api/src/main
diff options
context:
space:
mode:
authorThomas <>2022-04-12 17:28:16 +0200
committerThomas <>2022-04-12 17:28:16 +0200
commit154f1609f8825a09f569b7187acca8cdb42732c3 (patch)
tree8a3e438a899fb6261f3722e8ab81f92411acc824 /eaaf_core_api/src/main
parent8e6cff434f4e4321bead9114e8b84fcfff9cd30c (diff)
downloadEAAF-Components-154f1609f8825a09f569b7187acca8cdb42732c3.tar.gz
EAAF-Components-154f1609f8825a09f569b7187acca8cdb42732c3.tar.bz2
EAAF-Components-154f1609f8825a09f569b7187acca8cdb42732c3.zip
refact(config): split IConfigurationWithSP into two interfaces
Diffstat (limited to 'eaaf_core_api/src/main')
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java14
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java31
-rw-r--r--eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfigurationWithSP.java24
3 files changed, 41 insertions, 28 deletions
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java
index cf8867b3..a38f4ec1 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IConfigurationWithSP.java
@@ -1,14 +1,13 @@
package at.gv.egiz.eaaf.core.api.idp;
import java.net.URL;
-import java.util.Map;
import javax.annotation.Nullable;
import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
import at.gv.egiz.eaaf.core.exceptions.EaafException;
-public interface IConfigurationWithSP extends IConfiguration {
+public interface IConfigurationWithSP extends IExtendedConfiguration {
String CONFIG_PROPS_AUTH_DEFAULT_COUNTRYCODE = "configuration.auth.default.countrycode";
@@ -42,17 +41,6 @@ public interface IConfigurationWithSP extends IConfiguration {
throws EaafConfigurationException;
/**
- * Get a set of configuration values from file based configuration that starts
- * with this prefix. <br>
- * <br>
- * <b>Important:</b> The configuration values must be of type String!
- *
- * @param prefix Prefix of the configuration key
- * @return Map String/String without prefix, but never null
- */
- Map<String, String> getBasicConfigurationWithPrefix(String prefix);
-
- /**
* Validate a URL if it it is allowed by configuration.
*
* @param authReqUrl URL for validation
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
index ec09995d..fb1c9d04 100644
--- a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfiguration.java
@@ -1,24 +1,25 @@
package at.gv.egiz.eaaf.core.api.idp;
-import java.net.URI;
-import java.util.Properties;
+import java.util.Map;
-public interface IExtendedConfiguration extends IConfigurationWithSP {
+/**
+ * {@link IConfiguration} with Key/Value pre-fix loader.
+ *
+ * @author tlenz
+ *
+ */
+public interface IExtendedConfiguration extends IConfiguration {
/**
- * Get the full configuration properties object.
+ * Get a set of configuration values from file based configuration that starts
+ * with this prefix. <br>
+ * <br>
+ * <b>Important:</b> The configuration values must be of type String!
*
- * @return
+ * @param prefix Prefix of the configuration key
+ * @return Map String/String without prefix, but never null
*/
- @Deprecated
- Properties getFullConfigurationProperties();
-
- /**
- * Get the path to EAAFCore configuration that is internally used.
- *
- * @return
- */
- @Deprecated
- URI getConfigurationFilePath();
+ Map<String, String> getBasicConfigurationWithPrefix(String prefix);
+
}
diff --git a/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfigurationWithSP.java b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfigurationWithSP.java
new file mode 100644
index 00000000..0e867c7e
--- /dev/null
+++ b/eaaf_core_api/src/main/java/at/gv/egiz/eaaf/core/api/idp/IExtendedConfigurationWithSP.java
@@ -0,0 +1,24 @@
+package at.gv.egiz.eaaf.core.api.idp;
+
+import java.net.URI;
+import java.util.Properties;
+
+public interface IExtendedConfigurationWithSP extends IConfigurationWithSP {
+
+ /**
+ * Get the full configuration properties object.
+ *
+ * @return
+ */
+ @Deprecated
+ Properties getFullConfigurationProperties();
+
+ /**
+ * Get the path to EAAFCore configuration that is internally used.
+ *
+ * @return
+ */
+ @Deprecated
+ URI getConfigurationFilePath();
+
+}