X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fmdsal-netconf-monitoring%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fmonitoring%2FNetconfMonitoringOperationServiceFactory.java;h=b959fa5c52935835042d577ef28dce19a9d5402e;hb=refs%2Fchanges%2F13%2F23413%2F26;hp=78c23688e4a019b96964e531cb261dec38d465a2;hpb=ecabb3cf9b22efd564ef71cb60918318af19d753;p=controller.git

diff --git a/opendaylight/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/NetconfMonitoringOperationServiceFactory.java b/opendaylight/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/NetconfMonitoringOperationServiceFactory.java
index 78c23688e4..b959fa5c52 100644
--- a/opendaylight/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/NetconfMonitoringOperationServiceFactory.java
+++ b/opendaylight/netconf/mdsal-netconf-monitoring/src/main/java/org/opendaylight/controller/netconf/monitoring/NetconfMonitoringOperationServiceFactory.java
@@ -8,58 +8,17 @@
 
 package org.opendaylight.controller.netconf.monitoring;
 
-import com.google.common.base.Optional;
-import com.google.common.collect.Sets;
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
-import org.opendaylight.controller.netconf.api.Capability;
+import org.opendaylight.controller.config.util.capability.Capability;
 import org.opendaylight.controller.netconf.api.monitoring.CapabilityListener;
 import org.opendaylight.controller.netconf.mapping.api.NetconfOperationService;
 import org.opendaylight.controller.netconf.mapping.api.NetconfOperationServiceFactory;
 
-/**
-* Created by mmarsale on 18.2.2015.
-*/
 public class NetconfMonitoringOperationServiceFactory implements NetconfOperationServiceFactory, AutoCloseable {
 
     private final NetconfMonitoringOperationService operationService;
 
-    private static final Set<Capability> CAPABILITIES = Sets.<Capability>newHashSet(new Capability() {
-
-        @Override
-        public String getCapabilityUri() {
-            return MonitoringConstants.URI;
-        }
-
-        @Override
-        public Optional<String> getModuleNamespace() {
-            return Optional.of(MonitoringConstants.NAMESPACE);
-        }
-
-        @Override
-        public Optional<String> getModuleName() {
-            return Optional.of(MonitoringConstants.MODULE_NAME);
-        }
-
-        @Override
-        public Optional<String> getRevision() {
-            return Optional.of(MonitoringConstants.MODULE_REVISION);
-        }
-
-        @Override
-        public Optional<String> getCapabilitySchema() {
-            return Optional.absent();
-        }
-
-        @Override
-        public Collection<String> getLocation() {
-            return Collections.emptyList();
-        }
-    });
-
     private static final AutoCloseable AUTO_CLOSEABLE = new AutoCloseable() {
         @Override
         public void close() throws Exception {
@@ -67,8 +26,6 @@ public class NetconfMonitoringOperationServiceFactory implements NetconfOperatio
         }
     };
 
-    private final List<CapabilityListener> listeners = new ArrayList<>();
-
     public NetconfMonitoringOperationServiceFactory(final NetconfMonitoringOperationService operationService) {
         this.operationService = operationService;
     }
@@ -80,20 +37,17 @@ public class NetconfMonitoringOperationServiceFactory implements NetconfOperatio
 
     @Override
     public Set<Capability> getCapabilities() {
-        return CAPABILITIES;
+        // TODO
+        // No capabilities exposed to prevent clashes with schemas from config-netconf-connector (it exposes all the schemas)
+        // If the schemas exposed by config-netconf-connector are filtered, this class would expose monitoring related models
+        return Collections.emptySet();
     }
 
     @Override
     public AutoCloseable registerCapabilityListener(final CapabilityListener listener) {
-        listener.onCapabilitiesAdded(getCapabilities());
-        listeners.add(listener);
         return AUTO_CLOSEABLE;
     }
 
     @Override
-    public void close() {
-        for (final CapabilityListener listener : listeners) {
-            listener.onCapabilitiesRemoved(getCapabilities());
-        }
-    }
+    public void close() {}
 }