AbstractTranscriberInterface: correct readMd signature 93/59993/3
authorIsaku Yamahata <isaku.yamahata@intel.com>
Thu, 6 Jul 2017 01:11:22 +0000 (18:11 -0700)
committerIsaku Yamahata <isaku.yamahata@intel.com>
Wed, 12 Jul 2017 06:06:14 +0000 (23:06 -0700)
type parameter T of readMd() overwrites type parameter of the class.
rename T to W to avoid name conflict.

Change-Id: I8651661b9606c85195d53d47236986a244f0cf24
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java

index d4425f006a3555bd7c8caabdfe1385766f48a1ee..4202b579bc2ee60b286ac3a714827c47408360e9 100644 (file)
@@ -236,13 +236,13 @@ public abstract class AbstractNeutronInterface<T extends DataObject & Identifiab
 
     protected abstract S fromMd(T dataObject);
 
-    private <T extends DataObject> T readMd(InstanceIdentifier<T> path, ReadTransaction tx) {
+    private <W extends DataObject> W readMd(InstanceIdentifier<W> path, ReadTransaction tx) {
         Preconditions.checkNotNull(tx);
-        T result = null;
-        final CheckedFuture<Optional<T>,
+        W result = null;
+        final CheckedFuture<Optional<W>,
                 ReadFailedException> future = tx.read(LogicalDatastoreType.CONFIGURATION, path);
         if (future != null) {
-            Optional<T> optional;
+            Optional<W> optional;
             try {
                 optional = future.checkedGet();
                 if (optional.isPresent()) {
@@ -255,7 +255,7 @@ public abstract class AbstractNeutronInterface<T extends DataObject & Identifiab
         return result;
     }
 
-    protected <T extends DataObject> T readMd(InstanceIdentifier<T> path) {
+    protected <W extends DataObject> W readMd(InstanceIdentifier<W> path) {
         try (ReadOnlyTransaction tx = getDataBroker().newReadOnlyTransaction()) {
             return readMd(path, tx);
         }