incorporating feedbacks

Author: jainsahab

google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreOptions.java

@@ -122,7 +122,7 @@ protected String getDefaultHost() {
         System.getProperty(
             com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR,
             System.getenv(com.google.datastore.v1.client.DatastoreHelper.LOCAL_HOST_ENV_VAR));
-    return host != null ? host : DatastoreDefaults.INSTANCE.getHost();
+    return host != null ? host : DatastoreSettings.getDefaultEndpoint();
   }
 
   @Override
@@ -136,13 +136,6 @@ protected String getDefaultProject() {
 
   private static class DatastoreDefaults implements ServiceDefaults<Datastore, DatastoreOptions> {
 
-    private static final DatastoreDefaults INSTANCE = new DatastoreDefaults();
-    private final String HOST = DatastoreSettings.getDefaultEndpoint();
-
-    String getHost() {
-      return HOST;
-    }
-
     @Override
     public DatastoreFactory getDefaultServiceFactory() {
       return DefaultDatastoreFactory.INSTANCE;

google-cloud-datastore/src/main/java/com/google/cloud/datastore/spi/v1/GrpcDatastoreRpc.java

@@ -1,8 +1,25 @@
+/*
+ * Copyright 2023 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.datastore.spi.v1;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.grpc.GrpcCallContext;
@@ -43,7 +60,7 @@
 import java.io.IOException;
 import java.util.Collections;
 
-// TODO(gapic_upgrade): Make it implement AutoCloseable
+@InternalApi
 public class GrpcDatastoreRpc implements AutoCloseable, DatastoreRpc {
 
   private final GrpcDatastoreStub datastoreStub;