X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fimpl%2FContextReferenceExtractor.java;h=043501c76875a84a0e9a2ebc97dedb0b92468fea;hb=refs%2Fchanges%2F11%2F80211%2F6;hp=84f12444e5a9473cced4d79f3d0d289c9245fe21;hpb=b830d5ede22e323fe724cd747fe99280dfa2240d;p=controller.git diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java index 84f12444e5..043501c768 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/ContextReferenceExtractor.java @@ -5,24 +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.controller.md.sal.binding.impl; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; 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); private static final ContextReferenceExtractor NULL_EXTRACTOR = new ContextReferenceExtractor() { @@ -32,12 +29,11 @@ abstract class ContextReferenceExtractor { } }; - private static final LoadingCache, ContextReferenceExtractor> EXTRACTORS = CacheBuilder.newBuilder() .weakKeys().build(new CacheLoader, ContextReferenceExtractor>() { @Override - public ContextReferenceExtractor load(final Class key) throws Exception { + public ContextReferenceExtractor load(final Class key) { return create(key); } }); @@ -53,16 +49,14 @@ abstract class ContextReferenceExtractor { * Extract context-reference (Instance Identifier) from * 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 + * context reference. */ abstract @Nullable InstanceIdentifier extract(DataObject obj); - @Nonnull - private static ContextReferenceExtractor create(final Class key) { + private static @NonNull ContextReferenceExtractor create(final Class key) { final Method contextGetter = getContextGetter(key); if (contextGetter == null) { return NULL_EXTRACTOR; @@ -84,11 +78,10 @@ abstract class ContextReferenceExtractor { return NULL_EXTRACTOR; } - @Nullable - private static Method findGetValueMethod(final Class type, final Class returnType) { + 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())) { + if (returnType.equals(method.getReturnType())) { return method; } } catch (final NoSuchMethodException e) { @@ -105,7 +98,4 @@ abstract class ContextReferenceExtractor { } return null; } - - - }