Skip to content

Commit 4ca67f6

Browse files
committed
Revert "address comment by @minwoox"
This reverts commit 5c29fdd.
1 parent 5c29fdd commit 4ca67f6

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

core/src/main/java/com/linecorp/armeria/common/logging/BeanFieldMaskerSelector.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.linecorp.armeria.common.logging;
1818

19+
import static java.util.Objects.requireNonNull;
20+
1921
import com.linecorp.armeria.common.annotation.UnstableApi;
2022

2123
/**
@@ -42,4 +44,19 @@
4244
@UnstableApi
4345
@FunctionalInterface
4446
public interface BeanFieldMaskerSelector extends FieldMaskerSelector<BeanFieldInfo> {
47+
48+
/**
49+
* Delegates {@link FieldMasker} selection to a different {@link BeanFieldMaskerSelector}
50+
* if the current {@link BeanFieldMaskerSelector} returns {@link FieldMasker#fallthrough()}.
51+
*/
52+
default BeanFieldMaskerSelector orElse(BeanFieldMaskerSelector other) {
53+
requireNonNull(other, "other");
54+
return beanFieldInfo -> {
55+
final FieldMasker fieldMasker = fieldMasker(beanFieldInfo);
56+
if (fieldMasker != FieldMasker.fallthrough()) {
57+
return fieldMasker;
58+
}
59+
return other.fieldMasker(beanFieldInfo);
60+
};
61+
}
4562
}

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
package com.linecorp.armeria.common.logging;
1818

19-
import static java.util.Objects.requireNonNull;
20-
2119
import java.util.function.Function;
2220

2321
import com.linecorp.armeria.common.annotation.UnstableApi;
@@ -69,20 +67,5 @@ static BeanFieldMaskerSelector ofBean(Function<BeanFieldInfo, FieldMasker> field
6967
* @see FieldMasker
7068
*/
7169
FieldMasker fieldMasker(T info);
72-
73-
/**
74-
* Delegates {@link FieldMasker} selection to a different {@link FieldMaskerSelector}
75-
* if the current {@link FieldMaskerSelector} returns {@link FieldMasker#fallthrough()}.
76-
*/
77-
default FieldMaskerSelector<T> orElse(FieldMaskerSelector<T> other) {
78-
requireNonNull(other, "other");
79-
return fieldInfo -> {
80-
final FieldMasker fieldMasker = fieldMasker(fieldInfo);
81-
if (fieldMasker != FieldMasker.fallthrough()) {
82-
return fieldMasker;
83-
}
84-
return other.fieldMasker(fieldInfo);
85-
};
86-
}
8770
}
8871

0 commit comments

Comments
 (0)