You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2024/01/29 23:35:24 UTC
(lucene) 02/06: Use String.replace() instead of replaceAll() (#13047)
This is an automated email from the ASF dual-hosted git repository.
uschindler pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 5606bebae708850c74df1f64c0ab204351a9e5bf
Author: Dmitry Cherniachenko <2s...@gmail.com>
AuthorDate: Tue Jan 30 00:13:43 2024 +0100
Use String.replace() instead of replaceAll() (#13047)
---
.../apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java | 4 ++--
.../java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java | 2 +-
.../apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java | 2 +-
.../java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java | 2 +-
.../test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java | 5 ++---
.../core/src/test/org/apache/lucene/util/automaton/TestRegExp.java | 6 +++---
6 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java
index 2b5340dd3d6..8e786aa59cc 100644
--- a/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java
+++ b/lucene/analysis/common/src/test/org/apache/lucene/analysis/charfilter/TestHTMLStripCharFilter.java
@@ -478,14 +478,14 @@ public class TestHTMLStripCharFilter extends BaseTokenStreamTestCase {
// ">"
=
TestUtil.randomHtmlishString(random(), maxNumElems)
- .replaceAll(">", " ")
+ .replace('>', ' ')
.replaceFirst("^--", "__");
String closedAngleBangNonCDATA = "<!" + randomHtmlishString1 + "-[CDATA[&]]>";
// Don't create a comment (disallow "<!--") and don't include a closing ">"
String randomHtmlishString2 =
TestUtil.randomHtmlishString(random(), maxNumElems)
- .replaceAll(">", " ")
+ .replace('>', ' ')
.replaceFirst("^--", "__");
String unclosedAngleBangNonCDATA = "<!" + randomHtmlishString2 + "-[CDATA[";
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
index e5730f3cefa..9810718217e 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepAllTask.java
@@ -64,7 +64,7 @@ public class RepAllTask extends ReportTask {
String line = taskReportLine(longestOp, stat);
reported++;
if (taskStats.size() > 2 && reported % 2 == 0) {
- line = line.replaceAll(" ", " - ");
+ line = line.replace(" ", " - ");
}
sb.append(line);
}
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
index 2b6958c15fd..2634eda0e57 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/RepSelectByPrefTask.java
@@ -69,7 +69,7 @@ public class RepSelectByPrefTask extends RepSumByPrefTask {
first = false;
String line = taskReportLine(longestOp, stat);
if (taskStats.size() > 2 && reported % 2 == 0) {
- line = line.replaceAll(" ", " - ");
+ line = line.replace(" ", " - ");
}
sb.append(line);
}
diff --git a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
index 4d379fa1e0b..93b677dcac1 100644
--- a/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
+++ b/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReportTask.java
@@ -140,7 +140,7 @@ public abstract class ReportTask extends PerfTask {
String line = taskReportLine(longetOp, stat);
lineNum++;
if (partOfTasks.size() > 2 && lineNum % 2 == 0) {
- line = line.replaceAll(" ", " - ");
+ line = line.replace(" ", " - ");
}
sb.append(line);
int[] byTime = stat.getCountsByTime();
diff --git a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
index 0ded6008ab8..fe0f392bebb 100644
--- a/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
+++ b/lucene/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
@@ -957,12 +957,11 @@ public class TestPerfTasksLogic extends BenchmarkTestCase {
}
private String[] getAnalyzerFactoryConfig(String name, String params) {
- final String singleQuoteEscapedName = name.replaceAll("'", "\\\\'");
+ final String singleQuoteEscapedName = name.replace("'", "\\'");
String[] algLines = {
"content.source=org.apache.lucene.benchmark.byTask.feeds.LineDocSource",
"docs.file=" + getReuters20LinesFile(),
- "work.dir="
- + getWorkDir().toAbsolutePath().toString().replaceAll("\\\\", "/"), // Fix Windows path
+ "work.dir=" + getWorkDir().toAbsolutePath().toString().replace('\\', '/'), // Fix Windows path
"content.source.forever=false",
"directory=ByteBuffersDirectory",
"AnalyzerFactory(name:'" + singleQuoteEscapedName + "', " + params + ")",
diff --git a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java
index d50feeba09e..09f8a38a701 100644
--- a/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java
+++ b/lucene/core/src/test/org/apache/lucene/util/automaton/TestRegExp.java
@@ -182,11 +182,11 @@ public class TestRegExp extends LuceneTestCase {
break;
case 3:
// Star-replace all ab sequences.
- result.append(replacementPart.replaceAll("ab", ".*"));
+ result.append(replacementPart.replace("ab", ".*"));
break;
case 4:
// .-replace all b chars
- result.append(replacementPart.replaceAll("b", "."));
+ result.append(replacementPart.replace("b", "."));
break;
case 5:
// length-limited stars {1,2}
@@ -205,7 +205,7 @@ public class TestRegExp extends LuceneTestCase {
break;
case 8:
// NOT a character - replace all b's with "not a"
- result.append(replacementPart.replaceAll("b", "[^a]"));
+ result.append(replacementPart.replace("b", "[^a]"));
break;
case 9:
// Make whole part repeatable 1 or more times