-
Notifications
You must be signed in to change notification settings - Fork 1.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bigtable Admin: Promote models to top level classes #3513
Merged
igorbernstein2
merged 6 commits into
googleapis:master
from
igorbernstein2:admin-models
Aug 16, 2018
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3b2f24c
WIP: Bigtable Admin: Promote models to top level classes
igorbernstein2 6a043fb
fix compilation after rebase
igorbernstein2 4b76677
import warnings
igorbernstein2 9fd1be7
Address feedback
igorbernstein2 2d9f4a2
Address feedback
igorbernstein2 d51894d
Unused imports
igorbernstein2 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
...-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/ClusterState.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.cloud.bigtable.admin.v2.models; | ||
|
|
||
| import com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState; | ||
| import com.google.common.base.MoreObjects; | ||
|
|
||
| /** Wrapper for {@link ClusterState} protocol buffer object */ | ||
| public final class ClusterState { | ||
| private final String id; | ||
This comment was marked as spam.
Sorry, something went wrong. |
||
| private final ReplicationState replicationState; | ||
|
|
||
| public static ClusterState fromProto(String clusterId, com.google.bigtable.admin.v2.Table.ClusterState proto) { | ||
| return new ClusterState(clusterId, proto.getReplicationState()); | ||
| } | ||
|
|
||
| private ClusterState(String id, ReplicationState replicationState) { | ||
| this.id = id; | ||
| this.replicationState = replicationState; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the cluster Id | ||
| */ | ||
| public String getId() { | ||
| return id; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the ReplicationState of the table for this cluster | ||
This comment was marked as spam.
Sorry, something went wrong. |
||
| */ | ||
| public ReplicationState getReplicationState() { | ||
| return replicationState; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this) | ||
| .add("id", id) | ||
| .add("replicationState", replicationState) | ||
| .toString(); | ||
| } | ||
| } | ||
68 changes: 68 additions & 0 deletions
68
...-bigtable-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/ColumnFamily.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.cloud.bigtable.admin.v2.models; | ||
|
|
||
| import static com.google.cloud.bigtable.admin.v2.models.GCRules.GCRULES; | ||
|
|
||
| import com.google.api.core.InternalApi; | ||
| import com.google.bigtable.admin.v2.GcRule; | ||
| import com.google.bigtable.admin.v2.GcRule.RuleCase; | ||
| import com.google.cloud.bigtable.admin.v2.models.GCRules.GCRule; | ||
| import com.google.common.base.MoreObjects; | ||
|
|
||
| /** Wrapper for {@link ColumnFamily} protocol buffer object */ | ||
| public final class ColumnFamily { | ||
| private final String id; | ||
This comment was marked as spam.
Sorry, something went wrong. |
||
| private final GCRule rule; | ||
|
|
||
| @InternalApi | ||
| public static ColumnFamily fromProto(String id, com.google.bigtable.admin.v2.ColumnFamily proto) { | ||
| GcRule ruleProto = MoreObjects.firstNonNull(proto.getGcRule(), GcRule.getDefaultInstance()); | ||
This comment was marked as spam.
Sorry, something went wrong. |
||
|
|
||
| return new ColumnFamily(id, GCRULES.fromProto(ruleProto)); | ||
| } | ||
|
|
||
| private ColumnFamily(String id, GCRule rule) { | ||
| this.id = id; | ||
| this.rule = rule; | ||
| } | ||
|
|
||
| /** | ||
| * Gets the columnfamily name | ||
| */ | ||
| public String getId() { | ||
| return id; | ||
| } | ||
|
|
||
| /** | ||
| * Get's the GCRule configured for the columnfamily | ||
| */ | ||
| public GCRule getGCRule() { | ||
| return rule; | ||
| } | ||
|
|
||
| /** | ||
| * Returns true if a GCRule has been configured for the family | ||
| */ | ||
| public boolean hasGCRule() { | ||
| return !RuleCase.RULE_NOT_SET.equals(rule.toProto().getRuleCase()); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this).add("id", id).add("GCRule", rule).toString(); | ||
| } | ||
| } | ||
59 changes: 59 additions & 0 deletions
59
...table-admin/src/main/java/com/google/cloud/bigtable/admin/v2/models/ConsistencyToken.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright 2018 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.cloud.bigtable.admin.v2.models; | ||
|
|
||
| import com.google.api.core.InternalApi; | ||
| import com.google.bigtable.admin.v2.CheckConsistencyRequest; | ||
| import com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse; | ||
| import com.google.common.annotations.VisibleForTesting; | ||
| import com.google.common.base.MoreObjects; | ||
|
|
||
| /** | ||
| * Wrapper for {@link GenerateConsistencyTokenResponse#getConsistencyToken()} | ||
| * | ||
| * <p>Cannot be created. They are obtained by invoking {@link | ||
| * com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient#generateConsistencyToken(String)} | ||
| */ | ||
| public final class ConsistencyToken { | ||
| private final String token; | ||
|
|
||
| @InternalApi | ||
| public static ConsistencyToken fromProto(GenerateConsistencyTokenResponse proto) { | ||
| return new ConsistencyToken(proto.getConsistencyToken()); | ||
| } | ||
|
|
||
| private ConsistencyToken(String token) { | ||
| this.token = token; | ||
| } | ||
|
|
||
| @InternalApi | ||
| public CheckConsistencyRequest toProto(String tableName) { | ||
This comment was marked as spam.
Sorry, something went wrong. |
||
| return CheckConsistencyRequest.newBuilder() | ||
| .setName(tableName) | ||
| .setConsistencyToken(token) | ||
| .build(); | ||
| } | ||
|
|
||
| @VisibleForTesting | ||
| String getToken() { | ||
| return token; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return MoreObjects.toStringHelper(this).add("token", token).toString(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as spam.
Sorry, something went wrong.