From bc646667003b7f59ec54f1240e41128df1020655 Mon Sep 17 00:00:00 2001 From: Redkale <8730487+redkale@users.noreply.github.com> Date: Thu, 10 Jan 2019 18:43:45 +0800 Subject: [PATCH] =?UTF-8?q?Reproduce.create=E6=96=B9=E6=B3=95=E4=B8=ADBiPr?= =?UTF-8?q?edicate=E5=8F=82=E6=95=B0=E7=9A=84=E7=AC=AC=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=B3=9B=E5=9E=8B=E6=94=B9=E4=B8=BAAccessibleObject?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/org/redkale/util/Reproduce.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/redkale/util/Reproduce.java b/src/org/redkale/util/Reproduce.java index 1a87d0e5d..9f422d83a 100644 --- a/src/org/redkale/util/Reproduce.java +++ b/src/org/redkale/util/Reproduce.java @@ -41,12 +41,12 @@ public interface Reproduce extends BiFunction { } @SuppressWarnings("unchecked") - public static Reproduce create(final Class destClass, final Class srcClass, final BiPredicate, String> srcColumnPredicate) { + public static Reproduce create(final Class destClass, final Class srcClass, final BiPredicate srcColumnPredicate) { return create(destClass, srcClass, srcColumnPredicate, (Map) null); } @SuppressWarnings("unchecked") - public static Reproduce create(final Class destClass, final Class srcClass, final BiPredicate, String> srcColumnPredicate, final Map names) { + public static Reproduce create(final Class destClass, final Class srcClass, final BiPredicate srcColumnPredicate, final Map names) { // ------------------------------------------------------------------------------ final String supDynName = Reproduce.class.getName().replace('.', '/'); final String destClassName = destClass.getName().replace('.', '/'); @@ -89,7 +89,7 @@ public interface Reproduce extends BiFunction { if (Modifier.isFinal(field.getModifiers())) continue; if (!Modifier.isPublic(field.getModifiers())) continue; final String sfname = field.getName(); - if (srcColumnPredicate != null && !srcColumnPredicate.test(srcClass, sfname)) continue; + if (srcColumnPredicate != null && !srcColumnPredicate.test(field, sfname)) continue; final String dfname = names == null ? sfname : names.getOrDefault(sfname, sfname); java.lang.reflect.Method setter = null; @@ -128,7 +128,7 @@ public interface Reproduce extends BiFunction { cs[0] = Character.toLowerCase(cs[0]); sfname = new String(cs); } - if (srcColumnPredicate != null && !srcColumnPredicate.test(srcClass, sfname)) continue; + if (srcColumnPredicate != null && !srcColumnPredicate.test(getter, sfname)) continue; final String dfname = names == null ? sfname : names.getOrDefault(sfname, sfname); java.lang.reflect.Method setter = null;