From d223a07333633ee8e5e10f4da3301939c9e6eda9 Mon Sep 17 00:00:00 2001
From: Lars Johansson <lars.johansson@ess.eu>
Date: Wed, 29 Jun 2022 15:36:02 +0200
Subject: [PATCH] Fix issues as noted by SonarLint

Exceptions should be either logged or rethrown but not both
---
 .../rest/controller/NamesController.java      | 21 ------------
 .../rest/controller/StructuresController.java | 32 -------------------
 2 files changed, 53 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 ed70ad58..90673b59 100644
--- a/src/main/java/org/openepics/names/rest/controller/NamesController.java
+++ b/src/main/java/org/openepics/names/rest/controller/NamesController.java
@@ -88,7 +88,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -119,11 +118,9 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (IOException 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.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -144,7 +141,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -172,7 +168,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -189,7 +184,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -206,7 +200,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -223,7 +216,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -240,7 +232,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -255,7 +246,6 @@ public class NamesController implements INames {
             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.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);
         }
@@ -270,7 +260,6 @@ public class NamesController implements INames {
             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.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);
         }
@@ -285,7 +274,6 @@ public class NamesController implements INames {
             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.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);
         }
@@ -311,7 +299,6 @@ public class NamesController implements INames {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -341,7 +328,6 @@ public class NamesController implements INames {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -371,7 +357,6 @@ public class NamesController implements INames {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -400,7 +385,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -431,11 +415,9 @@ public class NamesController implements INames {
            LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
            throw e;
        } catch (IOException 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.WARNING, e.getMessage());
            LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
            throw e;
        }
@@ -458,7 +440,6 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -489,11 +470,9 @@ public class NamesController implements INames {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (IOException 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.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
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 4e7a0002..1f7e284f 100644
--- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java
+++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
@@ -97,7 +97,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -128,11 +127,9 @@ public class StructuresController implements IStructures {
            LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
            throw e;
        } catch (IOException 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.WARNING, e.getMessage());
            LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
            throw e;
        }
@@ -153,7 +150,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -184,7 +180,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -201,7 +196,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -218,7 +212,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -237,7 +230,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -254,7 +246,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -269,7 +260,6 @@ public class StructuresController implements IStructures {
             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.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);
         }
@@ -284,7 +274,6 @@ public class StructuresController implements IStructures {
             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.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);
         }
@@ -310,7 +299,6 @@ public class StructuresController implements IStructures {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -340,7 +328,6 @@ public class StructuresController implements IStructures {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -370,7 +357,6 @@ public class StructuresController implements IStructures {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -400,7 +386,6 @@ public class StructuresController implements IStructures {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -430,7 +415,6 @@ public class StructuresController implements IStructures {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -460,7 +444,6 @@ public class StructuresController implements IStructures {
                 }
                 responses.add(new ResponseBoolean(Boolean.FALSE, e.getMessage(), e.getDetails(), e.getField()));
             } catch (Exception e) {
-                LOGGER.log(Level.WARNING, e.getMessage());
                 LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
                 if (response) {
                     response = false;
@@ -484,7 +467,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -510,11 +492,9 @@ public class StructuresController implements IStructures {
            LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
            throw e;
        } catch (IOException 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.WARNING, e.getMessage());
            LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
            throw e;
        }
@@ -532,7 +512,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -558,11 +537,9 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (IOException 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.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -580,7 +557,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -606,11 +582,9 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (IOException 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.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -626,7 +600,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -652,11 +625,9 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (IOException 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.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -672,7 +643,6 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (Exception e) {
-            LOGGER.log(Level.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
@@ -698,11 +668,9 @@ public class StructuresController implements IStructures {
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         } catch (IOException 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.WARNING, e.getMessage());
             LogUtil.logStackTraceElements(LOGGER, Level.WARNING, e);
             throw e;
         }
-- 
GitLab