From e5b1c1a912555a188def1c968c0b49c4fe2f8233 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 23 Oct 2021 12:07:52 +0200 Subject: [PATCH] Access parameters.getFieldPaths() only once There is no point accessing it thrice, it just prevents proper analysis. Change-Id: Ib9fe20e5082c8e93d9ce578b656a8b365c88a1d0 Signed-off-by: Robert Varga --- .../services/impl/RestconfDataServiceImpl.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java index a2454ceb3e..2681ececd2 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfDataServiceImpl.java @@ -129,7 +129,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { final DOMActionService actionService, final Configuration configuration) { this.schemaContextHandler = requireNonNull(schemaContextHandler); this.dataBroker = requireNonNull(dataBroker); - this.restconfStrategy = new MdsalRestconfStrategy(dataBroker); + restconfStrategy = new MdsalRestconfStrategy(dataBroker); this.mountPointService = requireNonNull(mountPointService); this.delegRestconfSubscrService = requireNonNull(delegRestconfSubscrService); this.actionService = requireNonNull(actionService); @@ -144,7 +144,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { @Override public Response readData(final String identifier, final UriInfo uriInfo) { - final EffectiveModelContext schemaContextRef = this.schemaContextHandler.get(); + final EffectiveModelContext schemaContextRef = schemaContextHandler.get(); final InstanceIdentifierContext instanceIdentifier = ParserIdentifier.toInstanceIdentifier( identifier, schemaContextRef, Optional.of(mountPointService)); final WriterParameters parameters = ReadDataTransactionUtil.parseUriParameters(instanceIdentifier, uriInfo); @@ -157,11 +157,12 @@ public class RestconfDataServiceImpl implements RestconfDataService { createAllYangNotificationStreams(schemaContextRef, uriInfo); } + final List fieldPaths = parameters.getFieldPaths(); final RestconfStrategy strategy = getRestconfStrategy(mountPoint); final NormalizedNode node; - if (parameters.getFieldPaths() != null && !parameters.getFieldPaths().isEmpty()) { + if (fieldPaths != null && !fieldPaths.isEmpty()) { node = ReadDataTransactionUtil.readData(parameters.getContent(), instanceIdentifier.getInstanceIdentifier(), - strategy, parameters.getWithDefault(), schemaContextRef, parameters.getFieldPaths()); + strategy, parameters.getWithDefault(), schemaContextRef, fieldPaths); } else { node = ReadDataTransactionUtil.readData(parameters.getContent(), instanceIdentifier.getInstanceIdentifier(), strategy, parameters.getWithDefault(), schemaContextRef); @@ -172,7 +173,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { && identifier.contains(STREAM_LOCATION_PATH_PART)) { final String value = (String) node.body(); final String streamName = value.substring(value.indexOf(NOTIFICATION_STREAM + '/')); - this.delegRestconfSubscrService.subscribeToStream(streamName, uriInfo); + delegRestconfSubscrService.subscribeToStream(streamName, uriInfo); } if (node == null) { throw new RestconfDocumentedException( @@ -238,7 +239,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint(); final EffectiveModelContext ref = mountPoint == null - ? this.schemaContextHandler.get() : modelContext(mountPoint); + ? schemaContextHandler.get() : modelContext(mountPoint); final RestconfStrategy strategy = getRestconfStrategy(mountPoint); return PutDataTransactionUtil.putData(payload, ref, strategy, checkedParms.insert, checkedParms.point); @@ -322,7 +323,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { @Override public Response deleteData(final String identifier) { final InstanceIdentifierContext instanceIdentifier = ParserIdentifier.toInstanceIdentifier( - identifier, this.schemaContextHandler.get(), Optional.of(mountPointService)); + identifier, schemaContextHandler.get(), Optional.of(mountPointService)); final DOMMountPoint mountPoint = instanceIdentifier.getMountPoint(); final RestconfStrategy strategy = getRestconfStrategy(mountPoint); @@ -354,7 +355,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint(); final EffectiveModelContext ref = mountPoint == null - ? this.schemaContextHandler.get() : modelContext(mountPoint); + ? schemaContextHandler.get() : modelContext(mountPoint); final RestconfStrategy strategy = getRestconfStrategy(mountPoint); return PlainPatchDataTransactionUtil.patchData(payload, strategy, ref); -- 2.36.6