[
https://issues.apache.org/jira/browse/OAK-10321?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=17736055#comment-17736055
]
Marcel Reutegger commented on OAK-10321:
I don't think these are needed anymore.
{noformat}
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
index 22b6244792..9c4cee90d0 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
@@ -1325,7 +1325,7 @@ public final class DocumentNodeStore
|| node.equals(missing) ? null : node;
PERFLOG.end(start, 1, "getNode: path={}, rev={}", path, rev);
return result;
-} catch (UncheckedExecutionException |
com.google.common.util.concurrent.UncheckedExecutionException e) {
+} catch (UncheckedExecutionException e) {
throw DocumentStoreException.convert(e.getCause());
} catch (ExecutionException e) {
throw DocumentStoreException.convert(e.getCause());
@@ -1386,7 +1386,7 @@ public final class DocumentNodeStore
nodeChildrenCache.put(key, children);
}
return children;
-} catch (UncheckedExecutionException |
com.google.common.util.concurrent.UncheckedExecutionException e) {
+} catch (UncheckedExecutionException e) {
throw DocumentStoreException.convert(e.getCause(),
"Error occurred while fetching children for path "
+ path);
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
index 8b21976f30..1f156f4100 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
@@ -628,7 +628,7 @@ public class MongoDocumentStore implements DocumentStore {
} else {
return (T) doc;
}
-} catch (UncheckedExecutionException |
com.google.common.util.concurrent.UncheckedExecutionException e) {
+} catch (UncheckedExecutionException e) {
t = e.getCause();
} catch (ExecutionException e) {
t = e.getCause();
@@ -1774,7 +1774,7 @@ public class MongoDocumentStore implements DocumentStore {
}
}
return;
-} catch (UncheckedExecutionException |
com.google.common.util.concurrent.UncheckedExecutionException |
ExecutionException e) {
+} catch (UncheckedExecutionException | ExecutionException e) {
t = e.getCause();
} catch (RuntimeException e) {
t = e;
{noformat}
[~reschke], WDYT?
> Remove residual use of original Guava in oak-store-document
> ---
>
> Key: OAK-10321
> URL: https://issues.apache.org/jira/browse/OAK-10321
> Project: Jackrabbit Oak
> Issue Type: Technical task
> Components: documentmk
>Reporter: Marcel Reutegger
>Assignee: Marcel Reutegger
>Priority: Minor
>
> Some code still uses original Guava classes.
> {noformat}
> [ERROR]
> /home/jenkins/jenkins-agent/workspace/Jackrabbit_oak-trunk-pr_PR-997/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java:[1328,81]
> package com.google.common.util.concurrent does not exist
> [ERROR]
> /home/jenkins/jenkins-agent/workspace/Jackrabbit_oak-trunk-pr_PR-997/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java:[1389,81]
> package com.google.common.util.concurrent does not exist
> [ERROR]
> /home/jenkins/jenkins-agent/workspace/Jackrabbit_oak-trunk-pr_PR-997/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java:[631,81]
> package com.google.common.util.concurrent does not exist
> [ERROR]
> /home/jenkins/jenkins-agent/workspace/Jackrabbit_oak-trunk-pr_PR-997/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java:[1777,81]
> package com.google.common.util.concurrent does not exist
> {noformat}
--
This message was sent by Atlassian Jira
(v8.20.10#820010)
