From 8ca6d3727899bb8ca3f047863aad1512da03b123 Mon Sep 17 00:00:00 2001 From: mingwang01 Date: Sat, 1 Jul 2023 14:20:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=80=E4=B8=8Bsonar?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E7=9A=84=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stream/core/bean/BeanHelper.java | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/stream-core/src/main/java/org/dromara/streamquery/stream/core/bean/BeanHelper.java b/stream-core/src/main/java/org/dromara/streamquery/stream/core/bean/BeanHelper.java index ea671c91..5c6679c5 100644 --- a/stream-core/src/main/java/org/dromara/streamquery/stream/core/bean/BeanHelper.java +++ b/stream-core/src/main/java/org/dromara/streamquery/stream/core/bean/BeanHelper.java @@ -145,26 +145,23 @@ public class BeanHelper { Map.Entry, SerBiCons> targetGetterSetter = targetPropertyGetterSetterMap.get(property); - if (targetGetterSetter == null) { - continue; - } + if (targetGetterSetter != null) { + SerFunc sourceGetter = sourceGetterSetter.getKey(); + SerFunc targetGetter = targetGetterSetter.getKey(); - SerFunc sourceGetter = sourceGetterSetter.getKey(); - SerFunc targetGetter = targetGetterSetter.getKey(); + LambdaExecutable sourceGetterLambda = LambdaHelper.resolve(sourceGetter); + LambdaExecutable targetGetterLambda = LambdaHelper.resolve(targetGetter); - LambdaExecutable sourceGetterLambda = LambdaHelper.resolve(sourceGetter); - LambdaExecutable targetGetterLambda = LambdaHelper.resolve(targetGetter); + if (!Opp.of(sourceGetterLambda.getReturnType()) + .map(Type::getTypeName) + .equals(Opp.of(targetGetterLambda.getReturnType()).map(Type::getTypeName))) { + continue; + } - if (!Opp.of(sourceGetterLambda.getReturnType()) - .map(Type::getTypeName) - .equals(Opp.of(targetGetterLambda.getReturnType()).map(Type::getTypeName))) { - continue; + Object value = sourceGetter.apply(source); + targetGetterSetter.getValue().accept(target, value); } - - Object value = sourceGetter.apply(source); - targetGetterSetter.getValue().accept(target, value); } - return target; } -- Gitee