Make util functions package only.

Mark Shields · Mark Shields · commit 0befb344bd74 · 2016-03-31T15:30:01.000-07:00
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BucketingFunction.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/BucketingFunction.java
@@ -27,28 +27,28 @@
  * Keep track of the minimum/maximum/sum of a set of timestamped long values.
  * For efficiency, bucket values by their timestamp.
  */
-public class BucketingFunction {
+class BucketingFunction {
   private static class Bucket {
     private int numSamples;
     private long combinedValue;
 
-    public Bucket(BucketingFunction outer) {
+    Bucket(BucketingFunction outer) {
       numSamples = 0;
       combinedValue = outer.function.identity();
     }
 
-    public void add(BucketingFunction outer, long value) {
+    void add(BucketingFunction outer, long value) {
       combinedValue = outer.function.apply(combinedValue, value);
       numSamples++;
     }
 
-    public boolean remove() {
+    boolean remove() {
       numSamples--;
       Preconditions.checkState(numSamples >= 0);
       return numSamples == 0;
     }
 
-    public long get() {
+    long get() {
       return combinedValue;
     }
   }
@@ -78,7 +78,7 @@ public long get() {
    */
   private final Map<Long, Bucket> buckets;
 
-  public BucketingFunction(
+  BucketingFunction(
       long bucketWidthMs,
       int numSignificantBuckets,
       int numSignificantSamples,
@@ -100,7 +100,7 @@ private long key(long timeMsSinceEpoch) {
   /**
    * Add one sample of {@code value} (to bucket) at {@code timeMsSinceEpoch}.
    */
-  public void add(long timeMsSinceEpoch, long value) {
+  void add(long timeMsSinceEpoch, long value) {
     long key = key(timeMsSinceEpoch);
     Bucket bucket = buckets.get(key);
     if (bucket == null) {
@@ -113,7 +113,7 @@ public void add(long timeMsSinceEpoch, long value) {
   /**
    * Remove one sample (from bucket) at {@code timeMsSinceEpoch}.
    */
-  public void remove(long timeMsSinceEpoch) {
+  void remove(long timeMsSinceEpoch) {
     long key = key(timeMsSinceEpoch);
     Bucket bucket = buckets.get(key);
     if (bucket == null) {
@@ -127,7 +127,7 @@ public void remove(long timeMsSinceEpoch) {
   /**
    * Return the (bucketized) combined value of all samples.
    */
-  public long get() {
+  long get() {
     long result = function.identity();
     for (Bucket bucket : buckets.values()) {
       result = function.apply(result, bucket.get());
@@ -139,7 +139,7 @@ public long get() {
    * Is the current result 'significant'? Ie is it drawn from enough buckets
    * or from enough samples?
    */
-  public boolean isSignificant() {
+  boolean isSignificant() {
     if (buckets.size() >= numSignificantBuckets) {
       return true;
     }
diff --git a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/MovingFunction.java b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/io/MovingFunction.java
@@ -73,7 +73,7 @@ class MovingFunction {
    */
   private int currentIndex;
 
-  public MovingFunction(long samplePeriodMs, long sampleUpdateMs,
+  MovingFunction(long samplePeriodMs, long sampleUpdateMs,
                         int numSignificantBuckets, int numSignificantSamples,
                         Combine.BinaryCombineLongFn function) {
     this.samplePeriodMs = samplePeriodMs;
@@ -115,7 +115,7 @@ private void flush(long nowMsSinceEpoch) {
   /**
    * Add {@code value} at {@code nowMsSinceEpoch}.
    */
-  public void add(long nowMsSinceEpoch, long value) {
+  void add(long nowMsSinceEpoch, long value) {
     flush(nowMsSinceEpoch);
     buckets[currentIndex] = function.apply(buckets[currentIndex], value);
     numSamples[currentIndex]++;
@@ -125,7 +125,7 @@ public void add(long nowMsSinceEpoch, long value) {
    * Return the minimum/maximum/sum of all retained values within {@link #samplePeriodMs}
    * of {@code nowMsSinceEpoch}.
    */
-  public long get(long nowMsSinceEpoch) {
+  long get(long nowMsSinceEpoch) {
     flush(nowMsSinceEpoch);
     long result = function.identity();
     for (int i = 0; i < buckets.length; i++) {
@@ -138,7 +138,7 @@ public long get(long nowMsSinceEpoch) {
    * Is the current result 'significant'? Ie is it drawn from enough buckets
    * or from enough samples?
    */
-  public boolean isSignificant() {
+  boolean isSignificant() {
     int totalSamples = 0;
     int activeBuckets = 0;
     for (int i = 0; i < buckets.length; i++) {
