You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/12/16 10:34:58 UTC
(jackrabbit-oak) branch OAK-11311 updated: OAK-11311: Remove usage of Guava ImmutableList - oak-solr-cote
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11311
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11311 by this push:
new c2397bf6dd OAK-11311: Remove usage of Guava ImmutableList - oak-solr-cote
c2397bf6dd is described below
commit c2397bf6dd300cffab63cd0f542299cfed0db42f
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Dec 16 11:34:49 2024 +0100
OAK-11311: Remove usage of Guava ImmutableList - oak-solr-cote
---
.../index/solr/query/SolrQueryIndexProvider.java | 3 +--
.../oak/plugins/index/solr/query/SolrIndexIT.java | 28 +++++++++++-----------
2 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
index 7d7574cc72..20cc356acc 100644
--- a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
+++ b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndexProvider.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.plugins.index.solr.query;
import java.util.List;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.spi.query.QueryIndex;
@@ -51,7 +50,7 @@ public class SolrQueryIndexProvider implements QueryIndexProvider {
@NotNull
@Override
public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
- return ImmutableList.of(new SolrQueryIndex(aggregator, oakSolrConfigurationProvider, solrServerProvider));
+ return List.of(new SolrQueryIndex(aggregator, oakSolrConfigurationProvider, solrServerProvider));
}
}
diff --git a/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java b/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
index a1a57ba78a..442093b54c 100644
--- a/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
+++ b/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrIndexIT.java
@@ -20,8 +20,8 @@ import javax.jcr.query.Query;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
+import java.util.List;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.ContentRepository;
@@ -322,7 +322,7 @@ public class SolrIndexIT extends AbstractQueryTest {
Tree one = t.addChild("one");
one.setProperty("t", "美女衬衫");
root.commit();
- assertQuery("//*[jcr:contains(., '美女')]", "xpath", ImmutableList.of(one.getPath()));
+ assertQuery("//*[jcr:contains(., '美女')]", "xpath", List.of(one.getPath()));
}
@Test
@@ -364,13 +364,13 @@ public class SolrIndexIT extends AbstractQueryTest {
stmt.append("/jcr:root//*[jcr:contains(., '").append(h);
stmt.append("')]");
assertQuery(stmt.toString(), "xpath",
- ImmutableList.of("/test/a", "/test/b"));
+ List.of("/test/a", "/test/b"));
// query 'world'
stmt = new StringBuffer();
stmt.append("/jcr:root//*[jcr:contains(., '").append(w);
stmt.append("')]");
- assertQuery(stmt.toString(), "xpath", ImmutableList.of("/test/a"));
+ assertQuery(stmt.toString(), "xpath", List.of("/test/a"));
}
@@ -384,9 +384,9 @@ public class SolrIndexIT extends AbstractQueryTest {
root.commit();
assertQuery("/jcr:root//*[jcr:contains(., 'hello-wor*')]", "xpath",
- ImmutableList.of("/test/a", "/test/b"));
+ List.of("/test/a", "/test/b"));
assertQuery("/jcr:root//*[jcr:contains(., '*hello-wor*')]", "xpath",
- ImmutableList.of("/test/a", "/test/b"));
+ List.of("/test/a", "/test/b"));
}
@@ -398,7 +398,7 @@ public class SolrIndexIT extends AbstractQueryTest {
assertQuery(
"/jcr:root//*[jcr:contains(@dc:format, 'type:appli*')]",
- "xpath", ImmutableList.of("/test/a"));
+ "xpath", List.of("/test/a"));
}
@@ -411,19 +411,19 @@ public class SolrIndexIT extends AbstractQueryTest {
assertQuery(
"/jcr:root//*[jcr:contains(., 'lazy AND brown')]",
- "xpath", ImmutableList.of("/test/a"));
+ "xpath", List.of("/test/a"));
assertQuery(
"/jcr:root//*[jcr:contains(., 'lazy OR eat')]",
- "xpath", ImmutableList.of("/test/a", "/test/b"));
+ "xpath", List.of("/test/a", "/test/b"));
assertQuery(
"/jcr:root//*[jcr:contains(., 'lazy AND bones')]",
- "xpath", ImmutableList.of("/test/b"));
+ "xpath", List.of("/test/b"));
assertQuery(
"/jcr:root//*[jcr:contains(., 'lazy OR dog')]",
- "xpath", ImmutableList.of("/test/a", "/test/b"));
+ "xpath", List.of("/test/a", "/test/b"));
}
@Test
@@ -433,7 +433,7 @@ public class SolrIndexIT extends AbstractQueryTest {
test.addChild("a").setProperty("name", "/parent/child/node");
root.commit();
- assertQuery("//*[jcr:contains(., '/parent/child')]", "xpath", ImmutableList.of("/test/a"));
+ assertQuery("//*[jcr:contains(., '/parent/child')]", "xpath", List.of("/test/a"));
}
@@ -445,7 +445,7 @@ public class SolrIndexIT extends AbstractQueryTest {
a.setProperty("name", "/segment1/segment2/segment3");
root.commit();
- assertQuery("//*[jcr:contains(., '/segment1/segment2')]", "xpath", ImmutableList.of("/test/a"));
+ assertQuery("//*[jcr:contains(., '/segment1/segment2')]", "xpath", List.of("/test/a"));
}
@@ -470,7 +470,7 @@ public class SolrIndexIT extends AbstractQueryTest {
root.commit();
assertQuery("//*[jcr:contains(., 'media') and (@p = 'dam/smartcollection' or @p = 'dam/collection') ]", "xpath",
- ImmutableList.of(one.getPath(), two.getPath()));
+ List.of(one.getPath(), two.getPath()));
}
@Test