work on merging compressed transaction code
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/ae8dc466 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/ae8dc466 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/ae8dc466 Branch: refs/heads/CURATOR-3.0 Commit: ae8dc466cfd1ed31490bb65321406fabd0e5e560 Parents: 82a1df4 Author: randgalt <[email protected]> Authored: Mon Jan 18 16:03:55 2016 -0500 Committer: randgalt <[email protected]> Committed: Mon Jan 18 16:03:55 2016 -0500 ---------------------------------------------------------------------- .../framework/api/transaction/TransactionSetDataBuilder.java | 2 +- .../org/apache/curator/framework/imps/SetDataBuilderImpl.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/ae8dc466/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java index 84b25bb..42a0820 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/api/transaction/TransactionSetDataBuilder.java @@ -27,6 +27,6 @@ public interface TransactionSetDataBuilder<T> extends PathAndBytesable<T>, Versionable<PathAndBytesable<T>>, VersionPathAndBytesable<T>, - Compressible<PathAndBytesable<T>> + Compressible<VersionPathAndBytesable<T>> { } http://git-wip-us.apache.org/repos/asf/curator/blob/ae8dc466/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java ---------------------------------------------------------------------- diff --git a/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java b/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java index b150783..7057c11 100644 --- a/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java +++ b/curator-framework/src/main/java/org/apache/curator/framework/imps/SetDataBuilderImpl.java @@ -27,6 +27,7 @@ import org.apache.curator.framework.api.CuratorEventType; import org.apache.curator.framework.api.PathAndBytesable; import org.apache.curator.framework.api.SetDataBackgroundVersionable; import org.apache.curator.framework.api.SetDataBuilder; +import org.apache.curator.framework.api.VersionPathAndBytesable; import org.apache.curator.framework.api.transaction.OperationType; import org.apache.curator.framework.api.transaction.TransactionSetDataBuilder; import org.apache.zookeeper.AsyncCallback; @@ -81,7 +82,7 @@ class SetDataBuilderImpl implements SetDataBuilder, BackgroundOperation<PathAndB } @Override - public PathAndBytesable<T> compressed() + public VersionPathAndBytesable<T> compressed() { compress = true; return this;
