Skip to content

Commit 1bc2471

Browse files
committed
chore(java-pubsub): migrate java-pubsub into monorepo
2 parents 39133b5 + 5b52963 commit 1bc2471

File tree

364 files changed

+201433
-1
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

364 files changed

+201433
-1
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@
1111
/java-bigquery/ @googleapis/bigquery-team @googleapis/cloud-sdk-java-team
1212
/java-spanner/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
1313
/java-spanner-jdbc/ @googleapis/spanner-team @googleapis/cloud-sdk-java-team
14+
/java-pubsub/ @googleapis/pubsub-team @googleapis/cloud-sdk-java-team

.github/workflows/ci.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ jobs:
9292
java-bigquery: java-bigquery/**
9393
java-bigquerystorage: java-bigquerystorage/**
9494
java-datastore: java-datastore/**
95-
java-logging: java-logging/**
9695
java-logging-logback: java-logging-logback/**
96+
java-logging: java-logging/**
97+
java-pubsub: java-pubsub/**
9798
java-spanner: java-spanner/**
9899
sdk-platform-java: sdk-platform-java/**
99100
split-units:

.kokoro/common.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ excluded_modules=(
3131
'sdk-platform-java/java-showcase-3.25.8'
3232
'java-spanner'
3333
'java-spanner-jdbc'
34+
'java-pubsub'
3435
)
3536

3637
function retry_with_backoff {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.58.0" # {x-version-update:google-cloud-shared-dependencies:current}
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "graalvm-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
env_vars: {
36+
key: "IT_SERVICE_ACCOUNT_EMAIL"
37+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
38+
}
39+
env_vars: {
40+
key: "BUILD_SUBDIR"
41+
value: "java-pubsub"
42+
}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
value: "gcr.io/cloud-devrel-kokoro-resources/java11"
7+
}
8+
9+
env_vars: {
10+
key: "JOB_TYPE"
11+
value: "integration-single"
12+
}
13+
14+
# TODO: remove this after we've migrated all tests and scripts
15+
env_vars: {
16+
key: "GCLOUD_PROJECT"
17+
value: "gcloud-devel"
18+
}
19+
20+
env_vars: {
21+
key: "GOOGLE_CLOUD_PROJECT"
22+
value: "gcloud-devel"
23+
}
24+
25+
env_vars: {
26+
key: "GOOGLE_APPLICATION_CREDENTIALS"
27+
value: "secret_manager/java-it-service-account"
28+
}
29+
30+
env_vars: {
31+
key: "SECRET_MANAGER_KEYS"
32+
value: "java-it-service-account"
33+
}
34+
35+
36+
env_vars: {
37+
key: "BUILD_SUBDIR"
38+
value: "java-pubsub"
39+
}

gapic-libraries-bom/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,6 +1074,13 @@
10741074
<type>pom</type>
10751075
<scope>import</scope>
10761076
</dependency>
1077+
<dependency>
1078+
<groupId>com.google.cloud</groupId>
1079+
<artifactId>google-cloud-pubsub-bom</artifactId>
1080+
<version>1.150.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-pubsub:current} -->
1081+
<type>pom</type>
1082+
<scope>import</scope>
1083+
</dependency>
10771084
<dependency>
10781085
<groupId>com.google.cloud</groupId>
10791086
<artifactId>google-cloud-rapidmigrationassessment-bom</artifactId>

generation/check_non_release_please_versions.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ for pomFile in $(find . -mindepth 2 -name pom.xml | sort ); do
1515
[[ "${pomFile}" =~ .*sdk-platform-java.* ]] || \
1616
[[ "${pomFile}" =~ .*java-spanner.* ]] || \
1717
[[ "${pomFile}" =~ .*java-spanner-jdbc.* ]] || \
18+
[[ "${pomFile}" =~ .*java-pubsub.* ]] || \
1819
[[ "${pomFile}" =~ .*.github*. ]]; then
1920
continue
2021
fi

generation_config.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2022,6 +2022,27 @@ libraries:
20222022
GAPICs:
20232023
- proto_path: google/cloud/security/publicca/v1beta1
20242024
- proto_path: google/cloud/security/publicca/v1
2025+
- api_shortname: pubsub
2026+
name_pretty: Cloud Pub/Sub
2027+
api_reference: https://cloud.google.com/pubsub/
2028+
product_documentation: https://cloud.google.com/pubsub/docs/
2029+
client_documentation: https://cloud.google.com/java/docs/reference/google-cloud-pubsub/latest/history
2030+
api_description: is designed to provide reliable, many-to-many, asynchronous messaging
2031+
between applications. Publisher applications can send messages to a topic and
2032+
other applications can subscribe to that topic to receive the messages. By decoupling
2033+
senders and receivers, Google Cloud Pub/Sub allows developers to communicate between
2034+
independently written applications.
2035+
issue_tracker: https://issuetracker.google.com/savedsearches/559741
2036+
release_level: stable
2037+
language: java
2038+
distribution_name: com.google.cloud:google-cloud-pubsub
2039+
codeowner_team: '@googleapis/pubsub-team'
2040+
api_id: pubsub.googleapis.com
2041+
library_type: GAPIC_COMBO
2042+
requires_billing: true
2043+
recommended_package: com.google.cloud.pubsub.v1
2044+
GAPICs:
2045+
- proto_path: google/pubsub/v1
20252046
- api_shortname: rapidmigrationassessment
20262047
name_pretty: Rapid Migration Assessment API
20272048
product_documentation: https://cloud.google.com/migration-center/docs

java-pubsub/.OwlBot-hermetic.yaml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Copyright 2021 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
deep-remove-regex:
16+
- /java-pubsub/grpc-google-.*/src
17+
- /java-pubsub/proto-google-.*/src
18+
- /java-pubsub/google-.*/src
19+
deep-preserve-regex:
20+
- /java-pubsub/google-cloud-pubsub/src/test/resources/META-INF/native-image/.*
21+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/.*/v.*/it/IT.*Test.java
22+
- /java-pubsub/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java
23+
- /java-pubsub/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeletedTopic.java
24+
- /java-pubsub/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSnapshotName.java
25+
- /java-pubsub/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectSubscriptionName.java
26+
- /java-pubsub/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ProjectTopicName.java
27+
- /java-pubsub/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/TopicNames.java
28+
- /java-pubsub/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UntypedTopicName.java
29+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/it/ITPubSubTest.java
30+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/CustomArgumentMatchers.java
31+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeClock.java
32+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakePublisherServiceImpl.java
33+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeScheduledExecutorService.java
34+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java
35+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDataMatcher.java
36+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/MessageDispatcherTest.java
37+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenCensusUtilTest.java
38+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/OpenTelemetryTest.java
39+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/PublisherImplTest.java
40+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SequentialExecutorServiceTest.java
41+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StatusUtilTest.java
42+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java
43+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettingsTest.java
44+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java
45+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/TopicAdminSmokeTest.java
46+
- /java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/WaiterTest.java
47+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumer.java
48+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumerImpl.java
49+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumerWithResponse.java
50+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckReplyConsumerWithResponseImpl.java
51+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckRequestData.java
52+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/AckResponse.java
53+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
54+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiver.java
55+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageReceiverWithAckResponse.java
56+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/ModackRequestData.java
57+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenCensusUtil.java
58+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/OpenTelemetryPubsubTracer.java
59+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
60+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PublisherInterface.java
61+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PubsubMessageWrapper.java
62+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SequentialExecutorService.java
63+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StatusUtil.java
64+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnection.java
65+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
66+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberInterface.java
67+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberShutdownSettings.java
68+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/SubscriberStats.java
69+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Waiter.java
70+
- /java-pubsub/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/LoggingUtil.java
71+
deep-copy-regex:
72+
- source: /google/pubsub/(v.*)/.*-java/proto-google-.*/src
73+
dest: /owl-bot-staging/java-pubsub/$1/proto-google-cloud-pubsub-$1/src
74+
- source: /google/pubsub/(v.*)/.*-java/grpc-google-.*/src
75+
dest: /owl-bot-staging/java-pubsub/$1/grpc-google-cloud-pubsub-$1/src
76+
- source: /google/pubsub/(v.*)/.*-java/gapic-google-.*/src
77+
dest: /owl-bot-staging/java-pubsub/$1/google-cloud-pubsub/src
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
steps:
2+
- name: gcr.io/cloud-devrel-public-resources/java8
3+
entrypoint: ls
4+
args: [
5+
'-alt',
6+
]
7+
- name: gcr.io/cloud-devrel-public-resources/java8
8+
entrypoint: curl
9+
args: [
10+
'--header',
11+
'Metadata-Flavor: Google',
12+
'http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/email'
13+
]
14+
- name: gcr.io/cloud-devrel-public-resources/java8
15+
entrypoint: pwd
16+
- name: gcr.io/cloud-devrel-public-resources/java8
17+
entrypoint: bash
18+
args: [
19+
'.kokoro/build.sh'
20+
]
21+
env:
22+
- 'JOB_TYPE=samples'
23+
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-sample'
24+
- name: gcr.io/cloud-devrel-public-resources/java8
25+
entrypoint: echo
26+
args: [
27+
'Sample job succeeded',
28+
]
29+
timeout: 3600s
30+
options:
31+
defaultLogsBucketBehavior: REGIONAL_USER_OWNED_BUCKET

0 commit comments

Comments
 (0)