diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml new file mode 100644 index 00000000..98f19efe --- /dev/null +++ b/.github/.OwlBot.lock.yaml @@ -0,0 +1,3 @@ +docker: + image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:b3f8a219abf58ed4a775da5b90934b34f477b74f6f4e5d15781694dcc67b6f41 diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml new file mode 100644 index 00000000..524c48f0 --- /dev/null +++ b/.github/.OwlBot.yaml @@ -0,0 +1,29 @@ +# 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 +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +docker: + image: "gcr.io/repo-automation-bots/owlbot-java:latest" + +deep-remove-regex: +- "/grpc-google-.*/src" +- "/proto-google-.*/src" +- "/google-.*/src" + +deep-copy-regex: +- source: "/google/analytics/data/(v.*)/.*-java/proto-google-.*/src" + dest: "/owl-bot-staging/$1/proto-google-analytics-data-$1/src" +- source: "/google/analytics/data/(v.*)/.*-java/grpc-google-.*/src" + dest: "/owl-bot-staging/$1/grpc-google-analytics-data-$1/src" +- source: "/google/analytics/data/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-analytics-data/src" diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 47c2ba13..c644a24e 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 6e2b7bd9..51cdd5c7 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-data.git", - "sha": "76c52b98bc492d4c9c56bd44f39bf854c2b44057" + "sha": "8da023aa988851728c563d8be57242a29090efdd" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "79c8dd7ee768292f933012d3a69a5b4676404cda" + "sha": "d9ddac83a22a600dd33854c9d835a4fe52284207" } } ] diff --git a/.github/release-please.yml b/.github/release-please.yml index dce2c845..8ca7f9ca 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,2 +1,3 @@ +bumpMinorPreMajor: true +handleGHRelease: true releaseType: java-yoshi -bumpMinorPreMajor: true \ No newline at end of file diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 537f386a..6362cb60 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -39,6 +39,7 @@ branchProtectionRules: - "units (11)" - "Kokoro - Test: Integration" - "cla/google" + - "OwlBot Post Processor" # List of explicit permissions to add (additive only) permissionRules: - team: yoshi-admins diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index def8b3a2..0195b32f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,10 +19,6 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test - - name: coverage - uses: codecov/codecov-action@v1 - with: - name: actions ${{matrix.java}} windows: runs-on: windows-latest steps: @@ -80,4 +76,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d55e7f7e..bdfd0a92 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi 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 0fb8c843..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]}")) @@ -33,6 +34,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true @@ -45,7 +47,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -69,7 +71,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index c33c9236..f18ec8ff 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml @@ -49,6 +51,13 @@ pushd target/docfx-yml python3 -m docuploader create-metadata \ --name ${NAME} \ --version ${VERSION} \ + --xrefs devsite://java/gax \ + --xrefs devsite://java/google-cloud-core \ + --xrefs devsite://java/api-common \ + --xrefs devsite://java/proto-google-common-protos \ + --xrefs devsite://java/google-api-client \ + --xrefs devsite://java/google-http-client \ + --xrefs devsite://java/protobuf \ --language java # upload yml to production bucket diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a7..1f55b770 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2e..8a103384 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/.repo-metadata.json b/.repo-metadata.json index 4ffeeaab..163d8bb5 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -1,16 +1,17 @@ { - "name": "analytics-data", - "name_pretty": "Analytics Data", - "product_documentation": "https://developers.google.com/analytics/trusted-testing/analytics-data", - "api_description": "provides programmatic methods to access report data in Google Analytics App+Web properties.", - "client_documentation": "https://googleapis.dev/java/google-analytics-data/latest/index.html", - "release_level": "alpha", - "transport": "grpc", - "language": "java", - "repo": "googleapis/java-analytics-data", - "repo_short": "java-analytics-data", - "distribution_name": "com.google.analytics:google-analytics-data", - "api_id": "analytics-data.googleapis.com", - "requires_billing": true, - "codeowner_team": "@googleapis/analytics-dpe" -} \ No newline at end of file + "name": "analytics-data", + "name_pretty": "Analytics Data", + "product_documentation": "https://developers.google.com/analytics/trusted-testing/analytics-data", + "api_description": "provides programmatic methods to access report data in Google Analytics App+Web properties.", + "client_documentation": "https://googleapis.dev/java/google-analytics-data/latest/index.html", + "release_level": "alpha", + "transport": "grpc", + "language": "java", + "repo": "googleapis/java-analytics-data", + "repo_short": "java-analytics-data", + "distribution_name": "com.google.analytics:google-analytics-data", + "api_id": "analytics-data.googleapis.com", + "requires_billing": true, + "codeowner_team": "@googleapis/analytics-dpe", + "library_type": "GAPIC_AUTO" +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 797ed4a0..61d406f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## [0.8.0](https://www.github.com/googleapis/java-analytics-data/compare/v0.7.1...v0.8.0) (2021-07-15) + + +### Features + +* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#213](https://www.github.com/googleapis/java-analytics-data/issues/213)) ([4791520](https://www.github.com/googleapis/java-analytics-data/commit/479152031b0f2963191c387a8500d83fddaf6624)) +* add `kind` field which is used to distinguish between response types feat: add `potentially_thresholded_requests_per_hour` field to `PropertyQuota` ([#182](https://www.github.com/googleapis/java-analytics-data/issues/182)) ([8b30dcd](https://www.github.com/googleapis/java-analytics-data/commit/8b30dcd3132fd5a43955dda3f4c4aaddac2d0035)) +* add `potentially_thresholded_requests_per_hour` field to `PropertyQuota` ([c1d3e02](https://www.github.com/googleapis/java-analytics-data/commit/c1d3e02456af734220c88fce4b67e8702583cf1a)) +* add kind field which is used to distinguish between responsetypes ([c1d3e02](https://www.github.com/googleapis/java-analytics-data/commit/c1d3e02456af734220c88fce4b67e8702583cf1a)) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-analytics-data/issues/1130)) ([#228](https://www.github.com/googleapis/java-analytics-data/issues/228)) ([f4ea7d3](https://www.github.com/googleapis/java-analytics-data/commit/f4ea7d32ba63a60401940968d00e15ac31f7409c)) +* owlbot post-processor should generate README ([#1154](https://www.github.com/googleapis/java-analytics-data/issues/1154)) ([#234](https://www.github.com/googleapis/java-analytics-data/issues/234)) ([89cd9b5](https://www.github.com/googleapis/java-analytics-data/commit/89cd9b51a892cadee81932c3562264c5c6f2a0f8)), closes [#1146](https://www.github.com/googleapis/java-analytics-data/issues/1146) [#1147](https://www.github.com/googleapis/java-analytics-data/issues/1147) +* release scripts from issuing overlapping phases ([#196](https://www.github.com/googleapis/java-analytics-data/issues/196)) ([a17287f](https://www.github.com/googleapis/java-analytics-data/commit/a17287fe5ce6b76f4a55d340c77fba11c9c459b8)) +* typo ([#194](https://www.github.com/googleapis/java-analytics-data/issues/194)) ([e62c6ef](https://www.github.com/googleapis/java-analytics-data/commit/e62c6ef3069442fd32727609215521478a07e8ca)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#197](https://www.github.com/googleapis/java-analytics-data/issues/197)) ([4aba8fa](https://www.github.com/googleapis/java-analytics-data/commit/4aba8fa114b46ca1eefd64f63a5ffe9f1d726dd2)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#201](https://www.github.com/googleapis/java-analytics-data/issues/201)) ([46af6c8](https://www.github.com/googleapis/java-analytics-data/commit/46af6c80d0c838dcec27087e585c83f7eca50eda)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#209](https://www.github.com/googleapis/java-analytics-data/issues/209)) ([f15138c](https://www.github.com/googleapis/java-analytics-data/commit/f15138c30e675f56a47480e76ead95193286669e)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#212](https://www.github.com/googleapis/java-analytics-data/issues/212)) ([f34f92b](https://www.github.com/googleapis/java-analytics-data/commit/f34f92b0869cbd87b7f8909d1a5335e4adbb4851)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.3.0 ([#221](https://www.github.com/googleapis/java-analytics-data/issues/221)) ([1edc82e](https://www.github.com/googleapis/java-analytics-data/commit/1edc82e2a151692805472f87c550df7f0321b190)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#229](https://www.github.com/googleapis/java-analytics-data/issues/229)) ([f3e97ab](https://www.github.com/googleapis/java-analytics-data/commit/f3e97ab77a5b09879ade1b49fdac067ede5d6a88)) + ### [0.7.1](https://www.github.com/googleapis/java-analytics-data/compare/v0.7.0...v0.7.1) (2021-04-09) diff --git a/README.md b/README.md index b5edf62f..e7a291b6 100644 --- a/README.md +++ b/README.md @@ -20,18 +20,18 @@ If you are using Maven, add this to your pom.xml file: com.google.analytics google-analytics-data - 0.7.0 + 0.7.1 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.analytics:google-analytics-data:0.7.0' +compile 'com.google.analytics:google-analytics-data:0.7.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.analytics" % "google-analytics-data" % "0.7.0" +libraryDependencies += "com.google.analytics" % "google-analytics-data" % "0.7.1" ``` ## Authentication @@ -85,10 +85,50 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Analytics Data 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 @@ -152,3 +192,9 @@ Java is a registered trademark of Oracle and/or its affiliates. [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=analytics-data.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/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..8b58ae9c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,7 @@ +# Security Policy + +To report a security issue, please use [g.co/vulnz](https://g.co/vulnz). + +The Google Security Team will respond within 5 working days of your report on g.co/vulnz. + +We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue. diff --git a/google-analytics-data-bom/pom.xml b/google-analytics-data-bom/pom.xml index e13e7c70..c76f3bd6 100644 --- a/google-analytics-data-bom/pom.xml +++ b/google-analytics-data-bom/pom.xml @@ -1,14 +1,14 @@ - + 4.0.0 com.google.analytics google-analytics-data-bom - 0.7.1 + 0.8.0 pom com.google.cloud google-cloud-shared-config - 0.10.0 + 0.12.0 Google Analytics Data BOM @@ -43,17 +43,6 @@ 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 @@ -64,31 +53,30 @@ - com.google.analytics google-analytics-data - 0.7.1 + 0.8.0 com.google.api.grpc - proto-google-analytics-data-v1alpha - 0.7.1 + grpc-google-analytics-data-v1alpha + 0.8.0 com.google.api.grpc - proto-google-analytics-data-v1beta - 0.7.1 + grpc-google-analytics-data-v1beta + 0.8.0 com.google.api.grpc - grpc-google-analytics-data-v1alpha - 0.7.1 + proto-google-analytics-data-v1alpha + 0.8.0 com.google.api.grpc - grpc-google-analytics-data-v1beta - 0.7.1 + proto-google-analytics-data-v1beta + 0.8.0 diff --git a/google-analytics-data/pom.xml b/google-analytics-data/pom.xml index c208cc12..e247c8f4 100644 --- a/google-analytics-data/pom.xml +++ b/google-analytics-data/pom.xml @@ -1,9 +1,9 @@ - + 4.0.0 com.google.analytics google-analytics-data - 0.7.1 + 0.8.0 jar Google Analytics Data https://github.com/googleapis/java-analytics-data @@ -11,7 +11,7 @@ com.google.analytics google-analytics-data-parent - 0.7.1 + 0.8.0 google-analytics-data @@ -117,4 +117,4 @@ - \ No newline at end of file + diff --git a/google-analytics-data/src/test/java/com/google/analytics/data/v1alpha/AlphaAnalyticsDataClientTest.java b/google-analytics-data/src/test/java/com/google/analytics/data/v1alpha/AlphaAnalyticsDataClientTest.java index 7400e75a..40b042a2 100644 --- a/google-analytics-data/src/test/java/com/google/analytics/data/v1alpha/AlphaAnalyticsDataClientTest.java +++ b/google-analytics-data/src/test/java/com/google/analytics/data/v1alpha/AlphaAnalyticsDataClientTest.java @@ -40,9 +40,9 @@ @Generated("by gapic-generator-java") public class AlphaAnalyticsDataClientTest { + private static MockAlphaAnalyticsData mockAlphaAnalyticsData; private static MockServiceHelper mockServiceHelper; private AlphaAnalyticsDataClient client; - private static MockAlphaAnalyticsData mockAlphaAnalyticsData; private LocalChannelProvider channelProvider; @BeforeClass diff --git a/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java b/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java index f4e055aa..816bcf34 100644 --- a/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java +++ b/google-analytics-data/src/test/java/com/google/analytics/data/v1beta/BetaAnalyticsDataClientTest.java @@ -40,9 +40,9 @@ @Generated("by gapic-generator-java") public class BetaAnalyticsDataClientTest { + private static MockBetaAnalyticsData mockBetaAnalyticsData; private static MockServiceHelper mockServiceHelper; private BetaAnalyticsDataClient client; - private static MockBetaAnalyticsData mockBetaAnalyticsData; private LocalChannelProvider channelProvider; @BeforeClass @@ -89,6 +89,7 @@ public void runReportTest() throws Exception { .setRowCount(1340416618) .setMetadata(ResponseMetaData.newBuilder().build()) .setPropertyQuota(PropertyQuota.newBuilder().build()) + .setKind("kind3292052") .build(); mockBetaAnalyticsData.addResponse(expectedResponse); @@ -179,6 +180,7 @@ public void runPivotReportTest() throws Exception { .addAllAggregates(new ArrayList()) .setMetadata(ResponseMetaData.newBuilder().build()) .setPropertyQuota(PropertyQuota.newBuilder().build()) + .setKind("kind3292052") .build(); mockBetaAnalyticsData.addResponse(expectedResponse); @@ -253,6 +255,7 @@ public void batchRunReportsTest() throws Exception { BatchRunReportsResponse expectedResponse = BatchRunReportsResponse.newBuilder() .addAllReports(new ArrayList()) + .setKind("kind3292052") .build(); mockBetaAnalyticsData.addResponse(expectedResponse); @@ -300,6 +303,7 @@ public void batchRunPivotReportsTest() throws Exception { BatchRunPivotReportsResponse expectedResponse = BatchRunPivotReportsResponse.newBuilder() .addAllPivotReports(new ArrayList()) + .setKind("kind3292052") .build(); mockBetaAnalyticsData.addResponse(expectedResponse); @@ -435,6 +439,7 @@ public void runRealtimeReportTest() throws Exception { .addAllMinimums(new ArrayList()) .setRowCount(1340416618) .setPropertyQuota(PropertyQuota.newBuilder().build()) + .setKind("kind3292052") .build(); mockBetaAnalyticsData.addResponse(expectedResponse); diff --git a/grpc-google-analytics-data-v1alpha/pom.xml b/grpc-google-analytics-data-v1alpha/pom.xml index 194c1084..fcbbd501 100644 --- a/grpc-google-analytics-data-v1alpha/pom.xml +++ b/grpc-google-analytics-data-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-data-v1alpha - 0.7.1 + 0.8.0 grpc-google-analytics-data-v1alpha GRPC library for grpc-google-analytics-data-v1alpha com.google.analytics google-analytics-data-parent - 0.7.1 + 0.8.0 diff --git a/grpc-google-analytics-data-v1beta/pom.xml b/grpc-google-analytics-data-v1beta/pom.xml index 4a3c1cf9..47e29963 100644 --- a/grpc-google-analytics-data-v1beta/pom.xml +++ b/grpc-google-analytics-data-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-analytics-data-v1beta - 0.7.1 + 0.8.0 grpc-google-analytics-data-v1beta GRPC library for grpc-google-analytics-data-v1beta com.google.analytics google-analytics-data-parent - 0.7.1 + 0.8.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/synth.py b/owlbot.py similarity index 53% rename from synth.py rename to owlbot.py index 4e3b4d42..dca9d867 100644 --- a/synth.py +++ b/owlbot.py @@ -1,10 +1,10 @@ -# Copyright 2020 Google LLC +# 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 # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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, @@ -12,19 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""This script is used to synthesize generated parts of this library.""" +import synthtool as s +from synthtool.languages import java -import synthtool.languages.java as java -service = 'analytics-data' -versions = ['v1alpha', 'v1beta'] +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) -for version in versions: - java.pregenerated_library( - service=service, - version=version, - path=f'google/analytics/data/{version}', - cloud_api=False, - ) - -java.common_templates() \ No newline at end of file +s.remove_staging_dirs() +java.common_templates() diff --git a/pom.xml b/pom.xml index 6e601135..486de198 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.analytics google-analytics-data-parent pom - 0.7.1 + 0.8.0 Google Analytics Data Parent https://github.com/googleapis/java-analytics-data @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.10.0 + 0.12.0 @@ -41,16 +41,7 @@ https://github.com/googleapis/java-analytics-data/issues GitHub Issues - - - sonatype-nexus-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - + Apache-2.0 @@ -70,33 +61,33 @@ com.google.analytics google-analytics-data - 0.7.1 + 0.8.0 com.google.api.grpc proto-google-analytics-data-v1alpha - 0.7.1 + 0.8.0 com.google.api.grpc proto-google-analytics-data-v1beta - 0.7.1 + 0.8.0 com.google.api.grpc grpc-google-analytics-data-v1alpha - 0.7.1 + 0.8.0 com.google.api.grpc grpc-google-analytics-data-v1beta - 0.7.1 + 0.8.0 com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.4.0 pom import @@ -122,10 +113,10 @@ google-analytics-data - proto-google-analytics-data-v1alpha - proto-google-analytics-data-v1beta grpc-google-analytics-data-v1alpha grpc-google-analytics-data-v1beta + proto-google-analytics-data-v1alpha + proto-google-analytics-data-v1beta google-analytics-data-bom @@ -134,7 +125,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.1 + 3.1.2 @@ -161,7 +152,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html @@ -198,4 +189,4 @@ - \ No newline at end of file + diff --git a/proto-google-analytics-data-v1alpha/pom.xml b/proto-google-analytics-data-v1alpha/pom.xml index d4c41f0b..0aaada43 100644 --- a/proto-google-analytics-data-v1alpha/pom.xml +++ b/proto-google-analytics-data-v1alpha/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-data-v1alpha - 0.7.1 + 0.8.0 proto-google-analytics-data-v1alpha PROTO library for proto-google-analytics-data-v1alpha com.google.analytics google-analytics-data-parent - 0.7.1 + 0.8.0 diff --git a/proto-google-analytics-data-v1beta/pom.xml b/proto-google-analytics-data-v1beta/pom.xml index c1c52c13..180a343c 100644 --- a/proto-google-analytics-data-v1beta/pom.xml +++ b/proto-google-analytics-data-v1beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-analytics-data-v1beta - 0.7.1 + 0.8.0 proto-google-analytics-data-v1beta PROTO library for proto-google-analytics-data-v1beta com.google.analytics google-analytics-data-parent - 0.7.1 + 0.8.0 diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java index 81e32b4a..fa7cefd2 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/AnalyticsDataApiProto.java @@ -112,7 +112,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "derBy\022\025\n\rcurrency_code\030\013 \001(\t\022=\n\013cohort_s" + "pec\030\014 \001(\0132(.google.analytics.data.v1beta" + ".CohortSpec\022\027\n\017keep_empty_rows\030\r \001(\010\022\035\n\025" - + "return_property_quota\030\016 \001(\010\"\211\004\n\021RunRepor" + + "return_property_quota\030\016 \001(\010\"\227\004\n\021RunRepor" + "tResponse\022H\n\021dimension_headers\030\001 \003(\0132-.g" + "oogle.analytics.data.v1beta.DimensionHea" + "der\022B\n\016metric_headers\030\002 \003(\0132*.google.ana" @@ -125,105 +125,106 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\trow_count\030\007 \001(\005\022@\n\010metadata\030\010 \001(\0132..goo" + "gle.analytics.data.v1beta.ResponseMetaDa" + "ta\022C\n\016property_quota\030\t \001(\0132+.google.anal" - + "ytics.data.v1beta.PropertyQuota\"\257\004\n\025RunP" - + "ivotReportRequest\022\020\n\010property\030\001 \001(\t\022;\n\nd" - + "imensions\030\002 \003(\0132\'.google.analytics.data." - + "v1beta.Dimension\0225\n\007metrics\030\003 \003(\0132$.goog" - + "le.analytics.data.v1beta.Metric\022<\n\013date_" - + "ranges\030\004 \003(\0132\'.google.analytics.data.v1b" - + "eta.DateRange\0223\n\006pivots\030\005 \003(\0132#.google.a" - + "nalytics.data.v1beta.Pivot\022H\n\020dimension_" - + "filter\030\006 \001(\0132..google.analytics.data.v1b" - + "eta.FilterExpression\022E\n\rmetric_filter\030\007 " - + "\001(\0132..google.analytics.data.v1beta.Filte" - + "rExpression\022\025\n\rcurrency_code\030\010 \001(\t\022=\n\013co" - + "hort_spec\030\t \001(\0132(.google.analytics.data." - + "v1beta.CohortSpec\022\027\n\017keep_empty_rows\030\n \001" - + "(\010\022\035\n\025return_property_quota\030\013 \001(\010\"\327\003\n\026Ru" - + "nPivotReportResponse\022@\n\rpivot_headers\030\001 " - + "\003(\0132).google.analytics.data.v1beta.Pivot" - + "Header\022H\n\021dimension_headers\030\002 \003(\0132-.goog" - + "le.analytics.data.v1beta.DimensionHeader" - + "\022B\n\016metric_headers\030\003 \003(\0132*.google.analyt" - + "ics.data.v1beta.MetricHeader\022/\n\004rows\030\004 \003" - + "(\0132!.google.analytics.data.v1beta.Row\0225\n" - + "\naggregates\030\005 \003(\0132!.google.analytics.dat" - + "a.v1beta.Row\022@\n\010metadata\030\006 \001(\0132..google." - + "analytics.data.v1beta.ResponseMetaData\022C" - + "\n\016property_quota\030\007 \001(\0132+.google.analytic" - + "s.data.v1beta.PropertyQuota\"l\n\026BatchRunR" - + "eportsRequest\022\020\n\010property\030\001 \001(\t\022@\n\010reque" - + "sts\030\002 \003(\0132..google.analytics.data.v1beta" - + ".RunReportRequest\"[\n\027BatchRunReportsResp" - + "onse\022@\n\007reports\030\001 \003(\0132/.google.analytics" - + ".data.v1beta.RunReportResponse\"v\n\033BatchR" - + "unPivotReportsRequest\022\020\n\010property\030\001 \001(\t\022" - + "E\n\010requests\030\002 \003(\01323.google.analytics.dat" - + "a.v1beta.RunPivotReportRequest\"k\n\034BatchR" - + "unPivotReportsResponse\022K\n\rpivot_reports\030" - + "\001 \003(\01324.google.analytics.data.v1beta.Run" - + "PivotReportResponse\"Q\n\022GetMetadataReques" - + "t\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n%analyticsdata.g" - + "oogleapis.com/Metadata\"\347\003\n\030RunRealtimeRe" - + "portRequest\022\020\n\010property\030\001 \001(\t\022;\n\ndimensi" - + "ons\030\002 \003(\0132\'.google.analytics.data.v1beta" - + ".Dimension\0225\n\007metrics\030\003 \003(\0132$.google.ana" - + "lytics.data.v1beta.Metric\022H\n\020dimension_f" - + "ilter\030\004 \001(\0132..google.analytics.data.v1be" - + "ta.FilterExpression\022E\n\rmetric_filter\030\005 \001" - + "(\0132..google.analytics.data.v1beta.Filter" - + "Expression\022\r\n\005limit\030\006 \001(\003\022L\n\023metric_aggr" - + "egations\030\007 \003(\0162/.google.analytics.data.v" - + "1beta.MetricAggregation\0228\n\torder_bys\030\010 \003" - + "(\0132%.google.analytics.data.v1beta.OrderB" - + "y\022\035\n\025return_property_quota\030\t \001(\010\"\317\003\n\031Run" - + "RealtimeReportResponse\022H\n\021dimension_head" - + "ers\030\001 \003(\0132-.google.analytics.data.v1beta" - + ".DimensionHeader\022B\n\016metric_headers\030\002 \003(\013" - + "2*.google.analytics.data.v1beta.MetricHe" - + "ader\022/\n\004rows\030\003 \003(\0132!.google.analytics.da" - + "ta.v1beta.Row\0221\n\006totals\030\004 \003(\0132!.google.a" - + "nalytics.data.v1beta.Row\0223\n\010maximums\030\005 \003" - + "(\0132!.google.analytics.data.v1beta.Row\0223\n" - + "\010minimums\030\006 \003(\0132!.google.analytics.data." - + "v1beta.Row\022\021\n\trow_count\030\007 \001(\005\022C\n\016propert" - + "y_quota\030\010 \001(\0132+.google.analytics.data.v1" - + "beta.PropertyQuota2\343\t\n\021BetaAnalyticsData" - + "\022\242\001\n\tRunReport\022..google.analytics.data.v" - + "1beta.RunReportRequest\032/.google.analytic" - + "s.data.v1beta.RunReportResponse\"4\202\323\344\223\002.\"" - + ")/v1beta/{property=properties/*}:runRepo" - + "rt:\001*\022\266\001\n\016RunPivotReport\0223.google.analyt" - + "ics.data.v1beta.RunPivotReportRequest\0324." - + "google.analytics.data.v1beta.RunPivotRep" - + "ortResponse\"9\202\323\344\223\0023\"./v1beta/{property=p" - + "roperties/*}:runPivotReport:\001*\022\272\001\n\017Batch" - + "RunReports\0224.google.analytics.data.v1bet" - + "a.BatchRunReportsRequest\0325.google.analyt" - + "ics.data.v1beta.BatchRunReportsResponse\"" - + ":\202\323\344\223\0024\"//v1beta/{property=properties/*}" - + ":batchRunReports:\001*\022\316\001\n\024BatchRunPivotRep" - + "orts\0229.google.analytics.data.v1beta.Batc" - + "hRunPivotReportsRequest\032:.google.analyti" - + "cs.data.v1beta.BatchRunPivotReportsRespo" - + "nse\"?\202\323\344\223\0029\"4/v1beta/{property=propertie" - + "s/*}:batchRunPivotReports:\001*\022\234\001\n\013GetMeta" - + "data\0220.google.analytics.data.v1beta.GetM" - + "etadataRequest\032&.google.analytics.data.v" - + "1beta.Metadata\"3\202\323\344\223\002&\022$/v1beta/{name=pr" - + "operties/*/metadata}\332A\004name\022\302\001\n\021RunRealt" - + "imeReport\0226.google.analytics.data.v1beta" - + ".RunRealtimeReportRequest\0327.google.analy" - + "tics.data.v1beta.RunRealtimeReportRespon" - + "se\"<\202\323\344\223\0026\"1/v1beta/{property=properties" - + "/*}:runRealtimeReport:\001*\032~\312A\034analyticsda" - + "ta.googleapis.com\322A\\https://www.googleap" - + "is.com/auth/analytics,https://www.google" - + "apis.com/auth/analytics.readonlyB}\n com." - + "google.analytics.data.v1betaB\025AnalyticsD" - + "ataApiProtoP\001Z@google.golang.org/genprot" - + "o/googleapis/analytics/data/v1beta;datab" - + "\006proto3" + + "ytics.data.v1beta.PropertyQuota\022\014\n\004kind\030" + + "\n \001(\t\"\257\004\n\025RunPivotReportRequest\022\020\n\010prope" + + "rty\030\001 \001(\t\022;\n\ndimensions\030\002 \003(\0132\'.google.a" + + "nalytics.data.v1beta.Dimension\0225\n\007metric" + + "s\030\003 \003(\0132$.google.analytics.data.v1beta.M" + + "etric\022<\n\013date_ranges\030\004 \003(\0132\'.google.anal" + + "ytics.data.v1beta.DateRange\0223\n\006pivots\030\005 " + + "\003(\0132#.google.analytics.data.v1beta.Pivot" + + "\022H\n\020dimension_filter\030\006 \001(\0132..google.anal" + + "ytics.data.v1beta.FilterExpression\022E\n\rme" + + "tric_filter\030\007 \001(\0132..google.analytics.dat" + + "a.v1beta.FilterExpression\022\025\n\rcurrency_co" + + "de\030\010 \001(\t\022=\n\013cohort_spec\030\t \001(\0132(.google.a" + + "nalytics.data.v1beta.CohortSpec\022\027\n\017keep_" + + "empty_rows\030\n \001(\010\022\035\n\025return_property_quot" + + "a\030\013 \001(\010\"\345\003\n\026RunPivotReportResponse\022@\n\rpi" + + "vot_headers\030\001 \003(\0132).google.analytics.dat" + + "a.v1beta.PivotHeader\022H\n\021dimension_header" + + "s\030\002 \003(\0132-.google.analytics.data.v1beta.D" + + "imensionHeader\022B\n\016metric_headers\030\003 \003(\0132*" + + ".google.analytics.data.v1beta.MetricHead" + + "er\022/\n\004rows\030\004 \003(\0132!.google.analytics.data" + + ".v1beta.Row\0225\n\naggregates\030\005 \003(\0132!.google" + + ".analytics.data.v1beta.Row\022@\n\010metadata\030\006" + + " \001(\0132..google.analytics.data.v1beta.Resp" + + "onseMetaData\022C\n\016property_quota\030\007 \001(\0132+.g" + + "oogle.analytics.data.v1beta.PropertyQuot" + + "a\022\014\n\004kind\030\010 \001(\t\"l\n\026BatchRunReportsReques" + + "t\022\020\n\010property\030\001 \001(\t\022@\n\010requests\030\002 \003(\0132.." + + "google.analytics.data.v1beta.RunReportRe" + + "quest\"i\n\027BatchRunReportsResponse\022@\n\007repo" + + "rts\030\001 \003(\0132/.google.analytics.data.v1beta" + + ".RunReportResponse\022\014\n\004kind\030\002 \001(\t\"v\n\033Batc" + + "hRunPivotReportsRequest\022\020\n\010property\030\001 \001(" + + "\t\022E\n\010requests\030\002 \003(\01323.google.analytics.d" + + "ata.v1beta.RunPivotReportRequest\"y\n\034Batc" + + "hRunPivotReportsResponse\022K\n\rpivot_report" + + "s\030\001 \003(\01324.google.analytics.data.v1beta.R" + + "unPivotReportResponse\022\014\n\004kind\030\002 \001(\t\"Q\n\022G" + + "etMetadataRequest\022;\n\004name\030\001 \001(\tB-\340A\002\372A\'\n" + + "%analyticsdata.googleapis.com/Metadata\"\347" + + "\003\n\030RunRealtimeReportRequest\022\020\n\010property\030" + + "\001 \001(\t\022;\n\ndimensions\030\002 \003(\0132\'.google.analy" + + "tics.data.v1beta.Dimension\0225\n\007metrics\030\003 " + + "\003(\0132$.google.analytics.data.v1beta.Metri" + + "c\022H\n\020dimension_filter\030\004 \001(\0132..google.ana" + + "lytics.data.v1beta.FilterExpression\022E\n\rm" + + "etric_filter\030\005 \001(\0132..google.analytics.da" + + "ta.v1beta.FilterExpression\022\r\n\005limit\030\006 \001(" + + "\003\022L\n\023metric_aggregations\030\007 \003(\0162/.google." + + "analytics.data.v1beta.MetricAggregation\022" + + "8\n\torder_bys\030\010 \003(\0132%.google.analytics.da" + + "ta.v1beta.OrderBy\022\035\n\025return_property_quo" + + "ta\030\t \001(\010\"\335\003\n\031RunRealtimeReportResponse\022H" + + "\n\021dimension_headers\030\001 \003(\0132-.google.analy" + + "tics.data.v1beta.DimensionHeader\022B\n\016metr" + + "ic_headers\030\002 \003(\0132*.google.analytics.data" + + ".v1beta.MetricHeader\022/\n\004rows\030\003 \003(\0132!.goo" + + "gle.analytics.data.v1beta.Row\0221\n\006totals\030" + + "\004 \003(\0132!.google.analytics.data.v1beta.Row" + + "\0223\n\010maximums\030\005 \003(\0132!.google.analytics.da" + + "ta.v1beta.Row\0223\n\010minimums\030\006 \003(\0132!.google" + + ".analytics.data.v1beta.Row\022\021\n\trow_count\030" + + "\007 \001(\005\022C\n\016property_quota\030\010 \001(\0132+.google.a" + + "nalytics.data.v1beta.PropertyQuota\022\014\n\004ki" + + "nd\030\t \001(\t2\343\t\n\021BetaAnalyticsData\022\242\001\n\tRunRe" + + "port\022..google.analytics.data.v1beta.RunR" + + "eportRequest\032/.google.analytics.data.v1b" + + "eta.RunReportResponse\"4\202\323\344\223\002.\")/v1beta/{" + + "property=properties/*}:runReport:\001*\022\266\001\n\016" + + "RunPivotReport\0223.google.analytics.data.v" + + "1beta.RunPivotReportRequest\0324.google.ana" + + "lytics.data.v1beta.RunPivotReportRespons" + + "e\"9\202\323\344\223\0023\"./v1beta/{property=properties/" + + "*}:runPivotReport:\001*\022\272\001\n\017BatchRunReports" + + "\0224.google.analytics.data.v1beta.BatchRun" + + "ReportsRequest\0325.google.analytics.data.v" + + "1beta.BatchRunReportsResponse\":\202\323\344\223\0024\"//" + + "v1beta/{property=properties/*}:batchRunR" + + "eports:\001*\022\316\001\n\024BatchRunPivotReports\0229.goo" + + "gle.analytics.data.v1beta.BatchRunPivotR" + + "eportsRequest\032:.google.analytics.data.v1" + + "beta.BatchRunPivotReportsResponse\"?\202\323\344\223\002" + + "9\"4/v1beta/{property=properties/*}:batch" + + "RunPivotReports:\001*\022\234\001\n\013GetMetadata\0220.goo" + + "gle.analytics.data.v1beta.GetMetadataReq" + + "uest\032&.google.analytics.data.v1beta.Meta" + + "data\"3\202\323\344\223\002&\022$/v1beta/{name=properties/*" + + "/metadata}\332A\004name\022\302\001\n\021RunRealtimeReport\022" + + "6.google.analytics.data.v1beta.RunRealti" + + "meReportRequest\0327.google.analytics.data." + + "v1beta.RunRealtimeReportResponse\"<\202\323\344\223\0026" + + "\"1/v1beta/{property=properties/*}:runRea" + + "ltimeReport:\001*\032~\312A\034analyticsdata.googlea" + + "pis.com\322A\\https://www.googleapis.com/aut" + + "h/analytics,https://www.googleapis.com/a" + + "uth/analytics.readonlyB}\n com.google.ana" + + "lytics.data.v1betaB\025AnalyticsDataApiProt" + + "oP\001Z@google.golang.org/genproto/googleap" + + "is/analytics/data/v1beta;datab\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -279,6 +280,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "RowCount", "Metadata", "PropertyQuota", + "Kind", }); internal_static_google_analytics_data_v1beta_RunPivotReportRequest_descriptor = getDescriptor().getMessageTypes().get(3); @@ -311,6 +313,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Aggregates", "Metadata", "PropertyQuota", + "Kind", }); internal_static_google_analytics_data_v1beta_BatchRunReportsRequest_descriptor = getDescriptor().getMessageTypes().get(5); @@ -326,7 +329,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_analytics_data_v1beta_BatchRunReportsResponse_descriptor, new java.lang.String[] { - "Reports", + "Reports", "Kind", }); internal_static_google_analytics_data_v1beta_BatchRunPivotReportsRequest_descriptor = getDescriptor().getMessageTypes().get(7); @@ -342,7 +345,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_analytics_data_v1beta_BatchRunPivotReportsResponse_descriptor, new java.lang.String[] { - "PivotReports", + "PivotReports", "Kind", }); internal_static_google_analytics_data_v1beta_GetMetadataRequest_descriptor = getDescriptor().getMessageTypes().get(9); @@ -382,6 +385,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Minimums", "RowCount", "PropertyQuota", + "Kind", }); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java index a4f817f2..660701e0 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponse.java @@ -39,6 +39,7 @@ private BatchRunPivotReportsResponse(com.google.protobuf.GeneratedMessageV3.Buil private BatchRunPivotReportsResponse() { pivotReports_ = java.util.Collections.emptyList(); + kind_ = ""; } @java.lang.Override @@ -85,6 +86,13 @@ private BatchRunPivotReportsResponse( extensionRegistry)); break; } + case 18: + { + java.lang.String s = input.readStringRequireUtf8(); + + kind_ = s; + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -193,6 +201,59 @@ public com.google.analytics.data.v1beta.RunPivotReportResponseOrBuilder getPivot return pivotReports_.get(index); } + public static final int KIND_FIELD_NUMBER = 2; + private volatile java.lang.Object kind_; + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The kind. + */ + @java.lang.Override + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } + } + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The bytes for kind. + */ + @java.lang.Override + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -210,6 +271,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < pivotReports_.size(); i++) { output.writeMessage(1, pivotReports_.get(i)); } + if (!getKindBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kind_); + } unknownFields.writeTo(output); } @@ -222,6 +286,9 @@ public int getSerializedSize() { for (int i = 0; i < pivotReports_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, pivotReports_.get(i)); } + if (!getKindBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kind_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -239,6 +306,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.BatchRunPivotReportsResponse) obj; if (!getPivotReportsList().equals(other.getPivotReportsList())) return false; + if (!getKind().equals(other.getKind())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -254,6 +322,8 @@ public int hashCode() { hash = (37 * hash) + PIVOT_REPORTS_FIELD_NUMBER; hash = (53 * hash) + getPivotReportsList().hashCode(); } + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKind().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -408,6 +478,8 @@ public Builder clear() { } else { pivotReportsBuilder_.clear(); } + kind_ = ""; + return this; } @@ -446,6 +518,7 @@ public com.google.analytics.data.v1beta.BatchRunPivotReportsResponse buildPartia } else { result.pivotReports_ = pivotReportsBuilder_.build(); } + result.kind_ = kind_; onBuilt(); return result; } @@ -524,6 +597,10 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.BatchRunPivotReportsRe } } } + if (!other.getKind().isEmpty()) { + kind_ = other.kind_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -921,6 +998,122 @@ public com.google.analytics.data.v1beta.RunPivotReportResponse.Builder addPivotR return pivotReportsBuilder_; } + private java.lang.Object kind_ = ""; + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @return The kind. + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @return The bytes for kind. + */ + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @param value The kind to set. + * @return This builder for chaining. + */ + public Builder setKind(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kind_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @return This builder for chaining. + */ + public Builder clearKind() { + + kind_ = getDefaultInstance().getKind(); + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @param value The bytes for kind to set. + * @return This builder for chaining. + */ + public Builder setKindBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kind_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponseOrBuilder.java index 5f205584..97e2320f 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponseOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunPivotReportsResponseOrBuilder.java @@ -75,4 +75,33 @@ public interface BatchRunPivotReportsResponseOrBuilder */ com.google.analytics.data.v1beta.RunPivotReportResponseOrBuilder getPivotReportsOrBuilder( int index); + + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The kind. + */ + java.lang.String getKind(); + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunPivotReports". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The bytes for kind. + */ + com.google.protobuf.ByteString getKindBytes(); } diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java index 9af281f3..ae433bfd 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponse.java @@ -39,6 +39,7 @@ private BatchRunReportsResponse(com.google.protobuf.GeneratedMessageV3.Builder + * Identifies what kind of resource this message is. This `kind` is always the + * fixed string "analyticsData#batchRunReports". Useful to distinguish between + * response types in JSON. + * + * + * string kind = 2; + * + * @return The kind. + */ + @java.lang.Override + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } + } + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The bytes for kind. + */ + @java.lang.Override + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -208,6 +269,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < reports_.size(); i++) { output.writeMessage(1, reports_.get(i)); } + if (!getKindBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, kind_); + } unknownFields.writeTo(output); } @@ -220,6 +284,9 @@ public int getSerializedSize() { for (int i = 0; i < reports_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, reports_.get(i)); } + if (!getKindBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, kind_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -237,6 +304,7 @@ public boolean equals(final java.lang.Object obj) { (com.google.analytics.data.v1beta.BatchRunReportsResponse) obj; if (!getReportsList().equals(other.getReportsList())) return false; + if (!getKind().equals(other.getKind())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -252,6 +320,8 @@ public int hashCode() { hash = (37 * hash) + REPORTS_FIELD_NUMBER; hash = (53 * hash) + getReportsList().hashCode(); } + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKind().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -406,6 +476,8 @@ public Builder clear() { } else { reportsBuilder_.clear(); } + kind_ = ""; + return this; } @@ -443,6 +515,7 @@ public com.google.analytics.data.v1beta.BatchRunReportsResponse buildPartial() { } else { result.reports_ = reportsBuilder_.build(); } + result.kind_ = kind_; onBuilt(); return result; } @@ -520,6 +593,10 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.BatchRunReportsRespons } } } + if (!other.getKind().isEmpty()) { + kind_ = other.kind_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -905,6 +982,122 @@ public com.google.analytics.data.v1beta.RunReportResponse.Builder addReportsBuil return reportsBuilder_; } + private java.lang.Object kind_ = ""; + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @return The kind. + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @return The bytes for kind. + */ + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @param value The kind to set. + * @return This builder for chaining. + */ + public Builder setKind(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kind_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @return This builder for chaining. + */ + public Builder clearKind() { + + kind_ = getDefaultInstance().getKind(); + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 2; + * + * @param value The bytes for kind to set. + * @return This builder for chaining. + */ + public Builder setKindBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kind_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponseOrBuilder.java index b86e22ce..1fd1ce9e 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponseOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/BatchRunReportsResponseOrBuilder.java @@ -74,4 +74,33 @@ public interface BatchRunReportsResponseOrBuilder * repeated .google.analytics.data.v1beta.RunReportResponse reports = 1; */ com.google.analytics.data.v1beta.RunReportResponseOrBuilder getReportsOrBuilder(int index); + + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The kind. + */ + java.lang.String getKind(); + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#batchRunReports". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 2; + * + * @return The bytes for kind. + */ + com.google.protobuf.ByteString getKindBytes(); } diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java index e52d34e1..d3a2e672 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/Pivot.java @@ -359,8 +359,8 @@ public long getOffset() { * *
    * The number of unique combinations of dimension values to return in this
-   * pivot. If unspecified, up to 10,000 unique combinations of dimension values
-   * are returned. `limit` must be positive.
+   * pivot. The `limit` parameter is required. A `limit` of 10,000 is common for
+   * single pivot requests.
    * The product of the `limit` for each `pivot` in a `RunPivotReportRequest`
    * must not exceed 100,000. For example, a two pivot request with `limit:
    * 1000` in each pivot will fail because the product is `1,000,000`.
@@ -1617,8 +1617,8 @@ public Builder clearOffset() {
      *
      * 
      * The number of unique combinations of dimension values to return in this
-     * pivot. If unspecified, up to 10,000 unique combinations of dimension values
-     * are returned. `limit` must be positive.
+     * pivot. The `limit` parameter is required. A `limit` of 10,000 is common for
+     * single pivot requests.
      * The product of the `limit` for each `pivot` in a `RunPivotReportRequest`
      * must not exceed 100,000. For example, a two pivot request with `limit:
      * 1000` in each pivot will fail because the product is `1,000,000`.
@@ -1637,8 +1637,8 @@ public long getLimit() {
      *
      * 
      * The number of unique combinations of dimension values to return in this
-     * pivot. If unspecified, up to 10,000 unique combinations of dimension values
-     * are returned. `limit` must be positive.
+     * pivot. The `limit` parameter is required. A `limit` of 10,000 is common for
+     * single pivot requests.
      * The product of the `limit` for each `pivot` in a `RunPivotReportRequest`
      * must not exceed 100,000. For example, a two pivot request with `limit:
      * 1000` in each pivot will fail because the product is `1,000,000`.
@@ -1660,8 +1660,8 @@ public Builder setLimit(long value) {
      *
      * 
      * The number of unique combinations of dimension values to return in this
-     * pivot. If unspecified, up to 10,000 unique combinations of dimension values
-     * are returned. `limit` must be positive.
+     * pivot. The `limit` parameter is required. A `limit` of 10,000 is common for
+     * single pivot requests.
      * The product of the `limit` for each `pivot` in a `RunPivotReportRequest`
      * must not exceed 100,000. For example, a two pivot request with `limit:
      * 1000` in each pivot will fail because the product is `1,000,000`.
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotOrBuilder.java
index 9471eef0..3b8b5514 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotOrBuilder.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PivotOrBuilder.java
@@ -176,8 +176,8 @@ public interface PivotOrBuilder
    *
    * 
    * The number of unique combinations of dimension values to return in this
-   * pivot. If unspecified, up to 10,000 unique combinations of dimension values
-   * are returned. `limit` must be positive.
+   * pivot. The `limit` parameter is required. A `limit` of 10,000 is common for
+   * single pivot requests.
    * The product of the `limit` for each `pivot` in a `RunPivotReportRequest`
    * must not exceed 100,000. For example, a two pivot request with `limit:
    * 1000` in each pivot will fail because the product is `1,000,000`.
diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java
index ebb6d7f0..5836d2c1 100644
--- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java
+++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuota.java
@@ -132,6 +132,22 @@ private PropertyQuota(
                 serverErrorsPerProjectPerHour_ = subBuilder.buildPartial();
               }
 
+              break;
+            }
+          case 42:
+            {
+              com.google.analytics.data.v1beta.QuotaStatus.Builder subBuilder = null;
+              if (potentiallyThresholdedRequestsPerHour_ != null) {
+                subBuilder = potentiallyThresholdedRequestsPerHour_.toBuilder();
+              }
+              potentiallyThresholdedRequestsPerHour_ =
+                  input.readMessage(
+                      com.google.analytics.data.v1beta.QuotaStatus.parser(), extensionRegistry);
+              if (subBuilder != null) {
+                subBuilder.mergeFrom(potentiallyThresholdedRequestsPerHour_);
+                potentiallyThresholdedRequestsPerHour_ = subBuilder.buildPartial();
+              }
+
               break;
             }
           default:
@@ -385,6 +401,67 @@ public com.google.analytics.data.v1beta.QuotaStatus getServerErrorsPerProjectPer
     return getServerErrorsPerProjectPerHour();
   }
 
+  public static final int POTENTIALLY_THRESHOLDED_REQUESTS_PER_HOUR_FIELD_NUMBER = 5;
+  private com.google.analytics.data.v1beta.QuotaStatus potentiallyThresholdedRequestsPerHour_;
+  /**
+   *
+   *
+   * 
+   * Analytics Properties can send up to 120 requests with potentially
+   * thresholded dimensions per hour. In a batch request, each report request
+   * is individually counted for this quota if the request contains potentially
+   * thresholded dimensions.
+   * 
+ * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + * + * @return Whether the potentiallyThresholdedRequestsPerHour field is set. + */ + @java.lang.Override + public boolean hasPotentiallyThresholdedRequestsPerHour() { + return potentiallyThresholdedRequestsPerHour_ != null; + } + /** + * + * + *
+   * Analytics Properties can send up to 120 requests with potentially
+   * thresholded dimensions per hour. In a batch request, each report request
+   * is individually counted for this quota if the request contains potentially
+   * thresholded dimensions.
+   * 
+ * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + * + * @return The potentiallyThresholdedRequestsPerHour. + */ + @java.lang.Override + public com.google.analytics.data.v1beta.QuotaStatus getPotentiallyThresholdedRequestsPerHour() { + return potentiallyThresholdedRequestsPerHour_ == null + ? com.google.analytics.data.v1beta.QuotaStatus.getDefaultInstance() + : potentiallyThresholdedRequestsPerHour_; + } + /** + * + * + *
+   * Analytics Properties can send up to 120 requests with potentially
+   * thresholded dimensions per hour. In a batch request, each report request
+   * is individually counted for this quota if the request contains potentially
+   * thresholded dimensions.
+   * 
+ * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + @java.lang.Override + public com.google.analytics.data.v1beta.QuotaStatusOrBuilder + getPotentiallyThresholdedRequestsPerHourOrBuilder() { + return getPotentiallyThresholdedRequestsPerHour(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -411,6 +488,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (serverErrorsPerProjectPerHour_ != null) { output.writeMessage(4, getServerErrorsPerProjectPerHour()); } + if (potentiallyThresholdedRequestsPerHour_ != null) { + output.writeMessage(5, getPotentiallyThresholdedRequestsPerHour()); + } unknownFields.writeTo(output); } @@ -434,6 +514,11 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 4, getServerErrorsPerProjectPerHour()); } + if (potentiallyThresholdedRequestsPerHour_ != null) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 5, getPotentiallyThresholdedRequestsPerHour()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -468,6 +553,12 @@ public boolean equals(final java.lang.Object obj) { if (!getServerErrorsPerProjectPerHour().equals(other.getServerErrorsPerProjectPerHour())) return false; } + if (hasPotentiallyThresholdedRequestsPerHour() + != other.hasPotentiallyThresholdedRequestsPerHour()) return false; + if (hasPotentiallyThresholdedRequestsPerHour()) { + if (!getPotentiallyThresholdedRequestsPerHour() + .equals(other.getPotentiallyThresholdedRequestsPerHour())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -495,6 +586,10 @@ public int hashCode() { hash = (37 * hash) + SERVER_ERRORS_PER_PROJECT_PER_HOUR_FIELD_NUMBER; hash = (53 * hash) + getServerErrorsPerProjectPerHour().hashCode(); } + if (hasPotentiallyThresholdedRequestsPerHour()) { + hash = (37 * hash) + POTENTIALLY_THRESHOLDED_REQUESTS_PER_HOUR_FIELD_NUMBER; + hash = (53 * hash) + getPotentiallyThresholdedRequestsPerHour().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -666,6 +761,12 @@ public Builder clear() { serverErrorsPerProjectPerHour_ = null; serverErrorsPerProjectPerHourBuilder_ = null; } + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + potentiallyThresholdedRequestsPerHour_ = null; + } else { + potentiallyThresholdedRequestsPerHour_ = null; + potentiallyThresholdedRequestsPerHourBuilder_ = null; + } return this; } @@ -713,6 +814,12 @@ public com.google.analytics.data.v1beta.PropertyQuota buildPartial() { } else { result.serverErrorsPerProjectPerHour_ = serverErrorsPerProjectPerHourBuilder_.build(); } + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + result.potentiallyThresholdedRequestsPerHour_ = potentiallyThresholdedRequestsPerHour_; + } else { + result.potentiallyThresholdedRequestsPerHour_ = + potentiallyThresholdedRequestsPerHourBuilder_.build(); + } onBuilt(); return result; } @@ -774,6 +881,10 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.PropertyQuota other) { if (other.hasServerErrorsPerProjectPerHour()) { mergeServerErrorsPerProjectPerHour(other.getServerErrorsPerProjectPerHour()); } + if (other.hasPotentiallyThresholdedRequestsPerHour()) { + mergePotentiallyThresholdedRequestsPerHour( + other.getPotentiallyThresholdedRequestsPerHour()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -1634,6 +1745,243 @@ public Builder clearServerErrorsPerProjectPerHour() { return serverErrorsPerProjectPerHourBuilder_; } + private com.google.analytics.data.v1beta.QuotaStatus potentiallyThresholdedRequestsPerHour_; + private com.google.protobuf.SingleFieldBuilderV3< + com.google.analytics.data.v1beta.QuotaStatus, + com.google.analytics.data.v1beta.QuotaStatus.Builder, + com.google.analytics.data.v1beta.QuotaStatusOrBuilder> + potentiallyThresholdedRequestsPerHourBuilder_; + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + * + * @return Whether the potentiallyThresholdedRequestsPerHour field is set. + */ + public boolean hasPotentiallyThresholdedRequestsPerHour() { + return potentiallyThresholdedRequestsPerHourBuilder_ != null + || potentiallyThresholdedRequestsPerHour_ != null; + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + * + * @return The potentiallyThresholdedRequestsPerHour. + */ + public com.google.analytics.data.v1beta.QuotaStatus getPotentiallyThresholdedRequestsPerHour() { + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + return potentiallyThresholdedRequestsPerHour_ == null + ? com.google.analytics.data.v1beta.QuotaStatus.getDefaultInstance() + : potentiallyThresholdedRequestsPerHour_; + } else { + return potentiallyThresholdedRequestsPerHourBuilder_.getMessage(); + } + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + public Builder setPotentiallyThresholdedRequestsPerHour( + com.google.analytics.data.v1beta.QuotaStatus value) { + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + potentiallyThresholdedRequestsPerHour_ = value; + onChanged(); + } else { + potentiallyThresholdedRequestsPerHourBuilder_.setMessage(value); + } + + return this; + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + public Builder setPotentiallyThresholdedRequestsPerHour( + com.google.analytics.data.v1beta.QuotaStatus.Builder builderForValue) { + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + potentiallyThresholdedRequestsPerHour_ = builderForValue.build(); + onChanged(); + } else { + potentiallyThresholdedRequestsPerHourBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + public Builder mergePotentiallyThresholdedRequestsPerHour( + com.google.analytics.data.v1beta.QuotaStatus value) { + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + if (potentiallyThresholdedRequestsPerHour_ != null) { + potentiallyThresholdedRequestsPerHour_ = + com.google.analytics.data.v1beta.QuotaStatus.newBuilder( + potentiallyThresholdedRequestsPerHour_) + .mergeFrom(value) + .buildPartial(); + } else { + potentiallyThresholdedRequestsPerHour_ = value; + } + onChanged(); + } else { + potentiallyThresholdedRequestsPerHourBuilder_.mergeFrom(value); + } + + return this; + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + public Builder clearPotentiallyThresholdedRequestsPerHour() { + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + potentiallyThresholdedRequestsPerHour_ = null; + onChanged(); + } else { + potentiallyThresholdedRequestsPerHour_ = null; + potentiallyThresholdedRequestsPerHourBuilder_ = null; + } + + return this; + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + public com.google.analytics.data.v1beta.QuotaStatus.Builder + getPotentiallyThresholdedRequestsPerHourBuilder() { + + onChanged(); + return getPotentiallyThresholdedRequestsPerHourFieldBuilder().getBuilder(); + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + public com.google.analytics.data.v1beta.QuotaStatusOrBuilder + getPotentiallyThresholdedRequestsPerHourOrBuilder() { + if (potentiallyThresholdedRequestsPerHourBuilder_ != null) { + return potentiallyThresholdedRequestsPerHourBuilder_.getMessageOrBuilder(); + } else { + return potentiallyThresholdedRequestsPerHour_ == null + ? com.google.analytics.data.v1beta.QuotaStatus.getDefaultInstance() + : potentiallyThresholdedRequestsPerHour_; + } + } + /** + * + * + *
+     * Analytics Properties can send up to 120 requests with potentially
+     * thresholded dimensions per hour. In a batch request, each report request
+     * is individually counted for this quota if the request contains potentially
+     * thresholded dimensions.
+     * 
+ * + * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.analytics.data.v1beta.QuotaStatus, + com.google.analytics.data.v1beta.QuotaStatus.Builder, + com.google.analytics.data.v1beta.QuotaStatusOrBuilder> + getPotentiallyThresholdedRequestsPerHourFieldBuilder() { + if (potentiallyThresholdedRequestsPerHourBuilder_ == null) { + potentiallyThresholdedRequestsPerHourBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.analytics.data.v1beta.QuotaStatus, + com.google.analytics.data.v1beta.QuotaStatus.Builder, + com.google.analytics.data.v1beta.QuotaStatusOrBuilder>( + getPotentiallyThresholdedRequestsPerHour(), getParentForChildren(), isClean()); + potentiallyThresholdedRequestsPerHour_ = null; + } + return potentiallyThresholdedRequestsPerHourBuilder_; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuotaOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuotaOrBuilder.java index f4dcc95c..983f5733 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuotaOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/PropertyQuotaOrBuilder.java @@ -186,4 +186,52 @@ public interface PropertyQuotaOrBuilder * .google.analytics.data.v1beta.QuotaStatus server_errors_per_project_per_hour = 4; */ com.google.analytics.data.v1beta.QuotaStatusOrBuilder getServerErrorsPerProjectPerHourOrBuilder(); + + /** + * + * + *
+   * Analytics Properties can send up to 120 requests with potentially
+   * thresholded dimensions per hour. In a batch request, each report request
+   * is individually counted for this quota if the request contains potentially
+   * thresholded dimensions.
+   * 
+ * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + * + * @return Whether the potentiallyThresholdedRequestsPerHour field is set. + */ + boolean hasPotentiallyThresholdedRequestsPerHour(); + /** + * + * + *
+   * Analytics Properties can send up to 120 requests with potentially
+   * thresholded dimensions per hour. In a batch request, each report request
+   * is individually counted for this quota if the request contains potentially
+   * thresholded dimensions.
+   * 
+ * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + * + * @return The potentiallyThresholdedRequestsPerHour. + */ + com.google.analytics.data.v1beta.QuotaStatus getPotentiallyThresholdedRequestsPerHour(); + /** + * + * + *
+   * Analytics Properties can send up to 120 requests with potentially
+   * thresholded dimensions per hour. In a batch request, each report request
+   * is individually counted for this quota if the request contains potentially
+   * thresholded dimensions.
+   * 
+ * + * .google.analytics.data.v1beta.QuotaStatus potentially_thresholded_requests_per_hour = 5; + * + */ + com.google.analytics.data.v1beta.QuotaStatusOrBuilder + getPotentiallyThresholdedRequestsPerHourOrBuilder(); } diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ReportingApiProto.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ReportingApiProto.java index a76aea79..d7cbb0ba 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ReportingApiProto.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/ReportingApiProto.java @@ -291,7 +291,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "\n\005value\030\001 \001(\tH\000B\013\n\tone_value\"+\n\013MetricVa" + "lue\022\017\n\005value\030\004 \001(\tH\000B\013\n\tone_value\"J\n\014Num" + "ericValue\022\025\n\013int64_value\030\001 \001(\003H\000\022\026\n\014doub" - + "le_value\030\002 \001(\001H\000B\013\n\tone_value\"\265\002\n\rProper" + + "le_value\030\002 \001(\001H\000B\013\n\tone_value\"\223\003\n\rProper" + "tyQuota\022A\n\016tokens_per_day\030\001 \001(\0132).google" + ".analytics.data.v1beta.QuotaStatus\022B\n\017to" + "kens_per_hour\030\002 \001(\0132).google.analytics.d" @@ -299,29 +299,32 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "uests\030\003 \001(\0132).google.analytics.data.v1be" + "ta.QuotaStatus\022U\n\"server_errors_per_proj" + "ect_per_hour\030\004 \001(\0132).google.analytics.da" - + "ta.v1beta.QuotaStatus\"2\n\013QuotaStatus\022\020\n\010" - + "consumed\030\001 \001(\005\022\021\n\tremaining\030\002 \001(\005\"\204\001\n\021Di" - + "mensionMetadata\022\020\n\010api_name\030\001 \001(\t\022\017\n\007ui_" - + "name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\034\n\024depre" - + "cated_api_names\030\004 \003(\t\022\031\n\021custom_definiti" - + "on\030\005 \001(\010\"\315\001\n\016MetricMetadata\022\020\n\010api_name\030" - + "\001 \001(\t\022\017\n\007ui_name\030\002 \001(\t\022\023\n\013description\030\003 " - + "\001(\t\022\034\n\024deprecated_api_names\030\004 \003(\t\0226\n\004typ" - + "e\030\005 \001(\0162(.google.analytics.data.v1beta.M" - + "etricType\022\022\n\nexpression\030\006 \001(\t\022\031\n\021custom_" - + "definition\030\007 \001(\010*g\n\021MetricAggregation\022\"\n" - + "\036METRIC_AGGREGATION_UNSPECIFIED\020\000\022\t\n\005TOT" - + "AL\020\001\022\013\n\007MINIMUM\020\005\022\013\n\007MAXIMUM\020\006\022\t\n\005COUNT\020" - + "\004*\201\002\n\nMetricType\022\033\n\027METRIC_TYPE_UNSPECIF" - + "IED\020\000\022\020\n\014TYPE_INTEGER\020\001\022\016\n\nTYPE_FLOAT\020\002\022" - + "\020\n\014TYPE_SECONDS\020\004\022\025\n\021TYPE_MILLISECONDS\020\005" - + "\022\020\n\014TYPE_MINUTES\020\006\022\016\n\nTYPE_HOURS\020\007\022\021\n\rTY" - + "PE_STANDARD\020\010\022\021\n\rTYPE_CURRENCY\020\t\022\r\n\tTYPE" - + "_FEET\020\n\022\016\n\nTYPE_MILES\020\013\022\017\n\013TYPE_METERS\020\014" - + "\022\023\n\017TYPE_KILOMETERS\020\rBy\n com.google.anal" - + "ytics.data.v1betaB\021ReportingApiProtoP\001Z@" - + "google.golang.org/genproto/googleapis/an" - + "alytics/data/v1beta;datab\006proto3" + + "ta.v1beta.QuotaStatus\022\\\n)potentially_thr" + + "esholded_requests_per_hour\030\005 \001(\0132).googl" + + "e.analytics.data.v1beta.QuotaStatus\"2\n\013Q" + + "uotaStatus\022\020\n\010consumed\030\001 \001(\005\022\021\n\tremainin" + + "g\030\002 \001(\005\"\204\001\n\021DimensionMetadata\022\020\n\010api_nam" + + "e\030\001 \001(\t\022\017\n\007ui_name\030\002 \001(\t\022\023\n\013description\030" + + "\003 \001(\t\022\034\n\024deprecated_api_names\030\004 \003(\t\022\031\n\021c" + + "ustom_definition\030\005 \001(\010\"\315\001\n\016MetricMetadat" + + "a\022\020\n\010api_name\030\001 \001(\t\022\017\n\007ui_name\030\002 \001(\t\022\023\n\013" + + "description\030\003 \001(\t\022\034\n\024deprecated_api_name" + + "s\030\004 \003(\t\0226\n\004type\030\005 \001(\0162(.google.analytics" + + ".data.v1beta.MetricType\022\022\n\nexpression\030\006 " + + "\001(\t\022\031\n\021custom_definition\030\007 \001(\010*g\n\021Metric" + + "Aggregation\022\"\n\036METRIC_AGGREGATION_UNSPEC" + + "IFIED\020\000\022\t\n\005TOTAL\020\001\022\013\n\007MINIMUM\020\005\022\013\n\007MAXIM" + + "UM\020\006\022\t\n\005COUNT\020\004*\201\002\n\nMetricType\022\033\n\027METRIC" + + "_TYPE_UNSPECIFIED\020\000\022\020\n\014TYPE_INTEGER\020\001\022\016\n" + + "\nTYPE_FLOAT\020\002\022\020\n\014TYPE_SECONDS\020\004\022\025\n\021TYPE_" + + "MILLISECONDS\020\005\022\020\n\014TYPE_MINUTES\020\006\022\016\n\nTYPE" + + "_HOURS\020\007\022\021\n\rTYPE_STANDARD\020\010\022\021\n\rTYPE_CURR" + + "ENCY\020\t\022\r\n\tTYPE_FEET\020\n\022\016\n\nTYPE_MILES\020\013\022\017\n" + + "\013TYPE_METERS\020\014\022\023\n\017TYPE_KILOMETERS\020\rBy\n c" + + "om.google.analytics.data.v1betaB\021Reporti" + + "ngApiProtoP\001Z@google.golang.org/genproto" + + "/googleapis/analytics/data/v1beta;datab\006" + + "proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -603,6 +606,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "TokensPerHour", "ConcurrentRequests", "ServerErrorsPerProjectPerHour", + "PotentiallyThresholdedRequestsPerHour", }); internal_static_google_analytics_data_v1beta_QuotaStatus_descriptor = getDescriptor().getMessageTypes().get(23); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java index aa69985f..9dfbd55d 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponse.java @@ -43,6 +43,7 @@ private RunPivotReportResponse() { metricHeaders_ = java.util.Collections.emptyList(); rows_ = java.util.Collections.emptyList(); aggregates_ = java.util.Collections.emptyList(); + kind_ = ""; } @java.lang.Override @@ -165,6 +166,13 @@ private RunPivotReportResponse( propertyQuota_ = subBuilder.buildPartial(); } + break; + } + case 66: + { + java.lang.String s = input.readStringRequireUtf8(); + + kind_ = s; break; } default: @@ -845,6 +853,59 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO return getPropertyQuota(); } + public static final int KIND_FIELD_NUMBER = 8; + private volatile java.lang.Object kind_; + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 8; + * + * @return The kind. + */ + @java.lang.Override + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } + } + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 8; + * + * @return The bytes for kind. + */ + @java.lang.Override + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -880,6 +941,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (propertyQuota_ != null) { output.writeMessage(7, getPropertyQuota()); } + if (!getKindBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 8, kind_); + } unknownFields.writeTo(output); } @@ -910,6 +974,9 @@ public int getSerializedSize() { if (propertyQuota_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(7, getPropertyQuota()); } + if (!getKindBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, kind_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -939,6 +1006,7 @@ public boolean equals(final java.lang.Object obj) { if (hasPropertyQuota()) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } + if (!getKind().equals(other.getKind())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -978,6 +1046,8 @@ public int hashCode() { hash = (37 * hash) + PROPERTY_QUOTA_FIELD_NUMBER; hash = (53 * hash) + getPropertyQuota().hashCode(); } + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKind().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1172,6 +1242,8 @@ public Builder clear() { propertyQuota_ = null; propertyQuotaBuilder_ = null; } + kind_ = ""; + return this; } @@ -1255,6 +1327,7 @@ public com.google.analytics.data.v1beta.RunPivotReportResponse buildPartial() { } else { result.propertyQuota_ = propertyQuotaBuilder_.build(); } + result.kind_ = kind_; onBuilt(); return result; } @@ -1446,6 +1519,10 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunPivotReportResponse if (other.hasPropertyQuota()) { mergePropertyQuota(other.getPropertyQuota()); } + if (!other.getKind().isEmpty()) { + kind_ = other.kind_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -4284,6 +4361,122 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO return propertyQuotaBuilder_; } + private java.lang.Object kind_ = ""; + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 8; + * + * @return The kind. + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 8; + * + * @return The bytes for kind. + */ + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 8; + * + * @param value The kind to set. + * @return This builder for chaining. + */ + public Builder setKind(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kind_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 8; + * + * @return This builder for chaining. + */ + public Builder clearKind() { + + kind_ = getDefaultInstance().getKind(); + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 8; + * + * @param value The bytes for kind to set. + * @return This builder for chaining. + */ + public Builder setKindBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kind_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponseOrBuilder.java index b6d04e49..2a889094 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponseOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunPivotReportResponseOrBuilder.java @@ -536,4 +536,33 @@ public interface RunPivotReportResponseOrBuilder * .google.analytics.data.v1beta.PropertyQuota property_quota = 7; */ com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaOrBuilder(); + + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 8; + * + * @return The kind. + */ + java.lang.String getKind(); + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runPivotReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 8; + * + * @return The bytes for kind. + */ + com.google.protobuf.ByteString getKindBytes(); } diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java index b074e447..98cec581 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponse.java @@ -44,6 +44,7 @@ private RunRealtimeReportResponse() { totals_ = java.util.Collections.emptyList(); maximums_ = java.util.Collections.emptyList(); minimums_ = java.util.Collections.emptyList(); + kind_ = ""; } @java.lang.Override @@ -164,6 +165,13 @@ private RunRealtimeReportResponse( propertyQuota_ = subBuilder.buildPartial(); } + break; + } + case 74: + { + java.lang.String s = input.readStringRequireUtf8(); + + kind_ = s; break; } default: @@ -715,6 +723,59 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO return getPropertyQuota(); } + public static final int KIND_FIELD_NUMBER = 9; + private volatile java.lang.Object kind_; + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 9; + * + * @return The kind. + */ + @java.lang.Override + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } + } + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 9; + * + * @return The bytes for kind. + */ + @java.lang.Override + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -753,6 +814,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (propertyQuota_ != null) { output.writeMessage(8, getPropertyQuota()); } + if (!getKindBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 9, kind_); + } unknownFields.writeTo(output); } @@ -786,6 +850,9 @@ public int getSerializedSize() { if (propertyQuota_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getPropertyQuota()); } + if (!getKindBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, kind_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -813,6 +880,7 @@ public boolean equals(final java.lang.Object obj) { if (hasPropertyQuota()) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } + if (!getKind().equals(other.getKind())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -854,6 +922,8 @@ public int hashCode() { hash = (37 * hash) + PROPERTY_QUOTA_FIELD_NUMBER; hash = (53 * hash) + getPropertyQuota().hashCode(); } + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKind().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1051,6 +1121,8 @@ public Builder clear() { propertyQuota_ = null; propertyQuotaBuilder_ = null; } + kind_ = ""; + return this; } @@ -1139,6 +1211,7 @@ public com.google.analytics.data.v1beta.RunRealtimeReportResponse buildPartial() } else { result.propertyQuota_ = propertyQuotaBuilder_.build(); } + result.kind_ = kind_; onBuilt(); return result; } @@ -1357,6 +1430,10 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunRealtimeReportRespo if (other.hasPropertyQuota()) { mergePropertyQuota(other.getPropertyQuota()); } + if (!other.getKind().isEmpty()) { + kind_ = other.kind_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -3787,6 +3864,122 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO return propertyQuotaBuilder_; } + private java.lang.Object kind_ = ""; + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 9; + * + * @return The kind. + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 9; + * + * @return The bytes for kind. + */ + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 9; + * + * @param value The kind to set. + * @return This builder for chaining. + */ + public Builder setKind(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kind_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 9; + * + * @return This builder for chaining. + */ + public Builder clearKind() { + + kind_ = getDefaultInstance().getKind(); + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+     * between response types in JSON.
+     * 
+ * + * string kind = 9; + * + * @param value The bytes for kind to set. + * @return This builder for chaining. + */ + public Builder setKindBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kind_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java index 54db4272..e7e3a731 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunRealtimeReportResponseOrBuilder.java @@ -394,4 +394,33 @@ public interface RunRealtimeReportResponseOrBuilder * .google.analytics.data.v1beta.PropertyQuota property_quota = 8; */ com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaOrBuilder(); + + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 9; + * + * @return The kind. + */ + java.lang.String getKind(); + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runRealtimeReport". Useful to distinguish
+   * between response types in JSON.
+   * 
+ * + * string kind = 9; + * + * @return The bytes for kind. + */ + com.google.protobuf.ByteString getKindBytes(); } diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java index cfc1d07f..7994fc6e 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponse.java @@ -44,6 +44,7 @@ private RunReportResponse() { totals_ = java.util.Collections.emptyList(); maximums_ = java.util.Collections.emptyList(); minimums_ = java.util.Collections.emptyList(); + kind_ = ""; } @java.lang.Override @@ -181,6 +182,13 @@ private RunReportResponse( propertyQuota_ = subBuilder.buildPartial(); } + break; + } + case 82: + { + java.lang.String s = input.readStringRequireUtf8(); + + kind_ = s; break; } default: @@ -782,6 +790,59 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO return getPropertyQuota(); } + public static final int KIND_FIELD_NUMBER = 10; + private volatile java.lang.Object kind_; + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 10; + * + * @return The kind. + */ + @java.lang.Override + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } + } + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 10; + * + * @return The bytes for kind. + */ + @java.lang.Override + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -823,6 +884,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (propertyQuota_ != null) { output.writeMessage(9, getPropertyQuota()); } + if (!getKindBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 10, kind_); + } unknownFields.writeTo(output); } @@ -859,6 +923,9 @@ public int getSerializedSize() { if (propertyQuota_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(9, getPropertyQuota()); } + if (!getKindBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(10, kind_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -890,6 +957,7 @@ public boolean equals(final java.lang.Object obj) { if (hasPropertyQuota()) { if (!getPropertyQuota().equals(other.getPropertyQuota())) return false; } + if (!getKind().equals(other.getKind())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -935,6 +1003,8 @@ public int hashCode() { hash = (37 * hash) + PROPERTY_QUOTA_FIELD_NUMBER; hash = (53 * hash) + getPropertyQuota().hashCode(); } + hash = (37 * hash) + KIND_FIELD_NUMBER; + hash = (53 * hash) + getKind().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1137,6 +1207,8 @@ public Builder clear() { propertyQuota_ = null; propertyQuotaBuilder_ = null; } + kind_ = ""; + return this; } @@ -1230,6 +1302,7 @@ public com.google.analytics.data.v1beta.RunReportResponse buildPartial() { } else { result.propertyQuota_ = propertyQuotaBuilder_.build(); } + result.kind_ = kind_; onBuilt(); return result; } @@ -1451,6 +1524,10 @@ public Builder mergeFrom(com.google.analytics.data.v1beta.RunReportResponse othe if (other.hasPropertyQuota()) { mergePropertyQuota(other.getPropertyQuota()); } + if (!other.getKind().isEmpty()) { + kind_ = other.kind_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -4073,6 +4150,122 @@ public com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaO return propertyQuotaBuilder_; } + private java.lang.Object kind_ = ""; + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 10; + * + * @return The kind. + */ + public java.lang.String getKind() { + java.lang.Object ref = kind_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + kind_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 10; + * + * @return The bytes for kind. + */ + public com.google.protobuf.ByteString getKindBytes() { + java.lang.Object ref = kind_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + kind_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 10; + * + * @param value The kind to set. + * @return This builder for chaining. + */ + public Builder setKind(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + kind_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 10; + * + * @return This builder for chaining. + */ + public Builder clearKind() { + + kind_ = getDefaultInstance().getKind(); + onChanged(); + return this; + } + /** + * + * + *
+     * Identifies what kind of resource this message is. This `kind` is always the
+     * fixed string "analyticsData#runReport". Useful to distinguish between
+     * response types in JSON.
+     * 
+ * + * string kind = 10; + * + * @param value The bytes for kind to set. + * @return This builder for chaining. + */ + public Builder setKindBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + kind_ = value; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java index 4f7ebafd..a9f45e94 100644 --- a/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java +++ b/proto-google-analytics-data-v1beta/src/main/java/com/google/analytics/data/v1beta/RunReportResponseOrBuilder.java @@ -431,4 +431,33 @@ public interface RunReportResponseOrBuilder * .google.analytics.data.v1beta.PropertyQuota property_quota = 9; */ com.google.analytics.data.v1beta.PropertyQuotaOrBuilder getPropertyQuotaOrBuilder(); + + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 10; + * + * @return The kind. + */ + java.lang.String getKind(); + /** + * + * + *
+   * Identifies what kind of resource this message is. This `kind` is always the
+   * fixed string "analyticsData#runReport". Useful to distinguish between
+   * response types in JSON.
+   * 
+ * + * string kind = 10; + * + * @return The bytes for kind. + */ + com.google.protobuf.ByteString getKindBytes(); } diff --git a/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto b/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto index 9eaca560..38f2977a 100644 --- a/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto +++ b/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/analytics_data_api.proto @@ -244,6 +244,11 @@ message RunReportResponse { // This Analytics Property's quota state including this request. PropertyQuota property_quota = 9; + + // Identifies what kind of resource this message is. This `kind` is always the + // fixed string "analyticsData#runReport". Useful to distinguish between + // response types in JSON. + string kind = 10; } // The request to generate a pivot report. @@ -369,6 +374,11 @@ message RunPivotReportResponse { // This Analytics Property's quota state including this request. PropertyQuota property_quota = 7; + + // Identifies what kind of resource this message is. This `kind` is always the + // fixed string "analyticsData#runPivotReport". Useful to distinguish between + // response types in JSON. + string kind = 8; } // The batch request containing multiple report requests. @@ -393,6 +403,11 @@ message BatchRunReportsRequest { message BatchRunReportsResponse { // Individual responses. Each response has a separate report request. repeated RunReportResponse reports = 1; + + // Identifies what kind of resource this message is. This `kind` is always the + // fixed string "analyticsData#batchRunReports". Useful to distinguish between + // response types in JSON. + string kind = 2; } // The batch request containing multiple pivot report requests. @@ -417,6 +432,11 @@ message BatchRunPivotReportsRequest { message BatchRunPivotReportsResponse { // Individual responses. Each response has a separate pivot report request. repeated RunPivotReportResponse pivot_reports = 1; + + // Identifies what kind of resource this message is. This `kind` is always the + // fixed string "analyticsData#batchRunPivotReports". Useful to distinguish + // between response types in JSON. + string kind = 2; } // Request for a property's dimension and metric metadata. @@ -519,4 +539,9 @@ message RunRealtimeReportResponse { // This Analytics Property's Realtime quota state including this request. PropertyQuota property_quota = 8; + + // Identifies what kind of resource this message is. This `kind` is always the + // fixed string "analyticsData#runRealtimeReport". Useful to distinguish + // between response types in JSON. + string kind = 9; } diff --git a/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/data.proto b/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/data.proto index ad0f21c2..3057ae22 100644 --- a/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/data.proto +++ b/proto-google-analytics-data-v1beta/src/main/proto/google/analytics/data/v1beta/data.proto @@ -381,8 +381,8 @@ message Pivot { int64 offset = 3; // The number of unique combinations of dimension values to return in this - // pivot. If unspecified, up to 10,000 unique combinations of dimension values - // are returned. `limit` must be positive. + // pivot. The `limit` parameter is required. A `limit` of 10,000 is common for + // single pivot requests. // // The product of the `limit` for each `pivot` in a `RunPivotReportRequest` // must not exceed 100,000. For example, a two pivot request with `limit: @@ -667,6 +667,12 @@ message PropertyQuota { // server errors per hour; Analytics 360 Properties and cloud project pairs // can have up to 50 server errors per hour. QuotaStatus server_errors_per_project_per_hour = 4; + + // Analytics Properties can send up to 120 requests with potentially + // thresholded dimensions per hour. In a batch request, each report request + // is individually counted for this quota if the request contains potentially + // thresholded dimensions. + QuotaStatus potentially_thresholded_requests_per_hour = 5; } // Current state for a particular quota group. diff --git a/renovate.json b/renovate.json index 0b38a7f6..70d5a0eb 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 d34039de..6af83d91 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 @@ -29,7 +29,7 @@ com.google.analytics google-analytics-data - 0.7.0 + 0.7.1 @@ -42,7 +42,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/pom.xml b/samples/pom.xml index 9e7a7dbe..dbbe7b88 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 43cc0724..9b28137e 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 @@ -28,7 +28,7 @@ com.google.analytics google-analytics-data - 0.7.1 + 0.8.0 @@ -41,7 +41,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ea2c4ef3..f40e7f46 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 @@ -28,7 +28,7 @@ com.google.analytics google-analytics-data - 0.7.0 + 0.7.1 @@ -40,7 +40,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java b/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java index 3fb9a0b5..a1dcace5 100644 --- a/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java +++ b/samples/snippets/src/main/java/com/example/analytics/QuickstartJsonCredentialsSample.java @@ -53,8 +53,9 @@ public static void main(String... args) throws Exception { */ String propertyId = "YOUR-GA4-PROPERTY-ID"; - /** TODO(developer): Replace this variable with a valid path to the credentials.json file - * for your service account downloaded from the Cloud Console. + /** + * TODO(developer): Replace this variable with a valid path to the credentials.json file for + * your service account downloaded from the Cloud Console. */ String credentialsJsonPath = "/path/to/credentials.json"; sampleRunReport(propertyId, credentialsJsonPath); @@ -66,8 +67,8 @@ static void sampleRunReport(String propertyId, String credentialsJsonPath) throw // [START analyticsdata_json_credentials_initialize] // Explicitly use service account credentials by specifying // the private key file. - GoogleCredentials credentials = GoogleCredentials - .fromStream(new FileInputStream(credentialsJsonPath)); + GoogleCredentials credentials = + GoogleCredentials.fromStream(new FileInputStream(credentialsJsonPath)); BetaAnalyticsDataSettings betaAnalyticsDataSettings = BetaAnalyticsDataSettings.newBuilder() @@ -79,13 +80,13 @@ static void sampleRunReport(String propertyId, String credentialsJsonPath) throw // [END analyticsdata_json_credentials_initialize] // [START analyticsdata_json_credentials_run_report] - RunReportRequest request = RunReportRequest.newBuilder() - .setProperty("properties/" + propertyId) - .addDimensions( - Dimension.newBuilder().setName("city")) - .addMetrics(Metric.newBuilder().setName("activeUsers")) - .addDateRanges( - DateRange.newBuilder().setStartDate("2020-03-31").setEndDate("today")).build(); + RunReportRequest request = + RunReportRequest.newBuilder() + .setProperty("properties/" + propertyId) + .addDimensions(Dimension.newBuilder().setName("city")) + .addMetrics(Metric.newBuilder().setName("activeUsers")) + .addDateRanges(DateRange.newBuilder().setStartDate("2020-03-31").setEndDate("today")) + .build(); // Make the request. RunReportResponse response = analyticsData.runReport(request); @@ -95,12 +96,11 @@ static void sampleRunReport(String propertyId, String credentialsJsonPath) throw System.out.println("Report result:"); // Iterate through every row of the API response. for (Row row : response.getRowsList()) { - System.out.printf("%s, %s%n", row.getDimensionValues(0).getValue(), - row.getMetricValues(0).getValue()); + System.out.printf( + "%s, %s%n", row.getDimensionValues(0).getValue(), row.getMetricValues(0).getValue()); } // [END analyticsdata_json_credentials_print_report] } } } // [END analyticsdata_json_credentials_quickstart] - diff --git a/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java b/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java index 70c1845f..32983df9 100644 --- a/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java +++ b/samples/snippets/src/main/java/com/example/analytics/QuickstartSample.java @@ -53,8 +53,8 @@ public static void main(String... args) throws Exception { // on the provided GA4 property id. static void sampleRunReport(String propertyId) throws Exception { /** - * TODO(developer): Uncomment this variable and replace with your - * Google Analytics 4 property ID before running the sample. + * TODO(developer): Uncomment this variable and replace with your Google Analytics 4 property ID + * before running the sample. */ // propertyId = "YOUR-GA4-PROPERTY-ID"; @@ -65,13 +65,13 @@ static void sampleRunReport(String propertyId) throws Exception { // [END analyticsdata_initialize] // [START analyticsdata_run_report] - RunReportRequest request = RunReportRequest.newBuilder() - .setProperty("properties/" + propertyId) - .addDimensions( - Dimension.newBuilder().setName("city")) - .addMetrics(Metric.newBuilder().setName("activeUsers")) - .addDateRanges( - DateRange.newBuilder().setStartDate("2020-03-31").setEndDate("today")).build(); + RunReportRequest request = + RunReportRequest.newBuilder() + .setProperty("properties/" + propertyId) + .addDimensions(Dimension.newBuilder().setName("city")) + .addMetrics(Metric.newBuilder().setName("activeUsers")) + .addDateRanges(DateRange.newBuilder().setStartDate("2020-03-31").setEndDate("today")) + .build(); // Make the request. RunReportResponse response = analyticsData.runReport(request); @@ -81,8 +81,8 @@ static void sampleRunReport(String propertyId) throws Exception { System.out.println("Report result:"); // Iterate through every row of the API response. for (Row row : response.getRowsList()) { - System.out.printf("%s, %s%n", row.getDimensionValues(0).getValue(), - row.getMetricValues(0).getValue()); + System.out.printf( + "%s, %s%n", row.getDimensionValues(0).getValue(), row.getMetricValues(0).getValue()); } // [END analyticsdata_print_report] } diff --git a/samples/snippets/src/test/java/com/example/analytics/QuickstartJsonCredentialsSampleTest.java b/samples/snippets/src/test/java/com/example/analytics/QuickstartJsonCredentialsSampleTest.java index 7e1d4b11..1ff2e71f 100644 --- a/samples/snippets/src/test/java/com/example/analytics/QuickstartJsonCredentialsSampleTest.java +++ b/samples/snippets/src/test/java/com/example/analytics/QuickstartJsonCredentialsSampleTest.java @@ -24,9 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** - * Tests for quickstart sample. - */ +/** Tests for quickstart sample. */ @RunWith(JUnit4.class) public class QuickstartJsonCredentialsSampleTest { @@ -35,7 +33,6 @@ public class QuickstartJsonCredentialsSampleTest { private String credentialsJsonPath = System.getenv("GOOGLE_APPLICATION_CREDENTIALS"); - private String runSample(String ga4PropertyId) throws Exception { PrintStream stdOut = System.out; ByteArrayOutputStream bout = new ByteArrayOutputStream(); diff --git a/samples/snippets/src/test/java/com/example/analytics/QuickstartSampleTest.java b/samples/snippets/src/test/java/com/example/analytics/QuickstartSampleTest.java index 4278f957..e84f77ce 100644 --- a/samples/snippets/src/test/java/com/example/analytics/QuickstartSampleTest.java +++ b/samples/snippets/src/test/java/com/example/analytics/QuickstartSampleTest.java @@ -24,9 +24,7 @@ import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -/** - * Tests for quickstart sample. - */ +/** Tests for quickstart sample. */ @RunWith(JUnit4.class) public class QuickstartSampleTest { diff --git a/synth.metadata b/synth.metadata index 76159cfe..bd6fb71b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,30 +4,30 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-analytics-data.git", - "sha": "5a1cd5ffe708dd87da7571ab609996a3b3b06773" + "sha": "8b30dcd3132fd5a43955dda3f4c4aaddac2d0035" } }, { "git": { "name": "googleapis-gen", "remote": "https://github.com/googleapis/googleapis-gen.git", - "sha": "ebd77e76effb65c4fba8c64f31c15062c250a4c2", - "internalRef": "362856902" + "sha": "19ed6ced80e406dd4a7e2d0870c629427309d439", + "internalRef": "377081269" } }, { "git": { "name": "googleapis-gen", "remote": "https://github.com/googleapis/googleapis-gen.git", - "sha": "ebd77e76effb65c4fba8c64f31c15062c250a4c2", - "internalRef": "362856902" + "sha": "19ed6ced80e406dd4a7e2d0870c629427309d439", + "internalRef": "377081269" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "572ef8f70edd9041f5bcfa71511aed6aecfc2098" + "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" } } ], @@ -42,6 +42,7 @@ ".github/readme/synth.py", ".github/release-please.yml", ".github/snippet-bot.yml", + ".github/sync-repo-settings.yaml", ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", diff --git a/versions.txt b/versions.txt index 3491deb6..cb91b788 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -google-analytics-data:0.7.1:0.7.1 -proto-google-analytics-data-v1alpha:0.7.1:0.7.1 -proto-google-analytics-data-v1beta:0.7.1:0.7.1 -grpc-google-analytics-data-v1alpha:0.7.1:0.7.1 -grpc-google-analytics-data-v1beta:0.7.1:0.7.1 +google-analytics-data:0.8.0:0.8.0 +grpc-google-analytics-data-v1alpha:0.8.0:0.8.0 +grpc-google-analytics-data-v1beta:0.8.0:0.8.0 +proto-google-analytics-data-v1alpha:0.8.0:0.8.0 +proto-google-analytics-data-v1beta:0.8.0:0.8.0