[1/8] incubator-omid git commit: [OMID-62] Use interface instead of TSOClient in AbstractTransactionManager
Repository: incubator-omid Updated Branches: refs/heads/0.9.0 [created] 558c640b8 [OMID-62] Use interface instead of TSOClient in AbstractTransactionManager This will make it easy to mock AbstractTransactionManager dependencies This closes #9 Change-Id: Ia3c0d59261d2c8abba4509ff7d97ada93e69c758 Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/4e9cd997 Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/4e9cd997 Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/4e9cd997 Branch: refs/heads/0.9.0 Commit: 4e9cd997653b15a483192d11061c9dd3e82b0a21 Parents: 0c37136 Author: Francisco Perez-SorrosalAuthored: Thu Mar 2 17:26:02 2017 -0800 Committer: Francisco Perez-Sorrosal Committed: Thu Aug 10 11:30:12 2017 -0700 -- .../transaction/HBaseTransactionManager.java| 25 ++- .../transaction/AbstractTransactionManager.java | 26 +--- .../apache/omid/tso/client/MockTSOClient.java | 15 --- .../org/apache/omid/tso/client/TSOClient.java | 4 +-- .../org/apache/omid/tso/client/TSOProtocol.java | 7 ++ 5 files changed, 57 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4e9cd997/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java -- diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java index 990758c..b31d2c9 100644 --- a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java +++ b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java @@ -30,6 +30,7 @@ import org.apache.omid.committable.hbase.HBaseCommitTableConfig; import org.apache.omid.tools.hbase.HBaseLogin; import org.apache.omid.tso.client.CellId; import org.apache.omid.tso.client.TSOClient; +import org.apache.omid.tso.client.TSOProtocol; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; @@ -73,40 +74,40 @@ public class HBaseTransactionManager extends AbstractTransactionManager implemen } @VisibleForTesting -static class Builder { +public static class Builder { // Required parameters private final HBaseOmidClientConfiguration hbaseOmidClientConf; // Optional parameters - initialized to default values -private Optional tsoClient = Optional.absent(); +private Optional tsoClient = Optional.absent(); private Optional commitTableClient = Optional.absent(); private Optional postCommitter = Optional.absent(); -private Builder(HBaseOmidClientConfiguration hbaseOmidClientConf) { +public Builder(HBaseOmidClientConfiguration hbaseOmidClientConf) { this.hbaseOmidClientConf = hbaseOmidClientConf; } -Builder tsoClient(TSOClient tsoClient) { +public Builder tsoClient(TSOProtocol tsoClient) { this.tsoClient = Optional.of(tsoClient); return this; } -Builder commitTableClient(CommitTable.Client client) { +public Builder commitTableClient(CommitTable.Client client) { this.commitTableClient = Optional.of(client); return this; } -Builder postCommitter(PostCommitActions postCommitter) { +public Builder postCommitter(PostCommitActions postCommitter) { this.postCommitter = Optional.of(postCommitter); return this; } -HBaseTransactionManager build() throws IOException, InterruptedException { +public HBaseTransactionManager build() throws IOException, InterruptedException { CommitTable.Client commitTableClient = this.commitTableClient.or(buildCommitTableClient()).get(); PostCommitActions postCommitter = this.postCommitter.or(buildPostCommitter(commitTableClient)).get(); -TSOClient tsoClient = this.tsoClient.or(buildTSOClient()).get(); +TSOProtocol tsoClient = this.tsoClient.or(buildTSOClient()).get(); return new HBaseTransactionManager(hbaseOmidClientConf, postCommitter, @@ -115,8 +116,8 @@ public class HBaseTransactionManager extends AbstractTransactionManager implemen new HBaseTransactionFactory()); } -private Optional buildTSOClient() throws IOException, InterruptedException { -return
incubator-omid git commit: [OMID-62] Use interface instead of TSOClient in AbstractTransactionManager
Repository: incubator-omid Updated Branches: refs/heads/0.9.0.0 [created] 4e9cd9976 [OMID-62] Use interface instead of TSOClient in AbstractTransactionManager This will make it easy to mock AbstractTransactionManager dependencies This closes #9 Change-Id: Ia3c0d59261d2c8abba4509ff7d97ada93e69c758 Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/4e9cd997 Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/4e9cd997 Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/4e9cd997 Branch: refs/heads/0.9.0.0 Commit: 4e9cd997653b15a483192d11061c9dd3e82b0a21 Parents: 0c37136 Author: Francisco Perez-SorrosalAuthored: Thu Mar 2 17:26:02 2017 -0800 Committer: Francisco Perez-Sorrosal Committed: Thu Aug 10 11:30:12 2017 -0700 -- .../transaction/HBaseTransactionManager.java| 25 ++- .../transaction/AbstractTransactionManager.java | 26 +--- .../apache/omid/tso/client/MockTSOClient.java | 15 --- .../org/apache/omid/tso/client/TSOClient.java | 4 +-- .../org/apache/omid/tso/client/TSOProtocol.java | 7 ++ 5 files changed, 57 insertions(+), 20 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/4e9cd997/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java -- diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java index 990758c..b31d2c9 100644 --- a/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java +++ b/hbase-client/src/main/java/org/apache/omid/transaction/HBaseTransactionManager.java @@ -30,6 +30,7 @@ import org.apache.omid.committable.hbase.HBaseCommitTableConfig; import org.apache.omid.tools.hbase.HBaseLogin; import org.apache.omid.tso.client.CellId; import org.apache.omid.tso.client.TSOClient; +import org.apache.omid.tso.client.TSOProtocol; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; @@ -73,40 +74,40 @@ public class HBaseTransactionManager extends AbstractTransactionManager implemen } @VisibleForTesting -static class Builder { +public static class Builder { // Required parameters private final HBaseOmidClientConfiguration hbaseOmidClientConf; // Optional parameters - initialized to default values -private Optional tsoClient = Optional.absent(); +private Optional tsoClient = Optional.absent(); private Optional commitTableClient = Optional.absent(); private Optional postCommitter = Optional.absent(); -private Builder(HBaseOmidClientConfiguration hbaseOmidClientConf) { +public Builder(HBaseOmidClientConfiguration hbaseOmidClientConf) { this.hbaseOmidClientConf = hbaseOmidClientConf; } -Builder tsoClient(TSOClient tsoClient) { +public Builder tsoClient(TSOProtocol tsoClient) { this.tsoClient = Optional.of(tsoClient); return this; } -Builder commitTableClient(CommitTable.Client client) { +public Builder commitTableClient(CommitTable.Client client) { this.commitTableClient = Optional.of(client); return this; } -Builder postCommitter(PostCommitActions postCommitter) { +public Builder postCommitter(PostCommitActions postCommitter) { this.postCommitter = Optional.of(postCommitter); return this; } -HBaseTransactionManager build() throws IOException, InterruptedException { +public HBaseTransactionManager build() throws IOException, InterruptedException { CommitTable.Client commitTableClient = this.commitTableClient.or(buildCommitTableClient()).get(); PostCommitActions postCommitter = this.postCommitter.or(buildPostCommitter(commitTableClient)).get(); -TSOClient tsoClient = this.tsoClient.or(buildTSOClient()).get(); +TSOProtocol tsoClient = this.tsoClient.or(buildTSOClient()).get(); return new HBaseTransactionManager(hbaseOmidClientConf, postCommitter, @@ -115,8 +116,8 @@ public class HBaseTransactionManager extends AbstractTransactionManager implemen new HBaseTransactionFactory()); } -private Optional buildTSOClient() throws IOException, InterruptedException { -return