handle failing test

Author: jrhee17

core/src/main/java/com/linecorp/armeria/internal/server/annotation/AnnotatedServiceLogUtil.java

@@ -55,14 +55,18 @@ public final class AnnotatedServiceLogUtil {
 
     public static void customize(ObjectMapper objectMapper) {
         final SimpleModule module = new SimpleModule("annotated-service-logging");
-        for (Class<?> clazz : wellKnownTypes) {
-            module.addSerializer(clazz, new ToStringSerializer(clazz));
-        }
+        customizeWellKnownSerializers(module);
         module.addSerializer(new AnnotatedRequestJsonSerializer());
         module.addSerializer(new AnnotatedResponseJsonSerializer());
         objectMapper.registerModule(module);
     }
 
+    public static void customizeWellKnownSerializers(SimpleModule module) {
+        for (Class<?> clazz : wellKnownTypes) {
+            module.addSerializer(clazz, new ToStringSerializer(clazz));
+        }
+    }
+
     @Nullable
     static Object maybeUnwrapFuture(@Nullable Object param) {
         if (param == null) {

core/src/main/java/com/linecorp/armeria/internal/server/annotation/BeanFieldMaskerSelectorProvider.java

@@ -16,6 +16,8 @@
 
 package com.linecorp.armeria.internal.server.annotation;
 
+import static com.linecorp.armeria.internal.server.annotation.AnnotatedServiceLogUtil.customizeWellKnownSerializers;
+
 import java.util.List;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -46,6 +48,7 @@ public void customize(List<BeanFieldMaskerSelector> selectors, ObjectMapper obje
         module.setDeserializerModifier(new MaskingBeanDeserializerModifier(maskerCache));
         module.addSerializer(new AnnotatedRequestJsonSerializer(maskerCache));
         module.addSerializer(new AnnotatedResponseJsonSerializer(maskerCache));
+        customizeWellKnownSerializers(module);
         objectMapper.registerModule(module);
         // default to logging "{}" instead of throwing an exception for beans not intended for jackson
         objectMapper.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);

core/src/test/java/com/linecorp/armeria/common/logging/masker/it/BeanContentSanitizerITTest.java

@@ -250,8 +250,8 @@ public CompletableFuture<SimpleFoo> hello(SimpleFoo foo, @Param String param, Ht
                                       .node("params[12]").isEqualTo("optionalParamValue")
                                       .node("params[13]").matches(new StringContains("param=paramValue"))
                                       .node("params[14]").isStringEqualTo("[]")
-                                      .node("params[15]").matches(new StringContains(":method=POST"))
-                                      .node("params[16]").matches(new StringContains(":method=POST"));
+                                      .node("params[15].:method").isStringEqualTo("POST")
+                                      .node("params[16].:method").isStringEqualTo("POST");
 
         final String responseLog = logWriter.blockingDeque().takeFirst();
         matcher = responseContentPattern.matcher(responseLog);