Skip to content
Snippets Groups Projects
Commit 69c26d1f authored by OZGCloud's avatar OZGCloud
Browse files

OZG-5572 return empty array when parameter names are null

parent eaa138cf
No related branches found
No related tags found
No related merge requests found
...@@ -23,9 +23,12 @@ ...@@ -23,9 +23,12 @@
*/ */
package de.ozgcloud.common.logging.logger; package de.ozgcloud.common.logging.logger;
import org.apache.commons.lang3.ArrayUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.reflect.MethodSignature; import org.aspectj.lang.reflect.MethodSignature;
import java.util.Optional;
public class AspectLogger extends CommonLogger<JoinPoint> { public class AspectLogger extends CommonLogger<JoinPoint> {
public AspectLogger(JoinPoint joinPoint) { public AspectLogger(JoinPoint joinPoint) {
...@@ -39,7 +42,7 @@ public class AspectLogger extends CommonLogger<JoinPoint> { ...@@ -39,7 +42,7 @@ public class AspectLogger extends CommonLogger<JoinPoint> {
@Override @Override
String[] getParameterNames() { String[] getParameterNames() {
return getSignature().getParameterNames(); return Optional.ofNullable(getSignature()).map(MethodSignature::getParameterNames).orElse(ArrayUtils.EMPTY_STRING_ARRAY);
} }
@Override @Override
......
...@@ -24,9 +24,12 @@ ...@@ -24,9 +24,12 @@
package de.ozgcloud.common.logging.logger; package de.ozgcloud.common.logging.logger;
import jakarta.interceptor.InvocationContext; import jakarta.interceptor.InvocationContext;
import lombok.NonNull;
import org.apache.commons.lang3.ArrayUtils;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects; import java.util.Objects;
import java.util.Optional;
public class InterceptingLogger extends CommonLogger<InvocationContext> { public class InterceptingLogger extends CommonLogger<InvocationContext> {
...@@ -41,7 +44,11 @@ public class InterceptingLogger extends CommonLogger<InvocationContext> { ...@@ -41,7 +44,11 @@ public class InterceptingLogger extends CommonLogger<InvocationContext> {
@Override @Override
String[] getParameterNames() { 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) .filter(Objects::nonNull)
.map(param -> param.getClass().getSimpleName()) .map(param -> param.getClass().getSimpleName())
.toArray(String[]::new); .toArray(String[]::new);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment