add fromProto to RpcPriority enum

Author: rajatbhatta

google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java

@@ -22,9 +22,13 @@
 import com.google.api.gax.paging.Page;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.api.gax.rpc.DeadlineExceededException;
+import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnavailableException;
+import com.google.auth.Credentials;
+import com.google.auth.oauth2.GoogleCredentials;
 import com.google.cloud.ByteArray;
 import com.google.cloud.Date;
+import com.google.cloud.NoCredentials;
 import com.google.cloud.Timestamp;
 import com.google.cloud.spanner.Backup;
 import com.google.cloud.spanner.BatchClient;
@@ -144,6 +148,8 @@
 import com.google.spanner.v1.TypeCode;
 import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
+import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -162,6 +168,7 @@
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
+import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.NotNull;
 import org.threeten.bp.Duration;
 import org.threeten.bp.LocalDate;
@@ -743,6 +750,20 @@ private synchronized Spanner getClient() throws IOException {
 
  // Return the spanner client, create one if not exists.
  private synchronized Spanner getClient(long timeoutSeconds) throws IOException {
+ // Create a cloud spanner client
+ Credentials credentials;
+ if (WorkerProxy.serviceKeyFile.isEmpty()) {
+ credentials = NoCredentials.getInstance();
+ } else {
+ credentials =
+ GoogleCredentials.fromStream(
+ new ByteArrayInputStream(
+ FileUtils.readFileToByteArray(new File(WorkerProxy.serviceKeyFile))),
+ HTTP_TRANSPORT_FACTORY);
+ }
+
+ TransportChannelProvider channelProvider =
+ CloudUtil.newChannelProviderHelper(WorkerProxy.spannerPort);
 
  Duration rpcTimeout = Duration.ofHours(1L);
  if (timeoutSeconds > 0) {
@@ -761,7 +782,12 @@ private synchronized Spanner getClient(long timeoutSeconds) throws IOException {
 
  // Cloud Spanner Client does not support global retry settings,
  // Thus, we need to add retry settings to each individual stub.
- SpannerOptions.Builder optionsBuilder = SpannerOptions.newBuilder().setProjectId(PROJECT_ID);
+ SpannerOptions.Builder optionsBuilder =
+ SpannerOptions.newBuilder()
+ .setProjectId(PROJECT_ID)
+ .setHost(HOST_PREFIX + WorkerProxy.spannerPort)
+ .setCredentials(credentials)
+ .setChannelProvider(channelProvider);
 
  SpannerStubSettings.Builder stubSettingsBuilder =
  optionsBuilder.getSpannerStubSettingsBuilder();

google-cloud-spanner/src/main/java/com/google/cloud/spanner/Options.java

@@ -39,6 +39,13 @@ public enum RpcPriority {
  RpcPriority(Priority proto) {
  this.proto = Preconditions.checkNotNull(proto);
  }
+
+ public static RpcPriority getEnumFromProto(Priority proto){
+ for(RpcPriority e : RpcPriority.values()){
+ if(e.proto.equals(proto)) return e;
+ }
+ return null;
+ }
  }
 
  /** Marker interface to mark options applicable to both Read and Query operations */

google-cloud-spanner/src/test/java/com/google/cloud/spanner/OptionsTest.java

@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
@@ -300,6 +301,14 @@ public void testUpdateOptionsPriority() {
  assertEquals("priority: " + priority + " ", options.toString());
  }
 
+ @Test
+ public void testRpcPriorityEnumFromProto() {
+ assertEquals(RpcPriority.getEnumFromProto(Priority.PRIORITY_LOW), RpcPriority.LOW);
+ assertEquals(RpcPriority.getEnumFromProto(Priority.PRIORITY_MEDIUM), RpcPriority.MEDIUM);
+ assertEquals(RpcPriority.getEnumFromProto(Priority.PRIORITY_HIGH), RpcPriority.HIGH);
+ assertNull(RpcPriority.getEnumFromProto(Priority.PRIORITY_UNSPECIFIED));
+ }
+
  @Test
  public void testTransactionOptionsHashCode() {
  Options option1 = Options.fromTransactionOptions();