Skip to content

Commit 17e4cf9

Browse files
committed
Use equalsTo() for string comparison instead of ==
Previous PR opensearch-project#16461 Signed-off-by: Dmitry Kryukov <[email protected]>
1 parent c82cd2e commit 17e4cf9

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

server/src/main/java/org/opensearch/cluster/metadata/IndexAbstractionResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import java.util.Collection;
4242
import java.util.HashSet;
4343
import java.util.List;
44+
import java.util.Objects;
4445
import java.util.Set;
4546

4647
/**
@@ -105,7 +106,7 @@ public List<String> resolveIndexAbstractions(
105106

106107
// we always need to check for date math expressions
107108
final String dateMathName = indexNameExpressionResolver.resolveDateMathExpression(indexAbstraction);
108-
if (dateMathName != indexAbstraction) {
109+
if (!Objects.equals(dateMathName, indexAbstraction)) {
109110
assert dateMathName.equals(indexAbstraction) == false;
110111
if (replaceWildcards && Regex.isSimpleMatchPattern(dateMathName)) {
111112
// continue

server/src/main/java/org/opensearch/common/lucene/search/MultiPhrasePrefixQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void add(Term[] terms) {
126126
*/
127127
public void add(Term[] terms, int position) {
128128
for (int i = 0; i < terms.length; i++) {
129-
if (terms[i].field() != field) {
129+
if (!Objects.equals(terms[i].field(), field)) {
130130
throw new IllegalArgumentException("All phrase terms must be in the same field (" + field + "): " + terms[i]);
131131
}
132132
}

server/src/main/java/org/opensearch/search/aggregations/bucket/composite/UnsignedLongValuesSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ SortedDocsProducer createSortedDocsProducerOrNull(IndexReader reader, Query quer
210210

211211
if (fieldType instanceof NumberFieldMapper.NumberFieldType) {
212212
NumberFieldMapper.NumberFieldType ft = (NumberFieldMapper.NumberFieldType) fieldType;
213-
if (ft.typeName() == "unsigned_long") {
213+
if ("unsigned_long".equals(ft.typeName())) {
214214
return new UnsignedLongPointsSortedDocsProducer(fieldType.name(), lowerPoint, upperPoint);
215215
}
216216
}

server/src/main/java/org/opensearch/search/suggest/phrase/NoisyChannelSpellChecker.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,11 @@ public void reset(TokenStream stream) {
9191
public void nextToken() throws IOException {
9292
anyTokens = true;
9393
BytesRef term = fillBytesRef(termsRef);
94-
if (requireUnigram && typeAttribute.type() == ShingleFilter.DEFAULT_TOKEN_TYPE) {
94+
if (requireUnigram && ShingleFilter.DEFAULT_TOKEN_TYPE.equals(typeAttribute.type())) {
9595
return;
9696
}
9797
anyUnigram = true;
98-
if (posIncAttr.getPositionIncrement() == 0 && typeAttribute.type() == SynonymFilter.TYPE_SYNONYM) {
98+
if (posIncAttr.getPositionIncrement() == 0 && SynonymFilter.TYPE_SYNONYM.equals(typeAttribute.type())) {
9999
assert currentSet != null;
100100
TermStats termStats = generator.termStats(term);
101101
if (termStats.docFreq > 0) {

test/framework/src/main/java/org/opensearch/index/shard/IndexShardTestCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ protected IndexShard newShard(
622622
Settings nodeSettings = Settings.builder().put("node.name", routing.currentNodeId()).build();
623623
DiscoveryNodes discoveryNodes = IndexShardTestUtils.getFakeDiscoveryNodes(routing);
624624
// To simulate that the node is remote backed
625-
if (indexMetadata.getSettings().get(IndexMetadata.SETTING_REMOTE_STORE_ENABLED) == "true") {
625+
if (indexMetadata.getSettings().getAsBoolean(IndexMetadata.SETTING_REMOTE_STORE_ENABLED, false)) {
626626
nodeSettings = Settings.builder()
627627
.put("node.name", routing.currentNodeId())
628628
.put("node.attr.remote_store.translog.repository", "seg_repo")

0 commit comments

Comments
 (0)