More review fixes

Author: JonasKunz

x-pack/plugin/mapper-exponential-histogram/src/main/java/org/elasticsearch/xpack/exponentialhistogram/ExponentialHistogramFieldMapper.java

@@ -443,15 +443,14 @@ private Double validateOrEstimateSum(
                 IndexWithCount.asBuckets(scale, negativeBuckets).iterator(),
                 IndexWithCount.asBuckets(scale, positiveBuckets).iterator()
             );
-        } else {
-            if (totalValueCount == 0 && sum != 0.0) {
-                throw new DocumentParsingException(
-                    subParser.getTokenLocation(),
-                    "error parsing field [" + fullPath() + "], sum field must be zero if the histogram is empty, but got " + sum
-                );
-            }
-            return sum;
         }
+        if (totalValueCount == 0 && sum != 0.0) {
+            throw new DocumentParsingException(
+                subParser.getTokenLocation(),
+                "error parsing field [" + fullPath() + "], sum field must be zero if the histogram is empty, but got " + sum
+            );
+        }
+        return sum;
     }
 
     private Double validateOrEstimateMin(
@@ -470,15 +469,14 @@ private Double validateOrEstimateMin(
                 IndexWithCount.asBuckets(scale, positiveBuckets)
             );
             return estimatedMin.isPresent() ? estimatedMin.getAsDouble() : null;
-        } else {
-            if (totalValueCount == 0) {
-                throw new DocumentParsingException(
-                    subParser.getTokenLocation(),
-                    "error parsing field [" + fullPath() + "], min field must be null if the histogram is empty, but got " + parsedMin
-                );
-            }
-            return parsedMin;
         }
+        if (totalValueCount == 0) {
+            throw new DocumentParsingException(
+                subParser.getTokenLocation(),
+                "error parsing field [" + fullPath() + "], min field must be null if the histogram is empty, but got " + parsedMin
+            );
+        }
+        return parsedMin;
     }
 
     private Double validateOrEstimateMax(
@@ -497,15 +495,14 @@ private Double validateOrEstimateMax(
                 IndexWithCount.asBuckets(scale, positiveBuckets)
             );
             return estimatedMax.isPresent() ? estimatedMax.getAsDouble() : null;
-        } else {
-            if (totalValueCount == 0) {
-                throw new DocumentParsingException(
-                    subParser.getTokenLocation(),
-                    "error parsing field [" + fullPath() + "], max field must be null if the histogram is empty, but got " + parsedMax
-                );
-            }
-            return parsedMax;
         }
+        if (totalValueCount == 0) {
+            throw new DocumentParsingException(
+                subParser.getTokenLocation(),
+                "error parsing field [" + fullPath() + "], max field must be null if the histogram is empty, but got " + parsedMax
+            );
+        }
+        return parsedMax;
     }
 
     private double parseDoubleAllowingInfinity(XContentParser parser) throws IOException {