Fix merging conflicts

35 files changed, 36 insertions, 34 deletions

diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
index 0618e5cb29..c86d8afed5 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/InternalAggregation.java
@@ -174,7 +174,7 @@ public abstract class InternalAggregation implements Aggregation, ToXContent, Na
      * the aggregation name in the response, so that it can later be used by REST clients
      * to determine the internal type of the aggregation.
      */
-    protected String getType() {
+    public String getType() {
         return getWriteableName();
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java b/core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java
index 6942b6aec5..3ff91d8d36 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/ParsedAggregation.java
@@ -63,7 +63,7 @@ public abstract class ParsedAggregation implements Aggregation, ToXContent {
      * to determine the internal type of the aggregation.
      */
     //TODO it may make sense to move getType to the Aggregation interface given that we are duplicating it in both implementations
-    protected abstract String getType();
+    public abstract String getType();
 
     @Override
     public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java
index 9efc478aff..ace0cb5990 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedDateHistogram.java
@@ -32,7 +32,7 @@ import java.util.List;
 public class ParsedDateHistogram extends ParsedMultiBucketAggregation<ParsedDateHistogram.ParsedBucket> implements Histogram {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return DateHistogramAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java
index eeec1cd81b..6037c15588 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/ParsedHistogram.java
@@ -29,7 +29,7 @@ import java.util.List;
 public class ParsedHistogram extends ParsedMultiBucketAggregation<ParsedHistogram.ParsedBucket> implements Histogram {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return HistogramAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java
index 0c02f1ae93..3b5b42d59f 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/InternalSampler.java
@@ -48,7 +48,7 @@ public class InternalSampler extends InternalSingleBucketAggregation implements
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return "sampler";
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java
index f9d8375af8..e79b01abe4 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/significant/UnmappedSignificantTerms.java
@@ -76,7 +76,7 @@ public class UnmappedSignificantTerms extends InternalSignificantTerms<UnmappedS
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return SignificantStringTerms.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java
index 3401cd021b..d3afe5c176 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedDoubleTerms.java
@@ -28,7 +28,7 @@ import java.io.IOException;
 public class ParsedDoubleTerms extends ParsedTerms {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return DoubleTerms.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java
index 6de25dfefe..b5869fc6ee 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedLongTerms.java
@@ -28,7 +28,7 @@ import java.io.IOException;
 public class ParsedLongTerms extends ParsedTerms {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return LongTerms.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java
index f258f7f847..792365d6b1 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/ParsedStringTerms.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 public class ParsedStringTerms extends ParsedTerms {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return StringTerms.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java
index 40cbacd37e..6aaccd22d7 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/UnmappedTerms.java
@@ -73,7 +73,7 @@ public class UnmappedTerms extends InternalTerms<UnmappedTerms, UnmappedTerms.Bu
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return StringTerms.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java
index d77fd2bb3a..16d91bd08f 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/avg/ParsedAvg.java
@@ -34,7 +34,7 @@ public class ParsedAvg extends ParsedSingleValueNumericMetricsAggregation implem
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return AvgAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java
index 77356db519..82104fc9db 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/cardinality/ParsedCardinality.java
@@ -50,7 +50,7 @@ public class ParsedCardinality extends ParsedAggregation implements Cardinality
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return CardinalityAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java
index ed09c28186..7ce1f5d86f 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/geocentroid/ParsedGeoCentroid.java
@@ -46,7 +46,7 @@ public class ParsedGeoCentroid extends ParsedAggregation implements GeoCentroid
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return GeoCentroidAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java
index 86eab0025a..f6a3190cd0 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/max/ParsedMax.java
@@ -34,7 +34,7 @@ public class ParsedMax extends ParsedSingleValueNumericMetricsAggregation implem
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return MaxAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java
index c50cd5c361..9b214bb346 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/min/ParsedMin.java
@@ -34,7 +34,7 @@ public class ParsedMin extends ParsedSingleValueNumericMetricsAggregation implem
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return MinAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java
index 5d00d8dc8e..f5fd7717e0 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentileRanks.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
 public class ParsedHDRPercentileRanks extends ParsedPercentileRanks {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return InternalHDRPercentileRanks.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java
index 0b6da9f00e..1b1ba906aa 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/hdr/ParsedHDRPercentiles.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 public class ParsedHDRPercentiles extends ParsedPercentiles implements Percentiles {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return InternalHDRPercentiles.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java
index 34fd92ad4f..01929f374d 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentileRanks.java
@@ -31,7 +31,7 @@ import java.util.Iterator;
 public class ParsedTDigestPercentileRanks extends ParsedPercentileRanks {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return InternalTDigestPercentileRanks.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java
index bdd2d6b810..cbae25d61e 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/ParsedTDigestPercentiles.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 public class ParsedTDigestPercentiles extends ParsedPercentiles implements Percentiles {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return InternalTDigestPercentiles.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java
index 1711e4ee15..239548ecde 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/ParsedStats.java
@@ -87,7 +87,7 @@ public class ParsedStats extends ParsedAggregation implements Stats {
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return StatsAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java
index 0eb0bdb215..5931112736 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/stats/extended/ParsedExtendedStats.java
@@ -44,7 +44,7 @@ public class ParsedExtendedStats extends ParsedStats implements ExtendedStats {
     protected double avg;
 
     @Override
-    protected String getType() {
+    public String getType() {
         return ExtendedStatsAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java
index 86d3e1c429..a51f03d356 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/sum/ParsedSum.java
@@ -34,7 +34,7 @@ public class ParsedSum extends ParsedSingleValueNumericMetricsAggregation implem
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return SumAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java
index 012323f004..7430bca08d 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/metrics/valuecount/ParsedValueCount.java
@@ -48,7 +48,7 @@ public class ParsedValueCount extends ParsedAggregation implements ValueCount {
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return ValueCountAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java
index 7d1bcec3bc..7449ce6666 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/ParsedSimpleValue.java
@@ -29,7 +29,7 @@ import java.io.IOException;
 public class ParsedSimpleValue extends ParsedSingleValueNumericMetricsAggregation implements SimpleValue {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return InternalSimpleValue.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java
index 9008c56c5c..69e9935263 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/ParsedBucketMetricValue.java
@@ -38,7 +38,7 @@ public class ParsedBucketMetricValue extends ParsedSingleValueNumericMetricsAggr
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return InternalBucketMetricValue.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java
index 4738ad7d9d..c7ddcc6ee9 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/ParsedStatsBucket.java
@@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.metrics.stats.ParsedStats;
 public class ParsedStatsBucket extends ParsedStats implements StatsBucket {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return StatsBucketPipelineAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java
index 08bfbfe587..d292249242 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/stats/extended/ParsedExtendedStatsBucket.java
@@ -27,7 +27,7 @@ import org.elasticsearch.search.aggregations.metrics.stats.extended.ParsedExtend
 public class ParsedExtendedStatsBucket extends ParsedExtendedStats implements ExtendedStatsBucket {
 
     @Override
-    protected String getType() {
+    public String getType() {
         return ExtendedStatsBucketPipelineAggregationBuilder.NAME;
     }
 
diff --git a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java
index 5469b8b65c..2b871a99d9 100644
--- a/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java
+++ b/core/src/main/java/org/elasticsearch/search/aggregations/pipeline/derivative/ParsedDerivative.java
@@ -42,7 +42,7 @@ public class ParsedDerivative extends ParsedSimpleValue implements Derivative {
     }
 
     @Override
-    protected String getType() {
+    public String getType() {
         return DerivativePipelineAggregationBuilder.NAME;
     }
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java
index 4ac6c62f30..99129529e2 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/AggregationsTests.java
@@ -53,6 +53,7 @@ import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.percentile.I
 import org.elasticsearch.search.aggregations.pipeline.bucketmetrics.stats.extended.InternalExtendedStatsBucketTests;
 import org.elasticsearch.search.aggregations.pipeline.derivative.InternalDerivativeTests;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.InternalAggregationTestCase;
 import org.elasticsearch.test.hamcrest.ElasticsearchAssertions;
 import org.junit.After;
 import org.junit.Before;
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTestCase.java
index 64eee02dcb..b16b7f49d7 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTestCase.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/InternalMultiBucketAggregationTestCase.java
@@ -21,6 +21,7 @@ package org.elasticsearch.search.aggregations;
 
 import org.elasticsearch.search.aggregations.bucket.MultiBucketsAggregation;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
+import org.elasticsearch.test.InternalAggregationTestCase;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/ParsedAggregationTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/ParsedAggregationTests.java
index f56ae175a8..bfb8712752 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/ParsedAggregationTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/ParsedAggregationTests.java
@@ -94,7 +94,7 @@ public class ParsedAggregationTests extends ESTestCase {
         }
 
         @Override
-        protected String getType() {
+        public String getType() {
             return "type";
         }
 
@@ -122,7 +122,7 @@ public class ParsedAggregationTests extends ESTestCase {
         }
 
         @Override
-        protected String getType() {
+        public String getType() {
             return "type";
         }
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java
index 4e05b1bd68..9cb248401d 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/avg/InternalAvgTests.java
@@ -21,7 +21,7 @@ package org.elasticsearch.search.aggregations.metrics.avg;
 
 import org.elasticsearch.common.io.stream.Writeable.Reader;
 import org.elasticsearch.search.DocValueFormat;
-import org.elasticsearch.search.aggregations.InternalAggregationTestCase;
+import org.elasticsearch.search.aggregations.ParsedAggregation;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
 import org.elasticsearch.test.InternalAggregationTestCase;
 
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java
index b3cfbcea6c..e7d808a9b3 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/AbstractPercentilesTestCase.java
@@ -21,8 +21,8 @@ package org.elasticsearch.search.aggregations.metrics.percentiles;
 
 import org.elasticsearch.search.DocValueFormat;
 import org.elasticsearch.search.aggregations.InternalAggregation;
-import org.elasticsearch.search.aggregations.InternalAggregationTestCase;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
+import org.elasticsearch.test.InternalAggregationTestCase;
 
 import java.io.IOException;
 import java.util.Arrays;
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java
index 189091433a..f8698fda2c 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/metrics/percentiles/tdigest/InternalTDigestPercentilesRanksTests.java
@@ -21,9 +21,9 @@ package org.elasticsearch.search.aggregations.metrics.percentiles.tdigest;
 
 import org.elasticsearch.common.io.stream.Writeable.Reader;
 import org.elasticsearch.search.DocValueFormat;
+import org.elasticsearch.search.aggregations.metrics.percentiles.InternalPercentilesRanksTestCase;
 import org.elasticsearch.search.aggregations.metrics.percentiles.ParsedPercentiles;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
-import org.elasticsearch.test.InternalAggregationTestCase;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java
index 8de1700141..e58538864a 100644
--- a/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java
+++ b/core/src/test/java/org/elasticsearch/search/aggregations/pipeline/bucketmetrics/InternalBucketMetricValueTests.java
@@ -20,9 +20,9 @@
 package org.elasticsearch.search.aggregations.pipeline.bucketmetrics;
 
 import org.elasticsearch.common.io.stream.Writeable.Reader;
-import org.elasticsearch.search.aggregations.InternalAggregationTestCase;
 import org.elasticsearch.search.aggregations.ParsedAggregation;
 import org.elasticsearch.search.aggregations.pipeline.PipelineAggregator;
+import org.elasticsearch.test.InternalAggregationTestCase;
 
 import java.util.Collections;
 import java.util.List;