feat: re-generate merchant inventories under new directory (#9901)

* feat: re-generate merchant inventories under new directory * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
googleapis · Sep 27, 2023 · f26705e · f26705e
1 parent 140047e
commit f26705e
Show file tree

Hide file tree

Showing 102 changed files with 25 additions and 25 deletions.
diff --git a/java-merchantapi/.OwlBot.yaml → ...hopping-merchant-inventories/.OwlBot.yaml b/java-merchantapi/.OwlBot.yaml → ...hopping-merchant-inventories/.OwlBot.yaml
@@ -14,23 +14,23 @@
 
 
 deep-remove-regex:
-- "/java-merchantapi/grpc-google-.*/src"
-- "/java-merchantapi/proto-google-.*/src"
-- "/java-merchantapi/google-.*/src"
-- "/java-merchantapi/samples/snippets/generated"
+- "/java-shopping-merchant-inventories/grpc-google-.*/src"
+- "/java-shopping-merchant-inventories/proto-google-.*/src"
+- "/java-shopping-merchant-inventories/google-.*/src"
+- "/java-shopping-merchant-inventories/samples/snippets/generated"
 
 deep-preserve-regex:
-- "/java-merchantapi/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
+- "/java-shopping-merchant-inventories/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
 
 deep-copy-regex:
 - source: "/google/shopping/merchant/inventories/(v.*)/.*-java/proto-google-.*/src"
-  dest: "/owl-bot-staging/java-merchantapi/$1/proto-google-shopping-merchant-inventories-$1/src"
+  dest: "/owl-bot-staging/java-shopping-merchant-inventories/$1/proto-google-shopping-merchant-inventories-$1/src"
 - source: "/google/shopping/merchant/inventories/(v.*)/.*-java/grpc-google-.*/src"
-  dest: "/owl-bot-staging/java-merchantapi/$1/grpc-google-shopping-merchant-inventories-$1/src"
+  dest: "/owl-bot-staging/java-shopping-merchant-inventories/$1/grpc-google-shopping-merchant-inventories-$1/src"
 - source: "/google/shopping/merchant/inventories/(v.*)/.*-java/gapic-google-.*/src"
-  dest: "/owl-bot-staging/java-merchantapi/$1/google-shopping-merchant-inventories/src"
+  dest: "/owl-bot-staging/java-shopping-merchant-inventories/$1/google-shopping-merchant-inventories/src"
 - source: "/google/shopping/merchant/inventories/(v.*)/.*-java/samples/snippets/generated"
-  dest: "/owl-bot-staging/java-merchantapi/$1/samples/snippets/generated"
+  dest: "/owl-bot-staging/java-shopping-merchant-inventories/$1/samples/snippets/generated"
 
 
 api-name: merchantapi
diff --git a/java-merchantapi/.repo-metadata.json → ...-merchant-inventories/.repo-metadata.json b/java-merchantapi/.repo-metadata.json → ...-merchant-inventories/.repo-metadata.json
@@ -7,8 +7,8 @@
   "release_level": "preview",
   "transport": "grpc",
   "language": "java",
-  "repo": "googleapis/java-merchantapi",
-  "repo_short": "java-merchantapi",
+  "repo": "googleapis/java-shopping-merchant-inventories",
+  "repo_short": "java-shopping-merchant-inventories",
   "distribution_name": "com.google.shopping:google-shopping-merchant-inventories",
   "api_id": "merchantapi.googleapis.com",
   "library_type": "GAPIC_AUTO",

diff --git a/java-merchantapi/README.md → java-shopping-merchant-inventories/README.md b/java-merchantapi/README.md → java-shopping-merchant-inventories/README.md
@@ -189,16 +189,16 @@ Java is a registered trademark of Oracle and/or its affiliates.
 
 [product-docs]: https://developers.google.com/merchant/api
 [javadocs]: https://cloud.google.com/java/docs/reference/google-shopping-merchant-inventories/latest/overview
-[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java7.svg
-[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java7.html
-[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java8.svg
-[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java8.html
-[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java8-osx.svg
-[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java8-osx.html
-[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java8-win.svg
-[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java8-win.html
-[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java11.svg
-[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-merchantapi/java11.html
+[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java7.svg
+[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java7.html
+[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java8.svg
+[kokoro-badge-link-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java8.html
+[kokoro-badge-image-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java8-osx.svg
+[kokoro-badge-link-3]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java8-osx.html
+[kokoro-badge-image-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java8-win.svg
+[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java8-win.html
+[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java11.svg
+[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-shopping-merchant-inventories/java11.html
 [stability-image]: https://img.shields.io/badge/stability-preview-yellow
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.shopping/google-shopping-merchant-inventories.svg
 [maven-version-link]: https://central.sonatype.com/artifact/com.google.shopping/google-shopping-merchant-inventories/0.0.0
@@ -210,9 +210,9 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects
 [cloud-cli]: https://cloud.google.com/cli
 [troubleshooting]: https://github.com/googleapis/google-cloud-java/blob/main/TROUBLESHOOTING.md
-[contributing]: https://github.com/googleapis/java-merchantapi/blob/main/CONTRIBUTING.md
-[code-of-conduct]: https://github.com/googleapis/java-merchantapi/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
-[license]: https://github.com/googleapis/java-merchantapi/blob/main/LICENSE
+[contributing]: https://github.com/googleapis/java-shopping-merchant-inventories/blob/main/CONTRIBUTING.md
+[code-of-conduct]: https://github.com/googleapis/java-shopping-merchant-inventories/blob/main/CODE_OF_CONDUCT.md#contributor-code-of-conduct
+[license]: https://github.com/googleapis/java-shopping-merchant-inventories/blob/main/LICENSE
 [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing
 [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=merchantapi.googleapis.com
 [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM

diff --git a/...shopping-merchant-inventories-bom/pom.xml → ...shopping-merchant-inventories-bom/pom.xml b/...shopping-merchant-inventories-bom/pom.xml → ...shopping-merchant-inventories-bom/pom.xml
diff --git a/...gle-shopping-merchant-inventories/pom.xml → ...gle-shopping-merchant-inventories/pom.xml b/...gle-shopping-merchant-inventories/pom.xml → ...gle-shopping-merchant-inventories/pom.xml
diff --git a/...s/v1beta/LocalInventoryServiceClient.java → ...s/v1beta/LocalInventoryServiceClient.java b/...s/v1beta/LocalInventoryServiceClient.java → ...s/v1beta/LocalInventoryServiceClient.java
diff --git a/...v1beta/LocalInventoryServiceSettings.java → ...v1beta/LocalInventoryServiceSettings.java b/...v1beta/LocalInventoryServiceSettings.java → ...v1beta/LocalInventoryServiceSettings.java
diff --git a/...1beta/RegionalInventoryServiceClient.java → ...1beta/RegionalInventoryServiceClient.java b/...1beta/RegionalInventoryServiceClient.java → ...1beta/RegionalInventoryServiceClient.java
diff --git a/...eta/RegionalInventoryServiceSettings.java → ...eta/RegionalInventoryServiceSettings.java b/...eta/RegionalInventoryServiceSettings.java → ...eta/RegionalInventoryServiceSettings.java
diff --git a/...nt/inventories/v1beta/gapic_metadata.json → ...nt/inventories/v1beta/gapic_metadata.json b/...nt/inventories/v1beta/gapic_metadata.json → ...nt/inventories/v1beta/gapic_metadata.json
diff --git a/...hant/inventories/v1beta/package-info.java → ...hant/inventories/v1beta/package-info.java b/...hant/inventories/v1beta/package-info.java → ...hant/inventories/v1beta/package-info.java
diff --git a/...LocalInventoryServiceCallableFactory.java → ...LocalInventoryServiceCallableFactory.java b/...LocalInventoryServiceCallableFactory.java → ...LocalInventoryServiceCallableFactory.java
diff --git a/...a/stub/GrpcLocalInventoryServiceStub.java → ...a/stub/GrpcLocalInventoryServiceStub.java b/...a/stub/GrpcLocalInventoryServiceStub.java → ...a/stub/GrpcLocalInventoryServiceStub.java
diff --git a/...ionalInventoryServiceCallableFactory.java → ...ionalInventoryServiceCallableFactory.java b/...ionalInventoryServiceCallableFactory.java → ...ionalInventoryServiceCallableFactory.java
diff --git a/...tub/GrpcRegionalInventoryServiceStub.java → ...tub/GrpcRegionalInventoryServiceStub.java b/...tub/GrpcRegionalInventoryServiceStub.java → ...tub/GrpcRegionalInventoryServiceStub.java
diff --git a/...LocalInventoryServiceCallableFactory.java → ...LocalInventoryServiceCallableFactory.java b/...LocalInventoryServiceCallableFactory.java → ...LocalInventoryServiceCallableFactory.java
diff --git a/...ub/HttpJsonLocalInventoryServiceStub.java → ...ub/HttpJsonLocalInventoryServiceStub.java b/...ub/HttpJsonLocalInventoryServiceStub.java → ...ub/HttpJsonLocalInventoryServiceStub.java
diff --git a/...ionalInventoryServiceCallableFactory.java → ...ionalInventoryServiceCallableFactory.java b/...ionalInventoryServiceCallableFactory.java → ...ionalInventoryServiceCallableFactory.java
diff --git a/...HttpJsonRegionalInventoryServiceStub.java → ...HttpJsonRegionalInventoryServiceStub.java b/...HttpJsonRegionalInventoryServiceStub.java → ...HttpJsonRegionalInventoryServiceStub.java
diff --git a/...1beta/stub/LocalInventoryServiceStub.java → ...1beta/stub/LocalInventoryServiceStub.java b/...1beta/stub/LocalInventoryServiceStub.java → ...1beta/stub/LocalInventoryServiceStub.java
diff --git a/...ub/LocalInventoryServiceStubSettings.java → ...ub/LocalInventoryServiceStubSettings.java b/...ub/LocalInventoryServiceStubSettings.java → ...ub/LocalInventoryServiceStubSettings.java
diff --git a/...ta/stub/RegionalInventoryServiceStub.java → ...ta/stub/RegionalInventoryServiceStub.java b/...ta/stub/RegionalInventoryServiceStub.java → ...ta/stub/RegionalInventoryServiceStub.java
diff --git a/...RegionalInventoryServiceStubSettings.java → ...RegionalInventoryServiceStubSettings.java b/...RegionalInventoryServiceStubSettings.java → ...RegionalInventoryServiceStubSettings.java
diff --git a/...nt.inventories.v1beta/reflect-config.json → ...nt.inventories.v1beta/reflect-config.json b/...nt.inventories.v1beta/reflect-config.json → ...nt.inventories.v1beta/reflect-config.json
diff --git a/...alInventoryServiceClientHttpJsonTest.java → ...alInventoryServiceClientHttpJsonTest.java b/...alInventoryServiceClientHttpJsonTest.java → ...alInventoryServiceClientHttpJsonTest.java
diff --git a/...beta/LocalInventoryServiceClientTest.java → ...beta/LocalInventoryServiceClientTest.java b/...beta/LocalInventoryServiceClientTest.java → ...beta/LocalInventoryServiceClientTest.java
diff --git a/...ies/v1beta/MockLocalInventoryService.java → ...ies/v1beta/MockLocalInventoryService.java b/...ies/v1beta/MockLocalInventoryService.java → ...ies/v1beta/MockLocalInventoryService.java
diff --git a/...v1beta/MockLocalInventoryServiceImpl.java → ...v1beta/MockLocalInventoryServiceImpl.java b/...v1beta/MockLocalInventoryServiceImpl.java → ...v1beta/MockLocalInventoryServiceImpl.java
diff --git a/.../v1beta/MockRegionalInventoryService.java → .../v1beta/MockRegionalInventoryService.java b/.../v1beta/MockRegionalInventoryService.java → .../v1beta/MockRegionalInventoryService.java
diff --git a/...eta/MockRegionalInventoryServiceImpl.java → ...eta/MockRegionalInventoryServiceImpl.java b/...eta/MockRegionalInventoryServiceImpl.java → ...eta/MockRegionalInventoryServiceImpl.java
diff --git a/...alInventoryServiceClientHttpJsonTest.java → ...alInventoryServiceClientHttpJsonTest.java b/...alInventoryServiceClientHttpJsonTest.java → ...alInventoryServiceClientHttpJsonTest.java
diff --git a/...a/RegionalInventoryServiceClientTest.java → ...a/RegionalInventoryServiceClientTest.java b/...a/RegionalInventoryServiceClientTest.java → ...a/RegionalInventoryServiceClientTest.java
diff --git a/...pping-merchant-inventories-v1beta/pom.xml → ...pping-merchant-inventories-v1beta/pom.xml b/...pping-merchant-inventories-v1beta/pom.xml → ...pping-merchant-inventories-v1beta/pom.xml
diff --git a/...ies/v1beta/LocalInventoryServiceGrpc.java → ...ies/v1beta/LocalInventoryServiceGrpc.java b/...ies/v1beta/LocalInventoryServiceGrpc.java → ...ies/v1beta/LocalInventoryServiceGrpc.java
diff --git a/.../v1beta/RegionalInventoryServiceGrpc.java → .../v1beta/RegionalInventoryServiceGrpc.java b/.../v1beta/RegionalInventoryServiceGrpc.java → .../v1beta/RegionalInventoryServiceGrpc.java
diff --git a/java-merchantapi/owlbot.py → java-shopping-merchant-inventories/owlbot.py b/java-merchantapi/owlbot.py → java-shopping-merchant-inventories/owlbot.py
diff --git a/java-merchantapi/pom.xml → java-shopping-merchant-inventories/pom.xml b/java-merchantapi/pom.xml → java-shopping-merchant-inventories/pom.xml
diff --git a/...ries-v1beta/clirr-ignored-differences.xml → ...ries-v1beta/clirr-ignored-differences.xml b/...ries-v1beta/clirr-ignored-differences.xml → ...ries-v1beta/clirr-ignored-differences.xml
diff --git a/...pping-merchant-inventories-v1beta/pom.xml → ...pping-merchant-inventories-v1beta/pom.xml b/...pping-merchant-inventories-v1beta/pom.xml → ...pping-merchant-inventories-v1beta/pom.xml
diff --git a/...s/v1beta/DeleteLocalInventoryRequest.java → ...s/v1beta/DeleteLocalInventoryRequest.java b/...s/v1beta/DeleteLocalInventoryRequest.java → ...s/v1beta/DeleteLocalInventoryRequest.java
diff --git a/...DeleteLocalInventoryRequestOrBuilder.java → ...DeleteLocalInventoryRequestOrBuilder.java b/...DeleteLocalInventoryRequestOrBuilder.java → ...DeleteLocalInventoryRequestOrBuilder.java
diff --git a/...1beta/DeleteRegionalInventoryRequest.java → ...1beta/DeleteRegionalInventoryRequest.java b/...1beta/DeleteRegionalInventoryRequest.java → ...1beta/DeleteRegionalInventoryRequest.java
diff --git a/...eteRegionalInventoryRequestOrBuilder.java → ...eteRegionalInventoryRequestOrBuilder.java b/...eteRegionalInventoryRequestOrBuilder.java → ...eteRegionalInventoryRequestOrBuilder.java
diff --git a/...s/v1beta/InsertLocalInventoryRequest.java → ...s/v1beta/InsertLocalInventoryRequest.java b/...s/v1beta/InsertLocalInventoryRequest.java → ...s/v1beta/InsertLocalInventoryRequest.java
diff --git a/...InsertLocalInventoryRequestOrBuilder.java → ...InsertLocalInventoryRequestOrBuilder.java b/...InsertLocalInventoryRequestOrBuilder.java → ...InsertLocalInventoryRequestOrBuilder.java
diff --git a/...1beta/InsertRegionalInventoryRequest.java → ...1beta/InsertRegionalInventoryRequest.java b/...1beta/InsertRegionalInventoryRequest.java → ...1beta/InsertRegionalInventoryRequest.java
diff --git a/...ertRegionalInventoryRequestOrBuilder.java → ...ertRegionalInventoryRequestOrBuilder.java b/...ertRegionalInventoryRequestOrBuilder.java → ...ertRegionalInventoryRequestOrBuilder.java
diff --git a/...s/v1beta/ListLocalInventoriesRequest.java → ...s/v1beta/ListLocalInventoriesRequest.java b/...s/v1beta/ListLocalInventoriesRequest.java → ...s/v1beta/ListLocalInventoriesRequest.java
diff --git a/...ListLocalInventoriesRequestOrBuilder.java → ...ListLocalInventoriesRequestOrBuilder.java b/...ListLocalInventoriesRequestOrBuilder.java → ...ListLocalInventoriesRequestOrBuilder.java
diff --git a/.../v1beta/ListLocalInventoriesResponse.java → .../v1beta/ListLocalInventoriesResponse.java b/.../v1beta/ListLocalInventoriesResponse.java → .../v1beta/ListLocalInventoriesResponse.java
diff --git a/...istLocalInventoriesResponseOrBuilder.java → ...istLocalInventoriesResponseOrBuilder.java b/...istLocalInventoriesResponseOrBuilder.java → ...istLocalInventoriesResponseOrBuilder.java
diff --git a/...1beta/ListRegionalInventoriesRequest.java → ...1beta/ListRegionalInventoriesRequest.java b/...1beta/ListRegionalInventoriesRequest.java → ...1beta/ListRegionalInventoriesRequest.java
diff --git a/...tRegionalInventoriesRequestOrBuilder.java → ...tRegionalInventoriesRequestOrBuilder.java b/...tRegionalInventoriesRequestOrBuilder.java → ...tRegionalInventoriesRequestOrBuilder.java
diff --git a/...beta/ListRegionalInventoriesResponse.java → ...beta/ListRegionalInventoriesResponse.java b/...beta/ListRegionalInventoriesResponse.java → ...beta/ListRegionalInventoriesResponse.java
diff --git a/...RegionalInventoriesResponseOrBuilder.java → ...RegionalInventoriesResponseOrBuilder.java b/...RegionalInventoriesResponseOrBuilder.java → ...RegionalInventoriesResponseOrBuilder.java
diff --git a/...nt/inventories/v1beta/LocalInventory.java → ...nt/inventories/v1beta/LocalInventory.java b/...nt/inventories/v1beta/LocalInventory.java → ...nt/inventories/v1beta/LocalInventory.java
diff --git a/...nventories/v1beta/LocalInventoryName.java → ...nventories/v1beta/LocalInventoryName.java b/...nventories/v1beta/LocalInventoryName.java → ...nventories/v1beta/LocalInventoryName.java
diff --git a/...ories/v1beta/LocalInventoryOrBuilder.java → ...ories/v1beta/LocalInventoryOrBuilder.java b/...ories/v1beta/LocalInventoryOrBuilder.java → ...ories/v1beta/LocalInventoryOrBuilder.java
diff --git a/...ventories/v1beta/LocalInventoryProto.java → ...ventories/v1beta/LocalInventoryProto.java b/...ventories/v1beta/LocalInventoryProto.java → ...ventories/v1beta/LocalInventoryProto.java
diff --git a/...inventories/v1beta/RegionalInventory.java → ...inventories/v1beta/RegionalInventory.java b/...inventories/v1beta/RegionalInventory.java → ...inventories/v1beta/RegionalInventory.java
diff --git a/...ntories/v1beta/RegionalInventoryName.java → ...ntories/v1beta/RegionalInventoryName.java b/...ntories/v1beta/RegionalInventoryName.java → ...ntories/v1beta/RegionalInventoryName.java
diff --git a/...es/v1beta/RegionalInventoryOrBuilder.java → ...es/v1beta/RegionalInventoryOrBuilder.java b/...es/v1beta/RegionalInventoryOrBuilder.java → ...es/v1beta/RegionalInventoryOrBuilder.java
diff --git a/...tories/v1beta/RegionalInventoryProto.java → ...tories/v1beta/RegionalInventoryProto.java b/...tories/v1beta/RegionalInventoryProto.java → ...tories/v1beta/RegionalInventoryProto.java
diff --git a/...google/shopping/type/CustomAttribute.java → ...google/shopping/type/CustomAttribute.java b/...google/shopping/type/CustomAttribute.java → ...google/shopping/type/CustomAttribute.java
diff --git a/...opping/type/CustomAttributeOrBuilder.java → ...opping/type/CustomAttributeOrBuilder.java b/...opping/type/CustomAttributeOrBuilder.java → ...opping/type/CustomAttributeOrBuilder.java
diff --git a/...com/google/shopping/type/Destination.java → ...com/google/shopping/type/Destination.java b/...com/google/shopping/type/Destination.java → ...com/google/shopping/type/Destination.java
diff --git a/.../java/com/google/shopping/type/Price.java → .../java/com/google/shopping/type/Price.java b/.../java/com/google/shopping/type/Price.java → .../java/com/google/shopping/type/Price.java
diff --git a/.../google/shopping/type/PriceOrBuilder.java → .../google/shopping/type/PriceOrBuilder.java b/.../google/shopping/type/PriceOrBuilder.java → .../google/shopping/type/PriceOrBuilder.java
diff --git a/.../com/google/shopping/type/TypesProto.java → .../com/google/shopping/type/TypesProto.java b/.../com/google/shopping/type/TypesProto.java → .../com/google/shopping/type/TypesProto.java
diff --git a/...t/inventories/v1beta/localinventory.proto → ...t/inventories/v1beta/localinventory.proto b/...t/inventories/v1beta/localinventory.proto → ...t/inventories/v1beta/localinventory.proto
diff --git a/...nventories/v1beta/regionalinventory.proto → ...nventories/v1beta/regionalinventory.proto b/...nventories/v1beta/regionalinventory.proto → ...nventories/v1beta/regionalinventory.proto
diff --git a/...ate/SyncCreateSetCredentialsProvider.java → ...ate/SyncCreateSetCredentialsProvider.java b/...ate/SyncCreateSetCredentialsProvider.java → ...ate/SyncCreateSetCredentialsProvider.java
diff --git a/...te/SyncCreateSetCredentialsProvider1.java → ...te/SyncCreateSetCredentialsProvider1.java b/...te/SyncCreateSetCredentialsProvider1.java → ...te/SyncCreateSetCredentialsProvider1.java
diff --git a/...service/create/SyncCreateSetEndpoint.java → ...service/create/SyncCreateSetEndpoint.java b/...service/create/SyncCreateSetEndpoint.java → ...service/create/SyncCreateSetEndpoint.java
diff --git a/...linventory/AsyncDeleteLocalInventory.java → ...linventory/AsyncDeleteLocalInventory.java b/...linventory/AsyncDeleteLocalInventory.java → ...linventory/AsyncDeleteLocalInventory.java
diff --git a/...alinventory/SyncDeleteLocalInventory.java → ...alinventory/SyncDeleteLocalInventory.java b/...alinventory/SyncDeleteLocalInventory.java → ...alinventory/SyncDeleteLocalInventory.java
diff --git a/...leteLocalInventoryLocalinventoryname.java → ...leteLocalInventoryLocalinventoryname.java b/...leteLocalInventoryLocalinventoryname.java → ...leteLocalInventoryLocalinventoryname.java
diff --git a/...ntory/SyncDeleteLocalInventoryString.java → ...ntory/SyncDeleteLocalInventoryString.java b/...ntory/SyncDeleteLocalInventoryString.java → ...ntory/SyncDeleteLocalInventoryString.java
diff --git a/...linventory/AsyncInsertLocalInventory.java → ...linventory/AsyncInsertLocalInventory.java b/...linventory/AsyncInsertLocalInventory.java → ...linventory/AsyncInsertLocalInventory.java
diff --git a/...alinventory/SyncInsertLocalInventory.java → ...alinventory/SyncInsertLocalInventory.java b/...alinventory/SyncInsertLocalInventory.java → ...alinventory/SyncInsertLocalInventory.java
diff --git a/...nventories/AsyncListLocalInventories.java → ...nventories/AsyncListLocalInventories.java b/...nventories/AsyncListLocalInventories.java → ...nventories/AsyncListLocalInventories.java
diff --git a/...ories/AsyncListLocalInventoriesPaged.java → ...ories/AsyncListLocalInventoriesPaged.java b/...ories/AsyncListLocalInventoriesPaged.java → ...ories/AsyncListLocalInventoriesPaged.java
diff --git a/...inventories/SyncListLocalInventories.java → ...inventories/SyncListLocalInventories.java b/...inventories/SyncListLocalInventories.java → ...inventories/SyncListLocalInventories.java
diff --git a/...ories/SyncListLocalInventoriesString.java → ...ories/SyncListLocalInventoriesString.java b/...ories/SyncListLocalInventoriesString.java → ...ories/SyncListLocalInventoriesString.java
diff --git a/...alinventory/SyncInsertLocalInventory.java → ...alinventory/SyncInsertLocalInventory.java b/...alinventory/SyncInsertLocalInventory.java → ...alinventory/SyncInsertLocalInventory.java
diff --git a/...ate/SyncCreateSetCredentialsProvider.java → ...ate/SyncCreateSetCredentialsProvider.java b/...ate/SyncCreateSetCredentialsProvider.java → ...ate/SyncCreateSetCredentialsProvider.java
diff --git a/...te/SyncCreateSetCredentialsProvider1.java → ...te/SyncCreateSetCredentialsProvider1.java b/...te/SyncCreateSetCredentialsProvider1.java → ...te/SyncCreateSetCredentialsProvider1.java
diff --git a/...service/create/SyncCreateSetEndpoint.java → ...service/create/SyncCreateSetEndpoint.java b/...service/create/SyncCreateSetEndpoint.java → ...service/create/SyncCreateSetEndpoint.java
diff --git a/...ventory/AsyncDeleteRegionalInventory.java → ...ventory/AsyncDeleteRegionalInventory.java b/...ventory/AsyncDeleteRegionalInventory.java → ...ventory/AsyncDeleteRegionalInventory.java
diff --git a/...nventory/SyncDeleteRegionalInventory.java → ...nventory/SyncDeleteRegionalInventory.java b/...nventory/SyncDeleteRegionalInventory.java → ...nventory/SyncDeleteRegionalInventory.java
diff --git a/...gionalInventoryRegionalinventoryname.java → ...gionalInventoryRegionalinventoryname.java b/...gionalInventoryRegionalinventoryname.java → ...gionalInventoryRegionalinventoryname.java
diff --git a/...ry/SyncDeleteRegionalInventoryString.java → ...ry/SyncDeleteRegionalInventoryString.java b/...ry/SyncDeleteRegionalInventoryString.java → ...ry/SyncDeleteRegionalInventoryString.java
diff --git a/...ventory/AsyncInsertRegionalInventory.java → ...ventory/AsyncInsertRegionalInventory.java b/...ventory/AsyncInsertRegionalInventory.java → ...ventory/AsyncInsertRegionalInventory.java
diff --git a/...nventory/SyncInsertRegionalInventory.java → ...nventory/SyncInsertRegionalInventory.java b/...nventory/SyncInsertRegionalInventory.java → ...nventory/SyncInsertRegionalInventory.java
diff --git a/...ntories/AsyncListRegionalInventories.java → ...ntories/AsyncListRegionalInventories.java b/...ntories/AsyncListRegionalInventories.java → ...ntories/AsyncListRegionalInventories.java
diff --git a/...es/AsyncListRegionalInventoriesPaged.java → ...es/AsyncListRegionalInventoriesPaged.java b/...es/AsyncListRegionalInventoriesPaged.java → ...es/AsyncListRegionalInventoriesPaged.java
diff --git a/...entories/SyncListRegionalInventories.java → ...entories/SyncListRegionalInventories.java b/...entories/SyncListRegionalInventories.java → ...entories/SyncListRegionalInventories.java
diff --git a/...es/SyncListRegionalInventoriesString.java → ...es/SyncListRegionalInventoriesString.java b/...es/SyncListRegionalInventoriesString.java → ...es/SyncListRegionalInventoriesString.java
diff --git a/...nventory/SyncInsertRegionalInventory.java → ...nventory/SyncInsertRegionalInventory.java b/...nventory/SyncInsertRegionalInventory.java → ...nventory/SyncInsertRegionalInventory.java
diff --git a/...alinventory/SyncInsertLocalInventory.java → ...alinventory/SyncInsertLocalInventory.java b/...alinventory/SyncInsertLocalInventory.java → ...alinventory/SyncInsertLocalInventory.java
diff --git a/...nventory/SyncInsertRegionalInventory.java → ...nventory/SyncInsertRegionalInventory.java b/...nventory/SyncInsertRegionalInventory.java → ...nventory/SyncInsertRegionalInventory.java
diff --git a/pom.xml b/pom.xml
@@ -111,7 +111,6 @@
     <module>java-maps-routing</module>
     <module>java-mediatranslation</module>
     <module>java-memcache</module>
-    <module>java-merchantapi</module>
     <module>java-migrationcenter</module>
     <module>java-monitoring-dashboards</module>
     <module>java-monitoring-metricsscope</module>
@@ -152,6 +151,7 @@
     <module>java-service-management</module>
     <module>java-service-usage</module>
     <module>java-shell</module>
+    <module>java-shopping-merchant-inventories</module>
     <module>java-shopping-merchant-reports</module>
     <module>java-speech</module>
     <module>java-storageinsights</module>