From 9cc114dc8e4109893e2346477b5ae14391afe01c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 21 Mar 2022 15:05:48 +0100 Subject: [PATCH] InstanceIdentifierContext does not take generics The generic attribute here is completely useless and only has the function of tying EffectiveModelContext to being a SchemaNode -- nothing else. Remove the argument and adjust callers. Change-Id: Ic70482786ad1141bb20123ecca2f25c40e83eaf8 Signed-off-by: Robert Varga --- .../context/InstanceIdentifierContext.java | 12 +- .../restconf/common/patch/PatchContext.java | 8 +- .../common/util/OperationsResourceUtils.java | 4 +- .../schema/SchemaRetrievalServiceImpl.java | 2 +- .../AbstractIdentifierAwareJaxRsProvider.java | 12 +- .../impl/JsonNormalizedNodeBodyReader.java | 7 +- .../sal/rest/impl/JsonToPatchBodyReader.java | 30 ++--- .../sal/rest/impl/NormalizedNodeContext.java | 13 +- .../impl/NormalizedNodeJsonBodyWriter.java | 14 +- .../impl/NormalizedNodeXmlBodyWriter.java | 4 +- .../RestconfDocumentedExceptionMapper.java | 6 +- .../impl/XmlNormalizedNodeBodyReader.java | 6 +- .../sal/rest/impl/XmlToPatchBodyReader.java | 4 +- .../sal/restconf/impl/BrokerFacade.java | 32 ++--- .../sal/restconf/impl/ControllerContext.java | 23 ++-- .../sal/restconf/impl/RestconfImpl.java | 40 +++--- .../md/sal/rest/common/TestRestconfUtils.java | 4 +- .../impl/InstanceIdentifierTypeLeafTest.java | 19 +-- .../to/cnsn/test/RestPutListDataTest.java | 2 +- .../test/NnInstanceIdentifierToXmlTest.java | 4 +- .../impl/nn/to/xml/test/NnToXmlTest.java | 8 +- .../nn/to/xml/test/NnToXmlWithChoiceTest.java | 3 +- ...NnToXmlWithDataFromSeveralModulesTest.java | 2 +- .../restconf/impl/test/BrokerFacadeTest.java | 124 +++++++++--------- .../sal/restconf/impl/test/Bug3595Test.java | 2 +- .../sal/restconf/impl/test/Bug8072Test.java | 2 +- .../impl/test/CutDataToCorrectDepthTest.java | 10 +- .../impl/test/InvokeRpcMethodTest.java | 20 +-- ...GetAugmentedElementWhenEqualNamesTest.java | 2 +- .../restconf/impl/test/RestPutConfigTest.java | 20 +-- .../restconf/impl/test/RestconfImplTest.java | 16 +-- .../impl/test/URIParametersParsing.java | 12 +- .../sal/restconf/impl/test/URITest.java | 12 +- .../rfc8040/databind/jaxrs/QueryParams.java | 2 +- .../AbstractNormalizedNodeBodyReader.java | 2 +- .../JsonNormalizedNodeBodyReader.java | 9 +- .../JsonNormalizedNodeBodyWriter.java | 10 +- .../XmlNormalizedNodeBodyReader.java | 6 +- .../XmlNormalizedNodeBodyWriter.java | 4 +- .../patch/AbstractPatchBodyReader.java | 2 +- .../providers/patch/JsonPatchBodyReader.java | 12 +- .../providers/patch/XmlPatchBodyReader.java | 4 +- .../AbstractIdentifierAwareJaxRsProvider.java | 9 +- .../rfc8040/legacy/NormalizedNodePayload.java | 20 ++- .../impl/RestconfDataServiceImpl.java | 14 +- .../rests/services/impl/RestconfImpl.java | 2 +- .../RestconfInvokeOperationsServiceImpl.java | 3 +- .../impl/RestconfOperationsServiceImpl.java | 2 +- ...estconfStreamsSubscriptionServiceImpl.java | 5 +- .../rests/utils/PostDataTransactionUtil.java | 2 +- .../rests/utils/PutDataTransactionUtil.java | 2 +- .../parser/AbstractFieldsTranslator.java | 2 +- .../utils/parser/NetconfFieldsTranslator.java | 2 +- .../utils/parser/ParserIdentifier.java | 11 +- .../utils/parser/WriterFieldsTranslator.java | 2 +- .../nb/rfc8040/TestRestconfUtils.java | 6 +- .../XmlNormalizedNodeBodyWriterTest.java | 4 +- .../services/impl/CreateStreamUtilTest.java | 2 +- .../rests/services/impl/Netconf799Test.java | 2 +- .../impl/RestconfDataServiceImplTest.java | 23 ++-- ...stconfInvokeOperationsServiceImplTest.java | 2 +- .../utils/DeleteDataTransactionUtilTest.java | 18 +-- .../utils/PatchDataTransactionUtilTest.java | 97 +++++++------- .../PlainPatchDataTransactionUtilTest.java | 12 +- .../utils/PostDataTransactionUtilTest.java | 11 +- .../utils/PutDataTransactionUtilTest.java | 54 ++++---- .../utils/ReadDataTransactionUtilTest.java | 3 +- .../parser/AbstractFieldsTranslatorTest.java | 6 +- .../parser/NetconfFieldsTranslatorTest.java | 2 +- .../utils/parser/ParserIdentifierTest.java | 50 +++---- .../parser/WriterFieldsTranslatorTest.java | 2 +- 71 files changed, 439 insertions(+), 461 deletions(-) diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/InstanceIdentifierContext.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/InstanceIdentifierContext.java index 526542ce2c..94a4b9855c 100644 --- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/InstanceIdentifierContext.java +++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/context/InstanceIdentifierContext.java @@ -12,26 +12,26 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; -public class InstanceIdentifierContext { - +// FIXME: non-final for Mocking, which we should not tolerate +public class InstanceIdentifierContext { private final YangInstanceIdentifier instanceIdentifier; - private final T schemaNode; + private final SchemaNode schemaNode; private final DOMMountPoint mountPoint; private final EffectiveModelContext schemaContext; - public InstanceIdentifierContext(final YangInstanceIdentifier instanceIdentifier, final T schemaNode, + public InstanceIdentifierContext(final YangInstanceIdentifier instanceIdentifier, final SchemaNode schemaNode, final DOMMountPoint mountPoint, final EffectiveModelContext context) { this.instanceIdentifier = instanceIdentifier; this.schemaNode = schemaNode; this.mountPoint = mountPoint; - this.schemaContext = context; + schemaContext = context; } public YangInstanceIdentifier getInstanceIdentifier() { return instanceIdentifier; } - public T getSchemaNode() { + public SchemaNode getSchemaNode() { return schemaNode; } diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/PatchContext.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/PatchContext.java index bf1c7a2c32..51de63a174 100644 --- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/PatchContext.java +++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/patch/PatchContext.java @@ -11,21 +11,19 @@ import static java.util.Objects.requireNonNull; import java.util.List; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; public class PatchContext { - private final InstanceIdentifierContext context; + private final InstanceIdentifierContext context; private final List data; private final String patchId; - public PatchContext(final InstanceIdentifierContext context, - final List data, final String patchId) { + public PatchContext(final InstanceIdentifierContext context, final List data, final String patchId) { this.context = requireNonNull(context); this.data = requireNonNull(data); this.patchId = requireNonNull(patchId); } - public InstanceIdentifierContext getInstanceIdentifierContext() { + public InstanceIdentifierContext getInstanceIdentifierContext() { return context; } diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java index ceeb963966..7460f92aaa 100644 --- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java +++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/OperationsResourceUtils.java @@ -33,7 +33,7 @@ public final class OperationsResourceUtils { // Hidden on purpose } - public static @NonNull Entry, ContainerNode> + public static @NonNull Entry contextForModelContext(final @NonNull SchemaContext context, final @Nullable DOMMountPoint mountPoint) { // Determine which modules we need and construct leaf schemas to correspond to all RPC definitions final Collection modules = new ArrayList<>(); @@ -60,7 +60,7 @@ public final class OperationsResourceUtils { operationsBuilder.withChild(ImmutableNodes.leafNode(leaf.getQName(), Empty.value())); } - return Map.entry(new InstanceIdentifierContext<>(null, operatationsSchema, mountPoint, + return Map.entry(new InstanceIdentifierContext(null, operatationsSchema, mountPoint, new OperationsEffectiveModuleContext(ImmutableSet.copyOf(modules))), operationsBuilder.build()); } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java index 70b09bf97b..ad239927a7 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalServiceImpl.java @@ -85,7 +85,7 @@ public class SchemaRetrievalServiceImpl implements SchemaRetrievalService { } private SchemaContext getMountSchemaContext(final String identifier) { - final InstanceIdentifierContext mountContext = salContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountContext = salContext.toMountPointIdentifier(identifier); return mountContext.getSchemaContext(); } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java index 761b3bdd2e..76ffdb4689 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java @@ -33,24 +33,24 @@ public class AbstractIdentifierAwareJaxRsProvider { private final ControllerContext controllerContext; - protected AbstractIdentifierAwareJaxRsProvider(ControllerContext controllerContext) { + protected AbstractIdentifierAwareJaxRsProvider(final ControllerContext controllerContext) { this.controllerContext = controllerContext; } protected final String getIdentifier() { - return this.uriInfo.getPathParameters(false).getFirst(RestconfConstants.IDENTIFIER); + return uriInfo.getPathParameters(false).getFirst(RestconfConstants.IDENTIFIER); } - protected InstanceIdentifierContext getInstanceIdentifierContext() { + protected InstanceIdentifierContext getInstanceIdentifierContext() { return controllerContext.toInstanceIdentifier(getIdentifier()); } protected UriInfo getUriInfo() { - return this.uriInfo; + return uriInfo; } protected boolean isPost() { - return POST.equals(this.request.getMethod()); + return POST.equals(request.getMethod()); } protected ControllerContext getControllerContext() { @@ -58,6 +58,6 @@ public class AbstractIdentifierAwareJaxRsProvider { } Request getRequest() { - return this.request; + return request; } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java index a7ae431b29..17f7c19af2 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonNormalizedNodeBodyReader.java @@ -47,7 +47,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNormalizedNodeS import org.opendaylight.yangtools.yang.data.impl.schema.NormalizedNodeResult; import org.opendaylight.yangtools.yang.data.impl.schema.ResultAlreadySetException; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; import org.slf4j.Logger; @@ -100,7 +99,7 @@ public class JsonNormalizedNodeBodyReader } } - private static NormalizedNodeContext readFrom(final InstanceIdentifierContext path, + private static NormalizedNodeContext readFrom(final InstanceIdentifierContext path, final InputStream entityStream, final boolean isPost) throws IOException { final Optional nonEmptyInputStreamOptional = RestUtil.isInputStreamEmpty(entityStream); @@ -131,7 +130,7 @@ public class JsonNormalizedNodeBodyReader NormalizedNode result = resultHolder.getResult(); final List iiToDataList = new ArrayList<>(); - InstanceIdentifierContext newIIContext; + InstanceIdentifierContext newIIContext; while (result instanceof AugmentationNode || result instanceof ChoiceNode) { final Object childNode = ((DataContainerNode) result).body().iterator().next(); @@ -157,7 +156,7 @@ public class JsonNormalizedNodeBodyReader final YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat( path.getInstanceIdentifier().getPathArguments(), iiToDataList)); - newIIContext = new InstanceIdentifierContext<>(fullIIToData, path.getSchemaNode(), path.getMountPoint(), + newIIContext = new InstanceIdentifierContext(fullIIToData, path.getSchemaNode(), path.getMountPoint(), path.getSchemaContext()); return new NormalizedNodeContext(newIIContext, result); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java index f17666c59e..0028898aff 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPatchBodyReader.java @@ -106,7 +106,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider } } - private PatchContext readFrom(final InstanceIdentifierContext path, final InputStream entityStream) + private PatchContext readFrom(final InstanceIdentifierContext path, final InputStream entityStream) throws IOException { final Optional nonEmptyInputStreamOptional = RestUtil.isInputStreamEmpty(entityStream); if (nonEmptyInputStreamOptional.isEmpty()) { @@ -135,7 +135,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider ErrorTag.MALFORMED_MESSAGE, exception); } - private List read(final JsonReader in, final InstanceIdentifierContext path, + private List read(final JsonReader in, final InstanceIdentifierContext path, final AtomicReference patchId) throws IOException { final List resultCollection = new ArrayList<>(); final StringModuleInstanceIdentifierCodec codec = new StringModuleInstanceIdentifierCodec( @@ -192,7 +192,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider * @throws IOException if operation fails */ private void parseByName(final @NonNull String name, final @NonNull PatchEdit edit, - final @NonNull JsonReader in, final @NonNull InstanceIdentifierContext path, + final @NonNull JsonReader in, final @NonNull InstanceIdentifierContext path, final @NonNull StringModuleInstanceIdentifierCodec codec, final @NonNull List resultCollection, final @NonNull AtomicReference patchId) throws IOException { @@ -232,7 +232,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider * @throws IOException if operation fails */ private void readEditDefinition(final @NonNull PatchEdit edit, final @NonNull JsonReader in, - final @NonNull InstanceIdentifierContext path, + final @NonNull InstanceIdentifierContext path, final @NonNull StringModuleInstanceIdentifierCodec codec) throws IOException { final StringBuilder value = new StringBuilder(); in.beginObject(); @@ -378,7 +378,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider * @return NormalizedNode representing data */ private static NormalizedNode readEditData(final @NonNull JsonReader in, - final @NonNull SchemaNode targetSchemaNode, final @NonNull InstanceIdentifierContext path) { + final @NonNull SchemaNode targetSchemaNode, final @NonNull InstanceIdentifierContext path) { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); final EffectiveModelContext context = path.getSchemaContext(); @@ -437,7 +437,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider private NormalizedNode data; public String getId() { - return this.id; + return id; } public void setId(final String id) { @@ -445,7 +445,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider } public PatchEditOperation getOperation() { - return this.operation; + return operation; } public void setOperation(final PatchEditOperation operation) { @@ -453,7 +453,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider } public YangInstanceIdentifier getTarget() { - return this.target; + return target; } public void setTarget(final YangInstanceIdentifier target) { @@ -461,7 +461,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider } public SchemaNode getTargetSchemaNode() { - return this.targetSchemaNode; + return targetSchemaNode; } public void setTargetSchemaNode(final SchemaNode targetSchemaNode) { @@ -469,7 +469,7 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider } public NormalizedNode getData() { - return this.data; + return data; } public void setData(final NormalizedNode data) { @@ -477,11 +477,11 @@ public class JsonToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider } public void clear() { - this.id = null; - this.operation = null; - this.target = null; - this.targetSchemaNode = null; - this.data = null; + id = null; + operation = null; + target = null; + targetSchemaNode = null; + data = null; } } } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeContext.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeContext.java index 2fe6cc9816..d52de7d86c 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeContext.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeContext.java @@ -12,17 +12,16 @@ import static java.util.Objects.requireNonNull; import com.google.common.collect.ImmutableMap; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; @Deprecated(forRemoval = true, since = "2.0.6") // Non-final for mocking public class NormalizedNodeContext { - private final InstanceIdentifierContext context; + private final InstanceIdentifierContext context; private final ImmutableMap headers; private final WriterParameters writerParameters; private final NormalizedNode data; - public NormalizedNodeContext(final InstanceIdentifierContext context, + public NormalizedNodeContext(final InstanceIdentifierContext context, final NormalizedNode data, final WriterParameters writerParameters, final ImmutableMap headers) { this.context = context; @@ -31,22 +30,22 @@ public class NormalizedNodeContext { this.headers = requireNonNull(headers); } - public NormalizedNodeContext(final InstanceIdentifierContext context, + public NormalizedNodeContext(final InstanceIdentifierContext context, final NormalizedNode data, final WriterParameters writerParameters) { this(context, data, writerParameters, ImmutableMap.of()); } - public NormalizedNodeContext(final InstanceIdentifierContext context, + public NormalizedNodeContext(final InstanceIdentifierContext context, final NormalizedNode data) { this(context, data, WriterParameters.EMPTY, ImmutableMap.of()); } - public NormalizedNodeContext(final InstanceIdentifierContext context, + public NormalizedNodeContext(final InstanceIdentifierContext context, final NormalizedNode data, final ImmutableMap headers) { this(context, data, WriterParameters.EMPTY, headers); } - public InstanceIdentifierContext getInstanceIdentifierContext() { + public InstanceIdentifierContext getInstanceIdentifierContext() { return context; } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java index f70768d11d..a797215ac3 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeJsonBodyWriter.java @@ -91,9 +91,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter identifierCtx = - (InstanceIdentifierContext) context.getInstanceIdentifierContext(); + final InstanceIdentifierContext identifierCtx = context.getInstanceIdentifierContext(); try (JsonWriter jsonWriter = createJsonWriter(entityStream, context.getWriterParameters().isPrettyPrint())) { jsonWriter.beginObject(); @@ -103,9 +101,9 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context, NormalizedNode data, - final @Nullable Integer depth) throws IOException { + private static void writeNormalizedNode(final JsonWriter jsonWriter, final InstanceIdentifierContext context, + // Note: mutable argument + NormalizedNode data, final @Nullable Integer depth) throws IOException { SchemaPath path = context.getSchemaNode().getPath(); final RestconfNormalizedNodeWriter nnWriter; if (SchemaPath.ROOT.equals(path)) { @@ -158,7 +156,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context, final SchemaPath path, final JsonWriter jsonWriter, + final InstanceIdentifierContext context, final SchemaPath path, final JsonWriter jsonWriter, final @Nullable Integer depth) { final SchemaNode schema = context.getSchemaNode(); @@ -189,7 +187,7 @@ public class NormalizedNodeJsonBodyWriter implements MessageBodyWriter context) { + private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) { // TODO: Performance: Cache JSON Codec factory and schema context return JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(context.getSchemaContext()); } diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java index 62d8667df9..39eecad79c 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/NormalizedNodeXmlBodyWriter.java @@ -88,7 +88,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter entry : context.getNewHeaders().entrySet()) { httpHeaders.add(entry.getKey(), entry.getValue()); } - final InstanceIdentifierContext pathContext = context.getInstanceIdentifierContext(); + final InstanceIdentifierContext pathContext = context.getInstanceIdentifierContext(); if (context.getData() == null) { return; } @@ -109,7 +109,7 @@ public class NormalizedNodeXmlBodyWriter implements MessageBodyWriter pathContext, NormalizedNode data, final @Nullable Integer depth) + final InstanceIdentifierContext pathContext, NormalizedNode data, final @Nullable Integer depth) throws IOException { final RestconfNormalizedNodeWriter nnWriter; final EffectiveModelContext schemaCtx = pathContext.getSchemaContext(); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java index 9370aaebb2..e0545519c9 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/RestconfDocumentedExceptionMapper.java @@ -143,7 +143,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper(null, + final NormalizedNodeContext errContext = new NormalizedNodeContext(new InstanceIdentifierContext(null, (DataSchemaNode) errorsSchemaNode, null, controllerContext.getGlobalSchema()), errContBuild.build()); Object responseBody; @@ -210,7 +210,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper context = errorsNode.getInstanceIdentifierContext(); + final InstanceIdentifierContext context = errorsNode.getInstanceIdentifierContext(); final DataSchemaNode schema = (DataSchemaNode) context.getSchemaNode(); SchemaPath path = context.getSchemaNode().getPath(); @@ -307,7 +307,7 @@ public class RestconfDocumentedExceptionMapper implements ExceptionMapper pathContext = errorsNode.getInstanceIdentifierContext(); + final InstanceIdentifierContext pathContext = errorsNode.getInstanceIdentifierContext(); final ByteArrayOutputStream outStream = new ByteArrayOutputStream(); final XMLStreamWriter xmlWriter; diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java index f8ddb6f67d..a4cb3ddb49 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java @@ -105,7 +105,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro private NormalizedNodeContext readFrom(final InputStream entityStream) throws IOException, SAXException, XMLStreamException, ParserConfigurationException, URISyntaxException { - final InstanceIdentifierContext path = getInstanceIdentifierContext(); + final InstanceIdentifierContext path = getInstanceIdentifierContext(); final Optional nonEmptyInputStreamOptional = RestUtil.isInputStreamEmpty(entityStream); if (nonEmptyInputStreamOptional.isEmpty()) { // represent empty nopayload input @@ -116,7 +116,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro return parse(path, doc); } - private NormalizedNodeContext parse(final InstanceIdentifierContext pathContext,final Document doc) + private NormalizedNodeContext parse(final InstanceIdentifierContext pathContext,final Document doc) throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final SchemaNode schemaNodeContext = pathContext.getSchemaNode(); DataSchemaNode schemaNode; @@ -192,7 +192,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro final YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat( pathContext.getInstanceIdentifier().getPathArguments(), iiToDataList)); - final InstanceIdentifierContext outIIContext = new InstanceIdentifierContext<>( + final InstanceIdentifierContext outIIContext = new InstanceIdentifierContext( fullIIToData, pathContext.getSchemaNode(), pathContext.getMountPoint(), pathContext.getSchemaContext()); return new NormalizedNodeContext(outIIContext, parsed); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java index 3e6ea0520e..f90a6bf2b6 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlToPatchBodyReader.java @@ -101,7 +101,7 @@ public class XmlToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider i throws WebApplicationException { try { - final InstanceIdentifierContext path = getInstanceIdentifierContext(); + final InstanceIdentifierContext path = getInstanceIdentifierContext(); final Optional nonEmptyInputStreamOptional = RestUtil.isInputStreamEmpty(entityStream); if (nonEmptyInputStreamOptional.isEmpty()) { // represent empty nopayload input @@ -120,7 +120,7 @@ public class XmlToPatchBodyReader extends AbstractIdentifierAwareJaxRsProvider i } } - private static PatchContext parse(final InstanceIdentifierContext pathContext, final Document doc) + private static PatchContext parse(final InstanceIdentifierContext pathContext, final Document doc) throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final List resultCollection = new ArrayList<>(); final String patchId = doc.getElementsByTagName("patch-id").item(0).getFirstChild().getNodeValue(); diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java index ab321f6cf5..4ce925f7f5 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/BrokerFacade.java @@ -156,7 +156,7 @@ public class BrokerFacade implements Closeable { * @return read date */ public NormalizedNode readConfigurationData(final YangInstanceIdentifier path, final String withDefa) { - try (DOMDataTreeReadTransaction tx = this.domDataBroker.newReadOnlyTransaction()) { + try (DOMDataTreeReadTransaction tx = domDataBroker.newReadOnlyTransaction()) { return readDataViaTransaction(tx, CONFIGURATION, path, withDefa); } } @@ -204,7 +204,7 @@ public class BrokerFacade implements Closeable { * @return read data */ public NormalizedNode readOperationalData(final YangInstanceIdentifier path) { - try (DOMDataTreeReadTransaction tx = this.domDataBroker.newReadOnlyTransaction()) { + try (DOMDataTreeReadTransaction tx = domDataBroker.newReadOnlyTransaction()) { return readDataViaTransaction(tx, OPERATIONAL, path); } } @@ -254,7 +254,7 @@ public class BrokerFacade implements Closeable { requireNonNull(payload); isMounted.set(false); - final DOMDataTreeReadWriteTransaction newReadWriteTransaction = this.domDataBroker.newReadWriteTransaction(); + final DOMDataTreeReadWriteTransaction newReadWriteTransaction = domDataBroker.newReadWriteTransaction(); final Status status = readDataViaTransaction(newReadWriteTransaction, CONFIGURATION, path) != null ? Status.OK : Status.CREATED; final FluentFuture future = putDataViaTransaction( @@ -314,7 +314,7 @@ public class BrokerFacade implements Closeable { final DOMDataTreeReadWriteTransaction patchTransaction; if (mountPoint == null) { schemaContext = patchContext.getInstanceIdentifierContext().getSchemaContext(); - patchTransaction = this.domDataBroker.newReadWriteTransaction(); + patchTransaction = domDataBroker.newReadWriteTransaction(); } else { schemaContext = modelContext(mountPoint); @@ -464,7 +464,7 @@ public class BrokerFacade implements Closeable { final NormalizedNode payload, final String insert, final String point) { isMounted.set(false); FluentFuture future = - postDataViaTransaction(this.domDataBroker.newReadWriteTransaction(), CONFIGURATION, path, payload, + postDataViaTransaction(domDataBroker.newReadWriteTransaction(), CONFIGURATION, path, payload, globalSchema, insert, point); isMounted.remove(); return future; @@ -488,7 +488,7 @@ public class BrokerFacade implements Closeable { // DELETE configuration public FluentFuture commitConfigurationDataDelete(final YangInstanceIdentifier path) { - return deleteDataViaTransaction(this.domDataBroker.newReadWriteTransaction(), CONFIGURATION, path); + return deleteDataViaTransaction(domDataBroker.newReadWriteTransaction(), CONFIGURATION, path); } public FluentFuture commitConfigurationDataDelete( @@ -503,11 +503,11 @@ public class BrokerFacade implements Closeable { // RPC public ListenableFuture invokeRpc(final @NonNull QName type, final @NonNull NormalizedNode input) { - if (this.rpcService == null) { + if (rpcService == null) { throw new RestconfDocumentedException(Status.SERVICE_UNAVAILABLE); } LOG.trace("Invoke RPC {} with input: {}", type, input); - return this.rpcService.invokeRpc(type, input); + return rpcService.invokeRpc(type, input); } public void registerToListenDataChanges(final LogicalDatastoreType datastore, final Scope scope, @@ -517,11 +517,11 @@ public class BrokerFacade implements Closeable { } final YangInstanceIdentifier path = listener.getPath(); - DOMDataTreeChangeService changeService = this.domDataBroker.getExtensions() + DOMDataTreeChangeService changeService = domDataBroker.getExtensions() .getInstance(DOMDataTreeChangeService.class); if (changeService == null) { throw new UnsupportedOperationException("DOMDataBroker does not support the DOMDataTreeChangeService" - + this.domDataBroker); + + domDataBroker); } DOMDataTreeIdentifier root = new DOMDataTreeIdentifier(datastore, path); ListenerRegistration registration = @@ -795,7 +795,7 @@ public class BrokerFacade implements Closeable { final SchemaContext schemaContext, final String point, final UserLeafSetNode readLeafList, final boolean before) { rwTransaction.delete(datastore, path.getParent().getParent()); - final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); + final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); int lastItemPosition = 0; for (final LeafSetEntryNode nodeChild : readLeafList.body()) { if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { @@ -826,7 +826,7 @@ public class BrokerFacade implements Closeable { final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext, final String point, final MapNode readList, final boolean before) { rwTransaction.delete(datastore, path.getParent().getParent()); - final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); + final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); int lastItemPosition = 0; for (final MapEntryNode mapEntryNode : readList.body()) { if (mapEntryNode.getIdentifier() @@ -1111,7 +1111,7 @@ public class BrokerFacade implements Closeable { final SchemaContext schemaContext, final String point, final UserLeafSetNode readLeafList, final boolean before) { tx.delete(datastore, path.getParent()); - final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); + final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); int index1 = 0; for (final LeafSetEntryNode nodeChild : readLeafList.body()) { if (nodeChild.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { @@ -1139,7 +1139,7 @@ public class BrokerFacade implements Closeable { final YangInstanceIdentifier path, final NormalizedNode payload, final SchemaContext schemaContext, final String point, final UserMapNode readList, final boolean before) { tx.delete(datastore, path.getParent()); - final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); + final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier(point); int index1 = 0; for (final MapEntryNode mapEntryNode : readList.body()) { if (mapEntryNode.getIdentifier().equals(instanceIdentifier.getInstanceIdentifier().getLastPathArgument())) { @@ -1220,7 +1220,7 @@ public class BrokerFacade implements Closeable { } final SchemaPath path = listener.getSchemaPath(); - final ListenerRegistration registration = this.domNotification + final ListenerRegistration registration = domNotification .registerNotificationListener(listener, Absolute.of(ImmutableList.copyOf(path.getPathFromRoot()))); listener.setRegistration(registration); @@ -1269,7 +1269,7 @@ public class BrokerFacade implements Closeable { PatchStatusContext status; public PatchStatusContext getStatus() { - return this.status; + return status; } public void setStatus(final PatchStatusContext status) { 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 313b71d704..cc01ef9fe4 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 @@ -149,7 +149,7 @@ public final class ControllerContext implements EffectiveModelContextListener, C onModelContextUpdated(schemas); } - public InstanceIdentifierContext toInstanceIdentifier(final String restconfInstance) { + public InstanceIdentifierContext toInstanceIdentifier(final String restconfInstance) { return toIdentifier(restconfInstance, false); } @@ -157,17 +157,16 @@ public final class ControllerContext implements EffectiveModelContextListener, C return globalSchema; } - public InstanceIdentifierContext toMountPointIdentifier(final String restconfInstance) { + public InstanceIdentifierContext toMountPointIdentifier(final String restconfInstance) { return toIdentifier(restconfInstance, true); } - private InstanceIdentifierContext toIdentifier(final String restconfInstance, - final boolean toMountPointIdentifier) { + private InstanceIdentifierContext toIdentifier(final String restconfInstance, + final boolean toMountPointIdentifier) { checkPreconditions(); if (restconfInstance == null) { - return new InstanceIdentifierContext<>(YangInstanceIdentifier.empty(), globalSchema, null, - globalSchema); + return new InstanceIdentifierContext(YangInstanceIdentifier.empty(), globalSchema, null, globalSchema); } final List pathArgs = urlPathArgsDecode(SLASH_SPLITTER.split(restconfInstance)); @@ -191,7 +190,7 @@ public final class ControllerContext implements EffectiveModelContextListener, C ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT); } - final InstanceIdentifierContext iiWithSchemaNode = + final InstanceIdentifierContext iiWithSchemaNode = collectPathArguments(builder, pathArgs, latestModule.iterator().next(), null, toMountPointIdentifier); if (iiWithSchemaNode == null) { @@ -524,7 +523,7 @@ public final class ControllerContext implements EffectiveModelContextListener, C } @SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE", justification = "Unrecognised NullableDecl") - private InstanceIdentifierContext collectPathArguments(final InstanceIdentifierBuilder builder, + private InstanceIdentifierContext collectPathArguments(final InstanceIdentifierBuilder builder, final List strings, final DataNodeContainer parentNode, final DOMMountPoint mountPoint, final boolean returnJustMountPoint) { requireNonNull(strings); @@ -578,7 +577,7 @@ public final class ControllerContext implements EffectiveModelContextListener, C } if (returnJustMountPoint || strings.size() == 1) { - return new InstanceIdentifierContext<>(YangInstanceIdentifier.empty(), mountPointSchema, mount, + return new InstanceIdentifierContext(YangInstanceIdentifier.empty(), mountPointSchema, mount, mountPointSchema); } @@ -633,7 +632,7 @@ public final class ControllerContext implements EffectiveModelContextListener, C rpc = getRpcDefinition(module, rpcName); } if (rpc != null) { - return new InstanceIdentifierContext<>(builder.build(), rpc, mountPoint, + return new InstanceIdentifierContext(builder.build(), rpc, mountPoint, mountPoint != null ? getModelContext(mountPoint) : globalSchema); } } @@ -716,11 +715,11 @@ public final class ControllerContext implements EffectiveModelContextListener, C mountPoint != null ? getModelContext(mountPoint) : globalSchema); } - private static InstanceIdentifierContext createContext(final YangInstanceIdentifier instance, + private static InstanceIdentifierContext createContext(final YangInstanceIdentifier instance, final DataSchemaNode dataSchemaNode, final DOMMountPoint mountPoint, final EffectiveModelContext schemaContext) { final YangInstanceIdentifier instanceIdentifier = new DataNormalizer(schemaContext).toNormalized(instance); - return new InstanceIdentifierContext<>(instanceIdentifier, dataSchemaNode, mountPoint, schemaContext); + return new InstanceIdentifierContext(instanceIdentifier, dataSchemaNode, mountPoint, schemaContext); } public static DataSchemaNode findInstanceDataChildByNameAndNamespace(final DataNodeContainer container, diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java index ceb19e5077..16bc30d218 100644 --- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java +++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java @@ -223,7 +223,7 @@ public final class RestconfImpl implements RestconfService { SchemaAwareBuilders.containerBuilder((ContainerSchemaNode) modulesSchemaNode); moduleContainerBuilder.withChild(allModuleMap); - return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, modulesSchemaNode, null, schemaContext), + return new NormalizedNodeContext(new InstanceIdentifierContext(null, modulesSchemaNode, null, schemaContext), moduleContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo)); } @@ -240,7 +240,7 @@ public final class RestconfImpl implements RestconfService { throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - final InstanceIdentifierContext mountPointIdentifier = + final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); final DOMMountPoint mountPoint = mountPointIdentifier.getMountPoint(); final MapNode mountPointModulesMap = makeModuleMapNode(controllerContext.getAllModules(mountPoint)); @@ -255,7 +255,7 @@ public final class RestconfImpl implements RestconfService { moduleContainerBuilder.withChild(mountPointModulesMap); return new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, modulesSchemaNode, mountPoint, + new InstanceIdentifierContext(null, modulesSchemaNode, mountPoint, controllerContext.getGlobalSchema()), moduleContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo)); } @@ -268,7 +268,7 @@ public final class RestconfImpl implements RestconfService { DOMMountPoint mountPoint = null; final EffectiveModelContext schemaContext; if (identifier.contains(ControllerContext.MOUNT)) { - final InstanceIdentifierContext mountPointIdentifier = + final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); mountPoint = mountPointIdentifier.getMountPoint(); module = controllerContext.findModuleByNameAndRevision(mountPoint, nameRev.getKey(), @@ -294,7 +294,7 @@ public final class RestconfImpl implements RestconfService { checkState(moduleSchemaNode instanceof ListSchemaNode); return new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, moduleSchemaNode, mountPoint, schemaContext), moduleMap, + new InstanceIdentifierContext(null, moduleSchemaNode, mountPoint, schemaContext), moduleMap, QueryParametersParser.parseWriterParameters(uriInfo)); } @@ -324,7 +324,7 @@ public final class RestconfImpl implements RestconfService { streamsContainerBuilder.withChild(listStreamsBuilder.build()); return new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, streamsContainerSchemaNode, null, schemaContext), + new InstanceIdentifierContext(null, streamsContainerSchemaNode, null, schemaContext), streamsContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo)); } @@ -350,8 +350,7 @@ public final class RestconfImpl implements RestconfService { throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - final InstanceIdentifierContext mountPointIdentifier = - controllerContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountPointIdentifier = controllerContext.toMountPointIdentifier(identifier); final DOMMountPoint mountPoint = mountPointIdentifier.getMountPoint(); final var entry = OperationsResourceUtils.contextForModelContext(modelContext(mountPoint), mountPoint); return new NormalizedNodeContext(entry.getKey(), entry.getValue()); @@ -455,7 +454,7 @@ public final class RestconfImpl implements RestconfService { throw new WebApplicationException(Response.Status.NO_CONTENT); } else { return new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, resultNodeSchema, mountPoint, schemaContext), + new InstanceIdentifierContext(null, resultNodeSchema, mountPoint, schemaContext), resultData, QueryParametersParser.parseWriterParameters(uriInfo)); } } @@ -468,7 +467,7 @@ public final class RestconfImpl implements RestconfService { final EffectiveModelContext schemaContext; if (identifier.contains(ControllerContext.MOUNT)) { // mounted RPC call - look up mount instance. - final InstanceIdentifierContext mountPointId = controllerContext.toMountPointIdentifier(identifier); + final InstanceIdentifierContext mountPointId = controllerContext.toMountPointIdentifier(identifier); mountPoint = mountPointId.getMountPoint(); schemaContext = modelContext(mountPoint); final int startOfRemoteRpcName = @@ -530,7 +529,7 @@ public final class RestconfImpl implements RestconfService { // // This is legacy code, so if anybody cares to do that refactor, feel free to contribute, but I am not // doing that work. - return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, rpc, mountPoint, schemaContext), result, + return new NormalizedNodeContext(new InstanceIdentifierContext(null, rpc, mountPoint, schemaContext), result, QueryParametersParser.parseWriterParameters(uriInfo)); } @@ -701,7 +700,7 @@ public final class RestconfImpl implements RestconfService { } } - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); NormalizedNode data = null; final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -718,7 +717,7 @@ public final class RestconfImpl implements RestconfService { @Override public NormalizedNodeContext readOperationalData(final String identifier, final UriInfo uriInfo) { - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); NormalizedNode data = null; final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -781,7 +780,7 @@ public final class RestconfImpl implements RestconfService { requireNonNull(identifier); - final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); validateInput(iiWithData.getSchemaNode(), payload); validateTopLevelNodeName(payload, iiWithData.getInstanceIdentifier()); @@ -877,7 +876,7 @@ public final class RestconfImpl implements RestconfService { */ private static void validateListKeysEqualityInPayloadAndUri(final NormalizedNodeContext payload) { checkArgument(payload != null); - final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); final PathArgument lastPathArgument = iiWithData.getInstanceIdentifier().getLastPathArgument(); final SchemaNode schemaNode = iiWithData.getSchemaNode(); final NormalizedNode data = payload.getData(); @@ -924,7 +923,7 @@ public final class RestconfImpl implements RestconfService { throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); } final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint(); - final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); boolean insertUsed = false; @@ -1017,7 +1016,7 @@ public final class RestconfImpl implements RestconfService { @Override public Response deleteConfigurationData(final String identifier) { - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); final DOMMountPoint mountPoint = iiWithData.getMountPoint(); final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier(); @@ -1132,7 +1131,7 @@ public final class RestconfImpl implements RestconfService { if (response != null) { // prepare node with value of location - final InstanceIdentifierContext iid = prepareIIDSubsStreamOutput(); + final InstanceIdentifierContext iid = prepareIIDSubsStreamOutput(); final NormalizedNodeBuilder> builder = ImmutableLeafNodeBuilder.create().withValue(response.toString()); builder.withNodeIdentifier( @@ -1165,7 +1164,7 @@ public final class RestconfImpl implements RestconfService { * @return {@link InstanceIdentifierContext} of location leaf for * notification */ - private InstanceIdentifierContext prepareIIDSubsStreamOutput() { + private InstanceIdentifierContext prepareIIDSubsStreamOutput() { final QName qnameBase = QName.create("subscribe:to:notification", "2016-10-28", "notifi"); final EffectiveModelContext schemaCtx = controllerContext.getGlobalSchema(); final DataSchemaNode location = ((ContainerSchemaNode) schemaCtx @@ -1175,8 +1174,7 @@ public final class RestconfImpl implements RestconfService { path.add(NodeIdentifier.create(qnameBase)); path.add(NodeIdentifier.create(QName.create(qnameBase, "location"))); - return new InstanceIdentifierContext(YangInstanceIdentifier.create(path), location, null, - schemaCtx); + return new InstanceIdentifierContext(YangInstanceIdentifier.create(path), location, null, schemaCtx); } /** diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java index f9522c71c1..5896eab7f4 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/md/sal/rest/common/TestRestconfUtils.java @@ -111,7 +111,7 @@ public final class TestRestconfUtils { @SuppressWarnings("checkstyle:IllegalCatch") public static NormalizedNodeContext loadNormalizedContextFromXmlFile(final String pathToInputFile, final String uri, final ControllerContext controllerContext) { - final InstanceIdentifierContext iiContext = controllerContext.toInstanceIdentifier(uri); + final InstanceIdentifierContext iiContext = controllerContext.toInstanceIdentifier(uri); final InputStream inputStream = TestJsonBodyWriter.class.getResourceAsStream(pathToInputFile); try { final Document doc = UntrustedXML.newDocumentBuilder().parse(inputStream); @@ -123,7 +123,7 @@ public final class TestRestconfUtils { return null; } - private static NormalizedNode parse(final InstanceIdentifierContext iiContext, final Document doc) + private static NormalizedNode parse(final InstanceIdentifierContext iiContext, final Document doc) throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final SchemaNode schemaNodeContext = iiContext.getSchemaNode(); DataSchemaNode schemaNode = null; diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java index 97a9570094..3c46201573 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/rest/impl/InstanceIdentifierTypeLeafTest.java @@ -7,7 +7,10 @@ */ package org.opendaylight.controller.sal.rest.impl; -import org.junit.Assert; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import org.junit.Test; import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils; import org.opendaylight.netconf.sal.restconf.impl.ControllerContext; @@ -26,27 +29,27 @@ public class InstanceIdentifierTypeLeafTest { final EffectiveModelContext schemaContext = YangParserTestUtils.parseYangFiles(TestRestconfUtils.loadFiles("/instanceidentifier")); ControllerContext controllerContext = TestRestconfUtils.newControllerContext(schemaContext); - final InstanceIdentifierContext instanceIdentifier = + final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier( "/iid-value-module:cont-iid/iid-list/%2Fiid-value-module%3Acont-iid%2Fiid-value-module%3A" + "values-iid%5Biid-value-module:value-iid='value'%5D"); final YangInstanceIdentifier yiD = instanceIdentifier.getInstanceIdentifier(); - Assert.assertNotNull(yiD); + assertNotNull(yiD); final PathArgument lastPathArgument = yiD.getLastPathArgument(); - Assert.assertTrue(lastPathArgument.getNodeType().getNamespace().toString().equals("iid:value:module")); - Assert.assertTrue(lastPathArgument.getNodeType().getLocalName().equals("iid-list")); + assertTrue(lastPathArgument.getNodeType().getNamespace().toString().equals("iid:value:module")); + assertTrue(lastPathArgument.getNodeType().getLocalName().equals("iid-list")); final NodeIdentifierWithPredicates list = (NodeIdentifierWithPredicates) lastPathArgument; final YangInstanceIdentifier value = (YangInstanceIdentifier) list.getValue( QName.create(lastPathArgument.getNodeType(), "iid-leaf")); final PathArgument lastPathArgumentOfValue = value.getLastPathArgument(); - Assert.assertTrue(lastPathArgumentOfValue.getNodeType().getNamespace().toString().equals("iid:value:module")); - Assert.assertTrue(lastPathArgumentOfValue.getNodeType().getLocalName().equals("values-iid")); + assertTrue(lastPathArgumentOfValue.getNodeType().getNamespace().toString().equals("iid:value:module")); + assertTrue(lastPathArgumentOfValue.getNodeType().getLocalName().equals("values-iid")); final NodeIdentifierWithPredicates valueList = (NodeIdentifierWithPredicates) lastPathArgumentOfValue; final String valueIid = (String) valueList.getValue( QName.create(lastPathArgumentOfValue.getNodeType(), "value-iid")); - Assert.assertEquals("value", valueIid); + assertEquals("value", valueIid); } } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java index f47bb61ea0..c4455df658 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/input/to/cnsn/test/RestPutListDataTest.java @@ -201,7 +201,7 @@ public class RestPutListDataTest { testNodeContainer.withChild(leafKey2.build()); } - final NormalizedNodeContext testCompositeContext = new NormalizedNodeContext(new InstanceIdentifierContext<>( + final NormalizedNodeContext testCompositeContext = new NormalizedNodeContext(new InstanceIdentifierContext( null, testNodeSchemaNode, null, schemaContextTestModule), testNodeContainer.build()); final UriInfo uriInfo = Mockito.mock(UriInfo.class); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java index f9155d75e9..19cf4cf125 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnInstanceIdentifierToXmlTest.java @@ -138,7 +138,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { dataCont.withChild(dataCont1.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, schemaCont, + new InstanceIdentifierContext(null, schemaCont, null, schemaContext), dataCont.build()); return testNormalizedNodeContext; @@ -236,7 +236,7 @@ public class NnInstanceIdentifierToXmlTest extends AbstractBodyReaderTest { dataCont1.withChild(dataLst11.build()); dataCont.withChild(dataCont1.build()); - return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, schemaCont, null, schemaContext), + return new NormalizedNodeContext(new InstanceIdentifierContext(null, schemaCont, null, schemaContext), dataCont.build()); } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java index ff6863c0a4..ac52922dc1 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java @@ -305,7 +305,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue(object).build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); return testNormalizedNodeContext; } @@ -343,7 +343,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue("true").build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); return testNormalizedNodeContext; } @@ -363,7 +363,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(SchemaAwareBuilders.leafBuilder((LeafSchemaNode) schemaLf).withValue("value").build()); return new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); } private static NormalizedNodeContext prepareIdrefData(final String prefix, final boolean valueAsQName) { @@ -397,7 +397,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest { contData.withChild(cont1Data.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, contSchema, null, schemaContext), contData.build()); + new InstanceIdentifierContext(null, contSchema, null, schemaContext), contData.build()); return testNormalizedNodeContext; } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java index 9d9ba65ca7..b0282126f5 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithChoiceTest.java @@ -96,8 +96,7 @@ public class NnToXmlWithChoiceTest extends AbstractBodyReaderTest { dataContainerNodeAttrBuilder.withChild(dataChoice.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, - contSchemaNode, null, schemaContext), + new InstanceIdentifierContext(null, contSchemaNode, null, schemaContext), dataContainerNodeAttrBuilder.build()); return testNormalizedNodeContext; diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java index 08e723f2d4..ab7bc38fac 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlWithDataFromSeveralModulesTest.java @@ -108,7 +108,7 @@ public class NnToXmlWithDataFromSeveralModulesTest extends dataContSchemaContNode.withChild(modul2.build()); final NormalizedNodeContext testNormalizedNodeContext = new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, schemaContext, null, schemaContext), + new InstanceIdentifierContext(null, schemaContext, null, schemaContext), dataContSchemaContNode.build()); return testNormalizedNodeContext; diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java index dad0907a7e..e58a14f195 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/BrokerFacadeTest.java @@ -111,9 +111,9 @@ public class BrokerFacadeTest { private BrokerFacade brokerFacade; private final NormalizedNode dummyNode = createDummyNode("test:module", "2014-01-09", "interfaces"); - private final FluentFuture> dummyNodeInFuture = wrapDummyNode(this.dummyNode); + private final FluentFuture> dummyNodeInFuture = wrapDummyNode(dummyNode); private final QName qname = TestUtils.buildQName("interfaces","test:module", "2014-01-09"); - private final YangInstanceIdentifier instanceID = YangInstanceIdentifier.builder().node(this.qname).build(); + private final YangInstanceIdentifier instanceID = YangInstanceIdentifier.builder().node(qname).build(); private ControllerContext controllerContext; @Before @@ -123,9 +123,9 @@ public class BrokerFacadeTest { brokerFacade = BrokerFacade.newInstance(mockRpcService, domDataBroker, domNotification, controllerContext); - when(this.domDataBroker.newReadOnlyTransaction()).thenReturn(this.readTransaction); - when(this.domDataBroker.newReadWriteTransaction()).thenReturn(this.rwTransaction); - when(this.domDataBroker.getExtensions()).thenReturn(ImmutableClassToInstanceMap.of( + when(domDataBroker.newReadOnlyTransaction()).thenReturn(readTransaction); + when(domDataBroker.newReadWriteTransaction()).thenReturn(rwTransaction); + when(domDataBroker.getExtensions()).thenReturn(ImmutableClassToInstanceMap.of( DOMDataTreeChangeService.class, Mockito.mock(DOMDataTreeChangeService.class))); } @@ -148,22 +148,22 @@ public class BrokerFacadeTest { @Test public void testReadConfigurationData() { - when(this.readTransaction.read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class))).thenReturn( - this.dummyNodeInFuture); + when(readTransaction.read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class))).thenReturn( + dummyNodeInFuture); - final NormalizedNode actualNode = this.brokerFacade.readConfigurationData(this.instanceID); + final NormalizedNode actualNode = brokerFacade.readConfigurationData(instanceID); - assertSame("readConfigurationData", this.dummyNode, actualNode); + assertSame("readConfigurationData", dummyNode, actualNode); } @Test public void testReadOperationalData() { - when(this.readTransaction.read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class))).thenReturn( - this.dummyNodeInFuture); + when(readTransaction.read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class))).thenReturn( + dummyNodeInFuture); - final NormalizedNode actualNode = this.brokerFacade.readOperationalData(this.instanceID); + final NormalizedNode actualNode = brokerFacade.readOperationalData(instanceID); - assertSame("readOperationalData", this.dummyNode, actualNode); + assertSame("readOperationalData", dummyNode, actualNode); } @Test @@ -176,7 +176,7 @@ public class BrokerFacadeTest { .when(readTransaction).read(any(LogicalDatastoreType.class), any(YangInstanceIdentifier.class)); final RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, - () -> brokerFacade.readConfigurationData(this.instanceID, "explicit")); + () -> brokerFacade.readConfigurationData(instanceID, "explicit")); final List errors = ex.getErrors(); assertEquals(1, errors.size()); assertEquals("getErrorTag", ErrorTags.RESOURCE_DENIED_TRANSPORT, errors.get(0).getErrorTag()); @@ -187,10 +187,10 @@ public class BrokerFacadeTest { @Test public void testInvokeRpc() throws Exception { final DOMRpcResult expResult = mock(DOMRpcResult.class); - doReturn(immediateFluentFuture(expResult)).when(this.mockRpcService).invokeRpc(this.qname, this.dummyNode); + doReturn(immediateFluentFuture(expResult)).when(mockRpcService).invokeRpc(qname, dummyNode); - final ListenableFuture actualFuture = this.brokerFacade.invokeRpc(this.qname, - this.dummyNode); + final ListenableFuture actualFuture = brokerFacade.invokeRpc(qname, + dummyNode); assertNotNull("Future is null", actualFuture); final DOMRpcResult actualResult = actualFuture.get(); assertSame("invokeRpc", expResult, actualResult); @@ -198,49 +198,49 @@ public class BrokerFacadeTest { @Test public void testCommitConfigurationDataPut() throws Exception { - doReturn(CommitInfo.emptyFluentFuture()).when(this.rwTransaction).commit(); + doReturn(CommitInfo.emptyFluentFuture()).when(rwTransaction).commit(); - doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(this.rwTransaction) - .read(LogicalDatastoreType.CONFIGURATION, this.instanceID); + doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(rwTransaction) + .read(LogicalDatastoreType.CONFIGURATION, instanceID); - final PutResult result = this.brokerFacade.commitConfigurationDataPut(mock(EffectiveModelContext.class), - this.instanceID, this.dummyNode, null, null); + final PutResult result = brokerFacade.commitConfigurationDataPut(mock(EffectiveModelContext.class), + instanceID, dummyNode, null, null); assertSame("commitConfigurationDataPut", CommitInfo.emptyFluentFuture(), result.getFutureOfPutData()); - final InOrder inOrder = inOrder(this.domDataBroker, this.rwTransaction); - inOrder.verify(this.domDataBroker).newReadWriteTransaction(); - inOrder.verify(this.rwTransaction).put(LogicalDatastoreType.CONFIGURATION, this.instanceID, this.dummyNode); - inOrder.verify(this.rwTransaction).commit(); + final InOrder inOrder = inOrder(domDataBroker, rwTransaction); + inOrder.verify(domDataBroker).newReadWriteTransaction(); + inOrder.verify(rwTransaction).put(LogicalDatastoreType.CONFIGURATION, instanceID, dummyNode); + inOrder.verify(rwTransaction).commit(); } @Test public void testCommitConfigurationDataPost() { - when(this.rwTransaction.exists(LogicalDatastoreType.CONFIGURATION, this.instanceID)) + when(rwTransaction.exists(LogicalDatastoreType.CONFIGURATION, instanceID)) .thenReturn(wrapExistence(false)); - doReturn(CommitInfo.emptyFluentFuture()).when(this.rwTransaction).commit(); + doReturn(CommitInfo.emptyFluentFuture()).when(rwTransaction).commit(); - final FluentFuture actualFuture = this.brokerFacade - .commitConfigurationDataPost(mock(EffectiveModelContext.class), this.instanceID, this.dummyNode, null, + final FluentFuture actualFuture = brokerFacade + .commitConfigurationDataPost(mock(EffectiveModelContext.class), instanceID, dummyNode, null, null); assertSame("commitConfigurationDataPost", CommitInfo.emptyFluentFuture(), actualFuture); - final InOrder inOrder = inOrder(this.domDataBroker, this.rwTransaction); - inOrder.verify(this.domDataBroker).newReadWriteTransaction(); - inOrder.verify(this.rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, this.instanceID); - inOrder.verify(this.rwTransaction).put(LogicalDatastoreType.CONFIGURATION, this.instanceID, this.dummyNode); - inOrder.verify(this.rwTransaction).commit(); + final InOrder inOrder = inOrder(domDataBroker, rwTransaction); + inOrder.verify(domDataBroker).newReadWriteTransaction(); + inOrder.verify(rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, instanceID); + inOrder.verify(rwTransaction).put(LogicalDatastoreType.CONFIGURATION, instanceID, dummyNode); + inOrder.verify(rwTransaction).commit(); } @Test(expected = RestconfDocumentedException.class) public void testCommitConfigurationDataPostAlreadyExists() { - when(this.rwTransaction.exists(eq(LogicalDatastoreType.CONFIGURATION), any(YangInstanceIdentifier.class))) + when(rwTransaction.exists(eq(LogicalDatastoreType.CONFIGURATION), any(YangInstanceIdentifier.class))) .thenReturn(immediateTrueFluentFuture()); try { // Schema context is only necessary for ensuring parent structure - this.brokerFacade.commitConfigurationDataPost((EffectiveModelContext) null, this.instanceID, this.dummyNode, + brokerFacade.commitConfigurationDataPost((EffectiveModelContext) null, instanceID, dummyNode, null, null); } catch (final RestconfDocumentedException e) { assertEquals("getErrorTag", ErrorTag.DATA_EXISTS, e.getErrors().get(0).getErrorTag()); @@ -257,20 +257,20 @@ public class BrokerFacadeTest { prepareDataForDelete(true); // expected result - doReturn(CommitInfo.emptyFluentFuture()).when(this.rwTransaction).commit(); + doReturn(CommitInfo.emptyFluentFuture()).when(rwTransaction).commit(); // test - final FluentFuture actualFuture = this.brokerFacade - .commitConfigurationDataDelete(this.instanceID); + final FluentFuture actualFuture = brokerFacade + .commitConfigurationDataDelete(instanceID); // verify result and interactions assertSame("commitConfigurationDataDelete", CommitInfo.emptyFluentFuture(), actualFuture); // check exists, delete, submit - final InOrder inOrder = inOrder(this.domDataBroker, this.rwTransaction); - inOrder.verify(this.rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, this.instanceID); - inOrder.verify(this.rwTransaction).delete(LogicalDatastoreType.CONFIGURATION, this.instanceID); - inOrder.verify(this.rwTransaction).commit(); + final InOrder inOrder = inOrder(domDataBroker, rwTransaction); + inOrder.verify(rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, instanceID); + inOrder.verify(rwTransaction).delete(LogicalDatastoreType.CONFIGURATION, instanceID); + inOrder.verify(rwTransaction).commit(); } /** @@ -283,7 +283,7 @@ public class BrokerFacadeTest { // try to delete and expect DATA_MISSING error final RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, - () -> brokerFacade.commitConfigurationDataDelete(this.instanceID)); + () -> brokerFacade.commitConfigurationDataDelete(instanceID)); final List errors = ex.getErrors(); assertEquals(1, errors.size()); assertEquals(ErrorType.PROTOCOL, errors.get(0).getErrorType()); @@ -296,30 +296,30 @@ public class BrokerFacadeTest { * @param assumeDataExists boolean to assume if data exists */ private void prepareDataForDelete(final boolean assumeDataExists) { - when(this.rwTransaction.exists(LogicalDatastoreType.CONFIGURATION, this.instanceID)) + when(rwTransaction.exists(LogicalDatastoreType.CONFIGURATION, instanceID)) .thenReturn(immediateBooleanFluentFuture(assumeDataExists)); } @Test public void testRegisterToListenDataChanges() { - final ListenerAdapter listener = Notificator.createListener(this.instanceID, "stream", + final ListenerAdapter listener = Notificator.createListener(instanceID, "stream", NotificationOutputType.XML, controllerContext); @SuppressWarnings("unchecked") final ListenerRegistration mockRegistration = mock(ListenerRegistration.class); - DOMDataTreeChangeService changeService = this.domDataBroker.getExtensions() + DOMDataTreeChangeService changeService = domDataBroker.getExtensions() .getInstance(DOMDataTreeChangeService.class); - DOMDataTreeIdentifier loc = new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, this.instanceID); + DOMDataTreeIdentifier loc = new DOMDataTreeIdentifier(LogicalDatastoreType.CONFIGURATION, instanceID); when(changeService.registerDataTreeChangeListener(eq(loc), eq(listener))).thenReturn(mockRegistration); - this.brokerFacade.registerToListenDataChanges(LogicalDatastoreType.CONFIGURATION, Scope.BASE, listener); + brokerFacade.registerToListenDataChanges(LogicalDatastoreType.CONFIGURATION, Scope.BASE, listener); verify(changeService).registerDataTreeChangeListener(loc, listener); assertEquals("isListening", true, listener.isListening()); - this.brokerFacade.registerToListenDataChanges(LogicalDatastoreType.CONFIGURATION, Scope.BASE, listener); + brokerFacade.registerToListenDataChanges(LogicalDatastoreType.CONFIGURATION, Scope.BASE, listener); verifyNoMoreInteractions(changeService); } @@ -337,20 +337,20 @@ public class BrokerFacadeTest { // mock registration final ListenerRegistration registration = mock(ListenerRegistration.class); - when(this.domNotification.registerNotificationListener(listener, + when(domNotification.registerNotificationListener(listener, Absolute.of(ImmutableList.copyOf(listener.getSchemaPath().getPathFromRoot())))) .thenReturn(registration); // test to register listener for the first time - this.brokerFacade.registerToListenNotification(listener); + brokerFacade.registerToListenNotification(listener); assertEquals("Registration was not successful", true, listener.isListening()); // try to register for the second time - this.brokerFacade.registerToListenNotification(listener); + brokerFacade.registerToListenNotification(listener); assertEquals("Registration was not successful", true, listener.isListening()); // registrations should be invoked only once - verify(this.domNotification, times(1)).registerNotificationListener(listener, + verify(domNotification, times(1)).registerNotificationListener(listener, Absolute.of(ImmutableList.copyOf(listener.getSchemaPath().getPathFromRoot()))); final DOMTransactionChain transactionChain = mock(DOMTransactionChain.class); @@ -366,7 +366,7 @@ public class BrokerFacadeTest { @Test public void testPatchConfigurationDataWithinTransactionServer() throws Exception { final PatchContext patchContext = mock(PatchContext.class); - final InstanceIdentifierContext identifierContext = mock(InstanceIdentifierContext.class); + final InstanceIdentifierContext identifierContext = mock(InstanceIdentifierContext.class); when(patchContext.getData()).thenReturn(new ArrayList<>()); doReturn(identifierContext).when(patchContext).getInstanceIdentifierContext(); @@ -374,9 +374,9 @@ public class BrokerFacadeTest { // no mount point when(identifierContext.getMountPoint()).thenReturn(null); - doReturn(CommitInfo.emptyFluentFuture()).when(this.rwTransaction).commit(); + doReturn(CommitInfo.emptyFluentFuture()).when(rwTransaction).commit(); - final PatchStatusContext status = this.brokerFacade.patchConfigurationDataWithinTransaction(patchContext); + final PatchStatusContext status = brokerFacade.patchConfigurationDataWithinTransaction(patchContext); // assert success assertTrue("Patch operation should be successful on server", status.isOk()); @@ -388,7 +388,7 @@ public class BrokerFacadeTest { @Test public void testPatchConfigurationDataWithinTransactionMount() throws Exception { final PatchContext patchContext = mock(PatchContext.class); - final InstanceIdentifierContext identifierContext = mock(InstanceIdentifierContext.class); + final InstanceIdentifierContext identifierContext = mock(InstanceIdentifierContext.class); final DOMMountPoint mountPoint = mock(DOMMountPoint.class); final DOMDataBroker mountDataBroker = mock(DOMDataBroker.class); final DOMDataTreeReadWriteTransaction transaction = mock(DOMDataTreeReadWriteTransaction.class); @@ -403,7 +403,7 @@ public class BrokerFacadeTest { when(mountDataBroker.newReadWriteTransaction()).thenReturn(transaction); doReturn(CommitInfo.emptyFluentFuture()).when(transaction).commit(); - final PatchStatusContext status = this.brokerFacade.patchConfigurationDataWithinTransaction(patchContext); + final PatchStatusContext status = brokerFacade.patchConfigurationDataWithinTransaction(patchContext); // assert success assertTrue("Patch operation should be successful on mounted device", status.isOk()); @@ -416,7 +416,7 @@ public class BrokerFacadeTest { @Test public void testPatchConfigurationDataWithinTransactionMountFail() throws Exception { final PatchContext patchContext = mock(PatchContext.class); - final InstanceIdentifierContext identifierContext = mock(InstanceIdentifierContext.class); + final InstanceIdentifierContext identifierContext = mock(InstanceIdentifierContext.class); final DOMMountPoint mountPoint = mock(DOMMountPoint.class); final DOMDataBroker mountDataBroker = mock(DOMDataBroker.class); final DOMDataTreeReadWriteTransaction transaction = mock(DOMDataTreeReadWriteTransaction.class); @@ -429,7 +429,7 @@ public class BrokerFacadeTest { when(mountPoint.getService(DOMSchemaService.class)).thenReturn(Optional.empty()); - final PatchStatusContext status = this.brokerFacade.patchConfigurationDataWithinTransaction(patchContext); + final PatchStatusContext status = brokerFacade.patchConfigurationDataWithinTransaction(patchContext); // assert not successful operation with error assertNotNull(status.getGlobalErrors()); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java index fe084356f8..0d7241df84 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug3595Test.java @@ -45,7 +45,7 @@ public class Bug3595Test { final YangInstanceIdentifier node1IIexpected = YangInstanceIdentifier.of(CONT_QNAME) .node(LST_WITH_LFREF_KEY_QNAME).node(NodeIdentifierWithPredicates.of( LST_WITH_LFREF_KEY_QNAME, LFREF_KEY_QNAME, "node1")); - final InstanceIdentifierContext iiContext = + final InstanceIdentifierContext iiContext = controllerContext.toInstanceIdentifier("leafref-module:cont/lst-with-lfref-key/node1"); iiContext.getInstanceIdentifier(); assertEquals(node1IIexpected, iiContext.getInstanceIdentifier()); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java index 7e226c9b40..a65babdd64 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/Bug8072Test.java @@ -57,7 +57,7 @@ public class Bug8072Test { @Test public void testIdentityRefFromExternalModule() throws FileNotFoundException, ReactorException { - final InstanceIdentifierContext ctx = controllerContext.toInstanceIdentifier( + final InstanceIdentifierContext ctx = controllerContext.toInstanceIdentifier( "simple-nodes:users/yang-ext:mount/test-module:modules/module/test-module:module-type/name"); final Map keyValues = new HashMap<>(); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java index b8da10e878..e379b3a9d0 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CutDataToCorrectDepthTest.java @@ -87,7 +87,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { public NormalizedNodeContext getData(@Encoded @PathParam("identifier") final String identifier, @Context final UriInfo uriInfo) { - final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier(identifier); NormalizedNode data = null; if (identifier.equals("nested-module:depth1-cont/depth2-cont1")) { @@ -117,7 +117,7 @@ public class CutDataToCorrectDepthTest extends JerseyTest { LOG.info("Instance identifier of payload: {}.", payload.getInstanceIdentifierContext().getInstanceIdentifier()); LOG.info("Data of payload: {}.", payload.getData()); - CutDataToCorrectDepthTest.this.globalPayload = payload.getData(); + globalPayload = payload.getData(); } @PUT @@ -218,9 +218,9 @@ public class CutDataToCorrectDepthTest extends JerseyTest { } private void verifyResponse(final NormalizedNode nodeData) throws WebApplicationException, IOException { - assertNotNull(this.globalPayload); - assertEquals(this.globalPayload, nodeData); - this.globalPayload = null; + assertNotNull(globalPayload); + assertEquals(globalPayload, nodeData); + globalPayload = null; } @Override diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java index 2157587580..e87352cbb8 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java @@ -149,7 +149,7 @@ public class InvokeRpcMethodTest { container.withChild(contNode.build()); return new NormalizedNodeContext( - new InstanceIdentifierContext<>(null, rpcInputSchemaNode, null, schema), container.build()); + new InstanceIdentifierContext(null, rpcInputSchemaNode, null, schema), container.build()); } @Test @@ -160,7 +160,7 @@ public class InvokeRpcMethodTest { .when(brokerFacade).invokeRpc(eq(qname), any()); final RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, - () -> this.restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo)); + () -> restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo)); verifyRestconfDocumentedException(ex, 0, ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED, Optional.empty(), Optional.empty()); } @@ -199,7 +199,7 @@ public class InvokeRpcMethodTest { doReturn(immediateFluentFuture(result)).when(brokerFacade).invokeRpc(eq(path), any()); final RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, - () -> this.restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo)); + () -> restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo)); // We are performing pass-through here of error-tag, hence the tag remains as specified, but we want to make // sure the HTTP status remains the same as @@ -220,7 +220,7 @@ public class InvokeRpcMethodTest { doReturn(immediateFluentFuture(expResult)).when(brokerFacade).invokeRpc(eq(qname), any()); - final NormalizedNodeContext output = this.restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo); + final NormalizedNodeContext output = restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo); assertNotNull(output); assertEquals(null, output.getData()); // additional validation in the fact that the restconfImpl does not @@ -238,14 +238,14 @@ public class InvokeRpcMethodTest { doReturn(immediateFluentFuture(expResult)).when(brokerFacade).invokeRpc(eq(qname), any()); WebApplicationException exceptionToBeThrown = assertThrows(WebApplicationException.class, - () -> this.restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo)); + () -> restconfImpl.invokeRpc("toaster:cancel-toast", null, uriInfo)); assertEquals(Response.Status.NO_CONTENT.getStatusCode(), exceptionToBeThrown.getResponse().getStatus()); } @Test public void testInvokeRpcMethodWithBadMethodName() { final RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, - () -> this.restconfImpl.invokeRpc("toaster:bad-method", null, uriInfo)); + () -> restconfImpl.invokeRpc("toaster:bad-method", null, uriInfo)); verifyRestconfDocumentedException(ex, 0, ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT, Optional.empty(), Optional.empty()); } @@ -276,12 +276,12 @@ public class InvokeRpcMethodTest { SchemaAwareBuilders.containerBuilder(rpcInputSchemaNode); final NormalizedNodeContext payload = - new NormalizedNodeContext(new InstanceIdentifierContext<>(null, rpcInputSchemaNode, + new NormalizedNodeContext(new InstanceIdentifierContext(null, rpcInputSchemaNode, null, schemaContext), containerBuilder.build()); doReturn(immediateFluentFuture(expResult)).when(brokerFacade).invokeRpc(eq(path), any(NormalizedNode.class)); - final NormalizedNodeContext output = this.restconfImpl.invokeRpc("toaster:make-toast", payload, uriInfo); + final NormalizedNodeContext output = restconfImpl.invokeRpc("toaster:make-toast", payload, uriInfo); assertNotNull(output); assertEquals(null, output.getData()); // additional validation in the fact that the restconfImpl does not @@ -291,7 +291,7 @@ public class InvokeRpcMethodTest { @Test public void testThrowExceptionWhenSlashInModuleName() { final RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, - () -> this.restconfImpl.invokeRpc("toaster/slash", null, uriInfo)); + () -> restconfImpl.invokeRpc("toaster/slash", null, uriInfo)); verifyRestconfDocumentedException(ex, 0, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, Optional.empty(), Optional.empty()); } @@ -330,7 +330,7 @@ public class InvokeRpcMethodTest { doReturn(immediateFluentFuture(result)).when(brokerFacade).invokeRpc(eq(rpcDef.getQName()), any()); - final NormalizedNodeContext output = this.restconfImpl.invokeRpc("toaster:testOutput", null, uriInfo); + final NormalizedNodeContext output = restconfImpl.invokeRpc("toaster:testOutput", null, uriInfo); assertNotNull(output); assertNotNull(output.getData()); assertSame(container, output.getData()); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java index bfe9c1d185..d0b30cb998 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetAugmentedElementWhenEqualNamesTest.java @@ -35,7 +35,7 @@ public class RestGetAugmentedElementWhenEqualNamesTest { @Test public void augmentedNodesInUri() { - InstanceIdentifierContext iiWithData = + InstanceIdentifierContext iiWithData = controllerContext.toInstanceIdentifier("main:cont/augment-main-a:cont1"); assertEquals(XMLNamespace.of("ns:augment:main:a"), iiWithData.getSchemaNode().getQName().getNamespace()); iiWithData = controllerContext.toInstanceIdentifier("main:cont/augment-main-b:cont1"); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java index 3fc775bb88..9cd03d8540 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestPutConfigTest.java @@ -52,14 +52,14 @@ public class RestPutConfigTest { @Before public void init() { - this.controllerCx = TestRestconfUtils.newControllerContext(schemaContext); - this.restconfService = RestconfImpl.newInstance(brokerFacade, controllerCx); + controllerCx = TestRestconfUtils.newControllerContext(schemaContext); + restconfService = RestconfImpl.newInstance(brokerFacade, controllerCx); } @Test public void testPutConfigData() { final String identifier = "test-interface:interfaces/interface/key"; - final InstanceIdentifierContext iiCx = this.controllerCx.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiCx = controllerCx.toInstanceIdentifier(identifier); final MapEntryNode data = Mockito.mock(MapEntryNode.class); final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "interface"); final QName qNameKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "name"); @@ -74,13 +74,13 @@ public class RestPutConfigTest { final MultivaluedMap value = Mockito.mock(MultivaluedMap.class); Mockito.when(value.entrySet()).thenReturn(new HashSet<>()); Mockito.when(uriInfo.getQueryParameters()).thenReturn(value); - this.restconfService.updateConfigurationData(identifier, payload, uriInfo); + restconfService.updateConfigurationData(identifier, payload, uriInfo); } @Test public void testPutConfigDataCheckOnlyLastElement() { final String identifier = "test-interface:interfaces/interface/key/sub-interface/subkey"; - final InstanceIdentifierContext iiCx = this.controllerCx.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiCx = controllerCx.toInstanceIdentifier(identifier); final MapEntryNode data = Mockito.mock(MapEntryNode.class); final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "sub-interface"); final QName qNameSubKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "sub-name"); @@ -95,19 +95,19 @@ public class RestPutConfigTest { final MultivaluedMap value = Mockito.mock(MultivaluedMap.class); Mockito.when(value.entrySet()).thenReturn(new HashSet<>()); Mockito.when(uriInfo.getQueryParameters()).thenReturn(value); - this.restconfService.updateConfigurationData(identifier, payload, uriInfo); + restconfService.updateConfigurationData(identifier, payload, uriInfo); } @Test(expected = RestconfDocumentedException.class) public void testPutConfigDataMissingUriKey() { final String identifier = "test-interface:interfaces/interface"; - this.controllerCx.toInstanceIdentifier(identifier); + controllerCx.toInstanceIdentifier(identifier); } @Test(expected = RestconfDocumentedException.class) public void testPutConfigDataDiferentKey() { final String identifier = "test-interface:interfaces/interface/key"; - final InstanceIdentifierContext iiCx = this.controllerCx.toInstanceIdentifier(identifier); + final InstanceIdentifierContext iiCx = controllerCx.toInstanceIdentifier(identifier); final MapEntryNode data = Mockito.mock(MapEntryNode.class); final QName qName = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "interface"); final QName qNameKey = QName.create("urn:ietf:params:xml:ns:yang:test-interface", "2014-07-01", "name"); @@ -122,12 +122,12 @@ public class RestPutConfigTest { final MultivaluedMap value = Mockito.mock(MultivaluedMap.class); Mockito.when(value.entrySet()).thenReturn(new HashSet<>()); Mockito.when(uriInfo.getQueryParameters()).thenReturn(value); - this.restconfService.updateConfigurationData(identifier, payload, uriInfo); + restconfService.updateConfigurationData(identifier, payload, uriInfo); } private void mockingBrokerPut(final YangInstanceIdentifier yii, final NormalizedNode data) { final PutResult result = Mockito.mock(PutResult.class); - Mockito.when(this.brokerFacade.commitConfigurationDataPut(schemaContext, yii, data, null, null)) + Mockito.when(brokerFacade.commitConfigurationDataPut(schemaContext, yii, data, null, null)) .thenReturn(result); Mockito.doReturn(CommitInfo.emptyFluentFuture()).when(result).getFutureOfPutData(); Mockito.when(result.getStatus()).thenReturn(Status.OK); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java index ac208c6e06..d9874ec748 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestconfImplTest.java @@ -153,7 +153,7 @@ public class RestconfImplTest { doReturn(new MultivaluedHashMap<>()).when(uriInfo).getQueryParameters(anyBoolean()); final NormalizedNodeContext ctx = mock(NormalizedNodeContext.class); - final InstanceIdentifierContext iiCtx = mock(InstanceIdentifierContext.class); + final InstanceIdentifierContext iiCtx = mock(InstanceIdentifierContext.class); doReturn(iiCtx).when(ctx).getInstanceIdentifierContext(); final SchemaNode schemaNode = mock(SchemaNode.class); doReturn(schemaNode).when(iiCtx).getSchemaNode(); @@ -166,8 +166,8 @@ public class RestconfImplTest { doReturn(Optional.of(rpcService)).when(mount).getService(DOMRpcService.class); doReturn(immediateFluentFuture(mock(DOMRpcResult.class))).when(rpcService) .invokeRpc(any(QName.class), any(NormalizedNode.class)); - this.restconfImpl.invokeRpc("randomId", ctx, uriInfo); - this.restconfImpl.invokeRpc("ietf-netconf", ctx, uriInfo); + restconfImpl.invokeRpc("randomId", ctx, uriInfo); + restconfImpl.invokeRpc("ietf-netconf", ctx, uriInfo); verify(rpcService, times(2)).invokeRpc(any(QName.class), any()); } @@ -177,7 +177,7 @@ public class RestconfImplTest { @Test public void createNotificationStreamTest() { final NormalizedNodeContext payload = mock(NormalizedNodeContext.class); - final InstanceIdentifierContext iiCtx = mock(InstanceIdentifierContext.class); + final InstanceIdentifierContext iiCtx = mock(InstanceIdentifierContext.class); doReturn(iiCtx).when(payload).getInstanceIdentifierContext(); final SchemaNode schemaNode = mock(SchemaNode.class, @@ -204,7 +204,7 @@ public class RestconfImplTest { doReturn(children).when(normalizedNode).body(); // register notification - final NormalizedNodeContext context = this.restconfImpl + final NormalizedNodeContext context = restconfImpl .invokeRpc("sal-remote:create-notification-stream", payload, null); assertNotNull(context); } @@ -214,8 +214,8 @@ public class RestconfImplTest { */ @Test public void toStreamEntryNodeTest() { - final Module restconfModule = this.controllerContext.getRestconfModule(); - final DataSchemaNode streamSchemaNode = this.controllerContext + final Module restconfModule = controllerContext.getRestconfModule(); + final DataSchemaNode streamSchemaNode = controllerContext .getRestconfModuleRestConfSchemaNode(restconfModule, Draft02.RestConfModule.STREAM_LIST_SCHEMA_NODE); final ListSchemaNode listStreamSchemaNode = (ListSchemaNode) streamSchemaNode; final DataContainerNodeBuilder streamNodeValues = @@ -277,7 +277,7 @@ public class RestconfImplTest { when(uriInfo.getQueryParameters()).thenReturn(map); // subscribe to stream and verify response - final NormalizedNodeContext response = this.restconfImpl.subscribeToStream(identifier, uriInfo); + final NormalizedNodeContext response = restconfImpl.subscribeToStream(identifier, uriInfo); // remove test notification stream Notificator.removeAllListeners(); diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java index 6e48831d27..13459ed317 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URIParametersParsing.java @@ -62,10 +62,10 @@ public class URIParametersParsing { @Before public void init() throws FileNotFoundException, ReactorException { - this.mockedBrokerFacade = mock(BrokerFacade.class); - this.controllerContext = TestRestconfUtils.newControllerContext( + mockedBrokerFacade = mock(BrokerFacade.class); + controllerContext = TestRestconfUtils.newControllerContext( TestUtils.loadSchemaContext("/datastore-and-scope-specification")); - this.restconf = RestconfImpl.newInstance(mockedBrokerFacade, controllerContext); + restconf = RestconfImpl.newInstance(mockedBrokerFacade, controllerContext); } @Test @@ -100,7 +100,7 @@ public class URIParametersParsing { final UriBuilder uriBuilder = UriBuilder.fromUri("www.whatever.com"); when(mockedUriInfo.getAbsolutePathBuilder()).thenReturn(uriBuilder); - this.restconf.invokeRpc("sal-remote:create-data-change-event-subscription", + restconf.invokeRpc("sal-remote:create-data-change-event-subscription", prepareDomRpcNode(datastoreValue, scopeValue), mockedUriInfo); final ListenerAdapter listener = @@ -110,7 +110,7 @@ public class URIParametersParsing { } private NormalizedNodeContext prepareDomRpcNode(final String datastore, final String scope) { - final EffectiveModelContext schema = this.controllerContext.getGlobalSchema(); + final EffectiveModelContext schema = controllerContext.getGlobalSchema(); final Module rpcSalRemoteModule = schema.findModule("sal-remote", Revision.of("2014-01-14")).get(); final QName rpcQName = QName.create(rpcSalRemoteModule.getQNameModule(), "create-data-change-event-subscription"); @@ -169,7 +169,7 @@ public class URIParametersParsing { when(rpcDef.getPath()).thenReturn(SchemaPath.create(true, rpcQName)); when(rpcDef.getQName()).thenReturn(rpcQName); - return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, rpcDef, null, schema), + return new NormalizedNodeContext(new InstanceIdentifierContext(null, rpcDef, null, schema), container.build()); } } diff --git a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java index 594c6b4b48..8178674c49 100644 --- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java +++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/URITest.java @@ -47,7 +47,7 @@ public class URITest { @Test public void testToInstanceIdentifierList() { - InstanceIdentifierContext instanceIdentifier = controllerContext + InstanceIdentifierContext instanceIdentifier = controllerContext .toInstanceIdentifier("simple-nodes:userWithoutClass/foo"); assertEquals(instanceIdentifier.getSchemaNode().getQName().getLocalName(), "userWithoutClass"); @@ -64,7 +64,7 @@ public class URITest { @Test public void testToInstanceIdentifierWithDoubleSlash() { - InstanceIdentifierContext instanceIdentifier = controllerContext + InstanceIdentifierContext instanceIdentifier = controllerContext .toInstanceIdentifier("simple-nodes:food//nonalcoholic"); assertEquals(instanceIdentifier.getSchemaNode().getQName().getLocalName(), "nonalcoholic"); @@ -91,7 +91,7 @@ public class URITest { @Test public void testToInstanceIdentifierContainer() { - final InstanceIdentifierContext instanceIdentifier = + final InstanceIdentifierContext instanceIdentifier = controllerContext.toInstanceIdentifier("simple-nodes:users"); assertEquals(instanceIdentifier.getSchemaNode().getQName().getLocalName(), "users"); assertTrue(instanceIdentifier.getSchemaNode() instanceof ContainerSchemaNode); @@ -100,7 +100,7 @@ public class URITest { @Test public void testToInstanceIdentifierChoice() { - final InstanceIdentifierContext instanceIdentifier = controllerContext + final InstanceIdentifierContext instanceIdentifier = controllerContext .toInstanceIdentifier("simple-nodes:food/nonalcoholic"); assertEquals(instanceIdentifier.getSchemaNode().getQName().getLocalName(), "nonalcoholic"); } @@ -132,7 +132,7 @@ public class URITest { @Test public void testMountPointWithExternModul() { initSchemaService(); - final InstanceIdentifierContext instanceIdentifier = controllerContext + final InstanceIdentifierContext instanceIdentifier = controllerContext .toInstanceIdentifier("simple-nodes:users/yang-ext:mount/test-interface2:class/student/name"); assertEquals( "[(urn:ietf:params:xml:ns:yang:test-interface2?revision=2014-08-01)class, " @@ -145,7 +145,7 @@ public class URITest { @Test public void testMountPointWithoutExternModul() { initSchemaService(); - final InstanceIdentifierContext instanceIdentifier = controllerContext + final InstanceIdentifierContext instanceIdentifier = controllerContext .toInstanceIdentifier("simple-nodes:users/yang-ext:mount/"); assertTrue(Iterables.isEmpty(instanceIdentifier.getInstanceIdentifier().getPathArguments())); } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java index f2e2998a6d..fe00d8474c 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/databind/jaxrs/QueryParams.java @@ -104,7 +104,7 @@ public final class QueryParams { } public static QueryParameters newQueryParameters(final ReadDataParams params, - final InstanceIdentifierContext identifier) { + final InstanceIdentifierContext identifier) { final var fields = params.fields(); if (fields == null) { return QueryParameters.of(params); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java index 37939742c3..df32403ee8 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/AbstractNormalizedNodeBodyReader.java @@ -30,7 +30,7 @@ abstract class AbstractNormalizedNodeBodyReader extends AbstractIdentifierAwareJ } @Override - protected final NormalizedNodePayload emptyBody(final InstanceIdentifierContext path) { + protected final NormalizedNodePayload emptyBody(final InstanceIdentifierContext path) { return NormalizedNodePayload.empty(path); } } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java index d462ffadfd..61b63c889c 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyReader.java @@ -44,7 +44,6 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ResultAlreadySetExceptio import org.opendaylight.yangtools.yang.model.api.EffectiveStatementInference; import org.opendaylight.yangtools.yang.model.api.OperationDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.meta.EffectiveStatement; import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; @@ -63,7 +62,7 @@ public class JsonNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyRead @SuppressWarnings("checkstyle:IllegalCatch") @Override - protected NormalizedNodePayload readBody(final InstanceIdentifierContext path, final InputStream entityStream) + protected NormalizedNodePayload readBody(final InstanceIdentifierContext path, final InputStream entityStream) throws WebApplicationException { try { return readFrom(path, entityStream, isPost()); @@ -74,7 +73,7 @@ public class JsonNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyRead } public static NormalizedNodePayload readFrom( - final InstanceIdentifierContext path, final InputStream entityStream, final boolean isPost) { + final InstanceIdentifierContext path, final InputStream entityStream, final boolean isPost) { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); @@ -98,7 +97,7 @@ public class JsonNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyRead NormalizedNode result = resultHolder.getResult(); final List iiToDataList = new ArrayList<>(); - InstanceIdentifierContext newIIContext; + InstanceIdentifierContext newIIContext; while (result instanceof AugmentationNode || result instanceof ChoiceNode) { final Object childNode = ((DataContainerNode) result).body().iterator().next(); @@ -127,7 +126,7 @@ public class JsonNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyRead final YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat( path.getInstanceIdentifier().getPathArguments(), iiToDataList)); - newIIContext = new InstanceIdentifierContext<>(fullIIToData, path.getSchemaNode(), path.getMountPoint(), + newIIContext = new InstanceIdentifierContext(fullIIToData, path.getSchemaNode(), path.getMountPoint(), path.getSchemaContext()); // FIXME: can result really be null? diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java index 15c4a829a1..dffbc798b6 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/JsonNormalizedNodeBodyWriter.java @@ -63,9 +63,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit return; } - @SuppressWarnings("unchecked") - final InstanceIdentifierContext identifierCtx = - (InstanceIdentifierContext) context.getInstanceIdentifierContext(); + final InstanceIdentifierContext identifierCtx = context.getInstanceIdentifierContext(); final SchemaPath path = identifierCtx.getSchemaNode().getPath(); final var pretty = context.getWriterParameters().prettyPrint(); @@ -85,7 +83,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit } private static void writeNormalizedNode(final JsonWriter jsonWriter, - final SchemaPath path, final InstanceIdentifierContext context, final NormalizedNode data, + final SchemaPath path, final InstanceIdentifierContext context, final NormalizedNode data, final DepthParam depth, final List> fields) throws IOException { final RestconfNormalizedNodeWriter nnWriter; @@ -148,7 +146,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit } private static RestconfNormalizedNodeWriter createNormalizedNodeWriter( - final InstanceIdentifierContext context, final SchemaPath path, final JsonWriter jsonWriter, + final InstanceIdentifierContext context, final SchemaPath path, final JsonWriter jsonWriter, final DepthParam depth, final List> fields) { final SchemaNode schema = context.getSchemaNode(); @@ -176,7 +174,7 @@ public class JsonNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrit return JsonWriterFactory.createJsonWriter(new OutputStreamWriter(entityStream, StandardCharsets.UTF_8)); } - private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) { + private static JSONCodecFactory getCodecFactory(final InstanceIdentifierContext context) { // TODO: Performance: Cache JSON Codec factory and schema context return JSONCodecFactorySupplier.RFC7951.getShared(context.getSchemaContext()); } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java index b26bbd47dc..0c6e8e2cfa 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyReader.java @@ -71,7 +71,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyReade @SuppressWarnings("checkstyle:IllegalCatch") @Override - protected NormalizedNodePayload readBody(final InstanceIdentifierContext path, final InputStream entityStream) + protected NormalizedNodePayload readBody(final InstanceIdentifierContext path, final InputStream entityStream) throws WebApplicationException { try { final Document doc = UntrustedXML.newDocumentBuilder().parse(entityStream); @@ -86,7 +86,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyReade } } - private NormalizedNodePayload parse(final InstanceIdentifierContext pathContext, final Document doc) + private NormalizedNodePayload parse(final InstanceIdentifierContext pathContext, final Document doc) throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final SchemaNode schemaNodeContext = pathContext.getSchemaNode(); DataSchemaNode schemaNode; @@ -161,7 +161,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyReade final YangInstanceIdentifier fullIIToData = YangInstanceIdentifier.create(Iterables.concat( pathContext.getInstanceIdentifier().getPathArguments(), iiToDataList)); - final InstanceIdentifierContext outIIContext = new InstanceIdentifierContext<>( + final InstanceIdentifierContext outIIContext = new InstanceIdentifierContext( fullIIToData, pathContext.getSchemaNode(), pathContext.getMountPoint(), pathContext.getSchemaContext()); // FIXME: can result really be null? diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java index 81a1c17b26..8cb6ab0b11 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriter.java @@ -60,7 +60,7 @@ public class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrite final MediaType mediaType, final MultivaluedMap httpHeaders, final OutputStream entityStream) throws IOException, WebApplicationException { - final InstanceIdentifierContext pathContext = context.getInstanceIdentifierContext(); + final InstanceIdentifierContext pathContext = context.getInstanceIdentifierContext(); if (context.getData() == null) { return; } @@ -89,7 +89,7 @@ public class XmlNormalizedNodeBodyWriter extends AbstractNormalizedNodeBodyWrite } private static void writeNormalizedNode(final XMLStreamWriter xmlWriter, final SchemaPath path, - final InstanceIdentifierContext pathContext, final NormalizedNode data, final DepthParam depth, + final InstanceIdentifierContext pathContext, final NormalizedNode data, final DepthParam depth, final List> fields) throws IOException { final RestconfNormalizedNodeWriter nnWriter; final EffectiveModelContext schemaCtx = pathContext.getSchemaContext(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java index c994239cd5..3f12e5a3f6 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/AbstractPatchBodyReader.java @@ -25,7 +25,7 @@ abstract class AbstractPatchBodyReader extends AbstractIdentifierAwareJaxRsProvi } @Override - protected final PatchContext emptyBody(final InstanceIdentifierContext path) { + protected final PatchContext emptyBody(final InstanceIdentifierContext path) { return new PatchContext(path, null, null); } } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java index 8135e8d90d..c742886aef 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/JsonPatchBodyReader.java @@ -68,7 +68,7 @@ public class JsonPatchBodyReader extends AbstractPatchBodyReader { @SuppressWarnings("checkstyle:IllegalCatch") @Override - protected PatchContext readBody(final InstanceIdentifierContext path, final InputStream entityStream) + protected PatchContext readBody(final InstanceIdentifierContext path, final InputStream entityStream) throws WebApplicationException { try { return readFrom(path, entityStream); @@ -77,7 +77,7 @@ public class JsonPatchBodyReader extends AbstractPatchBodyReader { } } - private PatchContext readFrom(final InstanceIdentifierContext path, final InputStream entityStream) + private PatchContext readFrom(final InstanceIdentifierContext path, final InputStream entityStream) throws IOException { final JsonReader jsonReader = new JsonReader(new InputStreamReader(entityStream, StandardCharsets.UTF_8)); AtomicReference patchId = new AtomicReference<>(); @@ -113,7 +113,7 @@ public class JsonPatchBodyReader extends AbstractPatchBodyReader { ErrorTag.MALFORMED_MESSAGE, exception); } - private List read(final JsonReader in, final InstanceIdentifierContext path, + private List read(final JsonReader in, final InstanceIdentifierContext path, final AtomicReference patchId) throws IOException { final DataSchemaContextTree schemaTree = DataSchemaContextTree.from(path.getSchemaContext()); final List resultCollection = new ArrayList<>(); @@ -169,7 +169,7 @@ public class JsonPatchBodyReader extends AbstractPatchBodyReader { * @throws IOException if operation fails */ private void parseByName(final @NonNull String name, final @NonNull PatchEdit edit, - final @NonNull JsonReader in, final @NonNull InstanceIdentifierContext path, + final @NonNull JsonReader in, final @NonNull InstanceIdentifierContext path, final @NonNull DataSchemaContextTree schemaTree, final @NonNull List resultCollection, final @NonNull AtomicReference patchId) throws IOException { @@ -210,7 +210,7 @@ public class JsonPatchBodyReader extends AbstractPatchBodyReader { * @throws IOException if operation fails */ private void readEditDefinition(final @NonNull PatchEdit edit, final @NonNull JsonReader in, - final @NonNull InstanceIdentifierContext path, + final @NonNull InstanceIdentifierContext path, final @NonNull DataSchemaContextTree schemaTree) throws IOException { String deferredValue = null; in.beginObject(); @@ -369,7 +369,7 @@ public class JsonPatchBodyReader extends AbstractPatchBodyReader { * @return NormalizedNode representing data */ private static NormalizedNode readEditData(final @NonNull JsonReader in, - final @NonNull SchemaNode targetSchemaNode, final @NonNull InstanceIdentifierContext path) { + final @NonNull SchemaNode targetSchemaNode, final @NonNull InstanceIdentifierContext path) { final NormalizedNodeResult resultHolder = new NormalizedNodeResult(); final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder); JsonParserStream.create(writer, JSONCodecFactorySupplier.RFC7951.getShared(path.getSchemaContext()), diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java index 75b8bac83a..644fc45b43 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlPatchBodyReader.java @@ -70,7 +70,7 @@ public class XmlPatchBodyReader extends AbstractPatchBodyReader { @SuppressWarnings("checkstyle:IllegalCatch") @Override - protected PatchContext readBody(final InstanceIdentifierContext path, final InputStream entityStream) + protected PatchContext readBody(final InstanceIdentifierContext path, final InputStream entityStream) throws WebApplicationException { try { final Document doc = UntrustedXML.newDocumentBuilder().parse(entityStream); @@ -85,7 +85,7 @@ public class XmlPatchBodyReader extends AbstractPatchBodyReader { } } - private static PatchContext parse(final InstanceIdentifierContext pathContext, final Document doc) + private static PatchContext parse(final InstanceIdentifierContext pathContext, final Document doc) throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final List resultCollection = new ArrayList<>(); final String patchId = doc.getElementsByTagName("patch-id").item(0).getFirstChild().getNodeValue(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java index 730046988e..ebf2774966 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/spi/AbstractIdentifierAwareJaxRsProvider.java @@ -55,7 +55,7 @@ public abstract class AbstractIdentifierAwareJaxRsProvider implements Message final Annotation[] annotations, final MediaType mediaType, final MultivaluedMap httpHeaders, final InputStream entityStream) throws IOException, WebApplicationException { - final InstanceIdentifierContext path = getInstanceIdentifierContext(); + final InstanceIdentifierContext path = getInstanceIdentifierContext(); final PushbackInputStream pushbackInputStream = new PushbackInputStream(entityStream); @@ -75,17 +75,16 @@ public abstract class AbstractIdentifierAwareJaxRsProvider implements Message * @param path Request path * @return empty body type */ - protected abstract T emptyBody(InstanceIdentifierContext path); + protected abstract T emptyBody(InstanceIdentifierContext path); - protected abstract T readBody(InstanceIdentifierContext path, InputStream entityStream) + protected abstract T readBody(InstanceIdentifierContext path, InputStream entityStream) throws WebApplicationException; - private String getIdentifier() { return this.uriInfo.getPathParameters(false).getFirst("identifier"); } - private InstanceIdentifierContext getInstanceIdentifierContext() { + private InstanceIdentifierContext getInstanceIdentifierContext() { return ParserIdentifier.toInstanceIdentifier(getIdentifier(), getSchemaContext(), Optional.ofNullable(getMountPointService())); } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java index b7884d31a5..002360424b 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/legacy/NormalizedNodePayload.java @@ -22,47 +22,45 @@ import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; * messy details needed to deal with the payload. */ public final class NormalizedNodePayload { - private final InstanceIdentifierContext context; + private final InstanceIdentifierContext context; private final ImmutableMap headers; private final QueryParameters writerParameters; private final NormalizedNode data; - private NormalizedNodePayload(final InstanceIdentifierContext context, - final NormalizedNode data, final QueryParameters writerParameters, - final ImmutableMap headers) { + private NormalizedNodePayload(final InstanceIdentifierContext context, final NormalizedNode data, + final QueryParameters writerParameters, final ImmutableMap headers) { this.context = context; this.data = data; this.writerParameters = requireNonNull(writerParameters); this.headers = requireNonNull(headers); } - public static @NonNull NormalizedNodePayload empty(final InstanceIdentifierContext path) { + public static @NonNull NormalizedNodePayload empty(final InstanceIdentifierContext path) { return new NormalizedNodePayload(requireNonNull(path), null, QueryParameters.empty(), ImmutableMap.of()); } - public static @NonNull NormalizedNodePayload of(final InstanceIdentifierContext path, - final NormalizedNode data) { + public static @NonNull NormalizedNodePayload of(final InstanceIdentifierContext path, final NormalizedNode data) { return new NormalizedNodePayload(requireNonNull(path), requireNonNull(data), QueryParameters.empty(), ImmutableMap.of()); } - public static @NonNull NormalizedNodePayload ofNullable(final InstanceIdentifierContext path, + public static @NonNull NormalizedNodePayload ofNullable(final InstanceIdentifierContext path, final NormalizedNode data) { return data == null ? empty(path) : of(path, data); } - public static @NonNull NormalizedNodePayload ofLocation(final InstanceIdentifierContext path, + public static @NonNull NormalizedNodePayload ofLocation(final InstanceIdentifierContext path, final NodeIdentifier leafId, final URI location) { return new NormalizedNodePayload(requireNonNull(path), ImmutableNodes.leafNode(leafId, location.toString()), QueryParameters.empty(), ImmutableMap.of("Location", location)); } - public static Object ofReadData(final InstanceIdentifierContext path, final NormalizedNode data, + public static Object ofReadData(final InstanceIdentifierContext path, final NormalizedNode data, final QueryParameters parameters) { return new NormalizedNodePayload(requireNonNull(path), requireNonNull(data), parameters, ImmutableMap.of()); } - public InstanceIdentifierContext getInstanceIdentifierContext() { + public InstanceIdentifierContext getInstanceIdentifierContext() { return context; } 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 bfe5dda8b5..d557ca7b7a 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 @@ -134,7 +134,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { final ReadDataParams readParams = QueryParams.newReadDataParams(uriInfo); final EffectiveModelContext schemaContextRef = schemaContextHandler.get(); - final InstanceIdentifierContext instanceIdentifier = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext instanceIdentifier = ParserIdentifier.toInstanceIdentifier( identifier, schemaContextRef, Optional.of(mountPointService)); final DOMMountPoint mountPoint = instanceIdentifier.getMountPoint(); @@ -220,7 +220,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { final WriteDataParams params = QueryParams.newWriteDataParams(uriInfo); - final InstanceIdentifierContext iid = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iid = payload.getInstanceIdentifierContext(); validInputData(iid.getSchemaNode(), payload); validTopLevelNodeName(iid.getInstanceIdentifier(), payload); @@ -254,7 +254,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { @Override public Response deleteData(final String identifier) { - final InstanceIdentifierContext instanceIdentifier = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext instanceIdentifier = ParserIdentifier.toInstanceIdentifier( identifier, schemaContextHandler.get(), Optional.of(mountPointService)); final DOMMountPoint mountPoint = instanceIdentifier.getMountPoint(); @@ -280,7 +280,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { public Response patchData(final String identifier, final NormalizedNodePayload payload, final UriInfo uriInfo) { requireNonNull(payload); - final InstanceIdentifierContext iid = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iid = payload.getInstanceIdentifierContext(); validInputData(iid.getSchemaNode(), payload); validTopLevelNodeName(iid.getInstanceIdentifier(), payload); validateListKeysEqualityInPayloadAndUri(payload); @@ -317,7 +317,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { * @return {@link NormalizedNodePayload} wrapped in {@link Response} */ public Response invokeAction(final NormalizedNodePayload payload) { - final InstanceIdentifierContext context = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext context = payload.getInstanceIdentifierContext(); final YangInstanceIdentifier yangIIdContext = context.getInstanceIdentifier(); final NormalizedNode data = payload.getData(); @@ -356,7 +356,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { return Response.status(Status.OK) .entity(NormalizedNodePayload.ofNullable( - new InstanceIdentifierContext<>(yangIIdContext, resultNodeSchema, mountPoint, schemaContextRef), + new InstanceIdentifierContext(yangIIdContext, resultNodeSchema, mountPoint, schemaContextRef), resultData)) .build(); } @@ -468,7 +468,7 @@ public class RestconfDataServiceImpl implements RestconfDataService { */ @VisibleForTesting public static void validateListKeysEqualityInPayloadAndUri(final NormalizedNodePayload payload) { - final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); + final InstanceIdentifierContext iiWithData = payload.getInstanceIdentifierContext(); final PathArgument lastPathArgument = iiWithData.getInstanceIdentifier().getLastPathArgument(); final SchemaNode schemaNode = iiWithData.getSchemaNode(); final NormalizedNode data = payload.getData(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java index bbd2a731ba..c27c40edde 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfImpl.java @@ -51,7 +51,7 @@ public class RestconfImpl implements RestconfService { (LeafSchemaNode) ((ContainerSchemaNode) grouping.getDataChildByName(Restconf.QNAME)) .getDataChildByName(YANG_LIBRARY_VERSION); - return NormalizedNodePayload.of(new InstanceIdentifierContext<>( + return NormalizedNodePayload.of(new InstanceIdentifierContext( YangInstanceIdentifier.of(YANG_LIBRARY_VERSION), schemaNode, null, context), ImmutableNodes.leafNode(YANG_LIBRARY_VERSION, IetfYangLibrary.REVISION.toString())); } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java index 3d0e8aa9b8..b340007aed 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImpl.java @@ -46,7 +46,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -115,7 +114,7 @@ public class RestconfInvokeOperationsServiceImpl implements RestconfInvokeOperat if (resultData == null || ((ContainerNode) resultData).isEmpty()) { ar.resume(new WebApplicationException(Status.NO_CONTENT)); } else { - ar.resume(NormalizedNodePayload.of(new InstanceIdentifierContext<>(null, (RpcDefinition) schema, + ar.resume(NormalizedNodePayload.of(new InstanceIdentifierContext(null, schema, mountPoint, schemaContextRef), resultData)); } } diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java index cf9725ea2b..dfa708274b 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfOperationsServiceImpl.java @@ -73,7 +73,7 @@ public class RestconfOperationsServiceImpl implements RestconfOperationsService ErrorTag.INVALID_VALUE); } - final InstanceIdentifierContext mountPointIdentifier = ParserIdentifier.toInstanceIdentifier(identifier, + final InstanceIdentifierContext mountPointIdentifier = ParserIdentifier.toInstanceIdentifier(identifier, schemaContextHandler.get(), Optional.of(mountPointService)); final DOMMountPoint mountPoint = mountPointIdentifier.getMountPoint(); final var entry = OperationsResourceUtils.contextForModelContext(modelContext(mountPoint), mountPoint); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java index f141f6503a..0645e82794 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfStreamsSubscriptionServiceImpl.java @@ -31,7 +31,6 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,7 +94,7 @@ public class RestconfStreamsSubscriptionServiceImpl implements RestconfStreamsSu * @param schemaHandler Schema context handler. * @return InstanceIdentifier of Location leaf. */ - private static InstanceIdentifierContext prepareIIDSubsStreamOutput(final SchemaContextHandler schemaHandler) { + private static InstanceIdentifierContext prepareIIDSubsStreamOutput(final SchemaContextHandler schemaHandler) { final Optional module = schemaHandler.get().findModule(NOTIFI_QNAME.getModule()); checkState(module.isPresent()); final DataSchemaNode notify = module.get().dataChildByName(NOTIFI_QNAME); @@ -103,7 +102,7 @@ public class RestconfStreamsSubscriptionServiceImpl implements RestconfStreamsSu final DataSchemaNode location = ((ContainerSchemaNode) notify).dataChildByName(LOCATION_QNAME); checkState(location != null, "Missing location"); - return new InstanceIdentifierContext(LOCATION_PATH, location, null, schemaHandler.get()); + return new InstanceIdentifierContext(LOCATION_PATH, location, null, schemaHandler.get()); } /** diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java index cd5e8ce51c..fc066eb6fe 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtil.java @@ -148,7 +148,7 @@ public final class PostDataTransactionUtil { final RestconfTransaction transaction) { final YangInstanceIdentifier parent = path.getParent().getParent(); transaction.remove(parent); - final InstanceIdentifierContext instanceIdentifier = + final InstanceIdentifierContext instanceIdentifier = // FIXME: Point should be able to give us this method ParserIdentifier.toInstanceIdentifier(point.value(), schemaContext, Optional.empty()); int lastItemPosition = 0; diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java index c0f3e866af..6e688b3f6e 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PutDataTransactionUtil.java @@ -144,7 +144,7 @@ public final class PutDataTransactionUtil { final EffectiveModelContext schemaContext, final PointParam point, final NormalizedNodeContainer readList, final boolean before) { transaction.remove(path.getParent()); - final InstanceIdentifierContext instanceIdentifier = + final InstanceIdentifierContext instanceIdentifier = // FIXME: Point should be able to give us this method ParserIdentifier.toInstanceIdentifier(point.value(), schemaContext, Optional.empty()); int lastItemPosition = 0; diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java index 6972323725..552fc3462d 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslator.java @@ -42,7 +42,7 @@ public abstract class AbstractFieldsTranslator { * @param input input value of fields parameter * @return {@link List} of levels; each level contains {@link Set} of identifiers of type {@link T} */ - protected final @NonNull List> parseFields(final @NonNull InstanceIdentifierContext identifier, + protected final @NonNull List> parseFields(final @NonNull InstanceIdentifierContext identifier, final @NonNull FieldsParam input) { final DataSchemaContextNode startNode = DataSchemaContextNode.fromDataSchemaNode( (DataSchemaNode) identifier.getSchemaNode()); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java index 543791e6c3..ece8bc6365 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslator.java @@ -64,7 +64,7 @@ public final class NetconfFieldsTranslator extends AbstractFieldsTranslator translate( - final @NonNull InstanceIdentifierContext identifier, final @NonNull FieldsParam input) { + final @NonNull InstanceIdentifierContext identifier, final @NonNull FieldsParam input) { final List> levels = INSTANCE.parseFields(identifier, input); final List> mappedLevels = mapLevelsContentByIdentifiers(levels); return buildPaths(mappedLevels); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java index f6b6ad901a..4fc681c6c1 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java @@ -84,7 +84,7 @@ public final class ParserIdentifier { // // @NonNull InstanceIdentifierContext forUrl(identifier, schemaContexxt, mountPointService) // - public static InstanceIdentifierContext toInstanceIdentifier(final String identifier, + public static InstanceIdentifierContext toInstanceIdentifier(final String identifier, final EffectiveModelContext schemaContext, final Optional mountPointService) { if (identifier == null || !identifier.contains(RestconfConstants.MOUNT)) { return createIIdContext(schemaContext, identifier, null); @@ -115,11 +115,10 @@ public final class ParserIdentifier { * @return {@link InstanceIdentifierContext} * @throws RestconfDocumentedException if the path cannot be resolved */ - private static InstanceIdentifierContext createIIdContext(final EffectiveModelContext schemaContext, + private static InstanceIdentifierContext createIIdContext(final EffectiveModelContext schemaContext, final String url, final @Nullable DOMMountPoint mountPoint) { final YangInstanceIdentifier urlPath = IdentifierCodec.deserialize(url, schemaContext); - return new InstanceIdentifierContext<>(urlPath, getPathSchema(schemaContext, urlPath), mountPoint, - schemaContext); + return new InstanceIdentifierContext(urlPath, getPathSchema(schemaContext, urlPath), mountPoint, schemaContext); } private static SchemaNode getPathSchema(final EffectiveModelContext schemaContext, @@ -253,7 +252,7 @@ public final class ParserIdentifier { pathBuilder.append(current); } - final InstanceIdentifierContext point = toInstanceIdentifier(pathBuilder.toString(), schemaContext, + final InstanceIdentifierContext point = toInstanceIdentifier(pathBuilder.toString(), schemaContext, Optional.of(domMountPointService)); final String moduleName = validateAndGetModulName(componentIter); final Revision revision = validateAndGetRevision(componentIter); @@ -263,7 +262,7 @@ public final class ParserIdentifier { } } - public static YangInstanceIdentifier parserPatchTarget(final InstanceIdentifierContext context, + public static YangInstanceIdentifier parserPatchTarget(final InstanceIdentifierContext context, final String target) { final var schemaContext = context.getSchemaContext(); final var urlPath = context.getInstanceIdentifier(); diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java index 0ba136ac27..fd4af6f77b 100644 --- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java +++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslator.java @@ -47,7 +47,7 @@ public final class WriterFieldsTranslator extends AbstractFieldsTranslator> translate(final @NonNull InstanceIdentifierContext identifier, + public static @NonNull List> translate(final @NonNull InstanceIdentifierContext identifier, final @NonNull FieldsParam input) { return INSTANCE.parseFields(identifier, input); } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java index c1682dc7cc..dfdd73620e 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/TestRestconfUtils.java @@ -71,7 +71,7 @@ public final class TestRestconfUtils { @SuppressWarnings("checkstyle:IllegalCatch") public static NormalizedNodePayload loadNormalizedContextFromXmlFile(final String pathToInputFile, final String uri, final EffectiveModelContext schemaContext) { - final InstanceIdentifierContext iiContext = + final InstanceIdentifierContext iiContext = ParserIdentifier.toInstanceIdentifier(uri, schemaContext, Optional.empty()); final InputStream inputStream = TestRestconfUtils.class.getResourceAsStream(pathToInputFile); try { @@ -79,12 +79,12 @@ public final class TestRestconfUtils { final NormalizedNode nn = parse(iiContext, doc); return NormalizedNodePayload.of(iiContext, nn); } catch (final Exception e) { - LOG.error("Load xml file " + pathToInputFile + " fail.", e); + LOG.error("Load xml file {} fail.", pathToInputFile, e); } return null; } - private static NormalizedNode parse(final InstanceIdentifierContext iiContext, final Document doc) + private static NormalizedNode parse(final InstanceIdentifierContext iiContext, final Document doc) throws XMLStreamException, IOException, ParserConfigurationException, SAXException, URISyntaxException { final SchemaNode schemaNodeContext = iiContext.getSchemaNode(); DataSchemaNode schemaNode = null; diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java index 7d0b37d4d2..eb426c3076 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/XmlNormalizedNodeBodyWriterTest.java @@ -36,7 +36,7 @@ public class XmlNormalizedNodeBodyWriterTest { doReturn(SchemaPath.ROOT).when(schemaNode).getPath(); final NormalizedNodePayload nodePayload = NormalizedNodePayload.of( - new InstanceIdentifierContext<>(YangInstanceIdentifier.empty(), schemaNode, null, schemaContext), + new InstanceIdentifierContext(YangInstanceIdentifier.empty(), schemaNode, null, schemaContext), Builders.containerBuilder().withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)).build()); final ByteArrayOutputStream output = new ByteArrayOutputStream(); @@ -56,7 +56,7 @@ public class XmlNormalizedNodeBodyWriterTest { doReturn(SchemaPath.ROOT).when(schemaNode).getPath(); final NormalizedNodePayload nodePayload = NormalizedNodePayload.of( - new InstanceIdentifierContext<>(YangInstanceIdentifier.empty(), schemaNode, null, schemaContext), + new InstanceIdentifierContext(YangInstanceIdentifier.empty(), schemaNode, null, schemaContext), Builders.containerBuilder() .withNodeIdentifier(new NodeIdentifier(SchemaContext.NAME)) .withChild(Builders.containerBuilder() diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java index 927455d8a9..a4a7577538 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/CreateStreamUtilTest.java @@ -114,7 +114,7 @@ public class CreateStreamUtilTest { .withValue(o).build(); container.withChild(lfNode); - return NormalizedNodePayload.of(new InstanceIdentifierContext<>(null, rpcInputSchemaNode, null, schema), + return NormalizedNodePayload.of(new InstanceIdentifierContext(null, rpcInputSchemaNode, null, schema), container.build()); } } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java index f44a7161f7..ce2ab22c71 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/Netconf799Test.java @@ -77,7 +77,7 @@ public class Netconf799Test { final var schemaNode = loadAction(contextRef, RESET_QNAME, ACTION_YII).orElseThrow(); final var response = dataService.invokeAction(NormalizedNodePayload.of( - new InstanceIdentifierContext<>(ACTION_YII, schemaNode, null, contextRef), + new InstanceIdentifierContext(ACTION_YII, schemaNode, null, contextRef), Builders.containerBuilder() .withNodeIdentifier(NodeIdentifier.create(INPUT_QNAME)) .withChild(ImmutableNodes.leafNode(DELAY_QNAME, Uint32.TEN)) 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 fde8e70ac7..84a142ab3b 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 @@ -82,7 +82,6 @@ import org.opendaylight.yangtools.yang.data.util.DataSchemaContextTree; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @RunWith(MockitoJUnitRunner.StrictStubs.class) @@ -349,8 +348,8 @@ public class RestconfDataServiceImplTest { @Test public void testPutData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidBase, schemaNode, null, contextRef); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidBase, schemaNode, null, contextRef); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(immediateTrueFluentFuture()).when(read) @@ -363,8 +362,8 @@ public class RestconfDataServiceImplTest { @Test public void testPutDataWithMountPoint() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidBase, schemaNode, mountPoint, contextRef); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidBase, schemaNode, mountPoint, contextRef); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(immediateTrueFluentFuture()).when(read) @@ -383,8 +382,8 @@ public class RestconfDataServiceImplTest { NodeIdentifierWithPredicates.of(listQname, listKeyQname, "name of band"); doReturn(new MultivaluedHashMap()).when(uriInfo).getQueryParameters(); - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidBase, null, null, contextRef); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidBase, null, null, contextRef); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, Builders.mapBuilder() .withNodeIdentifier(new NodeIdentifier(listQname)) .withChild(Builders.mapEntryBuilder() @@ -433,8 +432,8 @@ public class RestconfDataServiceImplTest { @Test public void testPatchData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidBase, schemaNode, null, contextRef); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidBase, schemaNode, null, contextRef); final List entity = new ArrayList<>(); final YangInstanceIdentifier iidleaf = YangInstanceIdentifier.builder(iidBase) .node(containerPlayerQname) @@ -458,7 +457,7 @@ public class RestconfDataServiceImplTest { @Test public void testPatchDataMountPoint() throws Exception { - final InstanceIdentifierContext iidContext = new InstanceIdentifierContext<>( + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext( iidBase, schemaNode, mountPoint, contextRef); final List entity = new ArrayList<>(); final YangInstanceIdentifier iidleaf = YangInstanceIdentifier.builder(iidBase) @@ -483,8 +482,8 @@ public class RestconfDataServiceImplTest { @Test public void testPatchDataDeleteNotExist() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidBase, schemaNode, null, contextRef); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidBase, schemaNode, null, contextRef); final List entity = new ArrayList<>(); final YangInstanceIdentifier iidleaf = YangInstanceIdentifier.builder(iidBase) .node(containerPlayerQname) diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java index 57b2c2efe0..93996cd7b6 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/services/impl/RestconfInvokeOperationsServiceImplTest.java @@ -175,7 +175,7 @@ public class RestconfInvokeOperationsServiceImplTest { } private NormalizedNodePayload prepNNC(final NormalizedNode result) { - final InstanceIdentifierContext context = mock(InstanceIdentifierContext.class); + final InstanceIdentifierContext context = mock(InstanceIdentifierContext.class); final RpcDefinition schemaNode = mock(RpcDefinition.class); final QName qname = QName.create("invoke:rpc:module", "2013-12-03", "rpcTest"); doReturn(qname).when(schemaNode).getQName(); 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 163f834c9a..130766c1a0 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 @@ -44,7 +44,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class DeleteDataTransactionUtilTest { @Mock - private InstanceIdentifierContext context; + private InstanceIdentifierContext context; @Mock private DOMDataTreeReadWriteTransaction readWrite; @Mock @@ -54,14 +54,14 @@ public class DeleteDataTransactionUtilTest { @Before public void init() { - doReturn(CommitInfo.emptyFluentFuture()).when(this.readWrite).commit(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).commit(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).discardChanges(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).unlock(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).lock(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService) + doReturn(CommitInfo.emptyFluentFuture()).when(readWrite).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).discardChanges(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).unlock(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).lock(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) .delete(LogicalDatastoreType.CONFIGURATION, YangInstanceIdentifier.empty()); - doReturn(YangInstanceIdentifier.empty()).when(this.context).getInstanceIdentifier(); + doReturn(YangInstanceIdentifier.empty()).when(context).getInstanceIdentifier(); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); } @@ -92,7 +92,7 @@ public class DeleteDataTransactionUtilTest { ret.setException(new TransactionCommitFailedException( String.format("Commit of transaction %s failed", this), exception)); - doReturn(ret).when(this.netconfService).commit(); + doReturn(ret).when(netconfService).commit(); // test and assert error deleteFail(new MdsalRestconfStrategy(mockDataBroker)); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java index 0b7ed3e2a3..6ff6088535 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PatchDataTransactionUtilTest.java @@ -61,7 +61,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; @RunWith(MockitoJUnitRunner.StrictStubs.class) @@ -85,7 +84,7 @@ public class PatchDataTransactionUtilTest { @Before public void setUp() throws Exception { - this.refSchemaCtx = YangParserTestUtils.parseYangFiles( + refSchemaCtx = YangParserTestUtils.parseYangFiles( TestRestconfUtils.loadFiles(PATH_FOR_NEW_SCHEMA_CONTEXT)); final QName baseQName = QName.create("http://example.com/ns/example-jukebox", "2015-04-04", "jukebox"); final QName containerPlayerQName = QName.create(baseQName, "player"); @@ -97,13 +96,13 @@ public class PatchDataTransactionUtilTest { "name of artist"); /* instance identifier for accessing container node "player" */ - this.instanceIdContainer = YangInstanceIdentifier.builder() + instanceIdContainer = YangInstanceIdentifier.builder() .node(baseQName) .node(containerPlayerQName) .build(); /* instance identifier for accessing leaf node "gap" */ - this.instanceIdCreateAndDelete = instanceIdContainer.node(leafGapQName); + instanceIdCreateAndDelete = instanceIdContainer.node(leafGapQName); /* values that are used for creating leaf for testPatchDataCreateAndDelete test */ final LeafNode buildGapLeaf = Builders.leafBuilder() @@ -116,18 +115,18 @@ public class PatchDataTransactionUtilTest { .withChild(buildGapLeaf) .build(); - this.buildBaseContainerForTests = Builders.containerBuilder() + buildBaseContainerForTests = Builders.containerBuilder() .withNodeIdentifier(new NodeIdentifier(baseQName)) .withChild(buildPlayerContainer) .build(); - this.targetNodeForCreateAndDelete = YangInstanceIdentifier.builder(this.instanceIdCreateAndDelete) + targetNodeForCreateAndDelete = YangInstanceIdentifier.builder(instanceIdCreateAndDelete) .node(containerPlayerQName) .node(leafGapQName) .build(); /* instance identifier for accessing leaf node "name" in list "artist" */ - this.instanceIdMerge = YangInstanceIdentifier.builder() + instanceIdMerge = YangInstanceIdentifier.builder() .node(baseQName) .node(containerLibraryQName) .node(listArtistQName) @@ -152,12 +151,12 @@ public class PatchDataTransactionUtilTest { .withChild(contentDescription) .build(); - this.buildArtistList = Builders.mapBuilder() + buildArtistList = Builders.mapBuilder() .withNodeIdentifier(new YangInstanceIdentifier.NodeIdentifier(listArtistQName)) .withChild(mapEntryNode) .build(); - this.targetNodeMerge = YangInstanceIdentifier.builder() + targetNodeMerge = YangInstanceIdentifier.builder() .node(baseQName) .node(containerLibraryQName) .node(listArtistQName) @@ -165,35 +164,35 @@ public class PatchDataTransactionUtilTest { .build(); /* Mocks */ - doReturn(this.rwTransaction).when(this.mockDataBroker).newReadWriteTransaction(); - doReturn(CommitInfo.emptyFluentFuture()).when(this.rwTransaction).commit(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).commit(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).discardChanges(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).unlock(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).lock(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).merge(any(), any(), + doReturn(rwTransaction).when(mockDataBroker).newReadWriteTransaction(); + doReturn(CommitInfo.emptyFluentFuture()).when(rwTransaction).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).discardChanges(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).unlock(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).lock(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).merge(any(), any(), any(), any()); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService).replace(any(), any(), + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService).replace(any(), any(), any(), any()); } @Test public void testPatchDataReplaceMergeAndRemove() { final PatchEntity entityReplace = - new PatchEntity("edit1", REPLACE, this.targetNodeMerge, this.buildArtistList); - final PatchEntity entityMerge = new PatchEntity("edit2", MERGE, this.targetNodeMerge, this.buildArtistList); - final PatchEntity entityRemove = new PatchEntity("edit3", REMOVE, this.targetNodeMerge); + new PatchEntity("edit1", REPLACE, targetNodeMerge, buildArtistList); + final PatchEntity entityMerge = new PatchEntity("edit2", MERGE, targetNodeMerge, buildArtistList); + final PatchEntity entityRemove = new PatchEntity("edit3", REMOVE, targetNodeMerge); final List entities = new ArrayList<>(); entities.add(entityReplace); entities.add(entityMerge); entities.add(entityRemove); - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.instanceIdMerge, null, null, this.refSchemaCtx); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(instanceIdMerge, null, null, refSchemaCtx); final PatchContext patchContext = new PatchContext(iidContext, entities, "patchRMRm"); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService) + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) .remove(LogicalDatastoreType.CONFIGURATION, targetNodeMerge); patch(patchContext, new MdsalRestconfStrategy(mockDataBroker), false); @@ -202,27 +201,27 @@ public class PatchDataTransactionUtilTest { @Test public void testPatchDataCreateAndDelete() { - doReturn(immediateFalseFluentFuture()).when(this.rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, - this.instanceIdContainer); - doReturn(immediateTrueFluentFuture()).when(this.rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, - this.targetNodeForCreateAndDelete); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService) - .create(LogicalDatastoreType.CONFIGURATION, this.instanceIdContainer, this.buildBaseContainerForTests, + doReturn(immediateFalseFluentFuture()).when(rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, + instanceIdContainer); + doReturn(immediateTrueFluentFuture()).when(rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, + targetNodeForCreateAndDelete); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) + .create(LogicalDatastoreType.CONFIGURATION, instanceIdContainer, buildBaseContainerForTests, Optional.empty()); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService) - .delete(LogicalDatastoreType.CONFIGURATION, this.targetNodeForCreateAndDelete); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) + .delete(LogicalDatastoreType.CONFIGURATION, targetNodeForCreateAndDelete); final PatchEntity entityCreate = - new PatchEntity("edit1", CREATE, this.instanceIdContainer, this.buildBaseContainerForTests); + new PatchEntity("edit1", CREATE, instanceIdContainer, buildBaseContainerForTests); final PatchEntity entityDelete = - new PatchEntity("edit2", DELETE, this.targetNodeForCreateAndDelete); + new PatchEntity("edit2", DELETE, targetNodeForCreateAndDelete); final List entities = new ArrayList<>(); entities.add(entityCreate); entities.add(entityDelete); - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.instanceIdCreateAndDelete, null, null, this.refSchemaCtx); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(instanceIdCreateAndDelete, null, null, refSchemaCtx); final PatchContext patchContext = new PatchContext(iidContext, entities, "patchCD"); patch(patchContext, new MdsalRestconfStrategy(mockDataBroker), true); patch(patchContext, new NetconfRestconfStrategy(netconfService), true); @@ -230,25 +229,25 @@ public class PatchDataTransactionUtilTest { @Test public void deleteNonexistentDataTest() { - doReturn(immediateFalseFluentFuture()).when(this.rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, - this.targetNodeForCreateAndDelete); + doReturn(immediateFalseFluentFuture()).when(rwTransaction).exists(LogicalDatastoreType.CONFIGURATION, + targetNodeForCreateAndDelete); final NetconfDocumentedException exception = new NetconfDocumentedException("id", ErrorType.RPC, ErrorTag.DATA_MISSING, ErrorSeverity.ERROR); final SettableFuture ret = SettableFuture.create(); ret.setException(new TransactionCommitFailedException( String.format("Commit of transaction %s failed", this), exception)); - doReturn(ret).when(this.netconfService).commit(); - doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(this.netconfService) - .delete(LogicalDatastoreType.CONFIGURATION, this.targetNodeForCreateAndDelete); + doReturn(ret).when(netconfService).commit(); + doReturn(Futures.immediateFuture(new DefaultDOMRpcResult())).when(netconfService) + .delete(LogicalDatastoreType.CONFIGURATION, targetNodeForCreateAndDelete); - final PatchEntity entityDelete = new PatchEntity("edit", DELETE, this.targetNodeForCreateAndDelete); + final PatchEntity entityDelete = new PatchEntity("edit", DELETE, targetNodeForCreateAndDelete); final List entities = new ArrayList<>(); entities.add(entityDelete); - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.instanceIdCreateAndDelete, null, null, this.refSchemaCtx); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(instanceIdCreateAndDelete, null, null, refSchemaCtx); final PatchContext patchContext = new PatchContext(iidContext, entities, "patchD"); deleteMdsal(patchContext, new MdsalRestconfStrategy(mockDataBroker)); deleteNetconf(patchContext, new NetconfRestconfStrategy(netconfService)); @@ -257,13 +256,13 @@ public class PatchDataTransactionUtilTest { @Test public void testPatchMergePutContainer() { final PatchEntity entityMerge = - new PatchEntity("edit1", MERGE, this.instanceIdContainer, this.buildBaseContainerForTests); + new PatchEntity("edit1", MERGE, instanceIdContainer, buildBaseContainerForTests); final List entities = new ArrayList<>(); entities.add(entityMerge); - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(this.instanceIdCreateAndDelete, null, null, this.refSchemaCtx); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(instanceIdCreateAndDelete, null, null, refSchemaCtx); final PatchContext patchContext = new PatchContext(iidContext, entities, "patchM"); patch(patchContext, new MdsalRestconfStrategy(mockDataBroker), false); patch(patchContext, new NetconfRestconfStrategy(netconfService), false); @@ -272,7 +271,7 @@ public class PatchDataTransactionUtilTest { private void patch(final PatchContext patchContext, final RestconfStrategy strategy, final boolean failed) { final PatchStatusContext patchStatusContext = - PatchDataTransactionUtil.patchData(patchContext, strategy, this.refSchemaCtx); + PatchDataTransactionUtil.patchData(patchContext, strategy, refSchemaCtx); for (final PatchStatusEntity entity : patchStatusContext.getEditCollection()) { if (failed) { assertTrue("Edit " + entity.getEditId() + " failed", entity.isOk()); @@ -285,7 +284,7 @@ public class PatchDataTransactionUtilTest { private void deleteMdsal(final PatchContext patchContext, final RestconfStrategy strategy) { final PatchStatusContext patchStatusContext = - PatchDataTransactionUtil.patchData(patchContext, strategy, this.refSchemaCtx); + PatchDataTransactionUtil.patchData(patchContext, strategy, refSchemaCtx); assertFalse(patchStatusContext.isOk()); assertEquals(ErrorType.PROTOCOL, @@ -296,7 +295,7 @@ public class PatchDataTransactionUtilTest { private void deleteNetconf(final PatchContext patchContext, final RestconfStrategy strategy) { final PatchStatusContext patchStatusContext = - PatchDataTransactionUtil.patchData(patchContext, strategy, this.refSchemaCtx); + PatchDataTransactionUtil.patchData(patchContext, strategy, refSchemaCtx); assertFalse(patchStatusContext.isOk()); assertEquals(ErrorType.PROTOCOL, diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java index 3caf92fe32..a4d4f29680 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PlainPatchDataTransactionUtilTest.java @@ -157,8 +157,8 @@ public class PlainPatchDataTransactionUtilTest { @Test public void testPatchContainerData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidJukebox, schemaNodeForJukebox, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidJukebox, schemaNodeForJukebox, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, jukeboxContainerWithPlayer); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); @@ -179,8 +179,8 @@ public class PlainPatchDataTransactionUtilTest { @Test public void testPatchLeafData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidGap, schemaNodeForGap, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidGap, schemaNodeForGap, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, leafGap); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); @@ -202,8 +202,8 @@ public class PlainPatchDataTransactionUtilTest { @Test public void testPatchListData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidJukebox, schemaNodeForJukebox, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iidJukebox, schemaNodeForJukebox, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, jukeboxContainerWithPlaylist); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java index 4f67b760da..836316e311 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/PostDataTransactionUtilTest.java @@ -54,7 +54,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; import org.w3c.dom.DOMException; @@ -137,8 +136,8 @@ public class PostDataTransactionUtilTest { @Test public void testPostContainerData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, null, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, null, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, iid2); @@ -165,8 +164,7 @@ public class PostDataTransactionUtilTest { @Test public void testPostListData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iidList, null, null, schema); + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext(iidList, null, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildList); final MapNode data = (MapNode) payload.getData(); @@ -201,8 +199,7 @@ public class PostDataTransactionUtilTest { @Test public void testPostDataFail() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, null, null, schema); + final InstanceIdentifierContext iidContext = new InstanceIdentifierContext(iid2, null, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(immediateFalseFluentFuture()).when(readWrite).exists(LogicalDatastoreType.CONFIGURATION, 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 93ff49ef55..7b2f84907d 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 @@ -171,21 +171,21 @@ public class PutDataTransactionUtilTest { @Test public void testValidInputData() { RestconfDataServiceImpl.validInputData(schemaNode, NormalizedNodePayload.of( - new InstanceIdentifierContext<>(iid, schemaNode, null, schema), buildLeaf)); + new InstanceIdentifierContext(iid, schemaNode, null, schema), buildLeaf)); } @Test public void testValidTopLevelNodeName() { RestconfDataServiceImpl.validTopLevelNodeName(iid, NormalizedNodePayload.of( - new InstanceIdentifierContext<>(iid, schemaNode, null, schema), buildLeaf)); + new InstanceIdentifierContext(iid, schemaNode, null, schema), buildLeaf)); RestconfDataServiceImpl.validTopLevelNodeName(iid2, NormalizedNodePayload.of( - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema), buildBaseCont)); + new InstanceIdentifierContext(iid2, schemaNode2, null, schema), buildBaseCont)); } @Test public void testValidTopLevelNodeNamePathEmpty() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid, schemaNode, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid, schemaNode, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf); // FIXME: more asserts @@ -195,8 +195,8 @@ public class PutDataTransactionUtilTest { @Test public void testValidTopLevelNodeNameWrongTopIdentifier() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid, schemaNode, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid, schemaNode, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf); // FIXME: more asserts @@ -206,16 +206,16 @@ public class PutDataTransactionUtilTest { @Test public void testValidateListKeysEqualityInPayloadAndUri() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid3, schemaNode3, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid3, schemaNode3, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildListEntry); RestconfDataServiceImpl.validateListKeysEqualityInPayloadAndUri(payload); } @Test public void testPutContainerData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, schemaNode2, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); @@ -232,8 +232,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutCreateContainerData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, schemaNode2, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(iid2); @@ -250,8 +250,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutReplaceContainerData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, schemaNode2, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseCont); doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(netconfService).getConfig(iid2); @@ -267,8 +267,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutLeafData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid, schemaNode, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid, schemaNode, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); @@ -285,8 +285,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutCreateLeafData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid, schemaNode, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid, schemaNode, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf); doReturn(immediateFluentFuture(Optional.empty())).when(netconfService).getConfig(iid); @@ -302,8 +302,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutReplaceLeafData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid, schemaNode, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid, schemaNode, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildLeaf); doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(netconfService).getConfig(iid); @@ -319,8 +319,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutListData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, schemaNode2, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseContWithList); doReturn(readWrite).when(mockDataBroker).newReadWriteTransaction(); @@ -337,8 +337,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutCreateListData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, schemaNode2, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseContWithList); doReturn(immediateFluentFuture(Optional.empty())).when(netconfService) @@ -356,8 +356,8 @@ public class PutDataTransactionUtilTest { @Test public void testPutReplaceListData() { - final InstanceIdentifierContext iidContext = - new InstanceIdentifierContext<>(iid2, schemaNode2, null, schema); + final InstanceIdentifierContext iidContext = + new InstanceIdentifierContext(iid2, schemaNode2, null, schema); final NormalizedNodePayload payload = NormalizedNodePayload.of(iidContext, buildBaseContWithList); doReturn(immediateFluentFuture(Optional.of(mock(NormalizedNode.class)))).when(netconfService) diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java index a4142f1feb..3c4d71843d 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/rests/utils/ReadDataTransactionUtilTest.java @@ -40,7 +40,6 @@ import org.opendaylight.yangtools.yang.data.api.schema.MapNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.api.schema.UnkeyedListNode; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; -import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; @RunWith(MockitoJUnitRunner.StrictStubs.class) @@ -54,7 +53,7 @@ public class ReadDataTransactionUtilTest { @Mock private NetconfDataTreeService netconfService; @Mock - private InstanceIdentifierContext context; + private InstanceIdentifierContext context; @Mock private DOMDataTreeReadTransaction read; @Mock diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java index 8d92176934..669a8a6252 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/AbstractFieldsTranslatorTest.java @@ -40,10 +40,10 @@ import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils; public abstract class AbstractFieldsTranslatorTest { @Mock - private InstanceIdentifierContext identifierJukebox; + private InstanceIdentifierContext identifierJukebox; @Mock - private InstanceIdentifierContext identifierTestServices; + private InstanceIdentifierContext identifierTestServices; private static final QNameModule Q_NAME_MODULE_JUKEBOX = QNameModule.create( XMLNamespace.of("http://example.com/ns/example-jukebox"), Revision.of("2015-04-04")); @@ -208,7 +208,7 @@ public abstract class AbstractFieldsTranslatorTest { when(containerNextData.dataChildByName(NEXT_SERVICE_Q_NAME)).thenReturn(leafNextService); } - protected abstract List translateFields(InstanceIdentifierContext context, FieldsParam fields); + protected abstract List translateFields(InstanceIdentifierContext context, FieldsParam fields); /** * Test parse fields parameter containing only one child selected. diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java index 18bcdc5da9..cbea2c49ea 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/NetconfFieldsTranslatorTest.java @@ -28,7 +28,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent @RunWith(MockitoJUnitRunner.class) public class NetconfFieldsTranslatorTest extends AbstractFieldsTranslatorTest { @Override - protected List translateFields(final InstanceIdentifierContext context, + protected List translateFields(final InstanceIdentifierContext context, final FieldsParam fields) { return NetconfFieldsTranslator.translate(context, fields); } 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 1c4f8fec60..9282106d4f 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 @@ -121,7 +121,7 @@ public class ParserIdentifierTest { @Before public void setup() throws Exception { - this.mountPointService = new DOMMountPointServiceImpl(); + mountPointService = new DOMMountPointServiceImpl(); // create and register mount point final YangInstanceIdentifier mountPointId = YangInstanceIdentifier.builder() @@ -135,8 +135,8 @@ public class ParserIdentifierTest { .getInstance(); // register mount point with null schema context - when(this.mockMountPointService.getMountPoint(YangInstanceIdentifier.empty())) - .thenReturn(Optional.of(this.mockMountPoint)); + when(mockMountPointService.getMountPoint(YangInstanceIdentifier.empty())) + .thenReturn(Optional.of(mockMountPoint)); } /** @@ -149,7 +149,7 @@ public class ParserIdentifierTest { */ @Test public void toInstanceIdentifierTest() { - final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( TEST_IDENT, SCHEMA_CONTEXT, Optional.empty()); assertEquals("Returned not expected identifier", @@ -162,7 +162,7 @@ public class ParserIdentifierTest { */ @Test public void toInstanceIdentifierOtherModulesTest() { - final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( TEST_IDENT_OTHERS, SCHEMA_CONTEXT, Optional.empty()); assertEquals("Returned not expected identifier", @@ -175,14 +175,14 @@ public class ParserIdentifierTest { */ @Test public void toInstanceIdentifierMountPointTest() { - final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( - MOUNT_POINT_IDENT + "/" + TEST_IDENT, SCHEMA_CONTEXT, Optional.of(this.mountPointService)); + final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( + MOUNT_POINT_IDENT + "/" + TEST_IDENT, SCHEMA_CONTEXT, Optional.of(mountPointService)); assertEquals("Returned not expected identifier", TEST_IDENT_RESULT.toString(), context.getInstanceIdentifier().toString()); assertEquals("Mount point not found", - this.mountPoint, context.getMountPoint()); + mountPoint, context.getMountPoint()); assertEquals("Schema context from mount point expected", SCHEMA_CONTEXT_ON_MOUNT_POINT, context.getSchemaContext()); @@ -194,7 +194,7 @@ public class ParserIdentifierTest { */ @Test public void toInstanceIdentifierNullIdentifierTest() { - final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( null, SCHEMA_CONTEXT, Optional.empty()); assertEquals("Returned not expected identifier", YangInstanceIdentifier.empty(), context.getInstanceIdentifier()); @@ -215,7 +215,7 @@ public class ParserIdentifierTest { */ @Test public void toInstanceIdentifierEmptyIdentifierTest() { - final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext context = ParserIdentifier.toInstanceIdentifier( "", SCHEMA_CONTEXT, Optional.empty()); assertEquals("Returned not expected identifier", YangInstanceIdentifier.empty(), context.getInstanceIdentifier()); @@ -238,7 +238,7 @@ public class ParserIdentifierTest { public void toInstanceIdentifierMountPointInvalidIdentifierNegativeTest() { RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, () -> ParserIdentifier.toInstanceIdentifier(INVALID_MOUNT_POINT_IDENT, SCHEMA_CONTEXT, - Optional.of(this.mountPointService))); + Optional.of(mountPointService))); } /** @@ -250,7 +250,7 @@ public class ParserIdentifierTest { public void toInstanceIdentifierMissingMountPointNegativeTest() { RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, () -> ParserIdentifier.toInstanceIdentifier("/yang-ext:mount", SCHEMA_CONTEXT, - Optional.of(this.mountPointService))); + Optional.of(mountPointService))); final List errors = ex.getErrors(); assertEquals(1, errors.size()); assertEquals("Not expected error type", ErrorType.PROTOCOL, errors.get(0).getErrorType()); @@ -464,7 +464,7 @@ public class ParserIdentifierTest { final SchemaExportContext exportContext = ParserIdentifier.toSchemaExportContextFromIdentifier( SCHEMA_CONTEXT, MOUNT_POINT_IDENT + "/" + TEST_MODULE_NAME + "/" + TEST_MODULE_REVISION, - this.mountPointService, sourceProvider); + mountPointService, sourceProvider); final Module module = exportContext.getModule(); assertNotNull("Export context should contains test module", module); @@ -486,7 +486,7 @@ public class ParserIdentifierTest { final SchemaExportContext exportContext = ParserIdentifier.toSchemaExportContextFromIdentifier( SCHEMA_CONTEXT, MOUNT_POINT_IDENT + "/" + "not-existing-module" + "/" + "2016-01-01", - this.mountPointService, sourceProvider); + mountPointService, sourceProvider); assertNotNull("Export context should be parsed", exportContext); assertNull("Not-existing module should be null", exportContext.getModule()); @@ -501,7 +501,7 @@ public class ParserIdentifierTest { public void toSchemaExportContextFromIdentifierMountPointInvalidIdentifierNegativeTest() { RestconfDocumentedException ex = assertThrows(RestconfDocumentedException.class, () -> ParserIdentifier.toSchemaExportContextFromIdentifier(SCHEMA_CONTEXT, - MOUNT_POINT_IDENT + "/" + TEST_MODULE_REVISION + "/" + TEST_MODULE_NAME, this.mountPointService, + MOUNT_POINT_IDENT + "/" + TEST_MODULE_REVISION + "/" + TEST_MODULE_NAME, mountPointService, sourceProvider)); assertEquals("Not expected error type", ErrorType.PROTOCOL, ex.getErrors().get(0).getErrorType()); @@ -537,7 +537,7 @@ public class ParserIdentifierTest { @Test public void toSchemaExportContextFromIdentifierMountPointNullSchemaContextNegativeTest() { assertThrows(NullPointerException.class, () -> ParserIdentifier.toSchemaExportContextFromIdentifier(null, - MOUNT_POINT_IDENT + "/" + TEST_MODULE_NAME + "/" + TEST_MODULE_REVISION, this.mountPointService, + MOUNT_POINT_IDENT + "/" + TEST_MODULE_NAME + "/" + TEST_MODULE_REVISION, mountPointService, sourceProvider)); } @@ -557,7 +557,7 @@ public class ParserIdentifierTest { public void toSchemaExportContextFromIdentifierNullSchemaContextBehindMountPointNegativeTest() { assertThrows(IllegalStateException.class, () -> ParserIdentifier.toSchemaExportContextFromIdentifier( SCHEMA_CONTEXT, "/yang-ext:mount/" + TEST_MODULE_NAME + "/" + TEST_MODULE_REVISION, - this.mockMountPointService, sourceProvider)); + mockMountPointService, sourceProvider)); } /** @@ -568,7 +568,7 @@ public class ParserIdentifierTest { */ @Test public void invokeRpcTest() { - final InstanceIdentifierContext result = ParserIdentifier.toInstanceIdentifier( + final InstanceIdentifierContext result = ParserIdentifier.toInstanceIdentifier( INVOKE_RPC, SCHEMA_CONTEXT, Optional.empty()); // RPC schema node @@ -590,8 +590,8 @@ public class ParserIdentifierTest { */ @Test public void invokeRpcOnMountPointTest() { - final InstanceIdentifierContext result = ParserIdentifier.toInstanceIdentifier( - MOUNT_POINT_IDENT + "/" + INVOKE_RPC, SCHEMA_CONTEXT, Optional.of(this.mountPointService)); + final InstanceIdentifierContext result = ParserIdentifier.toInstanceIdentifier( + MOUNT_POINT_IDENT + "/" + INVOKE_RPC, SCHEMA_CONTEXT, Optional.of(mountPointService)); // RPC schema node final QName rpcQName = result.getSchemaNode().getQName(); @@ -600,7 +600,7 @@ public class ParserIdentifierTest { // other fields assertEquals(IdentifierCodec.deserialize(INVOKE_RPC, SCHEMA_CONTEXT), result.getInstanceIdentifier()); - assertEquals(this.mountPoint, result.getMountPoint()); + assertEquals(mountPoint, result.getMountPoint()); assertEquals(SCHEMA_CONTEXT_ON_MOUNT_POINT, result.getSchemaContext()); } @@ -610,7 +610,7 @@ public class ParserIdentifierTest { */ @Test public void invokeActionTest() { - final InstanceIdentifierContext result = ParserIdentifier + final InstanceIdentifierContext result = ParserIdentifier .toInstanceIdentifier(INVOKE_ACTION, SCHEMA_CONTEXT, Optional.empty()); // Action schema node @@ -630,9 +630,9 @@ public class ParserIdentifierTest { */ @Test public void invokeActionOnMountPointTest() { - final InstanceIdentifierContext result = ParserIdentifier + final InstanceIdentifierContext result = ParserIdentifier .toInstanceIdentifier(MOUNT_POINT_IDENT + "/" + INVOKE_ACTION, SCHEMA_CONTEXT, - Optional.of(this.mountPointService)); + Optional.of(mountPointService)); // Action schema node final QName actionQName = result.getSchemaNode().getQName(); @@ -641,7 +641,7 @@ public class ParserIdentifierTest { // other fields assertEquals(IdentifierCodec.deserialize(INVOKE_ACTION, SCHEMA_CONTEXT), result.getInstanceIdentifier()); - assertEquals(this.mountPoint, result.getMountPoint()); + assertEquals(mountPoint, result.getMountPoint()); assertEquals(SCHEMA_CONTEXT_ON_MOUNT_POINT, result.getSchemaContext()); } } diff --git a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java index 76e1355927..d809bedab7 100644 --- a/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java +++ b/restconf/restconf-nb-rfc8040/src/test/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/WriterFieldsTranslatorTest.java @@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.common.QName; @RunWith(MockitoJUnitRunner.class) public class WriterFieldsTranslatorTest extends AbstractFieldsTranslatorTest> { @Override - protected List> translateFields(final InstanceIdentifierContext context, final FieldsParam fields) { + protected List> translateFields(final InstanceIdentifierContext context, final FieldsParam fields) { return WriterFieldsTranslator.translate(context, fields); } -- 2.36.6