From d5840a8888fc90a4a0f534f2ee61aac5b5c2f8d4 Mon Sep 17 00:00:00 2001 From: Harrison Date: Mon, 20 Jun 2022 14:45:39 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-73833=E3=80=90=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E7=8E=AF=E5=A2=83=E6=A3=80=E6=B5=8B=E3=80=91=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E7=9B=AE=E5=BD=95=EF=BC=8C=E5=8F=AA=E6=9C=89finedb?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=B2=A1=E5=BC=B9=20=E9=9C=80=E8=A6=81=E5=AF=B9=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=90=8E=E5=9F=8B=E7=82=B9=E3=80=82=E4=B9=8B=E5=89=8D?= =?UTF-8?q?=E6=98=AF=E4=BD=BF=E7=94=A8=E7=9A=84=20Stream.=20=E5=9F=8B?= =?UTF-8?q?=E7=82=B9=E5=90=8E=20Stream=20=E6=B5=81=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E7=94=A8=E4=BA=86=E3=80=82=20=E8=BF=99=E8=BE=B9?= =?UTF-8?q?=E6=8D=A2=E6=88=90=20Collection=20=E9=80=82=E9=85=8D=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/env/detect/EnvDetectorCenter.java | 6 +++--- .../java/com/fr/env/detect/base/DetectorBridge.java | 13 +++++++++---- .../com/fr/start/LifecycleFatalErrorHandler.java | 5 +++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/designer-base/src/main/java/com/fr/env/detect/EnvDetectorCenter.java b/designer-base/src/main/java/com/fr/env/detect/EnvDetectorCenter.java index edaf3d0b3..1fb2665b2 100644 --- a/designer-base/src/main/java/com/fr/env/detect/EnvDetectorCenter.java +++ b/designer-base/src/main/java/com/fr/env/detect/EnvDetectorCenter.java @@ -151,7 +151,7 @@ public class EnvDetectorCenter { if (!validAction.get()) { return; } - Stream resultStream = DetectorBridge.getInstance().detect(); + Stream resultStream = DetectorBridge.getInstance().detect().stream(); // 展示效果 NotificationDialogProperties properties = new NotificationDialogProperties(DesignerContext.getDesignerFrame(), Toolkit.i18nText("Fine-Design_Basic_Detect_Notification_Title")); @@ -196,7 +196,7 @@ public class EnvDetectorCenter { */ public List terminate(Throwable throwable) { - Stream resultStream = DetectorBridge.getInstance().detect(throwable); + Stream resultStream = DetectorBridge.getInstance().detect(throwable).stream(); return resultStream .filter((e) -> e.getStatus() == DetectorStatus.EXCEPTION) .collect(Collectors.toList()); @@ -209,7 +209,7 @@ public class EnvDetectorCenter { */ public List terminateUnexpectedly() { - Stream resultStream = DetectorBridge.getInstance().detect(); + Stream resultStream = DetectorBridge.getInstance().detect().stream(); return resultStream .filter((e) -> e.getStatus() == DetectorStatus.EXCEPTION) .collect(Collectors.toList()); diff --git a/designer-base/src/main/java/com/fr/env/detect/base/DetectorBridge.java b/designer-base/src/main/java/com/fr/env/detect/base/DetectorBridge.java index c7159eec8..09ff9fe89 100644 --- a/designer-base/src/main/java/com/fr/env/detect/base/DetectorBridge.java +++ b/designer-base/src/main/java/com/fr/env/detect/base/DetectorBridge.java @@ -16,7 +16,9 @@ import com.fr.log.FineLoggerFactory; import com.fr.value.NotNullLazyValue; import org.jetbrains.annotations.NotNull; +import java.util.Collection; import java.util.concurrent.atomic.AtomicBoolean; +import java.util.stream.Collectors; import java.util.stream.Stream; /** @@ -128,9 +130,11 @@ public class DetectorBridge { * * @return 能够检测出的异常情况 */ - public Stream detect() { + @NotNull + public Collection detect() { - return detectorManager.getValue().detect(); + Stream results = detectorManager.getValue().detect(); + return results.collect(Collectors.toList()); } /** @@ -141,10 +145,11 @@ public class DetectorBridge { * @param throwable 异常 * @return 检测结果 */ - public Stream detect(Throwable throwable) { + @NotNull + public Collection detect(Throwable throwable) { ThrowableStore.getInstance().add(throwable); - Stream result = detect(); + Collection result = detect(); ThrowableStore.getInstance().reset(); return result; diff --git a/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java b/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java index ba0c5e03d..3115781b3 100644 --- a/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java +++ b/designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java @@ -28,12 +28,12 @@ import com.fr.stable.lifecycle.FineLifecycleFatalError; import com.fr.stable.project.ProjectConstants; import javax.swing.JOptionPane; +import java.util.Collection; import java.util.EnumMap; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * @author hades @@ -88,8 +88,9 @@ public class LifecycleFatalErrorHandler { @Override public void handle(FineLifecycleFatalError fatal) { - Stream resultStream = DetectorBridge.getInstance().detect(fatal); + Collection resultStream = DetectorBridge.getInstance().detect(fatal); List results = resultStream + .stream() .filter((e) -> e.getStatus() == DetectorStatus.EXCEPTION) .collect(Collectors.toList());