BUG-1473: update model.util.InstanceIdentifier users

Companion patch to https://git.opendaylight.org/gerrit/9622, updates
users to use the new name. Also make the code a tiny bit more readable.

Fixed conversion to checked Future.

Change-Id: If8da3639e656214713d3680951cd9ae724c5ad6f
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java
index 14ca75b9f3ecb5071621ff43f8234826360b8263..b6dbefbbac16506d6ed17af63bd2d208707ecaea 100644 (file)
--- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java
+++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/node/NodeValueCodec.java
@@ -18,7 +18,7 @@ import org.opendaylight.yangtools.yang.data.impl.codec.TypeDefinitionAwareCodec;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.IdentityrefType;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.util.IdentityrefType;

-import org.opendaylight.yangtools.yang.model.util.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.model.util.InstanceIdentifierType;

 import org.opendaylight.yangtools.yang.model.util.Leafref;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.opendaylight.yangtools.yang.model.util.Leafref;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -57,7 +57,7 @@ public class NodeValueCodec {
                 return value;
             } else if(baseType instanceof IdentityrefType) {
                 return QNameFactory.create(value);
                 return value;
             } else if(baseType instanceof IdentityrefType) {
                 return QNameFactory.create(value);

-            } else if(baseType instanceof InstanceIdentifier) {
+            } else if(baseType instanceof InstanceIdentifierType) {

                 return InstanceIdentifierUtils.fromSerializable(node.getInstanceIdentifierValue());
             } else {
                 logger.error("Could not figure out how to transform value " + value +  " for schemaType " + type);
                 return InstanceIdentifierUtils.fromSerializable(node.getInstanceIdentifierValue());
             } else {
                 logger.error("Could not figure out how to transform value " + value +  " for schemaType " + type);

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/XmlDocumentUtils.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/XmlDocumentUtils.java
index 127aa0732b5634bde6de07937ee098e2ba77e97b..49ba84307109e650b07e25420506e73bbae57842 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/XmlDocumentUtils.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/utils/XmlDocumentUtils.java
@@ -33,6 +33,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 import org.opendaylight.yangtools.yang.model.api.type.IdentityrefTypeDefinition;

+import org.opendaylight.yangtools.yang.model.util.InstanceIdentifierType;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Attr;


@@ -155,7 +156,7 @@ public class XmlDocumentUtils {
     }
 
     final TypeDefinition<?> baseType = XmlUtils.resolveBaseTypeFrom(schema.getType());
     }
 
     final TypeDefinition<?> baseType = XmlUtils.resolveBaseTypeFrom(schema.getType());

-    if (baseType instanceof org.opendaylight.yangtools.yang.model.util.InstanceIdentifier) {
+    if (baseType instanceof InstanceIdentifierType) {

       logger.debug("toSimpleNodeWithType: base type of node is instance identifier, deserializing element", xmlElement);
       value = InstanceIdentifierForXmlCodec.deserialize(xmlElement,schemaCtx);
 
       logger.debug("toSimpleNodeWithType: base type of node is instance identifier, deserializing element", xmlElement);
       value = InstanceIdentifierForXmlCodec.deserialize(xmlElement,schemaCtx);
 


@@ -184,7 +185,7 @@ public class XmlDocumentUtils {
       value = codec.deserialize(text);
     }
 
       value = codec.deserialize(text);
     }
 

-    if (schema.getType() instanceof org.opendaylight.yangtools.yang.model.util.InstanceIdentifier) {
+    if (schema.getType() instanceof InstanceIdentifierType) {

       logger.debug("toSimpleNodeWithType: base type of node is instance identifier, deserializing element", xmlElement);
       value = InstanceIdentifierForXmlCodec.deserialize(xmlElement,schemaCtx);
     }
       logger.debug("toSimpleNodeWithType: base type of node is instance identifier, deserializing element", xmlElement);
       value = InstanceIdentifierForXmlCodec.deserialize(xmlElement,schemaCtx);
     }

diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
index e50c07e05aef735b1adb2568981f2354718a64af..bca3d0b4579d291d18aa9527ad4baff5dcd3f4bc 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java
@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.base.Optional;
 import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.Futures;

-import com.google.common.util.concurrent.ListenableFuture;

 import java.util.concurrent.Future;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.junit.Before;
 import java.util.concurrent.Future;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.junit.Before;


@@ -32,6 +31,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

+import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;

 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener;
 import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataChangeListener;


@@ -75,7 +75,7 @@ public class BrokerFacadeTest {
     CompositeNode dataNode;
 
     NormalizedNode<?, ?> dummyNode = createDummyNode("dummy:namespace", "2014-07-01", "dummy local name");
     CompositeNode dataNode;
 
     NormalizedNode<?, ?> dummyNode = createDummyNode("dummy:namespace", "2014-07-01", "dummy local name");

-    ListenableFuture<Optional<NormalizedNode<?, ?>>> dummyNodeInFuture = wrapDummyNode(dummyNode);
+    CheckedFuture<Optional<NormalizedNode<?, ?>>,ReadFailedException> dummyNodeInFuture = wrapDummyNode(dummyNode);

 
     QName qname = QName.create("node");
 
 
     QName qname = QName.create("node");
 


@@ -104,14 +104,14 @@ public class BrokerFacadeTest {
 
     }
 
 
     }
 

-    private ListenableFuture<Optional<NormalizedNode<?, ?>>> wrapDummyNode(NormalizedNode<?, ?> dummyNode) {
-        return Futures.<Optional<NormalizedNode<?, ?>>> immediateFuture(Optional.<NormalizedNode<?, ?>> of(dummyNode));
+    private CheckedFuture<Optional<NormalizedNode<?, ?>>,ReadFailedException> wrapDummyNode(final NormalizedNode<?, ?> dummyNode) {
+        return  Futures.immediateCheckedFuture(Optional.<NormalizedNode<?, ?>> of(dummyNode));

     }
 
     /**
      * Value of this node shouldn't be important for testing purposes
      */
     }
 
     /**
      * Value of this node shouldn't be important for testing purposes
      */

-    private NormalizedNode<?, ?> createDummyNode(String namespace, String date, String localName) {
+    private NormalizedNode<?, ?> createDummyNode(final String namespace, final String date, final String localName) {

         return Builders.containerBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create(namespace, date, localName))).build();
     }
         return Builders.containerBuilder()
                 .withNodeIdentifier(new NodeIdentifier(QName.create(namespace, date, localName))).build();
     }