From 33423b92f6ff0426a84e4e6a9189f7c12cbd02d8 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Wed, 10 Jun 2020 13:18:04 +0300 Subject: [PATCH] Removed HTTP-Logger (deprecated) --- dmp-backend/logging/pom.xml | 23 -- .../java/eu/eudat/core/logger/Logger.java | 48 --- .../logger/common/AbstractBatchLogger.java | 57 ---- .../logger/remote/http/HttpRemoteLogger.java | 287 ------------------ .../java/eu/eudat/core/models/AuditModel.java | 8 - .../eu/eudat/core/models/LoggingModel.java | 36 --- .../exception/ApiExceptionLoggingModel.java | 35 --- .../exception/ExceptionLoggingModel.java | 21 -- .../core/models/simple/SimpleAuditModel.java | 14 - .../models/simple/SimpleLoggingModel.java | 14 - .../main/java/types/LoggingOutputType.java | 29 -- .../src/main/java/types/LoggingType.java | 33 -- .../main/java/eu/eudat/controllers/Admin.java | 1 - .../eu/eudat/controllers/BaseController.java | 7 - .../ControllerErrorHandler.java | 31 +- .../utilities/InvitationServiceImpl.java | 11 +- .../config/application-production.properties | 3 - .../config/application-staging.properties | 3 - 18 files changed, 3 insertions(+), 658 deletions(-) delete mode 100644 dmp-backend/logging/pom.xml delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/logger/Logger.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/logger/common/AbstractBatchLogger.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/logger/remote/http/HttpRemoteLogger.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/models/AuditModel.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/models/LoggingModel.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ApiExceptionLoggingModel.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/models/exception/ExceptionLoggingModel.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleAuditModel.java delete mode 100644 dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleLoggingModel.java delete mode 100644 dmp-backend/logging/src/main/java/types/LoggingOutputType.java delete mode 100644 dmp-backend/logging/src/main/java/types/LoggingType.java 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> { - private final String indexType = "exception-logging"; - - public String getIndexType() { - return indexType; - } - - @Override - public Map getData() { - return super.getData(); - } -} diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleAuditModel.java b/dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleAuditModel.java deleted file mode 100644 index 20d72dc72..000000000 --- a/dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleAuditModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package eu.eudat.core.models.simple; - -import eu.eudat.core.models.AuditModel; - -/** - * Created by ikalyvas on 5/30/2018. - */ -public class SimpleAuditModel extends AuditModel { - private final String indexType = "simple-audit"; - - public String getIndexType() { - return indexType; - } -} diff --git a/dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleLoggingModel.java b/dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleLoggingModel.java deleted file mode 100644 index 3ce76d736..000000000 --- a/dmp-backend/logging/src/main/java/eu/eudat/core/models/simple/SimpleLoggingModel.java +++ /dev/null @@ -1,14 +0,0 @@ -package eu.eudat.core.models.simple; - -import eu.eudat.core.models.LoggingModel; - -/** - * Created by ikalyvas on 5/30/2018. - */ -public class SimpleLoggingModel extends LoggingModel { - private final String indexType = "simple-logging"; - - public String getIndexType() { - return indexType; - } -} diff --git a/dmp-backend/logging/src/main/java/types/LoggingOutputType.java b/dmp-backend/logging/src/main/java/types/LoggingOutputType.java deleted file mode 100644 index 279091fe8..000000000 --- a/dmp-backend/logging/src/main/java/types/LoggingOutputType.java +++ /dev/null @@ -1,29 +0,0 @@ -package types; - -/** - * Created by ikalyvas on 5/30/2018. - */ -public enum LoggingOutputType { - FILE(0), JSON(1); - - private Integer value; - - private LoggingOutputType(Integer value) { - this.value = value; - } - - public Integer getValue() { - return value; - } - - public static LoggingOutputType fromInteger(Integer value) { - switch (value) { - case 0: - return FILE; - case 1: - return JSON; - default: - throw new RuntimeException("Unsupported Logging LoggingOutputType"); - } - } -} diff --git a/dmp-backend/logging/src/main/java/types/LoggingType.java b/dmp-backend/logging/src/main/java/types/LoggingType.java deleted file mode 100644 index a19980f05..000000000 --- a/dmp-backend/logging/src/main/java/types/LoggingType.java +++ /dev/null @@ -1,33 +0,0 @@ -package types; - -/** - * Created by ikalyvas on 5/30/2018. - */ -public enum LoggingType { - WARNING(0), ERROR(1), INFO(2), DEBUG(3); - - private Integer value; - - private LoggingType(Integer value) { - this.value = value; - } - - public Integer getValue() { - return value; - } - - public static LoggingType fromInteger(Integer value) { - switch (value) { - case 0: - return WARNING; - case 1: - return ERROR; - case 2: - return INFO; - case 3: - return DEBUG; - default: - throw new RuntimeException("Unsupported LoggingType"); - } - } -} diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java index 58ce64aae..b3ae23250 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java @@ -1,6 +1,5 @@ package eu.eudat.controllers; -import eu.eudat.core.logger.Logger; import eu.eudat.data.query.items.table.datasetprofile.DatasetProfileTableRequestItem; import eu.eudat.exceptions.datasetprofile.DatasetProfileNewVersionException; import eu.eudat.exceptions.datasetprofile.DatasetProfileWithDatasetsExeption; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java index c9bddab50..6e897e39a 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/BaseController.java @@ -1,6 +1,5 @@ package eu.eudat.controllers; -import eu.eudat.core.logger.Logger; import eu.eudat.logic.services.ApiContext; import eu.eudat.models.validators.*; import org.springframework.web.bind.WebDataBinder; @@ -9,18 +8,12 @@ import org.springframework.web.bind.annotation.InitBinder; public abstract class BaseController { - /*private Logger logger;*/ - private ApiContext apiContext; public ApiContext getApiContext() { return apiContext; } - /*public Logger getLoggerService() { - return logger; - }*/ - public BaseController(ApiContext apiContext) { this.apiContext = apiContext; diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java index 02054bdba..381f86972 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerErrorHandler.java @@ -1,26 +1,18 @@ package eu.eudat.controllers.controllerhandler; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; -import com.fasterxml.jackson.databind.SerializationFeature; -import eu.eudat.core.models.exception.ApiExceptionLoggingModel; + import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.models.data.security.Principal; import eu.eudat.types.ApiMessageCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseStatus; -import types.LoggingType; import javax.annotation.Priority; -import java.util.HashMap; -import java.util.Map; /** * Created by ikalyvas on 6/12/2018. @@ -30,31 +22,10 @@ import java.util.Map; public class ControllerErrorHandler { private static final Logger logger = LoggerFactory.getLogger(ControllerErrorHandler.class); -// private Logger logger; - - /*@Autowired - public ControllerErrorHandler(Logger logger) { - this.logger = logger; - }*/ - @ExceptionHandler(Exception.class) @ResponseStatus(HttpStatus.BAD_REQUEST) @ResponseBody public ResponseItem processValidationError(Principal principal, Exception ex) throws Exception { - ApiExceptionLoggingModel apiExceptionLoggingModel = new ApiExceptionLoggingModel<>(); - apiExceptionLoggingModel.setCode(HttpStatus.BAD_REQUEST); - apiExceptionLoggingModel.setUser(principal); - Map exceptionMap = new HashMap<>(); - ObjectWriter ow = new ObjectMapper().configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false).writer().withDefaultPrettyPrinter(); - try { - String json = ow.writeValueAsString(ex); - exceptionMap.put("exception", json); - apiExceptionLoggingModel.setData(ow.writeValueAsString(exceptionMap)); - } catch (JsonProcessingException e) { - logger.error(e.getMessage(), e); - } - apiExceptionLoggingModel.setMessage(ex.getMessage()); - apiExceptionLoggingModel.setType(LoggingType.ERROR); logger.error(ex.getMessage(), ex); return new ResponseItem().message(ex.getMessage()).status(ApiMessageCode.DEFAULT_ERROR_MESSAGE); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java index a03a917a0..49027b588 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/utilities/InvitationServiceImpl.java @@ -1,24 +1,19 @@ package eu.eudat.logic.services.utilities; -import eu.eudat.core.models.exception.ApiExceptionLoggingModel; + import eu.eudat.data.dao.entities.DMPDao; import eu.eudat.data.dao.entities.InvitationDao; import eu.eudat.data.entities.DMP; import eu.eudat.data.entities.Invitation; -import eu.eudat.data.entities.UserInfo; import eu.eudat.models.data.mail.SimpleMail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.env.Environment; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import types.LoggingType; import javax.mail.MessagingException; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.UUID; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @@ -27,12 +22,10 @@ import java.util.stream.Collectors; @Service("invitationService") public class InvitationServiceImpl implements InvitationService { private static final Logger logger = LoggerFactory.getLogger(InvitationServiceImpl.class); -// private Logger logger; private Environment environment; @Autowired - public InvitationServiceImpl(/*Logger logger,*/ Environment environment) { -// this.logger = logger; + public InvitationServiceImpl(Environment environment) { this.environment = environment; } diff --git a/dmp-backend/web/src/main/resources/config/application-production.properties b/dmp-backend/web/src/main/resources/config/application-production.properties index d34b99747..278ed566c 100644 --- a/dmp-backend/web/src/main/resources/config/application-production.properties +++ b/dmp-backend/web/src/main/resources/config/application-production.properties @@ -11,9 +11,6 @@ elasticsearch.port = 9200 elasticsearch.username=elastic elasticsearch.password= -####################ELK OVERRIDES CONFIGURATIONS########## -http-logger.server-address = http://logstash:31311 - ####################PDF OVERRIDES CONFIGURATIONS########## pdf.converter.url=http://docsbox-web/ diff --git a/dmp-backend/web/src/main/resources/config/application-staging.properties b/dmp-backend/web/src/main/resources/config/application-staging.properties index 4b92d0245..ae5a5407d 100644 --- a/dmp-backend/web/src/main/resources/config/application-staging.properties +++ b/dmp-backend/web/src/main/resources/config/application-staging.properties @@ -11,9 +11,6 @@ elasticsearch.port = 9200 elasticsearch.username=elastic elasticsearch.password= -####################ELK OVERRIDES CONFIGURATIONS########## -http-logger.server-address = http://logstash:31311 - ####################PDF OVERRIDES CONFIGURATIONS########## pdf.converter.url=http://docsbox-web/