Bump to odlparent-9.0.0/yangtools-7.0.1-SNAPSHOT

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / main / java / org / opendaylight / mdsal / binding / dom / adapter / ContextReferenceExtractor.java

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ContextReferenceExtractor.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ContextReferenceExtractor.java
index d9b4bf08add6b78dc463a38558a3b9cc2cb16963..31711cd7be0abb00918a680b9771d92fb4593639 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ContextReferenceExtractor.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/ContextReferenceExtractor.java
@@ -5,22 +5,21 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.lang.reflect.Method;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 abstract class ContextReferenceExtractor {
 
     private static final Logger LOG = LoggerFactory.getLogger(ContextReferenceExtractor.class);
@@ -40,8 +39,7 @@ abstract class ContextReferenceExtractor {
                     return create(key);
                 }
 
-                @Nonnull
-                private ContextReferenceExtractor create(final Class<?> key) {
+                private @NonNull ContextReferenceExtractor create(final Class<?> key) {
                     final Method contextGetter = getContextGetter(key);
                     if (contextGetter == null) {
                         return NULL_EXTRACTOR;
@@ -61,7 +59,7 @@ abstract class ContextReferenceExtractor {
                     } catch (final IllegalAccessException e) {
                         LOG.warn(
                                 "Class {} does not conform to Binding Specification v1. Falling back to NULL_EXTRACTOR",
-                                e);
+                                returnType, e);
                     }
                     return NULL_EXTRACTOR;
                 }
@@ -84,20 +82,18 @@ abstract class ContextReferenceExtractor {
     }
 
     /**
-     * Extract context-reference (Instance Identifier) from
-     * Binding DataObject.
+     * Extract context-reference (Instance Identifier) from a Binding DataObject.
      *
-     * @param obj DataObject from which context reference
-     *     should be extracted.
+     * @param obj DataObject from which context reference should be extracted.
      *
-     * @return Instance Identifier representing context reference
-     *     or null, if data object does not contain context reference.
+     * @return Instance Identifier representing context reference or null, if data object does not contain a context
+     *         reference.
      */
-    @Nullable
-    abstract InstanceIdentifier<?> extract(DataObject obj);
+    abstract @Nullable InstanceIdentifier<?> extract(DataObject obj);
 
-    @Nullable
-    private static Method findGetValueMethod(final Class<?> type, final Class<?> returnType) {
+    @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
+            justification = "https://github.com/spotbugs/spotbugs/issues/811")
+    private static @Nullable Method findGetValueMethod(final Class<?> type, final Class<?> returnType) {
         try {
             final Method method = type.getMethod(GET_VALUE_NAME);
             if (returnType.equals(method.getReturnType())) {