diff --git a/dmp-backend/logging/pom.xml b/dmp-backend/logging/pom.xml
deleted file mode 100644
index 872ec0288..000000000
--- a/dmp-backend/logging/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- 4.0.0
- dmp-backend
- logging
- 1.0-SNAPSHOT
- jar
-
- eu.eudat
- dmp-backend
- 1.0.0-SNAPSHOT
-
-
-
- org.springframework
- spring-web
- 5.0.6.RELEASE
-
-
-
\ No newline at end of file
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/logger/Logger.java b/dmp-backend/logging/src/main/java/eu/eudat/core/logger/Logger.java
deleted file mode 100644
index 86e5c74e1..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/logger/Logger.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package eu.eudat.core.logger;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import eu.eudat.core.models.exception.ApiExceptionLoggingModel;
-
-/**
- * Created by ikalyvas on 5/30/2018.
- */
-public interface Logger {
-
- void debug(T model);
-
- void debug(T model,String message);
-
- void debug(String message);
-
- void debug(T exception);
-
- void debug(T exception,String message);
-
- void warn(T model);
-
- void warn(T model,String message);
-
- void warn(String message);
-
- void warn(T exception);
-
- void warn(T exception,String message);
-
- void info(String message);
-
- void info(T model);
-
- void info(T model,String message);
-
- void info(T exception);
-
- void info(T exception,String message);
-
- void error(T loggingModel);
-
- void error(ApiExceptionLoggingModel model);
-
- void error(T exception);
-
- void error(T exception,String message);
-}
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/logger/common/AbstractBatchLogger.java b/dmp-backend/logging/src/main/java/eu/eudat/core/logger/common/AbstractBatchLogger.java
deleted file mode 100644
index e9938a5ff..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/logger/common/AbstractBatchLogger.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package eu.eudat.core.logger.common;
-
-import org.json.JSONObject;
-import org.springframework.core.env.Environment;
-import types.LoggingOutputType;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by ikalyvas on 5/30/2018.
- */
-public abstract class AbstractBatchLogger {
- private Map concurrentHashMap = new ConcurrentHashMap();
-
- public AbstractBatchLogger(Environment environment) {
- ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
-
- executor.scheduleAtFixedRate(() -> this.outputData(), Long.parseLong(environment.getProperty("http-logger.initial-delay")), Long.parseLong(environment.getProperty("http-logger.delay")), TimeUnit.SECONDS);
- }
-
- public abstract LoggingOutputType logOutputType();
-
- public void put(String key, T data) {
- this.concurrentHashMap.put(key, data);
- }
-
- public void clear() {
- this.concurrentHashMap.clear();
- }
-
- private Map getAndClear() {
- Map map = new HashMap<>();
- map.putAll(this.concurrentHashMap);
- this.concurrentHashMap.keySet().removeAll(map.keySet());
- return map;
- }
-
- public String tranformLog() {
- if (this.concurrentHashMap.size() > 0) {
- Map> transformedMap = new HashMap<>();
- transformedMap.put("entries", this.getAndClear().values());
- if (this.logOutputType().equals(LoggingOutputType.JSON))
- return new JSONObject(transformedMap).toString();
- if (this.logOutputType().equals(LoggingOutputType.FILE))
- return transformedMap.toString(); //TODO actual implementation of file Logger
- else throw new RuntimeException("Unsupported LoggingOutputType type");
- } else return null;
- }
-
- public abstract void outputData();
-}
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/logger/remote/http/HttpRemoteLogger.java b/dmp-backend/logging/src/main/java/eu/eudat/core/logger/remote/http/HttpRemoteLogger.java
deleted file mode 100644
index d3f8e088e..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/logger/remote/http/HttpRemoteLogger.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package eu.eudat.core.logger.remote.http;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-import eu.eudat.core.logger.Logger;
-import eu.eudat.core.logger.common.AbstractBatchLogger;
-import eu.eudat.core.models.LoggingModel;
-import eu.eudat.core.models.exception.ApiExceptionLoggingModel;
-import eu.eudat.core.models.exception.ExceptionLoggingModel;
-import eu.eudat.core.models.simple.SimpleAuditModel;
-import eu.eudat.core.models.simple.SimpleLoggingModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-import types.LoggingOutputType;
-import types.LoggingType;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Created by ikalyvas on 5/30/2018.
- */
-
-//@Service("logger")
-public class HttpRemoteLogger extends AbstractBatchLogger implements Logger {
-
- private RestTemplate rest;
- private HttpHeaders headers;
- private Environment environment;
-
- //@Autowired
- public HttpRemoteLogger(Environment environment) {
- super(environment);
- this.rest = new RestTemplate();
- this.headers = new HttpHeaders();
- this.environment = environment;
- headers.add("Content-Type", "application/json");
- headers.add("Accept", "*/*");
- }
-
- @Override
- public void outputData() {
- try {
- String log = this.tranformLog();
- if (log != null) {
- HttpEntity requestEntity = new HttpEntity(log, headers);
- ResponseEntity Object = rest.exchange(this.environment.getProperty("http-logger.server-address"), HttpMethod.POST, requestEntity, String.class);
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- }
-
- @Override
- public LoggingOutputType logOutputType() {
- return LoggingOutputType.JSON;
- }
-
- @Override
- public void debug(T model) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setData(model);
- loggingModel.setType(LoggingType.DEBUG);
- this.put(String.valueOf(model.hashCode()), loggingModel);
- }
-
- @Override
- public void debug(T model, String message) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setData(model);
- loggingModel.setMessage(message);
- loggingModel.setType(LoggingType.DEBUG);
- this.put(String.valueOf(model.hashCode()), loggingModel);
- }
-
- @Override
- public void debug(String message) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setMessage(message);
- loggingModel.setType(LoggingType.DEBUG);
- this.put(String.valueOf(message.hashCode()), loggingModel);
- }
-
- @Override
- public void debug(T exception) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setType(LoggingType.DEBUG);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void debug(T exception, String message) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
-
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setMessage(message);
- exceptionLoggingModel.setType(LoggingType.DEBUG);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void warn(T model) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setData(model);
- loggingModel.setType(LoggingType.WARNING);
- this.put(String.valueOf(model.hashCode()), loggingModel);
- }
-
- @Override
- public void warn(T model, String message) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setData(model);
- loggingModel.setMessage(message);
- loggingModel.setType(LoggingType.WARNING);
- this.put(String.valueOf(model.hashCode()), loggingModel);
- }
-
- @Override
- public void warn(String message) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setMessage(message);
- loggingModel.setType(LoggingType.WARNING);
- this.put(String.valueOf(message.hashCode()), loggingModel);
- }
-
- @Override
- public void warn(T exception) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setType(LoggingType.WARNING);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void warn(T exception, String message) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setMessage(message);
- exceptionLoggingModel.setType(LoggingType.WARNING);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void info(String message) {
- SimpleAuditModel simpleAuditModel = new SimpleAuditModel<>();
- simpleAuditModel.setMessage(message);
- simpleAuditModel.setType(LoggingType.INFO);
- this.put(String.valueOf(simpleAuditModel.hashCode()), simpleAuditModel);
- }
-
- @Override
- public void info(T model) {
- SimpleAuditModel simpleAuditModel = new SimpleAuditModel<>();
- simpleAuditModel.setData(model);
- simpleAuditModel.setType(LoggingType.INFO);
- this.put(String.valueOf(model.hashCode()), simpleAuditModel);
- }
-
- @Override
- public void info(T model, String message) {
- SimpleAuditModel simpleAuditModel = new SimpleAuditModel<>();
- simpleAuditModel.setData(model);
- simpleAuditModel.setMessage(message);
- simpleAuditModel.setType(LoggingType.INFO);
- this.put(String.valueOf(model.hashCode()), simpleAuditModel);
- }
-
- @Override
- public void info(T exception) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setType(LoggingType.INFO);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void info(T exception, String message) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setMessage(message);
- exceptionLoggingModel.setType(LoggingType.INFO);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void error(ApiExceptionLoggingModel model) {
- this.put(String.valueOf(model.hashCode()), model);
- }
-
- @Override
- public void error(T model) {
- LoggingModel loggingModel = new SimpleLoggingModel<>();
- loggingModel.setType(LoggingType.DEBUG);
- loggingModel.setData(model);
- this.put(String.valueOf(model.hashCode()), loggingModel);
- }
-
- @Override
- public void error(T exception) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setType(LoggingType.ERROR);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-
- @Override
- public void error(T exception, String message) {
- ExceptionLoggingModel exceptionLoggingModel = new ExceptionLoggingModel();
- Map map = new HashMap<>();
- ObjectWriter ow = new ObjectMapper().writer().withDefaultPrettyPrinter();
- try {
- String json = ow.writeValueAsString(exception);
- map.put("exception", json);
- } catch (JsonProcessingException e) {
- e.printStackTrace();
- }
- exceptionLoggingModel.setData(map);
- exceptionLoggingModel.setMessage(message);
- exceptionLoggingModel.setType(LoggingType.ERROR);
- this.put(String.valueOf(exception.hashCode()), exceptionLoggingModel);
- }
-}
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/models/AuditModel.java b/dmp-backend/logging/src/main/java/eu/eudat/core/models/AuditModel.java
deleted file mode 100644
index 3cf41edb1..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/models/AuditModel.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.eudat.core.models;
-
-/**
- * Created by ikalyvas on 5/30/2018.
- */
-public abstract class AuditModel extends LoggingModel{
-
-}
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/models/LoggingModel.java b/dmp-backend/logging/src/main/java/eu/eudat/core/models/LoggingModel.java
deleted file mode 100644
index 177721050..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/models/LoggingModel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package eu.eudat.core.models;
-
-import types.LoggingType;
-
-/**
- * Created by ikalyvas on 5/30/2018.
- */
-public abstract class LoggingModel {
- private T data;
- private LoggingType type;
- private String message;
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public T getData() {
- return data;
- }
-
- public void setData(T data) {
- this.data = data;
- }
-
- public LoggingType getType() {
- return type;
- }
-
- public void setType(LoggingType type) {
- this.type = type;
- }
-}
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ApiExceptionLoggingModel.java b/dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ApiExceptionLoggingModel.java
deleted file mode 100644
index d8991a967..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ApiExceptionLoggingModel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package eu.eudat.core.models.exception;
-
-import eu.eudat.core.models.LoggingModel;
-import org.springframework.http.HttpStatus;
-
-import java.util.Map;
-
-/**
- * Created by ikalyvas on 6/12/2018.
- */
-public class ApiExceptionLoggingModel extends LoggingModel {
- private HttpStatus code;
- private P user;
- private final String indexType = "api-exception-logging";
-
- public String getIndexType() {
- return indexType;
- }
-
- public P getUser() {
- return user;
- }
-
- public void setUser(P user) {
- this.user = user;
- }
-
- public HttpStatus getCode() {
- return code;
- }
-
- public void setCode(HttpStatus code) {
- this.code = code;
- }
-}
diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ExceptionLoggingModel.java b/dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ExceptionLoggingModel.java
deleted file mode 100644
index 815c8bfed..000000000
--- a/dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ExceptionLoggingModel.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package eu.eudat.core.models.exception;
-
-import eu.eudat.core.models.LoggingModel;
-
-import java.util.Map;
-
-/**
- * Created by ikalyvas on 5/30/2018.
- */
-public class ExceptionLoggingModel extends LoggingModel