killbill-memoizeit

diff --git a/api/src/main/java/com/ning/billing/meter/api/MeterUserApi.java b/api/src/main/java/com/ning/billing/meter/api/MeterUserApi.java
index 3ee17a1..b3aee1f 100644
--- a/api/src/main/java/com/ning/billing/meter/api/MeterUserApi.java
+++ b/api/src/main/java/com/ning/billing/meter/api/MeterUserApi.java
@@ -67,5 +67,5 @@ public interface MeterUserApi {
      * @param timestamp                      timestamp of this usage
      * @param context                        tenant context
      */
-    public void incrementUsage(UUID bundleId, Map<String, Map<String, Object>> samplesForCategoriesAndMetrics, DateTime timestamp, CallContext context);
+    public void recordUsage(UUID bundleId, Map<String, Map<String, Object>> samplesForCategoriesAndMetrics, DateTime timestamp, CallContext context);
 }

diff --git a/meter/src/main/java/com/ning/billing/meter/api/user/DefaultMeterUserApi.java b/meter/src/main/java/com/ning/billing/meter/api/user/DefaultMeterUserApi.java
index 840d295..8ea781b 100644
--- a/meter/src/main/java/com/ning/billing/meter/api/user/DefaultMeterUserApi.java
+++ b/meter/src/main/java/com/ning/billing/meter/api/user/DefaultMeterUserApi.java
@@ -79,24 +79,24 @@ public class DefaultMeterUserApi implements MeterUserApi {
     @Override
     public void incrementUsage(final UUID bundleId, final String categoryName, final String metricName,
                                final DateTime timestamp, final CallContext context) {
-        incrementUsage(bundleId,
-                       ImmutableMap.<String, Map<String, Object>>of(categoryName, ImmutableMap.<String, Object>of(metricName, (short) 1)),
-                       timestamp,
-                       context);
+        recordUsage(bundleId,
+                    ImmutableMap.<String, Map<String, Object>>of(categoryName, ImmutableMap.<String, Object>of(metricName, (short) 1)),
+                    timestamp,
+                    context);
     }
 
     @Override
     public void incrementUsageAndAggregate(final UUID bundleId, final String categoryName, final String metricName,
                                            final DateTime timestamp, final CallContext context) {
-        incrementUsage(bundleId,
-                       ImmutableMap.<String, Map<String, Object>>of(categoryName, ImmutableMap.<String, Object>of(metricName, (short) 1, AGGREGATE_METRIC_NAME, (short) 1)),
-                       timestamp,
-                       context);
+        recordUsage(bundleId,
+                    ImmutableMap.<String, Map<String, Object>>of(categoryName, ImmutableMap.<String, Object>of(metricName, (short) 1, AGGREGATE_METRIC_NAME, (short) 1)),
+                    timestamp,
+                    context);
     }
 
     @Override
-    public void incrementUsage(final UUID bundleId, final Map<String, Map<String, Object>> samplesForCategoriesAndMetrics,
-                               final DateTime timestamp, final CallContext context) {
+    public void recordUsage(final UUID bundleId, final Map<String, Map<String, Object>> samplesForCategoriesAndMetrics,
+                            final DateTime timestamp, final CallContext context) {
         final InternalCallContext internalCallContext = internalCallContextFactory.createInternalCallContext(bundleId, ObjectType.BUNDLE, context);
 
         for (final String category : samplesForCategoriesAndMetrics.keySet()) {

diff --git a/meter/src/main/java/com/ning/billing/meter/timeline/persistent/StreamyBytesPersistentOutputStream.java b/meter/src/main/java/com/ning/billing/meter/timeline/persistent/StreamyBytesPersistentOutputStream.java
index a4f38c5..be15537 100644
--- a/meter/src/main/java/com/ning/billing/meter/timeline/persistent/StreamyBytesPersistentOutputStream.java
+++ b/meter/src/main/java/com/ning/billing/meter/timeline/persistent/StreamyBytesPersistentOutputStream.java
@@ -65,6 +65,7 @@ public class StreamyBytesPersistentOutputStream extends OutputStream {
     public void write(final byte[] data, final int off, final int len) throws IOException {
         if (!inputBuffer.tryAppend(data, off, len)) {
             // Buffer full - need to flush
+            // TODO sync with HTTP call, performance hit?
             flushUnderlyingBufferAndReset();
 
             if (!inputBuffer.tryAppend(data, off, len)) {

diff --git a/meter/src/main/java/com/ning/billing/meter/timeline/persistent/TimelineDao.java b/meter/src/main/java/com/ning/billing/meter/timeline/persistent/TimelineDao.java
index c82183a..7137609 100644
--- a/meter/src/main/java/com/ning/billing/meter/timeline/persistent/TimelineDao.java
+++ b/meter/src/main/java/com/ning/billing/meter/timeline/persistent/TimelineDao.java
@@ -55,7 +55,7 @@ public interface TimelineDao {
 
     int getOrAddEventCategory(String eventCategory, InternalCallContext context) throws UnableToObtainConnectionException, CallbackFailedException;
 
-    // Sample kinds table
+    // Metrics table
 
     Integer getMetricId(int eventCategory, String metric, InternalTenantContext context) throws UnableToObtainConnectionException, CallbackFailedException;
 

diff --git a/meter/src/main/java/com/ning/billing/meter/timeline/TimelineSourceEventAccumulator.java b/meter/src/main/java/com/ning/billing/meter/timeline/TimelineSourceEventAccumulator.java
index a229b85..9912b37 100644
--- a/meter/src/main/java/com/ning/billing/meter/timeline/TimelineSourceEventAccumulator.java
+++ b/meter/src/main/java/com/ning/billing/meter/timeline/TimelineSourceEventAccumulator.java
@@ -142,7 +142,8 @@ public class TimelineSourceEventAccumulator {
             endTime = timestamp;
         } else if (timestamp.isBefore(endTime)) {
             // Note: we allow multiple events at the same time
-            log.warn("Adding samples for host {}, timestamp {} is before the end time {}; ignored",
+            // TODO Do we really want that?
+            log.warn("Adding samples for source {}, timestamp {} is before the end time {}; ignored",
                      new Object[]{sourceId, dateFormatter.print(timestamp), dateFormatter.print(endTime)});
             return;
         }

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestMeter.java b/server/src/test/java/com/ning/billing/jaxrs/TestMeter.java
index e7fd51f..05e2759 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestMeter.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestMeter.java
@@ -34,7 +34,6 @@ import com.google.common.collect.Ordering;
 
 public class TestMeter extends TestJaxrsBase {
 
-    private final Random rand = new Random();
     private final UUID bundleId = UUID.randomUUID();
     private final String category = "PageView";
     private final String visitor1 = "pierre";