From 515e4f65d8c75685d1fc340d6b78cca5dc4bc12a Mon Sep 17 00:00:00 2001 From: Deklan Dieterly Date: Wed, 22 Apr 2015 10:22:44 -0600 Subject: [PATCH] Minor cleanup Make methods protected. Extract methods. Clean up mixed-case in logging. Remove unnecessary try-catch block. Remove extra classes. Consolidate methods in abstract class. Change-Id: I6a8064998a2a474c9c51e4ea641387c69142fdd7 --- .../monasca/persister/PersisterModule.java | 19 +++-- .../consumer/KafkaConsumerRunnableBasic.java | 10 --- .../AlarmStateTransitionedEventHandler.java | 8 +- .../pipeline/event/FlushableHandler.java | 64 +++++++++----- .../pipeline/event/MetricHandler.java | 8 +- .../persister/repository/AlarmRepo.java | 27 ------ .../repository/{MetricRepo.java => Repo.java} | 10 +-- .../repository/influxdb/InfluxAlarmRepo.java | 46 +++------- .../repository/influxdb/InfluxMetricRepo.java | 78 ++++++----------- .../repository/influxdb/InfluxRepo.java | 84 +++++++++++++++++++ .../influxdb/InfluxV9AlarmRepo.java | 6 +- .../influxdb/InfluxV9MetricRepo.java | 6 +- .../influxdb/InfluxV9RepoWriter.java | 6 +- .../repository/vertica/VerticaAlarmRepo.java | 4 +- .../repository/vertica/VerticaMetricRepo.java | 4 +- 15 files changed, 205 insertions(+), 175 deletions(-) delete mode 100644 java/src/main/java/monasca/persister/repository/AlarmRepo.java rename java/src/main/java/monasca/persister/repository/{MetricRepo.java => Repo.java} (75%) create mode 100644 java/src/main/java/monasca/persister/repository/influxdb/InfluxRepo.java diff --git a/java/src/main/java/monasca/persister/PersisterModule.java b/java/src/main/java/monasca/persister/PersisterModule.java index cf246212..bf658df6 100644 --- a/java/src/main/java/monasca/persister/PersisterModule.java +++ b/java/src/main/java/monasca/persister/PersisterModule.java @@ -45,8 +45,7 @@ import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandler; import monasca.persister.pipeline.event.AlarmStateTransitionedEventHandlerFactory; import monasca.persister.pipeline.event.MetricHandler; import monasca.persister.pipeline.event.MetricHandlerFactory; -import monasca.persister.repository.AlarmRepo; -import monasca.persister.repository.MetricRepo; +import monasca.persister.repository.Repo; import monasca.persister.repository.influxdb.InfluxV9AlarmRepo; import monasca.persister.repository.influxdb.InfluxV9MetricRepo; import monasca.persister.repository.influxdb.InfluxV9RepoWriter; @@ -141,8 +140,12 @@ public class PersisterModule extends AbstractModule { if (config.getDatabaseConfiguration().getDatabaseType().equalsIgnoreCase(VERTICA)) { bind(DBI.class).toProvider(DBIProvider.class).in(Scopes.SINGLETON); - bind(MetricRepo.class).to(VerticaMetricRepo.class); - bind(AlarmRepo.class).to(VerticaAlarmRepo.class); + + bind(new TypeLiteral>(){}) + .to(VerticaMetricRepo.class); + + bind(new TypeLiteral>(){}) + .to(VerticaAlarmRepo.class); } else if (config.getDatabaseConfiguration().getDatabaseType().equalsIgnoreCase(INFLUXDB)) { @@ -158,8 +161,12 @@ public class PersisterModule extends AbstractModule { } bind(InfluxV9RepoWriter.class).in(Singleton.class); - bind(MetricRepo.class).to(InfluxV9MetricRepo.class); - bind(AlarmRepo.class).to(InfluxV9AlarmRepo.class); + + bind(new TypeLiteral>() {}) + .to(InfluxV9MetricRepo.class); + + bind(new TypeLiteral> () {}) + .to(InfluxV9AlarmRepo.class); } else { diff --git a/java/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java b/java/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java index 452846f3..963a2745 100644 --- a/java/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java +++ b/java/src/main/java/monasca/persister/consumer/KafkaConsumerRunnableBasic.java @@ -53,18 +53,8 @@ public class KafkaConsumerRunnableBasic implements Runnable { protected void handleMessage(String msg) { - try { - publishEvent(msg); - } catch (Exception e) { - - logger.error( - "[{}]: failed to deserialize JSON message and send to handler: {} ", - threadId, - msg, - e); - } } private void markRead() { diff --git a/java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java b/java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java index bb9877cc..664fa68f 100644 --- a/java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java +++ b/java/src/main/java/monasca/persister/pipeline/event/AlarmStateTransitionedEventHandler.java @@ -19,7 +19,6 @@ package monasca.persister.pipeline.event; import monasca.common.model.event.AlarmStateTransitionedEvent; import monasca.persister.configuration.PipelineConfig; -import monasca.persister.repository.AlarmRepo; import com.google.inject.Inject; import com.google.inject.assistedinject.Assisted; @@ -28,6 +27,7 @@ import com.codahale.metrics.Counter; import com.fasterxml.jackson.databind.DeserializationFeature; import io.dropwizard.setup.Environment; +import monasca.persister.repository.Repo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,13 +38,13 @@ public class AlarmStateTransitionedEventHandler extends private static final Logger logger = LoggerFactory.getLogger(AlarmStateTransitionedEventHandler.class); - private final AlarmRepo alarmRepo; + private final Repo alarmRepo; private final Counter alarmStateTransitionCounter; @Inject public AlarmStateTransitionedEventHandler( - AlarmRepo alarmRepo, + Repo alarmRepo, Environment environment, @Assisted PipelineConfig configuration, @Assisted("threadId") String threadId, @@ -66,7 +66,7 @@ public class AlarmStateTransitionedEventHandler extends AlarmStateTransitionedEvent alarmStateTransitionedEvent = objectMapper.readValue(msg, AlarmStateTransitionedEvent.class); - logger.debug("[{}]: [{}:{}]: {}", + logger.debug("[{}]: [{}:{}] {}", this.threadId, this.getBatchCount(), this.getMsgCount(), diff --git a/java/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java b/java/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java index 1414d774..df30b8ef 100644 --- a/java/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java +++ b/java/src/main/java/monasca/persister/pipeline/event/FlushableHandler.java @@ -94,31 +94,19 @@ public abstract class FlushableHandler { if (msg == null) { - logger.debug("[{}]: got heartbeat message, flush every {} seconds.", this.threadId, - this.secondsBetweenFlushes); + return checkFlushTime(); - if (this.flushTimeMillis < System.currentTimeMillis()) { - - logger.debug("[{}]: {} millis past flush time. flushing to repository now.", - this.threadId, (System.currentTimeMillis() - this.flushTimeMillis)); - - flush(); - - return true; - - } else { - - logger.debug("[{}]: {} millis to next flush time. no need to flush at this time.", - this.threadId, this.flushTimeMillis - System.currentTimeMillis()); - - return false; - - } } + this.msgCount += process(msg); + this.processedMeter.mark(); - this.msgCount += process(msg); + return checkBatchSize(); + + } + + private boolean checkBatchSize() { if (this.msgCount >= this.batchSize) { @@ -135,6 +123,36 @@ public abstract class FlushableHandler { } } + private boolean checkFlushTime() { + + logger.debug( + "[{}]: got heartbeat message, flush every {} seconds.", + this.threadId, + this.secondsBetweenFlushes); + + if (this.flushTimeMillis < System.currentTimeMillis()) { + + logger.debug( + "[{}]: {} millis past flush time. flushing to repository now.", + this.threadId, + (System.currentTimeMillis() - this.flushTimeMillis)); + + flush(); + + return true; + + } else { + + logger.debug( + "[{}]: {} millis to next flush time. no need to flush at this time.", + this.threadId, + this.flushTimeMillis - System.currentTimeMillis()); + + return false; + + } + } + public void flush() { logger.debug("[{}]: flush", this.threadId); @@ -142,6 +160,8 @@ public abstract class FlushableHandler { if (this.msgCount == 0) { logger.debug("[{}]: nothing to flush", this.threadId); + + return; } Timer.Context context = this.commitTimer.time(); @@ -161,13 +181,13 @@ public abstract class FlushableHandler { } - public long getBatchCount() { + protected long getBatchCount() { return this.batchCount; } - public int getMsgCount() { + protected int getMsgCount() { return this.msgCount; } diff --git a/java/src/main/java/monasca/persister/pipeline/event/MetricHandler.java b/java/src/main/java/monasca/persister/pipeline/event/MetricHandler.java index 87615624..78b2e85a 100644 --- a/java/src/main/java/monasca/persister/pipeline/event/MetricHandler.java +++ b/java/src/main/java/monasca/persister/pipeline/event/MetricHandler.java @@ -30,20 +30,20 @@ import org.slf4j.LoggerFactory; import io.dropwizard.setup.Environment; import monasca.common.model.metric.MetricEnvelope; import monasca.persister.configuration.PipelineConfig; -import monasca.persister.repository.MetricRepo; +import monasca.persister.repository.Repo; public class MetricHandler extends FlushableHandler { private static final Logger logger = LoggerFactory.getLogger(MetricHandler.class); - private final MetricRepo metricRepo; + private final Repo metricRepo; private final Counter metricCounter; @Inject public MetricHandler( - MetricRepo metricRepo, + Repo metricRepo, Environment environment, @Assisted PipelineConfig configuration, @Assisted("threadId") String threadId, @@ -76,7 +76,7 @@ public class MetricHandler extends FlushableHandler { private void processEnvelope(MetricEnvelope metricEnvelope) { - logger.debug("[{}]: [{}:{}]: {}", + logger.debug("[{}]: [{}:{}] {}", this.threadId, this.getBatchCount(), this.getMsgCount(), diff --git a/java/src/main/java/monasca/persister/repository/AlarmRepo.java b/java/src/main/java/monasca/persister/repository/AlarmRepo.java deleted file mode 100644 index 9d3d5de6..00000000 --- a/java/src/main/java/monasca/persister/repository/AlarmRepo.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. - * - * 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 monasca.persister.repository; - -import monasca.common.model.event.AlarmStateTransitionedEvent; - -public interface AlarmRepo { - - void addToBatch(final AlarmStateTransitionedEvent message); - - void flush(String id); -} diff --git a/java/src/main/java/monasca/persister/repository/MetricRepo.java b/java/src/main/java/monasca/persister/repository/Repo.java similarity index 75% rename from java/src/main/java/monasca/persister/repository/MetricRepo.java rename to java/src/main/java/monasca/persister/repository/Repo.java index 1c7e78a7..2e55ea1f 100644 --- a/java/src/main/java/monasca/persister/repository/MetricRepo.java +++ b/java/src/main/java/monasca/persister/repository/Repo.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Hewlett-Packard Development Company, L.P. + * Copyright (c) 2015 Hewlett-Packard Development Company, L.P. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package monasca.persister.repository; -import monasca.common.model.metric.MetricEnvelope; +public interface Repo { -public interface MetricRepo { - - void addToBatch(final MetricEnvelope metricEnvelope); + void addToBatch(final T msg); void flush(String id); + } diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxAlarmRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxAlarmRepo.java index 11efd6b8..b81ea426 100644 --- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxAlarmRepo.java +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxAlarmRepo.java @@ -15,35 +15,26 @@ package monasca.persister.repository.influxdb; import monasca.common.model.event.AlarmStateTransitionedEvent; -import monasca.persister.repository.AlarmRepo; import com.codahale.metrics.Meter; import com.codahale.metrics.MetricRegistry; -import com.codahale.metrics.Timer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.LinkedList; import java.util.List; import io.dropwizard.setup.Environment; -public abstract class InfluxAlarmRepo implements AlarmRepo { - - private static final Logger logger = LoggerFactory.getLogger(InfluxAlarmRepo.class); +public abstract class InfluxAlarmRepo extends InfluxRepo { protected static final String ALARM_STATE_HISTORY_NAME = "alarm_state_history"; - public final Timer flushTimer; - public final Meter alarmStateHistoryMeter; + protected final Meter alarmStateHistoryMeter; protected List alarmStateTransitionedEventList = new LinkedList<>(); public InfluxAlarmRepo(final Environment env) { - this.flushTimer = - env.metrics().timer(MetricRegistry.name(getClass(), "flush-timer")); + super(env); this.alarmStateHistoryMeter = env.metrics().meter( @@ -61,28 +52,17 @@ public abstract class InfluxAlarmRepo implements AlarmRepo { } @Override - public void flush(String id) { - try { - - if (this.alarmStateTransitionedEventList.isEmpty()) { - logger.debug("[{}]: no alarm state transition msg to be written to the influxDB", id); - logger.debug("[{}]: returning from flush", id); - return; - } - - long startTime = System.currentTimeMillis(); - Timer.Context context = flushTimer.time(); - - write(id); - - context.stop(); - long endTime = System.currentTimeMillis(); - logger.debug("[{}]: flushing batch took {} seconds", id, (endTime - startTime) / 1000); - - } catch (Exception e) { - logger.error("[{}]: failed to write alarm state history to database", id, e); - } + protected void clearBuffers() { this.alarmStateTransitionedEventList.clear(); + } + + @Override + protected boolean isBufferEmpty() { + + return this.alarmStateTransitionedEventList.isEmpty(); + + } + } diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxMetricRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxMetricRepo.java index a2b3348d..6d194a4d 100644 --- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxMetricRepo.java +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxMetricRepo.java @@ -19,94 +19,68 @@ package monasca.persister.repository.influxdb; import monasca.common.model.metric.Metric; import monasca.common.model.metric.MetricEnvelope; -import monasca.persister.repository.MetricRepo; import com.codahale.metrics.Meter; -import com.codahale.metrics.Timer; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.Map; import io.dropwizard.setup.Environment; -public abstract class InfluxMetricRepo implements MetricRepo { - - private static final Logger logger = LoggerFactory.getLogger(InfluxMetricRepo.class); +public abstract class InfluxMetricRepo extends InfluxRepo { protected final MeasurementBuffer measurementBuffer = new MeasurementBuffer(); - public final com.codahale.metrics.Timer flushTimer; - public final Meter measurementMeter; + protected final Meter measurementMeter; protected abstract void write(String id) throws Exception; public InfluxMetricRepo(final Environment env) { - this.flushTimer = env.metrics().timer(this.getClass().getName() + ".flush-timer"); - this.measurementMeter = env.metrics().meter(this.getClass().getName() + ".measurement-meter"); + super(env); + + this.measurementMeter = + env.metrics().meter(this.getClass().getName() + ".measurement-meter"); + } @Override public void addToBatch(MetricEnvelope metricEnvelope) { Metric metric = metricEnvelope.metric; + Map meta = metricEnvelope.meta; - Definition - definition = - new Definition(metric.getName(), (String) meta.get("tenantId"), - (String) meta.get("region")); + Definition definition = + new Definition( + metric.getName(), + (String) meta.get("tenantId"), + (String) meta.get("region")); Dimensions dimensions = new Dimensions(metric.getDimensions()); - Measurement - measurement = - new Measurement(metric.getTimestamp(), metric.getValue(), metric.getValueMeta()); + Measurement measurement = + new Measurement( + metric.getTimestamp(), + metric.getValue(), + metric.getValueMeta()); this.measurementBuffer.put(definition, dimensions, measurement); + this.measurementMeter.mark(); } - @Override - public void flush(String id) { - - try { - - if (this.measurementBuffer.isEmpty()) { - logger.debug("[{}]: no metric msg to be written to the influxDB", id); - logger.debug("[{}]: returning from flush", id); - return; - } - - final long startTime = System.currentTimeMillis(); - final Timer.Context context = flushTimer.time(); - - write(id); - - final long endTime = System.currentTimeMillis(); - context.stop(); - - logger.debug("[{}]: flushing batch took {} seconds", - id, (endTime - startTime) / 1000); - - } catch (Exception e) { - - logger.error("[{}]: failed to write measurements to InfluxDB", id, e); - - } - - clearBuffers(); - } - - - private void clearBuffers() { + protected void clearBuffers() { this.measurementBuffer.clear(); } + @Override + protected boolean isBufferEmpty() { + + return this.measurementBuffer.isEmpty(); + + } } diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxRepo.java new file mode 100644 index 00000000..dbe6ed7d --- /dev/null +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxRepo.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015 Hewlett-Packard Development Company, L.P. + * + * 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 monasca.persister.repository.influxdb; + +import com.codahale.metrics.Timer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.dropwizard.setup.Environment; +import monasca.persister.repository.Repo; + +public abstract class InfluxRepo implements Repo { + + private static final Logger logger = LoggerFactory.getLogger(InfluxRepo.class); + + protected final com.codahale.metrics.Timer flushTimer; + + public InfluxRepo (final Environment env) { + + this.flushTimer = + env.metrics().timer(this.getClass().getName() + ".flush-timer"); + + } + + @Override + public void flush(String id) { + + try { + + if (isBufferEmpty()) { + + logger.debug("[{}]: no msg to be written to influxdb", id); + + logger.debug("[{}]: returning from flush without flushing", id); + + return; + + } + + final long startTime = System.currentTimeMillis(); + + final Timer.Context context = flushTimer.time(); + + write(id); + + final long endTime = System.currentTimeMillis(); + + context.stop(); + + logger.debug("[{}]: flushing batch took {} millis", + id, endTime - startTime); + + } catch (Exception e) { + + logger.error("[{}]: failed to write msg to influxdb", id, e); + + } + + clearBuffers(); + + } + + + protected abstract boolean isBufferEmpty(); + + protected abstract void write(String id) throws Exception; + + protected abstract void clearBuffers(); +} diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java index 59adbe8f..8743aad6 100644 --- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java @@ -45,10 +45,12 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo { private final DateTimeFormatter dateFormatter = ISODateTimeFormat.dateTime(); @Inject - public InfluxV9AlarmRepo(final Environment env, - final InfluxV9RepoWriter influxV9RepoWriter) { + public InfluxV9AlarmRepo( + final Environment env, + final InfluxV9RepoWriter influxV9RepoWriter) { super(env); + this.influxV9RepoWriter = influxV9RepoWriter; this.objectMapper.setPropertyNamingStrategy( diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java index 937e78bd..47596c3b 100644 --- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9MetricRepo.java @@ -32,10 +32,12 @@ public class InfluxV9MetricRepo extends InfluxMetricRepo { private final InfluxV9RepoWriter influxV9RepoWriter; @Inject - public InfluxV9MetricRepo(final Environment env, - final InfluxV9RepoWriter influxV9RepoWriter) { + public InfluxV9MetricRepo( + final Environment env, + final InfluxV9RepoWriter influxV9RepoWriter) { super(env); + this.influxV9RepoWriter = influxV9RepoWriter; } diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9RepoWriter.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9RepoWriter.java index 48e2496f..52073a8c 100644 --- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9RepoWriter.java +++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9RepoWriter.java @@ -167,7 +167,7 @@ public class InfluxV9RepoWriter { try { - logger.debug("[{}]: sending {} points to influxdb database {} at {}", id, + logger.debug("[{}]: sending {} points to influxdb {} at {}", id, influxPointArry.length, this.influxName, this.influxUrl); HttpResponse response = this.httpClient.execute(request); @@ -180,7 +180,7 @@ public class InfluxV9RepoWriter { String responseString = EntityUtils.toString(responseEntity, "UTF-8"); - logger.error("[{}]: failed to send data to influxdb database {} at {}: {}", id, + logger.error("[{}]: failed to send data to influxdb {} at {}: {}", id, this.influxName, this.influxUrl, String.valueOf(rc)); logger.error("[{}]: http response: {}", id, responseString); @@ -189,7 +189,7 @@ public class InfluxV9RepoWriter { } logger - .debug("[{}]: successfully sent {} points to influxdb database {} at {}", id, + .debug("[{}]: successfully sent {} points to influxdb {} at {}", id, influxPointArry.length, this.influxName, this.influxUrl); } finally { diff --git a/java/src/main/java/monasca/persister/repository/vertica/VerticaAlarmRepo.java b/java/src/main/java/monasca/persister/repository/vertica/VerticaAlarmRepo.java index 84ff3c87..1b8fabb0 100644 --- a/java/src/main/java/monasca/persister/repository/vertica/VerticaAlarmRepo.java +++ b/java/src/main/java/monasca/persister/repository/vertica/VerticaAlarmRepo.java @@ -19,7 +19,6 @@ package monasca.persister.repository.vertica; import monasca.common.model.event.AlarmStateTransitionedEvent; import monasca.persister.configuration.PersisterConfig; -import monasca.persister.repository.AlarmRepo; import com.codahale.metrics.Timer; @@ -37,8 +36,9 @@ import java.util.TimeZone; import javax.inject.Inject; import io.dropwizard.setup.Environment; +import monasca.persister.repository.Repo; -public class VerticaAlarmRepo extends VerticaRepo implements AlarmRepo { +public class VerticaAlarmRepo extends VerticaRepo implements Repo { private static final Logger logger = LoggerFactory.getLogger(VerticaAlarmRepo.class); private final Environment environment; diff --git a/java/src/main/java/monasca/persister/repository/vertica/VerticaMetricRepo.java b/java/src/main/java/monasca/persister/repository/vertica/VerticaMetricRepo.java index 1269b92a..eeaf6b64 100644 --- a/java/src/main/java/monasca/persister/repository/vertica/VerticaMetricRepo.java +++ b/java/src/main/java/monasca/persister/repository/vertica/VerticaMetricRepo.java @@ -21,7 +21,6 @@ import monasca.common.model.metric.Metric; import monasca.common.model.metric.MetricEnvelope; import monasca.persister.configuration.PersisterConfig; import monasca.persister.pipeline.event.MetricHandler; -import monasca.persister.repository.MetricRepo; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -50,8 +49,9 @@ import java.util.TreeMap; import javax.inject.Inject; import io.dropwizard.setup.Environment; +import monasca.persister.repository.Repo; -public class VerticaMetricRepo extends VerticaRepo implements MetricRepo { +public class VerticaMetricRepo extends VerticaRepo implements Repo { private static final Logger logger = LoggerFactory.getLogger(VerticaMetricRepo.class);