Merge branch 'master' into bugfix/opphoerstidspunkt-etter-gyldighetstidspunkt

Author: krharum

libs/reactive-core/src/main/java/no/nav/testnav/libs/reactivecore/logging/TestnavLogbackEncoder.java

@@ -33,8 +33,8 @@
 public class TestnavLogbackEncoder extends LogstashEncoder {
 
     // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((?<!\\d)) or followed ((?!\\d)) by another digit.
-    private final Pattern identNummer = Pattern.compile("(?<!\\d)\\d{11}(?!\\d)");
-    private final Pattern bearer = Pattern.compile("Bearer [a-zA-Z0-9\\-_.]+");
+    private static final Pattern IDENT = Pattern.compile("(?<!\\d)\\d{11}(?!\\d)");
+    private static final Pattern BEARER = Pattern.compile("Bearer [a-zA-Z0-9\\-_.]+");
     @Setter
     private int maxStackTraceLength = 480;
 
@@ -113,15 +113,14 @@ private void appendStackTraceCauses(ThrowableProxy exception, StringWriter write
     }
 
     private String formatMessage(String message) {
-        message = identNummer.matcher(message).replaceAll(match -> {
-            if (match.group().charAt(2) < '4') {
-                return match.group().substring(0, 6) + "xxxxx";
-            }
-            return match.group();
-        });
 
-        message = bearer.matcher(message).replaceAll("REDACTED_BEARER");
+        message = IDENT.matcher(message).replaceAll(match ->
+
+                match.group().charAt(2) < '4' ?
+                        match.group().substring(0, 6) + "xxxxx" :
+                        match.group().substring(0, 11) + "x"
+        );
 
-        return message;
+        return BEARER.matcher(message).replaceAll("Bearer token");
     }
 }

libs/servlet-core/src/main/java/no/nav/testnav/libs/servletcore/logging/TestnavLogbackEncoder.java

@@ -33,7 +33,8 @@
 public class TestnavLogbackEncoder extends LogstashEncoder {
 
     // matches exactly 11 digits (\\d{11}) that are not immediately preceded ((?<!\\d)) or followed ((?!\\d)) by another digit.
-    private final Pattern pattern = Pattern.compile("(?<!\\d)\\d{11}(?!\\d)");
+    private static final Pattern IDENT = Pattern.compile("(?<!\\d)\\d{11}(?!\\d)");
+    private static final Pattern BEARER = Pattern.compile("Bearer [a-zA-Z0-9\\-_.]+");
 
     @Setter
     private int maxStackTraceLength = 480;
@@ -113,24 +114,14 @@ private void appendStackTraceCauses(ThrowableProxy exception, StringWriter write
     }
 
     private String formatMessage(String message) {
-        var matcher = pattern.matcher(message);
 
-        if (!matcher.find()) {
-            return message;
-        }
-
-        matcher.reset();
-        var result = new StringBuilder();
+        message = IDENT.matcher(message).replaceAll(match ->
 
-        while (matcher.find()) {
-            var match = matcher.group();
-            if (match.charAt(2) == '0' || match.charAt(2) == '1') {
-                var replacement = match.substring(0, 6) + "xxxxx";
-                matcher.appendReplacement(result, replacement);
-            }
-        }
-        matcher.appendTail(result);
+                match.group().charAt(2) < '4' ?
+                        match.group().substring(0, 6) + "xxxxx" :
+                        match.group().substring(0, 11) + "x"
+        );
 
-        return result.toString();
+        return BEARER.matcher(message).replaceAll("Bearer token");
     }
 }