Merge "Add NodeConfiguratorImpl enqueue trace"

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / sal / convertor / ConvertorExecutor.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorExecutor.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorExecutor.java
index 1e28a5498ddc462eee432faebcae46361d2320e9..a1a77da697cfe7336fd05c4d1d62f859c08ab810 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorExecutor.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ConvertorExecutor.java
@@ -11,30 +11,29 @@ package org.opendaylight.openflowplugin.openflow.md.core.sal.convertor;
 import java.util.Collection;
 import java.util.Optional;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.common.ConvertorData;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
 
 public interface ConvertorExecutor {
     /**
-     * Lookup and use convertor by specified type, then converts source and returns converted result
+     * Lookup and use convertor by specified type, then converts source and returns converted result.
      *
-     * @param <FROM> the source type
-     * @param <TO>   the result type
-     * @param <DATA> the data type
+     * @param <F> the source type
+     * @param <T>   the result type
+     * @param <D> the data type
      * @param source the source
      * @param data   convertor data
      * @return the result (can be empty, if no convertor was found)
      */
-    <FROM extends DataContainer, TO, DATA extends ConvertorData> Optional<TO> convert(final FROM source, final DATA data);
+    <F, T, D extends ConvertorData> Optional<T> convert(F source, D data);
 
     /**
-     * Lookup and use convertor by specified type, then converts source collection and returns converted result
+     * Lookup and use convertor by specified type, then converts source collection and returns converted result.
      *
-     * @param <FROM> the source type
-     * @param <TO>   the result type
-     * @param <DATA> the data type
+     * @param <F> the source type
+     * @param <T>   the result type
+     * @param <D> the data type
      * @param source the source collection
      * @param data   convertor data
      * @return the result (can be empty, if no convertor was found)
      */
-    <FROM extends DataContainer, TO, DATA extends ConvertorData> Optional<TO> convert(final Collection<FROM> source, final DATA data);
-}
\ No newline at end of file
+    <F, T, D extends ConvertorData> Optional<T> convert(Collection<F> source, D data);
+}