Revert "adjust to latest of googleapis"

This reverts commit e93f53c.
googleapis · Jun 26, 2024 · 849dca2 · 849dca2
1 parent e93f53c
commit 849dca2
Show file tree

Hide file tree

Showing 14 changed files with 273 additions and 1,169 deletions.
diff --git a/.repo-metadata.json b/.repo-metadata.json
@@ -1,19 +1,19 @@
 {
   "api_shortname": "pubsub",
   "name_pretty": "Cloud Pub/Sub",
-  "api_reference": "https://cloud.google.com/pubsub/",
   "product_documentation": "https://cloud.google.com/pubsub/docs/",
-  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-pubsub/latest/history",
   "api_description": "is designed to provide reliable, many-to-many, asynchronous messaging between applications. Publisher applications can send messages to a topic and other applications can subscribe to that topic to receive the messages. By decoupling senders and receivers, Google Cloud Pub/Sub allows developers to communicate between independently written applications.",
-  "issue_tracker": "https://issuetracker.google.com/savedsearches/559741",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-pubsub/latest/history",
   "release_level": "stable",
+  "transport": "both",
   "language": "java",
   "repo": "googleapis/java-pubsub",
   "repo_short": "java-pubsub",
   "distribution_name": "com.google.cloud:google-cloud-pubsub",
-  "codeowner_team": "@googleapis/api-pubsub",
   "api_id": "pubsub.googleapis.com",
   "library_type": "GAPIC_COMBO",
   "requires_billing": true,
-  "recommended_package": "com.google.cloud.pubsub.v1"
+  "api_reference": "https://cloud.google.com/pubsub/",
+  "codeowner_team": "@googleapis/api-pubsub",
+  "issue_tracker": "https://issuetracker.google.com/savedsearches/559741"
 }
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>26.42.0</version>
+      <version>26.39.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -44,28 +44,28 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-pubsub</artifactId>
-  <version>1.130.1</version>
+  <version>1.129.5</version>
 </dependency>
 
 ```
 
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.42.0')
+implementation platform('com.google.cloud:libraries-bom:26.40.0')
 
 implementation 'com.google.cloud:google-cloud-pubsub'
 ```
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-pubsub:1.130.1'
+implementation 'com.google.cloud:google-cloud-pubsub:1.129.7'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.130.1"
+libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.129.7"
 ```
 <!-- {x-version-update-end} -->
 
@@ -319,6 +319,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-pubsub/tree/m
 
 To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting].
 
+## Transport
+
+Cloud Pub/Sub uses both gRPC and HTTP/JSON for the transport layer.
+
 ## Supported Java Versions
 
 Java 8 or above is required for using this client.
@@ -411,7 +415,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.130.1
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.129.7
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

diff --git a/proto-google-cloud-pubsub-v1/pom.xml b/proto-google-cloud-pubsub-v1/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-pubsub-v1</artifactId>
-  <version>1.113.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
+  <version>1.111.7-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
   <name>proto-google-cloud-pubsub-v1</name>
   <description>PROTO library for proto-google-cloud-pubsub-v1</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-pubsub-parent</artifactId>
-    <version>1.131.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
+    <version>1.129.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java
@@ -41,7 +41,6 @@ private BigQueryConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder
   private BigQueryConfig() {
     table_ = "";
     state_ = 0;
-    serviceAccountEmail_ = "";
   }
 
   @java.lang.Override
@@ -478,67 +477,6 @@ public boolean getUseTableSchema() {
     return useTableSchema_;
   }
 
-  public static final int SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER = 7;
-
-  @SuppressWarnings("serial")
-  private volatile java.lang.Object serviceAccountEmail_ = "";
-  /**
-   *
-   *
-   * <pre>
-   * Optional. The service account to use to write to BigQuery. The subscription
-   * creator or updater that specifies this field must have
-   * `iam.serviceAccounts.actAs` permission on the service account. If not
-   * specified, the Pub/Sub [service
-   * agent](https://cloud.google.com/iam/docs/service-agents),
-   * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-   * </pre>
-   *
-   * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-   *
-   * @return The serviceAccountEmail.
-   */
-  @java.lang.Override
-  public java.lang.String getServiceAccountEmail() {
-    java.lang.Object ref = serviceAccountEmail_;
-    if (ref instanceof java.lang.String) {
-      return (java.lang.String) ref;
-    } else {
-      com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-      java.lang.String s = bs.toStringUtf8();
-      serviceAccountEmail_ = s;
-      return s;
-    }
-  }
-  /**
-   *
-   *
-   * <pre>
-   * Optional. The service account to use to write to BigQuery. The subscription
-   * creator or updater that specifies this field must have
-   * `iam.serviceAccounts.actAs` permission on the service account. If not
-   * specified, the Pub/Sub [service
-   * agent](https://cloud.google.com/iam/docs/service-agents),
-   * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-   * </pre>
-   *
-   * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-   *
-   * @return The bytes for serviceAccountEmail.
-   */
-  @java.lang.Override
-  public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
-    java.lang.Object ref = serviceAccountEmail_;
-    if (ref instanceof java.lang.String) {
-      com.google.protobuf.ByteString b =
-          com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-      serviceAccountEmail_ = b;
-      return b;
-    } else {
-      return (com.google.protobuf.ByteString) ref;
-    }
-  }
-
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -571,9 +509,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (useTableSchema_ != false) {
       output.writeBool(6, useTableSchema_);
     }
-    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
-      com.google.protobuf.GeneratedMessageV3.writeString(output, 7, serviceAccountEmail_);
-    }
     getUnknownFields().writeTo(output);
   }
 
@@ -601,9 +536,6 @@ public int getSerializedSize() {
     if (useTableSchema_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, useTableSchema_);
     }
-    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
-      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, serviceAccountEmail_);
-    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -625,7 +557,6 @@ public boolean equals(final java.lang.Object obj) {
     if (getDropUnknownFields() != other.getDropUnknownFields()) return false;
     if (state_ != other.state_) return false;
     if (getUseTableSchema() != other.getUseTableSchema()) return false;
-    if (!getServiceAccountEmail().equals(other.getServiceAccountEmail())) return false;
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -649,8 +580,6 @@ public int hashCode() {
     hash = (53 * hash) + state_;
     hash = (37 * hash) + USE_TABLE_SCHEMA_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUseTableSchema());
-    hash = (37 * hash) + SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER;
-    hash = (53 * hash) + getServiceAccountEmail().hashCode();
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -795,7 +724,6 @@ public Builder clear() {
       dropUnknownFields_ = false;
       state_ = 0;
       useTableSchema_ = false;
-      serviceAccountEmail_ = "";
       return this;
     }
 
@@ -849,9 +777,6 @@ private void buildPartial0(com.google.pubsub.v1.BigQueryConfig result) {
       if (((from_bitField0_ & 0x00000020) != 0)) {
         result.useTableSchema_ = useTableSchema_;
       }
-      if (((from_bitField0_ & 0x00000040) != 0)) {
-        result.serviceAccountEmail_ = serviceAccountEmail_;
-      }
     }
 
     @java.lang.Override
@@ -919,11 +844,6 @@ public Builder mergeFrom(com.google.pubsub.v1.BigQueryConfig other) {
       if (other.getUseTableSchema() != false) {
         setUseTableSchema(other.getUseTableSchema());
       }
-      if (!other.getServiceAccountEmail().isEmpty()) {
-        serviceAccountEmail_ = other.serviceAccountEmail_;
-        bitField0_ |= 0x00000040;
-        onChanged();
-      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -986,12 +906,6 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000020;
                 break;
               } // case 48
-            case 58:
-              {
-                serviceAccountEmail_ = input.readStringRequireUtf8();
-                bitField0_ |= 0x00000040;
-                break;
-              } // case 58
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1475,137 +1389,6 @@ public Builder clearUseTableSchema() {
       return this;
     }
 
-    private java.lang.Object serviceAccountEmail_ = "";
-    /**
-     *
-     *
-     * <pre>
-     * Optional. The service account to use to write to BigQuery. The subscription
-     * creator or updater that specifies this field must have
-     * `iam.serviceAccounts.actAs` permission on the service account. If not
-     * specified, the Pub/Sub [service
-     * agent](https://cloud.google.com/iam/docs/service-agents),
-     * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-     * </pre>
-     *
-     * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-     *
-     * @return The serviceAccountEmail.
-     */
-    public java.lang.String getServiceAccountEmail() {
-      java.lang.Object ref = serviceAccountEmail_;
-      if (!(ref instanceof java.lang.String)) {
-        com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
-        java.lang.String s = bs.toStringUtf8();
-        serviceAccountEmail_ = s;
-        return s;
-      } else {
-        return (java.lang.String) ref;
-      }
-    }
-    /**
-     *
-     *
-     * <pre>
-     * Optional. The service account to use to write to BigQuery. The subscription
-     * creator or updater that specifies this field must have
-     * `iam.serviceAccounts.actAs` permission on the service account. If not
-     * specified, the Pub/Sub [service
-     * agent](https://cloud.google.com/iam/docs/service-agents),
-     * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-     * </pre>
-     *
-     * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-     *
-     * @return The bytes for serviceAccountEmail.
-     */
-    public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
-      java.lang.Object ref = serviceAccountEmail_;
-      if (ref instanceof String) {
-        com.google.protobuf.ByteString b =
-            com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
-        serviceAccountEmail_ = b;
-        return b;
-      } else {
-        return (com.google.protobuf.ByteString) ref;
-      }
-    }
-    /**
-     *
-     *
-     * <pre>
-     * Optional. The service account to use to write to BigQuery. The subscription
-     * creator or updater that specifies this field must have
-     * `iam.serviceAccounts.actAs` permission on the service account. If not
-     * specified, the Pub/Sub [service
-     * agent](https://cloud.google.com/iam/docs/service-agents),
-     * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-     * </pre>
-     *
-     * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-     *
-     * @param value The serviceAccountEmail to set.
-     * @return This builder for chaining.
-     */
-    public Builder setServiceAccountEmail(java.lang.String value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      serviceAccountEmail_ = value;
-      bitField0_ |= 0x00000040;
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * <pre>
-     * Optional. The service account to use to write to BigQuery. The subscription
-     * creator or updater that specifies this field must have
-     * `iam.serviceAccounts.actAs` permission on the service account. If not
-     * specified, the Pub/Sub [service
-     * agent](https://cloud.google.com/iam/docs/service-agents),
-     * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-     * </pre>
-     *
-     * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-     *
-     * @return This builder for chaining.
-     */
-    public Builder clearServiceAccountEmail() {
-      serviceAccountEmail_ = getDefaultInstance().getServiceAccountEmail();
-      bitField0_ = (bitField0_ & ~0x00000040);
-      onChanged();
-      return this;
-    }
-    /**
-     *
-     *
-     * <pre>
-     * Optional. The service account to use to write to BigQuery. The subscription
-     * creator or updater that specifies this field must have
-     * `iam.serviceAccounts.actAs` permission on the service account. If not
-     * specified, the Pub/Sub [service
-     * agent](https://cloud.google.com/iam/docs/service-agents),
-     * service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
-     * </pre>
-     *
-     * <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
-     *
-     * @param value The bytes for serviceAccountEmail to set.
-     * @return This builder for chaining.
-     */
-    public Builder setServiceAccountEmailBytes(com.google.protobuf.ByteString value) {
-      if (value == null) {
-        throw new NullPointerException();
-      }
-      checkByteStringIsUtf8(value);
-      serviceAccountEmail_ = value;
-      bitField0_ |= 0x00000040;
-      onChanged();
-      return this;
-    }
-
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);