OAK-10860: oak-lucene: update gson test dependency and stop using dep…

…recated APIs (apache#1509)
oak-indexing · Jun 5, 2024 · 849307c · 849307c
1 parent cc8adb4
commit 849307c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/oak-lucene/pom.xml b/oak-lucene/pom.xml
@@ -443,7 +443,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/...ava/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java b/...ava/org/apache/jackrabbit/oak/plugins/index/lucene/property/PropertyIndexCleanerTest.java
@@ -25,8 +25,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
 import org.apache.jackrabbit.oak.InitialContent;
 import org.apache.jackrabbit.oak.api.CommitFailedException;
 import org.apache.jackrabbit.oak.plugins.index.AsyncIndexInfo;
@@ -48,10 +46,12 @@
 import org.apache.jackrabbit.oak.stats.Clock;
 import org.apache.jackrabbit.oak.stats.StatisticsProvider;
 import org.jetbrains.annotations.Nullable;
-import org.json.simple.parser.ParseException;
 import org.junit.Before;
 import org.junit.Test;
 
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
 import static java.util.Arrays.asList;
 import static org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT;
 import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
@@ -290,11 +290,11 @@ private void assertCleanUpPerformed(CleanupStats stats, boolean expected) {
         assertEquals(expected, stats.cleanupPerformed);
     }
 
-    private void assertJsonInfo(String indexPath, String expectedJson) throws ParseException {
+    private void assertJsonInfo(String indexPath, String expectedJson) {
         NodeState idx = NodeStateUtils.getNode(nodeStore.getRoot(), indexPath);
         String json = new HybridPropertyIndexInfo(idx).getInfoAsJson();
-        JsonObject j1 = (JsonObject) new JsonParser().parse(json);
-        JsonObject j2 = (JsonObject) new JsonParser().parse(expectedJson);
+        JsonObject j1 = (JsonObject) JsonParser.parseString(json);
+        JsonObject j2 = (JsonObject) JsonParser.parseString(expectedJson);
 
         if (!j1.equals(j2)){
             assertEquals(j1, j2);