From 1326e9fa5cffe326b82aeee9d82d008526aff947 Mon Sep 17 00:00:00 2001
From: Maros Marsalek <mmarsale@cisco.com>
Date: Mon, 5 Sep 2016 12:10:26 +0200
Subject: Cleanup TODOs and FIXMEs

- Fix minor ones
- Report bigger and include issue number in comment
- Pull common dependencies into dependency management of common/parents

Change-Id: I06a6ac37c52b603fd73ed42023d6b2e7fa18010f
Signed-off-by: Maros Marsalek <mmarsale@cisco.com>
---
 infra/impl/pom.xml                                 | 14 -------
 .../impl/NetconfMonitoringReaderFactory.java       | 45 ----------------------
 .../impl/NorthboundFacadeHoneycombDOMBroker.java   |  7 ++--
 3 files changed, 3 insertions(+), 63 deletions(-)
 delete mode 100644 infra/impl/src/main/java/io/fd/honeycomb/impl/NetconfMonitoringReaderFactory.java

(limited to 'infra/impl')

diff --git a/infra/impl/pom.xml b/infra/impl/pom.xml
index f3548965a..0bbe23e6c 100644
--- a/infra/impl/pom.xml
+++ b/infra/impl/pom.xml
@@ -49,30 +49,16 @@
       <artifactId>cfg-init</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!-- TODO used by NetconfMonitoringReaderModule, get it out of here-->
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf-monitoring</artifactId>
-      <version>1.0.2-Beryllium-SR2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netconf</groupId>
-      <artifactId>ietf-netconf-monitoring-extension</artifactId>
-      <version>1.0.2-Beryllium-SR2</version>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
     </dependency>
 
-    <!-- Testing Dependencies -->
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/NetconfMonitoringReaderFactory.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/NetconfMonitoringReaderFactory.java
deleted file mode 100644
index 244ae585e..000000000
--- a/infra/impl/src/main/java/io/fd/honeycomb/impl/NetconfMonitoringReaderFactory.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.fd.honeycomb.impl;
-
-import io.fd.honeycomb.translate.read.ReaderFactory;
-import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder;
-import io.fd.honeycomb.translate.util.read.BindingBrokerReader;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-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.NetconfStateBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-/**
- * {@link ReaderFactory} initiating reader into NETCONF's dedicated data store.
- * Making NETCONF operational data available over NETCONF/RESTCONF
- */
-public final class NetconfMonitoringReaderFactory implements ReaderFactory {
-
-    private final DataBroker netconfMonitoringBindingBrokerDependency;
-
-    public NetconfMonitoringReaderFactory(final DataBroker netconfMonitoringBindingBrokerDependency) {
-        this.netconfMonitoringBindingBrokerDependency = netconfMonitoringBindingBrokerDependency;
-    }
-
-    @Override
-    public void init(final ModifiableReaderRegistryBuilder registry) {
-        registry.add(new BindingBrokerReader<>(InstanceIdentifier.create(NetconfState.class),
-                netconfMonitoringBindingBrokerDependency,
-                LogicalDatastoreType.OPERATIONAL, NetconfStateBuilder.class));
-    }
-}
diff --git a/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java b/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java
index 4af0a9d4a..d49741797 100644
--- a/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java
+++ b/infra/impl/src/main/java/io/fd/honeycomb/impl/NorthboundFacadeHoneycombDOMBroker.java
@@ -61,13 +61,12 @@ public class NorthboundFacadeHoneycombDOMBroker implements AutoCloseable, Broker
                                               @Nonnull final DOMNotificationService domNotificatioNService) {
         services = Maps.newHashMap();
         services.put(DOMDataBroker.class, domDataBrokerDependency);
-        // All services below are required to be present by Restconf northbound
         services.put(SchemaService.class, schemaBiService);
-        services.put(DOMRpcService.class, EMPTY_DOM_RPC_SERVICE);
-        services.put(DOMMountPointService.class, EMPTY_DOM_MOUNT_SERVICE);
         services.put(DOMNotificationService.class, domNotificatioNService);
-        // TODO do both notification service types have to be registered ?
         services.put(DOMNotificationPublishService.class, domNotificatioNService);
+        // All services below are required to be present by Restconf northbound even if not used
+        services.put(DOMRpcService.class, EMPTY_DOM_RPC_SERVICE);
+        services.put(DOMMountPointService.class, EMPTY_DOM_MOUNT_SERVICE);
     }
 
     @Override
-- 
cgit 1.2.3-korg