Prosoft Git

killbill-aplcache

usage: move utility classes into util package Signed-off-by: …

7/29/2012 12:06:54 AM
Pierre-Alexandre Meyer

Pierre-Alexandre Meyer

Commit: 05b3cdf

Tree: a93391f

Parents: 6f413a2

Changes

usage/src/main/java/com/ning/billing/usage/timeline/categories/CategoryIdAndMetricMapper.java 2(+0 -2)

usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkBinder.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkMapper.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/codec/TimesAndSamplesCoder.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/persistent/DefaultTimelineDao.java 4(+2 -2)

usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesBinder.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesMapper.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/sources/SourceIdAndMetricIdMapper.java 2(+0 -2)

usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCoder.java 4(+2 -2)

usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCursor.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/util/DateTimeUtils.java 2(+1 -1)

usage/src/main/java/com/ning/billing/usage/timeline/util/Hex.java 2(+1 -1)

usage/src/test/java/com/ning/billing/usage/timeline/categories/TestCategoryAndMetrics.java 2(+0 -2)

usage/src/test/java/com/ning/billing/usage/timeline/codec/TestSampleCoder.java 4(+2 -2)

usage/src/test/java/com/ning/billing/usage/timeline/TestDateTimeUtils.java 1(+1 -0)

usage/src/test/java/com/ning/billing/usage/timeline/times/TestDefaultTimelineCoder.java 4(+2 -2)

Details

usage/src/main/java/com/ning/billing/usage/timeline/categories/CategoryIdAndMetricMapper.java 2(+0 -2) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/categories/CategoryIdAndMetricMapper.java b/usage/src/main/java/com/ning/billing/usage/timeline/categories/CategoryIdAndMetricMapper.java
index 2ca01a2..5610f7d 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/categories/CategoryIdAndMetricMapper.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/categories/CategoryIdAndMetricMapper.java
@@ -22,8 +22,6 @@ import java.sql.SQLException;
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import com.ning.billing.usage.timeline.categories.CategoryIdAndMetric;
-
 public class CategoryIdAndMetricMapper implements ResultSetMapper<CategoryIdAndMetric> {
 
     @Override

usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkBinder.java 2(+1 -1) 

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 efb1ff2..60d7d25 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
@@ -28,9 +28,9 @@ import org.skife.jdbi.v2.sqlobject.Binder;
 import org.skife.jdbi.v2.sqlobject.BinderFactory;
 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.codec.TimesAndSamplesCoder;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
 
 /**
  * jdbi binder for TimelineChunk

usage/src/main/java/com/ning/billing/usage/timeline/chunks/TimelineChunkMapper.java 2(+1 -1) 

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 17d532c..346b8be 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
@@ -24,8 +24,8 @@ import org.joda.time.DateTime;
 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.codec.TimesAndSamplesCoder;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
 
 /**
  * jdbi mapper for TimelineChunk

usage/src/main/java/com/ning/billing/usage/timeline/codec/TimesAndSamplesCoder.java 2(+1 -1) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/codec/TimesAndSamplesCoder.java b/usage/src/main/java/com/ning/billing/usage/timeline/codec/TimesAndSamplesCoder.java
index bca1eda..5d2a179 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/codec/TimesAndSamplesCoder.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/codec/TimesAndSamplesCoder.java
@@ -23,9 +23,9 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
-import com.ning.billing.usage.timeline.Hex;
 import com.ning.billing.usage.timeline.chunks.TimeBytesAndSampleBytes;
 import com.ning.billing.usage.timeline.chunks.TimelineChunk;
+import com.ning.billing.usage.timeline.util.Hex;
 
 public class TimesAndSamplesCoder {

usage/src/main/java/com/ning/billing/usage/timeline/persistent/DefaultTimelineDao.java 4(+2 -2) 

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 b82d6e5..37ba9ae 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
@@ -33,13 +33,13 @@ import org.skife.jdbi.v2.tweak.HandleCallback;
 import org.slf4j.Logger;
 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.consumer.TimelineChunkConsumer;
 import com.ning.billing.usage.timeline.chunks.TimelineChunkMapper;
+import com.ning.billing.usage.timeline.consumer.TimelineChunkConsumer;
 import com.ning.billing.usage.timeline.shutdown.StartTimes;
 import com.ning.billing.usage.timeline.sources.SourceIdAndMetricId;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.BiMap;

usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesBinder.java 2(+1 -1) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesBinder.java b/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesBinder.java
index 00c08c0..aa174a3 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesBinder.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesBinder.java
@@ -30,8 +30,8 @@ import org.skife.jdbi.v2.sqlobject.BindingAnnotation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ning.billing.usage.timeline.DateTimeUtils;
 import com.ning.billing.usage.timeline.shutdown.StartTimesBinder.StartTimesBinderFactory;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;

usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesMapper.java 2(+1 -1) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesMapper.java b/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesMapper.java
index 29ac314..59d4b25 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesMapper.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/shutdown/StartTimesMapper.java
@@ -25,7 +25,7 @@ import org.joda.time.DateTime;
 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.util.DateTimeUtils;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

usage/src/main/java/com/ning/billing/usage/timeline/sources/SourceIdAndMetricIdMapper.java 2(+0 -2) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/sources/SourceIdAndMetricIdMapper.java b/usage/src/main/java/com/ning/billing/usage/timeline/sources/SourceIdAndMetricIdMapper.java
index ba60a5a..2959bd5 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/sources/SourceIdAndMetricIdMapper.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/sources/SourceIdAndMetricIdMapper.java
@@ -22,8 +22,6 @@ import java.sql.SQLException;
 import org.skife.jdbi.v2.StatementContext;
 import org.skife.jdbi.v2.tweak.ResultSetMapper;
 
-import com.ning.billing.usage.timeline.sources.SourceIdAndMetricId;
-
 public class SourceIdAndMetricIdMapper implements ResultSetMapper<SourceIdAndMetricId> {
 
     @Override

usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCoder.java 4(+2 -2) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCoder.java b/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCoder.java
index 07a3c05..620b7e0 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCoder.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCoder.java
@@ -28,8 +28,8 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ning.billing.usage.timeline.DateTimeUtils;
-import com.ning.billing.usage.timeline.Hex;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
+import com.ning.billing.usage.timeline.util.Hex;
 
 public class DefaultTimelineCoder implements TimelineCoder {

usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCursor.java 2(+1 -1) 

diff --git a/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCursor.java b/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCursor.java
index 0b6cefa..4831e5c 100644
--- a/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCursor.java
+++ b/usage/src/main/java/com/ning/billing/usage/timeline/times/DefaultTimelineCursor.java
@@ -24,7 +24,7 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.ning.billing.usage.timeline.DateTimeUtils;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
 
 public class DefaultTimelineCursor implements TimelineCursor {

usage/src/test/java/com/ning/billing/usage/timeline/categories/TestCategoryAndMetrics.java 2(+0 -2) 

diff --git a/usage/src/test/java/com/ning/billing/usage/timeline/categories/TestCategoryAndMetrics.java b/usage/src/test/java/com/ning/billing/usage/timeline/categories/TestCategoryAndMetrics.java
index 97ec227..28bfe74 100644
--- a/usage/src/test/java/com/ning/billing/usage/timeline/categories/TestCategoryAndMetrics.java
+++ b/usage/src/test/java/com/ning/billing/usage/timeline/categories/TestCategoryAndMetrics.java
@@ -19,8 +19,6 @@ package com.ning.billing.usage.timeline.categories;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.ning.billing.usage.timeline.categories.CategoryAndMetrics;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 public class TestCategoryAndMetrics {

usage/src/test/java/com/ning/billing/usage/timeline/codec/TestSampleCoder.java 4(+2 -2) 

diff --git a/usage/src/test/java/com/ning/billing/usage/timeline/codec/TestSampleCoder.java b/usage/src/test/java/com/ning/billing/usage/timeline/codec/TestSampleCoder.java
index 837aef4..884872b 100644
--- a/usage/src/test/java/com/ning/billing/usage/timeline/codec/TestSampleCoder.java
+++ b/usage/src/test/java/com/ning/billing/usage/timeline/codec/TestSampleCoder.java
@@ -30,8 +30,6 @@ import org.joda.time.format.ISODateTimeFormat;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.ning.billing.usage.timeline.DateTimeUtils;
-import com.ning.billing.usage.timeline.Hex;
 import com.ning.billing.usage.timeline.samples.RepeatSample;
 import com.ning.billing.usage.timeline.samples.SampleOpcode;
 import com.ning.billing.usage.timeline.samples.ScalarSample;
@@ -39,6 +37,8 @@ import com.ning.billing.usage.timeline.times.DefaultTimelineCoder;
 import com.ning.billing.usage.timeline.times.DefaultTimelineCursor;
 import com.ning.billing.usage.timeline.times.TimelineCoder;
 import com.ning.billing.usage.timeline.times.TimelineCursor;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
+import com.ning.billing.usage.timeline.util.Hex;
 
 import com.google.common.collect.ImmutableList;

usage/src/test/java/com/ning/billing/usage/timeline/TestDateTimeUtils.java 1(+1 -0) 

diff --git a/usage/src/test/java/com/ning/billing/usage/timeline/TestDateTimeUtils.java b/usage/src/test/java/com/ning/billing/usage/timeline/TestDateTimeUtils.java
index 6ea9ed3..d7af0ec 100644
--- a/usage/src/test/java/com/ning/billing/usage/timeline/TestDateTimeUtils.java
+++ b/usage/src/test/java/com/ning/billing/usage/timeline/TestDateTimeUtils.java
@@ -21,6 +21,7 @@ import org.joda.time.Seconds;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
 import com.ning.billing.util.clock.Clock;
 import com.ning.billing.util.clock.ClockMock;

usage/src/test/java/com/ning/billing/usage/timeline/times/TestDefaultTimelineCoder.java 4(+2 -2) 

diff --git a/usage/src/test/java/com/ning/billing/usage/timeline/times/TestDefaultTimelineCoder.java b/usage/src/test/java/com/ning/billing/usage/timeline/times/TestDefaultTimelineCoder.java
index d742bd8..a582e1e 100644
--- a/usage/src/test/java/com/ning/billing/usage/timeline/times/TestDefaultTimelineCoder.java
+++ b/usage/src/test/java/com/ning/billing/usage/timeline/times/TestDefaultTimelineCoder.java
@@ -26,8 +26,8 @@ import org.joda.time.DateTime;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.ning.billing.usage.timeline.DateTimeUtils;
-import com.ning.billing.usage.timeline.Hex;
+import com.ning.billing.usage.timeline.util.DateTimeUtils;
+import com.ning.billing.usage.timeline.util.Hex;
 
 public class TestDefaultTimelineCoder {

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github