From 824c740124a9a73f567ff600ab6b388292cfcdd9 Mon Sep 17 00:00:00 2001
From: Michal Cmarada <mcmarada@cisco.com>
Date: Wed, 22 May 2019 15:46:54 +0200
Subject: move stats to separate module

Change-Id: Id349e926ecf336aeabac89afa45a5e0d0f37e36b
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
---
 v3po/v3po2vpp/pom.xml                              |  6 +++
 .../main/java/io/fd/hc2vpp/v3po/V3poModule.java    |  2 +-
 .../interfacesstate/cache/JVppStatsProvider.java   | 49 ----------------------
 3 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java

(limited to 'v3po')

diff --git a/v3po/v3po2vpp/pom.xml b/v3po/v3po2vpp/pom.xml
index 9572ed16e..7bcdbf631 100644
--- a/v3po/v3po2vpp/pom.xml
+++ b/v3po/v3po2vpp/pom.xml
@@ -80,6 +80,12 @@
             <version>${jvpp.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>io.fd.hc2vpp.stats</groupId>
+            <artifactId>stats-impl</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <!-- DI -->
         <dependency>
             <groupId>com.google.inject</groupId>
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
index 4bd4cca4a..569f58fb4 100644
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
+++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/V3poModule.java
@@ -23,6 +23,7 @@ import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;
 import com.google.inject.name.Names;
 import io.fd.hc2vpp.common.translate.util.NamingContext;
+import io.fd.hc2vpp.stats.jvpp.JVppStatsProvider;
 import io.fd.hc2vpp.v3po.factory.InterfacesStateReaderFactory;
 import io.fd.hc2vpp.v3po.factory.InterfacesWriterFactory;
 import io.fd.hc2vpp.v3po.factory.L2HoneycombWriterFactory;
@@ -33,7 +34,6 @@ import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManager;
 import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceCacheDumpManagerProvider;
 import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceStatisticsManager;
 import io.fd.hc2vpp.v3po.interfacesstate.cache.InterfaceStatisticsManagerProvider;
-import io.fd.hc2vpp.v3po.interfacesstate.cache.JVppStatsProvider;
 import io.fd.hc2vpp.v3po.notification.InterfaceChangeNotificationProducerProvider;
 import io.fd.honeycomb.notification.ManagedNotificationProducer;
 import io.fd.honeycomb.translate.read.ReaderFactory;
diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java
deleted file mode 100644
index 2ffc10419..000000000
--- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/JVppStatsProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2019 PANTHEON.tech.
- *
- * 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.hc2vpp.v3po.interfacesstate.cache;
-
-import com.google.inject.Inject;
-import io.fd.honeycomb.binding.init.ProviderTrait;
-import io.fd.honeycomb.data.init.ShutdownHandler;
-import io.fd.jvpp.JVppRegistry;
-import io.fd.jvpp.stats.JVppStatsImpl;
-import io.fd.jvpp.stats.future.FutureJVppStatsFacade;
-import java.io.IOException;
-
-public class JVppStatsProvider extends ProviderTrait<FutureJVppStatsFacade> {
-
-    @Inject
-    private JVppRegistry registry;
-
-    @Inject
-    private ShutdownHandler shutdownHandler;
-
-    private static JVppStatsImpl initStatsApi(final ShutdownHandler shutdownHandler) {
-        final JVppStatsImpl jvppStats = new JVppStatsImpl();
-        shutdownHandler.register("jvpp-stats", jvppStats);
-        return jvppStats;
-    }
-
-    @Override
-    protected FutureJVppStatsFacade create() {
-        try {
-            return new FutureJVppStatsFacade(registry, initStatsApi(shutdownHandler));
-        } catch (IOException e) {
-            throw new IllegalStateException("Unable to open VPP management connection", e);
-        }
-    }
-}
-- 
cgit 1.2.3-korg