From e2a6107b94f9aedaa5a64c173a79271e7af72e1e Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Thu, 8 Mar 2018 16:15:54 -0800 Subject: [PATCH 1/3] Add GapicSpannerRpc stub --- .../cloud/spanner/spi/v1/GapicSpannerRpc.java | 167 ++++++++++++++++++ 1 file changed, 167 insertions(+) create mode 100644 google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java new file mode 100644 index 000000000000..7cb71f40963d --- /dev/null +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -0,0 +1,167 @@ +/* + * Copyright 2017 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 + * + * http://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.spanner.spi.v1; + +import com.google.cloud.ServiceRpc; +import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient; +import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings; +import com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient; +import com.google.cloud.spanner.admin.database.v1.DatabaseAdminSettings; +import com.google.cloud.spanner.SpannerException; +import com.google.cloud.spanner.spi.v1.SpannerRpc.Option; +import com.google.common.collect.ImmutableList; +import com.google.longrunning.Operation; +import com.google.protobuf.FieldMask; +import com.google.spanner.admin.database.v1.Database; +import com.google.spanner.admin.instance.v1.Instance; +import com.google.spanner.admin.instance.v1.InstanceConfig; +import com.google.spanner.v1.BeginTransactionRequest; +import com.google.spanner.v1.CommitRequest; +import com.google.spanner.v1.CommitResponse; +import com.google.spanner.v1.ExecuteSqlRequest; +import com.google.spanner.v1.PartialResultSet; +import com.google.spanner.v1.PartitionQueryRequest; +import com.google.spanner.v1.PartitionReadRequest; +import com.google.spanner.v1.PartitionResponse; +import com.google.spanner.v1.ReadRequest; +import com.google.spanner.v1.RollbackRequest; +import com.google.spanner.v1.Session; +import com.google.spanner.v1.Transaction; +import javax.annotation.Nullable; +import java.lang.UnsupportedOperationException; +import java.util.List; +import java.util.Map; + + +public class GapicSpannerRpc implements SpannerRpc { + + // private final DatabaseAdminClient adminDatabaseClient; + // private final InstanceAdminClient adminInstanceClient; + + public Paginated listInstanceConfigs(int pageSize, @Nullable String pageToken) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public InstanceConfig getInstanceConfig(String instanceConfigName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // return adminInstanceClient.getInstanceConfig(instanceConfigName); + } + + public Paginated listInstances(int pageSize, @Nullable String pageToken, @Nullable String filter) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // return adminInstanceClient.listInstances(); + } + + public Operation createInstance(String parent, String instanceId, Instance instance) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public Operation updateInstance(Instance instance, FieldMask fieldMask) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public Instance getInstance(String instanceName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // return adminInstanceClient.getInstance(instanceName); + } + + public void deleteInstance(String instanceName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // adminInstanceClient.deleteInstance(instanceName); + } + + // Database admin APIs. + public Paginated listDatabases(String instanceName, int pageSize, @Nullable String pageToken) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public Operation createDatabase(String instanceName, String createDatabaseStatement, Iterable additionalStatements) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public Operation updateDatabaseDdl(String databaseName, Iterable updateDatabaseStatements, @Nullable String updateId) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public void dropDatabase(String databaseName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // adminDatabaseClient.dropDatabase(databaseName); + } + + public Database getDatabase(String databaseName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // adminDatabaseClient.getDatabase(databaseName); + } + + public List getDatabaseDdl(String databaseName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + /** Retrieves a long running operation. */ + public Operation getOperation(String name) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public Session createSession(String databaseName, @Nullable Map labels, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public void deleteSession(String sessionName, @Nullable Map options) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public StreamingCall read( + ReadRequest request, ResultStreamConsumer consumer, @Nullable Map options) { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public StreamingCall executeQuery( + ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map options) { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public Transaction beginTransaction(BeginTransactionRequest request, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public CommitResponse commit(CommitRequest commitRequest, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public void rollback(RollbackRequest request, @Nullable Map options) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public PartitionResponse partitionQuery(PartitionQueryRequest request, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } + + public PartitionResponse partitionRead(PartitionReadRequest request, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } +} \ No newline at end of file From c28f7649e99dcdb7a277c896463132a6e6d73b69 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Fri, 9 Mar 2018 09:26:01 -0800 Subject: [PATCH 2/3] Fix format --- .../cloud/spanner/spi/v1/GapicSpannerRpc.java | 191 +++++++++--------- 1 file changed, 93 insertions(+), 98 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java index 7cb71f40963d..5222961e0ffc 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Google LLC + * 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. @@ -16,14 +16,8 @@ package com.google.cloud.spanner.spi.v1; -import com.google.cloud.ServiceRpc; -import com.google.cloud.spanner.admin.instance.v1.InstanceAdminClient; -import com.google.cloud.spanner.admin.instance.v1.InstanceAdminSettings; -import com.google.cloud.spanner.admin.database.v1.DatabaseAdminClient; -import com.google.cloud.spanner.admin.database.v1.DatabaseAdminSettings; import com.google.cloud.spanner.SpannerException; import com.google.cloud.spanner.spi.v1.SpannerRpc.Option; -import com.google.common.collect.ImmutableList; import com.google.longrunning.Operation; import com.google.protobuf.FieldMask; import com.google.spanner.admin.database.v1.Database; @@ -33,7 +27,6 @@ import com.google.spanner.v1.CommitRequest; import com.google.spanner.v1.CommitResponse; import com.google.spanner.v1.ExecuteSqlRequest; -import com.google.spanner.v1.PartialResultSet; import com.google.spanner.v1.PartitionQueryRequest; import com.google.spanner.v1.PartitionReadRequest; import com.google.spanner.v1.PartitionResponse; @@ -41,127 +34,129 @@ import com.google.spanner.v1.RollbackRequest; import com.google.spanner.v1.Session; import com.google.spanner.v1.Transaction; -import javax.annotation.Nullable; -import java.lang.UnsupportedOperationException; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; +/** Implementation of Cloud Spanner remote calls using Gapic libraries. */ public class GapicSpannerRpc implements SpannerRpc { - // private final DatabaseAdminClient adminDatabaseClient; - // private final InstanceAdminClient adminInstanceClient; + // private final DatabaseAdminClient adminDatabaseClient; + // private final InstanceAdminClient adminInstanceClient; - public Paginated listInstanceConfigs(int pageSize, @Nullable String pageToken) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public Paginated listInstanceConfigs(int pageSize, @Nullable String pageToken) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public InstanceConfig getInstanceConfig(String instanceConfigName) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - // return adminInstanceClient.getInstanceConfig(instanceConfigName); - } + public InstanceConfig getInstanceConfig(String instanceConfigName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // return adminInstanceClient.getInstanceConfig(instanceConfigName); + } - public Paginated listInstances(int pageSize, @Nullable String pageToken, @Nullable String filter) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - // return adminInstanceClient.listInstances(); - } + public Paginated listInstances( + int pageSize, @Nullable String pageToken, @Nullable String filter) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // return adminInstanceClient.listInstances(); + } - public Operation createInstance(String parent, String instanceId, Instance instance) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public Operation createInstance(String parent, String instanceId, Instance instance) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public Operation updateInstance(Instance instance, FieldMask fieldMask) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public Operation updateInstance(Instance instance, FieldMask fieldMask) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public Instance getInstance(String instanceName) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - // return adminInstanceClient.getInstance(instanceName); - } + public Instance getInstance(String instanceName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // return adminInstanceClient.getInstance(instanceName); + } - public void deleteInstance(String instanceName) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - // adminInstanceClient.deleteInstance(instanceName); - } + public void deleteInstance(String instanceName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // adminInstanceClient.deleteInstance(instanceName); + } // Database admin APIs. - public Paginated listDatabases(String instanceName, int pageSize, @Nullable String pageToken) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public Paginated listDatabases( + String instanceName, int pageSize, @Nullable String pageToken) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public Operation createDatabase(String instanceName, String createDatabaseStatement, Iterable additionalStatements) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public Operation createDatabase(String instanceName, String createDatabaseStatement, + Iterable additionalStatements) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public Operation updateDatabaseDdl(String databaseName, Iterable updateDatabaseStatements, @Nullable String updateId) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public Operation updateDatabaseDdl(String databaseName, Iterable updateDatabaseStatements, + @Nullable String updateId) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public void dropDatabase(String databaseName) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - // adminDatabaseClient.dropDatabase(databaseName); - } + public void dropDatabase(String databaseName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // adminDatabaseClient.dropDatabase(databaseName); + } - public Database getDatabase(String databaseName) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - // adminDatabaseClient.getDatabase(databaseName); - } + public Database getDatabase(String databaseName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + // adminDatabaseClient.getDatabase(databaseName); + } - public List getDatabaseDdl(String databaseName) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public List getDatabaseDdl(String databaseName) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - /** Retrieves a long running operation. */ - public Operation getOperation(String name) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + /** Retrieves a long running operation. */ + public Operation getOperation(String name) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public Session createSession(String databaseName, @Nullable Map labels, @Nullable Map options) - throws SpannerException { + public Session createSession(String databaseName, @Nullable Map labels, + @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - } + } - public void deleteSession(String sessionName, @Nullable Map options) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public void deleteSession(String sessionName, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public StreamingCall read( - ReadRequest request, ResultStreamConsumer consumer, @Nullable Map options) { - throw new UnsupportedOperationException("Not implemented yet."); - } + public StreamingCall read( + ReadRequest request, ResultStreamConsumer consumer, @Nullable Map options) { + throw new UnsupportedOperationException("Not implemented yet."); + } - public StreamingCall executeQuery( - ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map options) { - throw new UnsupportedOperationException("Not implemented yet."); - } + public StreamingCall executeQuery( + ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map options) { + throw new UnsupportedOperationException("Not implemented yet."); + } - public Transaction beginTransaction(BeginTransactionRequest request, @Nullable Map options) - throws SpannerException { + public Transaction beginTransaction( + BeginTransactionRequest request, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - } + } - public CommitResponse commit(CommitRequest commitRequest, @Nullable Map options) - throws SpannerException { + public CommitResponse commit(CommitRequest commitRequest, @Nullable Map options) + throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - } + } - public void rollback(RollbackRequest request, @Nullable Map options) throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } + public void rollback(RollbackRequest request, @Nullable Map options) + throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } - public PartitionResponse partitionQuery(PartitionQueryRequest request, @Nullable Map options) - throws SpannerException { + public PartitionResponse partitionQuery( + PartitionQueryRequest request, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - } + } - public PartitionResponse partitionRead(PartitionReadRequest request, @Nullable Map options) - throws SpannerException { - throw new UnsupportedOperationException("Not implemented yet."); - } -} \ No newline at end of file + public PartitionResponse partitionRead( + PartitionReadRequest request, @Nullable Map options) throws SpannerException { + throw new UnsupportedOperationException("Not implemented yet."); + } +} From c2a06b50a4aff36c6f437a98aa04ccc8c156c535 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Fri, 9 Mar 2018 11:17:22 -0800 Subject: [PATCH 3/3] Remove dead code and add @Override annotations. --- .../cloud/spanner/spi/v1/GapicSpannerRpc.java | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java index 5222961e0ffc..9a7fd447359c 100644 --- a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java +++ b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -42,119 +42,131 @@ /** Implementation of Cloud Spanner remote calls using Gapic libraries. */ public class GapicSpannerRpc implements SpannerRpc { - // private final DatabaseAdminClient adminDatabaseClient; - // private final InstanceAdminClient adminInstanceClient; - + @Override public Paginated listInstanceConfigs(int pageSize, @Nullable String pageToken) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public InstanceConfig getInstanceConfig(String instanceConfigName) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - // return adminInstanceClient.getInstanceConfig(instanceConfigName); } + @Override public Paginated listInstances( int pageSize, @Nullable String pageToken, @Nullable String filter) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - // return adminInstanceClient.listInstances(); } + @Override public Operation createInstance(String parent, String instanceId, Instance instance) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public Operation updateInstance(Instance instance, FieldMask fieldMask) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public Instance getInstance(String instanceName) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - // return adminInstanceClient.getInstance(instanceName); } + @Override public void deleteInstance(String instanceName) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - // adminInstanceClient.deleteInstance(instanceName); } - // Database admin APIs. + @Override public Paginated listDatabases( String instanceName, int pageSize, @Nullable String pageToken) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public Operation createDatabase(String instanceName, String createDatabaseStatement, Iterable additionalStatements) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public Operation updateDatabaseDdl(String databaseName, Iterable updateDatabaseStatements, @Nullable String updateId) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public void dropDatabase(String databaseName) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - // adminDatabaseClient.dropDatabase(databaseName); } + @Override public Database getDatabase(String databaseName) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); - // adminDatabaseClient.getDatabase(databaseName); } + @Override public List getDatabaseDdl(String databaseName) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } - /** Retrieves a long running operation. */ + @Override public Operation getOperation(String name) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public Session createSession(String databaseName, @Nullable Map labels, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public void deleteSession(String sessionName, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public StreamingCall read( ReadRequest request, ResultStreamConsumer consumer, @Nullable Map options) { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public StreamingCall executeQuery( ExecuteSqlRequest request, ResultStreamConsumer consumer, @Nullable Map options) { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public Transaction beginTransaction( BeginTransactionRequest request, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public CommitResponse commit(CommitRequest commitRequest, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public void rollback(RollbackRequest request, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public PartitionResponse partitionQuery( PartitionQueryRequest request, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet."); } + @Override public PartitionResponse partitionRead( PartitionReadRequest request, @Nullable Map options) throws SpannerException { throw new UnsupportedOperationException("Not implemented yet.");