Polishing.

Remove duplicate license headers. Avoid fully-qualified type usage where possible.

See #2708
This commit is contained in:
Mark Paluch
2022-11-02 10:34:45 +01:00
parent 8d424855da
commit 5b784d006f
5 changed files with 21 additions and 114 deletions

View File

@@ -35,7 +35,6 @@ import java.util.function.Predicate;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.core.ResolvableType;
import org.springframework.util.ObjectUtils;
import org.springframework.util.ReflectionUtils;
@@ -178,15 +177,15 @@ public class TypeCollector {
Predicate<Method> excludedDomainsPredicate = methodToTest -> excludedDomainsFilter
.test(methodToTest.getDeclaringClass());
Predicate<Method> excludedMethodsPredicate = org.springframework.data.util.Predicates.IS_BRIDGE_METHOD //
.or(org.springframework.data.util.Predicates.IS_STATIC) //
.or(org.springframework.data.util.Predicates.IS_SYNTHETIC) //
.or(org.springframework.data.util.Predicates.IS_NATIVE) //
.or(org.springframework.data.util.Predicates.IS_PRIVATE) //
.or(org.springframework.data.util.Predicates.IS_PROTECTED) //
.or(org.springframework.data.util.Predicates.IS_OBJECT_MEMBER) //
.or(org.springframework.data.util.Predicates.IS_HIBERNATE_MEMBER) //
.or(org.springframework.data.util.Predicates.IS_ENUM_MEMBER) //
Predicate<Method> excludedMethodsPredicate = Predicates.IS_BRIDGE_METHOD //
.or(Predicates.IS_STATIC) //
.or(Predicates.IS_SYNTHETIC) //
.or(Predicates.IS_NATIVE) //
.or(Predicates.IS_PRIVATE) //
.or(Predicates.IS_PROTECTED) //
.or(Predicates.IS_OBJECT_MEMBER) //
.or(Predicates.IS_HIBERNATE_MEMBER) //
.or(Predicates.IS_ENUM_MEMBER) //
.or(excludedDomainsPredicate.negate()); //
return excludedMethodsPredicate.negate();
@@ -195,8 +194,8 @@ public class TypeCollector {
@SuppressWarnings("rawtypes")
private Predicate<Field> createFieldFilter() {
Predicate<Member> excludedFieldPredicate = org.springframework.data.util.Predicates.IS_HIBERNATE_MEMBER //
.or(org.springframework.data.util.Predicates.IS_SYNTHETIC) //
Predicate<Member> excludedFieldPredicate = Predicates.IS_HIBERNATE_MEMBER //
.or(Predicates.IS_SYNTHETIC) //
.or(Predicates.IS_JAVA);
return (Predicate) excludedFieldPredicate.negate();