This is an automated email from the ASF dual-hosted git repository.
nfsantos pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new f19e24291c OAK-11834 - Cleanups to reduce changeset in OAK-11814
(#2411)
f19e24291c is described below
commit f19e24291c709f87ab7b94dac8c736ef322ed0f8
Author: Nuno Santos <[email protected]>
AuthorDate: Tue Jul 29 16:53:15 2025 +0200
OAK-11834 - Cleanups to reduce changeset in OAK-11814 (#2411)
---
.../jackrabbit/oak/plugins/index/ConfigHelper.java | 6 ++++++
.../jackrabbit/oak/query/AbstractQueryTest.java | 19 ++++++++-----------
.../plugins/index/lucene/util/LuceneIndexHelper.java | 5 ++---
.../index/elastic/ElasticIndexProviderService.java | 3 ++-
.../index/elastic/query/ElasticIndexProvider.java | 3 +--
.../elastic/ElasticReliabilitySyncIndexingTest.java | 5 -----
6 files changed, 19 insertions(+), 22 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/ConfigHelper.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/ConfigHelper.java
index aefe26a736..3c5143cce7 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/ConfigHelper.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/ConfigHelper.java
@@ -35,6 +35,12 @@ public class ConfigHelper {
return result;
}
+ public static long getSystemPropertyAsLong(String name, long defaultValue)
{
+ long result = Long.getLong(name, defaultValue);
+ LOG.info("Config {}={}", name, result);
+ return result;
+ }
+
public static String getSystemPropertyAsString(String name, String
defaultValue) {
String result = System.getProperty(name, defaultValue);
LOG.info("Config {}={}", name, result);
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
index 71c29eb8af..b3eed17ff1 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
@@ -140,7 +140,7 @@ public abstract class AbstractQueryTest {
ContinueLineReader r = new ContinueLineReader(new LineNumberReader(new
InputStreamReader(in)));
PrintWriter w = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(output)));
- HashSet<String> knownQueries = new HashSet<String>();
+ HashSet<String> knownQueries = new HashSet<>();
boolean errors = false;
try {
while (true) {
@@ -149,7 +149,7 @@ public abstract class AbstractQueryTest {
break;
}
line = line.trim();
- if (line.startsWith("#") || line.length() == 0) {
+ if (line.startsWith("#") || line.isEmpty()) {
w.println(line);
} else if (line.startsWith("xpath2sql")) {
line = line.substring("xpath2sql".length()).trim();
@@ -196,7 +196,7 @@ public abstract class AbstractQueryTest {
readEnd = false;
} else {
line = line.trim();
- if (line.length() == 0) {
+ if (line.isEmpty()) {
errors = true;
readEnd = false;
} else {
@@ -215,7 +215,7 @@ public abstract class AbstractQueryTest {
break;
}
line = line.trim();
- if (line.length() == 0) {
+ if (line.isEmpty()) {
break;
}
errors = true;
@@ -254,10 +254,7 @@ public abstract class AbstractQueryTest {
}
protected List<String> executeQuery(String query, String language) {
- boolean pathsOnly = false;
- if (language.equals(QueryEngineImpl.XPATH)) {
- pathsOnly = true;
- }
+ boolean pathsOnly = language.equals(QueryEngineImpl.XPATH);
return executeQuery(query, language, pathsOnly);
}
@@ -267,7 +264,7 @@ public abstract class AbstractQueryTest {
protected List<String> executeQuery(String query, String language, boolean
pathsOnly, boolean skipSort) {
long time = System.currentTimeMillis();
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
try {
Result result = executeQuery(query, language, NO_BINDINGS);
if (query.startsWith("explain ")) {
@@ -588,7 +585,7 @@ public abstract class AbstractQueryTest {
* A line reader that supports multi-line statements, where lines that
start
* with a space belong to the previous line.
*/
- class ContinueLineReader {
+ static class ContinueLineReader {
private final LineNumberReader reader;
@@ -602,7 +599,7 @@ public abstract class AbstractQueryTest {
public String readLine() throws IOException {
String line = reader.readLine();
- if (line == null || line.trim().length() == 0) {
+ if (line == null || line.trim().isEmpty()) {
return line;
}
while (true) {
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java
index 18165792ea..896175e8dd 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/util/LuceneIndexHelper.java
@@ -48,8 +48,7 @@ public class LuceneIndexHelper extends IndexHelper {
@NotNull NodeBuilder index, @NotNull String name,
@Nullable Set<String> propertyTypes,
@Nullable Set<String> excludes, @Nullable String async) {
- return newLuceneIndexDefinition(index, name, propertyTypes, excludes,
- async, null);
+ return newLuceneIndexDefinition(index, name, propertyTypes, excludes,
async, null);
}
public static NodeBuilder newLuceneIndexDefinition(
@@ -119,7 +118,7 @@ public class LuceneIndexHelper extends IndexHelper {
public static NodeBuilder newLucenePropertyIndexDefinition(
@NotNull NodeBuilder index, @NotNull String name,
@NotNull Set<String> includes,
- @NotNull String async) {
+ String async) {
checkArgument(!includes.isEmpty(), "Lucene property index " +
"requires explicit list of property names to be indexed");
diff --git
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
index 8bbfdc9bbe..896284353e 100644
---
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
+++
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticIndexProviderService.java
@@ -234,7 +234,8 @@ public class ElasticIndexProviderService {
LOG.info("Registering Index and Editor providers with connection {}",
elasticConnection);
registerIndexProvider(bundleContext);
- ElasticRetryPolicy retryPolicy = new ElasticRetryPolicy(100,
config.elasticsearch_maxRetryTime() * 1000L, 5, 100);
+ final int maxRetryTime =
Integer.getInteger(PROP_ELASTIC_MAX_RETRY_TIME,
config.elasticsearch_maxRetryTime());
+ ElasticRetryPolicy retryPolicy = new ElasticRetryPolicy(100,
maxRetryTime * 1000L, 5, 100);
this.elasticIndexEditorProvider = new
ElasticIndexEditorProvider(indexTracker, elasticConnection, extractedTextCache,
retryPolicy);
registerIndexEditor(bundleContext, elasticIndexEditorProvider);
if (isElasticAvailable) {
diff --git
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexProvider.java
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexProvider.java
index c680ffb2de..5dfbf88088 100644
---
a/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexProvider.java
+++
b/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/query/ElasticIndexProvider.java
@@ -22,7 +22,6 @@ import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.jetbrains.annotations.NotNull;
-import java.util.Collections;
import java.util.List;
public class ElasticIndexProvider implements QueryIndexProvider {
@@ -35,6 +34,6 @@ public class ElasticIndexProvider implements
QueryIndexProvider {
@Override
public @NotNull List<? extends QueryIndex> getQueryIndexes(NodeState
nodeState) {
- return Collections.singletonList(new ElasticIndex(indexTracker));
+ return List.of(new ElasticIndex(indexTracker));
}
}
diff --git
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilitySyncIndexingTest.java
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilitySyncIndexingTest.java
index 28d2c6f9b3..0c3d4d1a1f 100644
---
a/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilitySyncIndexingTest.java
+++
b/oak-search-elastic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticReliabilitySyncIndexingTest.java
@@ -32,11 +32,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
public class ElasticReliabilitySyncIndexingTest extends ElasticReliabilityTest
{
- @Override
- public boolean useAsyncIndexing() {
- return false;
- }
-
@Test
public void connectionCutOnQuery() throws Exception {
String indexName = UUID.randomUUID().toString();
