From b830d5ede22e323fe724cd747fe99280dfa2240d Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Tue, 28 Apr 2015 15:41:05 +0200 Subject: [PATCH] Bug 4035: Fixed some sonar warnings in md.sal.binding.impl Change-Id: I7b850b65a7bfc40ef757115ae37a031fa88bebeb Signed-off-by: Tony Tkacik --- .../compat/HydrogenDataBrokerAdapter.java | 52 ++++++++++--------- .../compat/HydrogenDataChangeEvent.java | 19 +++---- .../HydrogenNotificationBrokerImpl.java | 2 +- .../binding/compat/NotificationInvoker.java | 6 +-- .../md/sal/binding/compat/NotifyTask.java | 28 ++++++---- .../binding/impl/BindingDOMAdapterLoader.java | 3 +- .../impl/BindingDOMRpcServiceAdapter.java | 6 +-- .../BindingDOMTransactionChainAdapter.java | 23 ++++---- .../BindingDOMWriteTransactionAdapter.java | 4 +- .../impl/BindingToNormalizedNodeCodec.java | 8 +-- .../impl/ContextReferenceExtractor.java | 6 ++- .../impl/LazyDataObjectModification.java | 2 +- .../sal/binding/impl/RpcServiceAdapter.java | 14 ++--- .../md/sal/binding/spi/AdapterLoader.java | 6 ++- .../binding/impl/RootBindingAwareBroker.java | 6 +-- ...rdedBackwardsCompatibleDataBrokerTest.java | 7 +-- .../binding/test/util/BindingTestContext.java | 1 - 17 files changed, 97 insertions(+), 96 deletions(-) diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataBrokerAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataBrokerAdapter.java index 0ac8f69702..da6859b4a3 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataBrokerAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataBrokerAdapter.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; @@ -57,7 +58,8 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose private static final Logger LOG = LoggerFactory.getLogger(HydrogenDataBrokerAdapter.class); - private final ConcurrentHashMap, CommitHandlerRegistrationImpl> commitHandlers = new ConcurrentHashMap<>(); + private final ConcurrentMap, CommitHandlerRegistrationImpl> commitHandlers = + new ConcurrentHashMap<>(); private final ListeningExecutorService executorService = SingletonHolder.getDefaultCommitExecutor(); private final DataBroker delegate; @@ -74,13 +76,13 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public DataObject readConfigurationData(final InstanceIdentifier path) { - DataModificationTransaction tx = beginTransaction(); + final DataModificationTransaction tx = beginTransaction(); return tx.readConfigurationData(path); } @Override public DataObject readOperationalData(final InstanceIdentifier path) { - DataModificationTransaction tx = beginTransaction(); + final DataModificationTransaction tx = beginTransaction(); return tx.readOperationalData(path); } @@ -88,7 +90,7 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose public Registration registerCommitHandler( final InstanceIdentifier path, final DataCommitHandler, DataObject> commitHandler) { - CommitHandlerRegistrationImpl reg = new CommitHandlerRegistrationImpl(path, commitHandler); + final CommitHandlerRegistrationImpl reg = new CommitHandlerRegistrationImpl(path, commitHandler); commitHandlers.put(path, reg); return reg; } @@ -105,11 +107,11 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose final InstanceIdentifier path, final DataChangeListener listener) { - org.opendaylight.controller.md.sal.binding.api.DataChangeListener asyncOperListener = new BackwardsCompatibleOperationalDataChangeInvoker(listener); - org.opendaylight.controller.md.sal.binding.api.DataChangeListener asyncCfgListener = new BackwardsCompatibleConfigurationDataChangeInvoker(listener); + final org.opendaylight.controller.md.sal.binding.api.DataChangeListener asyncOperListener = new BackwardsCompatibleOperationalDataChangeInvoker(listener); + final org.opendaylight.controller.md.sal.binding.api.DataChangeListener asyncCfgListener = new BackwardsCompatibleConfigurationDataChangeInvoker(listener); - ListenerRegistration cfgReg = delegate.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, path, asyncCfgListener, DataChangeScope.SUBTREE); - ListenerRegistration operReg = delegate.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, path, asyncOperListener, DataChangeScope.SUBTREE); + final ListenerRegistration cfgReg = delegate.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION, path, asyncCfgListener, DataChangeScope.SUBTREE); + final ListenerRegistration operReg = delegate.registerDataChangeListener(LogicalDatastoreType.OPERATIONAL, path, asyncOperListener, DataChangeScope.SUBTREE); return new LegacyListenerRegistration(listener,cfgReg,operReg); } @@ -125,20 +127,20 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose final List, DataObject>> subTrans = new ArrayList<>(); LOG.debug("Tx: {} Submitted.",tx.getIdentifier()); - ListenableFuture requestCommit = executorService.submit(new Callable() { + final ListenableFuture requestCommit = executorService.submit(new Callable() { @Override public Boolean call() throws Exception { try { - for (CommitHandlerRegistrationImpl handler : commitHandlers.values()) { + for (final CommitHandlerRegistrationImpl handler : commitHandlers.values()) { - DataCommitTransaction, DataObject> subTx = handler + final DataCommitTransaction, DataObject> subTx = handler .getInstance().requestCommit(tx); subTrans.add(subTx); } - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Tx: {} Rollback.",tx.getIdentifier(),e); - for (DataCommitTransaction, DataObject> subTx : subTrans) { + for (final DataCommitTransaction, DataObject> subTx : subTrans) { subTx.rollback(); } return false; @@ -149,7 +151,7 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose }); - ListenableFuture> dataStoreCommit = Futures.transform(requestCommit, new AsyncFunction>() { + final ListenableFuture> dataStoreCommit = Futures.transform(requestCommit, new AsyncFunction>() { @Override public ListenableFuture> apply(final Boolean requestCommitSuccess) throws Exception { @@ -164,12 +166,12 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public RpcResult apply(final RpcResult input) { if(input.isSuccessful()) { - for(DataCommitTransaction, DataObject> subTx : subTrans ) { + for(final DataCommitTransaction, DataObject> subTx : subTrans ) { subTx.finish(); } } else { LOG.error("Tx: {} Rollback - Datastore commit failed.",tx.getIdentifier()); - for(DataCommitTransaction, DataObject> subTx : subTrans ) { + for(final DataCommitTransaction, DataObject> subTx : subTrans ) { subTx.rollback(); } } @@ -206,7 +208,7 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public void putOperationalData(final InstanceIdentifier path, final DataObject data) { - boolean previouslyRemoved = posponedRemovedOperational.remove(path); + final boolean previouslyRemoved = posponedRemovedOperational.remove(path); @SuppressWarnings({ "rawtypes", "unchecked" }) final InstanceIdentifier castedPath = (InstanceIdentifier) path; @@ -219,8 +221,8 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public void putConfigurationData(final InstanceIdentifier path, final DataObject data) { - boolean previouslyRemoved = posponedRemovedConfiguration.remove(path); - DataObject originalObj = readConfigurationData(path); + final boolean previouslyRemoved = posponedRemovedConfiguration.remove(path); + final DataObject originalObj = readConfigurationData(path); if (originalObj != null) { original.put(path, originalObj); @@ -311,10 +313,10 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose LOG.trace("Transaction {} changed status to {}", getIdentifier(), status); this.status = status; - for(ListenerRegistration listener : listeners) { + for(final ListenerRegistration listener : listeners) { try { listener.getInstance().onStatusUpdated(this, status); - } catch (Exception e) { + } catch (final Exception e) { LOG.error("Error during invoking transaction listener {}",listener.getInstance(),e); } } @@ -323,11 +325,11 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public ListenableFuture> commit() { - for(InstanceIdentifier path : posponedRemovedConfiguration) { + for(final InstanceIdentifier path : posponedRemovedConfiguration) { delegate.delete(LogicalDatastoreType.CONFIGURATION, path); } - for(InstanceIdentifier path : posponedRemovedOperational) { + for(final InstanceIdentifier path : posponedRemovedOperational) { delegate.delete(LogicalDatastoreType.OPERATIONAL, path); } @@ -423,7 +425,7 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public void onDataChanged(final AsyncDataChangeEvent, DataObject> change) { - DataChangeEvent legacyChange = HydrogenDataChangeEvent.createOperational(change); + final DataChangeEvent legacyChange = HydrogenDataChangeEvent.createOperational(change); delegate.onDataChanged(legacyChange); } @@ -446,7 +448,7 @@ public class HydrogenDataBrokerAdapter implements DataProviderService, AutoClose @Override public void onDataChanged(final AsyncDataChangeEvent, DataObject> change) { - DataChangeEvent legacyChange = HydrogenDataChangeEvent.createConfiguration(change); + final DataChangeEvent legacyChange = HydrogenDataChangeEvent.createConfiguration(change); delegate.onDataChanged(legacyChange); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java index e2b838eb10..8f50d0ad2e 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenDataChangeEvent.java @@ -11,7 +11,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Set; - import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.DataChangeEvent; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -95,7 +94,7 @@ public abstract class HydrogenDataChangeEvent implements } @SuppressWarnings({ "rawtypes", "unchecked" }) - private final static class OperationalChangeEvent extends HydrogenDataChangeEvent { + private static final class OperationalChangeEvent extends HydrogenDataChangeEvent { private final AsyncDataChangeEvent, DataObject> delegate; private Map, DataObject> updatedCache; @@ -132,9 +131,10 @@ public abstract class HydrogenDataChangeEvent implements @Override public Map, DataObject> getUpdatedOperationalData() { if(updatedCache == null) { - Map, DataObject> created = delegate.getCreatedData(); - Map, DataObject> updated = delegate.getUpdatedData(); - HashMap, DataObject> updatedComposite = new HashMap<>(created.size() + updated.size()); + final Map, DataObject> created = delegate.getCreatedData(); + final Map, DataObject> updated = delegate.getUpdatedData(); + final Map, DataObject> updatedComposite = + new HashMap<>(created.size() + updated.size()); updatedComposite.putAll(created); updatedComposite.putAll(updated); updatedCache = Collections.unmodifiableMap(updatedComposite); @@ -150,7 +150,7 @@ public abstract class HydrogenDataChangeEvent implements } @SuppressWarnings({ "rawtypes", "unchecked" }) - private final static class ConfigurationChangeEvent extends HydrogenDataChangeEvent { + private static final class ConfigurationChangeEvent extends HydrogenDataChangeEvent { private final AsyncDataChangeEvent, DataObject> delegate; private Map, DataObject> updatedCache; @@ -187,9 +187,10 @@ public abstract class HydrogenDataChangeEvent implements @Override public Map, DataObject> getUpdatedConfigurationData() { if(updatedCache == null) { - Map, DataObject> created = delegate.getCreatedData(); - Map, DataObject> updated = delegate.getUpdatedData(); - HashMap, DataObject> updatedComposite = new HashMap<>(created.size() + updated.size()); + final Map, DataObject> created = delegate.getCreatedData(); + final Map, DataObject> updated = delegate.getUpdatedData(); + final Map, DataObject> updatedComposite = + new HashMap<>(created.size() + updated.size()); updatedComposite.putAll(created); updatedComposite.putAll(updated); updatedCache = Collections.unmodifiableMap(updatedComposite); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenNotificationBrokerImpl.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenNotificationBrokerImpl.java index b746020e0a..90e9484f05 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenNotificationBrokerImpl.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/HydrogenNotificationBrokerImpl.java @@ -53,7 +53,7 @@ public class HydrogenNotificationBrokerImpl implements NotificationProviderServi return HashMultimap.create(listeners.get().getListeners()); } - private final void addRegistrations(final NotificationListenerRegistration... registrations) { + private void addRegistrations(final NotificationListenerRegistration... registrations) { synchronized (this) { final Multimap, NotificationListenerRegistration> newListeners = mutableListeners(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java index cdc6315e49..f98c8b8a53 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotificationInvoker.java @@ -30,7 +30,7 @@ final class NotificationInvoker implements org.opendaylight.controller.sal.bindi delegate = listener; final Map, InvokerContext> builder = new HashMap<>(); for(final TypeToken ifaceToken : TypeToken.of(listener.getClass()).getTypes().interfaces()) { - Class iface = ifaceToken.getRawType(); + final Class iface = ifaceToken.getRawType(); if(NotificationListener.class.isAssignableFrom(iface) && BindingReflections.isBindingClass(iface)) { @SuppressWarnings("unchecked") final Class listenerType = (Class) iface; @@ -54,7 +54,7 @@ final class NotificationInvoker implements org.opendaylight.controller.sal.bindi @Override public void onNotification(final Notification notification) { getContext(notification.getImplementedInterface()).invoke(notification); - }; + } private InvokerContext getContext(final Class type) { return invokers.get(type); @@ -74,7 +74,7 @@ final class NotificationInvoker implements org.opendaylight.controller.sal.bindi return ret; } - private class InvokerContext { + private final class InvokerContext { private final QName name; private final NotificationListenerInvoker invoker; diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotifyTask.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotifyTask.java index 345ec62189..59be9af829 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotifyTask.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/compat/NotifyTask.java @@ -7,13 +7,12 @@ */ package org.opendaylight.controller.md.sal.binding.compat; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; import org.opendaylight.yangtools.yang.binding.Notification; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; - class NotifyTask implements Runnable { private static final Logger LOG = LoggerFactory.getLogger(NotifyTask.class); @@ -62,23 +61,30 @@ class NotifyTask implements Runnable { @Override public boolean equals(final Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; - NotifyTask other = (NotifyTask) obj; + } + final NotifyTask other = (NotifyTask) obj; if (registration == null) { - if (other.registration != null) + if (other.registration != null) { return false; - } else if (!registration.equals(other.registration)) + } + } else if (!registration.equals(other.registration)) { return false; + } if (notification == null) { - if (other.notification != null) + if (other.notification != null) { return false; - } else if (!notification.equals(other.notification)) + } + } else if (!notification.equals(other.notification)) { return false; + } return true; } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java index 175dbb6c99..96108ee1f0 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMAdapterLoader.java @@ -38,8 +38,7 @@ public abstract class BindingDOMAdapterLoader extends AdapterLoader createBuilder(final Class key) - throws IllegalArgumentException { + protected final AdapterBuilder createBuilder(final Class key) { final Factory factory = FACTORIES.get(key); Preconditions.checkArgument(factory != null, "Unsupported service type %s", key); final BindingDOMAdapterBuilder builder = factory.newBuilder(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java index 90d91458e1..8ebc5e6837 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMRpcServiceAdapter.java @@ -52,13 +52,11 @@ public class BindingDOMRpcServiceAdapter implements RpcConsumerRegistry { this.codec = codec; } + @SuppressWarnings("unchecked") @Override public T getRpcService(final Class rpcService) { Preconditions.checkArgument(rpcService != null, "Rpc Service needs to be specied."); - @SuppressWarnings("unchecked") - final - T proxy = (T) proxies.getUnchecked(rpcService).getProxy(); - return proxy; + return (T) proxies.getUnchecked(rpcService).getProxy(); } private RpcServiceAdapter createProxy(final Class key) { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java index 1a0787eb19..4dc55d2e14 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMTransactionChainAdapter.java @@ -53,15 +53,14 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain @Override public ReadOnlyTransaction newReadOnlyTransaction() { - DOMDataReadOnlyTransaction delegateTx = delegate.newReadOnlyTransaction(); - ReadOnlyTransaction bindingTx = new BindingDOMReadTransactionAdapter(delegateTx, codec); - return bindingTx; + final DOMDataReadOnlyTransaction delegateTx = delegate.newReadOnlyTransaction(); + return new BindingDOMReadTransactionAdapter(delegateTx, codec); } @Override public ReadWriteTransaction newReadWriteTransaction() { - DOMDataReadWriteTransaction delegateTx = delegate.newReadWriteTransaction(); - ReadWriteTransaction bindingTx = new BindingDOMReadWriteTransactionAdapter(delegateTx, codec) { + final DOMDataReadWriteTransaction delegateTx = delegate.newReadWriteTransaction(); + return new BindingDOMReadWriteTransactionAdapter(delegateTx, codec) { @Override public CheckedFuture submit() { @@ -69,33 +68,31 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain } }; - return bindingTx; } @Override public WriteTransaction newWriteOnlyTransaction() { final DOMDataWriteTransaction delegateTx = delegate.newWriteOnlyTransaction(); - WriteTransaction bindingTx = new BindingDOMWriteTransactionAdapter(delegateTx, codec) { + return new BindingDOMWriteTransactionAdapter(delegateTx, codec) { @Override public CheckedFuture submit() { return listenForFailure(this,super.submit()); - }; + } }; - return bindingTx; } private CheckedFuture listenForFailure( - final WriteTransaction tx, CheckedFuture future) { + final WriteTransaction tx, final CheckedFuture future) { Futures.addCallback(future, new FutureCallback() { @Override - public void onFailure(Throwable t) { + public void onFailure(final Throwable t) { failTransactionChain(tx,t); } @Override - public void onSuccess(Void result) { + public void onSuccess(final Void result) { // Intentionally NOOP } }); @@ -103,7 +100,7 @@ final class BindingDOMTransactionChainAdapter implements BindingTransactionChain return future; } - private void failTransactionChain(WriteTransaction tx, Throwable t) { + private void failTransactionChain(final WriteTransaction tx, final Throwable t) { /* * We asume correct state change for underlaying transaction * diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java index 02e15a1e51..88c8bf5a99 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingDOMWriteTransactionAdapter.java @@ -41,8 +41,8 @@ class BindingDOMWriteTransactionAdapter exten } @Override - public void merge(final LogicalDatastoreType store, final InstanceIdentifier path, - final T data) { + public void merge(final LogicalDatastoreType store, final InstanceIdentifier path, + final D data) { merge(store, path, data,false); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java index 776691c047..845f422911 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java @@ -94,7 +94,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto this.futureSchema = waitForSchema ? new FutureSchema(WAIT_DURATION_SEC, TimeUnit.SECONDS) : null; } - final YangInstanceIdentifier toYangInstanceIdentifierBlocking(final InstanceIdentifier binding) { + YangInstanceIdentifier toYangInstanceIdentifierBlocking(final InstanceIdentifier binding) { try { return codecRegistry.toYangInstanceIdentifier(binding); } catch (final MissingSchemaException e) { @@ -202,7 +202,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto } public Optional, DataObject>> toBinding( - final @Nonnull Entry> normalized) + @Nonnull final Entry> normalized) throws DeserializationException { try { /* @@ -218,7 +218,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto * It is safe to loose generic information and cast it to other generic signature. * */ - @SuppressWarnings({ "unchecked", "rawtypes" }) + @SuppressWarnings("unchecked") final Entry, DataObject> binding = Entry.class.cast(codecRegistry.fromNormalizedNode(normalized.getKey(), normalized.getValue())); return Optional.fromNullable(binding); } catch (final IllegalArgumentException e) { @@ -228,7 +228,7 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto @Override public void onGlobalContextUpdated(final SchemaContext arg0) { - legacyToNormalized = new DataNormalizer (arg0); + legacyToNormalized = new DataNormalizer(arg0); runtimeContext = BindingRuntimeContext.create(classLoadingStrategy, arg0); codecRegistry.onBindingRuntimeContextUpdated(runtimeContext); if(futureSchema != null) { 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 453958fd87..84f12444e5 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 @@ -61,7 +61,8 @@ abstract class ContextReferenceExtractor { */ abstract @Nullable InstanceIdentifier extract(DataObject obj); - private static @Nonnull ContextReferenceExtractor create(final Class key) { + @Nonnull + private static ContextReferenceExtractor create(final Class key) { final Method contextGetter = getContextGetter(key); if (contextGetter == null) { return NULL_EXTRACTOR; @@ -83,7 +84,8 @@ abstract class ContextReferenceExtractor { return NULL_EXTRACTOR; } - private static @Nullable Method findGetValueMethod(final Class type, final Class returnType) { + @Nullable + private static Method findGetValueMethod(final Class type, final Class returnType) { try { final Method method = type.getMethod(GET_VALUE_NAME); if(returnType.equals(method.getReturnType())) { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataObjectModification.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataObjectModification.java index 83d48f77a0..1170828ce9 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataObjectModification.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/LazyDataObjectModification.java @@ -59,7 +59,7 @@ final class LazyDataObjectModification implements DataObje private static Collection> from(final BindingCodecTreeNode parentCodec, final Collection domChildNodes) { - final ArrayList> result = new ArrayList<>(domChildNodes.size()); + final List> result = new ArrayList<>(domChildNodes.size()); populateList(result, parentCodec, domChildNodes); return result; } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java index 24ca97e0ab..f9163ce78a 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/RpcServiceAdapter.java @@ -61,7 +61,7 @@ class RpcServiceAdapter implements InvocationHandler { proxy = (RpcService) Proxy.newProxyInstance(type.getClassLoader(), new Class[] {type}, this); } - private final ListenableFuture> invoke0(final SchemaPath schemaPath, final NormalizedNode input) { + private ListenableFuture> invoke0(final SchemaPath schemaPath, final NormalizedNode input) { final CheckedFuture result = delegate.invokeRpc(schemaPath, input); if(result instanceof LazyDOMRpcResultFuture) { return ((LazyDOMRpcResultFuture) result).getBindingFuture(); @@ -105,14 +105,15 @@ class RpcServiceAdapter implements InvocationHandler { private static boolean isObjectMethod(final Method m) { switch (m.getName()) { case "toString": - return (m.getReturnType() == String.class && m.getParameterTypes().length == 0); + return (m.getReturnType().equals(String.class) && m.getParameterTypes().length == 0); case "hashCode": - return (m.getReturnType() == int.class && m.getParameterTypes().length == 0); + return (m.getReturnType().equals(int.class) && m.getParameterTypes().length == 0); case "equals": - return (m.getReturnType() == boolean.class && m.getParameterTypes().length == 1 && m + return (m.getReturnType().equals(boolean.class) && m.getParameterTypes().length == 1 && m .getParameterTypes()[0] == Object.class); + default: + return false; } - return false; } private Object callObjectMethod(final Object self, final Method m, final Object[] args) { @@ -123,8 +124,9 @@ class RpcServiceAdapter implements InvocationHandler { return System.identityHashCode(self); case "equals": return (self == args[0]); + default: + return null; } - return null; } private static ListenableFuture> transformFuture(final SchemaPath rpc, diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java index aea59078b0..7919a8fba4 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/spi/AdapterLoader.java @@ -29,8 +29,10 @@ public abstract class AdapterLoader extends CacheLoader return Optional.of(builder.build()); } - protected abstract @Nullable D getDelegate(Class reqDeleg); + @Nullable + protected abstract D getDelegate(Class reqDeleg); - protected abstract @Nonnull AdapterBuilder createBuilder(Class key) throws IllegalArgumentException; + @Nonnull + protected abstract AdapterBuilder createBuilder(Class key); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java index 193f3c8d36..3fccb1d326 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java @@ -37,10 +37,8 @@ import org.osgi.framework.BundleContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class RootBindingAwareBroker implements // - Mutable, // - Identifiable, // - BindingAwareBroker, AutoCloseable, RpcProviderRegistry { +public class RootBindingAwareBroker implements Mutable, Identifiable, BindingAwareBroker, AutoCloseable, + RpcProviderRegistry { private final static Logger LOG = LoggerFactory.getLogger(RootBindingAwareBroker.class); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ForwardedBackwardsCompatibleDataBrokerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ForwardedBackwardsCompatibleDataBrokerTest.java index 587b9260e6..7598882cc2 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ForwardedBackwardsCompatibleDataBrokerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ForwardedBackwardsCompatibleDataBrokerTest.java @@ -10,15 +10,13 @@ package org.opendaylight.controller.md.sal.binding.impl.test; import static junit.framework.TestCase.assertNotNull; -import org.opendaylight.controller.md.sal.binding.compat.HydrogenDataBrokerAdapter; - import com.google.common.collect.ImmutableSet; import java.util.concurrent.ExecutionException; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.compat.HydrogenDataBrokerAdapter; import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest; import org.opendaylight.controller.md.sal.binding.test.DataBrokerTestCustomizer; -import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; @@ -33,10 +31,7 @@ import org.opendaylight.yangtools.yang.binding.util.BindingReflections; public class ForwardedBackwardsCompatibleDataBrokerTest extends AbstractDataBrokerTest { - private DataBrokerTestCustomizer testCustomizer; private HydrogenDataBrokerAdapter dataBroker; - private DOMDataBroker domBroker; - private static final InstanceIdentifier TOP_PATH = InstanceIdentifier.create(Top.class); private static final TopLevelListKey TOP_LIST_KEY = new TopLevelListKey("foo"); private static final InstanceIdentifier NODE_PATH = TOP_PATH.child(TopLevelList.class, TOP_LIST_KEY); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index 1203a72dc3..5ca041a3e6 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -177,7 +177,6 @@ public class BindingTestContext implements AutoCloseable { private ProviderSession createMockContext() { - @SuppressWarnings("deprecation") final ClassToInstanceMap domBrokerServices = ImmutableClassToInstanceMap . builder() // -- 2.36.6