Skip to content
Snippets Groups Projects
Commit 71069778 authored by Lars Johansson's avatar Lars Johansson
Browse files

Change log handling to a service 

Change log handling to a service.
Add log configuration.
parent d223a073
No related branches found
No related tags found
No related merge requests found
Pipeline #115391 passed
Expand all Hide whitespace changes
Inline Side-by-side
src/main/java/org/openepics/names/rest/controller/NamesController.java
+ 61
− 58
View file @ 71069778
...@@ -31,10 +31,10 @@ import org.openepics.names.rest.beans.response.Response; ...@@ -31,10 +31,10 @@ import org.openepics.names.rest.beans.response.Response;
import org.openepics.names.rest.beans.response.ResponseBoolean; import org.openepics.names.rest.beans.response.ResponseBoolean;
import org.openepics.names.rest.beans.response.ResponseBooleanList; import org.openepics.names.rest.beans.response.ResponseBooleanList;
import org.openepics.names.rest.beans.response.ResponsePageNameElements; import org.openepics.names.rest.beans.response.ResponsePageNameElements;
import org.openepics.names.service.LogService;
import org.openepics.names.service.NamesService; import org.openepics.names.service.NamesService;
import org.openepics.names.service.exception.ServiceException; import org.openepics.names.service.exception.ServiceException;
import org.openepics.names.util.ExcelUtil; import org.openepics.names.util.ExcelUtil;
import org.openepics.names.util.LogUtil;
import org.openepics.names.util.TextUtil; import org.openepics.names.util.TextUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
...@@ -65,11 +65,14 @@ public class NamesController implements INames { ...@@ -65,11 +65,14 @@ public class NamesController implements INames {
private static final String ATTACHMENT_FILENAME_NAME_ELEMENT_XLSX = "attachment; filename=NameElement.xlsx"; private static final String ATTACHMENT_FILENAME_NAME_ELEMENT_XLSX = "attachment; filename=NameElement.xlsx";
private LogService logService;
private NamesService namesService; private NamesService namesService;
@Autowired @Autowired
public NamesController( public NamesController(
LogService logUtil,
NamesService namesService) { NamesService namesService) {
this.logService = logUtil;
this.namesService = namesService; this.namesService = namesService;
} }
...@@ -84,11 +87,11 @@ public class NamesController implements INames { ...@@ -84,11 +87,11 @@ public class NamesController implements INames {
namesService.validateNamesCreate(nameElements); namesService.validateNamesCreate(nameElements);
return new ResponseEntity<>(namesService.createNames(nameElements), Response.getHeaderJson(), HttpStatus.CREATED); return new ResponseEntity<>(namesService.createNames(nameElements), Response.getHeaderJson(), HttpStatus.CREATED);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -114,14 +117,14 @@ public class NamesController implements INames { ...@@ -114,14 +117,14 @@ public class NamesController implements INames {
throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null);
} }
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (IOException e) { } catch (IOException e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e);
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -137,11 +140,11 @@ public class NamesController implements INames { ...@@ -137,11 +140,11 @@ public class NamesController implements INames {
deleted, queryFields, queryValues, deleted, queryFields, queryValues,
orderBy, isAsc, page, pageSize); orderBy, isAsc, page, pageSize);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -164,11 +167,11 @@ public class NamesController implements INames { ...@@ -164,11 +167,11 @@ public class NamesController implements INames {
try { try {
return namesService.readNames(name, orderBy, isAsc, page, pageSize); return namesService.readNames(name, orderBy, isAsc, page, pageSize);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -180,11 +183,11 @@ public class NamesController implements INames { ...@@ -180,11 +183,11 @@ public class NamesController implements INames {
try { try {
return namesService.readNamesSystemStructure(mnemonicpath, orderBy, isAsc, page, pageSize); return namesService.readNamesSystemStructure(mnemonicpath, orderBy, isAsc, page, pageSize);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -196,11 +199,11 @@ public class NamesController implements INames { ...@@ -196,11 +199,11 @@ public class NamesController implements INames {
try { try {
return namesService.readNamesDeviceStructure(mnemonicpath, orderBy, isAsc, page, pageSize); return namesService.readNamesDeviceStructure(mnemonicpath, orderBy, isAsc, page, pageSize);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -212,11 +215,11 @@ public class NamesController implements INames { ...@@ -212,11 +215,11 @@ public class NamesController implements INames {
try { try {
return namesService.readNamesHistory(uuid, orderBy, isAsc, page, pageSize); return namesService.readNamesHistory(uuid, orderBy, isAsc, page, pageSize);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -228,11 +231,11 @@ public class NamesController implements INames { ...@@ -228,11 +231,11 @@ public class NamesController implements INames {
try { try {
return namesService.equivalenceName(name); return namesService.equivalenceName(name);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -242,11 +245,11 @@ public class NamesController implements INames { ...@@ -242,11 +245,11 @@ public class NamesController implements INames {
try { try {
return new ResponseEntity<>(new ResponseBoolean(namesService.existsName(name)), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(namesService.existsName(name)), Response.getHeaderJson(), HttpStatus.OK);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK);
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK);
} }
} }
...@@ -256,11 +259,11 @@ public class NamesController implements INames { ...@@ -256,11 +259,11 @@ public class NamesController implements INames {
try { try {
return new ResponseEntity<>(new ResponseBoolean(namesService.isLegacyName(name)), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(namesService.isLegacyName(name)), Response.getHeaderJson(), HttpStatus.OK);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK);
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK);
} }
} }
...@@ -270,11 +273,11 @@ public class NamesController implements INames { ...@@ -270,11 +273,11 @@ public class NamesController implements INames {
try { try {
return new ResponseEntity<>(new ResponseBoolean(namesService.isValidToCreateName(name)), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(namesService.isValidToCreateName(name)), Response.getHeaderJson(), HttpStatus.OK);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK);
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK);
} }
} }
...@@ -291,15 +294,15 @@ public class NamesController implements INames { ...@@ -291,15 +294,15 @@ public class NamesController implements INames {
namesService.validateNamesCreate(nameElement); namesService.validateNamesCreate(nameElement);
responses.add(new ResponseBoolean(Boolean.TRUE)); responses.add(new ResponseBoolean(Boolean.TRUE));
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
if (response) { if (response) {
response = false; response = false;
reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT;
} }
responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
if (response) { if (response) {
response = false; response = false;
reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT;
...@@ -320,15 +323,15 @@ public class NamesController implements INames { ...@@ -320,15 +323,15 @@ public class NamesController implements INames {
namesService.validateNamesUpdate(nameElement); namesService.validateNamesUpdate(nameElement);
responses.add(new ResponseBoolean(Boolean.TRUE)); responses.add(new ResponseBoolean(Boolean.TRUE));
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
if (response) { if (response) {
response = false; response = false;
reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT;
} }
responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
if (response) { if (response) {
response = false; response = false;
reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT;
...@@ -349,15 +352,15 @@ public class NamesController implements INames { ...@@ -349,15 +352,15 @@ public class NamesController implements INames {
namesService.validateNamesDelete(nameElement); namesService.validateNamesDelete(nameElement);
responses.add(new ResponseBoolean(Boolean.TRUE)); responses.add(new ResponseBoolean(Boolean.TRUE));
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
if (response) { if (response) {
response = false; response = false;
reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT;
} }
responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
if (response) { if (response) {
response = false; response = false;
reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT;
...@@ -381,11 +384,11 @@ public class NamesController implements INames { ...@@ -381,11 +384,11 @@ public class NamesController implements INames {
namesService.validateNamesUpdate(nameElements); namesService.validateNamesUpdate(nameElements);
return namesService.updateNames(nameElements); return namesService.updateNames(nameElements);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -411,14 +414,14 @@ public class NamesController implements INames { ...@@ -411,14 +414,14 @@ public class NamesController implements INames {
throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null);
} }
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (IOException e) { } catch (IOException e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e);
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -436,11 +439,11 @@ public class NamesController implements INames { ...@@ -436,11 +439,11 @@ public class NamesController implements INames {
namesService.validateNamesDelete(nameElements); namesService.validateNamesDelete(nameElements);
return namesService.deleteNames(nameElements); return namesService.deleteNames(nameElements);
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
...@@ -466,14 +469,14 @@ public class NamesController implements INames { ...@@ -466,14 +469,14 @@ public class NamesController implements INames {
throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null);
} }
} catch (ServiceException e) { } catch (ServiceException e) {
LogUtil.logServiceException(LOGGER, Level.WARNING, e); logService.logServiceException(LOGGER, Level.WARNING, e);
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} catch (IOException e) { } catch (IOException e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e);
} catch (Exception e) { } catch (Exception e) {
LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); logService.logStackTraceElements(LOGGER, Level.WARNING, e);
throw e; throw e;
} }
} }
......
src/main/java/org/openepics/names/util/LogUtil.java → src/main/java/org/openepics/names/service/LogService.java
+ 19
− 15
View file @ 71069778
...@@ -16,29 +16,33 @@ ...@@ -16,29 +16,33 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
package org.openepics.names.util; package org.openepics.names.service;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.openepics.names.service.exception.ServiceException; import org.openepics.names.service.exception.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
/** /**
* Utility class to assist in handling of logs. * Utility class to assist in handling of logs.
* *
* @author Lars Johansson * @author Lars Johansson
*/ */
public class LogUtil { @Service
public class LogService {
private static final String ORG_OPENEPICS_NAMES = "org.openepics.names"; private static final String ORG_OPENEPICS_NAMES = "org.openepics.names";
private static final String ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL = "org.openepics.names.util.ExceptionUtil"; private static final String ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL = "org.openepics.names.util.ExceptionUtil";
/** private int logStackTraceLength;
* This class is not to be instantiated.
*/ @Autowired
private LogUtil() { protected LogService(@Value("${logutil.stacktrace.length:10}") int logStackTraceLength) {
throw new IllegalStateException("Utility class"); this.logStackTraceLength = logStackTraceLength;
} }
/** /**
...@@ -48,7 +52,7 @@ public class LogUtil { ...@@ -48,7 +52,7 @@ public class LogUtil {
* @param level log level * @param level log level
* @param e service exception * @param e service exception
*/ */
public static void logServiceException(Logger logger, Level level, ServiceException e) { public void logServiceException(Logger logger, Level level, ServiceException e) {
if (logger == null || level == null || e == null) { if (logger == null || level == null || e == null) {
return; return;
} }
...@@ -74,8 +78,8 @@ public class LogUtil { ...@@ -74,8 +78,8 @@ public class LogUtil {
* @param level log level * @param level log level
* @param e service exception * @param e service exception
*/ */
public static void logStackTraceElements(Logger logger, Level level, ServiceException e) { public void logStackTraceElements(Logger logger, Level level, ServiceException e) {
logStackTraceElements(logger, level, e, 10, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL); logStackTraceElements(logger, level, e, logStackTraceLength, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL);
} }
/** /**
...@@ -85,8 +89,8 @@ public class LogUtil { ...@@ -85,8 +89,8 @@ public class LogUtil {
* @param level log level * @param level log level
* @param e exception * @param e exception
*/ */
public static void logStackTraceElements(Logger logger, Level level, Exception e) { public void logStackTraceElements(Logger logger, Level level, Exception e) {
logStackTraceElements(logger, level, e, 10, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL); logStackTraceElements(logger, level, e, logStackTraceLength, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL);
} }
/** /**
...@@ -99,7 +103,7 @@ public class LogUtil { ...@@ -99,7 +103,7 @@ public class LogUtil {
* @param filterInclude filter include * @param filterInclude filter include
* @param filterExclude filter exclude * @param filterExclude filter exclude
*/ */
public static void logStackTraceElements(Logger logger, Level level, ServiceException e, int maxNumberOfLogs, String filterInclude, String filterExclude) { public void logStackTraceElements(Logger logger, Level level, ServiceException e, int maxNumberOfLogs, String filterInclude, String filterExclude) {
if (logger == null || level == null || e == null || maxNumberOfLogs <= 0) { if (logger == null || level == null || e == null || maxNumberOfLogs <= 0) {
return; return;
} }
...@@ -118,7 +122,7 @@ public class LogUtil { ...@@ -118,7 +122,7 @@ public class LogUtil {
* @param filterInclude filter include * @param filterInclude filter include
* @param filterExclude filter exclude * @param filterExclude filter exclude
*/ */
public static void logStackTraceElements(Logger logger, Level level, Exception e, int maxNumberOfLogs, String filterInclude, String filterExclude) { public void logStackTraceElements(Logger logger, Level level, Exception e, int maxNumberOfLogs, String filterInclude, String filterExclude) {
if (logger == null || level == null || e == null || maxNumberOfLogs <= 0) { if (logger == null || level == null || e == null || maxNumberOfLogs <= 0) {
return; return;
} }
...@@ -136,7 +140,7 @@ public class LogUtil { ...@@ -136,7 +140,7 @@ public class LogUtil {
* @param filterInclude filter include * @param filterInclude filter include
* @param filterExclude filter exclude * @param filterExclude filter exclude
*/ */
private static void logStackTraceElements(Logger logger, Level level, StackTraceElement[] stackTraceElements, int maxNumberOfLogs, String filterInclude, String filterExclude) { private void logStackTraceElements(Logger logger, Level level, StackTraceElement[] stackTraceElements, int maxNumberOfLogs, String filterInclude, String filterExclude) {
if (logger == null || level == null || stackTraceElements == null || maxNumberOfLogs <= 0) { if (logger == null || level == null || stackTraceElements == null || maxNumberOfLogs <= 0) {
return; return;
} }
......
src/main/resources/application-docker.properties
+ 4
− 4
View file @ 71069778
...@@ -2,12 +2,15 @@ ...@@ -2,12 +2,15 @@
# Naming # Naming
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# logging
logging.level.org.openepics.names=DEBUG logging.level.org.openepics.names=DEBUG
logutil.stacktrace.length=10
server.port=8083 server.port=8083
spring.profiles.active=@spring.profiles.active@ spring.profiles.active=@spring.profiles.active@
# datasource
spring.datasource.url=jdbc:postgresql://postgres:5432/discs_names spring.datasource.url=jdbc:postgresql://postgres:5432/discs_names
spring.datasource.username=discs_names spring.datasource.username=discs_names
spring.datasource.password=discs_names spring.datasource.password=discs_names
...@@ -16,10 +19,7 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect ...@@ -16,10 +19,7 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.ddl-auto=none
spring.jpa.hibernate.show-sql=true spring.jpa.hibernate.show-sql=true
# ------------------------------------------------------------------------------ # swagger uI
# Swagger UI
# ------------------------------------------------------------------------------
app.version=0.0.1-SNAPSHOT app.version=0.0.1-SNAPSHOT
openapi.externaldocs.description=ESS Naming Convention openapi.externaldocs.description=ESS Naming Convention
openapi.externaldocs.url=https://chess.esss.lu.se/enovia/link/ESS-0000757/21308.51166.45568.45993/valid openapi.externaldocs.url=https://chess.esss.lu.se/enovia/link/ESS-0000757/21308.51166.45568.45993/valid
......
src/main/resources/application.properties
+ 4
− 4
View file @ 71069778
...@@ -2,12 +2,15 @@ ...@@ -2,12 +2,15 @@
# Naming # Naming
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# logging
logging.level.org.openepics.names=DEBUG logging.level.org.openepics.names=DEBUG
logutil.stacktrace.length=10
server.port=8083 server.port=8083
spring.profiles.active=@spring.profiles.active@ spring.profiles.active=@spring.profiles.active@
# datasource
spring.datasource.url=jdbc:postgresql://postgres:5432/discs_names spring.datasource.url=jdbc:postgresql://postgres:5432/discs_names
spring.datasource.username=discs_names spring.datasource.username=discs_names
spring.datasource.password=discs_names spring.datasource.password=discs_names
...@@ -16,10 +19,7 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect ...@@ -16,10 +19,7 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.ddl-auto=none
spring.jpa.hibernate.show-sql=true spring.jpa.hibernate.show-sql=true
# ------------------------------------------------------------------------------ # swagger uI
# Swagger UI
# ------------------------------------------------------------------------------
app.version=0.0.1-SNAPSHOT app.version=0.0.1-SNAPSHOT
openapi.externaldocs.description=ESS Naming Convention openapi.externaldocs.description=ESS Naming Convention
openapi.externaldocs.url=https://chess.esss.lu.se/enovia/link/ESS-0000757/21308.51166.45568.45993/valid openapi.externaldocs.url=https://chess.esss.lu.se/enovia/link/ESS-0000757/21308.51166.45568.45993/valid
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment