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 2018/04/03 07:53:42 UTC

svn commit: r1828199 - in /aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional: OSGiOperation.java OSGiRunnable.java internal/OSGiImpl.java internal/ProbeImpl.java

Author: csierra
Date: Tue Apr  3 07:53:42 2018
New Revision: 1828199

URL: http://svn.apache.org/viewvc?rev=1828199&view=rev
Log:
Remove redundant OSGiOperation

Removed:
    aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiOperation.java
Modified:
    aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java
    aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
    aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java

Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java?rev=1828199&r1=1828198&r2=1828199&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/OSGiRunnable.java Tue Apr  3 07:53:42 2018
@@ -26,7 +26,9 @@ import java.util.function.Consumer;
  */
 public interface OSGiRunnable<T> {
 
-	OSGiResult run(BundleContext bundleContext);
+	default OSGiResult run(BundleContext bundleContext) {
+		return run(bundleContext, (__) -> () -> {});
+	}
 
 	OSGiResult run(BundleContext bundleContext, Publisher<? super T> andThen);
 

Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java?rev=1828199&r1=1828198&r2=1828199&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/OSGiImpl.java Tue Apr  3 07:53:42 2018
@@ -18,8 +18,8 @@
 package org.apache.aries.osgi.functional.internal;
 
 import org.apache.aries.osgi.functional.OSGi;
-import org.apache.aries.osgi.functional.OSGiOperation;
 import org.apache.aries.osgi.functional.OSGiResult;
+import org.apache.aries.osgi.functional.OSGiRunnable;
 import org.apache.aries.osgi.functional.Publisher;
 import org.apache.aries.osgi.functional.Transformer;
 import org.apache.aries.osgi.functional.internal.ConcurrentDoublyLinkedList.Node;
@@ -41,7 +41,7 @@ import java.util.stream.Collectors;
  */
 public class OSGiImpl<T> implements OSGi<T> {
 
-	public OSGiImpl(OSGiOperation<T> operation) {
+	public OSGiImpl(OSGiRunnable<T> operation) {
 		_operation = operation;
 	}
 
@@ -371,7 +371,7 @@ public class OSGiImpl<T> implements OSGi
 		return stringBuilder.toString();
 	}
 
-	OSGiOperation<T> _operation;
+	OSGiRunnable<T> _operation;
 
 }
 

Modified: aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java?rev=1828199&r1=1828198&r2=1828199&view=diff
==============================================================================
--- aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java (original)
+++ aries/trunk/component-dsl/component-dsl/src/main/java/org/apache/aries/osgi/functional/internal/ProbeImpl.java Tue Apr  3 07:53:42 2018
@@ -17,7 +17,7 @@
 
 package org.apache.aries.osgi.functional.internal;
 
-import org.apache.aries.osgi.functional.OSGiOperation;
+import org.apache.aries.osgi.functional.OSGiRunnable;
 import org.apache.aries.osgi.functional.Publisher;
 import org.osgi.framework.BundleContext;
 
@@ -34,7 +34,7 @@ public class ProbeImpl<T> extends OSGiIm
         return ((ProbeOperationImpl<T>) _operation)._op;
     }
 
-    private static class ProbeOperationImpl<T> implements OSGiOperation<T> {
+    private static class ProbeOperationImpl<T> implements OSGiRunnable<T> {
 
         @Override
         public OSGiResultImpl run(