diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java
index c84dfb803c327..4ad67a5590752 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/histogram/HistogramAggregationBuilder.java
@@ -90,7 +90,7 @@ public static HistogramAggregationBuilder parse(String aggregationName, XContent
 
     private static AtomicBoolean wasRegistered = new AtomicBoolean(false);
     public static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
-        if (wasRegistered.compareAndSet(false, true) == true) {
+        if (wasRegistered.compareAndSet(false, true)) {
             HistogramAggregatorFactory.registerAggregators(valuesSourceRegistry);
         }
     }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java
index 6a3b1da5f5020..81afd7e07dc6f 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/terms/TermsAggregationBuilder.java
@@ -104,7 +104,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
 
     private static AtomicBoolean wasRegistered = new AtomicBoolean(false);
     public static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
-        if (wasRegistered.compareAndSet(false, true) == true) {
+        if (wasRegistered.compareAndSet(false, true)) {
             TermsAggregatorFactory.registerAggregators(valuesSourceRegistry);
         }
     }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
index fbb0e76536af6..77c2a912093f0 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
@@ -65,7 +65,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
 
     private static AtomicBoolean wasRegistered = new AtomicBoolean(false);
     public static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
-        if (wasRegistered.compareAndSet(false, true) == true) {
+        if (wasRegistered.compareAndSet(false, true)) {
             CardinalityAggregatorFactory.registerAggregators(valuesSourceRegistry);
         }
     }
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregationBuilder.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregationBuilder.java
index 949530466c3af..0ea84eb7dc8fc 100644
--- a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregationBuilder.java
+++ b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/PercentilesAggregationBuilder.java
@@ -121,7 +121,7 @@ public static AggregationBuilder parse(String aggregationName, XContentParser pa
 
     private static AtomicBoolean wasRegistered = new AtomicBoolean(false);
     public static void registerAggregators(ValuesSourceRegistry valuesSourceRegistry) {
-        if (wasRegistered.compareAndSet(false, true) == true) {
+        if (wasRegistered.compareAndSet(false, true)) {
             PercentilesAggregatorFactory.registerAggregators(valuesSourceRegistry);
         }
     }