Reorganize effects methods
diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
index b32ae17..45a5d7c 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/OSGi.java
@@ -599,13 +599,19 @@
return effects(onAdded, __ -> {}, __ -> {}, onRemoved);
}
- OSGi<T> effects(
+ default OSGi<T> effects(
+ Consumer<? super T> onAdded, Consumer<? super T> onRemoved, Consumer<? super T> onUpdate) {
+
+ return effects(onAdded, __ -> {}, __ -> {}, onRemoved, onUpdate);
+ }
+
+ default OSGi<T> effects(
Consumer<? super T> onAddedBefore, Consumer<? super T> onAddedAfter,
Consumer<? super T> onRemovedBefore,
- Consumer<? super T> onRemovedAfter);
+ Consumer<? super T> onRemovedAfter) {
- default OSGi<T> effects(Effect<? super T> effect) {
- return effects(effect.getOnIncoming(), effect.getOnLeaving());
+ return effects(
+ onAddedBefore, onAddedAfter, onRemovedBefore, onRemovedAfter, __ -> {});
}
OSGi<T> effects(
@@ -614,6 +620,10 @@
Consumer<? super T> onRemovedAfter,
Consumer<? super T> onUpdate);
+ default OSGi<T> effects(Effect<? super T> effect) {
+ return effects(effect.getOnIncoming(), effect.getOnLeaving());
+ }
+
OSGi<T> filter(Predicate<T> predicate);
<S> OSGi<S> flatMap(Function<? super T, OSGi<? extends S>> fun);
diff --git a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
index 74b0219..5d9fc2a 100644
--- a/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
+++ b/component-dsl/src/main/java/org/apache/aries/component/dsl/internal/BaseOSGiImpl.java
@@ -227,15 +227,6 @@
public OSGi<T> effects(
Consumer<? super T> onAddedBefore, Consumer<? super T> onAddedAfter,
Consumer<? super T> onRemovedBefore,
- Consumer<? super T> onRemovedAfter) {
-
- return effects(onAddedBefore, onAddedAfter, onRemovedBefore, onRemovedAfter, __ -> {});
- }
-
- @Override
- public OSGi<T> effects(
- Consumer<? super T> onAddedBefore, Consumer<? super T> onAddedAfter,
- Consumer<? super T> onRemovedBefore,
Consumer<? super T> onRemovedAfter,
Consumer<? super T> onUpdate) {
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 0dc4feb..a0f9371 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
@@ -1952,8 +1952,6 @@
atomicInteger.incrementAndGet();
},
- __ -> {},
- __ -> {},
__ -> atomicReference.set(null),
sr ->
atomicReference.set(
