diff --git a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java index 3bc0ff66da26..d17103fb0b0f 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java +++ b/google-cloud-core/src/main/java/com/google/cloud/ServiceOptions.java @@ -422,7 +422,7 @@ protected static String getServiceAccountProjectId() { /** * Returns a Service object for the current service. For instance, when using Google Cloud - * Storage, it returns a {@link com.google.cloud.storage.Storage} object. + * Storage, it returns a Storage object. */ @SuppressWarnings("unchecked") public ServiceT getService() { @@ -435,7 +435,7 @@ public ServiceT getService() { /** * Returns a Service RPC object for the current service. For instance, when using Google Cloud - * Storage, it returns a {@link com.google.cloud.storage.spi.StorageRpc} object. + * Storage, it returns a StorageRpc object. */ @SuppressWarnings("unchecked") public ServiceRpc getRpc() { diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java similarity index 99% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java index 3bdb67a567c6..fcb9db2a526d 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClient.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.UnaryCallable; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java similarity index 99% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java index f846c5ff27eb..0626f6d2e6b2 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.PropertiesProvider; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java similarity index 98% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java index 755495dfe7c0..af9da801cc95 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClient.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClient.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; -import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; -import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; +import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; +import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.UnaryCallable; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java similarity index 98% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java index 9a1aa7ae69be..14acd48661d9 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceSettings.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; -import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; -import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; +import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; +import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; import com.google.api.core.ApiFuture; import com.google.api.gax.core.GoogleCredentialsProvider; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/PagedResponseWrappers.java similarity index 99% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/PagedResponseWrappers.java index 87011485fa4e..bef0dbb557f8 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/PagedResponseWrappers.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClient.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java similarity index 99% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClient.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java index 1ac1a0baac5c..fee99bb61d0e 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClient.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.UnaryCallable; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java similarity index 99% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java index 2ce9c164492c..d550f075150c 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.PropertiesProvider; diff --git a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/package-info.java b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java similarity index 97% rename from google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/package-info.java rename to google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java index b220ed188232..edad46c5738e 100644 --- a/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/package-info.java +++ b/google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/v1beta1/package-info.java @@ -66,4 +66,4 @@ * * */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java similarity index 99% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClientTest.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java index 227c0dac1765..a360c8a5f1e2 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorGroupServiceClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java similarity index 96% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java index 85b40fb15a37..1b991db06ba1 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ErrorStatsServiceClientTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; -import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; -import static com.google.cloud.errorreporting.spi.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; +import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListEventsPagedResponse; +import static com.google.cloud.errorreporting.v1beta1.PagedResponseWrappers.ListGroupStatsPagedResponse; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java similarity index 96% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java index 19d5b86de1a1..0f22306f2f07 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupService.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java similarity index 98% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java index 9f7617d889d0..1de7122030ff 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorGroupServiceImpl.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorGroupServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup; import com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceGrpc.ErrorGroupServiceImplBase; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java similarity index 96% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java index 737b4d67ae74..364d716e1dda 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsService.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsServiceImpl.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java similarity index 98% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsServiceImpl.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java index 023e4696de66..c6dc2ea4840a 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockErrorStatsServiceImpl.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockErrorStatsServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest; import com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java similarity index 96% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java index 7da1f11a4c9c..a3db1786412d 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsService.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsServiceImpl.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java similarity index 97% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsServiceImpl.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java index 3388438a11af..883b7ee7de13 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/MockReportErrorsServiceImpl.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/MockReportErrorsServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest; import com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse; diff --git a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClientTest.java b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java similarity index 98% rename from google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClientTest.java rename to google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java index d4f8752b9195..087df60f2043 100644 --- a/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceClientTest.java +++ b/google-cloud-errorreporting/src/test/java/com/google/cloud/errorreporting/v1beta1/ReportErrorsServiceClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.errorreporting.spi.v1beta1; +package com.google.cloud.errorreporting.v1beta1; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/language/snippets/AnalyzeSentiment.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/language/snippets/AnalyzeSentiment.java index 72b5519ed9dd..44c8799e6e4a 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/language/snippets/AnalyzeSentiment.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/language/snippets/AnalyzeSentiment.java @@ -22,7 +22,7 @@ package com.google.cloud.examples.language.snippets; -import com.google.cloud.language.spi.v1.LanguageServiceClient; +import com.google.cloud.language.v1.LanguageServiceClient; import com.google.cloud.language.v1.Document; import com.google.cloud.language.v1.Document.Type; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java index f3ae5d4dc148..726264e0f690 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateSubscriptionAndConsumeMessages.java @@ -16,10 +16,10 @@ package com.google.cloud.examples.pubsub.snippets; -import com.google.cloud.pubsub.spi.v1.AckReplyConsumer; -import com.google.cloud.pubsub.spi.v1.MessageReceiver; -import com.google.cloud.pubsub.spi.v1.Subscriber; -import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient; +import com.google.cloud.pubsub.v1.AckReplyConsumer; +import com.google.cloud.pubsub.v1.MessageReceiver; +import com.google.cloud.pubsub.v1.Subscriber; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.util.concurrent.MoreExecutors; import com.google.pubsub.v1.PubsubMessage; import com.google.pubsub.v1.PushConfig; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java index 5b735c62ed35..6db5acc104dc 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/CreateTopicAndPublishMessages.java @@ -18,8 +18,8 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.cloud.pubsub.spi.v1.Publisher; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.Publisher; +import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.protobuf.ByteString; import com.google.pubsub.v1.PubsubMessage; import com.google.pubsub.v1.TopicName; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/MessageReceiverSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/MessageReceiverSnippets.java index dd525340d196..53c5d1989bcb 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/MessageReceiverSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/MessageReceiverSnippets.java @@ -22,8 +22,8 @@ package com.google.cloud.examples.pubsub.snippets; -import com.google.cloud.pubsub.spi.v1.AckReplyConsumer; -import com.google.cloud.pubsub.spi.v1.MessageReceiver; +import com.google.cloud.pubsub.v1.AckReplyConsumer; +import com.google.cloud.pubsub.v1.MessageReceiver; import com.google.pubsub.v1.PubsubMessage; import java.util.concurrent.BlockingQueue; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java index bd17e7abc4a8..814488a9fc13 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/PublisherSnippets.java @@ -32,8 +32,8 @@ import com.google.api.gax.grpc.InstantiatingExecutorProvider; import com.google.api.gax.retrying.RetrySettings; import com.google.auth.oauth2.ServiceAccountCredentials; -import com.google.cloud.pubsub.spi.v1.Publisher; -import com.google.cloud.pubsub.spi.v1.TopicAdminSettings; +import com.google.cloud.pubsub.v1.Publisher; +import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.protobuf.ByteString; import com.google.pubsub.v1.PubsubMessage; import com.google.pubsub.v1.TopicName; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java index 2890a923d727..b016fc6340d7 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriberSnippets.java @@ -30,10 +30,10 @@ import com.google.api.gax.grpc.ExecutorProvider; import com.google.api.gax.grpc.InstantiatingExecutorProvider; import com.google.auth.oauth2.ServiceAccountCredentials; -import com.google.cloud.pubsub.spi.v1.AckReplyConsumer; -import com.google.cloud.pubsub.spi.v1.MessageReceiver; -import com.google.cloud.pubsub.spi.v1.Subscriber; -import com.google.cloud.pubsub.spi.v1.TopicAdminSettings; +import com.google.cloud.pubsub.v1.AckReplyConsumer; +import com.google.cloud.pubsub.v1.MessageReceiver; +import com.google.cloud.pubsub.v1.Subscriber; +import com.google.cloud.pubsub.v1.TopicAdminSettings; import com.google.common.util.concurrent.MoreExecutors; import com.google.pubsub.v1.PubsubMessage; import com.google.pubsub.v1.SubscriptionName; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java index c842b57eb705..2c9528a86e38 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/SubscriptionAdminClientSnippets.java @@ -21,21 +21,18 @@ import com.google.cloud.Identity; import com.google.cloud.Role; import com.google.cloud.ServiceOptions; -import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; -import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; +import com.google.cloud.pubsub.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.iam.v1.Binding; import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsResponse; import com.google.pubsub.v1.ListSubscriptionsRequest; import com.google.pubsub.v1.ProjectName; -import com.google.pubsub.v1.PullResponse; import com.google.pubsub.v1.PushConfig; -import com.google.pubsub.v1.ReceivedMessage; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.SubscriptionName; import com.google.pubsub.v1.TopicName; -import java.util.Collections; import java.util.LinkedList; import java.util.List; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java index d985ffecfc8f..c9c53b0086e1 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/pubsub/snippets/TopicAdminClientSnippets.java @@ -19,9 +19,9 @@ import com.google.cloud.Identity; import com.google.cloud.Role; import com.google.cloud.ServiceOptions; -import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; -import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicsPagedResponse; +import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.iam.v1.Binding; import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsResponse; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/speech/snippets/RecognizeSpeech.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/speech/snippets/RecognizeSpeech.java index 405cdf8b5666..9cd2e53566a6 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/speech/snippets/RecognizeSpeech.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/speech/snippets/RecognizeSpeech.java @@ -22,7 +22,7 @@ package com.google.cloud.examples.speech.snippets; -import com.google.cloud.speech.spi.v1.SpeechClient; +import com.google.cloud.speech.v1.SpeechClient; import com.google.cloud.speech.v1.RecognitionAudio; import com.google.cloud.speech.v1.RecognitionConfig; import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding; diff --git a/google-cloud-examples/src/main/java/com/google/cloud/examples/vision/snippets/AnnotateImage.java b/google-cloud-examples/src/main/java/com/google/cloud/examples/vision/snippets/AnnotateImage.java index 5ac74457fa9f..ad44a350655d 100644 --- a/google-cloud-examples/src/main/java/com/google/cloud/examples/vision/snippets/AnnotateImage.java +++ b/google-cloud-examples/src/main/java/com/google/cloud/examples/vision/snippets/AnnotateImage.java @@ -21,7 +21,7 @@ */ package com.google.cloud.examples.vision.snippets; -import com.google.cloud.vision.spi.v1.ImageAnnotatorClient; +import com.google.cloud.vision.v1.ImageAnnotatorClient; import com.google.cloud.vision.v1.AnnotateImageRequest; import com.google.cloud.vision.v1.AnnotateImageResponse; import com.google.cloud.vision.v1.BatchAnnotateImagesResponse; diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/Cleanup.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/Cleanup.java index 3f2c9e64be73..97ca54854a78 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/Cleanup.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/Cleanup.java @@ -16,8 +16,8 @@ package com.google.cloud.examples.pubsub.snippets; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; -import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient; +import com.google.cloud.pubsub.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.pubsub.v1.SubscriptionName; import com.google.pubsub.v1.TopicName; diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java index df9d99f7b5f4..f564349821c6 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITPubSubSnippets.java @@ -23,9 +23,9 @@ import com.google.api.core.ApiFutures; import com.google.api.core.SettableApiFuture; import com.google.cloud.ServiceOptions; -import com.google.cloud.pubsub.spi.v1.Publisher; -import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.Publisher; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; +import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.util.concurrent.MoreExecutors; import com.google.pubsub.v1.PubsubMessage; import com.google.pubsub.v1.PushConfig; diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java index 4ef0f3da6cf0..0f43c5a42af6 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITSubscriptionAdminClientSnippets.java @@ -23,22 +23,15 @@ import com.google.api.gax.grpc.ApiException; import com.google.cloud.Identity; import com.google.cloud.Role; -import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; -import com.google.cloud.pubsub.spi.v1.Publisher; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; +import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.collect.Iterables; import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.ByteString; -import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.PullResponse; -import com.google.pubsub.v1.ReceivedMessage; import com.google.pubsub.v1.Subscription; import com.google.pubsub.v1.TopicName; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import java.util.UUID; import org.junit.After; import org.junit.Before; diff --git a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java index 76b641654e38..439057be9873 100644 --- a/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java +++ b/google-cloud-examples/src/test/java/com/google/cloud/examples/pubsub/snippets/ITTopicAdminClientSnippets.java @@ -23,9 +23,9 @@ import com.google.api.gax.grpc.ApiException; import com.google.cloud.Identity; import com.google.cloud.Role; -import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; -import com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse; -import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicsPagedResponse; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; import com.google.common.collect.Iterables; import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsResponse; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java index fd9856b16e50..460d4fefd0ca 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceClient.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java @@ -13,24 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.language.v1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.ClientContext; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; -import com.google.cloud.language.v1.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1.AnalyzeSentimentRequest; -import com.google.cloud.language.v1.AnalyzeSentimentResponse; -import com.google.cloud.language.v1.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1.AnalyzeSyntaxResponse; -import com.google.cloud.language.v1.AnnotateTextRequest; -import com.google.cloud.language.v1.AnnotateTextRequest.Features; -import com.google.cloud.language.v1.AnnotateTextResponse; -import com.google.cloud.language.v1.Document; -import com.google.cloud.language.v1.EncodingType; import io.grpc.ManagedChannel; import java.io.Closeable; import java.io.IOException; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java index 1c9c7c35dee0..7616f46110cf 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.language.v1; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; @@ -27,14 +27,6 @@ import com.google.api.gax.grpc.SimpleCallSettings; import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.language.v1.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1.AnalyzeSentimentRequest; -import com.google.cloud.language.v1.AnalyzeSentimentResponse; -import com.google.cloud.language.v1.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1.AnalyzeSyntaxResponse; -import com.google.cloud.language.v1.AnnotateTextRequest; -import com.google.cloud.language.v1.AnnotateTextResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/PagedResponseWrappers.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1/PagedResponseWrappers.java similarity index 96% rename from google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/PagedResponseWrappers.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1/PagedResponseWrappers.java index 9b237087ed54..b5aa4a1377a8 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/PagedResponseWrappers.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.language.v1; import com.google.protobuf.ExperimentalApi; import javax.annotation.Generated; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/package-info.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/package-info.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java index 8153b76e7b31..4c033205fa36 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/package-info.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1/package-info.java @@ -35,4 +35,4 @@ * * */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.language.v1; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceClient.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceClient.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java index efe1f25b6eec..77d349d54397 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceClient.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceClient.java @@ -13,26 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1beta2; +package com.google.cloud.language.v1beta2; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.ClientContext; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; -import com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest; -import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse; -import com.google.cloud.language.v1beta2.AnalyzeSentimentRequest; -import com.google.cloud.language.v1beta2.AnalyzeSentimentResponse; -import com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse; -import com.google.cloud.language.v1beta2.AnnotateTextRequest; -import com.google.cloud.language.v1beta2.AnnotateTextRequest.Features; -import com.google.cloud.language.v1beta2.AnnotateTextResponse; -import com.google.cloud.language.v1beta2.Document; -import com.google.cloud.language.v1beta2.EncodingType; import io.grpc.ManagedChannel; import java.io.Closeable; import java.io.IOException; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java index 5bbb181e3dd4..465b22a6987b 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1beta2; +package com.google.cloud.language.v1beta2; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; @@ -27,16 +27,6 @@ import com.google.api.gax.grpc.SimpleCallSettings; import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest; -import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse; -import com.google.cloud.language.v1beta2.AnalyzeSentimentRequest; -import com.google.cloud.language.v1beta2.AnalyzeSentimentResponse; -import com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse; -import com.google.cloud.language.v1beta2.AnnotateTextRequest; -import com.google.cloud.language.v1beta2.AnnotateTextResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/package-info.java b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/package-info.java rename to google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java index 39e9f44eb781..625f930edc29 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/package-info.java +++ b/google-cloud-language/src/main/java/com/google/cloud/language/v1beta2/package-info.java @@ -35,4 +35,4 @@ * * */ -package com.google.cloud.language.spi.v1beta2; +package com.google.cloud.language.v1beta2; diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java similarity index 92% rename from google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java rename to google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java index 64ddf7d2d8bb..b0a326a9e19c 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/LanguageServiceClientTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1/LanguageServiceClientTest.java @@ -13,23 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.language.v1; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; -import com.google.cloud.language.v1.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1.AnalyzeSentimentRequest; -import com.google.cloud.language.v1.AnalyzeSentimentResponse; -import com.google.cloud.language.v1.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1.AnalyzeSyntaxResponse; -import com.google.cloud.language.v1.AnnotateTextRequest; -import com.google.cloud.language.v1.AnnotateTextRequest.Features; -import com.google.cloud.language.v1.AnnotateTextResponse; -import com.google.cloud.language.v1.Document; -import com.google.cloud.language.v1.EncodingType; import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/MockLanguageService.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java similarity index 97% rename from google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/MockLanguageService.java rename to google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java index 9795fb7393cc..f69960281099 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/MockLanguageService.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.language.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/MockLanguageServiceImpl.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java similarity index 99% rename from google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/MockLanguageServiceImpl.java rename to google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java index d1d4ed6f985f..b312a31a88b8 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1/MockLanguageServiceImpl.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1/MockLanguageServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.language.v1; import com.google.cloud.language.v1.AnalyzeEntitiesRequest; import com.google.cloud.language.v1.AnalyzeEntitiesResponse; diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/LanguageServiceClientTest.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java similarity index 91% rename from google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/LanguageServiceClientTest.java rename to google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java index 01013c68ae61..a40a643a1666 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/LanguageServiceClientTest.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/LanguageServiceClientTest.java @@ -13,25 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1beta2; +package com.google.cloud.language.v1beta2; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; -import com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest; -import com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse; -import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest; -import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse; -import com.google.cloud.language.v1beta2.AnalyzeSentimentRequest; -import com.google.cloud.language.v1beta2.AnalyzeSentimentResponse; -import com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest; -import com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse; -import com.google.cloud.language.v1beta2.AnnotateTextRequest; -import com.google.cloud.language.v1beta2.AnnotateTextRequest.Features; -import com.google.cloud.language.v1beta2.AnnotateTextResponse; -import com.google.cloud.language.v1beta2.Document; -import com.google.cloud.language.v1beta2.EncodingType; import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/MockLanguageService.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java similarity index 97% rename from google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/MockLanguageService.java rename to google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java index 2ed8e069f061..3cd7703e5423 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/MockLanguageService.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1beta2; +package com.google.cloud.language.v1beta2; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/MockLanguageServiceImpl.java b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java similarity index 99% rename from google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/MockLanguageServiceImpl.java rename to google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java index 766c4bb5f53b..1397d9153ff3 100644 --- a/google-cloud-language/src/test/java/com/google/cloud/language/spi/v1beta2/MockLanguageServiceImpl.java +++ b/google-cloud-language/src/test/java/com/google/cloud/language/v1beta2/MockLanguageServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1beta2; +package com.google.cloud.language.v1beta2; import com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest; import com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java index 6b3791c08863..3ea6fa55c6a6 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java @@ -25,7 +25,7 @@ import com.google.cloud.logging.spi.v2.GrpcLoggingRpc; import com.google.cloud.logging.spi.v2.LoggingRpc; import com.google.cloud.logging.spi.LoggingRpcFactory; -import com.google.cloud.logging.spi.v2.LoggingSettings; +import com.google.cloud.logging.v2.LoggingSettings; import com.google.common.collect.ImmutableSet; import java.io.IOException; import java.util.Set; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java index c09539d77baa..fd1d9ee1f394 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/GrpcLoggingRpc.java @@ -33,6 +33,12 @@ import com.google.cloud.NoCredentials; import com.google.cloud.logging.LoggingException; import com.google.cloud.logging.LoggingOptions; +import com.google.cloud.logging.v2.ConfigClient; +import com.google.cloud.logging.v2.ConfigSettings; +import com.google.cloud.logging.v2.LoggingClient; +import com.google.cloud.logging.v2.LoggingSettings; +import com.google.cloud.logging.v2.MetricsClient; +import com.google.cloud.logging.v2.MetricsSettings; import com.google.logging.v2.CreateLogMetricRequest; import com.google.logging.v2.CreateSinkRequest; import com.google.logging.v2.DeleteLogMetricRequest; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java similarity index 99% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java index 7739058070e4..d9951ccb65a6 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigClient.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListSinksPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListSinksPagedResponse; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java similarity index 99% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java index d12afca49b37..5c6f0cc3f273 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListSinksPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListSinksPagedResponse; import com.google.api.core.ApiFuture; import com.google.api.core.BetaApi; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java similarity index 98% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java index acacdd1f1906..e59c9831bfd7 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingClient.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogEntriesPagedResponse; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogsPagedResponse; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogEntriesPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; import com.google.api.MonitoredResource; import com.google.api.core.BetaApi; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java similarity index 98% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java index faaf8b2b65fa..562d32246859 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogEntriesPagedResponse; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogsPagedResponse; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogEntriesPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFuture; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java similarity index 99% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java index 396b6df3db14..8c7def7b43c7 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsClient.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogMetricsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogMetricsPagedResponse; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java similarity index 99% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java index 1f9f4b7d41cc..4b3984e54bc2 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogMetricsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogMetricsPagedResponse; import com.google.api.core.ApiFuture; import com.google.api.core.BetaApi; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/PagedResponseWrappers.java similarity index 99% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/PagedResponseWrappers.java index 6954e4d738bd..9c34ff038897 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/PagedResponseWrappers.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFunction; diff --git a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/package-info.java b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java similarity index 98% rename from google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/package-info.java rename to google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java index 6fff642419ef..6aab8c8f3920 100644 --- a/google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/package-info.java +++ b/google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java @@ -65,4 +65,4 @@ * * */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java similarity index 98% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java index d3820d15dee3..171d60e718db 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/ConfigClientTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListSinksPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListSinksPagedResponse; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java similarity index 97% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java index d89dafa29091..fd7f15f29969 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/LoggingClientTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogEntriesPagedResponse; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogEntriesPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogsPagedResponse; import com.google.api.MonitoredResource; import com.google.api.gax.core.NoCredentialsProvider; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java similarity index 98% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java index 37215249b43f..999b2081c9d8 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MetricsClientTest.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; -import static com.google.cloud.logging.spi.v2.PagedResponseWrappers.ListLogMetricsPagedResponse; +import static com.google.cloud.logging.v2.PagedResponseWrappers.ListLogMetricsPagedResponse; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java similarity index 97% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java index 26790ffd2211..13033a5c89b5 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2Impl.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java similarity index 99% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2Impl.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java index 3e74a4b949d0..5c59f53aca24 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockConfigServiceV2Impl.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.logging.v2.ConfigServiceV2Grpc.ConfigServiceV2ImplBase; import com.google.logging.v2.CreateSinkRequest; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java similarity index 97% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java index e2868bb37cc0..24b7b5dcede3 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2Impl.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java similarity index 99% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2Impl.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java index c63de1feecbf..e8802942f313 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockLoggingServiceV2Impl.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.logging.v2.DeleteLogRequest; import com.google.logging.v2.ListLogEntriesRequest; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java similarity index 97% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java index c40b1845cc54..483876c9c6a6 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2Impl.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java similarity index 99% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2Impl.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java index 685bf0b97d8c..67d676c922ac 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/MockMetricsServiceV2Impl.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.logging.spi.v2; +package com.google.cloud.logging.v2; import com.google.logging.v2.CreateLogMetricRequest; import com.google.logging.v2.DeleteLogMetricRequest; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java similarity index 98% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java index 676927a4e07a..b2e81cbba7f1 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingHelper.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java @@ -12,7 +12,7 @@ * the License. */ -package com.google.cloud.logging.spi.v2.testing; +package com.google.cloud.logging.v2.testing; import io.grpc.ManagedChannel; diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingImpl.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java similarity index 98% rename from google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingImpl.java rename to google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java index 044af5d1b257..c63bfb4b7a32 100644 --- a/google-cloud-logging/src/test/java/com/google/cloud/logging/spi/v2/testing/LocalLoggingImpl.java +++ b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingImpl.java @@ -12,7 +12,7 @@ * the License. */ -package com.google.cloud.logging.spi.v2.testing; +package com.google.cloud.logging.v2.testing; import com.google.logging.v2.DeleteLogRequest; import com.google.logging.v2.ListLogEntriesRequest; diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java similarity index 99% rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java rename to google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java index e4d013e1dd0d..5dbc4e6480a0 100644 --- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceClient.java +++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceClient.java @@ -13,16 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; - -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListGroupMembersPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListGroupsPagedResponse; +package com.google.cloud.monitoring.v3; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.ClientContext; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; +import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListGroupMembersPagedResponse; +import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListGroupsPagedResponse; import com.google.monitoring.v3.CreateGroupRequest; import com.google.monitoring.v3.DeleteGroupRequest; import com.google.monitoring.v3.GetGroupRequest; diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java similarity index 99% rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java rename to google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java index c6a70ac42da9..c5ec04c40631 100644 --- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java +++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/GroupServiceSettings.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListGroupMembersPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListGroupsPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListGroupMembersPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListGroupsPagedResponse; import com.google.api.MonitoredResource; import com.google.api.core.ApiFuture; diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java similarity index 98% rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java rename to google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java index 6292523f3baa..44cea57160da 100644 --- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceClient.java +++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceClient.java @@ -13,11 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; - -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; +package com.google.cloud.monitoring.v3; import com.google.api.MetricDescriptor; import com.google.api.MonitoredResourceDescriptor; @@ -26,6 +22,9 @@ import com.google.api.gax.grpc.ClientContext; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; +import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; +import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; +import com.google.cloud.monitoring.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; import com.google.monitoring.v3.CreateMetricDescriptorRequest; import com.google.monitoring.v3.CreateTimeSeriesRequest; import com.google.monitoring.v3.DeleteMetricDescriptorRequest; @@ -36,7 +35,6 @@ import com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest; import com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse; import com.google.monitoring.v3.ListTimeSeriesRequest; -import com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView; import com.google.monitoring.v3.ListTimeSeriesResponse; import com.google.monitoring.v3.MetricDescriptorName; import com.google.monitoring.v3.MonitoredResourceDescriptorName; diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java similarity index 98% rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java rename to google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java index 0ac4888182e2..0c3ecc3f38d7 100644 --- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/MetricServiceSettings.java +++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/MetricServiceSettings.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; import com.google.api.MetricDescriptor; import com.google.api.MonitoredResourceDescriptor; diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/PagedResponseWrappers.java similarity index 99% rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java rename to google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/PagedResponseWrappers.java index a6ea551e83a8..ac1f54f7b766 100644 --- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/PagedResponseWrappers.java +++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; import com.google.api.MetricDescriptor; import com.google.api.MonitoredResource; diff --git a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/package-info.java b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java similarity index 98% rename from google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/package-info.java rename to google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java index 39be7555fee6..48cdc0e11742 100644 --- a/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/package-info.java +++ b/google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/v3/package-info.java @@ -58,4 +58,4 @@ * * */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java similarity index 98% rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java rename to google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java index 4d4500ab6eae..b1e590cf20bb 100644 --- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/GroupServiceClientTest.java +++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/GroupServiceClientTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListGroupMembersPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListGroupMembersPagedResponse; import com.google.api.MonitoredResource; import com.google.api.gax.core.NoCredentialsProvider; diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java similarity index 97% rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java rename to google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java index 8ed8231ac457..247e8dd7a33f 100644 --- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MetricServiceClientTest.java +++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MetricServiceClientTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; -import static com.google.cloud.monitoring.spi.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMetricDescriptorsPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListMonitoredResourceDescriptorsPagedResponse; +import static com.google.cloud.monitoring.v3.PagedResponseWrappers.ListTimeSeriesPagedResponse; import com.google.api.MetricDescriptor; import com.google.api.MonitoredResourceDescriptor; @@ -36,7 +36,6 @@ import com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest; import com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse; import com.google.monitoring.v3.ListTimeSeriesRequest; -import com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView; import com.google.monitoring.v3.ListTimeSeriesResponse; import com.google.monitoring.v3.MetricDescriptorName; import com.google.monitoring.v3.MonitoredResourceDescriptorName; diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java similarity index 97% rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java rename to google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java index 9ed06a88d1c7..966c1d405e57 100644 --- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupService.java +++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupServiceImpl.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java similarity index 99% rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupServiceImpl.java rename to google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java index 82487adc2e1d..367a683656de 100644 --- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockGroupServiceImpl.java +++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockGroupServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; import com.google.monitoring.v3.CreateGroupRequest; import com.google.monitoring.v3.DeleteGroupRequest; diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java similarity index 97% rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java rename to google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java index ede4735cb8b9..c2cb26229281 100644 --- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricService.java +++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricServiceImpl.java b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java similarity index 99% rename from google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricServiceImpl.java rename to google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java index e31c639eae74..0862b3d6719e 100644 --- a/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/spi/v3/MockMetricServiceImpl.java +++ b/google-cloud-monitoring/src/test/java/com/google/cloud/monitoring/v3/MockMetricServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.monitoring.spi.v3; +package com.google.cloud.monitoring.v3; import com.google.api.MetricDescriptor; import com.google.api.MonitoredResourceDescriptor; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/AckReplyConsumer.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java similarity index 96% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/AckReplyConsumer.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java index 7870e0c3b525..2d138bfeeae3 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/AckReplyConsumer.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; /** * Accepts a reply, sending it to the service. diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/AtomicRoundRobin.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AtomicRoundRobin.java similarity index 96% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/AtomicRoundRobin.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AtomicRoundRobin.java index 4a2eac8f3161..95e5f9514118 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/AtomicRoundRobin.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AtomicRoundRobin.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageDispatcher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageDispatcher.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java index 6e01b04b7f10..e8eb336a3e80 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageDispatcher.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiClock; import com.google.api.gax.batching.FlowController; import com.google.api.gax.batching.FlowController.FlowControlException; import com.google.api.gax.core.Distribution; -import com.google.cloud.pubsub.spi.v1.MessageDispatcher.OutstandingMessagesBatch.OutstandingMessage; +import com.google.cloud.pubsub.v1.MessageDispatcher.OutstandingMessagesBatch.OutstandingMessage; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; @@ -167,7 +167,7 @@ public enum AckReply { /** * Handles callbacks for acking/nacking messages from the {@link - * com.google.cloud.pubsub.spi.v1.MessageReceiver}. + * MessageReceiver}. */ private class AckHandler implements FutureCallback { private final String ackId; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageReceiver.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java similarity index 97% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageReceiver.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java index 7f7e3381a53d..743aecbb513a 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageReceiver.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.pubsub.v1.PubsubMessage; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageWaiter.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java similarity index 97% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageWaiter.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java index 9bf109b58b2c..b22db5440c25 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/MessageWaiter.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageWaiter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.common.annotations.VisibleForTesting; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PagedResponseWrappers.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PagedResponseWrappers.java index 31d6199e6471..133e89c5cf39 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PagedResponseWrappers.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PollingSubscriberConnection.java similarity index 97% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PollingSubscriberConnection.java index 4075a8a5a73f..b487a41ed416 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PollingSubscriberConnection.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.AbstractApiService; import com.google.api.core.ApiClock; import com.google.api.gax.batching.FlowController; import com.google.api.gax.core.Distribution; -import com.google.cloud.pubsub.spi.v1.MessageDispatcher.AckProcessor; -import com.google.cloud.pubsub.spi.v1.MessageDispatcher.PendingModifyAckDeadline; +import com.google.cloud.pubsub.v1.MessageDispatcher.AckProcessor; +import com.google.cloud.pubsub.v1.MessageDispatcher.PendingModifyAckDeadline; import com.google.common.collect.Lists; import com.google.common.primitives.Ints; import com.google.common.util.concurrent.FutureCallback; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java index ff780df0fd02..c205bdd0be9e 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Publisher.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiFuture; import com.google.api.core.SettableApiFuture; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherStats.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java similarity index 97% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherStats.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java index d15dcfed45a5..e3daeaaadd58 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PublisherStats.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherStats.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.auto.value.AutoValue; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StatusUtil.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java similarity index 97% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StatusUtil.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java index c9c4cef3cbc1..7f2220cb38ef 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StatusUtil.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java similarity index 98% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java index ea1e4ea5c2e4..7822bc470ac3 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnection.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.AbstractApiService; import com.google.api.core.ApiClock; import com.google.api.gax.batching.FlowController; import com.google.api.gax.core.Distribution; -import com.google.cloud.pubsub.spi.v1.MessageDispatcher.AckProcessor; -import com.google.cloud.pubsub.spi.v1.MessageDispatcher.PendingModifyAckDeadline; +import com.google.cloud.pubsub.v1.MessageDispatcher.AckProcessor; +import com.google.cloud.pubsub.v1.MessageDispatcher.PendingModifyAckDeadline; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.Lists; import com.google.common.util.concurrent.FutureCallback; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java index 6a67cd810565..ce116b7adb84 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.AbstractApiService; import com.google.api.core.ApiClock; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberStats.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java similarity index 98% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberStats.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java index f0614f79a8f2..7e45282dfc5a 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriberStats.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.auto.value.AutoValue; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java index 9c5a713f76f4..04b70ea87777 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClient.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSnapshotsPagedResponse; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSnapshotsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java index d1e7688f36f4..c0efac4387b6 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriptionAdminSettings.java @@ -13,10 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; - -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSnapshotsPagedResponse; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiFuture; import com.google.api.core.BetaApi; @@ -38,6 +35,8 @@ import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.grpc.UnaryCallable; import com.google.api.gax.retrying.RetrySettings; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSnapshotsPagedResponse; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java index 83b0ab6ab116..886550b6a1b4 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminClient.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminClient.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicsPagedResponse; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java similarity index 99% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java index 065f8abb3fe2..22902c8611d8 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/TopicAdminSettings.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/TopicAdminSettings.java @@ -13,10 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; - -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiFuture; import com.google.api.core.BetaApi; @@ -45,6 +42,8 @@ import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.grpc.UnaryCallable; import com.google.api.gax.retrying.RetrySettings; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; +import com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicsPagedResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -188,7 +187,7 @@ public class TopicAdminSettings extends ClientSettings { listTopicsSettings; private final PagedCallSettings< ListTopicSubscriptionsRequest, ListTopicSubscriptionsResponse, - ListTopicSubscriptionsPagedResponse> + ListTopicSubscriptionsPagedResponse> listTopicSubscriptionsSettings; private final SimpleCallSettings deleteTopicSettings; private final SimpleCallSettings setIamPolicySettings; diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/package-info.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java similarity index 98% rename from google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/package-info.java rename to google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java index 4054800fd344..52c3011066f4 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/package-info.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/package-info.java @@ -58,4 +58,4 @@ * * */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java index 8e915ff9713c..b82ccf92f88d 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java @@ -21,12 +21,12 @@ import com.google.api.core.SettableApiFuture; import com.google.cloud.ServiceOptions; -import com.google.cloud.pubsub.spi.v1.AckReplyConsumer; -import com.google.cloud.pubsub.spi.v1.MessageReceiver; -import com.google.cloud.pubsub.spi.v1.Publisher; -import com.google.cloud.pubsub.spi.v1.Subscriber; -import com.google.cloud.pubsub.spi.v1.SubscriptionAdminClient; -import com.google.cloud.pubsub.spi.v1.TopicAdminClient; +import com.google.cloud.pubsub.v1.AckReplyConsumer; +import com.google.cloud.pubsub.v1.MessageReceiver; +import com.google.cloud.pubsub.v1.Publisher; +import com.google.cloud.pubsub.v1.Subscriber; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; +import com.google.cloud.pubsub.v1.TopicAdminClient; import com.google.common.util.concurrent.MoreExecutors; import com.google.iam.v1.Binding; import com.google.iam.v1.Policy; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/AtomicRoundRobinTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/AtomicRoundRobinTest.java similarity index 97% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/AtomicRoundRobinTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/AtomicRoundRobinTest.java index 3bc4411eaa7b..1d1189d22885 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/AtomicRoundRobinTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/AtomicRoundRobinTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import org.junit.Assert; import org.junit.Test; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeClock.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java similarity index 96% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeClock.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java index 3e9508e0f0b8..52fe8a401893 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeClock.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiClock; import java.util.concurrent.TimeUnit; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakePublisherServiceImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java similarity index 98% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakePublisherServiceImpl.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java index 01f3dd58846c..65607df8327c 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakePublisherServiceImpl.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.common.base.Optional; import com.google.pubsub.v1.PublishRequest; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeScheduledExecutorService.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java similarity index 99% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeScheduledExecutorService.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java index 96e703f8ad3c..e15ac871cc9a 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeScheduledExecutorService.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.core.ApiClock; import com.google.common.primitives.Ints; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeSubscriberServiceImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java similarity index 99% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeSubscriberServiceImpl.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java index 2f0ed34423fe..eb766098569b 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeSubscriberServiceImpl.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.client.util.Preconditions; import com.google.common.collect.ImmutableList; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MessageWaiterTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java similarity index 97% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MessageWaiterTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java index 0c38e89ad060..16fe9ce0718d 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MessageWaiterTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageWaiterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import static org.junit.Assert.assertEquals; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockIAMPolicy.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java similarity index 97% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockIAMPolicy.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java index 628b6f511109..b88d621042fc 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockIAMPolicy.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockIAMPolicyImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java similarity index 98% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockIAMPolicyImpl.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java index d2986b9e3a84..96681a2c2ff9 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockIAMPolicyImpl.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockPublisher.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java similarity index 97% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockPublisher.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java index 7052c4cd1188..4a86a973ab58 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockPublisher.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockPublisherImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java similarity index 99% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockPublisherImpl.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java index 63317aba0656..bdf89bb7d42e 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockPublisherImpl.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockPublisherImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.protobuf.Empty; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockSubscriber.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java similarity index 97% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockSubscriber.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java index 19afb5b6fe4e..4cbb01aae5d0 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockSubscriber.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriber.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockSubscriberImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java similarity index 99% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockSubscriberImpl.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java index e780fb364037..c2230c2927c7 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/MockSubscriberImpl.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MockSubscriberImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.protobuf.Empty; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java similarity index 99% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java index b34b88fc6c01..9d0972fffea9 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/PublisherImplTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import static org.junit.Assert.*; @@ -26,7 +26,7 @@ import com.google.api.gax.grpc.FixedExecutorProvider; import com.google.api.gax.grpc.InstantiatingExecutorProvider; import com.google.auth.Credentials; -import com.google.cloud.pubsub.spi.v1.Publisher.Builder; +import com.google.cloud.pubsub.v1.Publisher.Builder; import com.google.protobuf.ByteString; import com.google.pubsub.v1.PublishResponse; import com.google.pubsub.v1.PubsubMessage; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/StatusUtilTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java similarity index 92% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/StatusUtilTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java index 80bfb3a5f664..adb1d8720345 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/StatusUtilTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java @@ -1,4 +1,4 @@ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; import com.google.common.truth.Truth; import io.grpc.Status; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnectionTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java similarity index 97% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnectionTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java index eace8c850591..2f44f4ae4f3f 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/StreamingSubscriberConnectionTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; -import com.google.cloud.pubsub.spi.v1.MessageDispatcher.PendingModifyAckDeadline; +import com.google.cloud.pubsub.v1.MessageDispatcher.PendingModifyAckDeadline; import com.google.common.truth.Truth; import com.google.pubsub.v1.StreamingPullRequest; import java.util.Arrays; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java similarity index 98% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java index d1261a4afc17..c716eeb950a3 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; -import static com.google.cloud.pubsub.spi.v1.MessageDispatcher.PENDING_ACKS_SEND_DELAY; +import static com.google.cloud.pubsub.v1.MessageDispatcher.PENDING_ACKS_SEND_DELAY; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import com.google.api.gax.grpc.FixedChannelProvider; import com.google.api.gax.grpc.FixedExecutorProvider; import com.google.api.gax.grpc.InstantiatingExecutorProvider; -import com.google.cloud.pubsub.spi.v1.FakeSubscriberServiceImpl.ModifyAckDeadline; -import com.google.cloud.pubsub.spi.v1.Subscriber.Builder; +import com.google.cloud.pubsub.v1.FakeSubscriberServiceImpl.ModifyAckDeadline; +import com.google.cloud.pubsub.v1.Subscriber.Builder; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java similarity index 99% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java index 67586b8f6f01..423f11048795 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriptionAdminClientTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriptionAdminClientTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSnapshotsPagedResponse; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSnapshotsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListSubscriptionsPagedResponse; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java similarity index 98% rename from google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java rename to google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java index 05af6ee2bc84..2191f85f858c 100644 --- a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/TopicAdminClientTest.java +++ b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminClientTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.pubsub.spi.v1; +package com.google.cloud.pubsub.v1; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; -import static com.google.cloud.pubsub.spi.v1.PagedResponseWrappers.ListTopicsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicSubscriptionsPagedResponse; +import static com.google.cloud.pubsub.v1.PagedResponseWrappers.ListTopicsPagedResponse; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechClient.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java similarity index 97% rename from google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechClient.java rename to google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java index 490881d93632..d1d931517921 100644 --- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechClient.java +++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1; +package com.google.cloud.speech.v1; import com.google.api.core.BetaApi; import com.google.api.gax.core.FixedCredentialsProvider; @@ -26,14 +26,6 @@ import com.google.api.gax.grpc.StreamingCallable; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; -import com.google.cloud.speech.v1.LongRunningRecognizeRequest; -import com.google.cloud.speech.v1.LongRunningRecognizeResponse; -import com.google.cloud.speech.v1.RecognitionAudio; -import com.google.cloud.speech.v1.RecognitionConfig; -import com.google.cloud.speech.v1.RecognizeRequest; -import com.google.cloud.speech.v1.RecognizeResponse; -import com.google.cloud.speech.v1.StreamingRecognizeRequest; -import com.google.cloud.speech.v1.StreamingRecognizeResponse; import com.google.longrunning.Operation; import com.google.longrunning.OperationsClient; import com.google.longrunning.OperationsSettings; diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java similarity index 97% rename from google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java rename to google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java index 13ce9dcac3a5..4f714aff82c5 100644 --- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/SpeechSettings.java +++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/SpeechSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1; +package com.google.cloud.speech.v1; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; @@ -29,12 +29,6 @@ import com.google.api.gax.grpc.StreamingCallSettings; import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.speech.v1.LongRunningRecognizeRequest; -import com.google.cloud.speech.v1.LongRunningRecognizeResponse; -import com.google.cloud.speech.v1.RecognizeRequest; -import com.google.cloud.speech.v1.RecognizeResponse; -import com.google.cloud.speech.v1.StreamingRecognizeRequest; -import com.google.cloud.speech.v1.StreamingRecognizeResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/package-info.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java similarity index 97% rename from google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/package-info.java rename to google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java index 058cb76d82c8..f6bbaf6ec5bb 100644 --- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1/package-info.java +++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java @@ -45,4 +45,4 @@ * * */ -package com.google.cloud.speech.spi.v1; +package com.google.cloud.speech.v1; diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechClient.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java similarity index 97% rename from google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechClient.java rename to google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java index ae56fc563d47..e111700c6b5f 100644 --- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechClient.java +++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1beta1; +package com.google.cloud.speech.v1beta1; import com.google.api.core.BetaApi; import com.google.api.gax.core.FixedCredentialsProvider; @@ -26,14 +26,6 @@ import com.google.api.gax.grpc.StreamingCallable; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; -import com.google.cloud.speech.v1beta1.AsyncRecognizeRequest; -import com.google.cloud.speech.v1beta1.AsyncRecognizeResponse; -import com.google.cloud.speech.v1beta1.RecognitionAudio; -import com.google.cloud.speech.v1beta1.RecognitionConfig; -import com.google.cloud.speech.v1beta1.StreamingRecognizeRequest; -import com.google.cloud.speech.v1beta1.StreamingRecognizeResponse; -import com.google.cloud.speech.v1beta1.SyncRecognizeRequest; -import com.google.cloud.speech.v1beta1.SyncRecognizeResponse; import com.google.longrunning.Operation; import com.google.longrunning.OperationsClient; import com.google.longrunning.OperationsSettings; diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java similarity index 97% rename from google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java rename to google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java index c23943661833..8fe5aca889b6 100644 --- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/SpeechSettings.java +++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/SpeechSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1beta1; +package com.google.cloud.speech.v1beta1; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; @@ -29,12 +29,6 @@ import com.google.api.gax.grpc.StreamingCallSettings; import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.speech.v1beta1.AsyncRecognizeRequest; -import com.google.cloud.speech.v1beta1.AsyncRecognizeResponse; -import com.google.cloud.speech.v1beta1.StreamingRecognizeRequest; -import com.google.cloud.speech.v1beta1.StreamingRecognizeResponse; -import com.google.cloud.speech.v1beta1.SyncRecognizeRequest; -import com.google.cloud.speech.v1beta1.SyncRecognizeResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/package-info.java b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java similarity index 97% rename from google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/package-info.java rename to google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java index aba4be4d6b7a..3378f1e72bb2 100644 --- a/google-cloud-speech/src/main/java/com/google/cloud/speech/spi/v1beta1/package-info.java +++ b/google-cloud-speech/src/main/java/com/google/cloud/speech/v1beta1/package-info.java @@ -43,4 +43,4 @@ * * */ -package com.google.cloud.speech.spi.v1beta1; +package com.google.cloud.speech.v1beta1; diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/MockSpeech.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java similarity index 97% rename from google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/MockSpeech.java rename to google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java index 4ff1a93edde6..342cb7711c49 100644 --- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/MockSpeech.java +++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeech.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1; +package com.google.cloud.speech.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/MockSpeechImpl.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java similarity index 99% rename from google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/MockSpeechImpl.java rename to google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java index 4192cc102c3a..c57a16a49ca5 100644 --- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/MockSpeechImpl.java +++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/MockSpeechImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1; +package com.google.cloud.speech.v1; import com.google.cloud.speech.v1.LongRunningRecognizeRequest; import com.google.cloud.speech.v1.RecognizeRequest; diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/SpeechClientTest.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java similarity index 94% rename from google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/SpeechClientTest.java rename to google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java index 803db8baec74..e0c20f0b0ff9 100644 --- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1/SpeechClientTest.java +++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1/SpeechClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1; +package com.google.cloud.speech.v1; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; @@ -22,15 +22,6 @@ import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.grpc.testing.MockStreamObserver; -import com.google.cloud.speech.v1.LongRunningRecognizeRequest; -import com.google.cloud.speech.v1.LongRunningRecognizeResponse; -import com.google.cloud.speech.v1.RecognitionAudio; -import com.google.cloud.speech.v1.RecognitionConfig; -import com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding; -import com.google.cloud.speech.v1.RecognizeRequest; -import com.google.cloud.speech.v1.RecognizeResponse; -import com.google.cloud.speech.v1.StreamingRecognizeRequest; -import com.google.cloud.speech.v1.StreamingRecognizeResponse; import com.google.longrunning.Operation; import com.google.protobuf.Any; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java similarity index 97% rename from google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java rename to google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java index 32571cd851f9..dc4af8783646 100644 --- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeech.java +++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeech.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1beta1; +package com.google.cloud.speech.v1beta1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeechImpl.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java similarity index 98% rename from google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeechImpl.java rename to google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java index 91872165fbb9..0e5b24c7a510 100644 --- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/MockSpeechImpl.java +++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/MockSpeechImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1beta1; +package com.google.cloud.speech.v1beta1; import com.google.cloud.speech.v1beta1.AsyncRecognizeRequest; import com.google.cloud.speech.v1beta1.SpeechGrpc.SpeechImplBase; diff --git a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java similarity index 93% rename from google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java rename to google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java index 0dfc6cecddc4..5a14d07eb172 100644 --- a/google-cloud-speech/src/test/java/com/google/cloud/speech/spi/v1beta1/SpeechClientTest.java +++ b/google-cloud-speech/src/test/java/com/google/cloud/speech/v1beta1/SpeechClientTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.speech.spi.v1beta1; +package com.google.cloud.speech.v1beta1; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; @@ -22,15 +22,6 @@ import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; import com.google.api.gax.grpc.testing.MockStreamObserver; -import com.google.cloud.speech.v1beta1.AsyncRecognizeRequest; -import com.google.cloud.speech.v1beta1.AsyncRecognizeResponse; -import com.google.cloud.speech.v1beta1.RecognitionAudio; -import com.google.cloud.speech.v1beta1.RecognitionConfig; -import com.google.cloud.speech.v1beta1.RecognitionConfig.AudioEncoding; -import com.google.cloud.speech.v1beta1.StreamingRecognizeRequest; -import com.google.cloud.speech.v1beta1.StreamingRecognizeResponse; -import com.google.cloud.speech.v1beta1.SyncRecognizeRequest; -import com.google.cloud.speech.v1beta1.SyncRecognizeResponse; import com.google.longrunning.Operation; import com.google.protobuf.Any; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/PagedResponseWrappers.java similarity index 99% rename from google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java rename to google-cloud-trace/src/main/java/com/google/cloud/trace/v1/PagedResponseWrappers.java index 39b5a1e8cfdd..751d54cb9e68 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/PagedResponseWrappers.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.trace.spi.v1; +package com.google.cloud.trace.v1; import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java similarity index 99% rename from google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java rename to google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java index 2e95856199c3..30503884fb93 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceClient.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceClient.java @@ -13,15 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.trace.spi.v1; - -import static com.google.cloud.trace.spi.v1.PagedResponseWrappers.ListTracesPagedResponse; +package com.google.cloud.trace.v1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.ClientContext; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; +import com.google.cloud.trace.v1.PagedResponseWrappers.ListTracesPagedResponse; import com.google.devtools.cloudtrace.v1.GetTraceRequest; import com.google.devtools.cloudtrace.v1.ListTracesRequest; import com.google.devtools.cloudtrace.v1.ListTracesResponse; diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java similarity index 99% rename from google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java rename to google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java index 639133410fc0..8b208312e8d7 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/TraceServiceSettings.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/TraceServiceSettings.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.trace.spi.v1; +package com.google.cloud.trace.v1; -import static com.google.cloud.trace.spi.v1.PagedResponseWrappers.ListTracesPagedResponse; +import static com.google.cloud.trace.v1.PagedResponseWrappers.ListTracesPagedResponse; import com.google.api.core.ApiFuture; import com.google.api.core.BetaApi; diff --git a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/package-info.java b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java similarity index 97% rename from google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/package-info.java rename to google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java index 162962740bce..8af37e382d95 100644 --- a/google-cloud-trace/src/main/java/com/google/cloud/trace/spi/v1/package-info.java +++ b/google-cloud-trace/src/main/java/com/google/cloud/trace/v1/package-info.java @@ -38,4 +38,4 @@ * * */ -package com.google.cloud.trace.spi.v1; +package com.google.cloud.trace.v1; diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java similarity index 97% rename from google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java rename to google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java index 2fc87887a55c..4d17d97642da 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceService.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.trace.spi.v1; +package com.google.cloud.trace.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceServiceImpl.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java similarity index 98% rename from google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceServiceImpl.java rename to google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java index 1871f21a1db8..3ce11269689c 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/MockTraceServiceImpl.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/MockTraceServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.trace.spi.v1; +package com.google.cloud.trace.v1; import com.google.devtools.cloudtrace.v1.GetTraceRequest; import com.google.devtools.cloudtrace.v1.ListTracesRequest; diff --git a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java similarity index 98% rename from google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java rename to google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java index 2b71fb3acd85..058f8ffec425 100644 --- a/google-cloud-trace/src/test/java/com/google/cloud/trace/spi/v1/TraceServiceClientTest.java +++ b/google-cloud-trace/src/test/java/com/google/cloud/trace/v1/TraceServiceClientTest.java @@ -13,14 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.trace.spi.v1; - -import static com.google.cloud.trace.spi.v1.PagedResponseWrappers.ListTracesPagedResponse; +package com.google.cloud.trace.v1; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; +import com.google.cloud.trace.v1.PagedResponseWrappers.ListTracesPagedResponse; import com.google.common.collect.Lists; import com.google.devtools.cloudtrace.v1.GetTraceRequest; import com.google.devtools.cloudtrace.v1.ListTracesRequest; diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceClient.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java similarity index 97% rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceClient.java rename to google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java index 222c46c31ef1..e94d6bdc5465 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceClient.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.videointelligence.spi.v1beta1; +package com.google.cloud.videointelligence.v1beta1; import com.google.api.core.BetaApi; import com.google.api.gax.core.FixedCredentialsProvider; @@ -25,10 +25,6 @@ import com.google.api.gax.grpc.OperationFuture; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; -import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest; -import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse; -import com.google.cloud.videointelligence.v1beta1.Feature; -import com.google.cloud.videointelligence.v1beta1.VideoContext; import com.google.longrunning.Operation; import com.google.longrunning.OperationsClient; import com.google.longrunning.OperationsSettings; diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceSettings.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java similarity index 98% rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceSettings.java rename to google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java index 401eaae1b09a..f13b536b25b7 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceSettings.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.videointelligence.spi.v1beta1; +package com.google.cloud.videointelligence.v1beta1; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; @@ -27,8 +27,6 @@ import com.google.api.gax.grpc.OperationCallSettings; import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest; -import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/package-info.java b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java similarity index 96% rename from google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/package-info.java rename to google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java index c58436c6a0ec..72e3610541b0 100644 --- a/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/spi/v1beta1/package-info.java +++ b/google-cloud-video-intelligence/src/main/java/com/google/cloud/videointelligence/v1beta1/package-info.java @@ -38,4 +38,4 @@ * * */ -package com.google.cloud.videointelligence.spi.v1beta1; +package com.google.cloud.videointelligence.v1beta1; diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/MockVideoIntelligenceService.java b/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java similarity index 96% rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/MockVideoIntelligenceService.java rename to google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java index 5180c5ab9fb2..70c564125d5e 100644 --- a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/MockVideoIntelligenceService.java +++ b/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.videointelligence.spi.v1beta1; +package com.google.cloud.videointelligence.v1beta1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/MockVideoIntelligenceServiceImpl.java b/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java similarity index 97% rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/MockVideoIntelligenceServiceImpl.java rename to google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java index 6bc6cefc8a87..257bc9310782 100644 --- a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/MockVideoIntelligenceServiceImpl.java +++ b/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/MockVideoIntelligenceServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.videointelligence.spi.v1beta1; +package com.google.cloud.videointelligence.v1beta1; import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest; import com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceGrpc.VideoIntelligenceServiceImplBase; diff --git a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceClientTest.java b/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java similarity index 93% rename from google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceClientTest.java rename to google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java index 9687a0a811ba..bc25270fc586 100644 --- a/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/spi/v1beta1/VideoIntelligenceServiceClientTest.java +++ b/google-cloud-video-intelligence/src/test/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceClientTest.java @@ -13,16 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.videointelligence.spi.v1beta1; +package com.google.cloud.videointelligence.v1beta1; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; -import com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest; -import com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse; -import com.google.cloud.videointelligence.v1beta1.Feature; -import com.google.cloud.videointelligence.v1beta1.VideoContext; import com.google.longrunning.Operation; import com.google.protobuf.Any; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorClient.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java similarity index 97% rename from google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorClient.java rename to google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java index 1228cca21b96..b614e020c1c5 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorClient.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorClient.java @@ -13,16 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.vision.v1; import com.google.api.core.BetaApi; import com.google.api.gax.grpc.ChannelAndExecutor; import com.google.api.gax.grpc.ClientContext; import com.google.api.gax.grpc.UnaryCallable; import com.google.auth.Credentials; -import com.google.cloud.vision.v1.AnnotateImageRequest; -import com.google.cloud.vision.v1.BatchAnnotateImagesRequest; -import com.google.cloud.vision.v1.BatchAnnotateImagesResponse; import io.grpc.ManagedChannel; import java.io.Closeable; import java.io.IOException; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java similarity index 98% rename from google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java rename to google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java index 377d2f616529..a6b98447e6cf 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/ImageAnnotatorSettings.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorSettings.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.vision.v1; import com.google.api.core.BetaApi; import com.google.api.gax.core.CredentialsProvider; @@ -27,8 +27,6 @@ import com.google.api.gax.grpc.SimpleCallSettings; import com.google.api.gax.grpc.UnaryCallSettings; import com.google.api.gax.retrying.RetrySettings; -import com.google.cloud.vision.v1.BatchAnnotateImagesRequest; -import com.google.cloud.vision.v1.BatchAnnotateImagesResponse; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; diff --git a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/PagedResponseWrappers.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/PagedResponseWrappers.java similarity index 96% rename from google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/PagedResponseWrappers.java rename to google-cloud-vision/src/main/java/com/google/cloud/vision/v1/PagedResponseWrappers.java index 56c603695b20..ce6434350399 100644 --- a/google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/PagedResponseWrappers.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/PagedResponseWrappers.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.language.spi.v1; +package com.google.cloud.vision.v1; import com.google.protobuf.ExperimentalApi; import javax.annotation.Generated; diff --git a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/package-info.java b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java similarity index 97% rename from google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/package-info.java rename to google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java index ea65fee3e3b4..2bbe9b867beb 100644 --- a/google-cloud-vision/src/main/java/com/google/cloud/vision/spi/v1/package-info.java +++ b/google-cloud-vision/src/main/java/com/google/cloud/vision/v1/package-info.java @@ -36,4 +36,4 @@ * * */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.vision.v1; diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/ImageAnnotatorClientTest.java b/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java similarity index 94% rename from google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/ImageAnnotatorClientTest.java rename to google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java index 0af3a7f45015..11a35a7ff2a3 100644 --- a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/ImageAnnotatorClientTest.java +++ b/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/ImageAnnotatorClientTest.java @@ -13,15 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.vision.v1; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.ApiException; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.api.gax.grpc.testing.MockServiceHelper; -import com.google.cloud.vision.v1.AnnotateImageRequest; -import com.google.cloud.vision.v1.BatchAnnotateImagesRequest; -import com.google.cloud.vision.v1.BatchAnnotateImagesResponse; import com.google.protobuf.GeneratedMessageV3; import io.grpc.Status; import io.grpc.StatusRuntimeException; diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java b/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java similarity index 97% rename from google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java rename to google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java index 8516b243ca79..29f74ef5bda7 100644 --- a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotator.java +++ b/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.vision.v1; import com.google.api.gax.grpc.testing.MockGrpcService; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotatorImpl.java b/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java similarity index 98% rename from google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotatorImpl.java rename to google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java index 2170d56f0cd7..0fe86519ae59 100644 --- a/google-cloud-vision/src/test/java/com/google/cloud/vision/spi/v1/MockImageAnnotatorImpl.java +++ b/google-cloud-vision/src/test/java/com/google/cloud/vision/v1/MockImageAnnotatorImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.cloud.vision.spi.v1; +package com.google.cloud.vision.v1; import com.google.cloud.vision.v1.BatchAnnotateImagesRequest; import com.google.cloud.vision.v1.BatchAnnotateImagesResponse; diff --git a/pom.xml b/pom.xml index 9735f78028cf..6cf348fb9621 100644 --- a/pom.xml +++ b/pom.xml @@ -863,7 +863,7 @@ error true true - com/google/cloud/*/spi/v*/** + com/google/cloud/*/v*/**