From e582bc660a41febaacaa97622535df6ebc3d50af Mon Sep 17 00:00:00 2001 From: BerndBreier <33351391+BerndBreier@users.noreply.github.com> Date: Thu, 30 Nov 2017 13:20:37 +0100 Subject: [PATCH] added gating of log statements with expensive evaluation of arguments --- .../taskana/impl/ClassificationQueryImpl.java | 12 ++++--- .../impl/ClassificationServiceImpl.java | 12 ++++--- .../impl/ObjectReferenceQueryImpl.java | 12 ++++--- .../pro/taskana/impl/SummaryServiceImpl.java | 7 ++++ .../java/pro/taskana/impl/TaskQueryImpl.java | 12 ++++--- .../pro/taskana/impl/TaskServiceImpl.java | 24 +++++++++---- .../taskana/impl/WorkbasketServiceImpl.java | 34 +++++++++++++------ 7 files changed, 79 insertions(+), 34 deletions(-) diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java index a74a42b7e..21ab1d351 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationQueryImpl.java @@ -128,8 +128,10 @@ public class ClassificationQueryImpl implements ClassificationQuery { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from list(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from list(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -144,8 +146,10 @@ public class ClassificationQueryImpl implements ClassificationQuery { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from list(offset,limit). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from list(offset,limit). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java index df5e03c39..59282a3bc 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ClassificationServiceImpl.java @@ -50,8 +50,10 @@ public class ClassificationServiceImpl implements ClassificationService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getClassificationTree(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getClassificationTree(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -158,8 +160,10 @@ public class ClassificationServiceImpl implements ClassificationService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getAllClassificationsWithId(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getAllClassificationsWithId(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java index 5d03e5686..8765f1c21 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/ObjectReferenceQueryImpl.java @@ -72,8 +72,10 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from list(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from list(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -88,8 +90,10 @@ public class ObjectReferenceQueryImpl implements ObjectReferenceQuery { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from list(offset,limit). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from list(offset,limit). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/SummaryServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/SummaryServiceImpl.java index 5645e9ddc..a76dd4091 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/SummaryServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/SummaryServiceImpl.java @@ -8,6 +8,7 @@ import org.slf4j.LoggerFactory; import pro.taskana.SummaryService; import pro.taskana.TaskanaEngine; +import pro.taskana.impl.util.LoggerUtils; import pro.taskana.model.TaskSummary; import pro.taskana.model.mappings.SummaryMapper; @@ -28,6 +29,7 @@ public class SummaryServiceImpl implements SummaryService { @Override public List getTaskSummariesByWorkbasketId(String workbasketId) { + LOGGER.debug("entry to getTaskSummariesByWorkbasketId(workbasketId = {}", workbasketId); List taskSummaries = new ArrayList<>(); try { taskanaEngineImpl.openConnection(); @@ -39,6 +41,11 @@ public class SummaryServiceImpl implements SummaryService { taskSummaries = new ArrayList<>(); } taskanaEngineImpl.returnConnection(); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = taskSummaries.size(); + LOGGER.debug("exit from getTaskSummariesByWorkbasketId(workbasketId). Returning {} resulting Objects: {} ", + numberOfResultObjects, LoggerUtils.listToString(taskSummaries)); + } } return taskSummaries; } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java index 23fc400ee..2471c0282 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskQueryImpl.java @@ -125,8 +125,10 @@ public class TaskQueryImpl implements TaskQuery { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from list(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from list(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -142,8 +144,10 @@ public class TaskQueryImpl implements TaskQuery { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from list(offset,limit). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from list(offset,limit). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java index d0b448f14..597f6cee2 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskServiceImpl.java @@ -176,7 +176,9 @@ public class TaskServiceImpl implements TaskService { @Override public List getTaskCountForState(List states) { - LOGGER.debug("entry to getTaskCountForState(states = {})", LoggerUtils.listToString(states)); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("entry to getTaskCountForState(states = {})", LoggerUtils.listToString(states)); + } List result = null; try { taskanaEngineImpl.openConnection(); @@ -184,15 +186,19 @@ public class TaskServiceImpl implements TaskService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getTaskCountForState(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getTaskCountForState(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @Override public long getTaskCountForWorkbasketByDaysInPastAndState(String workbasketId, long daysInPast, List states) { - LOGGER.debug("entry to getTaskCountForWorkbasketByDaysInPastAndState(workbasketId {}, daysInPast={}, states = {})", + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("entry to getTaskCountForWorkbasketByDaysInPastAndState(workbasketId {}, daysInPast={}, states = {})", workbasketId, daysInPast, LoggerUtils.listToString(states)); + } long result = -1; try { taskanaEngineImpl.openConnection(); @@ -247,7 +253,9 @@ public class TaskServiceImpl implements TaskService { @Override public List getTaskCountByWorkbasketAndDaysInPastAndState(long daysInPast, List states) { - LOGGER.debug("entry to getTaskCountByWorkbasketAndDaysInPastAndState(daysInPast = {}, states = {})", daysInPast, LoggerUtils.listToString(states)); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("entry to getTaskCountByWorkbasketAndDaysInPastAndState(daysInPast = {}, states = {})", daysInPast, LoggerUtils.listToString(states)); + } List result = null; try { taskanaEngineImpl.openConnection(); @@ -258,9 +266,11 @@ public class TaskServiceImpl implements TaskService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getTaskCountByWorkbasketAndDaysInPastAndState(daysInPast,states). Returning {} resulting Objects: {} ", + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getTaskCountByWorkbasketAndDaysInPastAndState(daysInPast,states). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java index ede8f43e1..4bce2e6b0 100644 --- a/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java +++ b/lib/taskana-core/src/main/java/pro/taskana/impl/WorkbasketServiceImpl.java @@ -71,7 +71,9 @@ public class WorkbasketServiceImpl implements WorkbasketService { @Override public List getWorkbaskets(List permissions) { - LOGGER.debug("entry to getWorkbaskets(permissions = {})", LoggerUtils.listToString(permissions)); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("entry to getWorkbaskets(permissions = {})", LoggerUtils.listToString(permissions)); + } List result = null; try { taskanaEngineImpl.openConnection(); @@ -85,8 +87,10 @@ public class WorkbasketServiceImpl implements WorkbasketService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getWorkbaskets(permissions). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getWorkbaskets(permissions). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -100,8 +104,10 @@ public class WorkbasketServiceImpl implements WorkbasketService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getWorkbaskets(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getWorkbaskets(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -162,10 +168,12 @@ public class WorkbasketServiceImpl implements WorkbasketService { } } distributionTargetMapper.deleteMultiple(workbasket.getId(), oldDistributionTargets); - LOGGER.info("Method updateWorkbasket() deleted distributionTargets for '{}' and old distribution targets {}", + if (LOGGER.isInfoEnabled()) { + LOGGER.info("Method updateWorkbasket() deleted distributionTargets for '{}' and old distribution targets {}", workbasket.getId(), LoggerUtils.listToString(oldDistributionTargets)); - LOGGER.info("Method updateWorkbasket() updated workbasket '{}'", workbasket.getId()); + LOGGER.info("Method updateWorkbasket() updated workbasket '{}'", workbasket.getId()); + } result = workbasketMapper.findById(workbasket.getId()); return result; } finally { @@ -226,8 +234,10 @@ public class WorkbasketServiceImpl implements WorkbasketService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getAllAuthorizations(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getAllAuthorizations(). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } @@ -287,8 +297,10 @@ public class WorkbasketServiceImpl implements WorkbasketService { return result; } finally { taskanaEngineImpl.returnConnection(); - int numberOfResultObjects = result == null ? 0 : result.size(); - LOGGER.debug("exit from getWorkbasketAuthorizations(workbasketId). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + if (LOGGER.isDebugEnabled()) { + int numberOfResultObjects = result == null ? 0 : result.size(); + LOGGER.debug("exit from getWorkbasketAuthorizations(workbasketId). Returning {} resulting Objects: {} ", numberOfResultObjects, LoggerUtils.listToString(result)); + } } } }