Merge pull request 'OZG-5572 CommonLogger - fehlende Parameter Namen...

Merge pull request 'OZG-5572 CommonLogger - fehlende Parameter Namen ignorieren' (#20) from OZG-5572-CommonLogger-fehlende-Parameter-Namen-ignorieren into Version-4

Reviewed-on: https://git.ozg-sh.de/ozgcloud-lib/common-lib/pulls/20


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

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

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);