From 870d986eefcd12be84faa16a78d2d2a28bc4b6db Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 7 Jun 2023 11:46:29 +0100 Subject: [PATCH] Remove unnecessary `!= false` idioms --- .../src/main/java/org/elasticsearch/plugins/cli/ProxyUtils.java | 2 +- libs/h3/src/main/java/org/elasticsearch/h3/H3Index.java | 2 +- .../org/elasticsearch/legacygeo/builders/PolygonBuilder.java | 2 +- .../org/elasticsearch/cluster/routing/IndexRoutingTable.java | 2 +- .../elasticsearch/cluster/routing/IndexShardRoutingTable.java | 2 +- .../java/org/elasticsearch/common/geo/GeoPolygonDecomposer.java | 2 +- .../src/main/java/org/elasticsearch/index/shard/IndexShard.java | 2 +- .../cluster/routing/allocation/DataTierAllocationDecider.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ProxyUtils.java b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ProxyUtils.java index 847f2f63ee772..55e9f2ebc9e84 100644 --- a/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ProxyUtils.java +++ b/distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/ProxyUtils.java @@ -54,6 +54,6 @@ static Proxy buildProxy(String proxy) throws UserException { * @return whether the arguments describe a potentially valid proxy. */ static boolean validateProxy(String hostname, String port) { - return Strings.isNullOrEmpty(hostname) == false && port != null && port.matches("^\\d+$") != false; + return Strings.isNullOrEmpty(hostname) == false && port != null && port.matches("^\\d+$"); } } diff --git a/libs/h3/src/main/java/org/elasticsearch/h3/H3Index.java b/libs/h3/src/main/java/org/elasticsearch/h3/H3Index.java index abde445d4abcf..6d7af86a9a537 100644 --- a/libs/h3/src/main/java/org/elasticsearch/h3/H3Index.java +++ b/libs/h3/src/main/java/org/elasticsearch/h3/H3Index.java @@ -268,7 +268,7 @@ private static boolean h3ToFaceIjkWithInitializedFijk(long h, FaceIJK fijk) { final int res = H3Index.H3_get_resolution(h); // center base cell hierarchy is entirely on this face - final boolean possibleOverage = BaseCells.isBaseCellPentagon(H3_get_base_cell(h)) != false + final boolean possibleOverage = BaseCells.isBaseCellPentagon(H3_get_base_cell(h)) || (res != 0 && (fijk.coord.i != 0 || fijk.coord.j != 0 || fijk.coord.k != 0)); for (int r = 1; r <= res; r++) { diff --git a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java index 6727dfeff345d..f9a01028f8650 100644 --- a/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java +++ b/modules/legacy-geo/src/main/java/org/elasticsearch/legacygeo/builders/PolygonBuilder.java @@ -721,7 +721,7 @@ private static Edge[] ring( // if the polygon is tiny, the computed area can result in zero. In that case // we assume orientation is correct - boolean orientation = signedArea == 0 ? handedness != false : signedArea < 0; + boolean orientation = signedArea == 0 ? handedness : signedArea < 0; // OGC requires shell as ccw (Right-Handedness) and holes as cw (Left-Handedness) // since GeoJSON doesn't specify (and doesn't need to) GEO core will assume OGC standards diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java index bd616ed8ed939..50962dbbfb3bc 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/IndexRoutingTable.java @@ -301,7 +301,7 @@ public boolean equals(Object o) { IndexRoutingTable that = (IndexRoutingTable) o; if (index.equals(that.index) == false) return false; - return Arrays.equals(shards, that.shards) != false; + return Arrays.equals(shards, that.shards); } @Override diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java b/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java index 735803c7b52aa..cc0bb6fd4323b 100644 --- a/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java +++ b/server/src/main/java/org/elasticsearch/cluster/routing/IndexShardRoutingTable.java @@ -477,7 +477,7 @@ public boolean equals(Object o) { IndexShardRoutingTable that = (IndexShardRoutingTable) o; if (shardId.equals(that.shardId) == false) return false; - return Arrays.equals(shards, that.shards) != false; + return Arrays.equals(shards, that.shards); } @Override diff --git a/server/src/main/java/org/elasticsearch/common/geo/GeoPolygonDecomposer.java b/server/src/main/java/org/elasticsearch/common/geo/GeoPolygonDecomposer.java index 9f80619b7e80d..e23443f411aec 100644 --- a/server/src/main/java/org/elasticsearch/common/geo/GeoPolygonDecomposer.java +++ b/server/src/main/java/org/elasticsearch/common/geo/GeoPolygonDecomposer.java @@ -215,7 +215,7 @@ private static Edge[] ring( } // if the polygon is tiny, the computed area can result in zero. In that case // we assume orientation is correct - boolean orientation = signedArea == 0 ? handedness != false : signedArea < 0; + boolean orientation = signedArea == 0 ? handedness : signedArea < 0; // OGC requires shell as ccw (Right-Handedness) and holes as cw (Left-Handedness) // since GeoJSON doesn't specify (and doesn't need to) GEO core will assume OGC standards diff --git a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java index fd53b07e04013..e0372250e2a43 100644 --- a/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java +++ b/server/src/main/java/org/elasticsearch/index/shard/IndexShard.java @@ -544,7 +544,7 @@ public void updateShardState( ); } - if (newRouting.active() != false && state != IndexShardState.STARTED && state != IndexShardState.CLOSED) { + if (newRouting.active() && state != IndexShardState.STARTED && state != IndexShardState.CLOSED) { // If cluster.no_master_block: all then we remove all shards locally whenever there's no master, but there might still be // a shard-started message in flight. When the new master is elected we start to recover our shards again and the stale // shard-started message could arrive and move this shard to STARTED in the cluster state too soon. This is pretty rare so diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java index 70579834c2aa7..6e7c4046b3531 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDecider.java @@ -76,7 +76,7 @@ public static Decision shouldFilter( RoutingAllocation allocation ) { List tierPreference = indexMd.getTierPreference(); - if (tierPreference.isEmpty() != false) { + if (tierPreference.isEmpty()) { return YES_PASSES; } Optional tier = preferredTierFunction.apply(tierPreference, allocation.nodes(), allocation.desiredNodes());