Compare strings with equals() instead of ==

Signed-off-by: Dmitry Kryukov <[email protected]>
opensearch-project · Oct 21, 2024 · d779fc6 · d779fc6
1 parent 0f7d572
commit d779fc6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstractionResolver.java b/server/src/main/java/org/opensearch/cluster/metadata/IndexAbstractionResolver.java
@@ -41,6 +41,7 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -105,7 +106,7 @@ public List<String> resolveIndexAbstractions(
 
             // we always need to check for date math expressions
             final String dateMathName = indexNameExpressionResolver.resolveDateMathExpression(indexAbstraction);
-            if (dateMathName != indexAbstraction) {
+            if (!Objects.equals(dateMathName, indexAbstraction)) {
                 assert dateMathName.equals(indexAbstraction) == false;
                 if (replaceWildcards && Regex.isSimpleMatchPattern(dateMathName)) {
                     // continue

diff --git a/server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java b/server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java
@@ -126,7 +126,7 @@ public void add(Term[] terms) {
      */
     public void add(Term[] terms, int position) {
         for (int i = 0; i < terms.length; i++) {
-            if (terms[i].field() != field) {
+            if (!Objects.equals(terms[i].field(), field)) {
                 throw new IllegalArgumentException("All phrase terms must be in the same field (" + field + "): " + terms[i]);
             }
         }

diff --git a/...in/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongValuesSource.java b/...in/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongValuesSource.java
@@ -210,7 +210,7 @@ SortedDocsProducer createSortedDocsProducerOrNull(IndexReader reader, Query quer
 
         if (fieldType instanceof NumberFieldMapper.NumberFieldType) {
             NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
-            if (ft.typeName() == "unsigned_long") {
+            if ("unsigned_long".equals(ft.typeName())) {
                 return new UnsignedLongPointsSortedDocsProducer(fieldType.name(), lowerPoint, upperPoint);
             }
         }

diff --git a/server/src/main/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellChecker.java b/server/src/main/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellChecker.java
@@ -45,6 +45,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.apache.lucene.analysis.shingle.ShingleFilter.DEFAULT_TOKEN_TYPE;
+
 /**
  * Spell checker based on a noisy channel
  *
@@ -91,11 +93,11 @@ public void reset(TokenStream stream) {
             public void nextToken() throws IOException {
                 anyTokens = true;
                 BytesRef term = fillBytesRef(termsRef);
-                if (requireUnigram && typeAttribute.type() == ShingleFilter.DEFAULT_TOKEN_TYPE) {
+                if (requireUnigram && DEFAULT_TOKEN_TYPE.equals(typeAttribute.type())) {
                     return;
                 }
                 anyUnigram = true;
-                if (posIncAttr.getPositionIncrement() == 0 && typeAttribute.type() == SynonymFilter.TYPE_SYNONYM) {
+                if (posIncAttr.getPositionIncrement() == 0 && SynonymFilter.TYPE_SYNONYM.equals(typeAttribute.type())) {
                     assert currentSet != null;
                     TermStats termStats = generator.termStats(term);
                     if (termStats.docFreq > 0) {

diff --git a/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java b/test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java
@@ -622,7 +622,7 @@ protected IndexShard newShard(
         Settings nodeSettings = Settings.builder().put("node.name", routing.currentNodeId()).build();
         DiscoveryNodes discoveryNodes = IndexShardTestUtils.getFakeDiscoveryNodes(routing);
         // To simulate that the node is remote backed
-        if (indexMetadata.getSettings().get(IndexMetadata.SETTING_REMOTE_STORE_ENABLED) == "true") {
+        if (Boolean.parseBoolean(indexMetadata.getSettings().get(IndexMetadata.SETTING_REMOTE_STORE_ENABLED))) {
             nodeSettings = Settings.builder()
                 .put("node.name", routing.currentNodeId())
                 .put("node.attr.remote_store.translog.repository", "seg_repo")