You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by cs...@apache.org on 2019/09/17 07:49:50 UTC

[aries-component-dsl] 02/05: [ARIES-1930] Consistent error handling

This is an automated email from the ASF dual-hosted git repository.

csierra pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-component-dsl.git

commit 0e678730866a2f2d82e162445e45d3962dfd7376
Author: Carlos Sierra <ca...@liferay.com>
AuthorDate: Mon Sep 16 17:17:54 2019 +0200

    [ARIES-1930] Consistent error handling
---
 .../aries/component/dsl/internal/AllOSGi.java      | 40 ++++++++++++++--------
 .../apache/aries/component/dsl/test/DSLTest.java   | 35 +++++++++++++++++++
 2 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java
index 3fc1b7b..9530d5e 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/AllOSGi.java
@@ -21,9 +21,7 @@ import org.apache.aries.component.dsl.OSGi;
 import org.apache.aries.component.dsl.OSGiResult;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.ListIterator;
-import java.util.stream.Collectors;
 
 /**
  * @author Carlos Sierra Andrés
@@ -33,23 +31,35 @@ public class AllOSGi<T> extends OSGiImpl<T> {
     @SafeVarargs
     public AllOSGi(OSGi<T>... programs) {
         super((bundleContext, op) -> {
-            ArrayList<OSGiResult> results = new ArrayList<>();
+            ArrayList<OSGiResult> results = new ArrayList<>(programs.length);
 
-            results.addAll(
-                Arrays.stream(programs).
-                    map(o -> o.run(bundleContext, op)).
-                    collect(Collectors.toList()));
+            try {
+                for (OSGi<T> program : programs) {
+                    results.add(program.run(bundleContext, op));
+                }
+            }
+            catch (Exception e) {
+                cleanUp(results);
 
-            return new OSGiResultImpl(
-                () -> {
-                    ListIterator<OSGiResult> iterator =
-                        results.listIterator(results.size());
+                throw e;
+            }
 
-                    while (iterator.hasPrevious()) {
-                        iterator.previous().close();
-                    }
-                }
+            return new OSGiResultImpl(
+                () -> cleanUp(results)
             );
         });
     }
+
+    private static void cleanUp(ArrayList<OSGiResult> results) {
+        ListIterator<OSGiResult> iterator =
+            results.listIterator(results.size());
+
+        while (iterator.hasPrevious()) {
+            try {
+                iterator.previous().close();
+            }
+            catch (Exception ex) {
+            }
+        }
+    }
 }
diff --git a/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java b/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
index 31efd00..9634de2 100644
--- a/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
+++ b/itests/src/main/java/org/apache/aries/component/dsl/test/DSLTest.java
@@ -1025,6 +1025,41 @@ public class DSLTest {
     }
 
     @Test
+    public void testAllWithErrors() {
+        ArrayList<Integer> results = new ArrayList<>();
+
+        OSGi<Integer> program = OSGi.all(
+            just(1),
+            just(2),
+            just(3),
+            just(4),
+            just(5)
+        ).effects(
+            results::add, results::remove
+        );
+
+        try(OSGiResult result = program.run(bundleContext)) {
+            assertEquals(Arrays.asList(1, 2, 3, 4, 5), results);
+        }
+
+        try(OSGiResult result = program.filter(i -> {
+                if (i == 5) {
+                    throw new IllegalArgumentException();
+                }
+
+                return true;
+            }
+        ).run(
+            bundleContext)
+        ) {
+            fail();
+        }
+        catch (Exception e) {
+            assertEquals(Collections.emptyList(), results);
+        }
+    }
+
+    @Test
     public void testMultipleApplies() {
         ArrayList<Integer> results = new ArrayList<>();
         AtomicInteger results2 = new AtomicInteger();