Skip to content

Commit 7f03e97

Browse files
committedJun 26, 2024
Revert "adjust to latest of googleapis"
This reverts commit e93f53c.
1 parent b6d8a43 commit 7f03e97

14 files changed

+273
-1169
lines changed
 

‎.repo-metadata.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"api_shortname": "pubsub",
33
"name_pretty": "Cloud Pub/Sub",
4-
"api_reference": "https://cloud.google.com/pubsub/",
54
"product_documentation": "https://cloud.google.com/pubsub/docs/",
6-
"client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-pubsub/latest/history",
75
"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.",
8-
"issue_tracker": "https://issuetracker.google.com/savedsearches/559741",
6+
"client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-pubsub/latest/history",
97
"release_level": "stable",
8+
"transport": "both",
109
"language": "java",
1110
"repo": "googleapis/java-pubsub",
1211
"repo_short": "java-pubsub",
1312
"distribution_name": "com.google.cloud:google-cloud-pubsub",
14-
"codeowner_team": "@googleapis/api-pubsub",
1513
"api_id": "pubsub.googleapis.com",
1614
"library_type": "GAPIC_COMBO",
1715
"requires_billing": true,
18-
"recommended_package": "com.google.cloud.pubsub.v1"
16+
"api_reference": "https://cloud.google.com/pubsub/",
17+
"codeowner_team": "@googleapis/api-pubsub",
18+
"issue_tracker": "https://issuetracker.google.com/savedsearches/559741"
1919
}

‎README.md

+10-6
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>libraries-bom</artifactId>
22-
<version>26.42.0</version>
22+
<version>26.39.0</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
@@ -44,28 +44,28 @@ If you are using Maven without the BOM, add this to your dependencies:
4444
<dependency>
4545
<groupId>com.google.cloud</groupId>
4646
<artifactId>google-cloud-pubsub</artifactId>
47-
<version>1.130.1</version>
47+
<version>1.129.5</version>
4848
</dependency>
4949

5050
```
5151

5252
If you are using Gradle 5.x or later, add this to your dependencies:
5353

5454
```Groovy
55-
implementation platform('com.google.cloud:libraries-bom:26.42.0')
55+
implementation platform('com.google.cloud:libraries-bom:26.40.0')
5656
5757
implementation 'com.google.cloud:google-cloud-pubsub'
5858
```
5959
If you are using Gradle without BOM, add this to your dependencies:
6060

6161
```Groovy
62-
implementation 'com.google.cloud:google-cloud-pubsub:1.130.1'
62+
implementation 'com.google.cloud:google-cloud-pubsub:1.129.7'
6363
```
6464

6565
If you are using SBT, add this to your dependencies:
6666

6767
```Scala
68-
libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.130.1"
68+
libraryDependencies += "com.google.cloud" % "google-cloud-pubsub" % "1.129.7"
6969
```
7070
<!-- {x-version-update-end} -->
7171

@@ -319,6 +319,10 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-pubsub/tree/m
319319

320320
To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting].
321321

322+
## Transport
323+
324+
Cloud Pub/Sub uses both gRPC and HTTP/JSON for the transport layer.
325+
322326
## Supported Java Versions
323327

324328
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.
411415
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-pubsub/java11.html
412416
[stability-image]: https://img.shields.io/badge/stability-stable-green
413417
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-pubsub.svg
414-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.130.1
418+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-pubsub/1.129.7
415419
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
416420
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
417421
[predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

‎proto-google-cloud-pubsub-v1/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.google.api.grpc</groupId>
66
<artifactId>proto-google-cloud-pubsub-v1</artifactId>
7-
<version>1.113.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
7+
<version>1.111.7-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-pubsub-v1:current} -->
88
<name>proto-google-cloud-pubsub-v1</name>
99
<description>PROTO library for proto-google-cloud-pubsub-v1</description>
1010
<parent>
1111
<groupId>com.google.cloud</groupId>
1212
<artifactId>google-cloud-pubsub-parent</artifactId>
13-
<version>1.131.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
13+
<version>1.129.7-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
1414
</parent>
1515
<dependencies>
1616
<dependency>

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/BigQueryConfig.java

-217
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ private BigQueryConfig(com.google.protobuf.GeneratedMessageV3.Builder<?> builder
4141
private BigQueryConfig() {
4242
table_ = "";
4343
state_ = 0;
44-
serviceAccountEmail_ = "";
4544
}
4645

4746
@java.lang.Override
@@ -478,67 +477,6 @@ public boolean getUseTableSchema() {
478477
return useTableSchema_;
479478
}
480479

481-
public static final int SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER = 7;
482-
483-
@SuppressWarnings("serial")
484-
private volatile java.lang.Object serviceAccountEmail_ = "";
485-
/**
486-
*
487-
*
488-
* <pre>
489-
* Optional. The service account to use to write to BigQuery. The subscription
490-
* creator or updater that specifies this field must have
491-
* `iam.serviceAccounts.actAs` permission on the service account. If not
492-
* specified, the Pub/Sub [service
493-
* agent](https://cloud.google.com/iam/docs/service-agents),
494-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
495-
* </pre>
496-
*
497-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
498-
*
499-
* @return The serviceAccountEmail.
500-
*/
501-
@java.lang.Override
502-
public java.lang.String getServiceAccountEmail() {
503-
java.lang.Object ref = serviceAccountEmail_;
504-
if (ref instanceof java.lang.String) {
505-
return (java.lang.String) ref;
506-
} else {
507-
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
508-
java.lang.String s = bs.toStringUtf8();
509-
serviceAccountEmail_ = s;
510-
return s;
511-
}
512-
}
513-
/**
514-
*
515-
*
516-
* <pre>
517-
* Optional. The service account to use to write to BigQuery. The subscription
518-
* creator or updater that specifies this field must have
519-
* `iam.serviceAccounts.actAs` permission on the service account. If not
520-
* specified, the Pub/Sub [service
521-
* agent](https://cloud.google.com/iam/docs/service-agents),
522-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
523-
* </pre>
524-
*
525-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
526-
*
527-
* @return The bytes for serviceAccountEmail.
528-
*/
529-
@java.lang.Override
530-
public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
531-
java.lang.Object ref = serviceAccountEmail_;
532-
if (ref instanceof java.lang.String) {
533-
com.google.protobuf.ByteString b =
534-
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
535-
serviceAccountEmail_ = b;
536-
return b;
537-
} else {
538-
return (com.google.protobuf.ByteString) ref;
539-
}
540-
}
541-
542480
private byte memoizedIsInitialized = -1;
543481

544482
@java.lang.Override
@@ -571,9 +509,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
571509
if (useTableSchema_ != false) {
572510
output.writeBool(6, useTableSchema_);
573511
}
574-
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
575-
com.google.protobuf.GeneratedMessageV3.writeString(output, 7, serviceAccountEmail_);
576-
}
577512
getUnknownFields().writeTo(output);
578513
}
579514

@@ -601,9 +536,6 @@ public int getSerializedSize() {
601536
if (useTableSchema_ != false) {
602537
size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, useTableSchema_);
603538
}
604-
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountEmail_)) {
605-
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, serviceAccountEmail_);
606-
}
607539
size += getUnknownFields().getSerializedSize();
608540
memoizedSize = size;
609541
return size;
@@ -625,7 +557,6 @@ public boolean equals(final java.lang.Object obj) {
625557
if (getDropUnknownFields() != other.getDropUnknownFields()) return false;
626558
if (state_ != other.state_) return false;
627559
if (getUseTableSchema() != other.getUseTableSchema()) return false;
628-
if (!getServiceAccountEmail().equals(other.getServiceAccountEmail())) return false;
629560
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
630561
return true;
631562
}
@@ -649,8 +580,6 @@ public int hashCode() {
649580
hash = (53 * hash) + state_;
650581
hash = (37 * hash) + USE_TABLE_SCHEMA_FIELD_NUMBER;
651582
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getUseTableSchema());
652-
hash = (37 * hash) + SERVICE_ACCOUNT_EMAIL_FIELD_NUMBER;
653-
hash = (53 * hash) + getServiceAccountEmail().hashCode();
654583
hash = (29 * hash) + getUnknownFields().hashCode();
655584
memoizedHashCode = hash;
656585
return hash;
@@ -795,7 +724,6 @@ public Builder clear() {
795724
dropUnknownFields_ = false;
796725
state_ = 0;
797726
useTableSchema_ = false;
798-
serviceAccountEmail_ = "";
799727
return this;
800728
}
801729

@@ -849,9 +777,6 @@ private void buildPartial0(com.google.pubsub.v1.BigQueryConfig result) {
849777
if (((from_bitField0_ & 0x00000020) != 0)) {
850778
result.useTableSchema_ = useTableSchema_;
851779
}
852-
if (((from_bitField0_ & 0x00000040) != 0)) {
853-
result.serviceAccountEmail_ = serviceAccountEmail_;
854-
}
855780
}
856781

857782
@java.lang.Override
@@ -919,11 +844,6 @@ public Builder mergeFrom(com.google.pubsub.v1.BigQueryConfig other) {
919844
if (other.getUseTableSchema() != false) {
920845
setUseTableSchema(other.getUseTableSchema());
921846
}
922-
if (!other.getServiceAccountEmail().isEmpty()) {
923-
serviceAccountEmail_ = other.serviceAccountEmail_;
924-
bitField0_ |= 0x00000040;
925-
onChanged();
926-
}
927847
this.mergeUnknownFields(other.getUnknownFields());
928848
onChanged();
929849
return this;
@@ -986,12 +906,6 @@ public Builder mergeFrom(
986906
bitField0_ |= 0x00000020;
987907
break;
988908
} // case 48
989-
case 58:
990-
{
991-
serviceAccountEmail_ = input.readStringRequireUtf8();
992-
bitField0_ |= 0x00000040;
993-
break;
994-
} // case 58
995909
default:
996910
{
997911
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -1475,137 +1389,6 @@ public Builder clearUseTableSchema() {
14751389
return this;
14761390
}
14771391

1478-
private java.lang.Object serviceAccountEmail_ = "";
1479-
/**
1480-
*
1481-
*
1482-
* <pre>
1483-
* Optional. The service account to use to write to BigQuery. The subscription
1484-
* creator or updater that specifies this field must have
1485-
* `iam.serviceAccounts.actAs` permission on the service account. If not
1486-
* specified, the Pub/Sub [service
1487-
* agent](https://cloud.google.com/iam/docs/service-agents),
1488-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
1489-
* </pre>
1490-
*
1491-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
1492-
*
1493-
* @return The serviceAccountEmail.
1494-
*/
1495-
public java.lang.String getServiceAccountEmail() {
1496-
java.lang.Object ref = serviceAccountEmail_;
1497-
if (!(ref instanceof java.lang.String)) {
1498-
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
1499-
java.lang.String s = bs.toStringUtf8();
1500-
serviceAccountEmail_ = s;
1501-
return s;
1502-
} else {
1503-
return (java.lang.String) ref;
1504-
}
1505-
}
1506-
/**
1507-
*
1508-
*
1509-
* <pre>
1510-
* Optional. The service account to use to write to BigQuery. The subscription
1511-
* creator or updater that specifies this field must have
1512-
* `iam.serviceAccounts.actAs` permission on the service account. If not
1513-
* specified, the Pub/Sub [service
1514-
* agent](https://cloud.google.com/iam/docs/service-agents),
1515-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
1516-
* </pre>
1517-
*
1518-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
1519-
*
1520-
* @return The bytes for serviceAccountEmail.
1521-
*/
1522-
public com.google.protobuf.ByteString getServiceAccountEmailBytes() {
1523-
java.lang.Object ref = serviceAccountEmail_;
1524-
if (ref instanceof String) {
1525-
com.google.protobuf.ByteString b =
1526-
com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref);
1527-
serviceAccountEmail_ = b;
1528-
return b;
1529-
} else {
1530-
return (com.google.protobuf.ByteString) ref;
1531-
}
1532-
}
1533-
/**
1534-
*
1535-
*
1536-
* <pre>
1537-
* Optional. The service account to use to write to BigQuery. The subscription
1538-
* creator or updater that specifies this field must have
1539-
* `iam.serviceAccounts.actAs` permission on the service account. If not
1540-
* specified, the Pub/Sub [service
1541-
* agent](https://cloud.google.com/iam/docs/service-agents),
1542-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
1543-
* </pre>
1544-
*
1545-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
1546-
*
1547-
* @param value The serviceAccountEmail to set.
1548-
* @return This builder for chaining.
1549-
*/
1550-
public Builder setServiceAccountEmail(java.lang.String value) {
1551-
if (value == null) {
1552-
throw new NullPointerException();
1553-
}
1554-
serviceAccountEmail_ = value;
1555-
bitField0_ |= 0x00000040;
1556-
onChanged();
1557-
return this;
1558-
}
1559-
/**
1560-
*
1561-
*
1562-
* <pre>
1563-
* Optional. The service account to use to write to BigQuery. The subscription
1564-
* creator or updater that specifies this field must have
1565-
* `iam.serviceAccounts.actAs` permission on the service account. If not
1566-
* specified, the Pub/Sub [service
1567-
* agent](https://cloud.google.com/iam/docs/service-agents),
1568-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
1569-
* </pre>
1570-
*
1571-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
1572-
*
1573-
* @return This builder for chaining.
1574-
*/
1575-
public Builder clearServiceAccountEmail() {
1576-
serviceAccountEmail_ = getDefaultInstance().getServiceAccountEmail();
1577-
bitField0_ = (bitField0_ & ~0x00000040);
1578-
onChanged();
1579-
return this;
1580-
}
1581-
/**
1582-
*
1583-
*
1584-
* <pre>
1585-
* Optional. The service account to use to write to BigQuery. The subscription
1586-
* creator or updater that specifies this field must have
1587-
* `iam.serviceAccounts.actAs` permission on the service account. If not
1588-
* specified, the Pub/Sub [service
1589-
* agent](https://cloud.google.com/iam/docs/service-agents),
1590-
* service-{project_number}&#64;gcp-sa-pubsub.iam.gserviceaccount.com, is used.
1591-
* </pre>
1592-
*
1593-
* <code>string service_account_email = 7 [(.google.api.field_behavior) = OPTIONAL];</code>
1594-
*
1595-
* @param value The bytes for serviceAccountEmail to set.
1596-
* @return This builder for chaining.
1597-
*/
1598-
public Builder setServiceAccountEmailBytes(com.google.protobuf.ByteString value) {
1599-
if (value == null) {
1600-
throw new NullPointerException();
1601-
}
1602-
checkByteStringIsUtf8(value);
1603-
serviceAccountEmail_ = value;
1604-
bitField0_ |= 0x00000040;
1605-
onChanged();
1606-
return this;
1607-
}
1608-
16091392
@java.lang.Override
16101393
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
16111394
return super.setUnknownFields(unknownFields);

0 commit comments

Comments
 (0)