address warns

opensearch-project · Oct 17, 2024 · eb73e63 · eb73e63
1 parent bebebac
commit eb73e63
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/server/src/test/java/org/opensearch/search/SearchIpFieldTermsTest.java b/server/src/test/java/org/opensearch/search/SearchIpFieldTermsTest.java
@@ -22,8 +22,12 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static org.hamcrest.Matchers.equalTo;
+
+import org.hamcrest.MatcherAssert;
+
 import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
 
 public class SearchIpFieldTermsTest extends OpenSearchSingleNodeTestCase {
@@ -41,7 +45,7 @@ public void testMassive() throws Exception {
         int cidrs = 0;
         int ips = 0;
         List<String> toQuery = new ArrayList<>();
-        for (int i = 0; ips <= 1024; i++) {
+        for (int i = 0; ips <= 1024 && i < 1000000; i++) {
             final String ip;
             final int prefix;
             if (IPv4_ONLY) {
@@ -93,7 +97,7 @@ public void testMassive() throws Exception {
         SearchResponse result = client().prepareSearch(defaultIndexName)
             .setQuery(QueryBuilders.termsQuery("addr", toQuery))
             .get();
-        assertThat(result.getHits().getTotalHits().value, equalTo(0L + cidrs + ips + addMatches));
+        MatcherAssert.assertThat(Objects.requireNonNull(result.getHits().getTotalHits()).value, equalTo((long) cidrs + ips + addMatches));
     }
 
 
@@ -126,9 +130,7 @@ private static boolean isIPInCIDR(String ip, String cidr) throws UnknownHostExce
         // Compare extra bits (if any)
         if (extraBits > 0) {
             int mask = 0xFF << (8 - extraBits);
-            if ((ipBytes[fullBytes] & mask) != (cidrIpBytes[fullBytes] & mask)) {
-                return false;
-            }
+            return (ipBytes[fullBytes] & mask) == (cidrIpBytes[fullBytes] & mask);
         }
 
         return true;
@@ -155,7 +157,7 @@ private static String generateRandomIPv6() {
     }
 
     private XContentBuilder createMapping() throws IOException {
-        XContentBuilder xcb = XContentFactory.jsonBuilder()
+        return XContentFactory.jsonBuilder()
             .startObject()
             .startObject("properties")
             .startObject("addr")
@@ -173,6 +175,5 @@ private XContentBuilder createMapping() throws IOException {
             .endObject()
             .endObject()
             .endObject();
-        return xcb;
     }
 }