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 md...@apache.org on 2014/02/19 15:35:15 UTC
svn commit: r1569762 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/api/
oak-core/src/main/java/org/apache/jackrabbit/oak/core/
oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/
oak-core/src/main/java/org/apache/jac...
Author: mduerig
Date: Wed Feb 19 14:35:14 2014
New Revision: 1569762
URL: http://svn.apache.org/r1569762
Log:
OAK-1438: Generalise Root.commit(String) to Root.commit(Map)
Remove message parameter in favour of the info map
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractRoot.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStoreKernel.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/api/Root.java Wed Feb 19 14:35:14 2014
@@ -112,8 +112,7 @@ public interface Root {
* @param path of the subtree to commit
* @throws CommitFailedException if the commit failed
*/
- void commit(@Nullable String message, @Nullable String path)
- throws CommitFailedException;
+ void commit(@Nullable String path) throws CommitFailedException;
/**
* Atomically persists all changes made to the tree attached to this root.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractRoot.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/AbstractRoot.java Wed Feb 19 14:35:14 2014
@@ -241,17 +241,15 @@ abstract class AbstractRoot implements R
}
@Override
- public void commit(@Nullable String message, @Nullable String path)
- throws CommitFailedException {
+ public void commit(@Nullable String path) throws CommitFailedException {
Map<String, Object> info = Maps.newHashMap();
- info.put("message", message);
info.put(COMMIT_PATH, path);
commit(info);
}
@Override
public void commit() throws CommitFailedException {
- commit(null, null);
+ commit((String) null);
}
/**
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/ImmutableRoot.java Wed Feb 19 14:35:14 2014
@@ -100,13 +100,13 @@ public final class ImmutableRoot impleme
}
@Override
- public void commit(String message, String path) {
+ public void commit(String path) {
throw new UnsupportedOperationException();
}
@Override
public void commit() {
- commit(null, null);
+ throw new UnsupportedOperationException();
}
@Override
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStoreKernel.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStoreKernel.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStoreKernel.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/NodeStoreKernel.java Wed Feb 19 14:35:14 2014
@@ -16,6 +16,13 @@
*/
package org.apache.jackrabbit.oak.kernel;
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Lists.newLinkedList;
+import static com.google.common.collect.Maps.newConcurrentMap;
+import static com.google.common.collect.Maps.newLinkedHashMap;
+import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
+import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.LinkedList;
@@ -32,7 +39,6 @@ import com.google.common.hash.HashCode;
import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import com.google.common.io.ByteStreams;
-
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.json.JsopBuilder;
@@ -53,13 +59,6 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Lists.newLinkedList;
-import static com.google.common.collect.Maps.newConcurrentMap;
-import static com.google.common.collect.Maps.newLinkedHashMap;
-import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
-import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
-
/**
* This is a simple {@link NodeStore}-based {@link MicroKernel} implementation.
*/
@@ -474,7 +473,7 @@ public class NodeStoreKernel implements
} else {
try {
CommitInfo info =
- new CommitInfo(CommitInfo.OAK_UNKNOWN, null, message);
+ new CommitInfo(CommitInfo.OAK_UNKNOWN, null);
NodeState newRoot = store.merge(builder, CONFLICT_HOOK, info);
if (!newRoot.equals(head.root)) {
revision = new Revision(head, newRoot, message);
@@ -511,7 +510,7 @@ public class NodeStoreKernel implements
try {
CommitInfo info =
- new CommitInfo(CommitInfo.OAK_UNKNOWN, null, message);
+ new CommitInfo(CommitInfo.OAK_UNKNOWN, null);
NodeState newRoot =
store.merge(revision.branch, CONFLICT_HOOK, info);
if (!newRoot.equals(head.root)) {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/commit/CommitInfo.java Wed Feb 19 14:35:14 2014
@@ -23,7 +23,6 @@ import static com.google.common.base.Pre
import java.util.Map;
-import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -43,7 +42,7 @@ public final class CommitInfo {
* metadata is known (or needed) about a commit.
*/
public static final CommitInfo EMPTY =
- new CommitInfo(OAK_UNKNOWN, OAK_UNKNOWN, "/");
+ new CommitInfo(OAK_UNKNOWN, OAK_UNKNOWN);
private final String sessionId;
@@ -60,17 +59,9 @@ public final class CommitInfo {
* @param userId The user id.
*/
public CommitInfo(
- @Nonnull String sessionId, @Nullable String userId,
- @Nullable String message) {
- this(sessionId, userId, message, "/");
- }
-
- public CommitInfo(
- @Nonnull String sessionId, @Nullable String userId,
- @Nullable String message, @Nonnull String path) {
+ @Nonnull String sessionId, @Nullable String userId) {
this(sessionId, userId, ImmutableMap.<String, Object>of(
- Root.COMMIT_PATH, checkNotNull(path),
- "message", String.valueOf(message)
+ Root.COMMIT_PATH, "/"
));
}
@@ -104,15 +95,6 @@ public final class CommitInfo {
}
/**
- * @return message attached to this commit
- */
- @CheckForNull
- public String getMessage() {
- Object message = info.get("message");
- return message instanceof String ? (String) message : null;
- }
-
- /**
* @return time stamp
*/
public long getDate() {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/lifecycle/OakInitializer.java Wed Feb 19 14:35:14 2014
@@ -42,7 +42,7 @@ public final class OakInitializer {
NodeBuilder builder = store.getRoot().builder();
initializer.initialize(builder);
CommitHook hook = new EditorHook(new IndexUpdateProvider(indexEditor));
- CommitInfo info = new CommitInfo("OakInitializer", null, (String)null);
+ CommitInfo info = new CommitInfo("OakInitializer", null);
store.merge(builder, hook, info);
} catch (CommitFailedException e) {
throw new RuntimeException(e);
@@ -61,7 +61,7 @@ public final class OakInitializer {
}
try {
CommitHook hook = new EditorHook(new IndexUpdateProvider(indexEditor));
- CommitInfo info = new CommitInfo("OakInitializer", null, (String)null);
+ CommitInfo info = new CommitInfo("OakInitializer", null);
store.merge(builder, hook, info);
} catch (CommitFailedException e) {
throw new RuntimeException(e);
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/commit/BackgroundObserverTest.java Wed Feb 19 14:35:14 2014
@@ -41,8 +41,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.junit.Test;
public class BackgroundObserverTest {
- private static final CommitInfo COMMIT_INFO =
- new CommitInfo("no-session", null, (String)null);
+ private static final CommitInfo COMMIT_INFO = new CommitInfo("no-session", null);
private final List<List<Runnable>> assertionLists = Lists.newArrayList();
private CountDownLatch doneCounter;
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java?rev=1569762&r1=1569761&r2=1569762&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/SessionDelegate.java Wed Feb 19 14:35:14 2014
@@ -388,7 +388,7 @@ public class SessionDelegate {
save();
} else {
try {
- root.commit(null, path);
+ root.commit(path);
} catch (CommitFailedException e) {
RepositoryException repositoryException = newRepositoryException(e);
sessionStats.failedSave(repositoryException);