cleanup

Author: jrhee17

core/src/main/java/com/linecorp/armeria/common/logging/masker/ContentSanitizer.java renamed to core/src/main/java/com/linecorp/armeria/common/logging/ContentSanitizer.java

@@ -14,14 +14,12 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.common.logging;
 
 import java.util.function.BiFunction;
 
 import com.linecorp.armeria.common.RequestContext;
 import com.linecorp.armeria.common.annotation.UnstableApi;
-import com.linecorp.armeria.common.logging.JsonLogFormatterBuilder;
-import com.linecorp.armeria.common.logging.TextLogFormatterBuilder;
 
 /**
  * A content sanitizer implementation which sanitizes an object before serializing it into a

core/src/main/java/com/linecorp/armeria/common/logging/masker/ContentSanitizerBuilder.java renamed to core/src/main/java/com/linecorp/armeria/common/logging/ContentSanitizerBuilder.java

@@ -14,9 +14,9 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.common.logging;
 
-import static com.linecorp.armeria.internal.common.logging.masker.MaskerAttributeKeys.REQUEST_CONTEXT_KEY;
+import static com.linecorp.armeria.internal.common.logging.MaskerAttributeKeys.REQUEST_CONTEXT_KEY;
 
 import java.util.List;
 import java.util.Map;
@@ -33,9 +33,9 @@
 import com.google.common.collect.ImmutableMap;
 
 import com.linecorp.armeria.common.annotation.UnstableApi;
-import com.linecorp.armeria.common.logging.JsonLogFormatterBuilder;
-import com.linecorp.armeria.common.logging.TextLogFormatterBuilder;
 import com.linecorp.armeria.internal.common.JacksonUtil;
+import com.linecorp.armeria.internal.common.logging.FieldMaskerSelectorProvider;
+import com.linecorp.armeria.internal.server.annotation.BeanFieldMaskerSelector;
 import com.linecorp.armeria.server.annotation.AnnotatedService;
 
 /**

core/src/main/java/com/linecorp/armeria/common/logging/masker/FieldMasker.java renamed to core/src/main/java/com/linecorp/armeria/common/logging/FieldMasker.java

@@ -14,14 +14,14 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.common.logging;
 
 import com.linecorp.armeria.common.RequestContext;
 import com.linecorp.armeria.common.annotation.Nullable;
 import com.linecorp.armeria.common.annotation.UnstableApi;
-import com.linecorp.armeria.common.logging.masker.FieldMaskers.FallThroughFieldMasker;
-import com.linecorp.armeria.common.logging.masker.FieldMaskers.NoMaskFieldMasker;
-import com.linecorp.armeria.common.logging.masker.FieldMaskers.NullifyFieldMasker;
+import com.linecorp.armeria.common.logging.FieldMaskers.FallThroughFieldMasker;
+import com.linecorp.armeria.common.logging.FieldMaskers.NoMaskFieldMasker;
+import com.linecorp.armeria.common.logging.FieldMaskers.NullifyFieldMasker;
 
 /**
  * Masks a field value. Users are encouraged to use one of the provided implementations

core/src/main/java/com/linecorp/armeria/common/logging/masker/FieldMaskerBuilder.java renamed to core/src/main/java/com/linecorp/armeria/common/logging/FieldMaskerBuilder.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.common.logging;
 
 import java.util.List;
 import java.util.function.Function;

core/src/main/java/com/linecorp/armeria/common/logging/masker/FieldMaskerSelector.java renamed to core/src/main/java/com/linecorp/armeria/common/logging/FieldMaskerSelector.java

@@ -14,11 +14,13 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.common.logging;
 
 import java.util.function.Function;
 
 import com.linecorp.armeria.common.annotation.UnstableApi;
+import com.linecorp.armeria.internal.server.annotation.BeanFieldInfo;
+import com.linecorp.armeria.internal.server.annotation.BeanFieldMaskerSelector;
 
 /**
  * A {@link FieldMaskerSelector} determines whether each field should be masked based on the provided

core/src/main/java/com/linecorp/armeria/common/logging/masker/FieldMaskers.java renamed to core/src/main/java/com/linecorp/armeria/common/logging/FieldMaskers.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.common.logging;
 
 import com.linecorp.armeria.common.annotation.Nullable;
 

core/src/main/java/com/linecorp/armeria/common/logging/masker/AnnotatedRequestJsonSerializer.java

@@ -14,13 +14,15 @@
  * under the License.
  */
 
-package com.linecorp.armeria.common.logging.masker;
+package com.linecorp.armeria.internal.common.logging;
 
 import java.util.List;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import com.linecorp.armeria.common.annotation.UnstableApi;
+import com.linecorp.armeria.common.logging.ContentSanitizer;
+import com.linecorp.armeria.common.logging.FieldMaskerSelector;
 
 /**
  * Customizes the {@link ObjectMapper} used by {@link ContentSanitizer}.

core/src/main/java/com/linecorp/armeria/common/logging/masker/AnnotatedResponseJsonSerializer.java

@@ -14,7 +14,7 @@
  * under the License.
  */
 
-package com.linecorp.armeria.internal.common.logging.masker;
+package com.linecorp.armeria.internal.common.logging;
 
 import com.linecorp.armeria.common.RequestContext;
 

core/src/main/java/com/linecorp/armeria/common/logging/masker/package-info.java

@@ -23,7 +23,6 @@
 import java.util.stream.Collectors;
 
 import com.linecorp.armeria.common.annotation.Nullable;
-import com.linecorp.armeria.common.logging.masker.BeanFieldInfo;
 
 final class AnnotatedBeanFieldInfo implements BeanFieldInfo {
 

core/src/main/java/com/linecorp/armeria/common/logging/masker/FieldMaskerSelectorProvider.java renamed to core/src/main/java/com/linecorp/armeria/internal/common/logging/FieldMaskerSelectorProvider.java

@@ -20,24 +20,29 @@
 import java.util.Collections;
 import java.util.List;
 
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.MoreObjects;
 
 import com.linecorp.armeria.common.annotation.Nullable;
 
-@JsonSerialize(using = AnnotatedRequestJsonSerializer.class)
 final class AnnotatedRequest {
 
     private final List<@Nullable Object> parameters;
+    private final List<BeanFieldInfo> beanFieldInfos;
 
-    AnnotatedRequest(Object[] parameters) {
+    AnnotatedRequest(Object[] parameters, List<BeanFieldInfo> beanFieldInfos) {
+        assert parameters.length == beanFieldInfos.size();
         this.parameters = Collections.unmodifiableList(Arrays.asList(parameters));
+        this.beanFieldInfos = beanFieldInfos;
     }
 
     public List<@Nullable Object> parameters() {
         return parameters;
     }
 
+    public List<BeanFieldInfo> beanFieldInfos() {
+        return beanFieldInfos;
+    }
+
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)