From 9ea4622349b8f1e149e9d8339334c450607e3f48 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 26 Apr 2023 19:55:44 +0200 Subject: [PATCH] Move netconf.api.monitoring This API is a server-side thing, rename it to netconf.server.api.monitoring and document the package. JIRA: NETCONF-945 Change-Id: I1cd390dcb3cfb6a75493485c8727c366c3f53e20 Signed-off-by: Robert Varga --- ...etconfNotificationOperationServiceFactory.java | 2 +- .../mdsal/connector/CurrentSchemaContext.java | 2 +- .../MdsalNetconfOperationServiceFactory.java | 2 +- .../mdsal/DefaultNetconfMonitoringService.java | 2 +- .../yang/netconf/mdsal/monitoring/GetSchema.java | 4 ++-- .../monitoring/MdsalMonitoringMapperFactory.java | 4 ++-- .../mdsal/monitoring/MonitoringToMdsalWriter.java | 6 +++--- .../monitoring/MonitoringToMdsalWriterTest.java | 3 +-- .../netconf/test/tool/DummyMonitoringService.java | 8 ++++---- .../netconf/test/tool/MdsalOperationProvider.java | 2 +- .../netconf/test/tool/NetconfDeviceSimulator.java | 2 +- .../test/tool/SimulatedOperationProvider.java | 2 +- .../test/tool/TesttoolNegotiationFactory.java | 3 +-- .../tool/customrpc/SettableOperationProvider.java | 2 +- .../netconf/test/tool/monitoring/Get.java | 2 +- .../NetconfMonitoringOperationService.java | 2 +- .../NetconfMonitoringOperationServiceFactory.java | 2 +- .../test/tool/monitoring/NetconfState.java | 6 +++--- .../test/tool/operations/OperationsProvider.java | 2 +- .../rpchandler/SettableOperationRpcProvider.java | 2 +- .../netconf/server/NetconfServerSession.java | 2 +- .../server/NetconfServerSessionListener.java | 6 +++--- .../NetconfServerSessionNegotiatorFactory.java | 2 +- ...confServerSessionNegotiatorFactoryBuilder.java | 2 +- .../api/monitoring/CapabilityListener.java | 4 +--- .../api/monitoring/NetconfManagementSession.java | 2 +- .../api/monitoring/NetconfMonitoringService.java | 4 +--- .../server}/api/monitoring/SessionEvent.java | 15 +++++++-------- .../server}/api/monitoring/SessionListener.java | 7 +------ .../NetconfOperationServiceFactory.java | 2 +- .../AggregatedNetconfOperationServiceFactory.java | 2 +- .../osgi/NetconfCapabilityMonitoringService.java | 4 ++-- .../server/osgi/NetconfMonitoringServiceImpl.java | 4 ++-- .../server/osgi/NetconfOperationRouterImpl.java | 2 +- .../osgi/NetconfSessionMonitoringService.java | 8 ++++---- .../netconf/server/ConcurrentClientsTest.java | 8 ++++---- .../server/NetconfServerSessionListenerTest.java | 6 +++--- .../server}/api/monitoring/SessionEventTest.java | 12 +++++++----- ...regatedNetconfOperationServiceFactoryTest.java | 2 +- .../NetconfCapabilityMonitoringServiceTest.java | 2 +- .../osgi/NetconfSessionMonitoringServiceTest.java | 6 +++--- 41 files changed, 76 insertions(+), 86 deletions(-) rename protocol/{netconf-api/src/main/java/org/opendaylight/netconf => netconf-server/src/main/java/org/opendaylight/netconf/server}/api/monitoring/CapabilityListener.java (90%) rename protocol/{netconf-api/src/main/java/org/opendaylight/netconf => netconf-server/src/main/java/org/opendaylight/netconf/server}/api/monitoring/NetconfManagementSession.java (90%) rename protocol/{netconf-api/src/main/java/org/opendaylight/netconf => netconf-server/src/main/java/org/opendaylight/netconf/server}/api/monitoring/NetconfMonitoringService.java (98%) rename protocol/{netconf-api/src/main/java/org/opendaylight/netconf => netconf-server/src/main/java/org/opendaylight/netconf/server}/api/monitoring/SessionEvent.java (73%) rename protocol/{netconf-api/src/main/java/org/opendaylight/netconf => netconf-server/src/main/java/org/opendaylight/netconf/server}/api/monitoring/SessionListener.java (90%) rename protocol/{netconf-api/src/test/java/org/opendaylight/netconf => netconf-server/src/test/java/org/opendaylight/netconf/server}/api/monitoring/SessionEventTest.java (76%) 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 4c0d002ca0..e843a263c9 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 @@ -11,8 +11,8 @@ 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.notifications.NetconfNotificationRegistry; +import org.opendaylight.netconf.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; diff --git a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java index 3956d3a8af..cd542c1d5f 100644 --- a/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java +++ b/netconf/mdsal-netconf-connector/src/main/java/org/opendaylight/netconf/mdsal/connector/CurrentSchemaContext.java @@ -16,7 +16,7 @@ import java.util.concurrent.atomic.AtomicReference; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.netconf.api.capability.Capability; -import org.opendaylight.netconf.api.monitoring.CapabilityListener; +import org.opendaylight.netconf.server.api.monitoring.CapabilityListener; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContextListener; 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 7e57acafe6..5f4ed1e381 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 @@ -25,7 +25,7 @@ import org.opendaylight.mdsal.dom.api.DOMYangTextSourceProvider; 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.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactoryListener; 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 31eedd9f9d..813a59d2a0 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 @@ -11,7 +11,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.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.osgi.NetconfMonitoringServiceImpl; import org.osgi.service.component.annotations.Activate; 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 1fd76630fa..b71cedadde 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 @@ -14,10 +14,10 @@ import java.util.Optional; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; 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.api.xml.XmlUtil; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.AbstractSingletonNetconfOperation; import org.opendaylight.yangtools.yang.common.ErrorSeverity; import org.opendaylight.yangtools.yang.common.ErrorTag; @@ -28,11 +28,11 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; public final class GetSchema extends AbstractSingletonNetconfOperation { + private static final Logger LOG = LoggerFactory.getLogger(GetSchema.class); private static final String GET_SCHEMA = "get-schema"; private static final String IDENTIFIER = "identifier"; private static final String VERSION = "version"; - private static final Logger LOG = LoggerFactory.getLogger(GetSchema.class); private final NetconfMonitoringService monitoring; public GetSchema(final String netconfSessionIdForReporting, final NetconfMonitoringService monitoring) { 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 309dbef433..ab2f79e4f3 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 @@ -11,8 +11,8 @@ 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.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.CapabilityListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; diff --git a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java index b62387eefe..82e5555240 100644 --- a/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java +++ b/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriter.java @@ -17,9 +17,9 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.CommitInfo; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService.CapabilitiesListener; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService.SessionsListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService.CapabilitiesListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService.SessionsListener; 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.netconf.state.Capabilities; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Schemas; diff --git a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java index a48ebdc764..e69c398313 100644 --- a/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java +++ b/netconf/mdsal-netconf-monitoring/src/test/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MonitoringToMdsalWriterTest.java @@ -25,7 +25,7 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; 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.netconf.state.Capabilities; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.CapabilitiesBuilder; @@ -40,7 +40,6 @@ import org.opendaylight.yangtools.yang.common.Uint32; @RunWith(MockitoJUnitRunner.StrictStubs.class) public class MonitoringToMdsalWriterTest { - private static final InstanceIdentifier INSTANCE_IDENTIFIER = InstanceIdentifier.create(NetconfState.class); diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java index 41b9ce6591..f63dc732db 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/DummyMonitoringService.java @@ -19,10 +19,10 @@ import java.util.List; import java.util.Optional; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; -import org.opendaylight.netconf.api.monitoring.NetconfManagementSession; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.SessionEvent; -import org.opendaylight.netconf.api.monitoring.SessionListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfManagementSession; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionEvent; +import org.opendaylight.netconf.server.api.monitoring.SessionListener; 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/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 c1b8973931..3ce5e87c4f 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 @@ -22,7 +22,6 @@ 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.capability.Capability; -import org.opendaylight.netconf.api.monitoring.CapabilityListener; import org.opendaylight.netconf.mdsal.connector.CurrentSchemaContext; import org.opendaylight.netconf.mdsal.connector.TransactionProvider; import org.opendaylight.netconf.mdsal.connector.ops.Commit; @@ -33,6 +32,7 @@ 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.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; 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 8c69562995..a5e774265d 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 @@ -37,11 +37,11 @@ import java.util.concurrent.ScheduledExecutorService; 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.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.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.impl.DefaultSessionIdProvider; import org.opendaylight.netconf.server.osgi.AggregatedNetconfOperationServiceFactory; 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 fd5171ba72..8ecfe8d5c5 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 @@ -15,8 +15,8 @@ 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.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; 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 0613918760..677d252601 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 @@ -5,7 +5,6 @@ * 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; import io.netty.util.Timer; @@ -13,9 +12,9 @@ import java.net.SocketAddress; import java.util.HashMap; import java.util.Map; import java.util.Set; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.NetconfServerSessionNegotiatorFactory; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.slf4j.Logger; 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 bcf30eeb64..6a1440bb84 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 @@ -10,7 +10,7 @@ package org.opendaylight.netconf.test.tool.customrpc; 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.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; 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 57432bebb1..a493dc7c9e 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 @@ -9,9 +9,9 @@ package org.opendaylight.netconf.test.tool.monitoring; import java.util.Map; 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.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.AbstractNetconfOperation; import org.opendaylight.netconf.server.api.operations.HandlingPriority; import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; 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 02d3dd1c87..8c300fdfaa 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 @@ -9,7 +9,7 @@ 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.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; 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 b9a5385ab1..39acddbded 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 @@ -12,7 +12,7 @@ import static java.util.Objects.requireNonNull; 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.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; diff --git a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfState.java b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfState.java index ec8beac73c..0c0a18a931 100644 --- a/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfState.java +++ b/netconf/tools/netconf-testtool/src/main/java/org/opendaylight/netconf/test/tool/monitoring/NetconfState.java @@ -12,7 +12,7 @@ import java.util.Collection; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; 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; @@ -23,8 +23,8 @@ public final class NetconfState { private Sessions sessions; public NetconfState(final NetconfMonitoringService monitoringService) { - this.sessions = monitoringService.getSessions(); - this.schemas = monitoringService.getSchemas(); + sessions = monitoringService.getSessions(); + schemas = monitoringService.getSchemas(); } public NetconfState() { 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 81ac88cb18..fcb4e8ae38 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 @@ -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.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; 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 24c4c68519..641950c6c8 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 @@ -9,7 +9,7 @@ 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.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java index 547d452fb7..0271415e6e 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/NetconfServerSession.java @@ -25,10 +25,10 @@ import java.util.regex.Pattern; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.netconf.api.messages.NotificationMessage; -import org.opendaylight.netconf.api.monitoring.NetconfManagementSession; import org.opendaylight.netconf.nettyutil.AbstractNetconfSession; import org.opendaylight.netconf.nettyutil.handler.NetconfMessageToXMLEncoder; import org.opendaylight.netconf.nettyutil.handler.NetconfXMLToMessageDecoder; +import org.opendaylight.netconf.server.api.monitoring.NetconfManagementSession; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; 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 b373716165..f03d8d3914 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 @@ -16,11 +16,11 @@ import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfSessionListener; import org.opendaylight.netconf.api.NetconfTerminationReason; import org.opendaylight.netconf.api.messages.NotificationMessage; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.SessionEvent; -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.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionEvent; +import org.opendaylight.netconf.server.api.monitoring.SessionListener; import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl; import org.opendaylight.netconf.server.spi.SubtreeFilter; import org.opendaylight.yangtools.yang.common.ErrorSeverity; 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 ee168d9ca1..c6aa4037e7 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 @@ -19,11 +19,11 @@ import java.util.Set; import org.checkerframework.checker.index.qual.NonNegative; 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.nettyutil.AbstractNetconfSessionNegotiator; import org.opendaylight.netconf.nettyutil.NetconfSessionNegotiatorFactory; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl; 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 7949e90f3e..66d3f4bd77 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 @@ -13,9 +13,9 @@ import static java.util.Objects.requireNonNull; 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.nettyutil.AbstractNetconfSessionNegotiator; import org.opendaylight.netconf.server.api.SessionIdProvider; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; public class NetconfServerSessionNegotiatorFactoryBuilder { diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/CapabilityListener.java similarity index 90% rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/CapabilityListener.java index 360a588826..8b5fcaf0c8 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/CapabilityListener.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/CapabilityListener.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.api.monitoring; +package org.opendaylight.netconf.server.api.monitoring; import java.util.Set; import org.opendaylight.netconf.api.capability.Capability; @@ -14,5 +13,4 @@ import org.opendaylight.netconf.api.capability.Capability; public interface CapabilityListener { void onCapabilitiesChanged(Set added, Set removed); - } diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/NetconfManagementSession.java similarity index 90% rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/NetconfManagementSession.java index 801b3a4ef8..59cd94aef0 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfManagementSession.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/NetconfManagementSession.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.api.monitoring; +package org.opendaylight.netconf.server.api.monitoring; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/NetconfMonitoringService.java similarity index 98% rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/NetconfMonitoringService.java index 0d1ed31f81..6b0446ffc2 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/NetconfMonitoringService.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/NetconfMonitoringService.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.api.monitoring; +package org.opendaylight.netconf.server.api.monitoring; import java.util.Collection; import java.util.Optional; @@ -51,7 +51,6 @@ public interface NetconfMonitoringService { Registration registerSessionsListener(SessionsListener listener); interface CapabilitiesListener { - /** * Callback used to notify about a change in used capabilities. * @@ -90,6 +89,5 @@ public interface NetconfMonitoringService { * @param sessions updated sessions */ void onSessionsUpdated(Collection sessions); - } } diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/SessionEvent.java similarity index 73% rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/SessionEvent.java index 6918335e5b..41288a17b8 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionEvent.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/SessionEvent.java @@ -5,16 +5,16 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.netconf.api.monitoring; +package org.opendaylight.netconf.server.api.monitoring; /** - * Class represents change in netconf session. + * Class represents change in a {@link NetconfManagementSession}. */ public final class SessionEvent { private final NetconfManagementSession session; private final Type type; - private SessionEvent(NetconfManagementSession session, Type type) { + private SessionEvent(final NetconfManagementSession session, final Type type) { this.session = session; this.type = type; } @@ -37,19 +37,19 @@ public final class SessionEvent { return type; } - public static SessionEvent inRpcSuccess(NetconfManagementSession session) { + public static SessionEvent inRpcSuccess(final NetconfManagementSession session) { return new SessionEvent(session, Type.IN_RPC_SUCCESS); } - public static SessionEvent inRpcFail(NetconfManagementSession session) { + public static SessionEvent inRpcFail(final NetconfManagementSession session) { return new SessionEvent(session, Type.IN_RPC_FAIL); } - public static SessionEvent outRpcError(NetconfManagementSession session) { + public static SessionEvent outRpcError(final NetconfManagementSession session) { return new SessionEvent(session, Type.OUT_RPC_ERROR); } - public static SessionEvent notification(NetconfManagementSession session) { + public static SessionEvent notification(final NetconfManagementSession session) { return new SessionEvent(session, Type.NOTIFICATION); } @@ -57,7 +57,6 @@ public final class SessionEvent { * Session event type. */ public enum Type { - /** * Correct rpc message received. */ diff --git a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/SessionListener.java similarity index 90% rename from protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java rename to protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/SessionListener.java index 1bfd3c976d..530e39d454 100644 --- a/protocol/netconf-api/src/main/java/org/opendaylight/netconf/api/monitoring/SessionListener.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/monitoring/SessionListener.java @@ -5,14 +5,9 @@ * 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.server.api.monitoring; -package org.opendaylight.netconf.api.monitoring; - -/** - * Created by mmarsale on 13.2.2015. - */ public interface SessionListener { - /** * Callback used to notify about netconf session start. * diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.java index d1c3f751ed..0c3bf9b414 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/api/operations/NetconfOperationServiceFactory.java @@ -10,7 +10,7 @@ package org.opendaylight.netconf.server.api.operations; 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.server.api.monitoring.CapabilityListener; import org.opendaylight.yangtools.concepts.Registration; /** 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 65f80515aa..8fe5375b5b 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 @@ -18,7 +18,7 @@ import java.util.Map; 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.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationService; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; 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 092536ea9b..2753179b10 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 @@ -24,9 +24,9 @@ import java.util.Optional; import java.util.Set; 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.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.monitoring.CapabilityListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; 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; 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 25dde0af84..3de768e256 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 @@ -9,9 +9,9 @@ package org.opendaylight.netconf.server.osgi; 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.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionListener; 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; 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 28fd80fda4..71d958b925 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 @@ -18,9 +18,9 @@ import java.util.NavigableMap; import java.util.Set; 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.server.NetconfServerSession; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.server.api.operations.HandlingPriority; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; diff --git a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java index 149d8c2fce..81551428a4 100644 --- a/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java +++ b/protocol/netconf-server/src/main/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringService.java @@ -20,10 +20,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; -import org.opendaylight.netconf.api.monitoring.NetconfManagementSession; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.SessionEvent; -import org.opendaylight.netconf.api.monitoring.SessionListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfManagementSession; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionEvent; +import org.opendaylight.netconf.server.api.monitoring.SessionListener; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.Sessions; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.SessionsBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.netconf.state.sessions.Session; 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 52b946674e..b96588bb85 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 @@ -50,10 +50,6 @@ import org.opendaylight.netconf.api.DocumentedException; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.capability.Capability; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; -import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.SessionEvent; -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.client.NetconfClientDispatcher; @@ -66,6 +62,10 @@ import org.opendaylight.netconf.client.conf.NetconfClientConfigurationBuilder; 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.monitoring.CapabilityListener; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionEvent; +import org.opendaylight.netconf.server.api.monitoring.SessionListener; import org.opendaylight.netconf.server.api.operations.HandlingPriority; import org.opendaylight.netconf.server.api.operations.NetconfOperation; import org.opendaylight.netconf.server.api.operations.NetconfOperationChainedExecution; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java index b8d37a1e99..37b31d00fe 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/NetconfServerSessionListenerTest.java @@ -29,10 +29,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.netconf.api.NetconfMessage; import org.opendaylight.netconf.api.NetconfTerminationReason; import org.opendaylight.netconf.api.messages.NotificationMessage; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.SessionEvent; -import org.opendaylight.netconf.api.monitoring.SessionListener; import org.opendaylight.netconf.api.xml.XmlUtil; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionEvent; +import org.opendaylight.netconf.server.api.monitoring.SessionListener; import org.opendaylight.netconf.server.osgi.NetconfOperationRouterImpl; import org.w3c.dom.Document; diff --git a/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/monitoring/SessionEventTest.java similarity index 76% rename from protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java rename to protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/monitoring/SessionEventTest.java index da4e4b2bfb..0714a132ae 100644 --- a/protocol/netconf-api/src/test/java/org/opendaylight/netconf/api/monitoring/SessionEventTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/api/monitoring/SessionEventTest.java @@ -5,20 +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.api.monitoring; +package org.opendaylight.netconf.server.api.monitoring; import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +@RunWith(MockitoJUnitRunner.StrictStubs.class) public class SessionEventTest { + @Mock + private NetconfManagementSession session; @Test public void test() { - final NetconfManagementSession session = mock(NetconfManagementSession.class); - assertEquals(SessionEvent.Type.IN_RPC_FAIL, SessionEvent.inRpcFail(session).getType()); assertEquals(SessionEvent.Type.IN_RPC_SUCCESS, SessionEvent.inRpcSuccess(session).getType()); assertEquals(SessionEvent.Type.NOTIFICATION, SessionEvent.notification(session).getType()); 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 15e965fc4e..163ae70be4 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 @@ -23,7 +23,7 @@ import org.mockito.Mock; 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.server.api.monitoring.CapabilityListener; import org.opendaylight.netconf.server.api.operations.NetconfOperationServiceFactory; import org.opendaylight.yangtools.concepts.Registration; 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 e65d457a61..b790537b9d 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 @@ -31,8 +31,8 @@ import org.mockito.junit.MockitoJUnitRunner; 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.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; 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; diff --git a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java index 4889170eda..5c6c89be24 100644 --- a/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java +++ b/protocol/netconf-server/src/test/java/org/opendaylight/netconf/server/osgi/NetconfSessionMonitoringServiceTest.java @@ -32,10 +32,10 @@ import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.config.threadpool.ScheduledThreadPool; import org.opendaylight.netconf.api.capability.BasicCapability; import org.opendaylight.netconf.api.capability.Capability; -import org.opendaylight.netconf.api.monitoring.NetconfManagementSession; -import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; -import org.opendaylight.netconf.api.monitoring.SessionEvent; import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration; +import org.opendaylight.netconf.server.api.monitoring.NetconfManagementSession; +import org.opendaylight.netconf.server.api.monitoring.NetconfMonitoringService; +import org.opendaylight.netconf.server.api.monitoring.SessionEvent; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; -- 2.36.6