From aafa2fb9d206df54b7088f449f6e3cfc7bcae50d Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 26 Apr 2023 20:40:02 +0200 Subject: [PATCH] Integrate netconf-mapping-api into netconf-server All interfaces in netconf-mapping-api are a server-side thing. Rehost them to netconf.server.api.operations. This in turn forces artifacts to declare which side of netconf-api they reside on. This effects the rename to netconf.server.api.operations, which is more descriptive than 'mapping'. JIRA: NETCONF-945 Change-Id: Ia6ce8e944569c2e2487a2b14f01046ff2a144f73 Signed-off-by: Robert Varga --- apps/netconf-events-mdsal/pom.xml | 6 +--- .../events/mdsal/CreateSubscription.java | 6 ++-- .../NetconfNotificationOperationService.java | 4 +-- ...nfNotificationOperationServiceFactory.java | 6 ++-- artifacts/pom.xml | 12 ------- .../netconf/features-netconf-testing/pom.xml | 6 ---- features/netconf/features-netconf/pom.xml | 6 ---- features/netconf/odl-netconf-all/pom.xml | 6 ---- features/netconf/odl-netconf-impl/pom.xml | 6 ---- .../netconf/odl-netconf-mapping-api/pom.xml | 35 ------------------- .../netconf/odl-netconf-netty-util/pom.xml | 6 ---- features/netconf/odl-netconf-util/pom.xml | 6 ---- features/netconf/pom.xml | 1 - netconf/mdsal-netconf-connector/pom.xml | 2 +- .../MdsalNetconfOperationService.java | 4 +-- .../MdsalNetconfOperationServiceFactory.java | 6 ++-- .../ops/AbstractConfigOperation.java | 2 +- .../netconf/mdsal/connector/ops/Commit.java | 12 +++---- .../mdsal/connector/ops/DiscardChanges.java | 2 +- .../netconf/mdsal/connector/ops/Lock.java | 5 +-- .../mdsal/connector/ops/RuntimeRpc.java | 15 +++----- .../netconf/mdsal/connector/ops/Unlock.java | 6 +--- .../mdsal/connector/ops/get/AbstractGet.java | 2 +- .../netconf/mdsal/connector/ops/get/Get.java | 21 ++--------- .../mdsal/connector/ops/get/GetConfig.java | 3 +- .../ops/AbstractNetconfOperationTest.java | 6 ++-- .../mdsal/connector/ops/RuntimeRpcTest.java | 4 +-- netconf/mdsal-netconf-impl/pom.xml | 4 --- .../DefaultNetconfMonitoringService.java | 2 +- .../impl/mdsal/NetconfMapperAggregator.java | 4 +-- .../netconf/impl/mdsal/OSGiNetconfServer.java | 2 +- netconf/mdsal-netconf-monitoring/pom.xml | 2 +- .../netconf/mdsal/monitoring/GetSchema.java | 2 +- .../MdsalMonitoringMapperFactory.java | 8 ++--- netconf/netconf-mapping-api/pom.xml | 33 ----------------- netconf/pom.xml | 1 - netconf/tools/netconf-testtool/pom.xml | 4 --- .../test/tool/MdsalOperationProvider.java | 7 ++-- .../test/tool/NetconfDeviceSimulator.java | 3 +- .../test/tool/SimulatedOperationProvider.java | 15 ++++---- .../test/tool/TesttoolNegotiationFactory.java | 4 +-- .../customrpc/SettableOperationProvider.java | 6 ++-- .../test/tool/customrpc/SettableRpc.java | 8 ++--- .../netconf/test/tool/monitoring/Get.java | 8 ++--- .../NetconfMonitoringOperationService.java | 5 ++- ...confMonitoringOperationServiceFactory.java | 4 +-- .../operations/DefaultOperationsCreator.java | 5 ++- .../tool/operations/OperationsCreator.java | 2 +- .../tool/operations/OperationsProvider.java | 5 ++- .../test/tool/rpc/SimulatedCommit.java | 2 +- .../tool/rpc/SimulatedCreateSubscription.java | 2 +- .../tool/rpc/SimulatedDiscardChanges.java | 3 +- .../test/tool/rpc/SimulatedEditConfig.java | 2 +- .../netconf/test/tool/rpc/SimulatedGet.java | 3 +- .../test/tool/rpc/SimulatedGetConfig.java | 4 +-- .../netconf/test/tool/rpc/SimulatedLock.java | 3 +- .../test/tool/rpc/SimulatedUnLock.java | 3 +- .../SettableOperationRpcProvider.java | 8 ++--- .../test/tool/rpchandler/SettableRpc.java | 8 ++--- plugins/sal-netconf-connector/pom.xml | 5 --- protocol/netconf-server/pom.xml | 4 --- .../server/NetconfServerSessionListener.java | 2 +- ...NetconfServerSessionNegotiatorFactory.java | 4 +-- ...ServerSessionNegotiatorFactoryBuilder.java | 2 +- .../AbstractLastNetconfOperation.java | 4 +-- .../operations}/AbstractNetconfOperation.java | 5 +-- .../AbstractSingletonNetconfOperation.java | 11 +++--- .../api/operations}/HandlingPriority.java | 20 +++-------- .../api/operations}/NetconfOperation.java | 2 +- .../NetconfOperationChainedExecution.java | 2 +- .../operations}/NetconfOperationService.java | 2 +- .../NetconfOperationServiceFactory.java | 2 +- ...etconfOperationServiceFactoryListener.java | 2 +- .../SessionAwareNetconfOperation.java | 2 +- .../operations/DefaultCloseSession.java | 2 +- .../mapping/operations/DefaultStartExi.java | 4 +-- .../mapping/operations/DefaultStopExi.java | 2 +- ...regatedNetconfOperationServiceFactory.java | 8 ++--- .../NetconfCapabilityMonitoringService.java | 2 +- .../osgi/NetconfMonitoringServiceImpl.java | 2 +- .../osgi/NetconfOperationRouterImpl.java | 10 +++--- .../netconf/server/spi}/SubtreeFilter.java | 6 ++-- .../netconf/server/spi/package-info.java | 11 ++++++ .../netconf/server/ConcurrentClientsTest.java | 10 +++--- .../AbstractLastNetconfOperationTest.java | 14 +++----- .../AbstractNetconfOperationTest.java | 12 +++---- ...AbstractSingletonNetconfOperationTest.java | 13 +++---- .../api/operations}/HandlingPriorityTest.java | 31 ++++++++-------- ...tedNetconfOperationServiceFactoryTest.java | 2 +- ...etconfCapabilityMonitoringServiceTest.java | 2 +- .../osgi/NetconfOperationRouterImplTest.java | 8 ++--- .../spi}/SubtreeFilterNotificationTest.java | 9 +++-- .../server/spi}/SubtreeFilterRpcTest.java | 7 ++-- protocol/netconf-util/pom.xml | 4 --- 94 files changed, 194 insertions(+), 402 deletions(-) delete mode 100644 features/netconf/odl-netconf-mapping-api/pom.xml delete mode 100644 netconf/netconf-mapping-api/pom.xml rename protocol/{netconf-util/src/main/java/org/opendaylight/netconf/util/mapping => netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/AbstractLastNetconfOperation.java (90%) rename protocol/{netconf-util/src/main/java/org/opendaylight/netconf/util/mapping => netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/AbstractNetconfOperation.java (95%) rename protocol/{netconf-util/src/main/java/org/opendaylight/netconf/util/mapping => netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/AbstractSingletonNetconfOperation.java (64%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/HandlingPriority.java (85%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/NetconfOperation.java (97%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/NetconfOperationChainedExecution.java (96%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/NetconfOperationService.java (92%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/NetconfOperationServiceFactory.java (95%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/NetconfOperationServiceFactoryListener.java (90%) rename {netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations}/SessionAwareNetconfOperation.java (89%) rename protocol/{netconf-util/src/main/java/org/opendaylight/netconf/util/messages => netconf-server/src/main/java/org/opendaylight/netconf/server/spi}/SubtreeFilter.java (98%) create mode 100644 protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/package-info.java rename protocol/{netconf-util/src/test/java/org/opendaylight/netconf/util/mapping => netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations}/AbstractLastNetconfOperationTest.java (78%) rename protocol/{netconf-util/src/test/java/org/opendaylight/netconf/util/mapping => netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations}/AbstractNetconfOperationTest.java (84%) rename protocol/{netconf-util/src/test/java/org/opendaylight/netconf/util/mapping => netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations}/AbstractSingletonNetconfOperationTest.java (69%) rename {netconf/netconf-mapping-api/src/main/test/java/org/opendaylight/netconf/mapping/api => protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations}/HandlingPriorityTest.java (65%) rename protocol/{netconf-util/src/test/java/org/opendaylight/netconf/util/messages => netconf-server/src/test/java/org/opendaylight/netconf/server/spi}/SubtreeFilterNotificationTest.java (90%) rename protocol/{netconf-util/src/test/java/org/opendaylight/netconf/util/messages => netconf-server/src/test/java/org/opendaylight/netconf/server/spi}/SubtreeFilterRpcTest.java (91%) diff --git a/apps/netconf-events-mdsal/pom.xml b/apps/netconf-events-mdsal/pom.xml index e49d5074a0..8697b2130e 100644 --- a/apps/netconf-events-mdsal/pom.xml +++ b/apps/netconf-events-mdsal/pom.xml @@ -94,11 +94,7 @@ org.opendaylight.netconf - netconf-mapping-api - - - org.opendaylight.netconf - netconf-util + netconf-server org.opendaylight.netconf.model diff --git a/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/CreateSubscription.java b/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/CreateSubscription.java index 6c64abea36..f4834fa0f8 100644 --- a/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/CreateSubscription.java +++ b/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/CreateSubscription.java @@ -19,11 +19,11 @@ import org.opendaylight.netconf.api.NetconfSession; import org.opendaylight.netconf.api.messages.NotificationMessage; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.mapping.api.SessionAwareNetconfOperation; import org.opendaylight.netconf.notifications.NetconfNotificationListener; import org.opendaylight.netconf.notifications.NetconfNotificationRegistry; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; -import org.opendaylight.netconf.util.messages.SubtreeFilter; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.SessionAwareNetconfOperation; +import org.opendaylight.netconf.server.spi.SubtreeFilter; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.CreateSubscriptionInput; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.notification._1._0.rev080714.StreamNameType; import org.opendaylight.yangtools.concepts.Registration; diff --git a/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationService.java b/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationService.java index cb4fffd6aa..894fbf29f7 100644 --- a/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationService.java +++ b/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationService.java @@ -8,9 +8,9 @@ package org.opendaylight.netconf.server.events.mdsal; import java.util.Set; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; import org.opendaylight.netconf.notifications.NetconfNotificationRegistry; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; final class NetconfNotificationOperationService implements NetconfOperationService { private final CreateSubscription createSubscription; diff --git a/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationServiceFactory.java b/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationServiceFactory.java index e5c1b3aa3d..4c0d002ca0 100644 --- a/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationServiceFactory.java +++ b/apps/netconf-events-mdsal/src/main/java/org/opendaylight/netconf/server/events/mdsal/NetconfNotificationOperationServiceFactory.java @@ -12,10 +12,10 @@ import static java.util.Objects.requireNonNull; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener; import org.opendaylight.netconf.notifications.NetconfNotificationRegistry; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; import org.opendaylight.yangtools.concepts.Registration; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d962cdc13d..8e867514b6 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -65,11 +65,6 @@ netconf-server ${project.version} - - ${project.groupId} - netconf-mapping-api - ${project.version} - ${project.groupId} mdsal-netconf-connector @@ -399,13 +394,6 @@ xml features - - ${project.groupId} - odl-netconf-mapping-api - ${project.version} - xml - features - ${project.groupId} odl-netconf-mdsal diff --git a/features/netconf/features-netconf-testing/pom.xml b/features/netconf/features-netconf-testing/pom.xml index 8730e664f7..72b3fa8a31 100644 --- a/features/netconf/features-netconf-testing/pom.xml +++ b/features/netconf/features-netconf-testing/pom.xml @@ -70,12 +70,6 @@ xml features - - ${project.groupId} - odl-netconf-mapping-api - xml - features - ${project.groupId} odl-netconf-mdsal diff --git a/features/netconf/features-netconf/pom.xml b/features/netconf/features-netconf/pom.xml index 635221d461..8da3a696db 100644 --- a/features/netconf/features-netconf/pom.xml +++ b/features/netconf/features-netconf/pom.xml @@ -70,12 +70,6 @@ xml features - - ${project.groupId} - odl-netconf-mapping-api - xml - features - ${project.groupId} odl-netconf-mdsal diff --git a/features/netconf/odl-netconf-all/pom.xml b/features/netconf/odl-netconf-all/pom.xml index efbc7cd5d5..6b108b0666 100644 --- a/features/netconf/odl-netconf-all/pom.xml +++ b/features/netconf/odl-netconf-all/pom.xml @@ -27,12 +27,6 @@ xml features - - ${project.groupId} - odl-netconf-mapping-api - xml - features - ${project.groupId} odl-netconf-util diff --git a/features/netconf/odl-netconf-impl/pom.xml b/features/netconf/odl-netconf-impl/pom.xml index 7ae7595791..c8ecd2f6f6 100644 --- a/features/netconf/odl-netconf-impl/pom.xml +++ b/features/netconf/odl-netconf-impl/pom.xml @@ -33,12 +33,6 @@ xml features - - ${project.groupId} - odl-netconf-mapping-api - xml - features - ${project.groupId} odl-netconf-util diff --git a/features/netconf/odl-netconf-mapping-api/pom.xml b/features/netconf/odl-netconf-mapping-api/pom.xml deleted file mode 100644 index c6710c9031..0000000000 --- a/features/netconf/odl-netconf-mapping-api/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netconf - feature-parent - 6.0.0-SNAPSHOT - ../../parent - - - odl-netconf-mapping-api - feature - OpenDaylight :: Netconf :: Mapping API - - - - org.opendaylight.netconf - odl-netconf-api - xml - features - - - org.opendaylight.netconf - netconf-mapping-api - - - diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml index 3026a272d2..a13bcbba14 100644 --- a/features/netconf/odl-netconf-netty-util/pom.xml +++ b/features/netconf/odl-netconf-netty-util/pom.xml @@ -48,12 +48,6 @@ xml features - - ${project.groupId} - odl-netconf-mapping-api - xml - features - ${project.groupId} odl-netconf-util diff --git a/features/netconf/odl-netconf-util/pom.xml b/features/netconf/odl-netconf-util/pom.xml index c15374fb67..0b519d079a 100644 --- a/features/netconf/odl-netconf-util/pom.xml +++ b/features/netconf/odl-netconf-util/pom.xml @@ -20,12 +20,6 @@ feature - - org.opendaylight.netconf - odl-netconf-mapping-api - xml - features - org.opendaylight.yangtools odl-yangtools-codec diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml index 9b0bb290ef..61a59d7e31 100644 --- a/features/netconf/pom.xml +++ b/features/netconf/pom.xml @@ -33,7 +33,6 @@ odl-netconf-api odl-netconf-client odl-netconf-impl - odl-netconf-mapping-api odl-netconf-mdsal odl-netconf-netty-util odl-netconf-notifications-api diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml index 21ca5f02f9..be0ead75f2 100644 --- a/netconf/mdsal-netconf-connector/pom.xml +++ b/netconf/mdsal-netconf-connector/pom.xml @@ -83,7 +83,7 @@ org.opendaylight.netconf - netconf-mapping-api + netconf-server org.opendaylight.netconf diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java index 3778c25e60..d5ea1e7544 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationService.java @@ -10,8 +10,6 @@ package org.opendaylight.netconf.mdsal.connector; import com.google.common.collect.ImmutableSet; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMRpcService; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; import org.opendaylight.netconf.mdsal.connector.ops.Commit; import org.opendaylight.netconf.mdsal.connector.ops.CopyConfig; import org.opendaylight.netconf.mdsal.connector.ops.DiscardChanges; @@ -22,6 +20,8 @@ import org.opendaylight.netconf.mdsal.connector.ops.Unlock; import org.opendaylight.netconf.mdsal.connector.ops.Validate; import org.opendaylight.netconf.mdsal.connector.ops.get.Get; import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; final class MdsalNetconfOperationService implements NetconfOperationService { private final ImmutableSet operations; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java index c59d625581..7e57acafe6 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/MdsalNetconfOperationServiceFactory.java @@ -26,9 +26,9 @@ import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.capability.YangModuleCapability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java index a7412a6983..4c2008573a 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractConfigOperation.java @@ -22,7 +22,7 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java index 53b7ba4a10..0de0b16e69 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Commit.java @@ -7,29 +7,27 @@ */ package org.opendaylight.netconf.mdsal.connector.ops; +import static java.util.Objects.requireNonNull; + import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; -// FIXME duplicated code -// netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/Commit.java public class Commit extends AbstractSingletonNetconfOperation { - private static final Logger LOG = LoggerFactory.getLogger(Commit.class); - private static final String OPERATION_NAME = "commit"; + private final TransactionProvider transactionProvider; public Commit(final String netconfSessionIdForReporting, final TransactionProvider transactionProvider) { super(netconfSessionIdForReporting); - this.transactionProvider = transactionProvider; - + this.transactionProvider = requireNonNull(transactionProvider); } @Override diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java index eed436c38e..fe0cbe2a59 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/DiscardChanges.java @@ -13,7 +13,7 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java index ab9076e2a4..c090600f0f 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Lock.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.mdsal.connector.ops; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -24,9 +24,7 @@ import org.w3c.dom.Element; confignetconfconnector/operations/Lock.java */ public class Lock extends AbstractSingletonNetconfOperation { - private static final Logger LOG = LoggerFactory.getLogger(Lock.class); - private static final String OPERATION_NAME = "lock"; private static final String TARGET_KEY = "target"; @@ -57,5 +55,4 @@ public class Lock extends AbstractSingletonNetconfOperation { protected String getOperationName() { return OPERATION_NAME; } - } diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java index a8fb6d8cea..ec8951e257 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpc.java @@ -25,10 +25,10 @@ import org.opendaylight.netconf.api.NetconfDocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -54,9 +54,7 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; public class RuntimeRpc extends AbstractSingletonNetconfOperation { - private static final Logger LOG = LoggerFactory.getLogger(RuntimeRpc.class); - private static final XMLOutputFactory XML_OUTPUT_FACTORY; static { @@ -164,13 +162,10 @@ public class RuntimeRpc extends AbstractSingletonNetconfOperation { } @Override - public Document handle(final Document requestMessage, - final NetconfOperationChainedExecution subsequentOperation) throws DocumentedException { - + public Document handle(final Document requestMessage, final NetconfOperationChainedExecution subsequentOperation) + throws DocumentedException { final XmlElement requestElement = getRequestElementWithCheck(requestMessage); - final Document document = XmlUtil.newDocument(); - final XmlElement operationElement = requestElement.getOnlyChildElement(); final Map attributes = requestElement.getAttributes(); diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java index 4fd8f22fee..71a9235904 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/Unlock.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.mdsal.connector.ops; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -19,10 +19,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; -/* FIXME Duplicated code - netconf/netconf/config-netconf-connector/src/main/java/org/opendaylight/netconf/confignetconfconnector/ - operations/UnLock.java -*/ public class Unlock extends AbstractSingletonNetconfOperation { private static final Logger LOG = LoggerFactory.getLogger(Unlock.class); private static final String OPERATION_NAME = "unlock"; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java index 8b9462a867..d0e7686835 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/AbstractGet.java @@ -21,7 +21,7 @@ import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.mdsal.connector.ops.Datastore; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java index 8dc6fdd3c9..811c3038f5 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/Get.java @@ -16,10 +16,6 @@ import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; -import org.opendaylight.netconf.mdsal.connector.ops.Datastore; -import org.opendaylight.yangtools.yang.common.ErrorSeverity; -import org.opendaylight.yangtools.yang.common.ErrorTag; -import org.opendaylight.yangtools.yang.common.ErrorType; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; @@ -28,14 +24,13 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; public class Get extends AbstractGet { - private static final Logger LOG = LoggerFactory.getLogger(Get.class); - private static final String OPERATION_NAME = "get"; + private final TransactionProvider transactionProvider; public Get(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext, - final TransactionProvider transactionProvider) { + final TransactionProvider transactionProvider) { super(netconfSessionIdForReporting, schemaContext); this.transactionProvider = transactionProvider; } @@ -51,7 +46,7 @@ public class Get extends AbstractGet { final YangInstanceIdentifier dataRoot = dataRootOptional.orElseThrow(); - final DOMDataTreeReadWriteTransaction rwTx = getTransaction(Datastore.running); + final DOMDataTreeReadWriteTransaction rwTx = transactionProvider.createRunningTransaction(); try { final Optional normalizedNodeOptional = rwTx.read( LogicalDatastoreType.OPERATIONAL, dataRoot).get(); @@ -68,16 +63,6 @@ public class Get extends AbstractGet { } } - private DOMDataTreeReadWriteTransaction getTransaction(final Datastore datastore) throws DocumentedException { - if (datastore == Datastore.candidate) { - return transactionProvider.getOrCreateTransaction(); - } else if (datastore == Datastore.running) { - return transactionProvider.createRunningTransaction(); - } - throw new DocumentedException("Incorrect Datastore: ", ErrorType.PROTOCOL, ErrorTag.BAD_ELEMENT, - ErrorSeverity.ERROR); - } - @Override protected String getOperationName() { return OPERATION_NAME; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java index 79d2c91a7f..e68d834289 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/ops/get/GetConfig.java @@ -28,10 +28,9 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; public class GetConfig extends AbstractGet { - private static final Logger LOG = LoggerFactory.getLogger(GetConfig.class); - private static final String OPERATION_NAME = "get-config"; + private final TransactionProvider transactionProvider; public GetConfig(final String netconfSessionIdForReporting, final CurrentSchemaContext schemaContext, diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java index 2e681c8dbb..2dd04a8434 100644 --- a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java +++ b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/AbstractNetconfOperationTest.java @@ -40,12 +40,12 @@ import org.opendaylight.mdsal.dom.broker.SerializedDOMDataBroker; import org.opendaylight.mdsal.dom.spi.store.DOMStore; import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; import org.opendaylight.netconf.mdsal.connector.ops.get.Get; import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.netconf.util.test.NetconfXmlUnitRecursiveQualifier; import org.opendaylight.netconf.util.test.XmlFileLoader; import org.opendaylight.yangtools.util.concurrent.SpecialExecutors; @@ -106,7 +106,7 @@ public abstract class AbstractNetconfOperationTest { final SerializedDOMDataBroker sdb = new SerializedDOMDataBroker(datastores, MoreExecutors.listeningDecorator(listenableFutureExecutor)); - this.transactionProvider = new TransactionProvider(sdb, SESSION_ID_FOR_REPORTING); + transactionProvider = new TransactionProvider(sdb, SESSION_ID_FOR_REPORTING); } protected CurrentSchemaContext getCurrentSchemaContext() { diff --git a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java index 0f5a6bb431..58e17786fc 100644 --- a/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java +++ b/netconf/mdsal-netconf-connector/src/test/java/org/opendaylight/netconf/mdsal/connector/ops/RuntimeRpcTest.java @@ -42,9 +42,9 @@ import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.mdsal.dom.spi.DefaultDOMRpcResult; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.netconf.util.test.XmlFileLoader; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.concepts.NoOpListenerRegistration; diff --git a/netconf/mdsal-netconf-impl/pom.xml b/netconf/mdsal-netconf-impl/pom.xml index 4c6a1c4114..022f8188cb 100644 --- a/netconf/mdsal-netconf-impl/pom.xml +++ b/netconf/mdsal-netconf-impl/pom.xml @@ -45,10 +45,6 @@ org.opendaylight.netconf netconf-server - - org.opendaylight.netconf - netconf-mapping-api - org.osgi org.osgi.framework diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java index 97a78bc865..31eedd9f9d 100644 --- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java +++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/DefaultNetconfMonitoringService.java @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; import java.util.Map; import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.osgi.NetconfMonitoringServiceImpl; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java index ea0eda2cdb..8e83e72210 100644 --- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java +++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/NetconfMapperAggregator.java @@ -7,8 +7,8 @@ */ package org.opendaylight.netconf.impl.mdsal; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java index 65a991cec2..865719b1f2 100644 --- a/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java +++ b/netconf/mdsal-netconf-impl/src/main/java/org/opendaylight/netconf/impl/mdsal/OSGiNetconfServer.java @@ -14,10 +14,10 @@ import io.netty.channel.EventLoopGroup; import io.netty.util.Timer; import java.util.Map; import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory; import org.opendaylight.netconf.server.ServerChannelInitializer; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory; import org.osgi.framework.FrameworkUtil; import org.osgi.service.component.ComponentFactory; diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml index 8b65efcfb6..7368bbbb5b 100644 --- a/netconf/mdsal-netconf-monitoring/pom.xml +++ b/netconf/mdsal-netconf-monitoring/pom.xml @@ -50,7 +50,7 @@ org.opendaylight.netconf - netconf-mapping-api + netconf-server org.opendaylight.netconf diff --git a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/GetSchema.java b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/GetSchema.java index c3c9bbf1d6..1fd76630fa 100644 --- a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/GetSchema.java +++ b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/GetSchema.java @@ -18,7 +18,7 @@ import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java index 8235949956..309dbef433 100644 --- a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java +++ b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java @@ -13,10 +13,10 @@ import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; import org.opendaylight.yangtools.concepts.Registration; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml deleted file mode 100644 index db857c91bf..0000000000 --- a/netconf/netconf-mapping-api/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.netconf - netconf-parent - 6.0.0-SNAPSHOT - ../../parent - - - netconf-mapping-api - ${project.artifactId} - bundle - - - - ${project.groupId} - netconf-api - - - com.google.guava - guava - - - diff --git a/netconf/pom.xml b/netconf/pom.xml index 91eaf76d13..adda768f62 100644 --- a/netconf/pom.xml +++ b/netconf/pom.xml @@ -37,7 +37,6 @@ mdsal-netconf-yang-library mdsal-netconf-impl netconf-netty-util - netconf-mapping-api netconf-auth aaa-authn-odl-plugin netconf-notifications-api diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml index 56a9d7a74c..87cd238ffe 100644 --- a/netconf/tools/netconf-testtool/pom.xml +++ b/netconf/tools/netconf-testtool/pom.xml @@ -102,10 +102,6 @@ org.opendaylight.mdsal.binding.model.ietf rfc6991 - - ${project.groupId} - netconf-mapping-api - org.opendaylight.netconf mdsal-netconf-monitoring diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java index 6fbbf29f5a..c1b8973931 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/MdsalOperationProvider.java @@ -23,9 +23,6 @@ import org.opendaylight.mdsal.dom.spi.store.DOMStore; import org.opendaylight.mdsal.dom.store.inmemory.InMemoryDOMDataStoreFactory; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; import org.opendaylight.netconf.mdsal.connector.ops.Commit; @@ -36,6 +33,9 @@ import org.opendaylight.netconf.mdsal.connector.ops.Unlock; import org.opendaylight.netconf.mdsal.connector.ops.get.Get; import org.opendaylight.netconf.mdsal.connector.ops.get.GetConfig; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.NetconfState; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas; @@ -147,6 +147,7 @@ class MdsalOperationProvider implements NetconfOperationServiceFactory { @Override public void close() { + // No-op } private ContainerNode createNetconfState() { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java index a4108fc62c..8c69562995 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/NetconfDeviceSimulator.java @@ -38,11 +38,11 @@ import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.capability.YangModuleCapability; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.NetconfServerDispatcherImpl; import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory; import org.opendaylight.netconf.server.ServerChannelInitializer; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.impl.DefaultSessionIdProvider; import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory; import org.opendaylight.netconf.shaded.sshd.common.keyprovider.KeyPairProvider; @@ -397,5 +397,4 @@ public class NetconfDeviceSimulator implements Closeable { minaTimerExecutor.shutdownNow(); nioExecutor.shutdownNow(); } - } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java index d46e0252a5..fd5171ba72 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/SimulatedOperationProvider.java @@ -7,16 +7,19 @@ */ package org.opendaylight.netconf.test.tool; +import static java.util.Objects.requireNonNull; + import com.google.common.collect.Sets; import java.io.File; import java.util.Optional; import java.util.Set; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.test.tool.rpc.DataList; import org.opendaylight.netconf.test.tool.rpc.SimulatedCommit; import org.opendaylight.netconf.test.tool.rpc.SimulatedCreateSubscription; @@ -29,14 +32,14 @@ import org.opendaylight.netconf.test.tool.rpc.SimulatedUnLock; import org.opendaylight.yangtools.concepts.Registration; class SimulatedOperationProvider implements NetconfOperationServiceFactory { - private final Set caps; + private final @NonNull Set caps; private final SimulatedOperationService simulatedOperationService; SimulatedOperationProvider(final SessionIdProvider idProvider, final Set caps, final Optional notificationsFile, final Optional initialConfigXMLFile) { - this.caps = caps; + this.caps = requireNonNull(caps); simulatedOperationService = new SimulatedOperationService( idProvider.getCurrentSessionId(), notificationsFile, initialConfigXMLFile); } @@ -90,7 +93,7 @@ class SimulatedOperationProvider implements NetconfOperationServiceFactory { @Override public void close() { + // No-op } - } } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java index 6eb8634eef..0613918760 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/TesttoolNegotiationFactory.java @@ -14,10 +14,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java index 84f2fbeaa4..bcf30eeb64 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableOperationProvider.java @@ -11,9 +11,9 @@ import java.io.File; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; public class SettableOperationProvider implements NetconfOperationServiceFactory { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableRpc.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableRpc.java index 09eb2bacf8..fd53b97e93 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableRpc.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/customrpc/SettableRpc.java @@ -13,9 +13,9 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -27,7 +27,6 @@ import org.w3c.dom.Document; * {@link NetconfOperation} which is able to handle it. */ class SettableRpc implements NetconfOperation { - private final RpcMapping mapping; SettableRpc(final File rpcConfig) { @@ -65,5 +64,4 @@ class SettableRpc implements NetconfOperation { throw DocumentedException.fromXMLDocument(document); } } - } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/Get.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/Get.java index ae504ace81..57432bebb1 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/Get.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/Get.java @@ -12,9 +12,9 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; -import org.opendaylight.netconf.util.mapping.AbstractNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractNetconfOperation; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -24,8 +24,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; public class Get extends AbstractNetconfOperation { - private static final Logger LOG = LoggerFactory.getLogger(Get.class); + private final NetconfMonitoringService netconfMonitor; public Get(final NetconfMonitoringService netconfMonitor) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java index ee89d8b95d..02d3dd1c87 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationService.java @@ -10,8 +10,8 @@ package org.opendaylight.netconf.test.tool.monitoring; import java.util.Set; import org.opendaylight.controller.config.yang.netconf.mdsal.monitoring.GetSchema; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; public class NetconfMonitoringOperationService implements NetconfOperationService { private final NetconfMonitoringService monitor; @@ -29,5 +29,4 @@ public class NetconfMonitoringOperationService implements NetconfOperationServic public void close() { // No-op } - } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationServiceFactory.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationServiceFactory.java index 7f3513a806..b9a5385ab1 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationServiceFactory.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfMonitoringOperationServiceFactory.java @@ -13,8 +13,8 @@ import java.util.Set; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; public class NetconfMonitoringOperationServiceFactory implements NetconfOperationServiceFactory, AutoCloseable { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java index 9f7ea8db74..c1c5833135 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/DefaultOperationsCreator.java @@ -11,9 +11,9 @@ import com.google.common.collect.Sets; import java.util.Optional; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.test.tool.rpc.DataList; import org.opendaylight.netconf.test.tool.rpc.SimulatedCommit; import org.opendaylight.netconf.test.tool.rpc.SimulatedCreateSubscription; @@ -65,6 +65,5 @@ public final class DefaultOperationsCreator implements OperationsCreator { @Override public void close() { } - } } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java index eb2489596a..fb601f4273 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsCreator.java @@ -9,8 +9,8 @@ package org.opendaylight.netconf.test.tool.operations; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; /** * Creator which enables testtool users to inject own. implementation of {@link NetconfOperationService} diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java index a379390f87..81ac88cb18 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/operations/OperationsProvider.java @@ -10,12 +10,11 @@ package org.opendaylight.netconf.test.tool.operations; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; - public class OperationsProvider implements NetconfOperationServiceFactory { private final Set caps; private final SessionIdProvider idProvider; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java index aa7b3a437e..de30fba731 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedCommit.java @@ -9,7 +9,7 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; 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 b354dcd100..a589147d11 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 @@ -28,8 +28,8 @@ import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.server.NetconfServerSession; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.opendaylight.netconf.server.mapping.operations.DefaultNetconfOperation; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java index dc445ab7ff..25a476636d 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedDiscardChanges.java @@ -9,12 +9,11 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; public class SimulatedDiscardChanges extends AbstractLastNetconfOperation { - public SimulatedDiscardChanges(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java index 65c222ec67..e2994ef0fe 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedEditConfig.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java index 41821f6b10..b46447f50c 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGet.java @@ -9,12 +9,11 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; public class SimulatedGet extends AbstractLastNetconfOperation { - private final DataList storage; public SimulatedGet(final String netconfSessionIdForReporting, final DataList storage) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java index a7bc4cfbde..83dc100601 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedGetConfig.java @@ -14,7 +14,7 @@ import java.util.Optional; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; @@ -22,9 +22,9 @@ import org.w3c.dom.Element; import org.xml.sax.SAXException; public class SimulatedGetConfig extends AbstractLastNetconfOperation { + private static final Logger LOG = LoggerFactory.getLogger(SimulatedGetConfig.class); private final DataList storage; - private static final Logger LOG = LoggerFactory.getLogger(SimulatedGetConfig.class); public SimulatedGetConfig(final String netconfSessionIdForReporting, final DataList storage, final Optional initialConfigXMLFile) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java index 38034de0e8..121ba90481 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedLock.java @@ -9,12 +9,11 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; public class SimulatedLock extends AbstractLastNetconfOperation { - public SimulatedLock(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java index 99113eff91..28929fae0b 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpc/SimulatedUnLock.java @@ -9,12 +9,11 @@ package org.opendaylight.netconf.test.tool.rpc; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.util.mapping.AbstractLastNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractLastNetconfOperation; import org.w3c.dom.Document; import org.w3c.dom.Element; public class SimulatedUnLock extends AbstractLastNetconfOperation { - public SimulatedUnLock(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); } diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java index bfc4818397..24c4c68519 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableOperationRpcProvider.java @@ -5,19 +5,17 @@ * 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.test.tool.rpchandler; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; public class SettableOperationRpcProvider implements NetconfOperationServiceFactory { - private final RpcHandler rpcHandler; public SettableOperationRpcProvider(final RpcHandler rpcHandler) { diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableRpc.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableRpc.java index efa1b592c9..d4ef012400 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableRpc.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/rpchandler/SettableRpc.java @@ -12,9 +12,9 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; @@ -26,7 +26,6 @@ import org.w3c.dom.Document; * {@link NetconfOperation} which is able to handle it. */ class SettableRpc implements NetconfOperation { - private final RpcHandler rpcHandler; SettableRpc(final RpcHandler rpcHandler) { @@ -64,5 +63,4 @@ class SettableRpc implements NetconfOperation { throw DocumentedException.fromXMLDocument(document); } } - } diff --git a/plugins/sal-netconf-connector/pom.xml b/plugins/sal-netconf-connector/pom.xml index 44658d6cda..45b18f671a 100644 --- a/plugins/sal-netconf-connector/pom.xml +++ b/plugins/sal-netconf-connector/pom.xml @@ -120,11 +120,6 @@ netconf-server test - - ${project.groupId} - netconf-mapping-api - test - ${project.groupId} netconf-util diff --git a/protocol/netconf-server/pom.xml b/protocol/netconf-server/pom.xml index 28acf944e9..90b4ff49a6 100644 --- a/protocol/netconf-server/pom.xml +++ b/protocol/netconf-server/pom.xml @@ -37,10 +37,6 @@ ${project.groupId} netconf-api - - ${project.groupId} - netconf-mapping-api - ${project.groupId} netconf-notifications-api 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 1a3ad542bb..b373716165 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 @@ -22,7 +22,7 @@ import org.opendaylight.netconf.api.monitoring.SessionListener; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl; -import org.opendaylight.netconf.util.messages.SubtreeFilter; +import org.opendaylight.netconf.server.spi.SubtreeFilter; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java index d2533c53f2..ee168d9ca1 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactory.java @@ -21,11 +21,11 @@ import org.opendaylight.netconf.api.NetconfSessionListenerFactory; import org.opendaylight.netconf.api.messages.HelloMessage; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.nettyutil.AbstractNetconfSessionNegotiator; import org.opendaylight.netconf.nettyutil.NetconfSessionNegotiatorFactory; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java index 0b9cd25402..7949e90f3e 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSessionNegotiatorFactoryBuilder.java @@ -14,9 +14,9 @@ import io.netty.util.Timer; import java.util.Set; import org.checkerframework.checker.index.qual.NonNegative; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.nettyutil.AbstractNetconfSessionNegotiator; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; public class NetconfServerSessionNegotiatorFactoryBuilder { private Timer timer; diff --git a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractLastNetconfOperation.java similarity index 90% rename from protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractLastNetconfOperation.java index 2e6f6410cb..a76c942456 100644 --- a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperation.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractLastNetconfOperation.java @@ -5,12 +5,10 @@ * 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.util.mapping; +package org.opendaylight.netconf.server.api.operations; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperation.java similarity index 95% rename from protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperation.java index f6dde7d958..40d1412a5f 100644 --- a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperation.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperation.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.util.mapping; +package org.opendaylight.netconf.server.api.operations; import java.util.Map; import java.util.Optional; @@ -13,9 +13,6 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.w3c.dom.Attr; import org.w3c.dom.Document; import org.w3c.dom.Element; diff --git a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractSingletonNetconfOperation.java similarity index 64% rename from protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractSingletonNetconfOperation.java index 77d4bb3400..a0814f9d88 100644 --- a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperation.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/AbstractSingletonNetconfOperation.java @@ -5,24 +5,22 @@ * 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.util.mapping; +package org.opendaylight.netconf.server.api.operations; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.w3c.dom.Document; import org.w3c.dom.Element; public abstract class AbstractSingletonNetconfOperation extends AbstractLastNetconfOperation { - protected AbstractSingletonNetconfOperation(String netconfSessionIdForReporting) { + protected AbstractSingletonNetconfOperation(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); } @Override - protected Element handle(Document document, XmlElement operationElement, - NetconfOperationChainedExecution subsequentOperation) throws DocumentedException { + protected Element handle(final Document document, final XmlElement operationElement, + final NetconfOperationChainedExecution subsequentOperation) throws DocumentedException { return handleWithNoSubsequentOperations(document, operationElement); } @@ -30,5 +28,4 @@ public abstract class AbstractSingletonNetconfOperation extends AbstractLastNetc protected HandlingPriority getHandlingPriority() { return HandlingPriority.HANDLE_WITH_MAX_PRIORITY; } - } diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.java similarity index 85% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.java index 2f1f37f205..8d485bbba7 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/HandlingPriority.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/HandlingPriority.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.mapping.api; +package org.opendaylight.netconf.server.api.operations; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; @@ -15,7 +15,6 @@ import java.util.Objects; import java.util.Optional; public final class HandlingPriority implements Comparable { - public static final HandlingPriority CANNOT_HANDLE = new HandlingPriority(); public static final HandlingPriority HANDLE_WITH_DEFAULT_PRIORITY = new HandlingPriority(Integer.MIN_VALUE); public static final HandlingPriority HANDLE_WITH_MAX_PRIORITY = new HandlingPriority(Integer.MAX_VALUE); @@ -51,7 +50,7 @@ public final class HandlingPriority implements Comparable { } public boolean isCannotHandle() { - return this.equals(CANNOT_HANDLE); + return equals(CANNOT_HANDLE); } @Override @@ -82,16 +81,7 @@ public final class HandlingPriority implements Comparable { @Override public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof HandlingPriority)) { - return false; - } - - HandlingPriority that = (HandlingPriority) obj; - - return Objects.equals(priority, that.priority); + return this == obj || obj instanceof HandlingPriority other && Objects.equals(priority, other.priority); } @Override @@ -101,8 +91,6 @@ public final class HandlingPriority implements Comparable { @Override public String toString() { - return MoreObjects.toStringHelper(this) - .add("priority", priority) - .toString(); + return MoreObjects.toStringHelper(this).add("priority", priority).toString(); } } diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperation.java similarity index 97% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperation.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperation.java index 7a9523cae2..395a0c0524 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperation.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperation.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.mapping.api; +package org.opendaylight.netconf.server.api.operations; import org.opendaylight.netconf.api.DocumentedException; import org.w3c.dom.Document; diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationChainedExecution.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.java similarity index 96% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationChainedExecution.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.java index 8d0385948a..fd567a1594 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationChainedExecution.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationChainedExecution.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.mapping.api; +package org.opendaylight.netconf.server.api.operations; import org.opendaylight.netconf.api.DocumentedException; import org.w3c.dom.Document; diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationService.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationService.java similarity index 92% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationService.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationService.java index e7a903a660..c9888cbdfc 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationService.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationService.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.mapping.api; +package org.opendaylight.netconf.server.api.operations; import java.util.Set; diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationServiceFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.java similarity index 95% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationServiceFactory.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.java index f38c059b59..d1c3f751ed 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationServiceFactory.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.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.mapping.api; +package org.opendaylight.netconf.server.api.operations; import java.util.Set; import org.eclipse.jdt.annotation.NonNull; diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationServiceFactoryListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java similarity index 90% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationServiceFactoryListener.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java index 4c100a83cf..9a5c4cc42f 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/NetconfOperationServiceFactoryListener.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactoryListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.mapping.api; +package org.opendaylight.netconf.server.api.operations; public interface NetconfOperationServiceFactoryListener { diff --git a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/SessionAwareNetconfOperation.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java similarity index 89% rename from netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/SessionAwareNetconfOperation.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java index 7a81176c3c..5d384677dd 100644 --- a/netconf/netconf-mapping-api/src/main/java/org/opendaylight/netconf/mapping/api/SessionAwareNetconfOperation.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/SessionAwareNetconfOperation.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.mapping.api; +package org.opendaylight.netconf.server.api.operations; import org.opendaylight.netconf.api.NetconfSession; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java index 02fde45c91..fa67a388d9 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultCloseSession.java @@ -14,7 +14,7 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.server.NetconfServerSession; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; 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 4f7150a19c..aee7eb6031 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 @@ -12,9 +12,9 @@ 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; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.netconf.server.NetconfServerSession; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.opendaylight.yangtools.yang.common.ErrorType; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java index 30de1e854a..c1dd6a154c 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/mapping/operations/DefaultStopExi.java @@ -11,7 +11,7 @@ import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.server.NetconfServerSession; -import org.opendaylight.netconf.util.mapping.AbstractSingletonNetconfOperation; +import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Document; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java index 372f6e76a0..65f80515aa 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactory.java @@ -19,10 +19,10 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactoryListener; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; import org.opendaylight.yangtools.concepts.AbstractRegistration; import org.opendaylight.yangtools.concepts.Registration; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java index 92a63e98f8..092536ea9b 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringService.java @@ -26,8 +26,8 @@ import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.Yang; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java index dc62112206..25dde0af84 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfMonitoringServiceImpl.java @@ -11,8 +11,8 @@ import java.util.Optional; import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.monitoring.SessionListener; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Sessions; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java index 3a2cf07efd..28fd80fda4 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImpl.java @@ -20,12 +20,12 @@ import java.util.TreeMap; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.SessionAwareNetconfOperation; import org.opendaylight.netconf.server.NetconfServerSession; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.SessionAwareNetconfOperation; import org.opendaylight.netconf.server.mapping.operations.DefaultCloseSession; import org.opendaylight.netconf.server.mapping.operations.DefaultNetconfOperation; import org.opendaylight.netconf.server.mapping.operations.DefaultStartExi; diff --git a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/SubtreeFilter.java similarity index 98% rename from protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/SubtreeFilter.java index f1a6ec5bae..c4234953c1 100644 --- a/protocol/netconf-util/src/main/java/org/opendaylight/netconf/util/messages/SubtreeFilter.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/SubtreeFilter.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.util.messages; +package org.opendaylight.netconf.server.spi; import java.util.Map; import java.util.Objects; @@ -15,7 +15,7 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlNetconfConstants; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.util.mapping.AbstractNetconfOperation.OperationNameAndNamespace; +import org.opendaylight.netconf.server.api.operations.AbstractNetconfOperation.OperationNameAndNamespace; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.w3c.dom.Attr; @@ -30,7 +30,7 @@ public final class SubtreeFilter { private static final Logger LOG = LoggerFactory.getLogger(SubtreeFilter.class); private SubtreeFilter() { - + // Hidden on purpose } public static Document applyRpcSubtreeFilter(final Document requestDocument, diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/package-info.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/package-info.java new file mode 100644 index 0000000000..d00b0755a7 --- /dev/null +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/spi/package-info.java @@ -0,0 +1,11 @@ +/* + * Copyright (c) 2023 PANTHEON.tech, s.r.o. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +/** + * Utility classes for realizing the NETCONF server APIs. + */ +package org.opendaylight.netconf.server.spi; \ No newline at end of file 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 145f9f0e98..52b946674e 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 @@ -63,14 +63,14 @@ import org.opendaylight.netconf.client.SimpleNetconfClientSessionListener; import org.opendaylight.netconf.client.TestingNetconfClient; import org.opendaylight.netconf.client.conf.NetconfClientConfiguration; import org.opendaylight.netconf.client.conf.NetconfClientConfigurationBuilder; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.nettyutil.NeverReconnectStrategy; import org.opendaylight.netconf.nettyutil.handler.exi.NetconfStartExiMessage; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.impl.DefaultSessionIdProvider; import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory; import org.opendaylight.netconf.util.test.XmlFileLoader; diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractLastNetconfOperationTest.java similarity index 78% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractLastNetconfOperationTest.java index 59d5ce4e1b..e861e15129 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractLastNetconfOperationTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractLastNetconfOperationTest.java @@ -5,8 +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.util.mapping; +package org.opendaylight.netconf.server.api.operations; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -17,24 +16,21 @@ import org.junit.Before; import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.w3c.dom.Document; import org.w3c.dom.Element; public class AbstractLastNetconfOperationTest { - class LastNetconfOperationImplTest extends AbstractLastNetconfOperation { - + private static final class LastNetconfOperationImplTest extends AbstractLastNetconfOperation { boolean handleWithNoSubsequentOperationsRun; - protected LastNetconfOperationImplTest(String netconfSessionIdForReporting) { + protected LastNetconfOperationImplTest(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); handleWithNoSubsequentOperationsRun = false; } @Override - protected Element handleWithNoSubsequentOperations(Document document, - XmlElement operationElement) throws DocumentedException { + protected Element handleWithNoSubsequentOperations(final Document document, final XmlElement operationElement) + throws DocumentedException { handleWithNoSubsequentOperationsRun = true; return null; } diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java similarity index 84% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java index 5420432f01..efd96bf287 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractNetconfOperationTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractNetconfOperationTest.java @@ -5,8 +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.util.mapping; +package org.opendaylight.netconf.server.api.operations; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -19,20 +18,17 @@ import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; import org.opendaylight.netconf.util.test.XmlFileLoader; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; public class AbstractNetconfOperationTest { - static class NetconfOperationImpl extends AbstractNetconfOperation { + private static class NetconfOperationImpl extends AbstractNetconfOperation { public boolean handleRun; - protected NetconfOperationImpl(final String netconfSessionIdForReporting) { + NetconfOperationImpl(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); - this.handleRun = false; } @Override @@ -43,7 +39,7 @@ public class AbstractNetconfOperationTest { @Override protected Element handle(final Document document, final XmlElement message, final NetconfOperationChainedExecution subsequentOperation) throws DocumentedException { - this.handleRun = true; + handleRun = true; try { return XmlUtil.readXmlToElement(""); } catch (SAXException | IOException e) { diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractSingletonNetconfOperationTest.java similarity index 69% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractSingletonNetconfOperationTest.java index 7c2c9e86fe..2e9c1ada68 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/mapping/AbstractSingletonNetconfOperationTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/AbstractSingletonNetconfOperationTest.java @@ -5,28 +5,25 @@ * 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.util.mapping; +package org.opendaylight.netconf.server.api.operations; import static org.junit.Assert.assertEquals; import org.junit.Test; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlElement; -import org.opendaylight.netconf.mapping.api.HandlingPriority; import org.w3c.dom.Document; import org.w3c.dom.Element; public class AbstractSingletonNetconfOperationTest { - class SingletonNCOperationImpl extends AbstractSingletonNetconfOperation { - - protected SingletonNCOperationImpl(String netconfSessionIdForReporting) { + private static final class SingletonNCOperationImpl extends AbstractSingletonNetconfOperation { + SingletonNCOperationImpl(final String netconfSessionIdForReporting) { super(netconfSessionIdForReporting); } @Override - protected Element handleWithNoSubsequentOperations(Document document, - XmlElement operationElement) throws DocumentedException { + protected Element handleWithNoSubsequentOperations(final Document document, + final XmlElement operationElement) throws DocumentedException { return null; } diff --git a/netconf/netconf-mapping-api/src/main/test/java/org/opendaylight/netconf/mapping/api/HandlingPriorityTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/HandlingPriorityTest.java similarity index 65% rename from netconf/netconf-mapping-api/src/main/test/java/org/opendaylight/netconf/mapping/api/HandlingPriorityTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/HandlingPriorityTest.java index 1146dbedaf..5d09e6656c 100644 --- a/netconf/netconf-mapping-api/src/main/test/java/org/opendaylight/netconf/mapping/api/HandlingPriorityTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/operations/HandlingPriorityTest.java @@ -5,31 +5,28 @@ * 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.controller.netconf.mapping.api; +package org.opendaylight.netconf.server.api.operations; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.opendaylight.netconf.mapping.api.HandlingPriority; public class HandlingPriorityTest { - - @Test public void testHandlingPriority() throws Exception { - assertTrue( - HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY) - == 0); - assertTrue(HandlingPriority.CANNOT_HANDLE.compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY) == -1); - assertTrue(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.compareTo(HandlingPriority.CANNOT_HANDLE) == 1); - - assertTrue( - HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.compareTo(HandlingPriority.HANDLE_WITH_MAX_PRIORITY) == -1); - assertTrue( - HandlingPriority.HANDLE_WITH_MAX_PRIORITY.compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY) == 1); - assertTrue(HandlingPriority.getHandlingPriority(Integer.MIN_VALUE) - .compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY) == 0); + @Test + public void testHandlingPriority() throws Exception { + assertEquals(0, + HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY)); + assertEquals(-1, HandlingPriority.CANNOT_HANDLE.compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY)); + assertEquals(1, HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.compareTo(HandlingPriority.CANNOT_HANDLE)); + + assertEquals(-1, + HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY.compareTo(HandlingPriority.HANDLE_WITH_MAX_PRIORITY)); + assertEquals(1, + HandlingPriority.HANDLE_WITH_MAX_PRIORITY.compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY)); + assertEquals(0, HandlingPriority.getHandlingPriority(Integer.MIN_VALUE) + .compareTo(HandlingPriority.HANDLE_WITH_DEFAULT_PRIORITY)); HandlingPriority prio = HandlingPriority.getHandlingPriority(10); assertTrue(prio.increasePriority(1).compareTo(HandlingPriority.getHandlingPriority(11)) == 0); diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java index 4287013897..15e965fc4e 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/AggregatedNetconfOperationServiceFactoryTest.java @@ -24,7 +24,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; @RunWith(MockitoJUnitRunner.StrictStubs.class) diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java index a137cbb700..e65d457a61 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfCapabilityMonitoringServiceTest.java @@ -32,8 +32,8 @@ import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.capability.YangModuleCapability; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Capabilities; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.CapabilitiesBuilder; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java index d598d64967..8a57d58bf2 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfOperationRouterImplTest.java @@ -29,10 +29,10 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.xml.XmlUtil; -import org.opendaylight.netconf.mapping.api.HandlingPriority; -import org.opendaylight.netconf.mapping.api.NetconfOperation; -import org.opendaylight.netconf.mapping.api.NetconfOperationChainedExecution; -import org.opendaylight.netconf.mapping.api.NetconfOperationService; +import org.opendaylight.netconf.server.api.operations.HandlingPriority; +import org.opendaylight.netconf.server.api.operations.NetconfOperation; +import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; +import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.yangtools.yang.common.ErrorTag; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/spi/SubtreeFilterNotificationTest.java similarity index 90% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/spi/SubtreeFilterNotificationTest.java index b7c841485e..2eeeae10aa 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterNotificationTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/spi/SubtreeFilterNotificationTest.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.util.messages; +package org.opendaylight.netconf.server.spi; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -13,7 +13,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.Optional; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; @@ -37,14 +36,14 @@ public class SubtreeFilterNotificationTest { @Parameters public static Collection data() { - List result = new ArrayList<>(); + var result = new ArrayList(); for (int i = 0; i < 5; i++) { result.add(new Object[]{i}); } return result; } - public SubtreeFilterNotificationTest(int directoryIndex) { + public SubtreeFilterNotificationTest(final int directoryIndex) { this.directoryIndex = directoryIndex; } @@ -70,7 +69,7 @@ public class SubtreeFilterNotificationTest { } } - public Document getDocument(String fileName) throws SAXException, IOException { + public Document getDocument(final String fileName) throws SAXException, IOException { return XmlUtil.readXmlToDocument(getClass().getResourceAsStream( "/subtree/notification/" + directoryIndex + "/" + fileName)); } diff --git a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/spi/SubtreeFilterRpcTest.java similarity index 91% rename from protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/spi/SubtreeFilterRpcTest.java index aa701658b5..9aca8becdb 100644 --- a/protocol/netconf-util/src/test/java/org/opendaylight/netconf/util/messages/SubtreeFilterRpcTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/spi/SubtreeFilterRpcTest.java @@ -5,8 +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.util.messages; +package org.opendaylight.netconf.server.spi; import static org.junit.Assert.assertTrue; @@ -42,7 +41,7 @@ public class SubtreeFilterRpcTest { return result; } - public SubtreeFilterRpcTest(int directoryIndex) { + public SubtreeFilterRpcTest(final int directoryIndex) { this.directoryIndex = directoryIndex; } @@ -63,7 +62,7 @@ public class SubtreeFilterRpcTest { } - public Document getDocument(String fileName) throws SAXException, IOException { + public Document getDocument(final String fileName) throws SAXException, IOException { return XmlUtil.readXmlToDocument( getClass().getResourceAsStream("/subtree/rpc/" + directoryIndex + "/" + fileName)); } diff --git a/protocol/netconf-util/pom.xml b/protocol/netconf-util/pom.xml index 7e5a14f690..c91b0b2f46 100644 --- a/protocol/netconf-util/pom.xml +++ b/protocol/netconf-util/pom.xml @@ -82,10 +82,6 @@ org.opendaylight.netconf netconf-api - - org.opendaylight.netconf - netconf-mapping-api - org.osgi org.osgi.service.component.annotations -- 2.36.6