Remove C* driver references and lifecycle methods from MetricsService

Even if we provide a C* backend only, the service interface should not expose such implementation details.
hawkular · Jun 5, 2015 · 937d0b8 · 937d0b8
1 parent ecf6828
commit 937d0b8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 51 deletions.
diff --git a/core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java b/core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricsService.java
@@ -23,7 +23,6 @@
 import java.util.Set;
 import java.util.function.Predicate;
 
-import com.datastax.driver.core.Session;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import rx.Observable;
@@ -34,22 +33,6 @@
  */
 public interface MetricsService {
 
-    enum State {
-        STARTING, STARTED, STOPPING, STOPPED, FAILED
-    }
-
-    /**
-     * Startup with a given cassandra session
-     * @param session
-     */
-    void startUp(Session session);
-
-    State getState();
-
-    void setState(State state);
-
-    void shutdown();
-
     /**
      * <p>
      * This method should be call before ever inserting any data to ensure that the tenant id is unique and to establish

diff --git a/core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java b/core/metrics-core-impl/src/main/java/org/hawkular/metrics/core/impl/MetricsServiceImpl.java
@@ -34,17 +34,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-import com.datastax.driver.core.ResultSet;
-import com.datastax.driver.core.ResultSetFuture;
-import com.datastax.driver.core.Row;
-import com.datastax.driver.core.Session;
-import com.google.common.collect.ImmutableList;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.RateLimiter;
 import org.hawkular.metrics.core.api.Availability;
 import org.hawkular.metrics.core.api.AvailabilityBucketDataPoint;
 import org.hawkular.metrics.core.api.AvailabilityData;
@@ -72,6 +61,19 @@
 import org.joda.time.Hours;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.ResultSetFuture;
+import com.datastax.driver.core.Row;
+import com.datastax.driver.core.Session;
+import com.google.common.collect.ImmutableList;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.RateLimiter;
+
 import rx.Observable;
 import rx.functions.Func1;
 import rx.subjects.PublishSubject;
@@ -86,8 +88,6 @@ public class MetricsServiceImpl implements MetricsService {
 
     public static final int DEFAULT_TTL = Duration.standardDays(7).toStandardSeconds().getSeconds();
 
-    public volatile State state;
-
     private static class DataRetentionKey {
         private final String tenantId;
         private final MetricId metricId;
@@ -146,25 +146,9 @@ public int hashCode() {
      */
     private final Map<DataRetentionKey, Integer> dataRetentions = new ConcurrentHashMap<>();
 
-    public MetricsServiceImpl() {
-        this.state = State.STARTING;
-    }
-
-    @Override
     public void startUp(Session s) {
         this.dataAccess = new DataAccessImpl(s);
         loadDataRetentions();
-        state = State.STARTED;
-    }
-
-    @Override
-    public State getState() {
-        return state;
-    }
-
-    @Override
-    public void setState(State state) {
-        this.state = state;
     }
 
     void loadDataRetentions() {
@@ -254,11 +238,6 @@ public void onFailure(Throwable t) {
         }
     }
 
-    @Override
-    public void shutdown() {
-        state = State.STOPPED;
-    }
-
     /**
      * This is a test hook.
      */