killbill-aplcache

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimeBytesAndSampleBytes.java b/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimeBytesAndSampleBytes.java
index 6e2255d..f9ff7fa 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimeBytesAndSampleBytes.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimeBytesAndSampleBytes.java
@@ -26,7 +26,7 @@ public class TimeBytesAndSampleBytes {
     private final byte[] timeBytes;
     private final byte[] sampleBytes;
 
-    public TimeBytesAndSampleBytes(byte[] timeBytes, byte[] sampleBytes) {
+    public TimeBytesAndSampleBytes(final byte[] timeBytes, final byte[] sampleBytes) {
         this.timeBytes = timeBytes;
         this.sampleBytes = sampleBytes;
     }
@@ -57,13 +57,21 @@ public class TimeBytesAndSampleBytes {
 
     @Override
     public boolean equals(final Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
 
         final TimeBytesAndSampleBytes that = (TimeBytesAndSampleBytes) o;
 
-        if (!Arrays.equals(sampleBytes, that.sampleBytes)) return false;
-        if (!Arrays.equals(timeBytes, that.timeBytes)) return false;
+        if (!Arrays.equals(sampleBytes, that.sampleBytes)) {
+            return false;
+        }
+        if (!Arrays.equals(timeBytes, that.timeBytes)) {
+            return false;
+        }
 
         return true;
     }

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkBinder.java b/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkBinder.java
index a94f258..efb1ff2 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkBinder.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkBinder.java
@@ -30,7 +30,7 @@ import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
 
 import com.ning.billing.usage.timeline.DateTimeUtils;
 import com.ning.billing.usage.timeline.chunks.TimelineChunkBinder.TimelineChunkBinderFactory;
-import com.ning.billing.usage.timeline.times.TimesAndSamplesCoder;
+import com.ning.billing.usage.timeline.codec.TimesAndSamplesCoder;
 
 /**
  * jdbi binder for TimelineChunk

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkMapper.java b/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkMapper.java
index 86319c5..17d532c 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkMapper.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkMapper.java
@@ -25,7 +25,7 @@ import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
 import com.ning.billing.usage.timeline.DateTimeUtils;
-import com.ning.billing.usage.timeline.times.TimesAndSamplesCoder;
+import com.ning.billing.usage.timeline.codec.TimesAndSamplesCoder;
 
 /**
  * jdbi mapper for TimelineChunk