From d0527be4256b4f2cc5a5633af0fa8cb3888a8791 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 18 Feb 2014 08:34:56 +0100 Subject: [PATCH] Another round of warnings fixes Removes one unused method Fixes raw type usage where possible Organize imports to get rid of unused/duplicate imports Remove the use of deprecated InstanceIdentifier methods Change-Id: I75bac5eae1e8cffcf88ab01451d3e4a8afa8c43e Signed-off-by: Robert Varga --- .../InventoryNotificationProvider.java | 6 +-- .../binding/impl/NotificationBrokerImpl.xtend | 19 +++----- .../sal/binding/impl/util/MapUtils.xtend | 8 ++-- .../sal/binding/test/mock/SimpleInput.java | 2 +- .../test/sal/binding/it/DataServiceTest.java | 47 ++++++++++--------- .../sal/binding/it/RoutedServiceTest.java | 3 +- .../sal/dom/broker/BrokerImpl.xtend | 19 +++----- .../dom/broker/impl/DataReaderRouter.xtend | 32 ++++++------- .../impl/SchemaAwareDataStoreAdapter.java | 2 +- .../dom/broker/util/YangDataOperations.xtend | 6 --- .../sal/connect/netconf/NetconfMapping.xtend | 17 ++----- 11 files changed, 66 insertions(+), 95 deletions(-) diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryNotificationProvider.java b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryNotificationProvider.java index 23a98ff39a..6a9db37dbb 100644 --- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryNotificationProvider.java +++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/InventoryNotificationProvider.java @@ -1,5 +1,7 @@ package org.opendaylight.controller.sal.compatibility; +import java.util.List; + import org.opendaylight.controller.sal.binding.api.data.DataChangeListener; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.controller.sal.inventory.IPluginOutInventoryService; @@ -11,8 +13,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; - public class InventoryNotificationProvider implements AutoCloseable{ private ListenerRegistration nodeConnectorDataChangeListenerRegistration; @@ -33,7 +33,7 @@ public class InventoryNotificationProvider implements AutoCloseable{ && inventoryPublisher!= null){ if(nodeConnectorDataChangeListener == null){ - InstanceIdentifier nodeConnectorPath = InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build(); + InstanceIdentifier nodeConnectorPath = InstanceIdentifier.builder(Nodes.class).child(Node.class).child(NodeConnector.class).build(); nodeConnectorDataChangeListener = new NodeConnectorDataChangeListener(); nodeConnectorDataChangeListener.setInventoryPublisher(inventoryPublisher); nodeConnectorDataChangeListenerRegistration = dataProviderService.registerDataChangeListener(nodeConnectorPath, nodeConnectorDataChangeListener); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend index 9a431fec74..bf82302e54 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/NotificationBrokerImpl.xtend @@ -8,25 +8,25 @@ package org.opendaylight.controller.sal.binding.impl import com.google.common.collect.HashMultimap +import com.google.common.collect.ImmutableSet import com.google.common.collect.Multimap -import java.util.Collection +import com.google.common.collect.Multimaps import java.util.Collections import java.util.concurrent.Callable import java.util.concurrent.ExecutorService +import java.util.concurrent.Future +import java.util.Set import org.opendaylight.controller.sal.binding.api.NotificationListener import org.opendaylight.controller.sal.binding.api.NotificationProviderService +import org.opendaylight.controller.sal.binding.api.NotificationProviderService.NotificationInterestListener +import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder import org.opendaylight.controller.sal.binding.spi.NotificationInvokerFactory.NotificationInvoker import org.opendaylight.yangtools.concepts.AbstractObjectRegistration import org.opendaylight.yangtools.concepts.ListenerRegistration import org.opendaylight.yangtools.concepts.Registration +import org.opendaylight.yangtools.concepts.util.ListenerRegistry import org.opendaylight.yangtools.yang.binding.Notification import org.slf4j.LoggerFactory -import org.opendaylight.controller.sal.binding.codegen.impl.SingletonHolder import com.google.common.collect.Multimaps -import org.opendaylight.yangtools.concepts.util.ListenerRegistry -import org.opendaylight.controller.sal.binding.api.NotificationProviderService.NotificationInterestListener import java.util.Set -import java.util.Set -import com.google.common.collect.ImmutableSet -import java.util.concurrent.Future class NotificationBrokerImpl implements NotificationProviderService, AutoCloseable { @@ -69,11 +69,6 @@ class NotificationBrokerImpl implements NotificationProviderService, AutoCloseab notification.class.interfaces.filter[it != Notification && Notification.isAssignableFrom(it)] } - @SuppressWarnings("unchecked") - private def notifyAll(Collection> listeners, Notification notification) { - listeners.forEach[(it as NotificationListener).onNotification(notification)] - } - @Deprecated override addNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) { throw new UnsupportedOperationException("Deprecated method. Use registerNotificationListener instead."); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/util/MapUtils.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/util/MapUtils.xtend index 95de575b51..c60686d209 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/util/MapUtils.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/util/MapUtils.xtend @@ -7,13 +7,11 @@ */ package org.opendaylight.controller.sal.binding.impl.util -import java.util.Map.Entry -import org.opendaylight.yangtools.concepts.Path -import java.util.Map -import java.util.Set +import com.google.common.collect.Multimap import java.util.Collection import java.util.HashSet -import com.google.common.collect.Multimap +import java.util.Map.Entry +import org.opendaylight.yangtools.concepts.Path class MapUtils { diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java index b56b94a67b..0a38c90a6a 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/mock/SimpleInput.java @@ -16,5 +16,5 @@ import org.opendaylight.yangtools.yang.binding.annotations.RoutingContext; public interface SimpleInput extends DataObject,Augmentable { @RoutingContext(BaseIdentity.class) - InstanceIdentifier getIdentifier(); + InstanceIdentifier getIdentifier(); } diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java index 105f6e59a3..8a390b337e 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/DataServiceTest.java @@ -7,15 +7,17 @@ */ package org.opendaylight.controller.test.sal.binding.it; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import java.util.concurrent.Future; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; -import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; +import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer; import org.opendaylight.controller.sal.binding.api.data.DataBrokerService; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.core.api.Broker; @@ -34,8 +36,8 @@ import com.google.inject.Inject; public class DataServiceTest extends AbstractTest { protected DataBrokerService consumerDataService; - - + + @Inject Broker broker2; @@ -56,59 +58,58 @@ public class DataServiceTest extends AbstractTest { assertNotNull(consumerDataService); - + DataModificationTransaction transaction = consumerDataService.beginTransaction(); assertNotNull(transaction); - + NodeRef node1 = createNodeRef("0"); DataObject node = consumerDataService.readConfigurationData(node1.getValue()); assertNull(node); Node nodeData1 = createNode("0"); - + transaction.putConfigurationData(node1.getValue(), nodeData1); Future> commitResult = transaction.commit(); assertNotNull(commitResult); - + RpcResult result = commitResult.get(); - + assertNotNull(result); assertNotNull(result.getResult()); assertEquals(TransactionStatus.COMMITED, result.getResult()); - + Node readedData = (Node) consumerDataService.readConfigurationData(node1.getValue()); assertNotNull(readedData); assertEquals(nodeData1.getKey(), readedData.getKey()); - - + + DataModificationTransaction transaction2 = consumerDataService.beginTransaction(); assertNotNull(transaction); - + transaction2.removeConfigurationData(node1.getValue()); - + Future> commitResult2 = transaction2.commit(); assertNotNull(commitResult2); - + RpcResult result2 = commitResult2.get(); - + assertNotNull(result2); assertNotNull(result2.getResult()); assertEquals(TransactionStatus.COMMITED, result2.getResult()); - + DataObject readedData2 = consumerDataService.readConfigurationData(node1.getValue()); assertNull(readedData2); - - + + } - + private static NodeRef createNodeRef(String string) { NodeKey key = new NodeKey(new NodeId(string)); - InstanceIdentifier path = InstanceIdentifier.builder().node(Nodes.class).node(Node.class, key) - .toInstance(); + InstanceIdentifier path = InstanceIdentifier.builder(Nodes.class).child(Node.class, key).build(); return new NodeRef(path); } - + private static Node createNode(String string) { NodeBuilder ret = new NodeBuilder(); NodeId id = new NodeId(string); diff --git a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java index befe703764..9c24ca0830 100644 --- a/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java +++ b/opendaylight/md-sal/sal-binding-it/src/test/java/org/opendaylight/controller/test/sal/binding/it/RoutedServiceTest.java @@ -192,8 +192,7 @@ public class RoutedServiceTest extends AbstractTest { */ private static NodeRef createNodeRef(String string) { NodeKey key = new NodeKey(new NodeId(string)); - InstanceIdentifier path = InstanceIdentifier.builder().node(Nodes.class).node(Node.class, key) - .toInstance(); + InstanceIdentifier path = InstanceIdentifier.builder(Nodes.class).child(Node.class, key).build(); return new NodeRef(path); } diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend index 8f734d7d4c..3bbdab2c07 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/BrokerImpl.xtend @@ -8,32 +8,27 @@ package org.opendaylight.controller.sal.dom.broker; import java.util.Collections -import java.util.HashMap import java.util.HashSet -import java.util.Map import java.util.Set import java.util.concurrent.Callable import java.util.concurrent.ExecutorService import java.util.concurrent.Executors import java.util.concurrent.Future +import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener import org.opendaylight.controller.sal.core.api.Broker -import org.opendaylight.controller.sal.core.api.BrokerService import org.opendaylight.controller.sal.core.api.Consumer import org.opendaylight.controller.sal.core.api.Provider -import org.opendaylight.controller.sal.core.spi.BrokerModule +import org.opendaylight.controller.sal.core.api.RpcImplementation +import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry +import org.opendaylight.controller.sal.core.api.RpcRegistrationListener +import org.opendaylight.controller.sal.core.api.RpcRoutingContext +import org.opendaylight.controller.sal.dom.broker.spi.RpcRouter import org.opendaylight.yangtools.yang.common.QName import org.opendaylight.yangtools.yang.common.RpcResult import org.opendaylight.yangtools.yang.data.api.CompositeNode +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier import org.osgi.framework.BundleContext import org.slf4j.LoggerFactory -import org.opendaylight.controller.sal.dom.broker.spi.RpcRouter -import org.opendaylight.yangtools.concepts.ListenerRegistration -import org.opendaylight.controller.sal.core.api.RpcRegistrationListener -import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry -import org.opendaylight.controller.sal.core.api.RpcImplementation -import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener -import org.opendaylight.controller.sal.core.api.RpcRoutingContext -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier public class BrokerImpl implements Broker, RpcProvisionRegistry, AutoCloseable { private static val log = LoggerFactory.getLogger(BrokerImpl); diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.xtend b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.xtend index cc44613e44..95d0018b21 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.xtend +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/DataReaderRouter.xtend @@ -7,29 +7,26 @@ */ package org.opendaylight.controller.sal.dom.broker.impl -import org.opendaylight.controller.md.sal.common.impl.routing.AbstractDataReadRouter -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier -import org.opendaylight.yangtools.yang.data.api.CompositeNode -import org.opendaylight.controller.md.sal.common.api.data.DataReader -import org.opendaylight.yangtools.yang.common.QName import java.net.URI -import java.util.List -import org.opendaylight.yangtools.yang.data.api.Node import java.util.ArrayList -import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl -import java.util.Map -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifier -import org.opendaylight.yangtools.yang.data.api.SimpleNode +import java.util.Collection import java.util.Collections -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates import java.util.HashMap -import static com.google.common.base.Preconditions.*; -import java.util.Collection -import java.util.Set +import java.util.Map import java.util.Map.Entry -import org.slf4j.LoggerFactory +import java.util.Set +import org.opendaylight.controller.md.sal.common.impl.routing.AbstractDataReadRouter +import org.opendaylight.yangtools.yang.common.QName +import org.opendaylight.yangtools.yang.data.api.CompositeNode +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument +import org.opendaylight.yangtools.yang.data.api.Node +import org.opendaylight.yangtools.yang.data.api.SimpleNode import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl +import org.slf4j.LoggerFactory + +import static com.google.common.base.Preconditions.* class DataReaderRouter extends AbstractDataReadRouter { private static val LOG = LoggerFactory.getLogger(DataReaderRouter); @@ -42,7 +39,6 @@ class DataReaderRouter extends AbstractDataReadRouter>(); val keyNodes = new HashMap>(); - val iterator = data.iterator; for(dataBit : data) { try { if(pathArgument != null && dataBit != null) { diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java index b02a37c300..602afd7c0c 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareDataStoreAdapter.java @@ -150,7 +150,7 @@ public class SchemaAwareDataStoreAdapter extends AbstractLockableDelegator> mergeMultiple(LeafSchemaNode node, List> original, List> modified, boolean configurational) { checkArgument(original.size === 1); diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend index f409ecdade..e5a24fcf63 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/NetconfMapping.xtend @@ -16,30 +16,23 @@ import java.util.Collections import java.util.List import java.util.Set import java.util.concurrent.atomic.AtomicInteger +import org.opendaylight.controller.netconf.api.NetconfMessage import org.opendaylight.controller.sal.common.util.Rpcs +import org.opendaylight.yangtools.yang.common.QName +import org.opendaylight.yangtools.yang.common.RpcResult import org.opendaylight.yangtools.yang.data.api.CompositeNode import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument -import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl -import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode -import java.util.Collections -import java.util.List -import java.util.Set -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates -import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument import org.opendaylight.yangtools.yang.data.api.Node import org.opendaylight.yangtools.yang.data.impl.CompositeNodeTOImpl +import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode +import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl import org.opendaylight.yangtools.yang.data.impl.codec.xml.XmlDocumentUtils import org.opendaylight.yangtools.yang.model.api.NotificationDefinition import org.opendaylight.yangtools.yang.model.api.SchemaContext import org.w3c.dom.Document import org.w3c.dom.Element -import org.opendaylight.yangtools.yang.common.QName -import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl -import org.opendaylight.controller.netconf.api.NetconfMessage -import org.opendaylight.yangtools.yang.common.RpcResult class NetconfMapping { -- 2.36.6