/*
 * Copyright (c) OSGi Alliance (2014, 2016). All Rights Reserved.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.osgi.converter;

import org.osgi.annotation.versioning.ConsumerType;

/**
 * A function that accepts a single argument and produces a result.
 * <p>
 * This is a functional interface and can be used as the assignment target for a
 * lambda expression or method reference.
 *
 * @param <F> The type of the function input.
 * @param <T> The type of the function output.
 * @ThreadSafe
 * @author $Id$
 */
@ConsumerType
@FunctionalInterface
public interface Function<F, T> {
	/**
	 * Applies this function to the specified argument.
	 *
	 * @param t The input to this function.
	 * @return The output of this function.
	 * @throws Exception An exception thrown by the method.
	 */
	T convert(F t) throws Exception;
}

@@ -716,16 +716,17 @@
 /**%0A * A
+n
  functio
@@ -730,286 +730,203 @@
 tion
- that accepts a single argument and produces a result.%0A * %3Cp%3E%0A * This is a functional interface and can be used as the assignment target for a%0A * lambda expression or method reference.%0A *%0A * @param %3CF%3E The type of the function input.%0A * @param %3CT%3E The type of the function outpu
+al interface with a single convert method that is passed the%0A * object to be converted.%0A *%0A * @param %3CF%3E Type parameter for the source object.%0A * @param %3CT%3E Type parameter for the converted objec
 t.%0A 
@@ -1041,55 +1041,51 @@
 %09 * 
-Applies this function to the specified argument
+/** Convert the object into the target type
 .%0A%09 
@@ -1101,135 +1101,433 @@
 ram 
-t
+obj
  The 
-input to this function.%0A%09 * @return The output of this function.%0A%09 * @throws Exception An exception thrown by the method.
+object to be converted. This object will never be%0A%09 *            %7B@code null%7D as the convert function will not be invoked for%0A%09 *            null values.%0A%09 * @return The conversion result or %7B@code null%7D to indicate that the%0A%09 *         convert function cannot handle this conversion. In this case the%0A%09 *         next matching rule or adapter will be given a opportunity to%0A%09 *         convert.%0A%09 * @throws Exception
 %0A%09 *
@@ -1541,17 +1541,19 @@
 nvert(F 
-t
+obj
 ) throws

Refactor Javadoc on converter API