From 8c3db8e4512e98b5e0c288f08e9a973fa98ef785 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 25 Feb 2021 10:07:57 +0000 Subject: [PATCH] [Trunk | Admin Tools]: 1. Deleted folder "responses" with all its files (moved to uoa-admin-tools-library in r60105). 2. Deleted file "SimpleErrorController.java" (moved to uoa-admin-tools-library in r60105). --- .../controllers/SimpleErrorController.java | 60 ------------------- .../responses/ExceptionResponse.java | 37 ------------ .../responses/SingleValueWrapperResponse.java | 18 ------ 3 files changed, 115 deletions(-) delete mode 100644 src/main/java/eu/dnetlib/uoaadmintools/controllers/SimpleErrorController.java delete mode 100644 src/main/java/eu/dnetlib/uoaadmintools/responses/ExceptionResponse.java delete mode 100644 src/main/java/eu/dnetlib/uoaadmintools/responses/SingleValueWrapperResponse.java diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/SimpleErrorController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/SimpleErrorController.java deleted file mode 100644 index e53beb3..0000000 --- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/SimpleErrorController.java +++ /dev/null @@ -1,60 +0,0 @@ -package eu.dnetlib.uoaadmintools.controllers; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.web.ErrorAttributes; -import org.springframework.boot.autoconfigure.web.ErrorController; -import org.springframework.util.Assert; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.context.request.ServletRequestAttributes; - -import javax.servlet.http.HttpServletRequest; -import java.util.Map; - -/** - * Created by argirok on 8/3/2018. - */ - -@RestController -@CrossOrigin(origins = "*") -@RequestMapping("/error") -public class SimpleErrorController implements ErrorController { - - private final ErrorAttributes errorAttributes; - - @Autowired - public SimpleErrorController(ErrorAttributes errorAttributes) { - Assert.notNull(errorAttributes, "ErrorAttributes must not be null"); - this.errorAttributes = errorAttributes; - } - - @Override - public String getErrorPath() { - return "/error"; - } - - @RequestMapping - public Map error(HttpServletRequest aRequest){ - Map body = getErrorAttributes(aRequest,getTraceParameter(aRequest)); - String trace = (String) body.get("trace"); - if(trace != null){ - String[] lines = trace.split("\n\t"); - body.put("trace", lines); - } - return body; - } - - private boolean getTraceParameter(HttpServletRequest request) { - String parameter = request.getParameter("trace"); - if (parameter == null) { - return false; - } - return !"false".equals(parameter.toLowerCase()); - } - - private Map getErrorAttributes(HttpServletRequest aRequest, boolean includeStackTrace) { - RequestAttributes requestAttributes = new ServletRequestAttributes(aRequest); - return errorAttributes.getErrorAttributes(requestAttributes, includeStackTrace); - } -} \ No newline at end of file diff --git a/src/main/java/eu/dnetlib/uoaadmintools/responses/ExceptionResponse.java b/src/main/java/eu/dnetlib/uoaadmintools/responses/ExceptionResponse.java deleted file mode 100644 index ee5cc8d..0000000 --- a/src/main/java/eu/dnetlib/uoaadmintools/responses/ExceptionResponse.java +++ /dev/null @@ -1,37 +0,0 @@ -package eu.dnetlib.uoaadmintools.responses; - -import java.util.List; - -public class ExceptionResponse { - - private String errorCode; - private String errorMessage; - private String errors; - - public ExceptionResponse() { - } - - public String getErrorCode() { - return errorCode; - } - - public void setErrorCode(String errorCode) { - this.errorCode = errorCode; - } - - public String getErrorMessage() { - return errorMessage; - } - - public void setErrorMessage(String errorMessage) { - this.errorMessage = errorMessage; - } - - public String getErrors() { - return errors; - } - - public void setErrors(String errors) { - this.errors = errors; - } -} diff --git a/src/main/java/eu/dnetlib/uoaadmintools/responses/SingleValueWrapperResponse.java b/src/main/java/eu/dnetlib/uoaadmintools/responses/SingleValueWrapperResponse.java deleted file mode 100644 index 1493e4f..0000000 --- a/src/main/java/eu/dnetlib/uoaadmintools/responses/SingleValueWrapperResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package eu.dnetlib.uoaadmintools.responses; - -public class SingleValueWrapperResponse { - private T value = null; - - public SingleValueWrapperResponse() { } - public SingleValueWrapperResponse(T value) { - this.value = value; - } - - public T getValue() { - return value; - } - - public void setValue(T value) { - this.value = value; - } -}