chore: regenerate merchantapi client (googleapis#23581)

Generated in GitHub action: https://togithub.com/googleapis/googleapis/google-api-java-client-services/actions/workflows/codegen.yaml

Author: yoshi-code-bot

clients/google-api-services-merchantapi/accounts_v1beta/2.0.0/README.md

@@ -22,7 +22,7 @@ Add the following lines to your `pom.xml` file:
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-merchantapi</artifactId>
-      <version>accounts_v1beta-rev20240916-2.0.0</version>
+      <version>accounts_v1beta-rev20240930-2.0.0</version>
     </dependency>
   </dependencies>
 </project>
@@ -35,7 +35,7 @@ repositories {
   mavenCentral()
 }
 dependencies {
-  implementation 'com.google.apis:google-api-services-merchantapi:accounts_v1beta-rev20240916-2.0.0'
+  implementation 'com.google.apis:google-api-services-merchantapi:accounts_v1beta-rev20240930-2.0.0'
 }
 ```
 

clients/google-api-services-merchantapi/accounts_v1beta/2.0.0/com/google/api/services/merchantapi/accounts_v1beta/Merchant.java

@@ -257,7 +257,8 @@ public CreateAndConfigure set(String parameterName, Object value) {
     /**
      * Deletes the specified account regardless of its type: standalone, MCA or sub-account. Deleting an
      * MCA leads to the deletion of all of its sub-accounts. Executing this method requires admin
-     * access.
+     * access. The deletion succeeds only if the account does not provide services to any other account
+     * and has no processed offers. You can use the `force` parameter to override this.
      *
      * Create a request for the method "accounts.delete".
      *
@@ -283,7 +284,8 @@ public class Delete extends MerchantRequest<com.google.api.services.merchantapi.
       /**
        * Deletes the specified account regardless of its type: standalone, MCA or sub-account. Deleting
        * an MCA leads to the deletion of all of its sub-accounts. Executing this method requires admin
-       * access.
+       * access. The deletion succeeds only if the account does not provide services to any other
+       * account and has no processed offers. You can use the `force` parameter to override this.
        *
        * Create a request for the method "accounts.delete".
        *
@@ -382,6 +384,29 @@ public Delete setName(java.lang.String name) {
         return this;
       }
 
+      /**
+       * Optional. If set to `true`, the account is deleted even if it provides services to other
+       * accounts or has processed offers.
+       */
+      @com.google.api.client.util.Key
+      private java.lang.Boolean force;
+
+      /** Optional. If set to `true`, the account is deleted even if it provides services to other accounts
+     or has processed offers.
+       */
+      public java.lang.Boolean getForce() {
+        return force;
+      }
+
+      /**
+       * Optional. If set to `true`, the account is deleted even if it provides services to other
+       * accounts or has processed offers.
+       */
+      public Delete setForce(java.lang.Boolean force) {
+        this.force = force;
+        return this;
+      }
+
       @Override
       public Delete set(String parameterName, Object value) {
         return (Delete) super.set(parameterName, value);
@@ -531,6 +556,7 @@ public Get set(String parameterName, Object value) {
      * Lists accounts accessible to the calling user and matching the constraints of the request such as
      * page size or filters. This is not just listing the sub-accounts of an MCA, but all accounts the
      * calling user has access to including other MCAs, linked accounts, standalone accounts and so on.
+     * If no filter is provided, then it returns accounts the user is directly added to.
      *
      * Create a request for the method "accounts.list".
      *
@@ -553,7 +579,7 @@ public class List extends MerchantRequest<com.google.api.services.merchantapi.ac
        * Lists accounts accessible to the calling user and matching the constraints of the request such
        * as page size or filters. This is not just listing the sub-accounts of an MCA, but all accounts
        * the calling user has access to including other MCAs, linked accounts, standalone accounts and
-       * so on.
+       * so on. If no filter is provided, then it returns accounts the user is directly added to.
        *
        * Create a request for the method "accounts.list".
        *
@@ -3196,35 +3222,28 @@ public List setPageToken(java.lang.String pageToken) {
           return this;
         }
 
-        /** IANA Time Zone Database time zone, e.g. "America/New_York". */
-        @com.google.api.client.util.Key("timeZone.id")
-        private java.lang.String timeZoneId;
-
-        /** IANA Time Zone Database time zone, e.g. "America/New_York".
+        /**
+         * Optional. The [IANA](https://www.iana.org/time-zones) timezone used to localize times in
+         * human-readable fields. For example 'America/Los_Angeles'. If not set,
+         * 'America/Los_Angeles' will be used.
          */
-        public java.lang.String getTimeZoneId() {
-          return timeZoneId;
-        }
-
-        /** IANA Time Zone Database time zone, e.g. "America/New_York". */
-        public List setTimeZoneId(java.lang.String timeZoneId) {
-          this.timeZoneId = timeZoneId;
-          return this;
-        }
-
-        /** Optional. IANA Time Zone Database version number, e.g. "2019a". */
-        @com.google.api.client.util.Key("timeZone.version")
-        private java.lang.String timeZoneVersion;
+        @com.google.api.client.util.Key
+        private java.lang.String timeZone;
 
-        /** Optional. IANA Time Zone Database version number, e.g. "2019a".
+        /** Optional. The [IANA](https://www.iana.org/time-zones) timezone used to localize times in human-
+       readable fields. For example 'America/Los_Angeles'. If not set, 'America/Los_Angeles' will be used.
          */
-        public java.lang.String getTimeZoneVersion() {
-          return timeZoneVersion;
+        public java.lang.String getTimeZone() {
+          return timeZone;
         }
 
-        /** Optional. IANA Time Zone Database version number, e.g. "2019a". */
-        public List setTimeZoneVersion(java.lang.String timeZoneVersion) {
-          this.timeZoneVersion = timeZoneVersion;
+        /**
+         * Optional. The [IANA](https://www.iana.org/time-zones) timezone used to localize times in
+         * human-readable fields. For example 'America/Los_Angeles'. If not set,
+         * 'America/Los_Angeles' will be used.
+         */
+        public List setTimeZone(java.lang.String timeZone) {
+          this.timeZone = timeZone;
           return this;
         }
 
@@ -6956,39 +6975,39 @@ public RetrieveLatest setUploadProtocol(java.lang.String uploadProtocol) {
         return (RetrieveLatest) super.setUploadProtocol(uploadProtocol);
       }
 
-      /** The Kind this terms of service version applies to. */
+      /** Required. The Kind this terms of service version applies to. */
       @com.google.api.client.util.Key
       private java.lang.String kind;
 
-      /** The Kind this terms of service version applies to.
+      /** Required. The Kind this terms of service version applies to.
        */
       public java.lang.String getKind() {
         return kind;
       }
 
-      /** The Kind this terms of service version applies to. */
+      /** Required. The Kind this terms of service version applies to. */
       public RetrieveLatest setKind(java.lang.String kind) {
         this.kind = kind;
         return this;
       }
 
       /**
-       * Region code as defined by [CLDR](https://cldr.unicode.org/). This is either a country when
-       * the ToS applies specifically to that country or 001 when it applies globally.
+       * Required. Region code as defined by [CLDR](https://cldr.unicode.org/). This is either a
+       * country when the ToS applies specifically to that country or 001 when it applies globally.
        */
       @com.google.api.client.util.Key
       private java.lang.String regionCode;
 
-      /** Region code as defined by [CLDR](https://cldr.unicode.org/). This is either a country when the ToS
-     applies specifically to that country or 001 when it applies globally.
+      /** Required. Region code as defined by [CLDR](https://cldr.unicode.org/). This is either a country
+     when the ToS applies specifically to that country or 001 when it applies globally.
        */
       public java.lang.String getRegionCode() {
         return regionCode;
       }
 
       /**
-       * Region code as defined by [CLDR](https://cldr.unicode.org/). This is either a country when
-       * the ToS applies specifically to that country or 001 when it applies globally.
+       * Required. Region code as defined by [CLDR](https://cldr.unicode.org/). This is either a
+       * country when the ToS applies specifically to that country or 001 when it applies globally.
        */
       public RetrieveLatest setRegionCode(java.lang.String regionCode) {
         this.regionCode = regionCode;

clients/google-api-services-merchantapi/accounts_v1beta/2.0.0/com/google/api/services/merchantapi/accounts_v1beta/model/AccountAggregation.java

@@ -0,0 +1,42 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+/*
+ * This code was generated by https://github.com/googleapis/google-api-java-client-services/
+ * Modify at your own risk.
+ */
+
+package com.google.api.services.merchantapi.accounts_v1beta.model;
+
+/**
+ * `AccountAggregation` payload.
+ *
+ * <p> This is the Java data model class that specifies how to parse/serialize into the JSON that is
+ * transmitted over HTTP when working with the Merchant API. For a detailed explanation see:
+ * <a href="https://developers.google.com/api-client-library/java/google-http-java-client/json">https://developers.google.com/api-client-library/java/google-http-java-client/json</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+@SuppressWarnings("javadoc")
+public final class AccountAggregation extends com.google.api.client.json.GenericJson {
+
+  @Override
+  public AccountAggregation set(String fieldName, Object value) {
+    return (AccountAggregation) super.set(fieldName, value);
+  }
+
+  @Override
+  public AccountAggregation clone() {
+    return (AccountAggregation) super.clone();
+  }
+
+}

clients/google-api-services-merchantapi/accounts_v1beta/2.0.0/com/google/api/services/merchantapi/accounts_v1beta/model/AddAccountService.java

@@ -30,11 +30,12 @@
 public final class AddAccountService extends com.google.api.client.json.GenericJson {
 
   /**
-   * The provider is an aggregator for the account.
+   * The provider is an [aggregator](https://support.google.com/merchants/answer/188487) for the
+   * account. Payload for service type Account Aggregation.
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
-  private Empty accountAggregation;
+  private AccountAggregation accountAggregation;
 
   /**
    * Optional. The provider of the service. Format: `accounts/{account}`
@@ -44,18 +45,20 @@ public final class AddAccountService extends com.google.api.client.json.GenericJ
   private java.lang.String provider;
 
   /**
-   * The provider is an aggregator for the account.
+   * The provider is an [aggregator](https://support.google.com/merchants/answer/188487) for the
+   * account. Payload for service type Account Aggregation.
    * @return value or {@code null} for none
    */
-  public Empty getAccountAggregation() {
+  public AccountAggregation getAccountAggregation() {
     return accountAggregation;
   }
 
   /**
-   * The provider is an aggregator for the account.
+   * The provider is an [aggregator](https://support.google.com/merchants/answer/188487) for the
+   * account. Payload for service type Account Aggregation.
    * @param accountAggregation accountAggregation or {@code null} for none
    */
-  public AddAccountService setAccountAggregation(Empty accountAggregation) {
+  public AddAccountService setAccountAggregation(AccountAggregation accountAggregation) {
     this.accountAggregation = accountAggregation;
     return this;
   }

clients/google-api-services-merchantapi/accounts_v1beta/2.0.0/com/google/api/services/merchantapi/accounts_v1beta/model/CreateAndConfigureAccountRequest.java

@@ -46,8 +46,9 @@ public final class CreateAndConfigureAccountRequest extends com.google.api.clien
   /**
    * Required. An account service between the account to be created and the provider account is
    * initialized as part of the creation. At least one such service needs to be provided. Currently
-   * only `account_aggregation` is supported which means the newly created account will be a
-   * subaccount of the provider defined in the `account_aggregation` service.
+   * exactly one of these needs to be `account_aggregation`, which means you can only create sub
+   * accounts, not standalone account through this method. Additional `account_management` or
+   * `product_management` services may be provided.
    * The value may be {@code null}.
    */
   @com.google.api.client.util.Key
@@ -103,8 +104,9 @@ public CreateAndConfigureAccountRequest setAccount(Account account) {
   /**
    * Required. An account service between the account to be created and the provider account is
    * initialized as part of the creation. At least one such service needs to be provided. Currently
-   * only `account_aggregation` is supported which means the newly created account will be a
-   * subaccount of the provider defined in the `account_aggregation` service.
+   * exactly one of these needs to be `account_aggregation`, which means you can only create sub
+   * accounts, not standalone account through this method. Additional `account_management` or
+   * `product_management` services may be provided.
    * @return value or {@code null} for none
    */
   public java.util.List<AddAccountService> getService() {
@@ -114,8 +116,9 @@ public java.util.List<AddAccountService> getService() {
   /**
    * Required. An account service between the account to be created and the provider account is
    * initialized as part of the creation. At least one such service needs to be provided. Currently
-   * only `account_aggregation` is supported which means the newly created account will be a
-   * subaccount of the provider defined in the `account_aggregation` service.
+   * exactly one of these needs to be `account_aggregation`, which means you can only create sub
+   * accounts, not standalone account through this method. Additional `account_management` or
+   * `product_management` services may be provided.
    * @param service service or {@code null} for none
    */
   public CreateAndConfigureAccountRequest setService(java.util.List<AddAccountService> service) {

clients/google-api-services-merchantapi/accounts_v1beta/2.0.0/pom.xml

@@ -8,8 +8,8 @@
 
   <groupId>com.google.apis</groupId>
   <artifactId>google-api-services-merchantapi</artifactId>
-  <version>accounts_v1beta-rev20240916-2.0.0</version>
-  <name>Merchant API accounts_v1beta-rev20240916-2.0.0</name>
+  <version>accounts_v1beta-rev20240930-2.0.0</version>
+  <name>Merchant API accounts_v1beta-rev20240930-2.0.0</name>
   <packaging>jar</packaging>
 
   <inceptionYear>2011</inceptionYear>

clients/google-api-services-merchantapi/accounts_v1beta/README.md

@@ -22,7 +22,7 @@ Add the following lines to your `pom.xml` file:
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-merchantapi</artifactId>
-      <version>accounts_v1beta-rev20240916-2.0.0</version>
+      <version>accounts_v1beta-rev20240930-2.0.0</version>
     </dependency>
   </dependencies>
 </project>
@@ -35,7 +35,7 @@ repositories {
   mavenCentral()
 }
 dependencies {
-  implementation 'com.google.apis:google-api-services-merchantapi:accounts_v1beta-rev20240916-2.0.0'
+  implementation 'com.google.apis:google-api-services-merchantapi:accounts_v1beta-rev20240930-2.0.0'
 }
 ```
 

clients/google-api-services-merchantapi/conversions_v1beta/2.0.0/README.md

@@ -22,7 +22,7 @@ Add the following lines to your `pom.xml` file:
     <dependency>
       <groupId>com.google.apis</groupId>
       <artifactId>google-api-services-merchantapi</artifactId>
-      <version>conversions_v1beta-rev20240827-2.0.0</version>
+      <version>conversions_v1beta-rev20241001-2.0.0</version>
     </dependency>
   </dependencies>
 </project>
@@ -35,7 +35,7 @@ repositories {
   mavenCentral()
 }
 dependencies {
-  implementation 'com.google.apis:google-api-services-merchantapi:conversions_v1beta-rev20240827-2.0.0'
+  implementation 'com.google.apis:google-api-services-merchantapi:conversions_v1beta-rev20241001-2.0.0'
 }
 ```
 

clients/google-api-services-merchantapi/conversions_v1beta/2.0.0/com/google/api/services/merchantapi/conversions_v1beta/Merchant.java

@@ -461,7 +461,7 @@ public Delete set(String parameterName, Object value) {
        * parameters, call the {@link Get#execute()} method to invoke the remote operation.
        *
        * @param name Required. The name of the conversion source to be fetched. Format:
-       *        accounts/{account}/conversionsources/{conversion_source}
+       *        accounts/{account}/conversionSources/{conversion_source}
        * @return the request
        */
       public Get get(java.lang.String name) throws java.io.IOException {
@@ -488,7 +488,7 @@ public class Get extends MerchantRequest<com.google.api.services.merchantapi.con
          * must be called to initialize this instance immediately after invoking the constructor. </p>
          *
          * @param name Required. The name of the conversion source to be fetched. Format:
-       *        accounts/{account}/conversionsources/{conversion_source}
+       *        accounts/{account}/conversionSources/{conversion_source}
          * @since 1.13
          */
         protected Get(java.lang.String name) {
@@ -568,21 +568,21 @@ public Get setUploadProtocol(java.lang.String uploadProtocol) {
 
         /**
          * Required. The name of the conversion source to be fetched. Format:
-         * accounts/{account}/conversionsources/{conversion_source}
+         * accounts/{account}/conversionSources/{conversion_source}
          */
         @com.google.api.client.util.Key
         private java.lang.String name;
 
         /** Required. The name of the conversion source to be fetched. Format:
-       accounts/{account}/conversionsources/{conversion_source}
+       accounts/{account}/conversionSources/{conversion_source}
          */
         public java.lang.String getName() {
           return name;
         }
 
         /**
          * Required. The name of the conversion source to be fetched. Format:
-         * accounts/{account}/conversionsources/{conversion_source}
+         * accounts/{account}/conversionSources/{conversion_source}
          */
         public Get setName(java.lang.String name) {
           if (!getSuppressPatternChecks()) {