diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/util/RequestHelper.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/util/RequestHelper.java index a6609abbb..f134ec949 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/util/RequestHelper.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/util/RequestHelper.java @@ -1,6 +1,7 @@ package ru.spcex.clearing.company.util; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; @@ -23,7 +24,7 @@ import java.util.Objects; * .forDestination(Consts.DESTINATION_COMPANY_NEW, callbacks::put); */ public class RequestHelper { - protected Logger log = null; + protected Logger log = LoggerFactory.getLogger(getClass()); protected final IMessageResolver messageResolver; public RequestHelper(IMessageResolver messageResolver) { @@ -48,15 +49,12 @@ public class RequestHelper { */ public > RequestInfoUpdate requestFunction(RequestCommand command, T userRequest) { try { - if (log != null) - log.debug("{} request received, BaseRequest.id = {}", userRequest.getClass().getSimpleName(), userRequest.getId()); + log.debug("{} request received, BaseRequest.id = {}", userRequest.getClass().getSimpleName(), userRequest.getId()); RequestInfoUpdate reply = command.command(userRequest); - if (log != null) - log.trace("Reply on request {}: {}" , userRequest.getId(), reply); + log.trace("Reply on request {}: {}" , userRequest.getId(), reply); return reply; } catch (ClearingBaseException expectedE) { - if (log != null) - log.trace("{} return expected exception: {}", command, expectedE.toString()); + log.trace("{} return expected exception: {}", command, expectedE.toString()); String message = expectedE.getEnumMsg() == null ? expectedE.getMessage() : messageResolver.resolve(expectedE.getEnumMsg()); @@ -65,8 +63,7 @@ public class RequestHelper { .setStatus(Status.Error) .setMessage(message); } catch (Exception unexpectedE) { - if (log != null) - log.error("Error at {}: {} ", command, ExceptionUtils.getStackTrace(unexpectedE)); + log.error("Error at {}: {} ", command, ExceptionUtils.getStackTrace(unexpectedE)); String message = messageResolver.resolve(new EnumMessage(CompanyErrors.GeneralError)); return new RequestInfoUpdate() .setId(userRequest.getId()) @@ -93,6 +90,7 @@ public class RequestHelper { } public RequestHelper setLogger(Logger log) { + if (log == null) return this; this.log = log; return this; }