diff options
Diffstat (limited to 'api/src')
9 files changed, 23 insertions, 23 deletions
diff --git a/api/src/main/java/io/opencensus/metrics/DoubleGauge.java b/api/src/main/java/io/opencensus/metrics/DoubleGauge.java index 62730a06..de2b053b 100644 --- a/api/src/main/java/io/opencensus/metrics/DoubleGauge.java +++ b/api/src/main/java/io/opencensus/metrics/DoubleGauge.java @@ -172,15 +172,15 @@ public abstract class DoubleGauge { Utils.checkNotNull(name, "name"); Utils.checkNotNull(description, "description"); Utils.checkNotNull(unit, "unit"); - Utils.checkNotNull(labelKeys, "labelKeys should not be null."); - Utils.checkListElementNotNull(labelKeys, "labelKeys element should not be null."); + Utils.checkListElementNotNull( + Utils.checkNotNull(labelKeys, "labelKeys"), "labelKey element should not be null."); labelKeysSize = labelKeys.size(); } @Override public NoopDoublePoint getOrCreateTimeSeries(List<LabelValue> labelValues) { - Utils.checkNotNull(labelValues, "labelValues should not be null."); - Utils.checkListElementNotNull(labelValues, "labelValues element should not be null."); + Utils.checkListElementNotNull( + Utils.checkNotNull(labelValues, "labelValues"), "labelValue element should not be null."); Utils.checkArgument(labelKeysSize == labelValues.size(), "Incorrect number of labels."); return NoopDoublePoint.INSTANCE; } @@ -192,7 +192,7 @@ public abstract class DoubleGauge { @Override public void removeTimeSeries(List<LabelValue> labelValues) { - Utils.checkNotNull(labelValues, "labelValues should not be null."); + Utils.checkNotNull(labelValues, "labelValues"); } @Override diff --git a/api/src/main/java/io/opencensus/metrics/LongGauge.java b/api/src/main/java/io/opencensus/metrics/LongGauge.java index f473a8ac..8ca760be 100644 --- a/api/src/main/java/io/opencensus/metrics/LongGauge.java +++ b/api/src/main/java/io/opencensus/metrics/LongGauge.java @@ -171,8 +171,8 @@ public abstract class LongGauge { @Override public NoopLongPoint getOrCreateTimeSeries(List<LabelValue> labelValues) { - Utils.checkNotNull(labelValues, "labelValues should not be null."); - Utils.checkListElementNotNull(labelValues, "labelValues element should not be null."); + Utils.checkListElementNotNull( + Utils.checkNotNull(labelValues, "labelValues"), "labelValue element should not be null."); Utils.checkArgument(labelKeysSize == labelValues.size(), "Incorrect number of labels."); return NoopLongPoint.INSTANCE; } @@ -184,7 +184,7 @@ public abstract class LongGauge { @Override public void removeTimeSeries(List<LabelValue> labelValues) { - Utils.checkNotNull(labelValues, "labelValues should not be null."); + Utils.checkNotNull(labelValues, "labelValues"); } @Override diff --git a/api/src/main/java/io/opencensus/stats/Aggregation.java b/api/src/main/java/io/opencensus/stats/Aggregation.java index f5efed9b..9c95e847 100644 --- a/api/src/main/java/io/opencensus/stats/Aggregation.java +++ b/api/src/main/java/io/opencensus/stats/Aggregation.java @@ -180,7 +180,7 @@ public abstract class Aggregation { * @since 0.8 */ public static Distribution create(BucketBoundaries bucketBoundaries) { - Utils.checkNotNull(bucketBoundaries, "bucketBoundaries should not be null."); + Utils.checkNotNull(bucketBoundaries, "bucketBoundaries"); return new AutoValue_Aggregation_Distribution(bucketBoundaries); } diff --git a/api/src/main/java/io/opencensus/stats/AggregationData.java b/api/src/main/java/io/opencensus/stats/AggregationData.java index eb7d40b3..c6e12b67 100644 --- a/api/src/main/java/io/opencensus/stats/AggregationData.java +++ b/api/src/main/java/io/opencensus/stats/AggregationData.java @@ -288,15 +288,15 @@ public abstract class AggregationData { Utils.checkArgument(min <= max, "max should be greater or equal to min."); } - Utils.checkNotNull(bucketCounts, "bucket counts should not be null."); + Utils.checkNotNull(bucketCounts, "bucketCounts"); List<Long> bucketCountsCopy = Collections.unmodifiableList(new ArrayList<Long>(bucketCounts)); for (Long bucket : bucketCountsCopy) { - Utils.checkNotNull(bucket, "bucket should not be null."); + Utils.checkNotNull(bucket, "bucket"); } Utils.checkNotNull(exemplars, "exemplar list should not be null."); for (Exemplar exemplar : exemplars) { - Utils.checkNotNull(exemplar, "exemplar should not be null."); + Utils.checkNotNull(exemplar, "exemplar"); } return new AutoValue_AggregationData_DistributionData( diff --git a/api/src/main/java/io/opencensus/stats/BucketBoundaries.java b/api/src/main/java/io/opencensus/stats/BucketBoundaries.java index 573a9e10..61e21e6c 100644 --- a/api/src/main/java/io/opencensus/stats/BucketBoundaries.java +++ b/api/src/main/java/io/opencensus/stats/BucketBoundaries.java @@ -42,7 +42,7 @@ public abstract class BucketBoundaries { * @since 0.8 */ public static final BucketBoundaries create(List<Double> bucketBoundaries) { - Utils.checkNotNull(bucketBoundaries, "bucketBoundaries list should not be null."); + Utils.checkNotNull(bucketBoundaries, "bucketBoundaries"); List<Double> bucketBoundariesCopy = new ArrayList<Double>(bucketBoundaries); // Deep copy. // Check if sorted. if (bucketBoundariesCopy.size() > 1) { diff --git a/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java b/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java index 5690bd44..b0cdea7c 100644 --- a/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java +++ b/api/src/test/java/io/opencensus/metrics/DoubleGaugeTest.java @@ -49,7 +49,7 @@ public class DoubleGaugeTest { DoubleGauge doubleGauge = DoubleGauge.newNoopDoubleGauge(NAME, DESCRIPTION, UNIT, EMPTY_LABEL_KEYS); thrown.expect(NullPointerException.class); - thrown.expectMessage("labelValues should not be null."); + thrown.expectMessage("labelValues"); doubleGauge.getOrCreateTimeSeries(null); } @@ -58,7 +58,7 @@ public class DoubleGaugeTest { List<LabelValue> labelValues = Collections.singletonList(null); DoubleGauge doubleGauge = DoubleGauge.newNoopDoubleGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY); thrown.expect(NullPointerException.class); - thrown.expectMessage("labelValues element should not be null."); + thrown.expectMessage("labelValue element should not be null."); doubleGauge.getOrCreateTimeSeries(labelValues); } @@ -74,7 +74,7 @@ public class DoubleGaugeTest { public void noopRemoveTimeSeries_WithNullLabelValues() { DoubleGauge doubleGauge = DoubleGauge.newNoopDoubleGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY); thrown.expect(NullPointerException.class); - thrown.expectMessage("labelValues should not be null."); + thrown.expectMessage("labelValues"); doubleGauge.removeTimeSeries(null); } diff --git a/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java b/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java index 768abe06..eedb287c 100644 --- a/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java +++ b/api/src/test/java/io/opencensus/metrics/LongGaugeTest.java @@ -48,7 +48,7 @@ public class LongGaugeTest { public void noopGetOrCreateTimeSeries_WithNullLabelValues() { LongGauge longGauge = LongGauge.newNoopLongGauge(NAME, DESCRIPTION, UNIT, EMPTY_LABEL_KEYS); thrown.expect(NullPointerException.class); - thrown.expectMessage("labelValues should not be null."); + thrown.expectMessage("labelValues"); longGauge.getOrCreateTimeSeries(null); } @@ -57,7 +57,7 @@ public class LongGaugeTest { List<LabelValue> labelValues = Collections.singletonList(null); LongGauge longGauge = LongGauge.newNoopLongGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY); thrown.expect(NullPointerException.class); - thrown.expectMessage("labelValues element should not be null."); + thrown.expectMessage("labelValue element should not be null."); longGauge.getOrCreateTimeSeries(labelValues); } @@ -73,7 +73,7 @@ public class LongGaugeTest { public void noopRemoveTimeSeries_WithNullLabelValues() { LongGauge longGauge = LongGauge.newNoopLongGauge(NAME, DESCRIPTION, UNIT, LABEL_KEY); thrown.expect(NullPointerException.class); - thrown.expectMessage("labelValues should not be null."); + thrown.expectMessage("labelValues"); longGauge.removeTimeSeries(null); } diff --git a/api/src/test/java/io/opencensus/stats/AggregationDataTest.java b/api/src/test/java/io/opencensus/stats/AggregationDataTest.java index 60551600..a6d6d1de 100644 --- a/api/src/test/java/io/opencensus/stats/AggregationDataTest.java +++ b/api/src/test/java/io/opencensus/stats/AggregationDataTest.java @@ -108,14 +108,14 @@ public class AggregationDataTest { @Test public void preventNullBucketCountList() { thrown.expect(NullPointerException.class); - thrown.expectMessage("bucket counts should not be null."); + thrown.expectMessage("bucketCounts"); DistributionData.create(1, 1, 1, 1, 0, null); } @Test public void preventNullBucket() { thrown.expect(NullPointerException.class); - thrown.expectMessage("bucket should not be null."); + thrown.expectMessage("bucket"); DistributionData.create(1, 1, 1, 1, 0, Arrays.asList(0L, 1L, null)); } @@ -129,7 +129,7 @@ public class AggregationDataTest { @Test public void preventNullExemplar() { thrown.expect(NullPointerException.class); - thrown.expectMessage("exemplar should not be null."); + thrown.expectMessage("exemplar"); DistributionData.create( 1, 1, 1, 1, 0, Arrays.asList(0L, 1L, 1L), Collections.<Exemplar>singletonList(null)); } diff --git a/api/src/test/java/io/opencensus/stats/AggregationTest.java b/api/src/test/java/io/opencensus/stats/AggregationTest.java index c2e6a716..cf337030 100644 --- a/api/src/test/java/io/opencensus/stats/AggregationTest.java +++ b/api/src/test/java/io/opencensus/stats/AggregationTest.java @@ -50,7 +50,7 @@ public class AggregationTest { @Test public void testNullBucketBoundaries() { thrown.expect(NullPointerException.class); - thrown.expectMessage("bucketBoundaries should not be null."); + thrown.expectMessage("bucketBoundaries"); Distribution.create(null); } |