Changed package name to com.hpcloud.mon.persister

pom.xml

@@ -155,7 +155,7 @@
                                         implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.hpcloud.MonPersisterService</mainClass>
+                                    <mainClass>com.hpcloud.mon.persister.MonPersisterService</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>

src/deb/init/mon-persister.conf

@@ -8,4 +8,4 @@ respawn
 
 setgid persister
 setuid persister
-exec /usr/bin/java -Xmx8g -cp /opt/mon/mon-persister.jar com.hpcloud.MonPersisterService server /etc/mon/persister-config.yml
+exec /usr/bin/java -Xmx8g -cp /opt/mon/mon-persister.jar com.hpcloud.mon.persister.MonPersisterService server /etc/mon/persister-config.yml

src/main/java/com/hpcloud/mon/persister/MonPersisterModule.java

@@ -1,19 +1,19 @@
-package com.hpcloud;
+package com.hpcloud.mon.persister;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.AbstractModule;
 import com.google.inject.Scopes;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
-import com.hpcloud.configuration.MonPersisterConfiguration;
-import com.hpcloud.consumer.KafkaConsumerRunnableBasic;
-import com.hpcloud.consumer.KafkaConsumerRunnableBasicFactory;
-import com.hpcloud.consumer.MonPersisterConsumer;
-import com.hpcloud.dbi.DBIProvider;
-import com.hpcloud.dedupe.MonPersisterDeduperHeartbeat;
-import com.hpcloud.disruptor.DisruptorExceptionHandler;
-import com.hpcloud.disruptor.DisruptorProvider;
-import com.hpcloud.disruptor.event.MetricMessageEventHandler;
-import com.hpcloud.disruptor.event.MetricMessageEventHandlerFactory;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.consumer.KafkaConsumerRunnableBasic;
+import com.hpcloud.mon.persister.consumer.KafkaConsumerRunnableBasicFactory;
+import com.hpcloud.mon.persister.consumer.MonPersisterConsumer;
+import com.hpcloud.mon.persister.dbi.DBIProvider;
+import com.hpcloud.mon.persister.dedupe.MonPersisterDeduperHeartbeat;
+import com.hpcloud.mon.persister.disruptor.DisruptorExceptionHandler;
+import com.hpcloud.mon.persister.disruptor.DisruptorProvider;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventHandler;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventHandlerFactory;
 import com.lmax.disruptor.ExceptionHandler;
 import com.lmax.disruptor.dsl.Disruptor;
 import com.yammer.dropwizard.config.Environment;

src/main/java/com/hpcloud/mon/persister/MonPersisterService.java

@@ -1,12 +1,12 @@
-package com.hpcloud;
+package com.hpcloud.mon.persister;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.hpcloud.configuration.MonPersisterConfiguration;
-import com.hpcloud.consumer.MonPersisterConsumer;
-import com.hpcloud.dedupe.MonPersisterDeduperHeartbeat;
-import com.hpcloud.healthcheck.SimpleHealthCheck;
-import com.hpcloud.resource.Resource;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.consumer.MonPersisterConsumer;
+import com.hpcloud.mon.persister.dedupe.MonPersisterDeduperHeartbeat;
+import com.hpcloud.mon.persister.healthcheck.SimpleHealthCheck;
+import com.hpcloud.mon.persister.resource.Resource;
 import com.yammer.dropwizard.Service;
 import com.yammer.dropwizard.config.Bootstrap;
 import com.yammer.dropwizard.config.Environment;

src/main/java/com/hpcloud/mon/persister/configuration/DeduperConfiguration.java

@@ -1,4 +1,4 @@
-package com.hpcloud.configuration;
+package com.hpcloud.mon.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/hpcloud/mon/persister/configuration/DisruptorConfiguration.java

@@ -1,4 +1,4 @@
-package com.hpcloud.configuration;
+package com.hpcloud.mon.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/hpcloud/mon/persister/configuration/KafkaConfiguration.java

@@ -1,4 +1,4 @@
-package com.hpcloud.configuration;
+package com.hpcloud.mon.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/hpcloud/mon/persister/configuration/MonPersisterConfiguration.java

@@ -1,4 +1,4 @@
-package com.hpcloud.configuration;
+package com.hpcloud.mon.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yammer.dropwizard.config.Configuration;

src/main/java/com/hpcloud/mon/persister/configuration/VerticaMetricRepositoryConfiguration.java

@@ -1,4 +1,4 @@
-package com.hpcloud.configuration;
+package com.hpcloud.mon.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/hpcloud/mon/persister/configuration/VerticaOutputProcessorConfiguration.java

@@ -1,4 +1,4 @@
-package com.hpcloud.configuration;
+package com.hpcloud.mon.persister.configuration;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumer.java

@@ -1,8 +1,8 @@
-package com.hpcloud.consumer;
+package com.hpcloud.mon.persister.consumer;
 
 import com.google.inject.Inject;
-import com.hpcloud.configuration.KafkaConfiguration;
-import com.hpcloud.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.configuration.KafkaConfiguration;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
 import kafka.consumer.Consumer;
 import kafka.consumer.ConsumerConfig;
 import kafka.consumer.KafkaStream;

src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumerRunnableBasic.java

@@ -1,11 +1,11 @@
-package com.hpcloud.consumer;
+package com.hpcloud.mon.persister.consumer;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.hpcloud.disruptor.event.MetricMessageEvent;
-import com.hpcloud.message.MetricEnvelope;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEvent;
+import com.hpcloud.mon.persister.message.MetricEnvelope;
 import com.lmax.disruptor.EventTranslator;
 import com.lmax.disruptor.dsl.Disruptor;
 import kafka.consumer.ConsumerIterator;

src/main/java/com/hpcloud/mon/persister/consumer/KafkaConsumerRunnableBasicFactory.java

@@ -1,4 +1,4 @@
-package com.hpcloud.consumer;
+package com.hpcloud.mon.persister.consumer;
 
 import kafka.consumer.KafkaStream;
 

src/main/java/com/hpcloud/mon/persister/consumer/MonPersisterConsumer.java

@@ -1,4 +1,4 @@
-package com.hpcloud.consumer;
+package com.hpcloud.mon.persister.consumer;
 
 import com.google.inject.Inject;
 import com.lmax.disruptor.dsl.Disruptor;

src/main/java/com/hpcloud/mon/persister/dbi/DBIProvider.java

@@ -1,7 +1,7 @@
-package com.hpcloud.dbi;
+package com.hpcloud.mon.persister.dbi;
 
 import com.google.inject.ProvisionException;
-import com.hpcloud.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
 import com.yammer.dropwizard.config.Environment;
 import com.yammer.dropwizard.jdbi.DBIFactory;
 import org.skife.jdbi.v2.DBI;

src/main/java/com/hpcloud/mon/persister/dedupe/MonPersisterDeduperHeartbeat.java

@@ -1,7 +1,7 @@
-package com.hpcloud.dedupe;
+package com.hpcloud.mon.persister.dedupe;
 
 import com.google.inject.Inject;
-import com.hpcloud.disruptor.event.MetricMessageEvent;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEvent;
 import com.lmax.disruptor.EventTranslator;
 import com.lmax.disruptor.dsl.Disruptor;
 import com.yammer.dropwizard.lifecycle.Managed;

src/main/java/com/hpcloud/mon/persister/disruptor/DisruptorExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.hpcloud.disruptor;
+package com.hpcloud.mon.persister.disruptor;
 
 import com.lmax.disruptor.ExceptionHandler;
 import org.slf4j.Logger;

src/main/java/com/hpcloud/mon/persister/disruptor/DisruptorProvider.java

@@ -1,11 +1,11 @@
-package com.hpcloud.disruptor;
+package com.hpcloud.mon.persister.disruptor;
 
 import com.google.inject.Inject;
 import com.google.inject.Provider;
-import com.hpcloud.configuration.MonPersisterConfiguration;
-import com.hpcloud.disruptor.event.MetricMessageEvent;
-import com.hpcloud.disruptor.event.MetricMessageEventFactory;
-import com.hpcloud.disruptor.event.MetricMessageEventHandlerFactory;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEvent;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventFactory;
+import com.hpcloud.mon.persister.disruptor.event.MetricMessageEventHandlerFactory;
 import com.lmax.disruptor.EventHandler;
 import com.lmax.disruptor.ExceptionHandler;
 import com.lmax.disruptor.dsl.Disruptor;

src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEvent.java

@@ -1,6 +1,6 @@
-package com.hpcloud.disruptor.event;
+package com.hpcloud.mon.persister.disruptor.event;
 
-import com.hpcloud.message.MetricEnvelope;
+import com.hpcloud.mon.persister.message.MetricEnvelope;
 
 public class MetricMessageEvent {
 

src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventFactory.java

@@ -1,4 +1,4 @@
-package com.hpcloud.disruptor.event;
+package com.hpcloud.mon.persister.disruptor.event;
 
 import com.lmax.disruptor.EventFactory;
 

src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandler.java

@@ -1,10 +1,10 @@
-package com.hpcloud.disruptor.event;
+package com.hpcloud.mon.persister.disruptor.event;
 
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import com.hpcloud.configuration.MonPersisterConfiguration;
-import com.hpcloud.message.MetricMessage;
-import com.hpcloud.repository.VerticaMetricRepository;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.message.MetricMessage;
+import com.hpcloud.mon.persister.repository.VerticaMetricRepository;
 import com.lmax.disruptor.EventHandler;
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Counter;

src/main/java/com/hpcloud/mon/persister/disruptor/event/MetricMessageEventHandlerFactory.java

@@ -1,4 +1,4 @@
-package com.hpcloud.disruptor.event;
+package com.hpcloud.mon.persister.disruptor.event;
 
 import com.google.inject.assistedinject.Assisted;
 

src/main/java/com/hpcloud/mon/persister/healthcheck/SimpleHealthCheck.java

@@ -1,4 +1,4 @@
-package com.hpcloud.healthcheck;
+package com.hpcloud.mon.persister.healthcheck;
 
 import com.yammer.metrics.core.HealthCheck;
 

src/main/java/com/hpcloud/mon/persister/message/MetricEnvelope.java

@@ -1,4 +1,4 @@
-package com.hpcloud.message;
+package com.hpcloud.mon.persister.message;
 
 import com.google.common.base.Preconditions;
 

src/main/java/com/hpcloud/mon/persister/message/MetricMessage.java

@@ -1,4 +1,4 @@
-package com.hpcloud.message;
+package com.hpcloud.mon.persister.message;
 
 import java.util.Arrays;
 import java.util.Map;

src/main/java/com/hpcloud/mon/persister/repository/VerticaMetricRepository.java

@@ -1,8 +1,8 @@
-package com.hpcloud.repository;
+package com.hpcloud.mon.persister.repository;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.hpcloud.configuration.MonPersisterConfiguration;
+import com.hpcloud.mon.persister.configuration.MonPersisterConfiguration;
 import com.yammer.metrics.Metrics;
 import com.yammer.metrics.core.Timer;
 import com.yammer.metrics.core.TimerContext;

src/main/java/com/hpcloud/mon/persister/repository/VerticaRepository.java

@@ -1,4 +1,4 @@
-package com.hpcloud.repository;
+package com.hpcloud.mon.persister.repository;
 
 import org.skife.jdbi.v2.DBI;
 import org.skife.jdbi.v2.Handle;

src/main/java/com/hpcloud/mon/persister/resource/PlaceHolder.java

@@ -1,4 +1,4 @@
-package com.hpcloud.resource;
+package com.hpcloud.mon.persister.resource;
 
 public class PlaceHolder {
     private final String content;

src/main/java/com/hpcloud/mon/persister/resource/Resource.java

@@ -1,4 +1,4 @@
-package com.hpcloud.resource;
+package com.hpcloud.mon.persister.resource;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;

src/main/resources/com/hpcloud/mon/persister/mon-persister-config.yml

@@ -85,7 +85,7 @@ logging:
     # Sets the level for 'com.example.app' to DEBUG.
     com.example.app: DEBUG
 #    com.hpcloud: debug
-#    com.hpcloud.repository: DEBUG
+#    com.hpcloud.mon.persister.repository: DEBUG
 
   # Settings for logging to stdout.
   console:

src/test/java/com/hpcloud/mon/persister/MonPersisterConsumerTest.java

@@ -1,7 +1,7 @@
-package com.hpcloud;
+package com.hpcloud.mon.persister;
 
-import com.hpcloud.consumer.KafkaConsumer;
-import com.hpcloud.consumer.MonPersisterConsumer;
+import com.hpcloud.mon.persister.consumer.KafkaConsumer;
+import com.hpcloud.mon.persister.consumer.MonPersisterConsumer;
 import com.lmax.disruptor.dsl.Disruptor;
 import org.junit.After;
 import org.junit.Before;
@@ -10,7 +10,7 @@ import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
-public class MonConsumerTest {
+public class MonPersisterConsumerTest {
 
     @Mock
     private KafkaConsumer kafkaConsumer;