svn commit: r1762456 - /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java

[mr...@apache.org]

Author: mreutegg
Date: Tue Sep 27 11:43:11 2016
New Revision: 1762456

URL: http://svn.apache.org/viewvc?rev=1762456&view=rev
Log:
OAK-4854: Simplify TarNodeStore

Modified:
    jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java

Modified: jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java?rev=1762456&r1=1762455&r2=1762456&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java (original)
+++ jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/TarNodeStore.java Tue Sep 27 11:43:11 2016
@@ -16,20 +16,12 @@
  */
 package org.apache.jackrabbit.oak.upgrade.cli.node;
 
-import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.spi.commit.CommitHook;
-import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.spi.state.ProxyNodeStore;
 
-import javax.annotation.Nonnull;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-
-public class TarNodeStore implements NodeStore {
+public class TarNodeStore extends ProxyNodeStore {
 
     private final NodeStore ns;
 
@@ -48,72 +40,9 @@ public class TarNodeStore implements Nod
         return superRootProvider.getSuperRoot();
     }
 
-    @Nonnull
-    @Override
-    public NodeState getRoot() {
-        return ns.getRoot();
-    }
-
-    @Nonnull
-    @Override
-    public NodeState merge(@Nonnull NodeBuilder builder, @Nonnull CommitHook commitHook, @Nonnull CommitInfo info) throws CommitFailedException {
-        return ns.merge(builder, commitHook, info);
-    }
-
-    @Nonnull
-    @Override
-    public NodeState rebase(@Nonnull NodeBuilder builder) {
-        return ns.rebase(builder);
-    }
-
-    @Override
-    public NodeState reset(@Nonnull NodeBuilder builder) {
-        return ns.reset(builder);
-    }
-
-    @Nonnull
-    @Override
-    public Blob createBlob(InputStream inputStream) throws IOException {
-        return ns.createBlob(inputStream);
-    }
-
-    @Override
-    public Blob getBlob(@Nonnull String reference) {
-        return ns.getBlob(reference);
-    }
-
-    @Nonnull
-    @Override
-    public String checkpoint(long lifetime, @Nonnull Map<String, String> properties) {
-        return ns.checkpoint(lifetime, properties);
-    }
-
-    @Nonnull
-    @Override
-    public String checkpoint(long lifetime) {
-        return ns.checkpoint(lifetime);
-    }
-
-    @Nonnull
-    @Override
-    public Map<String, String> checkpointInfo(@Nonnull String checkpoint) {
-        return ns.checkpointInfo(checkpoint);
-    }
-
-    @Nonnull
-    @Override
-    public Iterable<String> checkpoints() {
-        return ns.checkpoints();
-    }
-
-    @Override
-    public NodeState retrieve(@Nonnull String checkpoint) {
-        return ns.retrieve(checkpoint);
-    }
-
     @Override
-    public boolean release(@Nonnull String checkpoint) {
-        return ns.release(checkpoint);
+    protected NodeStore getNodeStore() {
+        return ns;
     }
 
     interface SuperRootProvider {