package com.urbanairship.datacube;

import org.apache.commons.codec.binary.Hex;
import org.apache.commons.lang.ArrayUtils;

/**
 * A simple struct to hold a bucket type along with a corresponding bucket.
 * 
 * For example, bucket type "city" and bucket "portland."
 */
class BucketTypeAndBucket {
    static final BucketTypeAndBucket WILDCARD = new BucketTypeAndBucket(BucketType.WILDCARD,
            ArrayUtils.EMPTY_BYTE_ARRAY);
    
    public final BucketType bucketType;
    public final byte[] bucket;
    
    public BucketTypeAndBucket(BucketType bucketType, byte[] bucket) {
        this.bucketType = bucketType;
        this.bucket = bucket;
    }
    
    public String toString() {
        StringBuilder sb = new StringBuilder();
        sb.append("(");
        sb.append(bucketType.toString());
        sb.append(": ");
        sb.append(Hex.encodeHex(bucket));
        sb.append(")");
        return sb.toString();
    }
}
@@ -263,16 +263,23 @@
 d.%22%0A */%0A
+public 
 class Bu

Make BucketTypeAndBucket public, otherwise rollup filters are unusable