killbill-aplcache

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/consumer/SampleConsumer.java b/usage/src/main/java/com/ning/billing/usage/timeline/consumer/SampleConsumer.java
new file mode 100644
index 0000000..f6a04c3
--- /dev/null
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/consumer/SampleConsumer.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you 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 com.ning.billing.usage.timeline.consumer;
+
+import org.joda.time.DateTime;
+
+import com.ning.billing.usage.timeline.samples.SampleOpcode;
+
+public interface SampleConsumer {
+
+    public void consumeSample(int sampleNumber, SampleOpcode opcode, Object value, DateTime time);
+}
+

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/consumer/TimelineChunkConsumer.java b/usage/src/main/java/com/ning/billing/usage/timeline/consumer/TimelineChunkConsumer.java
new file mode 100644
index 0000000..1c403da
--- /dev/null
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/consumer/TimelineChunkConsumer.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2012 Ning, Inc.
+ *
+ * Ning licenses this file to you 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 com.ning.billing.usage.timeline.consumer;
+
+import com.ning.billing.usage.timeline.chunks.TimelineChunk;
+
+public interface TimelineChunkConsumer {
+
+    public void processTimelineChunk(TimelineChunk chunk);
+}

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/persistent/CachingTimelineDao.java b/usage/src/main/java/com/ning/billing/usage/timeline/persistent/CachingTimelineDao.java
index 2ce5673..e6d74d7 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/persistent/CachingTimelineDao.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/persistent/CachingTimelineDao.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 
 import com.ning.billing.usage.timeline.categories.CategoryIdAndMetric;
 import com.ning.billing.usage.timeline.chunks.TimelineChunk;
-import com.ning.billing.usage.timeline.chunks.TimelineChunkConsumer;
+import com.ning.billing.usage.timeline.consumer.TimelineChunkConsumer;
 import com.ning.billing.usage.timeline.shutdown.StartTimes;
 import com.ning.billing.usage.timeline.sources.SourceIdAndMetricId;
 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/persistent/DefaultTimelineDao.java b/usage/src/main/java/com/ning/billing/usage/timeline/persistent/DefaultTimelineDao.java
index 77f232d..b82d6e5 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/persistent/DefaultTimelineDao.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/persistent/DefaultTimelineDao.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 import com.ning.billing.usage.timeline.DateTimeUtils;
 import com.ning.billing.usage.timeline.categories.CategoryIdAndMetric;
 import com.ning.billing.usage.timeline.chunks.TimelineChunk;
-import com.ning.billing.usage.timeline.chunks.TimelineChunkConsumer;
+import com.ning.billing.usage.timeline.consumer.TimelineChunkConsumer;
 import com.ning.billing.usage.timeline.chunks.TimelineChunkMapper;
 import com.ning.billing.usage.timeline.shutdown.StartTimes;
 import com.ning.billing.usage.timeline.sources.SourceIdAndMetricId;

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/persistent/TimelineDao.java b/usage/src/main/java/com/ning/billing/usage/timeline/persistent/TimelineDao.java
index 5137154..6cbdb34 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/persistent/TimelineDao.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/persistent/TimelineDao.java
@@ -26,7 +26,7 @@ import org.skife.jdbi.v2.exceptions.UnableToObtainConnectionException;
 
 import com.ning.billing.usage.timeline.categories.CategoryIdAndMetric;
 import com.ning.billing.usage.timeline.chunks.TimelineChunk;
-import com.ning.billing.usage.timeline.chunks.TimelineChunkConsumer;
+import com.ning.billing.usage.timeline.consumer.TimelineChunkConsumer;
 import com.ning.billing.usage.timeline.shutdown.StartTimes;
 import com.ning.billing.usage.timeline.sources.SourceIdAndMetricId;