From 3ec875373486f2ecb88f78ef4acedf726e1beb0f Mon Sep 17 00:00:00 2001 From: Lars Johansson <lars.johansson@ess.eu> Date: Wed, 29 Jun 2022 13:19:06 +0200 Subject: [PATCH] Adjust logging and logger levels --- .../rest/controller/NamesController.java | 156 ++++++------ .../rest/controller/ReportController.java | 2 +- .../rest/controller/StructuresController.java | 232 +++++++++--------- .../controller/VerificationController.java | 2 +- .../old/DeviceNamesControllerV0.java | 52 ++-- .../controller/old/HistoryControllerV0.java | 8 +- .../rest/controller/old/PartControllerV0.java | 16 +- .../openepics/names/service/NamesService.java | 50 ++-- .../names/service/StructuresService.java | 76 +++--- .../org/openepics/names/util/ExcelUtil.java | 8 +- .../org/openepics/names/util/LogUtil.java | 4 +- .../resources/application-docker.properties | 9 +- src/main/resources/application.properties | 9 +- .../names/util/StructureElementUtilTest.java | 1 - 14 files changed, 319 insertions(+), 306 deletions(-) diff --git a/src/main/java/org/openepics/names/rest/controller/NamesController.java b/src/main/java/org/openepics/names/rest/controller/NamesController.java index 5d20b5fd..ed70ad58 100644 --- a/src/main/java/org/openepics/names/rest/controller/NamesController.java +++ b/src/main/java/org/openepics/names/rest/controller/NamesController.java @@ -84,12 +84,12 @@ public class NamesController implements INames { namesService.validateNamesCreate(nameElements); return new ResponseEntity<>(namesService.createNames(nameElements), Response.getHeaderJson(), HttpStatus.CREATED); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -115,16 +115,16 @@ public class NamesController implements INames { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -140,12 +140,12 @@ public class NamesController implements INames { deleted, queryFields, queryValues, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -168,12 +168,12 @@ public class NamesController implements INames { try { return namesService.readNames(name, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -185,12 +185,12 @@ public class NamesController implements INames { try { return namesService.readNamesSystemStructure(mnemonicpath, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -202,12 +202,12 @@ public class NamesController implements INames { try { return namesService.readNamesDeviceStructure(mnemonicpath, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -219,12 +219,12 @@ public class NamesController implements INames { try { return namesService.readNamesHistory(uuid, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -236,12 +236,12 @@ public class NamesController implements INames { try { return namesService.equivalenceName(name); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -251,12 +251,12 @@ public class NamesController implements INames { try { return new ResponseEntity<>(new ResponseBoolean(namesService.existsName(name)), Response.getHeaderJson(), HttpStatus.OK); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); } } @@ -266,12 +266,12 @@ public class NamesController implements INames { try { return new ResponseEntity<>(new ResponseBoolean(namesService.isLegacyName(name)), Response.getHeaderJson(), HttpStatus.OK); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); } } @@ -281,12 +281,12 @@ public class NamesController implements INames { try { return new ResponseEntity<>(new ResponseBoolean(namesService.isValidToCreateName(name)), Response.getHeaderJson(), HttpStatus.OK); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); } } @@ -303,16 +303,16 @@ public class NamesController implements INames { namesService.validateNamesCreate(nameElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -333,16 +333,16 @@ public class NamesController implements INames { namesService.validateNamesUpdate(nameElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -363,16 +363,16 @@ public class NamesController implements INames { namesService.validateNamesDelete(nameElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -396,12 +396,12 @@ public class NamesController implements INames { namesService.validateNamesUpdate(nameElements); return namesService.updateNames(nameElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -427,16 +427,16 @@ public class NamesController implements INames { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -454,12 +454,12 @@ public class NamesController implements INames { namesService.validateNamesDelete(nameElements); return namesService.deleteNames(nameElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -485,16 +485,16 @@ public class NamesController implements INames { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } diff --git a/src/main/java/org/openepics/names/rest/controller/ReportController.java b/src/main/java/org/openepics/names/rest/controller/ReportController.java index 7cb7f53f..5ff2400c 100644 --- a/src/main/java/org/openepics/names/rest/controller/ReportController.java +++ b/src/main/java/org/openepics/names/rest/controller/ReportController.java @@ -482,7 +482,7 @@ public class ReportController { */ private void addOne(UUID key, Map<UUID, Long> map, Map<UUID, Long> mapNok) { if (key == null) { - LOGGER.log(Level.INFO, "addOne, key == null"); + LOGGER.log(Level.FINEST, "addOne, key == null"); return; } diff --git a/src/main/java/org/openepics/names/rest/controller/StructuresController.java b/src/main/java/org/openepics/names/rest/controller/StructuresController.java index 20cda037..4e7a0002 100644 --- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java +++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java @@ -93,12 +93,12 @@ public class StructuresController implements IStructures { structuresService.validateStructuresCreate(structureElements); return new ResponseEntity<>(structuresService.createStructures(structureElements), Response.getHeaderJson(), HttpStatus.CREATED); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -124,16 +124,16 @@ public class StructuresController implements IStructures { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -149,12 +149,12 @@ public class StructuresController implements IStructures { type, statuses, deleted, queryFields, queryValues, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -180,12 +180,12 @@ public class StructuresController implements IStructures { type, uuid, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -197,12 +197,12 @@ public class StructuresController implements IStructures { try { return structuresService.readStructuresMnemonic(mnemonic, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -214,12 +214,12 @@ public class StructuresController implements IStructures { try { return structuresService.readStructuresMnemonicpath(mnemonicpath, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -233,12 +233,12 @@ public class StructuresController implements IStructures { uuid, type, orderBy, isAsc, page, pageSize); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -250,12 +250,12 @@ public class StructuresController implements IStructures { try { return structuresService.equivalenceMnemonic(mnemonic); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -265,12 +265,12 @@ public class StructuresController implements IStructures { try { return new ResponseEntity<>(new ResponseBoolean(structuresService.existsStructure(type, mnemonicpath)), Response.getHeaderJson(), HttpStatus.OK); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); } } @@ -280,12 +280,12 @@ public class StructuresController implements IStructures { try { return new ResponseEntity<>(new ResponseBoolean(structuresService.isValidToCreateStructure(type, mnemonicpath)), Response.getHeaderJson(), HttpStatus.OK); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()), Response.getHeaderJson(), HttpStatus.OK); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); return new ResponseEntity<>(new ResponseBoolean(Boolean.FALSE, TextUtil.OPERATION_COULD_NOT_BE_PERFORMED), Response.getHeaderJson(), HttpStatus.OK); } } @@ -302,16 +302,16 @@ public class StructuresController implements IStructures { structuresService.validateStructuresCreate(structureElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -332,16 +332,16 @@ public class StructuresController implements IStructures { structuresService.validateStructuresUpdate(structureElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -362,16 +362,16 @@ public class StructuresController implements IStructures { structuresService.validateStructuresDelete(structureElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -392,16 +392,16 @@ public class StructuresController implements IStructures { structuresService.validateStructuresApprove(structureElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -422,16 +422,16 @@ public class StructuresController implements IStructures { structuresService.validateStructuresCancel(structureElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -452,16 +452,16 @@ public class StructuresController implements IStructures { structuresService.validateStructuresReject(structureElement); responses.add(new ResponseBoolean(Boolean.TRUE)); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; } responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField())); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); if (response) { response = false; reason = TextUtil.ONE_OR_MORE_ELEMENTS_ARE_NOT_CORRECT; @@ -480,12 +480,12 @@ public class StructuresController implements IStructures { structuresService.validateStructuresUpdate(structureElements); return structuresService.updateStructures(structureElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -506,16 +506,16 @@ public class StructuresController implements IStructures { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -528,12 +528,12 @@ public class StructuresController implements IStructures { structuresService.validateStructuresDelete(structureElements); return structuresService.deleteStructures(structureElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -554,16 +554,16 @@ public class StructuresController implements IStructures { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -576,12 +576,12 @@ public class StructuresController implements IStructures { structuresService.validateStructuresApprove(structureElements); return structuresService.approveStructures(structureElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -602,16 +602,16 @@ public class StructuresController implements IStructures { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -622,12 +622,12 @@ public class StructuresController implements IStructures { structuresService.validateStructuresCancel(structureElements); return structuresService.cancelStructures(structureElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -648,16 +648,16 @@ public class StructuresController implements IStructures { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -668,12 +668,12 @@ public class StructuresController implements IStructures { structuresService.validateStructuresReject(structureElements); return structuresService.rejectStructures(structureElements); } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } @@ -694,16 +694,16 @@ public class StructuresController implements IStructures { throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, null, null, null); } } catch (ServiceException e) { - LogUtil.logServiceException(LOGGER, Level.SEVERE, e); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LogUtil.logServiceException(LOGGER, Level.WARNING, e); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } catch (IOException e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw new ServiceException(TextUtil.FILE_COULD_NOT_BE_PARSED, e.getMessage(), null, e); } catch (Exception e) { - LOGGER.log(Level.SEVERE, e.getMessage()); - LogUtil.logStackTraceElements(LOGGER, Level.SEVERE, e); + LOGGER.log(Level.WARNING, e.getMessage()); + LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e); throw e; } } diff --git a/src/main/java/org/openepics/names/rest/controller/VerificationController.java b/src/main/java/org/openepics/names/rest/controller/VerificationController.java index b28eeea2..64c6d00f 100644 --- a/src/main/java/org/openepics/names/rest/controller/VerificationController.java +++ b/src/main/java/org/openepics/names/rest/controller/VerificationController.java @@ -1032,7 +1032,7 @@ public class VerificationController { */ private void prepareLogReport(String message, StringBuilder reportHtml) { if (!StringUtils.isEmpty(message)) { - LOGGER.log(Level.INFO, message); + LOGGER.log(Level.FINE, message); reportHtml.append(message + NEW_LINE_BR); } } diff --git a/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java index 613d83bf..629995c6 100644 --- a/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java +++ b/src/main/java/org/openepics/names/rest/controller/old/DeviceNamesControllerV0.java @@ -123,7 +123,7 @@ public class DeviceNamesControllerV0 { deviceNameElements.add(DeviceNameElementUtil.getDeviceNameElement(name, holder)); } - LOGGER.log(Level.INFO, "findNames, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNames, deviceNameElement s.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -152,7 +152,7 @@ public class DeviceNamesControllerV0 { try { pattern = Pattern.compile(name); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return deviceNameElements; } @@ -167,8 +167,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesSearch, name: {0}", name); - LOGGER.log(Level.INFO, "findNamesSearch, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesSearch, name: {0}", name); + LOGGER.log(Level.FINE, "findNamesSearch, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -203,8 +203,8 @@ public class DeviceNamesControllerV0 { deviceNameElements.add(DeviceNameElementUtil.getDeviceNameElement(name, holder)); } - LOGGER.log(Level.INFO, "findNamesBySystem, system: {0}", system); - LOGGER.log(Level.INFO, "findNamesBySystem, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesBySystem, system: {0}", system); + LOGGER.log(Level.FINE, "findNamesBySystem, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -228,7 +228,7 @@ public class DeviceNamesControllerV0 { try { pattern = Pattern.compile(system); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return deviceNameElements; } @@ -244,8 +244,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesSearch, system: {0}", system); - LOGGER.log(Level.INFO, "findNamesSearch, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesSearch, system: {0}", system); + LOGGER.log(Level.FINE, "findNamesSearch, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -277,8 +277,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesBySubsystem, subsystem: {0}", subsystem); - LOGGER.log(Level.INFO, "findNamesBySubsystem, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesBySubsystem, subsystem: {0}", subsystem); + LOGGER.log(Level.FINE, "findNamesBySubsystem, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -302,7 +302,7 @@ public class DeviceNamesControllerV0 { try { pattern = Pattern.compile(subsystem); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return deviceNameElements; } @@ -318,8 +318,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesBySubsystemSearch, subsystem: {0}", subsystem); - LOGGER.log(Level.INFO, "findNamesBySubsystemSearch, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesBySubsystemSearch, subsystem: {0}", subsystem); + LOGGER.log(Level.FINE, "findNamesBySubsystemSearch, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -351,8 +351,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesByDiscipline, discipline: {0}", discipline); - LOGGER.log(Level.INFO, "findNamesByDiscipline, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesByDiscipline, discipline: {0}", discipline); + LOGGER.log(Level.FINE, "findNamesByDiscipline, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -376,7 +376,7 @@ public class DeviceNamesControllerV0 { try { pattern = Pattern.compile(discipline); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return deviceNameElements; } @@ -392,8 +392,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesByDisciplineSearch, discipline: {0}", discipline); - LOGGER.log(Level.INFO, "findNamesByDisciplineSearch, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesByDisciplineSearch, discipline: {0}", discipline); + LOGGER.log(Level.FINE, "findNamesByDisciplineSearch, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -425,8 +425,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesByDeviceType, deviceType: {0}", deviceType); - LOGGER.log(Level.INFO, "findNamesByDeviceType, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesByDeviceType, deviceType: {0}", deviceType); + LOGGER.log(Level.FINE, "findNamesByDeviceType, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -450,7 +450,7 @@ public class DeviceNamesControllerV0 { try { pattern = Pattern.compile(deviceType); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); return deviceNameElements; } @@ -466,8 +466,8 @@ public class DeviceNamesControllerV0 { } } - LOGGER.log(Level.INFO, "findNamesByDeviceTypeSearch, deviceType: {0}", deviceType); - LOGGER.log(Level.INFO, "findNamesByDeviceTypeSearch, deviceNameElements.size: {0}", deviceNameElements.size()); + LOGGER.log(Level.FINE, "findNamesByDeviceTypeSearch, deviceType: {0}", deviceType); + LOGGER.log(Level.FINE, "findNamesByDeviceTypeSearch, deviceNameElements.size: {0}", deviceNameElements.size()); return deviceNameElements; } @@ -493,8 +493,8 @@ public class DeviceNamesControllerV0 { } DeviceNameElement deviceNameElement = DeviceNameElementUtil.getDeviceNameElement(name, holderIRepositories); - LOGGER.log(Level.INFO, "findName, uuid: {0}", uuid); - LOGGER.log(Level.INFO, "findName, deviceNameElement: {0}", deviceNameElement); + LOGGER.log(Level.FINE, "findName, uuid: {0}", uuid); + LOGGER.log(Level.FINE, "findName, deviceNameElement: {0}", deviceNameElement); return deviceNameElement; } diff --git a/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java index 265d075f..e467d40a 100644 --- a/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java +++ b/src/main/java/org/openepics/names/rest/controller/old/HistoryControllerV0.java @@ -224,8 +224,8 @@ public class HistoryControllerV0 { } } - LOGGER.log(Level.INFO, "findNamePartHistoryForUuid, uuid: {0}", uuid); - LOGGER.log(Level.INFO, "findNamePartHistoryForUuid, historyElements.size: {0}", historyElements.size()); + LOGGER.log(Level.FINE, "findNamePartHistoryForUuid, uuid: {0}", uuid); + LOGGER.log(Level.FINE, "findNamePartHistoryForUuid, historyElements.size: {0}", historyElements.size()); return historyElements; } @@ -256,8 +256,8 @@ public class HistoryControllerV0 { historyElements.add(HistoryElementUtil.getHistoryElement(name)); } - LOGGER.log(Level.INFO, "findNameHistoryForUuid, uuid: {0}", uuid); - LOGGER.log(Level.INFO, "findNameHistoryForUuid, historyElements.size: {0}", historyElements.size()); + LOGGER.log(Level.FINE, "findNameHistoryForUuid, uuid: {0}", uuid); + LOGGER.log(Level.FINE, "findNameHistoryForUuid, historyElements.size: {0}", historyElements.size()); return historyElements; } diff --git a/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java b/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java index 9c34b77d..69ed3203 100644 --- a/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java +++ b/src/main/java/org/openepics/names/rest/controller/old/PartControllerV0.java @@ -141,8 +141,8 @@ public class PartControllerV0 { partElements.add(PartElementUtil.getPartElement(deviceType, holderIRepositories)); } - LOGGER.log(Level.INFO, "findPartsByMnemonic, mnemonic: {0}", mnemonic); - LOGGER.log(Level.INFO, "findPartsByMnemonic, partElements.size: {0}", partElements.size()); + LOGGER.log(Level.FINE, "findPartsByMnemonic, mnemonic: {0}", mnemonic); + LOGGER.log(Level.FINE, "findPartsByMnemonic, partElements.size: {0}", partElements.size()); return partElements; } @@ -167,7 +167,7 @@ public class PartControllerV0 { try { pattern = Pattern.compile(mnemonic); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } // find in system structure @@ -213,8 +213,8 @@ public class PartControllerV0 { } } - LOGGER.log(Level.INFO, "getAllPartsByMnemonicSearch, mnemonic: {0}", mnemonic); - LOGGER.log(Level.INFO, "getAllPartsByMnemonicSearch, partElements.size: {0}", partElements.size()); + LOGGER.log(Level.FINE, "getAllPartsByMnemonicSearch, mnemonic: {0}", mnemonic); + LOGGER.log(Level.FINE, "getAllPartsByMnemonicSearch, partElements.size: {0}", partElements.size()); return partElements; } @@ -239,7 +239,7 @@ public class PartControllerV0 { try { pattern = Pattern.compile(mnemonicPath); } catch (PatternSyntaxException e) { - LOGGER.log(Level.FINE, e.getMessage(), e); + LOGGER.log(Level.WARNING, e.getMessage(), e); } // find in system structure @@ -293,8 +293,8 @@ public class PartControllerV0 { } } - LOGGER.log(Level.INFO, "findPartsByMnemonicPathSearch, mnemonicPath: {0}", mnemonicPath); - LOGGER.log(Level.INFO, "findPartsByMnemonicPathSearch, partElements.size: {0}", partElements.size()); + LOGGER.log(Level.FINE, "findPartsByMnemonicPathSearch, mnemonicPath: {0}", mnemonicPath); + LOGGER.log(Level.FINE, "findPartsByMnemonicPathSearch, partElements.size: {0}", partElements.size()); return partElements; } diff --git a/src/main/java/org/openepics/names/service/NamesService.java b/src/main/java/org/openepics/names/service/NamesService.java index c6f8a177..d1f918a4 100644 --- a/src/main/java/org/openepics/names/service/NamesService.java +++ b/src/main/java/org/openepics/names/service/NamesService.java @@ -144,7 +144,7 @@ public class NamesService { // return // name elements for created names - LOGGER.log(Level.INFO, "createNames, nameElements.size: {0}", String.valueOf(nameElements != null ? nameElements.size() : "null")); + LOGGER.log(Level.FINE, "createNames, nameElements.size: {0}", String.valueOf(nameElements != null ? nameElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -157,7 +157,7 @@ public class NamesService { createdNameElements.add(createName(nameElement, holder, requestedBy)); } - LOGGER.log(Level.INFO, "createNames, createdNameElements.size: {0}", createdNameElements.size()); + LOGGER.log(Level.FINE, "createNames, createdNameElements.size: {0}", createdNameElements.size()); return createdNameElements; } @Transactional(propagation = Propagation.MANDATORY) @@ -215,22 +215,22 @@ public class NamesService { Boolean deleted, FieldName[] queryFields, String[] queryValues, Boolean includeHistory, FieldName orderBy, Boolean isAsc, Integer offset, Integer limit) { - LOGGER.log(Level.INFO, "readNames, deleted: {0}", deleted); - LOGGER.log(Level.INFO, "readNames, queryFields.length: {0}", String.valueOf(queryFields != null ? queryFields.length : "null")); - LOGGER.log(Level.INFO, "readNames, queryValues.length: {0}", String.valueOf(queryValues != null ? queryValues.length : "null")); - LOGGER.log(Level.INFO, "readNames, includeHistory: {0}", includeHistory); - LOGGER.log(Level.INFO, "readNames, orderBy: {0}", orderBy); - LOGGER.log(Level.INFO, "readNames, isAsc: {0}", isAsc); - LOGGER.log(Level.INFO, "readNames, offset: {0}", offset); - LOGGER.log(Level.INFO, "readNames, limit: {0}", limit); + LOGGER.log(Level.FINE, "readNames, deleted: {0}", deleted); + LOGGER.log(Level.FINE, "readNames, queryFields.length: {0}", String.valueOf(queryFields != null ? queryFields.length : "null")); + LOGGER.log(Level.FINE, "readNames, queryValues.length: {0}", String.valueOf(queryValues != null ? queryValues.length : "null")); + LOGGER.log(Level.FINE, "readNames, includeHistory: {0}", includeHistory); + LOGGER.log(Level.FINE, "readNames, orderBy: {0}", orderBy); + LOGGER.log(Level.FINE, "readNames, isAsc: {0}", isAsc); + LOGGER.log(Level.FINE, "readNames, offset: {0}", offset); + LOGGER.log(Level.FINE, "readNames, limit: {0}", limit); if (queryFields != null && queryFields.length > 0) { for (FieldName queryField : queryFields) { - LOGGER.log(Level.INFO, "readNames, queryField: {0}", queryField); + LOGGER.log(Level.FINE, "readNames, queryField: {0}", queryField); } } if (queryValues != null && queryValues.length > 0) { for (String queryValue : queryValues) { - LOGGER.log(Level.INFO, "readNames, queryValue: {0}", queryValue); + LOGGER.log(Level.FINE, "readNames, queryValue: {0}", queryValue); } } @@ -259,7 +259,7 @@ public class NamesService { } ResponsePageNameElements response = new ResponsePageNameElements(nameElements, totalCount, nameElements.size(), offset, limit); - LOGGER.log(Level.INFO, "readNames, response: {0}", response); + LOGGER.log(Level.FINE, "readNames, response: {0}", response); return response; } @@ -267,7 +267,7 @@ public class NamesService { String name, FieldName orderBy, Boolean isAsc, Integer offset, Integer limit) { - LOGGER.log(Level.INFO, "readNames, name: {0}", name); + LOGGER.log(Level.FINE, "readNames, name: {0}", name); // validate input // name or uuid @@ -300,7 +300,7 @@ public class NamesService { String mnemonicpath, FieldName orderBy, Boolean isAsc, Integer offset, Integer limit) { - LOGGER.log(Level.INFO, "readNamesSystemStructure, mnemonicpath: {0}", mnemonicpath); + LOGGER.log(Level.FINE, "readNamesSystemStructure, mnemonicpath: {0}", mnemonicpath); // validate input // mnemonic path @@ -320,7 +320,7 @@ public class NamesService { String mnemonicpath, FieldName orderBy, Boolean isAsc, Integer offset, Integer limit) { - LOGGER.log(Level.INFO, "readNamesDeviceStructure, mnemonicpath: {0}", mnemonicpath); + LOGGER.log(Level.FINE, "readNamesDeviceStructure, mnemonicpath: {0}", mnemonicpath); // validate input // mnemonic path @@ -339,7 +339,7 @@ public class NamesService { public ResponsePageNameElements readNamesHistory( String uuid, FieldName orderBy, Boolean isAsc, Integer offset, Integer limit) { - LOGGER.log(Level.INFO, "readNamesHistory, uuid: {0}", uuid); + LOGGER.log(Level.FINE, "readNamesHistory, uuid: {0}", uuid); // note // HolderIRepositories and HolderSystemDeviceStructure may or may not be used for preparation of what to return @@ -368,7 +368,7 @@ public class NamesService { // ---------------------------------------------------------------------------------------------------- public String equivalenceName(String name) { - LOGGER.log(Level.INFO, "equivalenceName, name: {0}", name); + LOGGER.log(Level.FINE, "equivalenceName, name: {0}", name); // validate input // do @@ -382,7 +382,7 @@ public class NamesService { } public Boolean existsName(String name) { - LOGGER.log(Level.INFO, "existsName, name: {0}", name); + LOGGER.log(Level.FINE, "existsName, name: {0}", name); // validate input // do @@ -397,7 +397,7 @@ public class NamesService { } public Boolean isLegacyName(String name) { - LOGGER.log(Level.INFO, "isLegacyName, name: {0}", name); + LOGGER.log(Level.FINE, "isLegacyName, name: {0}", name); // validate input // do @@ -493,7 +493,7 @@ public class NamesService { } public Boolean isValidToCreateName(String name) { - LOGGER.log(Level.INFO, "isValidToCreateName, name: {0}", name); + LOGGER.log(Level.FINE, "isValidToCreateName, name: {0}", name); // validate input // validate data @@ -624,7 +624,7 @@ public class NamesService { // return // name elements for updated names - LOGGER.log(Level.INFO, "updateNames, nameElements.size: {0}", String.valueOf(nameElements != null ? nameElements.size() : "null")); + LOGGER.log(Level.FINE, "updateNames, nameElements.size: {0}", String.valueOf(nameElements != null ? nameElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -687,7 +687,7 @@ public class NamesService { updatedNameElements.add(NameElementUtil.getNameElement(name)); } - LOGGER.log(Level.INFO, "updateNames, updatedNameElements.size: {0}", updatedNameElements.size()); + LOGGER.log(Level.FINE, "updateNames, updatedNameElements.size: {0}", updatedNameElements.size()); return updatedNameElements; } @@ -705,7 +705,7 @@ public class NamesService { // return // name element for deleted name - LOGGER.log(Level.INFO, "deleteNames, nameElements.size: {0}", String.valueOf(nameElements != null ? nameElements.size() : "null")); + LOGGER.log(Level.FINE, "deleteNames, nameElements.size: {0}", String.valueOf(nameElements != null ? nameElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -757,7 +757,7 @@ public class NamesService { deletedNameElements.add(NameElementUtil.getNameElement(name)); } - LOGGER.log(Level.INFO, "deleteNames, deletedNameElements.size: {0}", deletedNameElements.size()); + LOGGER.log(Level.FINE, "deleteNames, deletedNameElements.size: {0}", deletedNameElements.size()); return deletedNameElements; } diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java index e8b55d22..255c615e 100644 --- a/src/main/java/org/openepics/names/service/StructuresService.java +++ b/src/main/java/org/openepics/names/service/StructuresService.java @@ -148,7 +148,7 @@ public class StructuresService { // return // structure elements for created structures - LOGGER.log(Level.INFO, "createStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); + LOGGER.log(Level.FINE, "createStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -258,7 +258,7 @@ public class StructuresService { } } - LOGGER.log(Level.INFO, "createStructures, createdStructureElements.size: {0}", createdStructureElements.size()); + LOGGER.log(Level.FINE, "createStructures, createdStructureElements.size: {0}", createdStructureElements.size()); return createdStructureElements; } @@ -275,30 +275,30 @@ public class StructuresService { FieldStructure orderBy, Boolean isAsc, Integer offset, Integer limit, StructureChoice structureChoice) { - LOGGER.log(Level.INFO, "readStructures, type: {0}", type); - LOGGER.log(Level.INFO, "readStructures, statuses.length: {0}", String.valueOf(statuses != null ? statuses.length : "null")); - LOGGER.log(Level.INFO, "readStructures, deleted: {0}", deleted); - LOGGER.log(Level.INFO, "readStructures, queryFields.length: {0}", String.valueOf(queryFields != null ? queryFields.length : "null")); - LOGGER.log(Level.INFO, "readStructures, queryValues.length: {0}", String.valueOf(queryValues != null ? queryValues.length : "null")); - LOGGER.log(Level.INFO, "readStructures, includeHistory: {0}", includeHistory); - LOGGER.log(Level.INFO, "readStructures, orderBy: {0}", orderBy); - LOGGER.log(Level.INFO, "readStructures, isAsc: {0}", isAsc); - LOGGER.log(Level.INFO, "readStructures, offset: {0}", offset); - LOGGER.log(Level.INFO, "readStructures, limit: {0}", limit); - LOGGER.log(Level.INFO, "readStructures, structureChoice: {0}", structureChoice); + LOGGER.log(Level.FINE, "readStructures, type: {0}", type); + LOGGER.log(Level.FINE, "readStructures, statuses.length: {0}", String.valueOf(statuses != null ? statuses.length : "null")); + LOGGER.log(Level.FINE, "readStructures, deleted: {0}", deleted); + LOGGER.log(Level.FINE, "readStructures, queryFields.length: {0}", String.valueOf(queryFields != null ? queryFields.length : "null")); + LOGGER.log(Level.FINE, "readStructures, queryValues.length: {0}", String.valueOf(queryValues != null ? queryValues.length : "null")); + LOGGER.log(Level.FINE, "readStructures, includeHistory: {0}", includeHistory); + LOGGER.log(Level.FINE, "readStructures, orderBy: {0}", orderBy); + LOGGER.log(Level.FINE, "readStructures, isAsc: {0}", isAsc); + LOGGER.log(Level.FINE, "readStructures, offset: {0}", offset); + LOGGER.log(Level.FINE, "readStructures, limit: {0}", limit); + LOGGER.log(Level.FINE, "readStructures, structureChoice: {0}", structureChoice); if (statuses != null && statuses.length > 0) { for (Status status : statuses) { - LOGGER.log(Level.INFO, "readStructures, status: {0}", status); + LOGGER.log(Level.FINE, "readStructures, status: {0}", status); } } if (queryFields != null && queryFields.length > 0) { for (FieldStructure queryField : queryFields) { - LOGGER.log(Level.INFO, "readStructures, queryField: {0}", queryField); + LOGGER.log(Level.FINE, "readStructures, queryField: {0}", queryField); } } if (queryValues != null && queryValues.length > 0) { for (String queryValue : queryValues) { - LOGGER.log(Level.INFO, "readStructures, queryValue: {0}", queryValue); + LOGGER.log(Level.FINE, "readStructures, queryValue: {0}", queryValue); } } @@ -331,7 +331,7 @@ public class StructuresService { orderBy, isAsc, offset, limit); totalCount = holderRepositories.getSystemGroupRepository().countSystemGroups(statuses, deleted, queryFields, queryValues, includeHistory); - LOGGER.log(Level.INFO, "readStructures, systemGroups.size: {0}", systemGroups.size()); + LOGGER.log(Level.FINE, "readStructures, systemGroups.size: {0}", systemGroups.size()); structureElements.addAll(StructureElementUtil.getStructureElementsForSystemGroups(systemGroups, holder, structureChoice)); } else if (Type.SYSTEM.equals(type)) { List<System> systems = holderRepositories.getSystemRepository().readSystems( @@ -340,7 +340,7 @@ public class StructuresService { orderBy, isAsc, offset, limit); totalCount = holderRepositories.getSystemRepository().countSystems(statuses, deleted, queryFields, queryValues, includeHistory); - LOGGER.log(Level.INFO, "readStructures, systems.size: {0}", systems.size()); + LOGGER.log(Level.FINE, "readStructures, systems.size: {0}", systems.size()); structureElements.addAll(StructureElementUtil.getStructureElementsForSystems(systems, holder, structureChoice)); } else if (Type.SUBSYSTEM.equals(type)) { List<Subsystem> subsystems = holderRepositories.getSubsystemRepository().readSubsystems( @@ -349,7 +349,7 @@ public class StructuresService { orderBy, isAsc, offset, limit); totalCount = holderRepositories.getSubsystemRepository().countSubsystems(statuses, deleted, queryFields, queryValues, includeHistory); - LOGGER.log(Level.INFO, "readStructures, subsystems.size: {0}", subsystems.size()); + LOGGER.log(Level.FINE, "readStructures, subsystems.size: {0}", subsystems.size()); structureElements.addAll(StructureElementUtil.getStructureElementsForSubsystems(subsystems, holder, structureChoice)); } else if (Type.DISCIPLINE.equals(type)) { List<Discipline> disciplines = holderRepositories.getDisciplineRepository().readDisciplines( @@ -358,7 +358,7 @@ public class StructuresService { orderBy, isAsc, offset, limit); totalCount = holderRepositories.getDisciplineRepository().countDisciplines(statuses, deleted, queryFields, queryValues, includeHistory); - LOGGER.log(Level.INFO, "readStructures, disciplines.size: {0}", disciplines.size()); + LOGGER.log(Level.FINE, "readStructures, disciplines.size: {0}", disciplines.size()); structureElements.addAll(StructureElementUtil.getStructureElementsForDisciplines(disciplines, holder, structureChoice)); } else if (Type.DEVICEGROUP.equals(type)) { List<DeviceGroup> deviceGroups = holderRepositories.getDeviceGroupRepository().readDeviceGroups( @@ -367,7 +367,7 @@ public class StructuresService { orderBy, isAsc, offset, limit); totalCount = holderRepositories.getDeviceGroupRepository().countDeviceGroups(statuses, deleted, queryFields, queryValues, includeHistory); - LOGGER.log(Level.INFO, "readStructures, deviceGroups.size: {0}", deviceGroups.size()); + LOGGER.log(Level.FINE, "readStructures, deviceGroups.size: {0}", deviceGroups.size()); structureElements.addAll(StructureElementUtil.getStructureElementsForDeviceGroups(deviceGroups, holder, structureChoice)); } else if (Type.DEVICETYPE.equals(type)) { List<DeviceType> deviceTypes = holderRepositories.getDeviceTypeRepository().readDeviceTypes( @@ -376,12 +376,12 @@ public class StructuresService { orderBy, isAsc, offset, limit); totalCount = holderRepositories.getDeviceTypeRepository().countDeviceTypes(statuses, deleted, queryFields, queryValues, includeHistory); - LOGGER.log(Level.INFO, "readStructures, deviceTypes.size: {0}", deviceTypes.size()); + LOGGER.log(Level.FINE, "readStructures, deviceTypes.size: {0}", deviceTypes.size()); structureElements.addAll(StructureElementUtil.getStructureElementsForDeviceTypes(deviceTypes, holder, structureChoice)); } ResponsePageStructureElements response = new ResponsePageStructureElements(structureElements, totalCount, structureElements.size(), offset, limit); - LOGGER.log(Level.INFO, "readStructures, response: {0}", response); + LOGGER.log(Level.FINE, "readStructures, response: {0}", response); return response; } @@ -396,8 +396,8 @@ public class StructuresService { // return // structure elements for structures - LOGGER.log(Level.INFO, "readStructuresChildren, type: {0}", type); - LOGGER.log(Level.INFO, "readStructuresChildren, uuid: {0}", uuid); + LOGGER.log(Level.FINE, "readStructuresChildren, type: {0}", type); + LOGGER.log(Level.FINE, "readStructuresChildren, uuid: {0}", uuid); // validate input ValidateUtil.validateInputType(type); @@ -839,7 +839,7 @@ public class StructuresService { // return // structure elements for updated structures - LOGGER.log(Level.INFO, "updateStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); + LOGGER.log(Level.FINE, "updateStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -949,7 +949,7 @@ public class StructuresService { } } - LOGGER.log(Level.INFO, "updateStructures, updatedStructureElements.size: {0}", updatedStructureElements.size()); + LOGGER.log(Level.FINE, "updateStructures, updatedStructureElements.size: {0}", updatedStructureElements.size()); return updatedStructureElements; } @@ -969,7 +969,7 @@ public class StructuresService { // structure elements for deleted structures // TODO continue ---> validation error - LOGGER.log(Level.INFO, "deleteStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); + LOGGER.log(Level.FINE, "deleteStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -1113,7 +1113,7 @@ public class StructuresService { } } - LOGGER.log(Level.INFO, "deleteStructures, deletedStructureElements.size: {0}", deletedStructureElements.size()); + LOGGER.log(Level.FINE, "deleteStructures, deletedStructureElements.size: {0}", deletedStructureElements.size()); return deletedStructureElements; } @@ -1130,7 +1130,7 @@ public class StructuresService { // updated structure element // TODO continue ---> validation error - LOGGER.log(Level.INFO, "approveStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); + LOGGER.log(Level.FINE, "approveStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -1181,7 +1181,7 @@ public class StructuresService { if (!StringUtils.isEmpty(systemGroup.getMnemonic())) { NameElementCommand nameElement = new NameElementCommand(null, systemGroup.getUuid(), null, null, SYSTEM_STRUCTURE_ONLY, null); NameElement createdNameElement = namesService.createName(nameElement, holder, processedBy); - LOGGER.log(Level.INFO, "approveStructures, nameElement created, name: {0}", createdNameElement.getName()); + LOGGER.log(Level.FINE, "approveStructures, nameElement created, name: {0}", createdNameElement.getName()); } // add @@ -1217,7 +1217,7 @@ public class StructuresService { if (!StringUtils.isEmpty(system.getMnemonic())) { NameElementCommand nameElement = new NameElementCommand(null, system.getUuid(), null, null, SYSTEM_STRUCTURE_ONLY, null); NameElement createdNameElement = namesService.createName(nameElement, holder, processedBy); - LOGGER.log(Level.INFO, "approveStructures, nameElement created, name: {0}", createdNameElement.getName()); + LOGGER.log(Level.FINE, "approveStructures, nameElement created, name: {0}", createdNameElement.getName()); } // add @@ -1253,7 +1253,7 @@ public class StructuresService { if (!StringUtils.isEmpty(subsystem.getMnemonic())) { NameElementCommand nameElement = new NameElementCommand(null, subsystem.getUuid(), null, null, SYSTEM_STRUCTURE_ONLY, null); NameElement createdNameElement = namesService.createName(nameElement, holder, processedBy); - LOGGER.log(Level.INFO, "approveStructures, nameElement created, name: {0}", createdNameElement.getName()); + LOGGER.log(Level.FINE, "approveStructures, nameElement created, name: {0}", createdNameElement.getName()); } // add @@ -1344,7 +1344,7 @@ public class StructuresService { } } - LOGGER.log(Level.INFO, "approveStructures, approvedStructureElements.size: {0}", approvedStructureElements.size()); + LOGGER.log(Level.FINE, "approveStructures, approvedStructureElements.size: {0}", approvedStructureElements.size()); return approvedStructureElements; } @@ -1359,7 +1359,7 @@ public class StructuresService { // updated structure element // TODO continue ---> validation error - LOGGER.log(Level.INFO, "cancelStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); + LOGGER.log(Level.FINE, "cancelStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -1466,7 +1466,7 @@ public class StructuresService { } } - LOGGER.log(Level.INFO, "cancelStructures, cancelledStructureElements.size: {0}", cancelledStructureElements.size()); + LOGGER.log(Level.FINE, "cancelStructures, cancelledStructureElements.size: {0}", cancelledStructureElements.size()); return cancelledStructureElements; } @@ -1481,7 +1481,7 @@ public class StructuresService { // updated structure element // TODO continue ---> validation error - LOGGER.log(Level.INFO, "rejectStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); + LOGGER.log(Level.FINE, "rejectStructures, structureElements.size: {0}", String.valueOf(structureElements != null ? structureElements.size() : "null")); // initiate holder of containers for system and device structure content, for performance reasons HolderSystemDeviceStructure holder = new HolderSystemDeviceStructure(holderIRepositories); @@ -1588,7 +1588,7 @@ public class StructuresService { } } - LOGGER.log(Level.INFO, "rejectStructures, rejectedStructureElements.size: {0}", rejectedStructureElements.size()); + LOGGER.log(Level.FINE, "rejectStructures, rejectedStructureElements.size: {0}", rejectedStructureElements.size()); return rejectedStructureElements; } diff --git a/src/main/java/org/openepics/names/util/ExcelUtil.java b/src/main/java/org/openepics/names/util/ExcelUtil.java index e7f72859..7bda187c 100644 --- a/src/main/java/org/openepics/names/util/ExcelUtil.java +++ b/src/main/java/org/openepics/names/util/ExcelUtil.java @@ -213,7 +213,7 @@ public class ExcelUtil { } workbook.close(); - LOGGER.log(Level.INFO, ENTRIES_EXCEL_TO_NAME_ELEMENT_COMMANDS, list.size()); + LOGGER.log(Level.FINE, ENTRIES_EXCEL_TO_NAME_ELEMENT_COMMANDS, list.size()); return list; } catch (IllegalArgumentException | IOException e) { throw new ServiceException( @@ -301,7 +301,7 @@ public class ExcelUtil { } workbook.close(); - LOGGER.log(Level.INFO, ENTRIES_EXCEL_TO_STRUCTURE_ELEMENT_COMMANDS, list.size()); + LOGGER.log(Level.FINE, ENTRIES_EXCEL_TO_STRUCTURE_ELEMENT_COMMANDS, list.size()); return list; } catch (IllegalArgumentException | IOException e) { throw new ServiceException( @@ -384,7 +384,7 @@ public class ExcelUtil { * @return Excel file */ public static ByteArrayInputStream nameElementsToExcel(List<NameElement> nameElements) { - LOGGER.log(Level.INFO, ENTRIES_NAME_ELEMENTS_TO_EXCEL, nameElements.size()); + LOGGER.log(Level.FINE, ENTRIES_NAME_ELEMENTS_TO_EXCEL, nameElements.size()); try (Workbook workbook = new XSSFWorkbook(); ByteArrayOutputStream out = new ByteArrayOutputStream();) { Sheet sheet = workbook.createSheet(SHEET); @@ -470,7 +470,7 @@ public class ExcelUtil { * @return Excel file */ public static ByteArrayInputStream structureElementsToExcel(List<StructureElement> structureElements) { - LOGGER.log(Level.INFO, ENTRIES_STRUCTURE_ELEMENTS_TO_EXCEL, structureElements.size()); + LOGGER.log(Level.FINE, ENTRIES_STRUCTURE_ELEMENTS_TO_EXCEL, structureElements.size()); try (Workbook workbook = new XSSFWorkbook(); ByteArrayOutputStream out = new ByteArrayOutputStream();) { Sheet sheet = workbook.createSheet(SHEET); diff --git a/src/main/java/org/openepics/names/util/LogUtil.java b/src/main/java/org/openepics/names/util/LogUtil.java index f8acc373..57b2da35 100644 --- a/src/main/java/org/openepics/names/util/LogUtil.java +++ b/src/main/java/org/openepics/names/util/LogUtil.java @@ -75,7 +75,7 @@ public class LogUtil { * @param e service exception */ public static void logStackTraceElements(Logger logger, Level level, ServiceException e) { - logStackTraceElements(logger, Level.SEVERE, e, 10, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL); + logStackTraceElements(logger, level, e, 10, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL); } /** @@ -86,7 +86,7 @@ public class LogUtil { * @param e exception */ public static void logStackTraceElements(Logger logger, Level level, Exception e) { - logStackTraceElements(logger, Level.SEVERE, e, 10, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL); + logStackTraceElements(logger, level, e, 10, ORG_OPENEPICS_NAMES, ORG_OPENEPICS_NAMES_UTIL_EXCEPTION_UTIL); } /** diff --git a/src/main/resources/application-docker.properties b/src/main/resources/application-docker.properties index 272502d9..5dc8bd5d 100644 --- a/src/main/resources/application-docker.properties +++ b/src/main/resources/application-docker.properties @@ -1,3 +1,8 @@ +# ------------------------------------------------------------------------------ +# Naming +# ------------------------------------------------------------------------------ + +logging.level.org.openepics.names=DEBUG server.port=8083 @@ -11,7 +16,9 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.show-sql=true -# ------------------------------------------------------------ +# ------------------------------------------------------------------------------ +# Swagger UI +# ------------------------------------------------------------------------------ app.version=0.0.1-SNAPSHOT openapi.externaldocs.description=ESS Naming Convention diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 272502d9..5dc8bd5d 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,8 @@ +# ------------------------------------------------------------------------------ +# Naming +# ------------------------------------------------------------------------------ + +logging.level.org.openepics.names=DEBUG server.port=8083 @@ -11,7 +16,9 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect spring.jpa.hibernate.ddl-auto=none spring.jpa.hibernate.show-sql=true -# ------------------------------------------------------------ +# ------------------------------------------------------------------------------ +# Swagger UI +# ------------------------------------------------------------------------------ app.version=0.0.1-SNAPSHOT openapi.externaldocs.description=ESS Naming Convention diff --git a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java index 4aad2d9e..ec4cf2cd 100644 --- a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java +++ b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java @@ -86,7 +86,6 @@ class StructureElementUtilTest { // for (Field field : superclass_fields) { // System.out.println("superclass_fields.field.getName: " + field.getName()); // } - // // LOGGER.log(Level.INFO, "-----------------------------------------"); // System.out.println("-----------------------------------------"); // for (Field field : superclass_declaredFields) { // System.out.println("superclass_declaredFields.field.getName: " + field.getName()); -- GitLab