From a007a4a04c33bb0b1ccb0d2e47115589f0447ee9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20de=20Talhou=C3=ABt?= Date: Wed, 2 Nov 2016 15:02:35 -0400 Subject: [PATCH] Address comments from blueprint patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a follow-up patch addressing the following comments: - add missing destroy-method: https://git.opendaylight.org/gerrit/#/c/45750/ - refactor class name, remove useless param and got back to simple map/set as there is no obvious need to have them concurrent: https://git.opendaylight.org/gerrit/#/c/45608/ - add TODO back: https://git.opendaylight.org/gerrit/#/c/45631/ Change-Id: Ie4648aa520717effbfe367de62a2fb7d6b1d3505 Signed-off-by: Alexis de Talhouët --- .../org/opendaylight/blueprint/mdsal-netconf-impl.xml | 3 ++- ...Factory.java => MdsalMonitoringMapperFactory.java} | 4 ++-- .../blueprint/mdsal-netconf-monitoring.xml | 2 +- .../yang/library/SchemaServiceToMdsalWriter.java | 1 + .../impl/osgi/NetconfCapabilityMonitoringService.java | 11 +++-------- 5 files changed, 9 insertions(+), 12 deletions(-) rename netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/{MdSalMonitoringMapperFactory.java => MdsalMonitoringMapperFactory.java} (96%) diff --git a/netconf/mdsal-netconf-impl/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-impl.xml b/netconf/mdsal-netconf-impl/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-impl.xml index f75383c90f..aec6ca10e7 100755 --- a/netconf/mdsal-netconf-impl/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-impl.xml +++ b/netconf/mdsal-netconf-impl/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-impl.xml @@ -81,7 +81,8 @@ + class="org.opendaylight.netconf.impl.osgi.NetconfMonitoringServiceImpl" + destroy-method="close"> 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 similarity index 96% rename from netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdSalMonitoringMapperFactory.java rename to netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/config/yang/netconf/mdsal/monitoring/MdsalMonitoringMapperFactory.java index a80275df8f..8ed7a7b173 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 @@ -20,7 +20,7 @@ import org.opendaylight.netconf.monitoring.GetSchema; import java.util.Collections; import java.util.Set; -public class MdSalMonitoringMapperFactory implements NetconfOperationServiceFactory, AutoCloseable { +public class MdsalMonitoringMapperFactory implements NetconfOperationServiceFactory, AutoCloseable { private final NetconfOperationService operationService; private final MonitoringToMdsalWriter monitoringToMdsalWriter; @@ -28,7 +28,7 @@ public class MdSalMonitoringMapperFactory implements NetconfOperationServiceFact private static final Set CAPABILITIES = Collections.emptySet(); - public MdSalMonitoringMapperFactory(final NetconfOperationServiceFactoryListener netconfOperationServiceFactoryListener, + public MdsalMonitoringMapperFactory(final NetconfOperationServiceFactoryListener netconfOperationServiceFactoryListener, final NetconfMonitoringService netconfMonitoringService, final MonitoringToMdsalWriter monitoringToMdsalWriter) { diff --git a/netconf/mdsal-netconf-monitoring/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-monitoring.xml b/netconf/mdsal-netconf-monitoring/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-monitoring.xml index 13b263303f..c1c8c8d0af 100644 --- a/netconf/mdsal-netconf-monitoring/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-monitoring.xml +++ b/netconf/mdsal-netconf-monitoring/src/main/resources/org/opendaylight/blueprint/mdsal-netconf-monitoring.xml @@ -29,7 +29,7 @@ diff --git a/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java b/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java index 2360369e6a..953d878d1e 100644 --- a/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java +++ b/netconf/mdsal-netconf-yang-library/src/main/java/org/opendaylight/netconf/mdsal/yang/library/SchemaServiceToMdsalWriter.java @@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory; * Listens for updates on global schema context, transforms context to ietf-yang-library:modules-state and * writes this state to operational data store */ +// TODO Implement also yang-library-change notfication public class SchemaServiceToMdsalWriter implements SchemaContextListener, AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(SchemaServiceToMdsalWriter.class); diff --git a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java index edd3c36bde..c31531d052 100644 --- a/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java +++ b/netconf/netconf-impl/src/main/java/org/opendaylight/netconf/impl/osgi/NetconfCapabilityMonitoringService.java @@ -16,7 +16,6 @@ import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import io.netty.util.internal.ConcurrentSet; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -24,11 +23,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import org.opendaylight.controller.config.util.capability.BasicCapability; import org.opendaylight.controller.config.util.capability.Capability; import org.opendaylight.netconf.api.monitoring.CapabilityListener; -import org.opendaylight.netconf.api.monitoring.NetconfManagementSession; import org.opendaylight.netconf.api.monitoring.NetconfMonitoringService; import org.opendaylight.netconf.mapping.api.NetconfOperationServiceFactory; import org.opendaylight.netconf.notifications.BaseNotificationPublisherRegistration; @@ -58,13 +55,12 @@ class NetconfCapabilityMonitoringService implements CapabilityListener, AutoClos } }; - private final Set sessions = new ConcurrentSet<>(); private final NetconfOperationServiceFactory netconfOperationProvider; - private final Map capabilities = new ConcurrentHashMap<>(); - private final Map> mappedModulesToRevisionToSchema = new ConcurrentHashMap<>(); + private final Map capabilities = Maps.newHashMap(); + private final Map> mappedModulesToRevisionToSchema = Maps.newHashMap(); - private final Set listeners = new ConcurrentSet<>(); + private final Set listeners = Sets.newHashSet(); private volatile BaseNotificationPublisherRegistration notificationPublisher; NetconfCapabilityMonitoringService(final NetconfOperationServiceFactory netconfOperationProvider) { @@ -216,7 +212,6 @@ class NetconfCapabilityMonitoringService implements CapabilityListener, AutoClos @Override public synchronized void close() throws Exception { listeners.clear(); - sessions.clear(); capabilities.clear(); } -- 2.36.6