From 69fde5f35315d0253d3e05a04d5576d626fbd508 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Tue, 28 Jan 2020 18:33:50 +0200 Subject: [PATCH] Even more Replacements of the HttpRemoteLogger with the sl4j Logger (ref #223) --- .../configurations/WebMVCConfiguration.java | 2 +- .../main/java/eu/eudat/controllers/Admin.java | 2 +- .../eu/eudat/controllers/BaseController.java | 6 +++--- .../main/java/eu/eudat/controllers/Login.java | 19 +++++++++++-------- .../ControllerUnauthorisedHandler.java | 13 +++++++------ .../interceptors/RequestInterceptor.java | 12 +++++++----- .../services/helpers/HelpersService.java | 2 +- .../services/helpers/HelpersServiceImpl.java | 10 +++++----- .../services/helpers/LoggerServiceImpl.java | 4 ++-- 9 files changed, 38 insertions(+), 32 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java b/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java index d1136aba9..89a330cd2 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java +++ b/dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java @@ -37,6 +37,6 @@ public class WebMVCConfiguration extends WebMvcConfigurerAdapter { @Override public void addInterceptors(InterceptorRegistry registry) { - registry.addInterceptor(new RequestInterceptor(this.apiContext.getHelpersService().getLoggerService())); +// registry.addInterceptor(new RequestInterceptor(this.apiContext.getHelpersService().getLoggerService())); } } 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 11760957b..c461906b6 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 @@ -42,7 +42,7 @@ public class Admin extends BaseController { private ConfigLoader configLoader; @Autowired - public Admin(ApiContext apiContext, DatasetProfileManager datasetProfileManager, UserManager userManager, Logger logger, ConfigLoader configLoader) { + public Admin(ApiContext apiContext, DatasetProfileManager datasetProfileManager, UserManager userManager/*, Logger logger*/, ConfigLoader configLoader) { super(apiContext); this.datasetProfileManager = datasetProfileManager; this.userManager = userManager; 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 147f91f22..c9bddab50 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 @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.InitBinder; public abstract class BaseController { - private Logger logger; + /*private Logger logger;*/ private ApiContext apiContext; @@ -17,9 +17,9 @@ public abstract class BaseController { return apiContext; } - public Logger getLoggerService() { + /*public Logger getLoggerService() { return logger; - } + }*/ public BaseController(ApiContext apiContext) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java index 954ab00e2..78304aa20 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java @@ -1,6 +1,6 @@ package eu.eudat.controllers; -import eu.eudat.core.logger.Logger; + import eu.eudat.exceptions.security.NullEmailException; import eu.eudat.logic.managers.UserManager; import eu.eudat.logic.proxy.config.configloaders.ConfigLoader; @@ -28,6 +28,8 @@ import eu.eudat.models.data.login.Credentials; import eu.eudat.models.data.login.LoginInfo; 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.http.ResponseEntity; @@ -42,6 +44,7 @@ import java.security.GeneralSecurityException; @CrossOrigin @RequestMapping(value = "api/auth") public class Login { + private static final Logger logger = LoggerFactory.getLogger(Login.class); private CustomAuthenticationProvider customAuthenticationProvider; private AuthenticationService nonVerifiedUserAuthenticationService; @@ -53,13 +56,13 @@ public class Login { private ConfigurableProviderTokenValidator configurableProviderTokenValidator; private ConfigLoader configLoader; - private Logger logger; +// private Logger logger; private UserManager userManager; @Autowired public Login(CustomAuthenticationProvider customAuthenticationProvider, AuthenticationService nonVerifiedUserAuthenticationService, TwitterTokenValidator twitterTokenValidator, LinkedInTokenValidator linkedInTokenValidator, B2AccessTokenValidator b2AccessTokenValidator, - ORCIDTokenValidator orcidTokenValidator, OpenAIRETokenValidator openAIRETokenValidator, ConfigurableProviderTokenValidator configurableProviderTokenValidator, ConfigLoader configLoader, UserManager userManager, Logger logger) { + ORCIDTokenValidator orcidTokenValidator, OpenAIRETokenValidator openAIRETokenValidator, ConfigurableProviderTokenValidator configurableProviderTokenValidator, ConfigLoader configLoader, UserManager userManager/*, Logger logger*/) { this.customAuthenticationProvider = customAuthenticationProvider; this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService; this.twitterTokenValidator = twitterTokenValidator; @@ -69,7 +72,7 @@ public class Login { this.openAIRETokenValidator = openAIRETokenValidator; this.configurableProviderTokenValidator = configurableProviderTokenValidator; this.configLoader = configLoader; - this.logger = logger; +// this.logger = logger; this.userManager = userManager; } @@ -77,7 +80,7 @@ public class Login { @RequestMapping(method = RequestMethod.POST, value = {"/externallogin"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> externallogin(@RequestBody LoginInfo credentials) throws GeneralSecurityException, NullEmailException { - this.logger.info(credentials, "Trying To Login With " + credentials.getProvider()); + logger.info("Trying To Login With " + credentials.getProvider()); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(customAuthenticationProvider.authenticate(credentials)).status(ApiMessageCode.SUCCESS_MESSAGE)); } @@ -85,7 +88,7 @@ public class Login { @RequestMapping(method = RequestMethod.POST, value = {"/nativelogin"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> nativelogin(@RequestBody Credentials credentials) throws NullEmailException { - this.logger.info(credentials.getUsername(), "Trying To Login"); + logger.info(credentials.getUsername() + " Trying To Login"); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(userManager.authenticate(this.nonVerifiedUserAuthenticationService, credentials)).status(ApiMessageCode.SUCCESS_MESSAGE)); } @@ -128,7 +131,7 @@ public class Login { @RequestMapping(method = RequestMethod.POST, value = {"/me"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseEntity> authMe(Principal principal) throws NullEmailException { - this.logger.info(principal, "Getting Me"); + logger.info(principal + " Getting Me"); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(this.nonVerifiedUserAuthenticationService.Touch(principal.getToken())).status(ApiMessageCode.NO_MESSAGE)); } @@ -137,7 +140,7 @@ public class Login { public @ResponseBody ResponseEntity> logout(Principal principal) { this.nonVerifiedUserAuthenticationService.Logout(principal.getToken()); - this.logger.info(principal, "Logged Out"); + logger.info(principal + " Logged Out"); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().status(ApiMessageCode.NO_MESSAGE)); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java index 72e02ad89..0a8599265 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/controllerhandler/ControllerUnauthorisedHandler.java @@ -1,7 +1,8 @@ package eu.eudat.controllers.controllerhandler; -import eu.eudat.core.logger.Logger; import eu.eudat.exceptions.security.UnauthorisedException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; @@ -18,19 +19,19 @@ import javax.annotation.Priority; @ControllerAdvice @Priority(4) public class ControllerUnauthorisedHandler { - - private Logger logger; + private static final Logger logger = LoggerFactory.getLogger(ControllerUnauthorisedHandler.class); +// private Logger logger; @Autowired - public ControllerUnauthorisedHandler(Logger logger) { - this.logger = logger; + public ControllerUnauthorisedHandler(/*Logger logger*/) { +// this.logger = logger; } @ExceptionHandler(UnauthorisedException.class) @ResponseStatus(HttpStatus.UNAUTHORIZED) @ResponseBody public void processValidationError(UnauthorisedException ex) { - this.logger.error(ex, ex.getMessage()); + logger.error(ex.getMessage(), ex); return; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java index 7bf712829..24d0278e3 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/interceptors/RequestInterceptor.java @@ -2,6 +2,8 @@ package eu.eudat.controllers.interceptors; import eu.eudat.logic.services.helpers.LoggerService; import eu.eudat.types.WarningLevel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; @@ -15,19 +17,19 @@ import java.util.Date; */ @Component public class RequestInterceptor extends HandlerInterceptorAdapter { - - private LoggerService loggerService; + private static final Logger logger = LoggerFactory.getLogger(RequestInterceptor.class); +// private LoggerService loggerService; @Autowired - public RequestInterceptor(LoggerService loggerService) { - this.loggerService = loggerService; + public RequestInterceptor(/*LoggerService loggerService*/) { +// this.loggerService = loggerService; } @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { String reqUri = request.getRequestURI(); - this.loggerService.log("Call to " + reqUri + " method: " + request.getMethod() + " at: " + new Date(), WarningLevel.INFO); + logger.info("Call to " + reqUri + " method: " + request.getMethod() + " at: " + new Date(), WarningLevel.INFO); return super.preHandle(request, response, handler); } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersService.java index e8f2954b0..df4fdaa64 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersService.java @@ -9,5 +9,5 @@ public interface HelpersService { MessageSource getMessageSource(); - LoggerService getLoggerService(); +// LoggerService getLoggerService(); } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersServiceImpl.java index e6f6806bc..c09003c23 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/HelpersServiceImpl.java @@ -11,12 +11,12 @@ import org.springframework.stereotype.Service; public class HelpersServiceImpl implements HelpersService { private MessageSource messageSource; - private LoggerService loggerService; +// private LoggerService loggerService; @Autowired - public HelpersServiceImpl(MessageSource messageSource, LoggerService loggerService) { + public HelpersServiceImpl(MessageSource messageSource/*, LoggerService loggerService*/) { this.messageSource = messageSource; - this.loggerService = loggerService; +// this.loggerService = loggerService; } @Override @@ -24,8 +24,8 @@ public class HelpersServiceImpl implements HelpersService { return messageSource; } - @Override + /*@Override public LoggerService getLoggerService() { return loggerService; - } + }*/ } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/LoggerServiceImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/LoggerServiceImpl.java index d0fff2fee..7e4533707 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/LoggerServiceImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/helpers/LoggerServiceImpl.java @@ -12,7 +12,7 @@ import java.util.Map; /** * Created by ikalyvas on 3/1/2018. */ -@Service("loggerService") +//@Service("loggerService") public class LoggerServiceImpl implements LoggerService { private Logger logger; private WarningLevel level; @@ -22,7 +22,7 @@ public class LoggerServiceImpl implements LoggerService { this.level = level; } - @Autowired +// @Autowired public LoggerServiceImpl(Logger logger) { this.logger = logger; this.options.put(WarningLevel.DEBUG, (log, message) -> log.debug(message));