From 9a42076866ac48394163722b6ca95821a6cce876 Mon Sep 17 00:00:00 2001 From: "matus.matok" Date: Tue, 8 Aug 2023 12:06:36 +0200 Subject: [PATCH 1/1] Move NetconfMessage into netconf.api.messages Moved NetconfMessage into netconf.api.messages in order to prepare it for future changes related to NetconfMessage. JIRA: NETCONF-1014 Change-Id: I72e59385555a9c4e3b41669cb8bb8ae8f3505126 Signed-off-by: matus.matok --- .../netconf/callhome/mount/CallHomeMountSessionContext.java | 2 +- .../netconf/callhome/mount/CallHomeMountSessionContextTest.java | 2 +- .../opendaylight/netconf/nettyutil/AbstractNetconfSession.java | 2 +- .../netconf/nettyutil/AbstractNetconfSessionNegotiator.java | 2 +- .../netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java | 2 +- .../nettyutil/handler/NetconfHelloMessageToXMLEncoder.java | 2 +- .../netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java | 2 +- .../netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java | 2 +- .../nettyutil/handler/NetconfXMLToHelloMessageDecoder.java | 2 +- .../netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java | 2 +- .../netconf/nettyutil/handler/exi/NetconfStartExiMessage.java | 2 +- .../netconf/nettyutil/AbstractNetconfSessionTest.java | 2 +- .../opendaylight/netconf/nettyutil/TestingNetconfSession.java | 2 +- .../netconf/nettyutil/handler/NetconfEXIHandlersTest.java | 2 +- .../nettyutil/handler/NetconfHelloMessageToXMLEncoderTest.java | 2 +- .../test/tool/client/stress/AbstractExecutionStrategy.java | 2 +- .../netconf/test/tool/client/stress/AsyncExecutionStrategy.java | 2 +- .../netconf/test/tool/client/stress/StressClient.java | 2 +- .../netconf/test/tool/client/stress/StressClientCallable.java | 2 +- .../netconf/test/tool/client/stress/SyncExecutionStrategy.java | 2 +- .../netconf/test/tool/rpc/SimulatedCreateSubscription.java | 2 +- .../java/org/opendaylight/netconf/test/tool/TestToolTest.java | 2 +- .../org/opendaylight/netconf/client/mdsal/NetconfDevice.java | 2 +- .../netconf/client/mdsal/NetconfDeviceCommunicator.java | 2 +- .../opendaylight/netconf/client/mdsal/NotificationHandler.java | 2 +- .../netconf/client/mdsal/SchemalessNetconfDevice.java | 2 +- .../netconf/client/mdsal/api/ActionTransformer.java | 2 +- .../netconf/client/mdsal/api/NotificationTransformer.java | 2 +- .../org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java | 2 +- .../netconf/client/mdsal/api/RemoteDeviceCommunicator.java | 2 +- .../opendaylight/netconf/client/mdsal/api/RpcTransformer.java | 2 +- .../netconf/client/mdsal/impl/BaseRpcSchemalessTransformer.java | 2 +- .../netconf/client/mdsal/impl/NetconfMessageTransformUtil.java | 2 +- .../netconf/client/mdsal/impl/NetconfMessageTransformer.java | 2 +- .../netconf/client/mdsal/impl/SchemalessMessageTransformer.java | 2 +- .../opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpc.java | 2 +- .../netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java | 2 +- .../netconf/client/mdsal/NetconfDeviceCommunicatorTest.java | 2 +- .../opendaylight/netconf/client/mdsal/NetconfDeviceTest.java | 2 +- .../netconf/client/mdsal/NetconfNestedNotificationTest.java | 2 +- .../netconf/client/mdsal/NetconfToNotificationTest.java | 2 +- .../netconf/client/mdsal/NetconfToRpcRequestTest.java | 2 +- .../netconf/client/mdsal/SchemalessNetconfDeviceTest.java | 2 +- .../client/mdsal/impl/BaseRpcSchemalessTransformerTest.java | 2 +- .../netconf/client/mdsal/impl/NetconfBaseOpsTest.java | 2 +- .../client/mdsal/impl/NetconfMessageTransformerTest.java | 2 +- .../client/mdsal/impl/SchemalessMessageTransformerTest.java | 2 +- .../client/mdsal/spi/NetconfDataTreeServiceImplTest.java | 2 +- .../netconf/client/mdsal/spi/NetconfDeviceRpcTest.java | 2 +- .../client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java | 2 +- .../java/org/opendaylight/netconf/api/NetconfExiSession.java | 2 ++ .../main/java/org/opendaylight/netconf/api/NetconfSession.java | 1 + .../org/opendaylight/netconf/api/NetconfSessionListener.java | 1 + .../org/opendaylight/netconf/api/messages/HelloMessage.java | 1 - .../opendaylight/netconf/api/{ => messages}/NetconfMessage.java | 2 +- .../opendaylight/netconf/api/messages/NotificationMessage.java | 1 - .../org/opendaylight/netconf/client/NetconfClientSession.java | 2 +- .../netconf/client/NetconfClientSessionNegotiator.java | 2 +- .../org/opendaylight/netconf/client/NetconfMessageUtil.java | 2 +- .../netconf/client/SimpleNetconfClientSessionListener.java | 2 +- .../netconf/client/NetconfClientSessionNegotiatorTest.java | 2 +- .../org/opendaylight/netconf/client/NetconfMessageUtilTest.java | 2 +- .../netconf/client/SimpleNetconfClientSessionListenerTest.java | 2 +- .../org/opendaylight/netconf/client/TestingNetconfClient.java | 2 +- .../org/opendaylight/netconf/server/NetconfServerSession.java | 2 +- .../netconf/server/NetconfServerSessionListener.java | 2 +- .../org/opendaylight/netconf/server/SendErrorExceptionUtil.java | 2 +- .../netconf/server/mapping/operations/DefaultStartExi.java | 2 +- .../org/opendaylight/netconf/server/ConcurrentClientsTest.java | 2 +- .../org/opendaylight/netconf/server/ExiEncodeDecodeTest.java | 2 +- .../java/org/opendaylight/netconf/server/MessageParserTest.java | 2 +- .../netconf/server/NetconfServerSessionListenerTest.java | 2 +- .../opendaylight/netconf/server/NetconfServerSessionTest.java | 2 +- .../opendaylight/netconf/server/SendErrorExceptionUtilTest.java | 2 +- .../server/mapping/operations/DefaultCloseSessionTest.java | 2 +- .../java/org/opendaylight/netconf/test/util/XmlFileLoader.java | 2 +- 76 files changed, 75 insertions(+), 73 deletions(-) rename protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/{ => messages}/NetconfMessage.java (97%) diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java index a8e475a2a5..e0845026da 100644 --- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java +++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContext.java @@ -11,8 +11,8 @@ import static java.util.Objects.requireNonNull; import com.google.common.base.MoreObjects; import io.netty.util.concurrent.Future; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.callhome.protocol.CallHomeChannelActivator; import org.opendaylight.netconf.callhome.protocol.CallHomeProtocolSessionContext; import org.opendaylight.netconf.client.NetconfClientSession; diff --git a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContextTest.java b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContextTest.java index d27b13cce8..e51cb18b80 100644 --- a/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContextTest.java +++ b/apps/callhome-provider/src/test/java/org/opendaylight/netconf/callhome/mount/CallHomeMountSessionContextTest.java @@ -20,8 +20,8 @@ import java.net.Inet4Address; import java.net.InetSocketAddress; import org.junit.Before; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.callhome.protocol.CallHomeChannelActivator; import org.opendaylight.netconf.callhome.protocol.CallHomeProtocolSessionContext; import org.opendaylight.netconf.client.NetconfClientSession; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java index a5868dfea4..d9290b9947 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSession.java @@ -20,10 +20,10 @@ import io.netty.handler.codec.MessageToByteEncoder; import java.io.EOFException; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.api.NetconfExiSession; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSession; import org.opendaylight.netconf.api.NetconfSessionListener; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.nettyutil.handler.NetconfEXICodec; import org.opendaylight.netconf.nettyutil.handler.NetconfEXIToMessageDecoder; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java index 65d10ffe9c..a2af2f3103 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionNegotiator.java @@ -30,10 +30,10 @@ import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.netconf.api.CapabilityURN; import org.opendaylight.netconf.api.NamespaceURN; import org.opendaylight.netconf.api.NetconfDocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSessionListener; import org.opendaylight.netconf.api.messages.FramingMechanism; import org.opendaylight.netconf.api.messages.HelloMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.nettyutil.handler.FramingMechanismHandlerFactory; import org.opendaylight.netconf.nettyutil.handler.NetconfChunkAggregator; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java index 0f85d18c16..a0e6e52673 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIToMessageDecoder.java @@ -24,7 +24,7 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.shaded.exificient.core.exceptions.EXIException; import org.opendaylight.yangtools.util.xml.UntrustedXML; import org.slf4j.Logger; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java index d968b85569..7ddf8ec8dc 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoder.java @@ -15,9 +15,9 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.Optional; import javax.xml.transform.TransformerException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.HelloMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; /** * Customized NetconfMessageToXMLEncoder that serializes additional header with diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java index 4f27742f40..6d6adacec3 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToEXIEncoder.java @@ -19,7 +19,7 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.shaded.exificient.core.exceptions.EXIException; import org.opendaylight.netconf.shaded.exificient.main.api.sax.SAXEncoder; import org.slf4j.Logger; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java index 81ee32c26d..8da680040e 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfMessageToXMLEncoder.java @@ -21,7 +21,7 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.eclipse.jdt.annotation.Nullable; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Comment; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java index 3309ea0e38..5b13003c2f 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToHelloMessageDecoder.java @@ -21,9 +21,9 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.HelloMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java index 27c01eacc3..9244d8ee19 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/NetconfXMLToMessageDecoder.java @@ -15,7 +15,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import java.io.IOException; import java.util.List; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java index 2f7a44db08..e5dfbcb165 100644 --- a/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java +++ b/netconf/netconf-netty-util/src/main/java/org/opendaylight/netconf/nettyutil/handler/exi/NetconfStartExiMessage.java @@ -12,7 +12,7 @@ import com.google.common.annotations.VisibleForTesting; import java.util.ArrayList; import java.util.List; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; import org.w3c.dom.Document; diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java index ce5ba29367..433d9fdae7 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/AbstractNetconfSessionTest.java @@ -35,10 +35,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSessionListener; import org.opendaylight.netconf.api.NetconfTerminationReason; import org.opendaylight.netconf.api.messages.HelloMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.nettyutil.handler.exi.EXIParameters; import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType; diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestingNetconfSession.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestingNetconfSession.java index 03aeb51e9b..3a7fde0dcf 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestingNetconfSession.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/TestingNetconfSession.java @@ -10,8 +10,8 @@ package org.opendaylight.netconf.nettyutil; import io.netty.channel.Channel; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSessionListener; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType; class TestingNetconfSession diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIHandlersTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIHandlersTest.java index 6559825b54..aaa30bb6c0 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIHandlersTest.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfEXIHandlersTest.java @@ -23,7 +23,7 @@ import javax.xml.transform.sax.SAXResult; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Before; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.nettyutil.handler.exi.EXIParameters; import org.opendaylight.netconf.shaded.exificient.core.exceptions.EXIException; diff --git a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoderTest.java b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoderTest.java index c4da9a1d08..3eb29f46b0 100644 --- a/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoderTest.java +++ b/netconf/netconf-netty-util/src/test/java/org/opendaylight/netconf/nettyutil/handler/NetconfHelloMessageToXMLEncoderTest.java @@ -19,9 +19,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.HelloMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; @RunWith(MockitoJUnitRunner.StrictStubs.class) diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AbstractExecutionStrategy.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AbstractExecutionStrategy.java index 58399503c5..35d771f2f2 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AbstractExecutionStrategy.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AbstractExecutionStrategy.java @@ -9,7 +9,7 @@ package org.opendaylight.netconf.test.tool.client.stress; import java.util.ArrayList; import java.util.List; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.NetconfDeviceCommunicator; abstract class AbstractExecutionStrategy implements ExecutionStrategy { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java index e3b9e918f3..35b7c3701e 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/AsyncExecutionStrategy.java @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.NetconfDeviceCommunicator; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java index ab3dd0694b..ad2b9e4956 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClient.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.ArgumentParserException; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.NetconfClientDispatcherImpl; import org.opendaylight.netconf.client.mdsal.NetconfDeviceCommunicator; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java index 0de06d9012..88b86cc1bf 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/StressClientCallable.java @@ -11,8 +11,8 @@ import java.net.InetSocketAddress; import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.NetconfClientDispatcherImpl; import org.opendaylight.netconf.client.NetconfClientSession; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java index 83e2c418bb..f5e3402242 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/client/stress/SyncExecutionStrategy.java @@ -15,7 +15,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.NetconfDeviceCommunicator; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java index cd870e30d2..764cd061bc 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCreateSubscription.java @@ -23,7 +23,7 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Unmarshaller; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; diff --git a/netconf/tools/netconf-testtool/src/test/java/org/opendaylight/netconf/test/tool/TestToolTest.java b/netconf/tools/netconf-testtool/src/test/java/org/opendaylight/netconf/test/tool/TestToolTest.java index 4e29072ad4..d2eeb329ad 100644 --- a/netconf/tools/netconf-testtool/src/test/java/org/opendaylight/netconf/test/tool/TestToolTest.java +++ b/netconf/tools/netconf-testtool/src/test/java/org/opendaylight/netconf/test/tool/TestToolTest.java @@ -27,7 +27,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.auth.AuthProvider; import org.opendaylight.netconf.client.NetconfClientDispatcher; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java index 4c0bdeec22..cf430e51fb 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java @@ -37,7 +37,7 @@ import org.checkerframework.checker.lock.qual.GuardedBy; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.netconf.api.CapabilityURN; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.api.BaseNetconfSchemas; import org.opendaylight.netconf.client.mdsal.api.DeviceActionFactory; import org.opendaylight.netconf.client.mdsal.api.NetconfDeviceSchemasResolver; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java index 5edf44fce0..99822cde1d 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicator.java @@ -23,8 +23,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.netconf.api.DocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NotificationHandler.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NotificationHandler.java index 9e5a1e1c22..81261ce53e 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NotificationHandler.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NotificationHandler.java @@ -15,7 +15,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Predicate; import org.opendaylight.mdsal.dom.api.DOMNotification; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.api.NotificationTransformer; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceHandler; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java index 0cc541a584..33c5ccc7c7 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDevice.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.client.mdsal; import static java.util.Objects.requireNonNull; import com.google.common.annotations.VisibleForTesting; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.api.BaseNetconfSchemas; import org.opendaylight.netconf.client.mdsal.api.NetconfSessionPreferences; import org.opendaylight.netconf.client.mdsal.api.RemoteDevice; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java index 988954cc73..91c0d71e64 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/ActionTransformer.java @@ -9,7 +9,7 @@ package org.opendaylight.netconf.client.mdsal.api; import org.opendaylight.mdsal.dom.api.DOMActionResult; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Absolute; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/NotificationTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/NotificationTransformer.java index 87aa36f3ab..207472f65c 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/NotificationTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/NotificationTransformer.java @@ -8,7 +8,7 @@ package org.opendaylight.netconf.client.mdsal.api; import org.opendaylight.mdsal.dom.api.DOMNotification; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; /** * Interface for transforming NETCONF device {@link NetconfMessage}s to {@link DOMNotification}. diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java index 292e8287dd..036d8d605d 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDevice.java @@ -7,7 +7,7 @@ */ package org.opendaylight.netconf.client.mdsal.api; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; /** * Remote device. diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java index f5f87d9009..8ac16ca405 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RemoteDeviceCommunicator.java @@ -8,7 +8,7 @@ package org.opendaylight.netconf.client.mdsal.api; import com.google.common.util.concurrent.ListenableFuture; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RpcTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RpcTransformer.java index f01ba51b40..95b922230e 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RpcTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/api/RpcTransformer.java @@ -7,7 +7,7 @@ */ package org.opendaylight.netconf.client.mdsal.api; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformer.java index 3fa1e368c4..b4fdd7abb4 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformer.java @@ -17,7 +17,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.api.BaseNetconfSchemas; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java index 7a0c9f9bb4..c528e5e0f0 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformUtil.java @@ -31,7 +31,7 @@ import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.EffectiveOperation; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java index a909d2ba26..17bd3d6b6f 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java @@ -55,7 +55,7 @@ import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.mdsal.dom.spi.SimpleDOMActionResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.MissingNameSpaceException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.client.mdsal.api.ActionTransformer; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java index d6f1496873..332f500272 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformer.java @@ -11,7 +11,7 @@ import java.time.Instant; import java.util.Map; import javax.xml.transform.dom.DOMSource; import org.opendaylight.mdsal.dom.api.DOMNotification; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.MissingNameSpaceException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpc.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpc.java index 6a64fc120d..565ddabb50 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpc.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpc.java @@ -20,7 +20,7 @@ import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException; import org.opendaylight.mdsal.dom.api.DOMRpcResult; import org.opendaylight.mdsal.dom.api.DefaultDOMRpcException; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceCommunicator; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices.Rpcs; import org.opendaylight.netconf.client.mdsal.api.RpcTransformer; diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java index 2e5a043177..9a3eb4f976 100644 --- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java +++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpc.java @@ -16,7 +16,7 @@ import javax.xml.transform.dom.DOMSource; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMRpcImplementationNotAvailableException; import org.opendaylight.mdsal.dom.api.DOMRpcResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceCommunicator; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceServices.Rpcs; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java index 53989409ec..17bf26dde8 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceCommunicatorTest.java @@ -47,8 +47,8 @@ import org.mockito.MockMakers; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.CapabilityURN; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.client.NetconfClientSession; import org.opendaylight.netconf.client.NetconfClientSessionListener; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java index d73d1e47ee..0aa6e6b980 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfDeviceTest.java @@ -45,7 +45,7 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.netconf.api.CapabilityURN; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.NetconfDevice.EmptySchemaContextException; import org.opendaylight.netconf.client.mdsal.api.NetconfDeviceSchemasResolver; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfNestedNotificationTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfNestedNotificationTest.java index 47926db7ed..d27d5ae663 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfNestedNotificationTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfNestedNotificationTest.java @@ -18,7 +18,7 @@ import java.util.Collections; import org.junit.Test; import org.opendaylight.mdsal.dom.api.DOMEvent; import org.opendaylight.mdsal.dom.api.DOMNotification; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformer; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java index 2c9c86bc12..449736f4ba 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java @@ -18,7 +18,7 @@ import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.dom.api.DOMEvent; import org.opendaylight.mdsal.dom.api.DOMNotification; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformer; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java index e94cd05281..41c7c7ec9b 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToRpcRequestTest.java @@ -17,7 +17,7 @@ import java.util.Collection; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.impl.NetconfMessageTransformer; import org.opendaylight.yangtools.yang.common.QName; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java index fc6cb678cf..cda0cd21cc 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/SchemalessNetconfDeviceTest.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.opendaylight.mdsal.dom.api.DOMNotification; import org.opendaylight.netconf.api.CapabilityURN; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.api.NetconfSessionPreferences; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceHandler; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java index 6252741b31..8f99b2b7eb 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java @@ -18,7 +18,7 @@ import org.custommonkey.xmlunit.XMLUnit; import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.dom.api.DOMRpcResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.AbstractBaseSchemasTest; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.copy.config.input.target.ConfigTarget; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java index ec64755cdb..38569f2ceb 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java @@ -32,7 +32,7 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.EffectiveOperation; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.AbstractTestModelTest; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceCommunicator; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java index 1ecb0d3dfd..3a0e1e0309 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java @@ -50,7 +50,7 @@ import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMActionResult; import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.AbstractBaseSchemasTest; import org.opendaylight.netconf.client.mdsal.MonitoringSchemaSourceProvider; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformerTest.java index 248559221c..9cefb91312 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformerTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/SchemalessMessageTransformerTest.java @@ -17,7 +17,7 @@ import org.custommonkey.xmlunit.XMLUnit; import org.junit.Before; import org.junit.Test; import org.opendaylight.mdsal.dom.api.DOMNotification; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDataTreeServiceImplTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDataTreeServiceImplTest.java index b61d9fa331..328bed23cb 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDataTreeServiceImplTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDataTreeServiceImplTest.java @@ -35,7 +35,7 @@ import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.netconf.api.CapabilityURN; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.mdsal.AbstractTestModelTest; import org.opendaylight.netconf.client.mdsal.api.NetconfSessionPreferences; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceId; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java index 3571b8305e..0663df815e 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java @@ -32,7 +32,7 @@ import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers; import org.opendaylight.mdsal.dom.api.DOMRpcAvailabilityListener; import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier; import org.opendaylight.mdsal.dom.api.DOMRpcResult; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.AbstractBaseSchemasTest; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceCommunicator; diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java index 676c4a9ba5..a36bffcc5c 100644 --- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java +++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/SchemalessNetconfDeviceRpcTest.java @@ -21,7 +21,7 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.mdsal.AbstractBaseSchemasTest; import org.opendaylight.netconf.client.mdsal.api.RemoteDeviceCommunicator; diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java index 11b3012a8d..248d1c7656 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java +++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfExiSession.java @@ -7,6 +7,8 @@ */ package org.opendaylight.netconf.api; +import org.opendaylight.netconf.api.messages.NetconfMessage; + /** * Session capable of exi communication according to http://tools.ietf.org/html/draft-varga-netconf-exi-capability-02. */ diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java index 182740b699..07a68233f8 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java +++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSession.java @@ -9,6 +9,7 @@ package org.opendaylight.netconf.api; import io.netty.channel.ChannelFuture; import java.io.Closeable; +import org.opendaylight.netconf.api.messages.NetconfMessage; /** * Protocol Session represents the finite state machine in underlying protocol, including timers and its purpose is to diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java index bf1adeaac3..9d5e1a4e83 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java +++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfSessionListener.java @@ -8,6 +8,7 @@ package org.opendaylight.netconf.api; import java.io.EOFException; +import org.opendaylight.netconf.api.messages.NetconfMessage; // FIXME: NETCONF-554: rework this interface public interface NetconfSessionListener { diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/HelloMessage.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/HelloMessage.java index 4409adaaa5..1b6ee7b724 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/HelloMessage.java +++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/HelloMessage.java @@ -11,7 +11,6 @@ import com.google.common.collect.Sets; import java.util.Optional; import java.util.Set; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfMessage.java similarity index 97% rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java rename to protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfMessage.java index 1e8cb5412b..5e04f80134 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/NetconfMessage.java +++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NetconfMessage.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.api; +package org.opendaylight.netconf.api.messages; import static java.util.Objects.requireNonNull; diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java index 66da0ffe79..da58fcce82 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java +++ b/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/messages/NotificationMessage.java @@ -22,7 +22,6 @@ import java.time.temporal.TemporalAccessor; import java.util.function.Function; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java index 87488f7aa5..aa22f61a41 100644 --- a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java +++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSession.java @@ -13,7 +13,7 @@ import io.netty.channel.Channel; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; import java.util.Collection; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.nettyutil.AbstractNetconfSession; import org.opendaylight.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; diff --git a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java index f2431521d8..a1e3446c47 100644 --- a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java +++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiator.java @@ -22,8 +22,8 @@ import javax.xml.xpath.XPathExpression; import org.checkerframework.checker.index.qual.NonNegative; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.api.NetconfDocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.HelloMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer; diff --git a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfMessageUtil.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfMessageUtil.java index 1e6e49e1fa..7974c183ad 100644 --- a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfMessageUtil.java +++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/NetconfMessageUtil.java @@ -12,7 +12,7 @@ import java.util.Collection; import java.util.List; import java.util.Optional; import org.opendaylight.netconf.api.DocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.slf4j.Logger; diff --git a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java index c0d326e8d5..b9e6815dec 100644 --- a/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java +++ b/protocol/netconf-client/src/main/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListener.java @@ -16,8 +16,8 @@ import java.util.ArrayDeque; import java.util.Queue; import org.checkerframework.checker.lock.qual.GuardedBy; import org.checkerframework.checker.lock.qual.Holding; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java index 6af05e040d..2a80583175 100644 --- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java +++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfClientSessionNegotiatorTest.java @@ -38,8 +38,8 @@ import java.util.Optional; import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.HelloMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.nettyutil.handler.ChunkedFramingMechanismEncoder; import org.opendaylight.netconf.nettyutil.handler.NetconfEXIToMessageDecoder; diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java index c1336ea6e0..08013597b3 100644 --- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java +++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfMessageUtilTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.test.util.XmlFileLoader; public class NetconfMessageUtilTest { diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java index 40a862376b..4515bfd170 100644 --- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java +++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/SimpleNetconfClientSessionListenerTest.java @@ -24,8 +24,8 @@ import io.netty.util.concurrent.GenericFutureListener; import java.util.Set; import org.junit.Before; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.HelloMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.SessionIdType; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java index 6d6916aa5b..e4fbce8b5b 100644 --- a/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java +++ b/protocol/netconf-client/src/test/java/org/opendaylight/netconf/client/TestingNetconfClient.java @@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration.NetconfClientProtocol; import org.opendaylight.netconf.client.conf.NetconfClientConfigurationBuilder; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java index acdb925595..1f70282560 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java @@ -22,8 +22,8 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.util.regex.Pattern; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.nettyutil.AbstractNetconfSession; import org.opendaylight.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java index 9e7cc53e51..ec17c01fb6 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionListener.java @@ -13,9 +13,9 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSessionListener; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java index 6a68b333e6..7598b4baeb 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/SendErrorExceptionUtil.java @@ -14,8 +14,8 @@ import io.netty.channel.ChannelFutureListener; import javax.xml.XMLConstants; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSession; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; import org.slf4j.Logger; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java index b1e6ba3e31..1873ae3aa0 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStartExi.java @@ -9,7 +9,7 @@ package org.opendaylight.netconf.server.mapping.operations; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NamespaceURN; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java index 9d1c1da327..5a5a9b2b9f 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ConcurrentClientsTest.java @@ -44,8 +44,8 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.opendaylight.netconf.api.CapabilityURN; import org.opendaylight.netconf.api.DocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.client.NetconfClientDispatcher; import org.opendaylight.netconf.client.NetconfClientDispatcherImpl; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java index 12ef9ea7f7..e190d56d48 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/ExiEncodeDecodeTest.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.server; import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.test.util.XmlFileLoader; public class ExiEncodeDecodeTest { diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java index 665bbe68c4..798094459f 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/MessageParserTest.java @@ -21,8 +21,8 @@ import java.util.Queue; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Before; import org.junit.Test; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.FramingMechanism; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.nettyutil.handler.ChunkedFramingMechanismEncoder; import org.opendaylight.netconf.nettyutil.handler.FramingMechanismHandlerFactory; import org.opendaylight.netconf.nettyutil.handler.NetconfChunkAggregator; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java index 89e92e0b79..8b96f64660 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.mockito.ArgumentMatcher; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java index 2c8becd48c..1e8727f5d8 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.nettyutil.AbstractChannelInitializer; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java index be45be0db2..15fe4671c0 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/SendErrorExceptionUtilTest.java @@ -26,8 +26,8 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.DocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSession; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.w3c.dom.Element; import org.xml.sax.SAXException; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java index 800e08c4f1..48886417c4 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSessionTest.java @@ -26,9 +26,9 @@ import io.netty.util.concurrent.GenericFutureListener; import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfDocumentedException; -import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.server.NetconfServerSession; diff --git a/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java index 8870a8f1bb..183ee61a81 100644 --- a/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java +++ b/protocol/netconf-test-util/src/main/java/org/opendaylight/netconf/test/util/XmlFileLoader.java @@ -14,7 +14,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import javax.xml.parsers.ParserConfigurationException; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.netconf.api.NetconfMessage; +import org.opendaylight.netconf.api.messages.NetconfMessage; import org.opendaylight.netconf.api.xml.XmlUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; -- 2.36.6