diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java index 1f060fd284cbc04298c02a8b3b44ea72d29c51fc..3e1df9813e1d004fa55c50f255399860ededd7b5 100644 --- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java +++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/AspectLogger.java @@ -23,9 +23,12 @@ */ package de.ozgcloud.common.logging.logger; +import org.apache.commons.lang3.ArrayUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; +import java.util.Optional; + public class AspectLogger extends CommonLogger<JoinPoint> { public AspectLogger(JoinPoint joinPoint) { @@ -39,7 +42,7 @@ public class AspectLogger extends CommonLogger<JoinPoint> { @Override String[] getParameterNames() { - return getSignature().getParameterNames(); + return Optional.ofNullable(getSignature()).map(MethodSignature::getParameterNames).orElse(ArrayUtils.EMPTY_STRING_ARRAY); } @Override diff --git a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java index 349866f276437b4fb47d42e6cd9efa02ec014a0e..daba25500838ebd6c7a635cf1cfd002586bc933f 100644 --- a/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java +++ b/ozgcloud-common-lib/src/main/java/de/ozgcloud/common/logging/logger/InterceptingLogger.java @@ -24,9 +24,12 @@ package de.ozgcloud.common.logging.logger; import jakarta.interceptor.InvocationContext; +import lombok.NonNull; +import org.apache.commons.lang3.ArrayUtils; import java.util.Arrays; import java.util.Objects; +import java.util.Optional; public class InterceptingLogger extends CommonLogger<InvocationContext> { @@ -41,7 +44,11 @@ public class InterceptingLogger extends CommonLogger<InvocationContext> { @Override String[] getParameterNames() { - return Arrays.stream(logContext.getParameters()) + return Optional.ofNullable(logContext.getParameters()).map(this::mapParameters).orElse(ArrayUtils.EMPTY_STRING_ARRAY); + } + + private String[] mapParameters(@NonNull Object[] parameters) { + return Arrays.stream(parameters) .filter(Objects::nonNull) .map(param -> param.getClass().getSimpleName()) .toArray(String[]::new);