This is an automated email from the ASF dual-hosted git repository. stefanegli pushed a commit to branch OAK-10739-1454-1 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit cd55b26fbd3153d8e74cfdc3ad64dd0b754fbc84 Author: Stefan Egli <[email protected]> AuthorDate: Tue May 14 18:08:28 2024 +0200 OAK-10739 : revert unrelated or unnecessary changes --- .../src/main/java/org/apache/jackrabbit/oak/run/Utils.java | 3 ++- oak-segment-azure/src/test/resources/logback-test.xml | 2 +- oak-store-document/pom.xml | 12 ++++++------ .../oak/plugins/document/DocumentNodeStoreBuilder.java | 1 - .../jackrabbit/oak/plugins/document/VersionGCSupport.java | 7 +++---- .../oak/plugins/document/VersionGCSupportTest.java | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java index dc8bfd61a9..7df4f7ee46 100644 --- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java +++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Utils.java @@ -72,6 +72,7 @@ import org.apache.jackrabbit.guava.common.collect.Maps; import org.apache.jackrabbit.guava.common.io.Closer; import org.apache.jackrabbit.guava.common.io.Files; import com.mongodb.MongoClientURI; +import com.mongodb.MongoURI; import joptsimple.ArgumentAcceptingOptionSpec; import joptsimple.OptionParser; @@ -183,7 +184,7 @@ class Utils { System.exit(1); } - if (src.startsWith(MONGODB_PREFIX) || src.startsWith("jdbc")) { + if (src.startsWith(MongoURI.MONGODB_PREFIX) || src.startsWith("jdbc")) { DocumentNodeStoreBuilder<?> builder = createDocumentMKBuilder(options, closer); if (builder != null) { if (readOnlyMode) { diff --git a/oak-segment-azure/src/test/resources/logback-test.xml b/oak-segment-azure/src/test/resources/logback-test.xml index 7a0f4dbbcd..ebe3ff9700 100644 --- a/oak-segment-azure/src/test/resources/logback-test.xml +++ b/oak-segment-azure/src/test/resources/logback-test.xml @@ -21,7 +21,7 @@ <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern> </encoder> </appender> - <statusListener class="ch.qos.logback.core.status.NopStatusListener"/> + <statusListener class="ch.qos.logback.core.status.NopStatusListener" /> <appender name="file" class="ch.qos.logback.core.FileAppender"> <file>target/unit-tests.log</file> diff --git a/oak-store-document/pom.xml b/oak-store-document/pom.xml index dfbe77dacb..119d54e89e 100644 --- a/oak-store-document/pom.xml +++ b/oak-store-document/pom.xml @@ -349,11 +349,11 @@ <version>${testcontainers.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <version>${jackson.version}</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>${jackson.version}</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java index 54af8f6199..a15dff4bc6 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java @@ -312,7 +312,6 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> { return this.embeddedVerificationEnabled; } - public T setReadOnlyMode() { this.isReadOnlyMode = true; return thisBuilder(); diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java index cb0c3ced31..b938da536a 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupport.java @@ -27,7 +27,6 @@ import static java.util.stream.Stream.concat; import static java.util.stream.StreamSupport.stream; import static org.apache.jackrabbit.guava.common.collect.Iterables.filter; import static java.util.stream.Collectors.toList; -import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet; import static org.apache.jackrabbit.oak.plugins.document.Document.ID; import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.MIN_ID_VALUE; import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.MODIFIED_IN_SECS; @@ -35,11 +34,11 @@ import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.getModifie import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getAllDocuments; import static org.apache.jackrabbit.oak.plugins.document.util.Utils.getSelectedDocuments; +import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.jackrabbit.oak.plugins.document.NodeDocument.SplitDocType; @@ -65,7 +64,7 @@ public class VersionGCSupport { /** * Returns documents that have a {@link NodeDocument#MODIFIED_IN_SECS} value - * within the given range and the {@link NodeDocument# DELETED} set to + * within the given range and the {@link NodeDocument#DELETED} set to * {@code true}. The two passed modified timestamps are in milliseconds * since the epoch and the implementation will convert them to seconds at * the granularity of the {@link NodeDocument#MODIFIED_IN_SECS} field and @@ -259,7 +258,7 @@ public class VersionGCSupport { return ofNullable(doc); } - final Set<String> projectedSet = newHashSet(fields); + final Set<String> projectedSet = new HashSet<>(fields); projectedSet.add(ID); final NodeDocument newDoc = Collection.NODES.newDocument(store); diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java index a27269d4d0..6555a641f4 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCSupportTest.java @@ -65,7 +65,7 @@ public class VersionGCSupportTest { @Parameterized.Parameters(name="{0}") public static java.util.Collection<DocumentStoreFixture> fixtures() { - List<DocumentStoreFixture> fixtures = new ArrayList<>(3); + List<DocumentStoreFixture> fixtures = new ArrayList<>(); if (RDB_H2.isAvailable()) { fixtures.add(RDB_H2); }
