aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorGerwin Gsenger <g.gsenger@datentechnik-innovation.at>2015-01-13 14:41:43 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2015-06-19 11:07:43 +0200
commitccb85bd3fcd268b4e3cece2d57c1a92374cbc59d (patch)
tree753d76e29ea3bd79b0cacae4cef828173244bba0 /id
parent4882a375585451be88bee367a82f9e18a57ebfdf (diff)
downloadmoa-id-spss-ccb85bd3fcd268b4e3cece2d57c1a92374cbc59d.tar.gz
moa-id-spss-ccb85bd3fcd268b4e3cece2d57c1a92374cbc59d.tar.bz2
moa-id-spss-ccb85bd3fcd268b4e3cece2d57c1a92374cbc59d.zip
add Json annotations to getter methods
Diffstat (limited to 'id')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java10
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java1
2 files changed, 8 insertions, 3 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
index 24def1e02..f24f4e646 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/ConfigurationProvider.java
@@ -46,13 +46,12 @@
package at.gv.egovernment.moa.id.config;
-import java.math.BigInteger;
-import java.security.Principal;
-import java.security.cert.X509Certificate;
import java.util.Map;
import at.gv.egovernment.moa.id.data.IssuerAndSerial;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
/**
* Base class for <code>AuthConfigurationProvider</code> and <code>ProxyConfigurationProvider</code>,
* providing functions common to both of them.
@@ -131,10 +130,12 @@ public class ConfigurationProvider {
*
* @return the directory
*/
+ @JsonProperty("getRootConfigFileDir")
public String getRootConfigFileDir() {
return rootConfigFileDir;
}
+ @JsonProperty("getDefaultChainingMode")
public String getDefaultChainingMode() {
return defaultChainingMode;
}
@@ -144,6 +145,7 @@ public class ConfigurationProvider {
* Returns the trustedCACertificates.
* @return String
*/
+ @JsonProperty("getTrustedCACertificates")
public String getTrustedCACertificates() {
return trustedCACertificates;
@@ -152,6 +154,7 @@ public class ConfigurationProvider {
/**
* @return the certstoreDirectory
*/
+@JsonProperty("getCertstoreDirectory")
public String getCertstoreDirectory() {
return certstoreDirectory;
}
@@ -159,6 +162,7 @@ public String getCertstoreDirectory() {
/**
* @return the trustmanagerrevoationchecking
*/
+@JsonProperty("isTrustmanagerrevoationchecking")
public boolean isTrustmanagerrevoationchecking() {
return trustmanagerrevoationchecking;
}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 0049813d3..5ccaa4f35 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -1054,6 +1054,7 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
return Arrays.asList(prop.replaceAll(" ", "").split(","));
}
+ @JsonProperty("isMonitoringActive")
public boolean isMonitoringActive() {
String prop = props.getProperty("configuration.monitoring.active", "false");
return Boolean.valueOf(prop);