remove unused functionality

4 files changed, 7 insertions, 84 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java
index a2c5da247..a9889da9c 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/ImportExportAction.java
@@ -53,8 +53,6 @@ import at.gv.egovernment.moa.id.configuration.helper.LanguageHelper;
 import at.gv.egovernment.moa.id.util.Random;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 public class ImportExportAction extends BasicAction {
 	
 	private static final Logger log = Logger.getLogger(ImportExportAction.class);
@@ -150,7 +148,7 @@ public class ImportExportAction extends BasicAction {
 						
 					}
 					
-				} catch (JsonProcessingException | JAXBException | FileNotFoundException e) {
+				} catch (JAXBException | FileNotFoundException e) {
 					log.info("Legacy configuration has an Import Error", e);
 					addActionError(LanguageHelper.getErrorString("errors.importexport.legacyimport", new Object[] {e.getMessage()}, request));
 								
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java
index 8ee32c54e..7ac026888 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/advancedlogging/MOAReversionLogger.java
@@ -23,11 +23,10 @@
 package at.gv.egovernment.moa.id.advancedlogging;
 
 import java.security.MessageDigest;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-import com.google.common.primitives.Ints;
-
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
@@ -47,7 +46,7 @@ public class MOAReversionLogger {
 
 	private static MOAReversionLogger instance = null; 
 	
-	private static final List<Integer> defaultEventCodes = Ints.asList(
+	private static final List<Integer> defaultEventCodes = Arrays.asList(
 			MOAIDEventConstants.SESSION_CREATED, 
 			MOAIDEventConstants.SESSION_DESTROYED,
 			MOAIDEventConstants.SESSION_ERROR,
@@ -69,8 +68,9 @@ public class MOAReversionLogger {
 			MOAIDEventConstants.AUTHPROCESS_INTERFEDERATION,
 			MOAIDEventConstants.AUTHPROCESS_STORK_REQUESTED,
 			MOAIDEventConstants.AUTHPROCESS_SERVICEPROVIDER
-			);
-
+	);
+	
+	
 	public static synchronized MOAReversionLogger getInstance() {
 		if (instance == null) {
 			instance = new MOAReversionLogger();
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
index 4130b2c5d..e24cb8606 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationUtil.java
@@ -27,8 +27,6 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.STORK;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-
 public class ConfigurationUtil {
 	
 	final boolean isOverwriteData;
@@ -83,7 +81,7 @@ public class ConfigurationUtil {
 	 *             is thrown if problem occurred while serializing one of the
 	 *             database values
 	 */
-	public static Properties moaIdConfigToJsonProperties(MOAIDConfiguration config) throws JsonProcessingException {
+	public static Properties moaIdConfigToJsonProperties(MOAIDConfiguration config) {
 
 		Properties result = new Properties();
 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java
deleted file mode 100644
index 6138d571b..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/persistence/JsonMapper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package at.gv.egovernment.moa.id.commons.config.persistence;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-/**
- * Helper class to handle the JSON (de-)serialization.
- *
- */
-public class JsonMapper {
-
-	private ObjectMapper mapper = new ObjectMapper();
-
-	/**
-	 * The default constructor where the default pretty printer is disabled.
-	 */
-	public JsonMapper() {
-		this(false);
-	}
-
-	/**
-	 * The constructor.
-	 * @param prettyPrint enables or disables the default pretty printer
-	 */
-	public JsonMapper(boolean prettyPrint) {
-		mapper.setVisibility(PropertyAccessor.ALL, Visibility.NONE);
-		mapper.setVisibility(PropertyAccessor.GETTER, Visibility.PUBLIC_ONLY);
-		mapper.setVisibility(PropertyAccessor.IS_GETTER, Visibility.PUBLIC_ONLY);
-		if (prettyPrint) {
-			mapper.enable(SerializationFeature.INDENT_OUTPUT);
-		}
-	}
-
-	/**
-	 * Serialize an object to a JSON string.
-	 * @param value the object to serialize
-	 * @return a JSON string
-	 * @throws JsonProcessingException thrown when an error occurs during serialization
-	 */
-	public String serialize(Object value) throws JsonProcessingException {
-		return mapper.writeValueAsString(value);
-	}
-
-	/**
-	 * Deserialize a JSON string.
-	 * 
-	 * @param value the JSON string to deserialize
-	 * @param clazz optional parameter that determines the type of the returned object. If not set, an {@link Object} is returned.
-	 * @return the deserialized JSON string as an object of type {@code clazz} or {@link Object}
-	 * @throws JsonParseException if the JSON string contains invalid content.
-	 * @throws JsonMappingException if the input JSON structure does not match structure expected for result type
-	 * @throws IOException if an I/O problem occurs (e.g. unexpected end-of-input)
-	 */
-	public <T> Object deserialize(String value, Class<T> clazz) throws JsonParseException, JsonMappingException, IOException{
-
-		ObjectMapper mapper = new ObjectMapper();
-		if (clazz != null) {
-			JavaType javaType = TypeFactory.defaultInstance().constructType(clazz);
-			return mapper.readValue(value, javaType);
-		} else {
-			return mapper.readValue(value, Object.class);
-		}
-	}
-}