From 9e7adec1a8dfe5dd84dcb7317280572aab20e668 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 3 Sep 2019 12:27:41 +0200 Subject: [PATCH] Migrate YangInstanceIdentifier.EMPTY users This moves over to use the replacement empty() method. Change-Id: I133d5025ee176e5487dbcd8f71517c990c299682 Signed-off-by: Robert Varga --- .../netconf/mdsal/connector/ops/CopyConfig.java | 4 ++-- .../netconf/mdsal/connector/ops/get/AbstractGet.java | 2 +- .../topology/singleton/impl/ProxyDOMRpcService.java | 2 +- .../topology/singleton/impl/actors/NetconfNodeActor.java | 2 +- .../topology/singleton/impl/ProxyDOMDataBrokerTest.java | 6 +++--- .../impl/actors/ReadTransactionActorTestAdapter.java | 2 +- .../singleton/impl/tx/ProxyReadWriteTransactionTest.java | 2 +- .../sal/connect/netconf/util/NetconfBaseOpsTest.java | 4 ++-- .../netconf/sal/restconf/impl/ControllerContext.java | 2 +- .../rests/services/impl/RestconfDataServiceImplTest.java | 4 ++-- .../rests/utils/DeleteDataTransactionUtilTest.java | 6 +++--- .../rfc8040/rests/utils/PutDataTransactionUtilTest.java | 2 +- .../nb/rfc8040/utils/parser/IdentifierCodecTest.java | 8 ++++---- .../nb/rfc8040/utils/parser/ParserIdentifierTest.java | 6 +++--- .../parser/YangInstanceIdentifierSerializerTest.java | 5 +++-- 15 files changed, 29 insertions(+), 28 deletions(-) diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java index dd3889eec9..939fcb1d3c 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/CopyConfig.java @@ -104,7 +104,7 @@ public final class CopyConfig extends AbstractEdit { // , unlike , always replaces entire configuration, // so remove old configuration first: final DOMDataTreeReadWriteTransaction rwTx = transactionProvider.getOrCreateTransaction(); - rwTx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY, EMPTY_ROOT_NODE); + rwTx.put(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty(), EMPTY_ROOT_NODE); // Then create nodes present in the element: for (final XmlElement element : configElements) { @@ -169,7 +169,7 @@ public final class CopyConfig extends AbstractEdit { private ContainerNode readData(final XmlElement source) throws DocumentedException { final Datastore sourceDatastore = getDatastore(source); final DOMDataTreeReadWriteTransaction rwTx = getTransaction(sourceDatastore); - final YangInstanceIdentifier dataRoot = YangInstanceIdentifier.EMPTY; + final YangInstanceIdentifier dataRoot = YangInstanceIdentifier.empty(); try { final Optional> normalizedNodeOptional = rwTx.read( LogicalDatastoreType.CONFIGURATION, dataRoot).get(); diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java index f02bc08adf..af319616da 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java @@ -43,7 +43,7 @@ import org.w3c.dom.Node; public abstract class AbstractGet extends AbstractSingletonNetconfOperation { private static final XMLOutputFactory XML_OUTPUT_FACTORY; - private static final YangInstanceIdentifier ROOT = YangInstanceIdentifier.EMPTY; + private static final YangInstanceIdentifier ROOT = YangInstanceIdentifier.empty(); private static final String FILTER = "filter"; static { diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java index 8936b110c0..5c5fd4a77e 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMRpcService.java @@ -57,7 +57,7 @@ public class ProxyDOMRpcService implements DOMRpcService { LOG.trace("{}: Rpc operation invoked with schema type: {} and node: {}.", id, type, input); final NormalizedNodeMessage normalizedNodeMessage = input != null - ? new NormalizedNodeMessage(YangInstanceIdentifier.EMPTY, input) : null; + ? new NormalizedNodeMessage(YangInstanceIdentifier.empty(), input) : null; final Future scalaFuture = Patterns.ask(masterActorRef, new InvokeRpcMessage(new SchemaPathMessage(type), normalizedNodeMessage), actorResponseWaitTime); diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java index e99834d07a..e6183e17e9 100644 --- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java +++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/actors/NetconfNodeActor.java @@ -254,7 +254,7 @@ public class NetconfNodeActor extends AbstractUntypedActor { } NormalizedNodeMessage nodeMessageReply = null; if (domRpcResult.getResult() != null) { - nodeMessageReply = new NormalizedNodeMessage(YangInstanceIdentifier.EMPTY, + nodeMessageReply = new NormalizedNodeMessage(YangInstanceIdentifier.empty(), domRpcResult.getResult()); } recipient.tell(new InvokeRpcMessageReply(nodeMessageReply, domRpcResult.getErrors()), getSelf()); diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java index 5384856bd6..337552101d 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/ProxyDOMDataBrokerTest.java @@ -59,7 +59,7 @@ public class ProxyDOMDataBrokerTest { assertEquals(DEVICE_ID, tx.getIdentifier()); - tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); masterActor.expectMsgClass(ReadRequest.class); } @@ -71,7 +71,7 @@ public class ProxyDOMDataBrokerTest { assertEquals(DEVICE_ID, tx.getIdentifier()); - tx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + tx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); masterActor.expectMsgClass(DeleteRequest.class); } @@ -83,7 +83,7 @@ public class ProxyDOMDataBrokerTest { assertEquals(DEVICE_ID, tx.getIdentifier()); - tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); masterActor.expectMsgClass(ReadRequest.class); } diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java index 9080ed47d8..cb1324b472 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/actors/ReadTransactionActorTestAdapter.java @@ -40,7 +40,7 @@ import org.opendaylight.yangtools.yang.data.impl.schema.Builders; * @author Thomas Pantelis */ public abstract class ReadTransactionActorTestAdapter { - static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; + static final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty(); static final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; static final Timeout TIMEOUT = Timeout.apply(5, TimeUnit.SECONDS); static final NormalizedNode NODE = Builders.containerBuilder() diff --git a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java index 60cf7fab8e..591b57067a 100644 --- a/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java +++ b/netconf/netconf-topology-singleton/src/test/java/org/opendaylight/netconf/topology/singleton/impl/tx/ProxyReadWriteTransactionTest.java @@ -56,7 +56,7 @@ public class ProxyReadWriteTransactionTest { private static final FiniteDuration EXP_NO_MESSAGE_TIMEOUT = Duration.apply(300, TimeUnit.MILLISECONDS); private static final RemoteDeviceId DEVICE_ID = new RemoteDeviceId("dev1", InetSocketAddress.createUnresolved("localhost", 17830)); - private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.EMPTY; + private static final YangInstanceIdentifier PATH = YangInstanceIdentifier.empty(); private static final LogicalDatastoreType STORE = LogicalDatastoreType.CONFIGURATION; private static ActorSystem system = ActorSystem.apply(); diff --git a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java index 316b2ae651..0fce822e6a 100644 --- a/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java +++ b/netconf/sal-netconf-connector/src/test/java/org/opendaylight/netconf/sal/connect/netconf/util/NetconfBaseOpsTest.java @@ -177,7 +177,7 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetConfigRunningData() throws Exception { final Optional> dataOpt = - baseOps.getConfigRunningData(callback, Optional.of(YangInstanceIdentifier.EMPTY)).get(); + baseOps.getConfigRunningData(callback, Optional.of(YangInstanceIdentifier.empty())).get(); Assert.assertTrue(dataOpt.isPresent()); Assert.assertEquals(NetconfUtil.NETCONF_DATA_QNAME, dataOpt.get().getNodeType()); } @@ -185,7 +185,7 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest { @Test public void testGetData() throws Exception { final Optional> dataOpt = - baseOps.getData(callback, Optional.of(YangInstanceIdentifier.EMPTY)).get(); + baseOps.getData(callback, Optional.of(YangInstanceIdentifier.empty())).get(); Assert.assertTrue(dataOpt.isPresent()); Assert.assertEquals(NetconfUtil.NETCONF_DATA_QNAME, dataOpt.get().getNodeType()); } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java index 5908624515..b36b0c5c1b 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java @@ -171,7 +171,7 @@ public final class ControllerContext implements SchemaContextListener, Closeable checkPreconditions(); if (restconfInstance == null) { - return new InstanceIdentifierContext<>(YangInstanceIdentifier.EMPTY, this.globalSchema, null, + return new InstanceIdentifierContext<>(YangInstanceIdentifier.empty(), this.globalSchema, null, this.globalSchema); } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java index 101213e5e3..7d474846ab 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImplTest.java @@ -231,10 +231,10 @@ public class RestconfDataServiceImplTest { doReturn(new MultivaluedHashMap()).when(this.uriInfo).getQueryParameters(); doReturn(immediateFluentFuture(Optional.of(wrapNodeByDataRootContainer(this.buildBaseContConfig)))) .when(this.read) - .read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY); + .read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); doReturn(immediateFluentFuture(Optional.of(wrapNodeByDataRootContainer(this.buildBaseContOperational)))) .when(this.read) - .read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.EMPTY); + .read(LogicalDatastoreType.OPERATIONAL, YangInstanceIdentifier.empty()); final Response response = this.dataService.readData(this.uriInfo); assertNotNull(response); assertEquals(200, response.getStatus()); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java index 0f95c8eebd..696ae89ee5 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/DeleteDataTransactionUtilTest.java @@ -49,7 +49,7 @@ public class DeleteDataTransactionUtilTest { MockitoAnnotations.initMocks(this); Mockito.when(this.transactionChain.newReadWriteTransaction()).thenReturn(this.readWrite); Mockito.doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit(); - Mockito.when(this.context.getInstanceIdentifier()).thenReturn(YangInstanceIdentifier.EMPTY); + Mockito.when(this.context.getInstanceIdentifier()).thenReturn(YangInstanceIdentifier.empty()); Mockito.doReturn(transactionChain).when(mockDataBroker).createTransactionChain(Mockito.any()); transactionChainHandler = new TransactionChainHandler(mockDataBroker); @@ -62,7 +62,7 @@ public class DeleteDataTransactionUtilTest { public void deleteData() throws Exception { // assert that data to delete exists Mockito.when(this.transactionChain.newReadWriteTransaction().exists(LogicalDatastoreType.CONFIGURATION, - YangInstanceIdentifier.EMPTY)).thenReturn(immediateTrueFluentFuture()); + YangInstanceIdentifier.empty())).thenReturn(immediateTrueFluentFuture()); // test final Response response = DeleteDataTransactionUtil.deleteData( @@ -79,7 +79,7 @@ public class DeleteDataTransactionUtilTest { public void deleteDataNegativeTest() throws Exception { // assert that data to delete does NOT exist Mockito.when(this.transactionChain.newReadWriteTransaction().exists(LogicalDatastoreType.CONFIGURATION, - YangInstanceIdentifier.EMPTY)).thenReturn(immediateFalseFluentFuture()); + YangInstanceIdentifier.empty())).thenReturn(immediateFalseFluentFuture()); // test and assert error try { diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java index 6d026c5d7d..27a0a0631f 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtilTest.java @@ -188,7 +188,7 @@ public class PutDataTransactionUtilTest { final InstanceIdentifierContext iidContext = new InstanceIdentifierContext<>(this.iid, this.schemaNode, null, this.schema); final NormalizedNodeContext payload = new NormalizedNodeContext(iidContext, this.buildLeaf); - PutDataTransactionUtil.validTopLevelNodeName(YangInstanceIdentifier.EMPTY, payload); + PutDataTransactionUtil.validTopLevelNodeName(YangInstanceIdentifier.empty(), payload); } @Test(expected = RestconfDocumentedException.class) diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java index fed9756f65..f4fc263f86 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/IdentifierCodecTest.java @@ -73,7 +73,7 @@ public class IdentifierCodecTest { @Test public void codecDeserializeNullTest() { final YangInstanceIdentifier dataYangII = IdentifierCodec.deserialize(null, this.schemaContext); - assertEquals("Failed codec deserialization test", YangInstanceIdentifier.EMPTY, dataYangII); + assertEquals("Failed codec deserialization test", YangInstanceIdentifier.empty(), dataYangII); } /** @@ -82,7 +82,7 @@ public class IdentifierCodecTest { */ @Test public void codecSerializeEmptyTest() { - final String serialized = IdentifierCodec.serialize(YangInstanceIdentifier.EMPTY, this.schemaContext); + final String serialized = IdentifierCodec.serialize(YangInstanceIdentifier.empty(), this.schemaContext); assertTrue("Failed codec serialization test", serialized.isEmpty()); } @@ -92,8 +92,8 @@ public class IdentifierCodecTest { */ @Test public void codecDeserializeAndSerializeEmptyTest() { - final String serialized = IdentifierCodec.serialize(YangInstanceIdentifier.EMPTY, this.schemaContext); + final String serialized = IdentifierCodec.serialize(YangInstanceIdentifier.empty(), this.schemaContext); assertEquals("Failed codec serialization and deserialization test", - YangInstanceIdentifier.EMPTY, IdentifierCodec.deserialize(serialized, this.schemaContext)); + YangInstanceIdentifier.empty(), IdentifierCodec.deserialize(serialized, this.schemaContext)); } } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java index 2ad973f7b6..d5f3568b6b 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifierTest.java @@ -128,7 +128,7 @@ public class ParserIdentifierTest { // register mount point with null schema context when(this.mockMountPoint.getSchemaContext()).thenReturn(null); - when(this.mockMountPointService.getMountPoint(YangInstanceIdentifier.EMPTY)) + when(this.mockMountPointService.getMountPoint(YangInstanceIdentifier.empty())) .thenReturn(Optional.of(this.mockMountPoint)); } @@ -190,7 +190,7 @@ public class ParserIdentifierTest { final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( null, this.schemaContext, Optional.empty()); assertEquals("Returned not expected identifier", - YangInstanceIdentifier.EMPTY, context.getInstanceIdentifier()); + YangInstanceIdentifier.empty(), context.getInstanceIdentifier()); } /** @@ -211,7 +211,7 @@ public class ParserIdentifierTest { final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( "", this.schemaContext, Optional.empty()); assertEquals("Returned not expected identifier", - YangInstanceIdentifier.EMPTY, context.getInstanceIdentifier()); + YangInstanceIdentifier.empty(), context.getInstanceIdentifier()); } /** diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java index 8721346af1..36ee08edc3 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/YangInstanceIdentifierSerializerTest.java @@ -191,7 +191,7 @@ public class YangInstanceIdentifierSerializerTest { @Test public void serializeNullSchemaContextNegativeTest() { this.thrown.expect(NullPointerException.class); - YangInstanceIdentifierSerializer.create(null, YangInstanceIdentifier.EMPTY); + YangInstanceIdentifierSerializer.create(null, YangInstanceIdentifier.empty()); } /** @@ -212,7 +212,8 @@ public class YangInstanceIdentifierSerializerTest { */ @Test public void serializeEmptyDataTest() { - final String result = YangInstanceIdentifierSerializer.create(this.schemaContext, YangInstanceIdentifier.EMPTY); + final String result = YangInstanceIdentifierSerializer.create(this.schemaContext, + YangInstanceIdentifier.empty()); assertTrue("Empty identifier is expected", result.isEmpty()); } -- 2.36.6