diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index be22516e..3f7432a5 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/repo-automation-bots/owlbot-java:latest - digest: sha256:3796fe5c26bbf814f0a82a2eab2749b5710f87e7197dc011e5fa3c694e532462 + digest: sha256:12cbdc4f137152a1a8b83f50ebc1a4098be0d3baff78b46efaec306f7cfafd13 diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index a98a065a..0d428482 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-analytics-admin.git", - "sha": "e8d626908a020d4c1ea6ff0ff34afd5d65ae967a" + "sha": "d22e529264c18408c18e708cfc1c050aae945b7c" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "21da7d9fa02f6916d9f87cf4072b3547b5c72eb5" + "sha": "3d32990b6f4b57be77455e3ca89e6e21cd0c06b3" } } ] diff --git a/.github/release-please.yml b/.github/release-please.yml index 8ca7f9ca..7bf58076 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +branches: + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 537f386a..b795051a 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,51 +1,46 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor + - pattern: java7 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push -- team: analytics-dpe - permission: push + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push + - team: analytics-dpe + permission: push diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 0195b32f..65ae6ecd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [7, 8, 11] + java: [8, 11] steps: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49..46edbf7f 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index a7e999d3..9030ba8f 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a6dd16a..09688372 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +## [0.5.0](https://www.github.com/googleapis/java-analytics-admin/compare/v0.4.0...v0.5.0) (2021-08-06) + + +### ⚠ BREAKING CHANGES + +* release gapic-generator-java v2.0.0 (#257) + +### Features + +* release gapic-generator-java v2.0.0 ([#257](https://www.github.com/googleapis/java-analytics-admin/issues/257)) ([ebbc014](https://www.github.com/googleapis/java-analytics-admin/commit/ebbc014dfde8577e1331bc09ecc2abae3e5b2f82)) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-analytics-admin/issues/1130)) ([#232](https://www.github.com/googleapis/java-analytics-admin/issues/232)) ([7dffdfc](https://www.github.com/googleapis/java-analytics-admin/commit/7dffdfcfa03bd9df5d3a0678a816bdc5339dcb11)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#234](https://www.github.com/googleapis/java-analytics-admin/issues/234)) ([fdd111a](https://www.github.com/googleapis/java-analytics-admin/commit/fdd111a9791d2f2f0b32d3a439023a34fd67656a)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2 ([#258](https://www.github.com/googleapis/java-analytics-admin/issues/258)) ([315f245](https://www.github.com/googleapis/java-analytics-admin/commit/315f245df1b516966b19a6a0980c3967cd4aca51)) + ## [0.4.0](https://www.github.com/googleapis/java-analytics-admin/compare/v0.3.2...v0.4.0) (2021-06-15) diff --git a/README.md b/README.md index 6b2c16ec..da04879e 100644 --- a/README.md +++ b/README.md @@ -11,33 +11,41 @@ Java idiomatic client for [Analytics Admin][product-docs]. > Note: This client is a work-in-progress, and may occasionally > make backwards-incompatible changes. + ## Quickstart If you are using Maven, add this to your pom.xml file: + ```xml com.google.analytics google-analytics-admin - 0.3.2 + 0.4.0 ``` If you are using Gradle without BOM, add this to your dependencies + ```Groovy -compile 'com.google.analytics:google-analytics-admin:0.3.2' +compile 'com.google.analytics:google-analytics-admin:0.4.0' ``` If you are using SBT, add this to your dependencies + ```Scala -libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.3.2" +libraryDependencies += "com.google.analytics" % "google-analytics-admin" % "0.4.0" ``` ## Authentication See the [Authentication][authentication] section in the base directory's README. +## Authorization + +The client application making API calls must be granted [authorization scopes][auth-scopes] required for the desired Analytics Admin APIs, and the authenticated principal must have the [IAM role(s)][predefined-iam-roles] required to access GCP resources using the Analytics Admin API calls. + ## Getting Started ### Prerequisites @@ -67,8 +75,7 @@ use this Analytics Admin Client Library. ## Samples -Samples are in the [`samples/`](https://github.com/googleapis/java-analytics-admin/tree/master/samples) directory. The samples' `README.md` -has instructions for running the samples. +Samples are in the [`samples/`](https://github.com/googleapis/java-analytics-admin/tree/master/samples) directory. | Sample | Source Code | Try it | | --------------------------- | --------------------------------- | ------ | @@ -84,10 +91,50 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Analytics Admin uses gRPC for the transport layer. -## Java Versions +## Supported Java Versions Java 7 or above is required for using this client. +Google's Java client libraries, +[Google Cloud Client Libraries][cloudlibs] +and +[Google Cloud API Libraries][apilibs], +follow the +[Oracle Java SE support roadmap][oracle] +(see the Oracle Java SE Product Releases section). + +### For new development + +In general, new feature development occurs with support for the lowest Java +LTS version covered by Oracle's Premier Support (which typically lasts 5 years +from initial General Availability). If the minimum required JVM for a given +library is changed, it is accompanied by a [semver][semver] major release. + +Java 11 and (in September 2021) Java 17 are the best choices for new +development. + +### Keeping production systems current + +Google tests its client libraries with all current LTS versions covered by +Oracle's Extended Support (which typically lasts 8 years from initial +General Availability). + +#### Legacy support + +Google's client libraries support legacy versions of Java runtimes with long +term stable libraries that don't receive feature updates on a best efforts basis +as it may not be possible to backport all patches. + +Google provides updates on a best efforts basis to apps that continue to use +Java 7, though apps might need to upgrade to current versions of the library +that supports their JVM. + +#### Where to find specific information + +The latest versions and the supported Java versions are identified on +the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME` +and on [google-cloud-java][g-c-j]. + ## Versioning @@ -97,6 +144,7 @@ This library follows [Semantic Versioning](http://semver.org/). It is currently in major version zero (``0.y.z``), which means that anything may change at any time and the public API should not be considered stable. + ## Contributing @@ -108,6 +156,7 @@ Please note that this project is released with a Contributor Code of Conduct. By this project you agree to abide by its terms. See [Code of Conduct][code-of-conduct] for more information. + ## License Apache 2.0 - See [LICENSE][license] for more information. @@ -140,6 +189,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [maven-version-image]: https://img.shields.io/maven-central/v/com.google.analytics/google-analytics-admin.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.analytics%20AND%20a:google-analytics-admin&core=gav [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 +[iam-policy]: https://cloud.google.com/iam/docs/overview#cloud-iam-policy [developer-console]: https://console.developers.google.com/ [create-project]: https://cloud.google.com/resource-manager/docs/creating-managing-projects [cloud-sdk]: https://cloud.google.com/sdk/ @@ -151,3 +203,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=analyticsadmin.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM [shell_img]: https://gstatic.com/cloudssh/images/open-btn.png + +[semver]: https://semver.org/ +[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained +[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries +[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html +[g-c-j]: http://github.com/googleapis/google-cloud-java diff --git a/google-analytics-admin-bom/pom.xml b/google-analytics-admin-bom/pom.xml index ece8d5f3..25247b11 100644 --- a/google-analytics-admin-bom/pom.xml +++ b/google-analytics-admin-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.analytics google-analytics-admin-bom - 0.4.0 + 0.5.0 pom com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 Google Analytics Admin BOM @@ -43,18 +43,7 @@ true - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - + The Apache Software License, Version 2.0 http://www.apache.org/licenses/LICENSE-2.0.txt @@ -67,17 +56,17 @@ com.google.analytics google-analytics-admin - 0.4.0 + 0.5.0 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.4.0 + 0.5.0 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.4.0 + 0.5.0 diff --git a/google-analytics-admin/clirr-ignored-differences.xml b/google-analytics-admin/clirr-ignored-differences.xml deleted file mode 100644 index 7572b3e7..00000000 --- a/google-analytics-admin/clirr-ignored-differences.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - 7002 - com/google/analytics/admin/v1alpha/*AnalyticsAdminService* - * create*(*) - - - 7002 - com/google/analytics/admin/v1alpha/stub/*AnalyticsAdminService* - * create*(*) - - - 7006 - com/google/analytics/admin/v1alpha/AnalyticsAdminService* - * deleteProperty(*) - com.google.analytics.admin.v1alpha.Property - - diff --git a/google-analytics-admin/pom.xml b/google-analytics-admin/pom.xml index bb945f04..5b113ff9 100644 --- a/google-analytics-admin/pom.xml +++ b/google-analytics-admin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.analytics google-analytics-admin - 0.4.0 + 0.5.0 jar Google Analytics Admin https://github.com/googleapis/java-analytics-admin @@ -11,7 +11,7 @@ com.google.analytics google-analytics-admin-parent - 0.4.0 + 0.5.0 google-analytics-admin diff --git a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java index 67308dde..2067e7a5 100644 --- a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java +++ b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java @@ -18,7 +18,6 @@ import com.google.analytics.admin.v1alpha.stub.AnalyticsAdminServiceStub; import com.google.analytics.admin.v1alpha.stub.AnalyticsAdminServiceStubSettings; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -7349,12 +7348,7 @@ public static ApiFuture createAsync( ListAccountsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAccountsPagedResponse apply(ListAccountsPage input) { - return new ListAccountsPagedResponse(input); - } - }, + input -> new ListAccountsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7430,12 +7424,7 @@ public static ApiFuture createAsync( ListAccountSummariesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAccountSummariesPagedResponse apply(ListAccountSummariesPage input) { - return new ListAccountSummariesPagedResponse(input); - } - }, + input -> new ListAccountSummariesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7518,12 +7507,7 @@ public static ApiFuture createAsync( ListPropertiesPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListPropertiesPagedResponse apply(ListPropertiesPage input) { - return new ListPropertiesPagedResponse(input); - } - }, + input -> new ListPropertiesPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7599,12 +7583,7 @@ public static ApiFuture createAsync( ListUserLinksPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListUserLinksPagedResponse apply(ListUserLinksPage input) { - return new ListUserLinksPagedResponse(input); - } - }, + input -> new ListUserLinksPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7680,12 +7659,7 @@ public static ApiFuture createAsync( AuditUserLinksPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public AuditUserLinksPagedResponse apply(AuditUserLinksPage input) { - return new AuditUserLinksPagedResponse(input); - } - }, + input -> new AuditUserLinksPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7761,12 +7735,7 @@ public static ApiFuture createAsync( ListWebDataStreamsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListWebDataStreamsPagedResponse apply(ListWebDataStreamsPage input) { - return new ListWebDataStreamsPagedResponse(input); - } - }, + input -> new ListWebDataStreamsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7847,12 +7816,7 @@ public static ApiFuture createAsync( ListIosAppDataStreamsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListIosAppDataStreamsPagedResponse apply(ListIosAppDataStreamsPage input) { - return new ListIosAppDataStreamsPagedResponse(input); - } - }, + input -> new ListIosAppDataStreamsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -7939,13 +7903,7 @@ public static ApiFuture createAsync( ListAndroidAppDataStreamsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAndroidAppDataStreamsPagedResponse apply( - ListAndroidAppDataStreamsPage input) { - return new ListAndroidAppDataStreamsPagedResponse(input); - } - }, + input -> new ListAndroidAppDataStreamsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8037,12 +7995,7 @@ public static ApiFuture createAsync( ListFirebaseLinksPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListFirebaseLinksPagedResponse apply(ListFirebaseLinksPage input) { - return new ListFirebaseLinksPagedResponse(input); - } - }, + input -> new ListFirebaseLinksPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8122,12 +8075,7 @@ public static ApiFuture createAsync( ListGoogleAdsLinksPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListGoogleAdsLinksPagedResponse apply(ListGoogleAdsLinksPage input) { - return new ListGoogleAdsLinksPagedResponse(input); - } - }, + input -> new ListGoogleAdsLinksPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8212,14 +8160,7 @@ public static ApiFuture createAsync .createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction< - ListMeasurementProtocolSecretsPage, ListMeasurementProtocolSecretsPagedResponse>() { - @Override - public ListMeasurementProtocolSecretsPagedResponse apply( - ListMeasurementProtocolSecretsPage input) { - return new ListMeasurementProtocolSecretsPagedResponse(input); - } - }, + input -> new ListMeasurementProtocolSecretsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8315,13 +8256,7 @@ public static ApiFuture createAsync( SearchChangeHistoryEventsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public SearchChangeHistoryEventsPagedResponse apply( - SearchChangeHistoryEventsPage input) { - return new SearchChangeHistoryEventsPagedResponse(input); - } - }, + input -> new SearchChangeHistoryEventsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8414,12 +8349,7 @@ public static ApiFuture createAsync( ListConversionEventsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListConversionEventsPagedResponse apply(ListConversionEventsPage input) { - return new ListConversionEventsPagedResponse(input); - } - }, + input -> new ListConversionEventsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8503,12 +8433,7 @@ public static ApiFuture createAsync( ListCustomDimensionsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCustomDimensionsPagedResponse apply(ListCustomDimensionsPage input) { - return new ListCustomDimensionsPagedResponse(input); - } - }, + input -> new ListCustomDimensionsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -8591,12 +8516,7 @@ public static ApiFuture createAsync( ListCustomMetricsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListCustomMetricsPagedResponse apply(ListCustomMetricsPage input) { - return new ListCustomMetricsPagedResponse(input); - } - }, + input -> new ListCustomMetricsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java index e1c8d581..ab244744 100644 --- a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java +++ b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java @@ -596,14 +596,13 @@ public AnalyticsAdminServiceStubSettings.Builder getStubSettingsBuilder() { return ((AnalyticsAdminServiceStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java index 47306a1c..8d538243 100644 --- a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java +++ b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java @@ -1748,6 +1748,11 @@ public static String getDefaultEndpoint() { return "analyticsadmin.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "analyticsadmin.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -2402,6 +2407,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } @@ -2750,14 +2757,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceStub.java b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceStub.java index 15e4c2d0..8446c1a0 100644 --- a/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceStub.java +++ b/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/GrpcAnalyticsAdminServiceStub.java @@ -141,7 +141,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.common.collect.ImmutableMap; import com.google.longrunning.stub.GrpcOperationsStub; @@ -149,7 +148,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -1139,13 +1137,10 @@ protected GrpcAnalyticsAdminServiceStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(getAccountMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetAccountRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings listAccountsTransportSettings = @@ -1156,26 +1151,20 @@ public Map extract(GetAccountRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAccountMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteAccountRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateAccountTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateAccountMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateAccountRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("account.name", String.valueOf(request.getAccount().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("account.name", String.valueOf(request.getAccount().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1193,13 +1182,10 @@ public Map extract(UpdateAccountRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getPropertyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetPropertyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1215,39 +1201,30 @@ public Map extract(GetPropertyRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deletePropertyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeletePropertyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updatePropertyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updatePropertyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdatePropertyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("property.name", String.valueOf(request.getProperty().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("property.name", String.valueOf(request.getProperty().getName())); + return params.build(); }) .build(); GrpcCallSettings getUserLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getUserLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetUserLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1255,26 +1232,20 @@ public Map extract(GetUserLinkRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchGetUserLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchGetUserLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings listUserLinksTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listUserLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListUserLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1282,26 +1253,20 @@ public Map extract(ListUserLinksRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(auditUserLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(AuditUserLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings createUserLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createUserLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateUserLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1309,26 +1274,20 @@ public Map extract(CreateUserLinkRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchCreateUserLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchCreateUserLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateUserLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateUserLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateUserLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("user_link.name", String.valueOf(request.getUserLink().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("user_link.name", String.valueOf(request.getUserLink().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1336,65 +1295,50 @@ public Map extract(UpdateUserLinkRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(batchUpdateUserLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchUpdateUserLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteUserLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteUserLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteUserLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings batchDeleteUserLinksTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(batchDeleteUserLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(BatchDeleteUserLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getWebDataStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getWebDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetWebDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings deleteWebDataStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteWebDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteWebDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1402,15 +1346,12 @@ public Map extract(DeleteWebDataStreamRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateWebDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateWebDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "web_data_stream.name", - String.valueOf(request.getWebDataStream().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "web_data_stream.name", + String.valueOf(request.getWebDataStream().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1418,13 +1359,10 @@ public Map extract(UpdateWebDataStreamRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createWebDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateWebDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1432,13 +1370,10 @@ public Map extract(CreateWebDataStreamRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listWebDataStreamsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListWebDataStreamsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1446,26 +1381,20 @@ public Map extract(ListWebDataStreamsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getIosAppDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetIosAppDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings deleteIosAppDataStreamTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteIosAppDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteIosAppDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1473,15 +1402,12 @@ public Map extract(DeleteIosAppDataStreamRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateIosAppDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateIosAppDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "ios_app_data_stream.name", - String.valueOf(request.getIosAppDataStream().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "ios_app_data_stream.name", + String.valueOf(request.getIosAppDataStream().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1490,13 +1416,10 @@ public Map extract(UpdateIosAppDataStreamRequest request) { .newBuilder() .setMethodDescriptor(listIosAppDataStreamsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListIosAppDataStreamsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1504,13 +1427,10 @@ public Map extract(ListIosAppDataStreamsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getAndroidAppDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetAndroidAppDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1518,14 +1438,10 @@ public Map extract(GetAndroidAppDataStreamRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAndroidAppDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - DeleteAndroidAppDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1533,16 +1449,12 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(updateAndroidAppDataStreamMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateAndroidAppDataStreamRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "android_app_data_stream.name", - String.valueOf(request.getAndroidAppDataStream().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "android_app_data_stream.name", + String.valueOf(request.getAndroidAppDataStream().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1551,13 +1463,10 @@ public Map extract( .newBuilder() .setMethodDescriptor(listAndroidAppDataStreamsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListAndroidAppDataStreamsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1566,14 +1475,10 @@ public Map extract(ListAndroidAppDataStreamsRequest request) { .newBuilder() .setMethodDescriptor(getEnhancedMeasurementSettingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - GetEnhancedMeasurementSettingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1582,56 +1487,43 @@ public Map extract( .newBuilder() .setMethodDescriptor(updateEnhancedMeasurementSettingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateEnhancedMeasurementSettingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "enhanced_measurement_settings.name", - String.valueOf(request.getEnhancedMeasurementSettings().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "enhanced_measurement_settings.name", + String.valueOf(request.getEnhancedMeasurementSettings().getName())); + return params.build(); }) .build(); GrpcCallSettings createFirebaseLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createFirebaseLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateFirebaseLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateFirebaseLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateFirebaseLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateFirebaseLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "firebase_link.name", String.valueOf(request.getFirebaseLink().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "firebase_link.name", String.valueOf(request.getFirebaseLink().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteFirebaseLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteFirebaseLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteFirebaseLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1639,26 +1531,20 @@ public Map extract(DeleteFirebaseLinkRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listFirebaseLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListFirebaseLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getGlobalSiteTagTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getGlobalSiteTagMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetGlobalSiteTagRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1666,13 +1552,10 @@ public Map extract(GetGlobalSiteTagRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createGoogleAdsLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateGoogleAdsLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1680,28 +1563,22 @@ public Map extract(CreateGoogleAdsLinkRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateGoogleAdsLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateGoogleAdsLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "google_ads_link.name", - String.valueOf(request.getGoogleAdsLink().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "google_ads_link.name", + String.valueOf(request.getGoogleAdsLink().getName())); + return params.build(); }) .build(); GrpcCallSettings deleteGoogleAdsLinkTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteGoogleAdsLinkMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteGoogleAdsLinkRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1709,13 +1586,10 @@ public Map extract(DeleteGoogleAdsLinkRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listGoogleAdsLinksMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListGoogleAdsLinksRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1723,13 +1597,10 @@ public Map extract(ListGoogleAdsLinksRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getDataSharingSettingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetDataSharingSettingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1738,14 +1609,10 @@ public Map extract(GetDataSharingSettingsRequest request) { .newBuilder() .setMethodDescriptor(getMeasurementProtocolSecretMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - GetMeasurementProtocolSecretRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1755,14 +1622,10 @@ public Map extract( newBuilder() .setMethodDescriptor(listMeasurementProtocolSecretsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - ListMeasurementProtocolSecretsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1771,14 +1634,10 @@ public Map extract( .newBuilder() .setMethodDescriptor(createMeasurementProtocolSecretMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - CreateMeasurementProtocolSecretRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1786,14 +1645,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteMeasurementProtocolSecretMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - DeleteMeasurementProtocolSecretRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1802,16 +1657,12 @@ public Map extract( .newBuilder() .setMethodDescriptor(updateMeasurementProtocolSecretMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateMeasurementProtocolSecretRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "measurement_protocol_secret.name", - String.valueOf(request.getMeasurementProtocolSecret().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "measurement_protocol_secret.name", + String.valueOf(request.getMeasurementProtocolSecret().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1820,13 +1671,10 @@ public Map extract( .newBuilder() .setMethodDescriptor(searchChangeHistoryEventsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SearchChangeHistoryEventsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("account", String.valueOf(request.getAccount())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("account", String.valueOf(request.getAccount())); + return params.build(); }) .build(); GrpcCallSettings @@ -1834,13 +1682,10 @@ public Map extract(SearchChangeHistoryEventsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getGoogleSignalsSettingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetGoogleSignalsSettingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1848,16 +1693,12 @@ public Map extract(GetGoogleSignalsSettingsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateGoogleSignalsSettingsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract( - UpdateGoogleSignalsSettingsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "google_signals_settings.name", - String.valueOf(request.getGoogleSignalsSettings().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "google_signals_settings.name", + String.valueOf(request.getGoogleSignalsSettings().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1865,13 +1706,10 @@ public Map extract( GrpcCallSettings.newBuilder() .setMethodDescriptor(createConversionEventMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateConversionEventRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1879,26 +1717,20 @@ public Map extract(CreateConversionEventRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getConversionEventMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetConversionEventRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings deleteConversionEventTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteConversionEventMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteConversionEventRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1906,13 +1738,10 @@ public Map extract(DeleteConversionEventRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listConversionEventsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListConversionEventsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1920,13 +1749,10 @@ public Map extract(ListConversionEventsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(createCustomDimensionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCustomDimensionRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings @@ -1934,15 +1760,12 @@ public Map extract(CreateCustomDimensionRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCustomDimensionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCustomDimensionRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "custom_dimension.name", - String.valueOf(request.getCustomDimension().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "custom_dimension.name", + String.valueOf(request.getCustomDimension().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1950,26 +1773,20 @@ public Map extract(UpdateCustomDimensionRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCustomDimensionsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCustomDimensionsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings archiveCustomDimensionTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(archiveCustomDimensionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ArchiveCustomDimensionRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -1977,40 +1794,31 @@ public Map extract(ArchiveCustomDimensionRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(getCustomDimensionMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCustomDimensionRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings createCustomMetricTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createCustomMetricMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateCustomMetricRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings updateCustomMetricTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateCustomMetricMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateCustomMetricRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put( - "custom_metric.name", String.valueOf(request.getCustomMetric().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put( + "custom_metric.name", String.valueOf(request.getCustomMetric().getName())); + return params.build(); }) .build(); GrpcCallSettings @@ -2018,39 +1826,30 @@ public Map extract(UpdateCustomMetricRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(listCustomMetricsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListCustomMetricsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings archiveCustomMetricTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(archiveCustomMetricMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ArchiveCustomMetricRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings getCustomMetricTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getCustomMetricMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetCustomMetricRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); @@ -2898,7 +2697,13 @@ public UnaryCallable getCustomMetricCallab @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClientTest.java b/google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClientTest.java index 83b3cc3e..b5de84fb 100644 --- a/google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClientTest.java +++ b/google-analytics-admin/src/test/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClientTest.java @@ -63,8 +63,8 @@ public class AnalyticsAdminServiceClientTest { private static MockAnalyticsAdminService mockAnalyticsAdminService; private static MockServiceHelper mockServiceHelper; - private AnalyticsAdminServiceClient client; private LocalChannelProvider channelProvider; + private AnalyticsAdminServiceClient client; @BeforeClass public static void startStaticServer() { diff --git a/grpc-google-analytics-admin-v1alpha/clirr-ignored-differences.xml b/grpc-google-analytics-admin-v1alpha/clirr-ignored-differences.xml deleted file mode 100644 index 05c657f6..00000000 --- a/grpc-google-analytics-admin-v1alpha/clirr-ignored-differences.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - 7002 - com/google/analytics/admin/v1alpha/AnalyticsAdminServiceGrpc* - * create*(*) - - - 7002 - com/google/analytics/admin/v1alpha/AnalyticsAdminServiceGrpc* - * get*(*) - - - 7006 - com/google/analytics/admin/v1alpha/AnalyticsAdminServiceGrpc* - * deleteProperty(*) - com.google.analytics.admin.v1alpha.Property - - \ No newline at end of file diff --git a/grpc-google-analytics-admin-v1alpha/pom.xml b/grpc-google-analytics-admin-v1alpha/pom.xml index 28d97907..a879255e 100644 --- a/grpc-google-analytics-admin-v1alpha/pom.xml +++ b/grpc-google-analytics-admin-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.4.0 + 0.5.0 grpc-google-analytics-admin-v1alpha GRPC library for grpc-google-analytics-admin-v1alpha com.google.analytics google-analytics-admin-parent - 0.4.0 + 0.5.0 diff --git a/java.header b/java.header index 3a9b503a..d0970ba7 100644 --- a/java.header +++ b/java.header @@ -1,5 +1,5 @@ ^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$ ^ \*$ ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ ^ \* you may not use this file except in compliance with the License\.$ diff --git a/pom.xml b/pom.xml index 4bcbaf2e..a2fc5114 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.analytics google-analytics-admin-parent pom - 0.4.0 + 0.5.0 Google Analytics Admin Parent https://github.com/googleapis/java-analytics-admin @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 @@ -41,16 +41,7 @@ https://github.com/googleapis/java-analytics-admin/issues GitHub Issues - - - sonatype-nexus-snapshots - https://google.oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://google.oss.sonatype.org/service/local/staging/deploy/maven2/ - - + Apache-2.0 @@ -70,23 +61,23 @@ com.google.analytics google-analytics-admin - 0.4.0 + 0.5.0 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.4.0 + 0.5.0 com.google.api.grpc grpc-google-analytics-admin-v1alpha - 0.4.0 + 0.5.0 com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 2.0.0 pom import diff --git a/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml b/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml index ba7b7ea6..df768a74 100644 --- a/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml +++ b/proto-google-analytics-admin-v1alpha/clirr-ignored-differences.xml @@ -16,7 +16,6 @@ com/google/analytics/admin/v1alpha/*OrBuilder boolean has*(*) - 6011 @@ -32,4 +31,8 @@ 8001 com/google/analytics/admin/v1alpha/Create* + + 8001 + com/google/analytics/admin/v1alpha/AccountSummary* + diff --git a/proto-google-analytics-admin-v1alpha/pom.xml b/proto-google-analytics-admin-v1alpha/pom.xml index 3daab5c5..8ba11960 100644 --- a/proto-google-analytics-admin-v1alpha/pom.xml +++ b/proto-google-analytics-admin-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-admin-v1alpha - 0.4.0 + 0.5.0 proto-google-analytics-admin-v1alpha PROTO library for proto-google-analytics-admin-v1alpha com.google.analytics google-analytics-admin-parent - 0.4.0 + 0.5.0 diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountName.java index f8147f6b..a3fe0fcc 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountName.java @@ -158,7 +158,7 @@ public Builder setAccount(String account) { } private Builder(AccountName accountName) { - account = accountName.account; + this.account = accountName.account; } public AccountName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountSummaryName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountSummaryName.java deleted file mode 100644 index 200a9444..00000000 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AccountSummaryName.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * 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 - * - * https://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. - */ - -package com.google.analytics.admin.v1alpha; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class AccountSummaryName implements ResourceName { - private static final PathTemplate ACCOUNT_SUMMARY = - PathTemplate.createWithoutUrlEncoding("accountSummaries/{account_summary}"); - private volatile Map fieldValuesMap; - private final String accountSummary; - - @Deprecated - protected AccountSummaryName() { - accountSummary = null; - } - - private AccountSummaryName(Builder builder) { - accountSummary = Preconditions.checkNotNull(builder.getAccountSummary()); - } - - public String getAccountSummary() { - return accountSummary; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static AccountSummaryName of(String accountSummary) { - return newBuilder().setAccountSummary(accountSummary).build(); - } - - public static String format(String accountSummary) { - return newBuilder().setAccountSummary(accountSummary).build().toString(); - } - - public static AccountSummaryName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - ACCOUNT_SUMMARY.validatedMatch( - formattedString, "AccountSummaryName.parse: formattedString not in valid format"); - return of(matchMap.get("account_summary")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (AccountSummaryName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return ACCOUNT_SUMMARY.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (accountSummary != null) { - fieldMapBuilder.put("account_summary", accountSummary); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return ACCOUNT_SUMMARY.instantiate("account_summary", accountSummary); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - AccountSummaryName that = ((AccountSummaryName) o); - return Objects.equals(this.accountSummary, that.accountSummary); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(accountSummary); - return h; - } - - /** Builder for accountSummaries/{account_summary}. */ - public static class Builder { - private String accountSummary; - - protected Builder() {} - - public String getAccountSummary() { - return accountSummary; - } - - public Builder setAccountSummary(String accountSummary) { - this.accountSummary = accountSummary; - return this; - } - - private Builder(AccountSummaryName accountSummaryName) { - accountSummary = accountSummaryName.accountSummary; - } - - public AccountSummaryName build() { - return new AccountSummaryName(this); - } - } -} diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStreamName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStreamName.java index 0fe0cca9..43984e0b 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStreamName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AndroidAppDataStreamName.java @@ -187,8 +187,8 @@ public Builder setAndroidAppDataStream(String androidAppDataStream) { } private Builder(AndroidAppDataStreamName androidAppDataStreamName) { - property = androidAppDataStreamName.property; - androidAppDataStream = androidAppDataStreamName.androidAppDataStream; + this.property = androidAppDataStreamName.property; + this.androidAppDataStream = androidAppDataStreamName.androidAppDataStream; } public AndroidAppDataStreamName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ConversionEventName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ConversionEventName.java index 30e7609e..5e05acec 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ConversionEventName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/ConversionEventName.java @@ -187,8 +187,8 @@ public Builder setConversionEvent(String conversionEvent) { } private Builder(ConversionEventName conversionEventName) { - property = conversionEventName.property; - conversionEvent = conversionEventName.conversionEvent; + this.property = conversionEventName.property; + this.conversionEvent = conversionEventName.conversionEvent; } public ConversionEventName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomDimensionName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomDimensionName.java index 1c0b45b6..dda33250 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomDimensionName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomDimensionName.java @@ -158,7 +158,7 @@ public Builder setProperty(String property) { } private Builder(CustomDimensionName customDimensionName) { - property = customDimensionName.property; + this.property = customDimensionName.property; } public CustomDimensionName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomMetricName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomMetricName.java index 384101c0..350e9eb0 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomMetricName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/CustomMetricName.java @@ -158,7 +158,7 @@ public Builder setProperty(String property) { } private Builder(CustomMetricName customMetricName) { - property = customMetricName.property; + this.property = customMetricName.property; } public CustomMetricName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettingsName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettingsName.java index ece341ae..846bbebf 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettingsName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/DataSharingSettingsName.java @@ -158,7 +158,7 @@ public Builder setAccount(String account) { } private Builder(DataSharingSettingsName dataSharingSettingsName) { - account = dataSharingSettingsName.account; + this.account = dataSharingSettingsName.account; } public DataSharingSettingsName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettingsName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettingsName.java index 635da2a6..41d9b7a3 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettingsName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/EnhancedMeasurementSettingsName.java @@ -186,8 +186,8 @@ public Builder setWebDataStream(String webDataStream) { } private Builder(EnhancedMeasurementSettingsName enhancedMeasurementSettingsName) { - property = enhancedMeasurementSettingsName.property; - webDataStream = enhancedMeasurementSettingsName.webDataStream; + this.property = enhancedMeasurementSettingsName.property; + this.webDataStream = enhancedMeasurementSettingsName.webDataStream; } public EnhancedMeasurementSettingsName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLinkName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLinkName.java index ce8dc214..513632cb 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLinkName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/FirebaseLinkName.java @@ -181,8 +181,8 @@ public Builder setFirebaseLink(String firebaseLink) { } private Builder(FirebaseLinkName firebaseLinkName) { - property = firebaseLinkName.property; - firebaseLink = firebaseLinkName.firebaseLink; + this.property = firebaseLinkName.property; + this.firebaseLink = firebaseLinkName.firebaseLink; } public FirebaseLinkName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTagName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTagName.java index d85fc90d..ecb906f9 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTagName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GlobalSiteTagName.java @@ -158,7 +158,7 @@ public Builder setProperty(String property) { } private Builder(GlobalSiteTagName globalSiteTagName) { - property = globalSiteTagName.property; + this.property = globalSiteTagName.property; } public GlobalSiteTagName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLinkName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLinkName.java index 6fb8423f..dceffbb5 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLinkName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleAdsLinkName.java @@ -183,8 +183,8 @@ public Builder setGoogleAdsLink(String googleAdsLink) { } private Builder(GoogleAdsLinkName googleAdsLinkName) { - property = googleAdsLinkName.property; - googleAdsLink = googleAdsLinkName.googleAdsLink; + this.property = googleAdsLinkName.property; + this.googleAdsLink = googleAdsLinkName.googleAdsLink; } public GoogleAdsLinkName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleSignalsSettingsName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleSignalsSettingsName.java index 5faf4820..297a3057 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleSignalsSettingsName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/GoogleSignalsSettingsName.java @@ -159,7 +159,7 @@ public Builder setProperty(String property) { } private Builder(GoogleSignalsSettingsName googleSignalsSettingsName) { - property = googleSignalsSettingsName.property; + this.property = googleSignalsSettingsName.property; } public GoogleSignalsSettingsName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStreamName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStreamName.java index 3235c77e..29a9271a 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStreamName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/IosAppDataStreamName.java @@ -187,8 +187,8 @@ public Builder setIosAppDataStream(String iosAppDataStream) { } private Builder(IosAppDataStreamName iosAppDataStreamName) { - property = iosAppDataStreamName.property; - iosAppDataStream = iosAppDataStreamName.iosAppDataStream; + this.property = iosAppDataStreamName.property; + this.iosAppDataStream = iosAppDataStreamName.iosAppDataStream; } public IosAppDataStreamName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/MeasurementProtocolSecretName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/MeasurementProtocolSecretName.java index 3a8bd481..c43d5d32 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/MeasurementProtocolSecretName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/MeasurementProtocolSecretName.java @@ -229,9 +229,9 @@ public Builder setMeasurementProtocolSecret(String measurementProtocolSecret) { } private Builder(MeasurementProtocolSecretName measurementProtocolSecretName) { - property = measurementProtocolSecretName.property; - webDataStream = measurementProtocolSecretName.webDataStream; - measurementProtocolSecret = measurementProtocolSecretName.measurementProtocolSecret; + this.property = measurementProtocolSecretName.property; + this.webDataStream = measurementProtocolSecretName.webDataStream; + this.measurementProtocolSecret = measurementProtocolSecretName.measurementProtocolSecret; } public MeasurementProtocolSecretName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/PropertyName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/PropertyName.java index 1fce097c..213b82f6 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/PropertyName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/PropertyName.java @@ -158,7 +158,7 @@ public Builder setProperty(String property) { } private Builder(PropertyName propertyName) { - property = propertyName.property; + this.property = propertyName.property; } public PropertyName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLinkName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLinkName.java index 0a68da91..6ff103be 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLinkName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/UserLinkName.java @@ -252,8 +252,8 @@ private Builder(UserLinkName userLinkName) { Preconditions.checkArgument( Objects.equals(userLinkName.pathTemplate, ACCOUNT_USER_LINK), "toBuilder is only supported when UserLinkName has the pattern of accounts/{account}/userLinks/{user_link}"); - account = userLinkName.account; - userLink = userLinkName.userLink; + this.account = userLinkName.account; + this.userLink = userLinkName.userLink; } public UserLinkName build() { diff --git a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStreamName.java b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStreamName.java index b9faebf4..6835bd79 100644 --- a/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStreamName.java +++ b/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/WebDataStreamName.java @@ -183,8 +183,8 @@ public Builder setWebDataStream(String webDataStream) { } private Builder(WebDataStreamName webDataStreamName) { - property = webDataStreamName.property; - webDataStream = webDataStreamName.webDataStream; + this.property = webDataStreamName.property; + this.webDataStream = webDataStreamName.webDataStream; } public WebDataStreamName build() { diff --git a/renovate.json b/renovate.json index 1291cc6e..683b5f76 100644 --- a/renovate.json +++ b/renovate.json @@ -69,5 +69,8 @@ } ], "semanticCommits": true, - "masterIssue": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 0c972b83..00362710 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.analytics google-analytics-admin - 0.3.2 + 0.4.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0cbcbc99..728d24fa 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.analytics google-analytics-admin - 0.4.0 + 0.5.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 82e95579..850bd409 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -27,7 +27,7 @@ com.google.analytics google-analytics-admin - 0.4.0 + 0.5.0 diff --git a/versions.txt b/versions.txt index 26a37fc3..24a18b81 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-analytics-admin:0.4.0:0.4.0 -grpc-google-analytics-admin-v1alpha:0.4.0:0.4.0 -proto-google-analytics-admin-v1alpha:0.4.0:0.4.0 +google-analytics-admin:0.5.0:0.5.0 +grpc-google-analytics-admin-v1alpha:0.5.0:0.5.0 +proto-google-analytics-admin-v1alpha:0.5.0:0.5.0