Skip to content

Commit 0246a40

Browse files
committed
Replace deprecated YangInstanceIdentifier methods
Modernize usage of YangInstanceIdentifier, replacing deprecated methods. See: Ie6a431deaca0a80b8ce1d16dad5a1b919c94f722 JIRA: LIGHTY-394 Signed-off-by: Peter Suna <peter.suna@pantheon.tech>
1 parent 158788b commit 0246a40

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

lighty-netconf-device/src/main/java/io/lighty/netconf/device/NetconfDeviceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ void initDatastore(LogicalDatastoreType datastoreType, File initialData) {
125125
NormalizedNode initialDataBI = netconfDeviceServices.getXmlNodeConverter()
126126
.deserialize(netconfDeviceServices.getRootInference(), reader);
127127
DOMDataTreeWriteTransaction writeTx = netconfDeviceServices.getDOMDataBroker().newWriteOnlyTransaction();
128-
writeTx.put(datastoreType, YangInstanceIdentifier.empty(), initialDataBI);
128+
writeTx.put(datastoreType, YangInstanceIdentifier.of(), initialDataBI);
129129
writeTx.commit().get(TimeoutUtil.TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
130130
final String dataTreeString = NormalizedNodes.toStringTree(initialDataBI);
131131
LOG.trace("Initial {} datastore data: {}", datastoreType, dataTreeString);

lighty-netconf-device/src/main/java/io/lighty/netconf/device/requests/DatastoreOutputRequestProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected List<NormalizedNode> getAllDataFromDatastore(LogicalDatastoreType data
4848
Optional<NormalizedNode> listData;
4949
try (DOMDataTreeReadTransaction domDataReadOnlyTransaction = domDataBroker.newReadOnlyTransaction()) {
5050
FluentFuture<Optional<NormalizedNode>> readData =
51-
domDataReadOnlyTransaction.read(datastoreType, YangInstanceIdentifier.empty());
51+
domDataReadOnlyTransaction.read(datastoreType, YangInstanceIdentifier.of());
5252
listData = readData.get(TimeoutUtil.TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
5353

5454
if (listData.isPresent()) {

lighty-netconf-device/src/main/java/io/lighty/netconf/device/requests/EditConfigRequestProcessor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ private void ensureParentsByMerge(final YangInstanceIdentifier path, final DOMDa
218218
while (it.hasNext()) {
219219
final PathArgument pathArgument = it.next();
220220
if (rootNormalizedPath == null) {
221-
rootNormalizedPath = YangInstanceIdentifier.create(pathArgument);
221+
rootNormalizedPath = YangInstanceIdentifier.of(pathArgument);
222222
}
223223

224224
if (it.hasNext()) {
@@ -233,7 +233,7 @@ private void ensureParentsByMerge(final YangInstanceIdentifier path, final DOMDa
233233
Preconditions.checkArgument(rootNormalizedPath != null, "Empty path received");
234234

235235
final NormalizedNode parentStructure = ImmutableNodes.fromInstanceId(effectiveModelContext,
236-
YangInstanceIdentifier.create(normalizedPathWithoutChildArgs));
236+
YangInstanceIdentifier.of(normalizedPathWithoutChildArgs));
237237
writeTx.merge(LogicalDatastoreType.CONFIGURATION, rootNormalizedPath, parentStructure);
238238
}
239239

@@ -302,7 +302,7 @@ private static YangInstanceIdentifier getYangInstanceIdentifier(final List<QName
302302
contextNode = requireNonNull(((DataSchemaContext.Composite) contextNode).childByQName(currentQname));
303303

304304
while (contextNode instanceof PathMixin) {
305-
targetIdentifier = YangInstanceIdentifier.create(targetIdentifier.getPathArguments())
305+
targetIdentifier = YangInstanceIdentifier.of(targetIdentifier.getPathArguments())
306306
.node(contextNode.pathStep());
307307
contextNode = requireNonNull(((DataSchemaContext.Composite) contextNode).childByQName(currentQname));
308308
}
@@ -313,10 +313,10 @@ private static YangInstanceIdentifier getYangInstanceIdentifier(final List<QName
313313
final MapEntryNode next = ((MapNode) findNode.get()).body().iterator().next();
314314
final Map<QName, Object> keyValues = next.name().asMap();
315315
targetIdentifier = YangInstanceIdentifier
316-
.builder(YangInstanceIdentifier.create(targetIdentifier.getPathArguments()))
316+
.builder(YangInstanceIdentifier.of(targetIdentifier.getPathArguments()))
317317
.nodeWithKey(contextNode.dataSchemaNode().getQName(), keyValues).build();
318318
} else {
319-
targetIdentifier = YangInstanceIdentifier.create(targetIdentifier.getPathArguments())
319+
targetIdentifier = YangInstanceIdentifier.of(targetIdentifier.getPathArguments())
320320
.node(contextNode.getPathStep());
321321
}
322322
}

0 commit comments

Comments
 (0)