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/10/02 15:39:56 UTC
(jackrabbit-oak) 01/01: OAK-11161: Fix cases where checkArgument is used with the incorrect template syntax
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11161
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 51df972f653f4509c048dace97743e7e61176d36
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Wed Oct 2 16:39:40 2024 +0100
OAK-11161: Fix cases where checkArgument is used with the incorrect template syntax
---
.../oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java | 2 +-
.../org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java | 2 +-
.../java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java | 2 +-
.../src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
index 931c051bb5..e650d33b57 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/writer/DefaultIndexWriterFactory.java
@@ -48,7 +48,7 @@ public class DefaultIndexWriterFactory implements LuceneIndexWriterFactory {
public LuceneIndexWriter newInstance(IndexDefinition def, NodeBuilder definitionBuilder,
CommitInfo commitInfo, boolean reindex) {
Preconditions.checkArgument(def instanceof LuceneIndexDefinition,
- "Expected {} but found {} for index definition",
+ "Expected %s but found %s for index definition",
LuceneIndexDefinition.class, def.getClass());
LuceneIndexDefinition definition = (LuceneIndexDefinition)def;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
index 46e5ea88b0..d279d29d6a 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
@@ -59,7 +59,7 @@ class JournalDiffLoader implements DiffCache.Loader {
this.node = requireNonNull(node);
this.ns = requireNonNull(ns);
checkArgument(base.getPath().equals(node.getPath()),
- "nodes must have matching paths: {} != {}",
+ "nodes must have matching paths: %s != %s",
base.getPath(), node.getPath());
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
index b0d9edbee8..dfe4240901 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalEntry.java
@@ -701,7 +701,7 @@ public final class JournalEntry extends Document {
TreeNode(MapFactory mapFactory, TreeNode parent, String name) {
checkArgument(!name.contains("/"),
- "name must not contain '/': {}", name);
+ "name must not contain '/': %s", name);
this.mapFactory = mapFactory;
this.parent = parent;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java
index 404637c930..efdc722e97 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Path.java
@@ -80,7 +80,7 @@ public final class Path implements CacheValue, Comparable<Path> {
public Path(@NotNull String name) {
this(null, requireNonNull(name), -1);
checkArgument(!name.isEmpty(), "name cannot be the empty String");
- checkArgument(name.indexOf('/') == -1, "name must not contain path separator: {}", name);
+ checkArgument(name.indexOf('/') == -1, "name must not contain path separator: %s", name);
}
/**