Author: pderop
Date: Sat Jan 30 15:10:50 2016
New Revision: 1727710

URL: http://svn.apache.org/viewvc?rev=1727710&view=rev
Log:
Updated Javadoc.

Modified:
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperties.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
    
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ConfigurationDependencyBuilder.java
 Sat Jan 30 15:10:50 2016
@@ -20,6 +20,7 @@ import org.apache.felix.dm.lambda.callba
  *           .impl(ServiceImpl.class)
  *           .withConf(conf -> 
conf.pid(ServiceConsumer.class).cb(ServiceImpl::modified)));  
  *    }
+ * }
  * }</pre>
  * 
  * @author <a href="mailto:[email protected]";>Felix Project Team</a>
@@ -88,8 +89,9 @@ public interface ConfigurationDependency
     /**
      * Sets a <code>callback</code> method reference used to invoke an update 
method. The method reference must point to a method from one of the component
      * implementation classes, and is invoked when the configuration is 
updated.
-     * 
-     * @param updateMethod the callback method reference which must point to a 
method from one of the component implementation classes. The method
+     *
+     * @param <T> the type of the component implementation class on which the 
callback is invoked on.
+     * @param callback the callback method reference which must point to a 
method from one of the component implementation classes. The method
      * takes as argument a Dictionary.
      * @return this builder
      */
@@ -98,8 +100,9 @@ public interface ConfigurationDependency
     /**
      * Sets the <code>callback</code> method reference used to invoke an 
update method. The method reference must point to a method from one of the 
      * component implementation classes, and is invoked when the configuration 
is updated.
-     * 
-     * @param updateMethod the callback method reference used to invoke an 
update method on the component instance(s) when the configuration is updated.
+     *
+     * @param <T> the type of the component implementation class on which the 
callback is invoked on.
+     * @param callback the callback method reference used to invoke an update 
method on the component instance(s) when the configuration is updated.
      * The method takes as argument a Component and a Dictionary.
      * @return this builder
      */
@@ -109,7 +112,7 @@ public interface ConfigurationDependency
      * Sets a <code>callback instance</code> method reference used to invoke 
the update method. The method reference must point to an Object instance 
      * method which takes as argument a Dictionary.
      * 
-     * @param updateMethod a method reference that points to an Object 
instance method which takes as argument a Dictionary.
+     * @param updated a method reference that points to an Object instance 
method which takes as argument a Dictionary.
      * @return this builder
      */
     ConfigurationDependencyBuilder cbi(CbDictionary updated);   
@@ -118,7 +121,7 @@ public interface ConfigurationDependency
      * Sets a <code>callback instance</code> method reference used to invoke 
the update method. The method reference must point to an Object instance method 
      * which takes as argument a Component and a Dictionary.
      * 
-     * @param updateMethod a method reference that points to an Object 
instance method which takes as argument a Component and a Dictionary.
+     * @param updated a method reference that points to an Object instance 
method which takes as argument a Component and a Dictionary.
      * @return this builder
      */
     ConfigurationDependencyBuilder cbi(CbComponentDictionary updated);   

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/DependencyManagerActivator.java
 Sat Jan 30 15:10:50 2016
@@ -36,9 +36,9 @@ import org.osgi.framework.BundleContext;
  * }
  * }</pre>
  *
- * Code example using reflection callbacks:<p>
- * <pre> {@code
+ * Code example using reflection callbacks:
  * 
+ * <pre> {@code
  * import static org.apache.felix.dm.builder.lambda.DependencyActivatorBase.*;
  *
  * public class Activator extends DependencyManagerActivator {    
@@ -52,10 +52,9 @@ import org.osgi.framework.BundleContext;
  * }
  * }</pre>
  *
- * Code example using method references:<p>
+ * Code example using method references:
  * 
  * <pre> {@code
- * 
  * import static org.apache.felix.dm.lambda.DependencyActivatorBase.*;
  *
  * public class Activator extends DependencyManagerActivator {    
@@ -100,20 +99,20 @@ public abstract class DependencyManagerA
 
     /**
      * Sub classes must override this method in order to build some DM 
components.
-     * @throws Exception
+     * @throws Exception if the activation fails
      */
     protected abstract void activate() throws Exception;
 
     /**
      * Sub classes may override this method that is called when the Activator 
is stopped.
-     * @param manager
-     * @throws Exception
+     * @throws Exception if the deactivation fails
      */
     protected void deactivate() throws Exception {
     }
     
     /**
-     * Returns the DependencyManager used to create/managed DM Components
+     * Returns the DependencyManager used to create/managed DM Components.
+     * 
      * @return the DependencyManager associated to this Activator
      */
     protected DependencyManager getDependencyManager() {
@@ -121,7 +120,9 @@ public abstract class DependencyManagerA
     }
     
     /**
-     * Returns the bundle context.
+     * Returns the bundle context that is associated with this bundle.
+     * 
+     * @return the bundle context
      */
     protected BundleContext getBundleContext() {
         return m_ctx;
@@ -136,8 +137,11 @@ public abstract class DependencyManagerA
     }
     
     /**
-     * Creates a service Aspect builder that can be used to create a DM Aspect 
Component. 
-     * @return a service Aspect builder that can be used to create a DM Aspect 
Component.
+     * Creates a service Aspect builder that can be used to create a DM Aspect 
Component.
+     * 
+     * @param <T> the aspect service type
+     * @param aspectType the aspect service
+     * @return a service Aspect builder.
      */
     protected <T> ServiceAspectBuilder<T> aspect(Class<T> aspectType) {
         ServiceAspectBuilderImpl<T> aspectBuilder = new 
ServiceAspectBuilderImpl<>(m_manager, aspectType);
@@ -146,10 +150,13 @@ public abstract class DependencyManagerA
     
     /**
      * Creates a service Adapter builder that can be used to create a DM 
Adapter Component. 
-     * @return a service Adapter builder that can be used to create a DM 
Adapter Component.
+     *
+     * @param <T> the adapted service type.
+     * @param adaptee the adapted service
+     * @return a service Adapter builder.
      */
-    protected <T> ServiceAdapterBuilder<T> adapter(Class<T> adapteeType) {
-        ServiceAdapterBuilderImpl<T> adapterBuilder = new 
ServiceAdapterBuilderImpl<>(m_manager, adapteeType);
+    protected <T> ServiceAdapterBuilder<T> adapter(Class<T> adaptee) {
+        ServiceAdapterBuilderImpl<T> adapterBuilder = new 
ServiceAdapterBuilderImpl<>(m_manager, adaptee);
         return adapterBuilder;
     }
     
@@ -165,9 +172,12 @@ public abstract class DependencyManagerA
         
     /**
      * Builds a DM Aspect Component using a Java8 style AspectBuilder.
-     * @param consumer the lambda that will use the AspectBuilder for building 
the DM aspect component. 
      * The component is auto-added to the DependencyManager, unless the lambda 
calls the AspectBuilder.autoAdd(false) method.
-     * @return a newly built DM component.
+     *
+     * @param <T> the aspect service type
+     * @param aspect the aspect service
+     * @param consumer the lambda that will use the AspectBuilder for building 
the DM aspect component. 
+     * @return the DM component build by the consumer of the aspect builder
      */
     protected <T> Component aspect(Class<T> aspect, 
Consumer<ServiceAspectBuilder<T>> consumer) {
         return aspect(m_manager, aspect, consumer);
@@ -175,8 +185,11 @@ public abstract class DependencyManagerA
 
     /**
      * Builds a DM Adapter Component using a Java8 style AdapterBuilder.
-     * @param consumer the lambda that will use the AdapterBuilder for 
building the DM adapter component. 
      * The component is auto-added to the DependencyManager, unless the lambda 
calls the AdapterBuilder.autoAdd(false) method.
+     * 
+     * @param <T> the adapted service type
+     * @param adaptee the adapted service
+     * @param consumer the lambda that will use the AdapterBuilder for 
building the DM adapter component. 
      * @return a newly built DM component.
      */
     protected <T> Component adapter(Class<T> adaptee, 
Consumer<ServiceAdapterBuilder<T>> consumer) {
@@ -185,8 +198,9 @@ public abstract class DependencyManagerA
     
     /**
      * Builds a DM Factory Configuration Adapter Component using a Java8 style 
FactoryPidAdapterBuilder.
-     * @param consumer the lambda that will use the FactoryPidAdapterBuilder 
for building the DM factory configuration adapter component. 
      * The component is auto-added to the DependencyManager, unless the lambda 
calls the FactoryPidAdapterBuilder.autoAdd(false) method.
+     *
+     * @param consumer the lambda that will use the FactoryPidAdapterBuilder 
for building the DM factory configuration adapter component. 
      * @return a newly built DM component.
      */
     protected Component factoryPidAdapter(Consumer<FactoryPidAdapterBuilder> 
consumer) {
@@ -207,6 +221,8 @@ public abstract class DependencyManagerA
        
     /**
      * Creates a Component builder that can be used to create a Component. 
+     * 
+     * @param dm the DependencyManager object used to create the component 
builder
      * @return a Component builder that can be used to create a Component.
      */
     public static ComponentBuilder<?> component(DependencyManager dm) {
@@ -215,6 +231,8 @@ public abstract class DependencyManagerA
     
     /**
      * Creates a service Aspect builder that can be used to create an Aspect 
Component. 
+     *
+     * @param <T> the aspect service type
      * @param dm the DependencyManager object used to register the built 
component
      * @param aspect the type of the aspect service
      * @return a service Aspect builder that can be used to create an Aspect 
Component.
@@ -225,7 +243,9 @@ public abstract class DependencyManagerA
     }
     
     /**
-     * Creates a service Adapter builder that can be used to create an Adapter 
Component. 
+     * Creates a service Adapter builder that can be used to create an Adapter 
Component.
+     * 
+     * @param <T> the adapted service type
      * @param dm the DependencyManager object used to register the built 
component
      * @param adaptee the type of the adaptee service
      * @return a service Adapter builder that can be used to create an Adapter 
Component.
@@ -246,7 +266,8 @@ public abstract class DependencyManagerA
    
     /**
      * Creates a bundle adapter builder that can be used to create a DM bundle 
adapter Component. 
-     * @param dm
+     *
+     * @param dm the DependencyManager object used to create the bundle 
adapter builder.
      * @return a bundle adapter builder that can be used to create a DM bundle 
adapter Component.
      */
     public static BundleAdapterBuilder bundleAdapter(DependencyManager dm) {
@@ -255,7 +276,8 @@ public abstract class DependencyManagerA
    
     /**
      * Creates a DM ServiceDependency builder.
-     * 
+     *
+     * @param <T> the service dependency type
      * @param component the component on which you want to build a new service 
dependency using the returned builder
      * @param service the service dependency type.
      * @return a DM ServiceDependency builder.
@@ -286,7 +308,8 @@ public abstract class DependencyManagerA
 
     /**
      * Creates a DM CompletableFuture Dependency builder.
-     * 
+     *
+     * @param <F> the type of the CompletableFuture result.
      * @param component the component on which you want to build a new 
completable future dependency using the returned builder.
      * @param future the future the dependency built using the returned 
builder will depend on.
      * @return a CompletableFuture dependency builder.
@@ -326,6 +349,8 @@ public abstract class DependencyManagerA
     
     /**
      * Builds an aspect DM Component.
+     * 
+     * @param <T> the aspect service type
      * @param dm the DependencyManager object used to register the built 
component
      * @param aspect the type of the aspect service
      * @param consumer a lambda used to build the DM aspect component
@@ -344,6 +369,8 @@ public abstract class DependencyManagerA
         
     /**
      * Builds an adapter DM Component.
+     * 
+     * @param <T> the adapted service type
      * @param dm the DependencyManager object used to register the built 
component
      * @param adaptee the type of the adapted service
      * @param consumer a lambda used to build the DM adapter component
@@ -362,12 +389,13 @@ public abstract class DependencyManagerA
       
     /**
      * Builds a bundle adapter DM Component.
+     * 
      * @param dm the DependencyManager object used to register the built 
component
      * @param consumer a lambda used to build the bundle adapter component
      * @return a new bundle adapter component. The adapter component is 
auto-added into the dm object, unless the lambda calls
      * the AspectBuilder.autoAdd(false) method is called.
      */
-    public static <T> Component bundleAdapter(DependencyManager dm, 
Consumer<BundleAdapterBuilder> consumer) {
+    public static Component bundleAdapter(DependencyManager dm, 
Consumer<BundleAdapterBuilder> consumer) {
         BundleAdapterBuilderImpl adapterBuilder = new 
BundleAdapterBuilderImpl(dm);
         consumer.accept(adapterBuilder);
         Component comp = adapterBuilder.build();
@@ -384,7 +412,7 @@ public abstract class DependencyManagerA
      * @return a new DM factory configuration adapter component. The adapter 
component is auto-added into the dm object, unless the lambda calls
      * the FactoryPidAdapterBuilder.autoAdd(false) method is called
      */
-    public static <T> Component factoryPidAdapter(DependencyManager dm, 
Consumer<FactoryPidAdapterBuilder> consumer) {
+    public static Component factoryPidAdapter(DependencyManager dm, 
Consumer<FactoryPidAdapterBuilder> consumer) {
         FactoryPidAdapterBuilderImpl factoryPidAdapter = new 
FactoryPidAdapterBuilderImpl(dm);
         consumer.accept(factoryPidAdapter);
         Component comp = factoryPidAdapter.build();

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FactoryPidAdapterBuilder.java
 Sat Jan 30 15:10:50 2016
@@ -19,6 +19,7 @@ import org.apache.felix.dm.lambda.callba
  *             .propagate()
  *             .withSrv(LogService.class, log -> log.optional()));
  *    }
+ * }
  * }</pre>
  */
 public interface FactoryPidAdapterBuilder extends 
ComponentBuilder<FactoryPidAdapterBuilder> {
@@ -52,7 +53,7 @@ public interface FactoryPidAdapterBuilde
     /**
      * Specifies a callback method that will be called on the component 
instances when the configuration is injected
      * @param updateMethod the method to call on the component instances when 
the configuration is available ("updated" by default).
-     * The following method signatures are supported:<p>
+     * The following method signatures are supported:
      * 
      * <pre> {@code
      *    method(Dictionary properties)
@@ -66,47 +67,50 @@ public interface FactoryPidAdapterBuilde
     /**
      * Specifies a callback instance method that will be called on a given 
object instance when the configuration is injected
      * @param updateMethod the method to call on the given object instance 
when the configuration is available ("updated" by default).
-     * The following method signatures are supported:<p>
+     * The following method signatures are supported:
      * 
      * <pre> {@code
      *    method(Dictionary properties)
      *    method(Component component, Dictionary properties)
      * }</pre>
-     * 
+     *
+     * @param callbackInstance the Object instance on which the updated 
callback will be invoked.
      * @return this builder
      */
     FactoryPidAdapterBuilder cb(Object callbackInstance, String updateMethod);
     
     /**
-     * Specifies a callback method reference that will be called on one of the 
component classes when the configuration is injected
+     * Specifies a callback method reference that will be called on one of the 
component classes when the configuration is injected.
+     * 
+     * @param <U> the type of the component implementation class on which the 
callback is invoked on.
      * @param callback the method to call on one of the component classes when 
the configuration is available.
-     *
      * @return this builder
      */
     <U> FactoryPidAdapterBuilder cb(CbTypeDictionary<U> callback);
     
     /**
-     * Specifies a callback instance method reference that will be called on a 
given object instance when the configuration is injected
-     * @param callback the method to call on a given object instance when the 
configuration is available. The callback takes as
-     * a Dictionary<String, Object> parameter. 
-     *
-     * @return this builder
-     */
-    FactoryPidAdapterBuilder cbi(CbDictionary callback);
-
-    /**
      * Specifies a callback method reference that will be called on one of the 
component classes when the configuration is injected
+     * 
+     * @param <U> the type of the component implementation class on which the 
callback is invoked on.
      * @param callback the reference to a method on one of the component 
classes. The method may takes as parameter a Component and a Dictionary.
-     *
      * @return this builder
      */
     <U> FactoryPidAdapterBuilder cb(CbTypeComponentDictionary<U> callback);
     
     /**
      * Specifies a callback instance method reference that will be called on a 
given object instance when the configuration is injected
-     * @param callback the method to call on a given object instance when the 
configuration is available. The callback takes as
-     * a Dictionary<String, Object> parameter. 
-     *
+     * 
+     * @param callback the method to call on a given object instance when the 
configuration is available. The callback takes as argument a
+     * a Dictionary parameter.
+     * @return this builder
+     */
+    FactoryPidAdapterBuilder cbi(CbDictionary callback);
+
+    /**
+     * Specifies a callback instance method reference that will be called on a 
given object instance when the configuration is injected.
+     * 
+     * @param callback the method to call on a given object instance when the 
configuration is available. The callback takes as argument a
+     * Dictionary parameter. 
      * @return this builder
      */
     FactoryPidAdapterBuilder cbi(CbComponentDictionary callback);

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperties.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperties.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperties.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FluentProperties.java
 Sat Jan 30 15:10:50 2016
@@ -3,28 +3,32 @@ package org.apache.felix.dm.lambda;
 import org.apache.felix.dm.lambda.callbacks.SerializableLambda;
 
 /**
- * Lambda allowing to define fluent service properties, like param1 -> 
"value1", etc ...
- * Property names are deduces from the lambda parameter name.
+ * Lambda allowing to define fluent service properties. Property names are 
deduces from the lambda parameter name.
  * 
- * <bold>Caution: Fluent properties requires the usage of the "-parameter" 
javac option.
- * Under eclipse, you can enable this option using:
- * Windows -> Preference -> Compiler -> Classfile Generation -> Store 
information about method parameters.
+ * <p> Example of a component which provides fluent properties ("foo=bar"; 
"foo2=Integer(123)):
  * 
- * <p> Example of a component which provides fluent properties:
- * 
- * <blockquote><pre>
+ * <pre>{@code
  * public class Activator extends DependencyManagerActivator {
  *   public void activate() throws Exception {
  *       component(comp -> 
comp.impl(MyComponentImpl.class).provides(MyService.class, foo->"bar", foo2 -> 
123));
  *   }
- * } </pre></blockquote>
+ * } 
+ * }</pre>
+ * 
+ * <b>Caution: Fluent properties requires the usage of the "-parameter" javac 
option.</b>
+ * 
+ * Under eclipse, you can enable this option using:
+ * 
+ * <pre>{@code
+ * Windows -> Preference -> Compiler -> Classfile Generation -> Store 
information about method parameters.
+ * }</pre>
  */
 @FunctionalInterface
 public interface FluentProperties extends SerializableLambda {
     /**
      * Represents a fluent property
      * 
-     * @param name the property name
+     * @param name the property name. The parameter used by the lambda will be 
intropsected and will be used as the actual property name.
      * @return the property value
      */
     public Object apply(String name);

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/FutureDependencyBuilder.java
 Sat Jan 30 15:10:50 2016
@@ -56,6 +56,8 @@ public interface FutureDependencyBuilder
     /**
      * Sets the function to invoke when the future task has completed. The 
function is one of the Component instances method that accepts the
      * result of the completed future.
+     * 
+     * @param <T> the type of the CompletableFuture result.
      * @param callback the function to perform when the future task as 
completed. 
      * @return this dependency
      */
@@ -64,7 +66,10 @@ public interface FutureDependencyBuilder
     /**
      * Sets the function to invoke asynchronously when the future task has 
completed. The function is one of the Component instances method that accepts 
the
      * result of the completed future.
-     * @param callback the function to perform when the future task as 
completed. 
+     * 
+     * @param <T> the type of the CompletableFuture result.
+     * @param callback the function to perform when the future task as 
completed.
+     * @param async true if the callback should be invoked asynchronously 
using the default jdk execution facility, false if not.
      * @return this dependency
      */
     <T> FutureDependencyBuilder<F> cb(CbTypeFuture<T, ? super F> callback, 
boolean async);
@@ -72,6 +77,8 @@ public interface FutureDependencyBuilder
     /**
      * Sets the function to invoke asynchronously when the future task has 
completed. The function is one of the Component instances method that accepts 
the
      * result of the completed future.
+     * 
+     * @param <T> the type of the CompletableFuture result.
      * @param callback the function to perform when the future task as 
completed. 
      * @param executor the executor used to schedule the action.
      * @return this dependency
@@ -89,7 +96,9 @@ public interface FutureDependencyBuilder
     /**
      * Sets the action to perform asynchronously when the future task has 
completed. The action is a Consumer instance which accepts the
      * result of the completed future.
+     * 
      * @param callback a Consumer instance which accepts the result of the 
completed future.
+     * @param async true if the callback should be invoked asynchronously 
using the default jdk execution facility, false if not.
      * @return this dependency
      */
     FutureDependencyBuilder<F> cbi(CbFuture<? super F> callback, boolean 
async);

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAdapterBuilder.java
 Sat Jan 30 15:10:50 2016
@@ -21,6 +21,7 @@ package org.apache.felix.dm.lambda;
 public interface ServiceAdapterBuilder<T> extends 
ComponentBuilder<ServiceAdapterBuilder<T>>, ServiceCallbacksBuilder<T, 
ServiceAdapterBuilder<T>> {
     /**
      * Specifies the filter used to match a given adapted service.
+     * 
      * @param adapteeFilter the filter used to match a given adapted service
      * @return this builder
      */
@@ -28,6 +29,7 @@ public interface ServiceAdapterBuilder<T
     
     /**
      * Specifies whether or not the adapted service properties must be 
propagated to the adapter service (true by default). 
+     * 
      * @param propagate true if the adapted service properties must be 
propagated to the adapter service (true by default). 
      * @return this builder
      */
@@ -35,12 +37,14 @@ public interface ServiceAdapterBuilder<T
     
     /**
      * Injects this adapted service in all fields matching the adapted service 
type.
+     * 
      * @return this builder
      */
     ServiceAdapterBuilder<T> autoConfig();
     
     /**
      * Configures whether or not the adapted service can be injected in all 
fields matching the adapted service type. 
+     * 
      * @param autoConfig true if the adapted service can be injected in all 
fields matching the adapted service type
      * @return this builder
      */
@@ -48,6 +52,7 @@ public interface ServiceAdapterBuilder<T
     
     /**
      * Injects this adapted service on the field matching the given name
+     * 
      * @param field the field name where the adapted service must be injected 
to.
      * @return this builder
      */

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceAspectBuilder.java
 Sat Jan 30 15:10:50 2016
@@ -23,13 +23,15 @@ package org.apache.felix.dm.lambda;
 public interface ServiceAspectBuilder<T> extends 
ComponentBuilder<ServiceAspectBuilder<T>>, ServiceCallbacksBuilder<T, 
ServiceAspectBuilder<T>> {
     /**
      * Specifies the aspect service filter. 
-     * @param filter
-     * @return
+     * 
+     * @param filter the filter condition to use with the service interface 
the aspect will apply on
+     * @return this builder
      */
     ServiceAspectBuilder<T> filter(String filter);
     
     /**
      * Specifies the aspect ranking. Aspects of a given service are ordered by 
their ranking property.
+     * 
      * @param ranking the aspect ranking
      * @return this builder
      */
@@ -42,14 +44,16 @@ public interface ServiceAspectBuilder<T>
     ServiceAspectBuilder<T> autoConfig();
     
     /**
-     * Configures whether or not the aspect service can be injected in all 
fields matching the aspect type. 
+     * Configures whether or not the aspect service can be injected in all 
fields matching the aspect type.
+     *  
      * @param autoConfig true if the aspect service can be injected in all 
fields matching the dependency type
      * @return this builder
      */
     ServiceAspectBuilder<T> autoConfig(boolean autoConfig);
     
     /**
-     * Injects the aspect service on the field with the given name
+     * Injects the aspect service on the field with the given name.
+     * 
      * @param field the field name where the aspect service must be injected
      * @return this builder
      */

Modified: 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java
URL: 
http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java?rev=1727710&r1=1727709&r2=1727710&view=diff
==============================================================================
--- 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java
 (original)
+++ 
felix/sandbox/pderop/dependencymanager-lambda/org.apache.felix.dependencymanager.lambda/src/org/apache/felix/dm/lambda/ServiceDependencyBuilder.java
 Sat Jan 30 15:10:50 2016
@@ -44,6 +44,8 @@ public interface ServiceDependencyBuilde
     
     /**
      * Configures whether this dependency is required or not.
+     * 
+     * @param required true if the dependency is required, false if not. 
Unlike with the original DM API, service dependencies are required by default.
         * @return this builder
      */
     ServiceDependencyBuilder<S> required(boolean required);
@@ -63,6 +65,8 @@ public interface ServiceDependencyBuilde
   
     /**
      * Configures whether the dependency properties must be propagated or not 
to the component service properties.
+     * 
+     * @param propagate true if the service dependency properties should be 
propagated to the properties provided by the component using this dependency.
         * @return this builder
      */
     ServiceDependencyBuilder<S> propagate(boolean propagate);


Reply via email to