From c8527b67435c5a2d0de7b4c0fa630f73276edc80 Mon Sep 17 00:00:00 2001 From: Christos Soulios Date: Mon, 25 Jul 2022 12:30:08 +0300 Subject: [PATCH] Fix incorrect switch statements --- .../InternalAutoDateHistogramTests.java | 2 +- .../terms/SignificantLongTermsTests.java | 4 ++-- .../terms/SignificantStringTermsTests.java | 4 ++-- .../metrics/InternalAvgTests.java | 21 ++++++++----------- .../metrics/InternalGeoCentroidTests.java | 21 ++++++++----------- .../metrics/InternalWeightedAvgTests.java | 21 ++++++++----------- .../pipeline/InternalDerivativeTests.java | 21 +++++++------------ 7 files changed, 40 insertions(+), 54 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java index 4b54768a2375e..d0ddf2eeaa70a 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalAutoDateHistogramTests.java @@ -276,7 +276,7 @@ protected InternalAutoDateHistogram mutateInstance(InternalAutoDateHistogram ins BucketInfo bucketInfo = instance.getBucketInfo(); Map metadata = instance.getMetadata(); long interval = instance.getBucketInnerInterval(); - switch (between(0, 3)) { + switch (between(0, 4)) { case 0 -> name += randomAlphaOfLength(5); case 1 -> { buckets = new ArrayList<>(buckets); diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java index 74316a962bccb..8d8832296f3f6 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantLongTermsTests.java @@ -81,7 +81,7 @@ protected Class implementationClass() { List buckets = longTerms.getBuckets(); SignificanceHeuristic significanceHeuristic = longTerms.significanceHeuristic; Map metadata = longTerms.getMetadata(); - switch (between(0, 5)) { + switch (between(0, 6)) { case 0 -> name += randomAlphaOfLength(5); case 1 -> requiredSize += between(1, 100); case 2 -> minDocCount += between(1, 100); @@ -102,7 +102,7 @@ protected Class implementationClass() { ) ); } - case 8 -> { + case 6 -> { if (metadata == null) { metadata = Maps.newMapWithExpectedSize(1); } else { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java index c1d30c0f81a83..da009c60e2333 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/bucket/terms/SignificantStringTermsTests.java @@ -84,7 +84,7 @@ protected Class implementationClass() { List buckets = stringTerms.getBuckets(); SignificanceHeuristic significanceHeuristic = stringTerms.significanceHeuristic; Map metadata = stringTerms.getMetadata(); - switch (between(0, 5)) { + switch (between(0, 6)) { case 0 -> name += randomAlphaOfLength(5); case 1 -> requiredSize += between(1, 100); case 2 -> minDocCount += between(1, 100); @@ -105,7 +105,7 @@ protected Class implementationClass() { ) ); } - case 8 -> { + case 6 -> { if (metadata == null) { metadata = Maps.newMapWithExpectedSize(1); } else { diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalAvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalAvgTests.java index 67a385985657c..83e27a7c11d03 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalAvgTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalAvgTests.java @@ -108,34 +108,31 @@ protected InternalAvg mutateInstance(InternalAvg instance) { long count = instance.getCount(); DocValueFormat formatter = instance.getFormatter(); Map metadata = instance.getMetadata(); - switch (between(0, 2)) { - case 0: - name += randomAlphaOfLength(5); - break; - case 1: + switch (between(0, 3)) { + case 0 -> name += randomAlphaOfLength(5); + case 1 -> { if (Double.isFinite(sum)) { sum += between(1, 100); } else { sum = between(1, 100); } - break; - case 2: + } + case 2 -> { if (Double.isFinite(count)) { count += between(1, 100); } else { count = between(1, 100); } - break; - case 3: + } + case 3 -> { if (metadata == null) { metadata = Maps.newMapWithExpectedSize(1); } else { metadata = new HashMap<>(instance.getMetadata()); } metadata.put(randomAlphaOfLength(15), randomInt()); - break; - default: - throw new AssertionError("Illegal randomisation branch"); + } + default -> throw new AssertionError("Illegal randomisation branch"); } return new InternalAvg(name, sum, count, formatter, metadata); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalGeoCentroidTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalGeoCentroidTests.java index 5f8cff22e1635..212a2c0127e5b 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalGeoCentroidTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalGeoCentroidTests.java @@ -98,19 +98,17 @@ protected InternalGeoCentroid mutateInstance(InternalGeoCentroid instance) { GeoPoint centroid = instance.centroid(); long count = instance.count(); Map metadata = instance.getMetadata(); - switch (between(0, 2)) { - case 0: - name += randomAlphaOfLength(5); - break; - case 1: + switch (between(0, 3)) { + case 0 -> name += randomAlphaOfLength(5); + case 1 -> { count += between(1, 100); if (centroid == null) { // if the new count is > 0 then we need to make sure there is a // centroid or the constructor will throw an exception centroid = new GeoPoint(randomDoubleBetween(-90, 90, false), randomDoubleBetween(-180, 180, false)); } - break; - case 2: + } + case 2 -> { if (centroid == null) { centroid = new GeoPoint(randomDoubleBetween(-90, 90, false), randomDoubleBetween(-180, 180, false)); count = between(1, 100); @@ -123,17 +121,16 @@ protected InternalGeoCentroid mutateInstance(InternalGeoCentroid instance) { } centroid = newCentroid; } - break; - case 3: + } + case 3 -> { if (metadata == null) { metadata = Maps.newMapWithExpectedSize(1); } else { metadata = new HashMap<>(instance.getMetadata()); } metadata.put(randomAlphaOfLength(15), randomInt()); - break; - default: - throw new AssertionError("Illegal randomisation branch"); + } + default -> throw new AssertionError("Illegal randomisation branch"); } return new InternalGeoCentroid(name, centroid, count, metadata); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalWeightedAvgTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalWeightedAvgTests.java index 3b1daf6791330..270648e3b0795 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalWeightedAvgTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/metrics/InternalWeightedAvgTests.java @@ -74,34 +74,31 @@ protected InternalWeightedAvg mutateInstance(InternalWeightedAvg instance) { double weight = instance.getWeight(); DocValueFormat formatter = instance.getFormatter(); Map metadata = instance.getMetadata(); - switch (between(0, 2)) { - case 0: - name += randomAlphaOfLength(5); - break; - case 1: + switch (between(0, 3)) { + case 0 -> name += randomAlphaOfLength(5); + case 1 -> { if (Double.isFinite(sum)) { sum += between(1, 100); } else { sum = between(1, 100); } - break; - case 2: + } + case 2 -> { if (Double.isFinite(weight)) { weight += between(1, 100); } else { weight = between(1, 100); } - break; - case 3: + } + case 3 -> { if (metadata == null) { metadata = Maps.newMapWithExpectedSize(1); } else { metadata = new HashMap<>(instance.getMetadata()); } metadata.put(randomAlphaOfLength(15), randomInt()); - break; - default: - throw new AssertionError("Illegal randomisation branch"); + } + default -> throw new AssertionError("Illegal randomisation branch"); } return new InternalWeightedAvg(name, sum, weight, formatter, metadata); } diff --git a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalDerivativeTests.java b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalDerivativeTests.java index 090fe5a8c36c3..cd6e4a9387a95 100644 --- a/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalDerivativeTests.java +++ b/server/src/test/java/org/elasticsearch/search/aggregations/pipeline/InternalDerivativeTests.java @@ -59,30 +59,25 @@ protected InternalDerivative mutateInstance(InternalDerivative instance) { double normalizationFactor = instance.getNormalizationFactor(); DocValueFormat formatter = instance.formatter(); Map metadata = instance.getMetadata(); - switch (between(0, 2)) { - case 0: - name += randomAlphaOfLength(5); - break; - case 1: + switch (between(0, 3)) { + case 0 -> name += randomAlphaOfLength(5); + case 1 -> { if (Double.isFinite(value)) { value += between(1, 100); } else { value = randomDoubleBetween(0, 100000, true); } - break; - case 2: - normalizationFactor += between(1, 100); - break; - case 3: + } + case 2 -> normalizationFactor += between(1, 100); + case 3 -> { if (metadata == null) { metadata = Maps.newMapWithExpectedSize(1); } else { metadata = new HashMap<>(instance.getMetadata()); } metadata.put(randomAlphaOfLength(15), randomInt()); - break; - default: - throw new AssertionError("Illegal randomisation branch"); + } + default -> throw new AssertionError("Illegal randomisation branch"); } return new InternalDerivative(name, value, normalizationFactor, formatter, metadata); }