This moves over to use the replacement empty() method.
Change-Id: I133d5025ee176e5487dbcd8f71517c990c299682
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
// <copy-config>, unlike <edit-config>, 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 <config> element:
for (final XmlElement element : configElements) {
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<NormalizedNode<?, ?>> normalizedNodeOptional = rwTx.read(
LogicalDatastoreType.CONFIGURATION, dataRoot).get();
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 {
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<Object> scalaFuture = Patterns.ask(masterActorRef,
new InvokeRpcMessage(new SchemaPathMessage(type), normalizedNodeMessage), actorResponseWaitTime);
}
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());
assertEquals(DEVICE_ID, tx.getIdentifier());
- tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
+ tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty());
masterActor.expectMsgClass(ReadRequest.class);
}
assertEquals(DEVICE_ID, tx.getIdentifier());
- tx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
+ tx.delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty());
masterActor.expectMsgClass(DeleteRequest.class);
}
assertEquals(DEVICE_ID, tx.getIdentifier());
- tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.EMPTY);
+ tx.read(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty());
masterActor.expectMsgClass(ReadRequest.class);
}
* @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()
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();
@Test
public void testGetConfigRunningData() throws Exception {
final Optional<NormalizedNode<?, ?>> 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());
}
@Test
public void testGetData() throws Exception {
final Optional<NormalizedNode<?, ?>> 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());
}
checkPreconditions();
if (restconfInstance == null) {
- return new InstanceIdentifierContext<>(YangInstanceIdentifier.EMPTY, this.globalSchema, null,
+ return new InstanceIdentifierContext<>(YangInstanceIdentifier.empty(), this.globalSchema, null,
this.globalSchema);
}
doReturn(new MultivaluedHashMap<String, String>()).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());
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);
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(
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 {
final InstanceIdentifierContext<DataSchemaNode> 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)
@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);
}
/**
*/
@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());
}
*/
@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));
}
}
// 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));
}
final InstanceIdentifierContext<?> context = ParserIdentifier.toInstanceIdentifier(
null, this.schemaContext, Optional.empty());
assertEquals("Returned not expected identifier",
- YangInstanceIdentifier.EMPTY, context.getInstanceIdentifier());
+ YangInstanceIdentifier.empty(), context.getInstanceIdentifier());
}
/**
final InstanceIdentifierContext<?> context = ParserIdentifier.toInstanceIdentifier(
"", this.schemaContext, Optional.empty());
assertEquals("Returned not expected identifier",
- YangInstanceIdentifier.EMPTY, context.getInstanceIdentifier());
+ YangInstanceIdentifier.empty(), context.getInstanceIdentifier());
}
/**
@Test
public void serializeNullSchemaContextNegativeTest() {
this.thrown.expect(NullPointerException.class);
- YangInstanceIdentifierSerializer.create(null, YangInstanceIdentifier.EMPTY);
+ YangInstanceIdentifierSerializer.create(null, YangInstanceIdentifier.empty());
}
/**
*/
@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());
}
Code Review / netconf.git / commitdiff