diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata new file mode 100644 index 000000000..ad965e880 --- /dev/null +++ b/.github/readme/synth.metadata/synth.metadata @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-automl.git", + "sha": "2eeb69d7bbe7b1b35f5747501c14ad3fc81810e3" + } + }, + { + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "fd3584b01cedd6c9f79d08be4e2365085f955aa5" + } + } + ] +} \ No newline at end of file diff --git a/.github/readme/synth.py b/.github/readme/synth.py new file mode 100644 index 000000000..7b48cc28d --- /dev/null +++ b/.github/readme/synth.py @@ -0,0 +1,19 @@ +# Copyright 2020 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. + +"""This script is used to synthesize generated the README for this library.""" + +from synthtool.languages import java + +java.custom_templates(["java_library/README.md"]) diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml new file mode 100644 index 000000000..e69de29bb diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml new file mode 100644 index 000000000..6bddd18ea --- /dev/null +++ b/.github/sync-repo-settings.yaml @@ -0,0 +1,49 @@ + +# Whether or not rebase-merging is enabled on this repository. +# Defaults to `true` +rebaseMergeAllowed: false + +# Whether or not squash-merging is enabled on this repository. +# Defaults to `true` +squashMergeAllowed: true + +# Whether or not PRs are merged with a merge commit on this repository. +# Defaults to `false` +mergeCommitAllowed: false + +# Rules for master branch protection +branchProtectionRules: +# Identifies the protection rule pattern. Name of the branch to be protected. +# Defaults to `master` +- pattern: master + # Can admins overwrite branch protection. + # Defaults to `true` + isAdminEnforced: true + # Number of approving reviews required to update matching branches. + # Defaults to `1` + requiredApprovingReviewCount: 1 + # Are reviews from code owners required to update matching branches. + # Defaults to `false` + requiresCodeOwnerReviews: true + # Require up to date branches + requiresStrictStatusChecks: false + # List of required status check contexts that must pass for commits to be accepted to matching branches. + requiredStatusCheckContexts: + - "dependencies (8)" + - "dependencies (11)" + - "linkage-monitor" + - "lint" + - "clirr" + - "units (7)" + - "units (8)" + - "units (11)" + - "Kokoro - Test: Integration" + - "cla/google" +# List of explicit permissions to add (additive only) +permissionRules: +- team: yoshi-admins + permission: admin +- team: yoshi-java-admins + permission: admin +- team: yoshi-java + permission: push \ No newline at end of file diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml new file mode 100644 index 000000000..e2d841d6c --- /dev/null +++ b/.github/workflows/approve-readme.yaml @@ -0,0 +1,54 @@ +on: + pull_request: +name: auto-merge-readme +jobs: + approve: + runs-on: ubuntu-latest + if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' + steps: + - uses: actions/github-script@v3.0.0 + with: + github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} + script: | + // only approve PRs from yoshi-automation + if (context.payload.pull_request.user.login !== "yoshi-automation") { + return; + } + + // only approve PRs like "chore: release " + if (!context.payload.pull_request.title === "chore: regenerate README") { + return; + } + + // only approve PRs with README.md and synth.metadata changes + const files = new Set( + ( + await github.paginate( + github.pulls.listFiles.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.payload.pull_request.number, + }) + ) + ).map(file => file.filename) + ); + if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) { + return; + } + + // approve README regeneration PR + await github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + body: 'Rubber stamped PR!', + pull_number: context.payload.pull_request.number, + event: 'APPROVE' + }); + + // attach automerge label + await github.issues.addLabels({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.payload.pull_request.number, + labels: ['automerge'] + }); diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index d26427e46..bc1554aec 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -4,10 +4,11 @@ name: auto-release jobs: approve: runs-on: ubuntu-latest + if: contains(github.head_ref, 'release-v') steps: - uses: actions/github-script@v3.0.0 with: - github-token: ${{secrets.GITHUB_TOKEN}} + github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} debug: true script: | // only approve PRs from release-please[bot] @@ -20,6 +21,24 @@ jobs: return; } + // only approve PRs with pom.xml and versions.txt changes + const filesPromise = github.pulls.listFiles.endpoint({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: context.payload.pull_request.number, + }); + const changed_files = await github.paginate(filesPromise) + + if ( changed_files.length < 1 ) { + console.log( "Not proceeding since PR is empty!" ) + return; + } + + if ( !changed_files.some(v => v.filename.includes("pom")) || !changed_files.some(v => v.filename.includes("versions.txt")) ) { + console.log( "PR file changes do not have pom.xml or versions.txt -- something is wrong. PTAL!" ) + return; + } + // trigger auto-release when // 1) it is a SNAPSHOT release (auto-generated post regular release) // 2) there are dependency updates only @@ -66,4 +85,4 @@ jobs: repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: ['kokoro:force-run', 'automerge'] - }); \ No newline at end of file + }); diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml new file mode 100644 index 000000000..d4d367cfc --- /dev/null +++ b/.github/workflows/formatting.yaml @@ -0,0 +1,25 @@ +on: + pull_request_target: + types: [opened, synchronize] + branches: + - master +name: format +jobs: + format-code: + runs-on: ubuntu-latest + env: + ACCESS_TOKEN: ${{ secrets.YOSHI_CODE_BOT_TOKEN }} + steps: + - uses: actions/checkout@v2 + with: + ref: ${{github.event.pull_request.head.ref}} + repository: ${{github.event.pull_request.head.repo.full_name}} + - uses: actions/setup-java@v1 + with: + java-version: 11 + - run: "mvn com.coveo:fmt-maven-plugin:format" + - uses: googleapis/code-suggester@v1.8.0 + with: + command: review + pull_number: ${{ github.event.pull_request.number }} + git_dir: '.' diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml index a1d500730..c46230a78 100644 --- a/.github/workflows/samples.yaml +++ b/.github/workflows/samples.yaml @@ -2,7 +2,7 @@ on: pull_request: name: samples jobs: - lint: + checkstyle: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg new file mode 100644 index 000000000..468bae055 --- /dev/null +++ b/.kokoro/continuous/readme.cfg @@ -0,0 +1,55 @@ +# Copyright 2020 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. + +# Format: //devtools/kokoro/config/proto/build.proto + +env_vars: { + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/python-multi" +} + +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/java-automl/.kokoro/readme.sh" +} + +# Build logs will be here +action { + define_artifacts { + regex: "**/*sponge_log.xml" + regex: "**/*sponge_log.log" + } +} + +# The github token is stored here. +before_action { + fetch_keystore { + keystore_resource { + keystore_config_id: 73713 + keyname: "yoshi-automation-github-key" + # TODO(theacodes): remove this after secrets have globally propagated + backend_type: FASTCONFIGPUSH + } + } +} + +# Common env vars for all repositories and builds. +env_vars: { + key: "GITHUB_USER" + value: "yoshi-automation" +} +env_vars: { + key: "GITHUB_EMAIL" + value: "yoshi-automation@google.com" +} diff --git a/.kokoro/readme.sh b/.kokoro/readme.sh new file mode 100755 index 000000000..63e2d5ff4 --- /dev/null +++ b/.kokoro/readme.sh @@ -0,0 +1,36 @@ +#!/bin/bash +# Copyright 2020 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. + +set -eo pipefail + +cd ${KOKORO_ARTIFACTS_DIR}/github/java-automl + +# Disable buffering, so that the logs stream through. +export PYTHONUNBUFFERED=1 + +# Kokoro exposes this as a file, but the scripts expect just a plain variable. +export GITHUB_TOKEN=$(cat ${KOKORO_KEYSTORE_DIR}/73713_yoshi-automation-github-key) + +# Setup git credentials +echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials +git config --global credential.helper 'store --file ~/.git-credentials' + +python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool +python3.6 -m autosynth.synth \ + --repository=googleapis/java-automl \ + --synth-file-name=.github/readme/synth.py \ + --metadata-path=.github/readme/synth.metadata \ + --pr-title="chore: regenerate README" \ + --branch-suffix="readme" \ No newline at end of file diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 71eed0b20..22e1a93de 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -62,7 +62,7 @@ popd # V2 mvn clean site -B -q -Ddevsite.template="${KOKORO_GFILE_DIR}/java/" -pushd target/devsite +pushd target/devsite/reference # create metadata python3 -m docuploader create-metadata \ diff --git a/CHANGELOG.md b/CHANGELOG.md index fa6b1e745..92b531142 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.3.0](https://www.github.com/googleapis/java-automl/compare/v1.2.3...v1.3.0) (2020-10-27) + + +### Features + +* Added text extraction health care option in create model. ([#332](https://www.github.com/googleapis/java-automl/issues/332)) ([102614c](https://www.github.com/googleapis/java-automl/commit/102614c9e86e173ae13752c79b2f59c94708a62f)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.10.2 ([#328](https://www.github.com/googleapis/java-automl/issues/328)) ([970a32a](https://www.github.com/googleapis/java-automl/commit/970a32a412b9b3639dd86eb124209a48f4f39075)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.12.1 ([#347](https://www.github.com/googleapis/java-automl/issues/347)) ([77d54c3](https://www.github.com/googleapis/java-automl/commit/77d54c39ea99fffa11473c1067cc6bb5413d6b0d)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.13.0 ([#352](https://www.github.com/googleapis/java-automl/issues/352)) ([1e5655f](https://www.github.com/googleapis/java-automl/commit/1e5655f22c3a26fd532b2afc74e37f5232878406)) + ### [1.2.3](https://www.github.com/googleapis/java-automl/compare/v1.2.2...v1.2.3) (2020-09-23) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6b2238bb7..2add2547a 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,3 +1,4 @@ + # Code of Conduct ## Our Pledge @@ -69,12 +70,12 @@ dispute. If you are unable to resolve the matter for any reason, or if the behavior is threatening or harassing, report it. We are dedicated to providing an environment where participants feel welcome and safe. -Reports should be directed to *[PROJECT STEWARD NAME(s) AND EMAIL(s)]*, the -Project Steward(s) for *[PROJECT NAME]*. It is the Project Steward’s duty to +Reports should be directed to *googleapis-stewards@google.com*, the +Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to receive and address reported violations of the code of conduct. They will then work with a committee consisting of representatives from the Open Source Programs Office and the Google Open Source Strategy team. If for any reason you -are uncomfortable reaching out the Project Steward, please email +are uncomfortable reaching out to the Project Steward, please email opensource@google.com. We will investigate every complaint, but you may not receive a direct response. diff --git a/README.md b/README.md index d9756b444..3fa3bff5a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 10.1.0 + 13.3.0 pom import @@ -47,12 +47,12 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-automl - 1.2.1 + 1.2.3 com.google.cloud google-cloud-bigquery - 1.120.0 + 1.122.2 com.google.cloud @@ -62,8 +62,6 @@ If you are using Maven without BOM, add this to your dependencies: ``` -[//]: # ({x-version-update-start:google-cloud-automl:released}) - If you are using Gradle, add this to your dependencies ```Groovy compile 'com.google.cloud:google-cloud-automl:1.2.3' @@ -72,7 +70,6 @@ If you are using SBT, add this to your dependencies ```Scala libraryDependencies += "com.google.cloud" % "google-cloud-automl" % "1.2.3" ``` -[//]: # ({x-version-update-end}) ## Authentication diff --git a/google-cloud-automl-bom/pom.xml b/google-cloud-automl-bom/pom.xml index 2798213fe..ee690cd2a 100644 --- a/google-cloud-automl-bom/pom.xml +++ b/google-cloud-automl-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-automl-bom - 1.2.3 + 1.3.0 pom com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.4 Google Cloud Auto ML BOM @@ -63,27 +63,27 @@ com.google.api.grpc grpc-google-cloud-automl-v1beta1 - 0.83.3 + 0.84.0 com.google.api.grpc grpc-google-cloud-automl-v1 - 1.2.3 + 1.3.0 com.google.api.grpc proto-google-cloud-automl-v1beta1 - 0.83.3 + 0.84.0 com.google.api.grpc proto-google-cloud-automl-v1 - 1.2.3 + 1.3.0 com.google.cloud google-cloud-automl - 1.2.3 + 1.3.0 diff --git a/google-cloud-automl/pom.xml b/google-cloud-automl/pom.xml index 1f852d945..8155c5e94 100644 --- a/google-cloud-automl/pom.xml +++ b/google-cloud-automl/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-automl - 1.2.3 + 1.3.0 jar Google Cloud AutoML https://github.com/googleapis/java-automl @@ -11,7 +11,7 @@ com.google.cloud google-cloud-automl-parent - 1.2.3 + 1.3.0 google-cloud-automl diff --git a/grpc-google-cloud-automl-v1/pom.xml b/grpc-google-cloud-automl-v1/pom.xml index d691d18a8..2e4eeddab 100644 --- a/grpc-google-cloud-automl-v1/pom.xml +++ b/grpc-google-cloud-automl-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-automl-v1 - 1.2.3 + 1.3.0 grpc-google-cloud-automl-v1 GRPC library for grpc-google-cloud-automl-v1 com.google.cloud google-cloud-automl-parent - 1.2.3 + 1.3.0 diff --git a/grpc-google-cloud-automl-v1beta1/pom.xml b/grpc-google-cloud-automl-v1beta1/pom.xml index 799e14996..75550734c 100644 --- a/grpc-google-cloud-automl-v1beta1/pom.xml +++ b/grpc-google-cloud-automl-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-automl-v1beta1 - 0.83.3 + 0.84.0 grpc-google-cloud-automl-v1beta1 GRPC library for grpc-google-cloud-automl-v1beta1 com.google.cloud google-cloud-automl-parent - 1.2.3 + 1.3.0 diff --git a/pom.xml b/pom.xml index 812f54174..8bcc75b9a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-automl-parent pom - 1.2.3 + 1.3.0 Google Cloud AutoML Parent https://github.com/googleapis/java-automl @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.9.2 + 0.9.4 @@ -63,7 +63,7 @@ UTF-8 github google-cloud-automl-parent - 4.13 + 4.13.1 @@ -71,33 +71,33 @@ com.google.api.grpc proto-google-cloud-automl-v1beta1 - 0.83.3 + 0.84.0 com.google.api.grpc proto-google-cloud-automl-v1 - 1.2.3 + 1.3.0 com.google.api.grpc grpc-google-cloud-automl-v1beta1 - 0.83.3 + 0.84.0 com.google.api.grpc grpc-google-cloud-automl-v1 - 1.2.3 + 1.3.0 com.google.cloud google-cloud-automl - 1.2.3 + 1.3.0 com.google.cloud google-cloud-shared-dependencies - 0.10.0 + 0.13.0 pom import diff --git a/proto-google-cloud-automl-v1/pom.xml b/proto-google-cloud-automl-v1/pom.xml index 49886233f..bec8a716e 100644 --- a/proto-google-cloud-automl-v1/pom.xml +++ b/proto-google-cloud-automl-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-automl-v1 - 1.2.3 + 1.3.0 proto-google-cloud-automl-v1 PROTO library for proto-google-cloud-automl-v1 com.google.cloud google-cloud-automl-parent - 1.2.3 + 1.3.0 diff --git a/proto-google-cloud-automl-v1beta1/pom.xml b/proto-google-cloud-automl-v1beta1/pom.xml index 788717553..04421872b 100644 --- a/proto-google-cloud-automl-v1beta1/pom.xml +++ b/proto-google-cloud-automl-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-automl-v1beta1 - 0.83.3 + 0.84.0 proto-google-cloud-automl-v1beta1 PROTO library for proto-google-cloud-automl-v1beta1 com.google.cloud google-cloud-automl-parent - 1.2.3 + 1.3.0 diff --git a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfig.java b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfig.java index d66828c58..7047e1450 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfig.java +++ b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfig.java @@ -366,6 +366,23 @@ public com.google.cloud.automl.v1beta1.GcrDestinationOrBuilder getGcrDestination * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -413,6 +430,23 @@ public java.lang.String getModelFormat() { * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -1539,6 +1573,23 @@ public com.google.cloud.automl.v1beta1.GcrDestinationOrBuilder getGcrDestination * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -1585,6 +1636,23 @@ public java.lang.String getModelFormat() { * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -1631,6 +1699,23 @@ public com.google.protobuf.ByteString getModelFormatBytes() { * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -1676,6 +1761,23 @@ public Builder setModelFormat(java.lang.String value) { * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -1717,6 +1819,23 @@ public Builder clearModelFormat() { * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) diff --git a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfigOrBuilder.java b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfigOrBuilder.java index 810784ffd..1b77d30a7 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfigOrBuilder.java +++ b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelExportOutputConfigOrBuilder.java @@ -138,6 +138,23 @@ public interface ModelExportOutputConfigOrBuilder * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) @@ -174,6 +191,23 @@ public interface ModelExportOutputConfigOrBuilder * * For Image Classification mobile-core-ml-low-latency-1, * mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: * "core_ml" (default). + * * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + * mobile-high-accuracy-1: + * "tflite", "tf_saved_model", "tf_js". + * * For Video Classification cloud, + * "tf_saved_model". + * * For Video Object Tracking cloud, + * "tf_saved_model". + * * For Video Object Tracking mobile-versatile-1: + * "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + * * For Video Object Tracking mobile-coral-versatile-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-coral-low-latency-1: + * "tflite", "edgetpu_tflite", "docker". + * * For Video Object Tracking mobile-jetson-versatile-1: + * "tf_saved_model", "docker". + * * For Tables: + * "docker". * Formats description: * * tflite - Used for Android mobile devices. * * edgetpu_tflite - Used for [Edge TPU](https://cloud.google.com/edge-tpu/) diff --git a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadata.java b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadata.java index 6cafee9e8..e2ab45e01 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadata.java +++ b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadata.java @@ -37,7 +37,9 @@ private TextExtractionModelMetadata(com.google.protobuf.GeneratedMessageV3.Build super(builder); } - private TextExtractionModelMetadata() {} + private TextExtractionModelMetadata() { + modelHint_ = ""; + } @java.lang.Override @SuppressWarnings({"unused"}) @@ -68,6 +70,13 @@ private TextExtractionModelMetadata( case 0: done = true; break; + case 26: + { + java.lang.String s = input.readStringRequireUtf8(); + + modelHint_ = s; + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -102,6 +111,61 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.automl.v1beta1.TextExtractionModelMetadata.Builder.class); } + public static final int MODEL_HINT_FIELD_NUMBER = 3; + private volatile java.lang.Object modelHint_; + /** + * + * + * 
+   * Indicates the scope of model use case.
+   * * `default`: Use to train a general text extraction model. Default value.
+   * * `health_care`: Use to train a text extraction model that is tuned for
+   *   healthcare applications.
+   *
+ * + * string model_hint = 3; + * + * @return The modelHint. + */ + @java.lang.Override + public java.lang.String getModelHint() { + java.lang.Object ref = modelHint_; + 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(); + modelHint_ = s; + return s; + } + } + /** + * + * + * 
+   * Indicates the scope of model use case.
+   * * `default`: Use to train a general text extraction model. Default value.
+   * * `health_care`: Use to train a text extraction model that is tuned for
+   *   healthcare applications.
+   *
+ * + * string model_hint = 3; + * + * @return The bytes for modelHint. + */ + @java.lang.Override + public com.google.protobuf.ByteString getModelHintBytes() { + java.lang.Object ref = modelHint_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + modelHint_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -116,6 +180,9 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { + if (!getModelHintBytes().isEmpty()) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 3, modelHint_); + } unknownFields.writeTo(output); } @@ -125,6 +192,9 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; + if (!getModelHintBytes().isEmpty()) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, modelHint_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -141,6 +211,7 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.automl.v1beta1.TextExtractionModelMetadata other = (com.google.cloud.automl.v1beta1.TextExtractionModelMetadata) obj; + if (!getModelHint().equals(other.getModelHint())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -152,6 +223,8 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + MODEL_HINT_FIELD_NUMBER; + hash = (53 * hash) + getModelHint().hashCode(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -298,6 +371,8 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); + modelHint_ = ""; + return this; } @@ -325,6 +400,7 @@ public com.google.cloud.automl.v1beta1.TextExtractionModelMetadata build() { public com.google.cloud.automl.v1beta1.TextExtractionModelMetadata buildPartial() { com.google.cloud.automl.v1beta1.TextExtractionModelMetadata result = new com.google.cloud.automl.v1beta1.TextExtractionModelMetadata(this); + result.modelHint_ = modelHint_; onBuilt(); return result; } @@ -375,6 +451,10 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.cloud.automl.v1beta1.TextExtractionModelMetadata other) { if (other == com.google.cloud.automl.v1beta1.TextExtractionModelMetadata.getDefaultInstance()) return this; + if (!other.getModelHint().isEmpty()) { + modelHint_ = other.modelHint_; + onChanged(); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -405,6 +485,127 @@ public Builder mergeFrom( return this; } + private java.lang.Object modelHint_ = ""; + /** + * + * + * 
+     * Indicates the scope of model use case.
+     * * `default`: Use to train a general text extraction model. Default value.
+     * * `health_care`: Use to train a text extraction model that is tuned for
+     *   healthcare applications.
+     *
+ * + * string model_hint = 3; + * + * @return The modelHint. + */ + public java.lang.String getModelHint() { + java.lang.Object ref = modelHint_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + modelHint_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * + * + * 
+     * Indicates the scope of model use case.
+     * * `default`: Use to train a general text extraction model. Default value.
+     * * `health_care`: Use to train a text extraction model that is tuned for
+     *   healthcare applications.
+     *
+ * + * string model_hint = 3; + * + * @return The bytes for modelHint. + */ + public com.google.protobuf.ByteString getModelHintBytes() { + java.lang.Object ref = modelHint_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + modelHint_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * + * + * 
+     * Indicates the scope of model use case.
+     * * `default`: Use to train a general text extraction model. Default value.
+     * * `health_care`: Use to train a text extraction model that is tuned for
+     *   healthcare applications.
+     *
+ * + * string model_hint = 3; + * + * @param value The modelHint to set. + * @return This builder for chaining. + */ + public Builder setModelHint(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + + modelHint_ = value; + onChanged(); + return this; + } + /** + * + * + * 
+     * Indicates the scope of model use case.
+     * * `default`: Use to train a general text extraction model. Default value.
+     * * `health_care`: Use to train a text extraction model that is tuned for
+     *   healthcare applications.
+     *
+ * + * string model_hint = 3; + * + * @return This builder for chaining. + */ + public Builder clearModelHint() { + + modelHint_ = getDefaultInstance().getModelHint(); + onChanged(); + return this; + } + /** + * + * + * 
+     * Indicates the scope of model use case.
+     * * `default`: Use to train a general text extraction model. Default value.
+     * * `health_care`: Use to train a text extraction model that is tuned for
+     *   healthcare applications.
+     *
+ * + * string model_hint = 3; + * + * @param value The bytes for modelHint to set. + * @return This builder for chaining. + */ + public Builder setModelHintBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + checkByteStringIsUtf8(value); + + modelHint_ = 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-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadataOrBuilder.java b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadataOrBuilder.java index a1e158341..be64161f3 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadataOrBuilder.java +++ b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextExtractionModelMetadataOrBuilder.java @@ -21,4 +21,36 @@ public interface TextExtractionModelMetadataOrBuilder extends // @@protoc_insertion_point(interface_extends:google.cloud.automl.v1beta1.TextExtractionModelMetadata) - com.google.protobuf.MessageOrBuilder {} + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * Indicates the scope of model use case.
+   * * `default`: Use to train a general text extraction model. Default value.
+   * * `health_care`: Use to train a text extraction model that is tuned for
+   *   healthcare applications.
+   *
+ * + * string model_hint = 3; + * + * @return The modelHint. + */ + java.lang.String getModelHint(); + /** + * + * + * 
+   * Indicates the scope of model use case.
+   * * `default`: Use to train a general text extraction model. Default value.
+   * * `health_care`: Use to train a text extraction model that is tuned for
+   *   healthcare applications.
+   *
+ * + * string model_hint = 3; + * + * @return The bytes for modelHint. + */ + com.google.protobuf.ByteString getModelHintBytes(); +} diff --git a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java index bee55a1c9..0457c2bd3 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java +++ b/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java @@ -70,14 +70,15 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "cationModelMetadata\022L\n\023classification_ty" + "pe\030\003 \001(\0162/.google.cloud.automl.v1beta1.C" + "lassificationType\"\037\n\035TextExtractionDatas" - + "etMetadata\"\035\n\033TextExtractionModelMetadat" - + "a\"5\n\034TextSentimentDatasetMetadata\022\025\n\rsen" - + "timent_max\030\001 \001(\005\"\034\n\032TextSentimentModelMe" - + "tadataB\260\001\n\037com.google.cloud.automl.v1bet" - + "a1B\tTextProtoP\001ZAgoogle.golang.org/genpr" - + "oto/googleapis/cloud/automl/v1beta1;auto" - + "ml\312\002\033Google\\Cloud\\AutoMl\\V1beta1\352\002\036Googl" - + "e::Cloud::AutoML::V1beta1b\006proto3" + + "etMetadata\"1\n\033TextExtractionModelMetadat" + + "a\022\022\n\nmodel_hint\030\003 \001(\t\"5\n\034TextSentimentDa" + + "tasetMetadata\022\025\n\rsentiment_max\030\001 \001(\005\"\034\n\032" + + "TextSentimentModelMetadataB\260\001\n\037com.googl" + + "e.cloud.automl.v1beta1B\tTextProtoP\001ZAgoo" + + "gle.golang.org/genproto/googleapis/cloud" + + "/automl/v1beta1;automl\312\002\033Google\\Cloud\\Au" + + "toMl\\V1beta1\352\002\036Google::Cloud::AutoML::V1" + + "beta1b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -113,7 +114,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { internal_static_google_cloud_automl_v1beta1_TextExtractionModelMetadata_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_automl_v1beta1_TextExtractionModelMetadata_descriptor, - new java.lang.String[] {}); + new java.lang.String[] { + "ModelHint", + }); internal_static_google_cloud_automl_v1beta1_TextSentimentDatasetMetadata_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_google_cloud_automl_v1beta1_TextSentimentDatasetMetadata_fieldAccessorTable = diff --git a/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/io.proto b/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/io.proto index a99793830..3d8ab45fe 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/io.proto +++ b/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/io.proto @@ -1015,6 +1015,32 @@ message ModelExportOutputConfig { // * For Image Classification mobile-core-ml-low-latency-1, // mobile-core-ml-versatile-1, mobile-core-ml-high-accuracy-1: // "core_ml" (default). + // + // * For Image Object Detection mobile-low-latency-1, mobile-versatile-1, + // mobile-high-accuracy-1: + // "tflite", "tf_saved_model", "tf_js". + // + // * For Video Classification cloud, + // "tf_saved_model". + // + // * For Video Object Tracking cloud, + // "tf_saved_model". + // + // * For Video Object Tracking mobile-versatile-1: + // "tflite", "edgetpu_tflite", "tf_saved_model", "docker". + // + // * For Video Object Tracking mobile-coral-versatile-1: + // "tflite", "edgetpu_tflite", "docker". + // + // * For Video Object Tracking mobile-coral-low-latency-1: + // "tflite", "edgetpu_tflite", "docker". + // + // * For Video Object Tracking mobile-jetson-versatile-1: + // "tf_saved_model", "docker". + // + // * For Tables: + // "docker". + // // Formats description: // // * tflite - Used for Android mobile devices. diff --git a/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/text.proto b/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/text.proto index f6f33185c..3319a094b 100644 --- a/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/text.proto +++ b/proto-google-cloud-automl-v1beta1/src/main/proto/google/cloud/automl/v1beta1/text.proto @@ -45,7 +45,13 @@ message TextExtractionDatasetMetadata { // Model metadata that is specific to text extraction. message TextExtractionModelMetadata { - + // Indicates the scope of model use case. + // + // * `default`: Use to train a general text extraction model. Default value. + // + // * `health_care`: Use to train a text extraction model that is tuned for + // healthcare applications. + string model_hint = 3; } // Dataset metadata for text sentiment. diff --git a/renovate.json b/renovate.json index 0d42bec3c..eede4612c 100644 --- a/renovate.json +++ b/renovate.json @@ -17,24 +17,6 @@ ], "versionScheme": "docker" }, - { - "packagePatterns": [ - "^com.google.api:gax", - "^com.google.auth:", - "^com.google.cloud:google-cloud-core", - "^io.grpc:", - "^com.google.guava:" - ], - "groupName": "core dependencies" - }, - { - "packagePatterns": [ - "^com.google.http-client:", - "^com.google.oauth-client:", - "^com.google.api-client:" - ], - "groupName": "core transport dependencies" - }, { "packagePatterns": [ "*" @@ -63,6 +45,16 @@ "semanticCommitType": "chore", "semanticCommitScope": "deps" }, + { + "packagePatterns": [ + "^junit:junit", + "^com.google.truth:truth", + "^org.mockito:mockito-core", + "^org.objenesis:objenesis" + ], + "semanticCommitType": "test", + "semanticCommitScope": "deps" + }, { "packagePatterns": [ "^com.google.cloud:google-cloud-" @@ -78,4 +70,4 @@ ], "semanticCommits": true, "masterIssue": true -} \ No newline at end of file +} diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index c2be653bd..9a668b828 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.18 + 1.0.21 @@ -29,17 +29,17 @@ com.google.cloud google-cloud-automl - 1.2.1 + 1.2.3 com.google.cloud google-cloud-bigquery - 1.120.0 + 1.123.2 com.google.cloud google-cloud-storage - 1.113.1 + 1.113.2 @@ -51,13 +51,13 @@ junit junit - 4.13 + 4.13.1 test com.google.truth truth - 1.0.1 + 1.1 test diff --git a/samples/pom.xml b/samples/pom.xml index 1f833b30d..1ddc16a41 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index d049d2cf9..8e9621271 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 @@ -28,19 +28,20 @@ com.google.cloud google-cloud-automl - 1.2.3 + 1.3.0 + com.google.cloud google-cloud-bigquery - 1.2.3 + 1.123.2 com.google.cloud google-cloud-storage - 1.2.3 + 1.113.2 - + net.sourceforge.argparse4j argparse4j @@ -49,13 +50,13 @@ junit junit - 4.13 + 4.13.1 test com.google.truth truth - 1.0.1 + 1.1 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d4ac5632e..b07bb298f 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.21 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 10.1.0 + 13.3.0 pom import @@ -59,13 +59,13 @@ junit junit - 4.13 + 4.13.1 test com.google.truth truth - 1.0.1 + 1.1 test diff --git a/samples/snippets/src/main/java/com/beta/automl/BatchPredict.java b/samples/snippets/src/main/java/beta/automl/BatchPredict.java similarity index 97% rename from samples/snippets/src/main/java/com/beta/automl/BatchPredict.java rename to samples/snippets/src/main/java/beta/automl/BatchPredict.java index 5b88a0313..4684f7079 100644 --- a/samples/snippets/src/main/java/com/beta/automl/BatchPredict.java +++ b/samples/snippets/src/main/java/beta/automl/BatchPredict.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; +// [START automl_tables_batch_predict] // [START automl_batch_predict_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.automl.v1beta1.BatchPredictInputConfig; @@ -80,3 +81,4 @@ static void batchPredict(String projectId, String modelId, String inputUri, Stri } } // [END automl_batch_predict_beta] +// [END automl_tables_batch_predict] diff --git a/samples/snippets/src/main/java/com/beta/automl/CancelOperation.java b/samples/snippets/src/main/java/beta/automl/CancelOperation.java similarity index 98% rename from samples/snippets/src/main/java/com/beta/automl/CancelOperation.java rename to samples/snippets/src/main/java/beta/automl/CancelOperation.java index 557e5fb87..1e0e4fd2a 100644 --- a/samples/snippets/src/main/java/com/beta/automl/CancelOperation.java +++ b/samples/snippets/src/main/java/beta/automl/CancelOperation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_cancel_operation_beta] diff --git a/samples/snippets/src/main/java/com/beta/automl/DeleteDataset.java b/samples/snippets/src/main/java/beta/automl/DeleteDataset.java similarity index 95% rename from samples/snippets/src/main/java/com/beta/automl/DeleteDataset.java rename to samples/snippets/src/main/java/beta/automl/DeleteDataset.java index 1c902df2c..9ef47c5c2 100644 --- a/samples/snippets/src/main/java/com/beta/automl/DeleteDataset.java +++ b/samples/snippets/src/main/java/beta/automl/DeleteDataset.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_delete_dataset_beta] +// [START automl_tables_delete_dataset] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.DatasetName; import com.google.protobuf.Empty; @@ -46,4 +47,5 @@ static void deleteDataset(String projectId, String datasetId) } } } +// [END automl_tables_delete_dataset] // [END automl_delete_dataset_beta] diff --git a/samples/snippets/src/main/java/com/beta/automl/DeleteModel.java b/samples/snippets/src/main/java/beta/automl/DeleteModel.java similarity index 95% rename from samples/snippets/src/main/java/com/beta/automl/DeleteModel.java rename to samples/snippets/src/main/java/beta/automl/DeleteModel.java index cd1660ba8..77cc99bb2 100644 --- a/samples/snippets/src/main/java/com/beta/automl/DeleteModel.java +++ b/samples/snippets/src/main/java/beta/automl/DeleteModel.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; +// [START automl_tables_delete_model] // [START automl_delete_model_beta] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.ModelName; @@ -52,3 +53,4 @@ static void deleteModel(String projectId, String modelId) } } // [END automl_delete_model_beta] +// [END automl_tables_delete_model] diff --git a/samples/snippets/src/main/java/com/beta/automl/DeployModel.java b/samples/snippets/src/main/java/beta/automl/DeployModel.java similarity index 96% rename from samples/snippets/src/main/java/com/beta/automl/DeployModel.java rename to samples/snippets/src/main/java/beta/automl/DeployModel.java index 0f9c0d381..55a3105dd 100644 --- a/samples/snippets/src/main/java/com/beta/automl/DeployModel.java +++ b/samples/snippets/src/main/java/beta/automl/DeployModel.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; +// [START automl_tables_deploy_model] // [START automl_deploy_model_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.automl.v1beta1.AutoMlClient; @@ -55,3 +56,4 @@ static void deployModel(String projectId, String modelId) } } // [END automl_deploy_model_beta] +// [END automl_tables_deploy_model] diff --git a/samples/snippets/src/main/java/com/beta/automl/GetModel.java b/samples/snippets/src/main/java/beta/automl/GetModel.java similarity index 96% rename from samples/snippets/src/main/java/com/beta/automl/GetModel.java rename to samples/snippets/src/main/java/beta/automl/GetModel.java index 330bc003b..4534dfbbe 100644 --- a/samples/snippets/src/main/java/com/beta/automl/GetModel.java +++ b/samples/snippets/src/main/java/beta/automl/GetModel.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_get_model_beta] +// [START automl_tables_get_model] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.Model; import com.google.cloud.automl.v1beta1.ModelName; @@ -59,4 +60,5 @@ static void getModel(String projectId, String modelId) } } } +// [END automl_tables_get_model] // [END automl_get_model_beta] diff --git a/samples/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java b/samples/snippets/src/main/java/beta/automl/GetModelEvaluation.java similarity index 96% rename from samples/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java rename to samples/snippets/src/main/java/beta/automl/GetModelEvaluation.java index 13393c714..74f35f5a7 100644 --- a/samples/snippets/src/main/java/com/beta/automl/GetModelEvaluation.java +++ b/samples/snippets/src/main/java/beta/automl/GetModelEvaluation.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_video_classification_get_model_evaluation_beta] // [START automl_video_object_tracking_get_model_evaluation_beta] +// [START automl_tables_get_model_evaluation] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.ModelEvaluation; import com.google.cloud.automl.v1beta1.ModelEvaluationName; @@ -69,5 +70,6 @@ static void getModelEvaluation(String projectId, String modelId, String modelEva } } } -// [END automl_video_classification_get_model_evaluation_beta] +// [END automl_tables_get_model_evaluation] // [END automl_video_object_tracking_get_model_evaluation_beta] +// [END automl_video_classification_get_model_evaluation_beta] diff --git a/samples/snippets/src/main/java/com/beta/automl/GetOperationStatus.java b/samples/snippets/src/main/java/beta/automl/GetOperationStatus.java similarity index 95% rename from samples/snippets/src/main/java/com/beta/automl/GetOperationStatus.java rename to samples/snippets/src/main/java/beta/automl/GetOperationStatus.java index 711c91e6b..77dc70340 100644 --- a/samples/snippets/src/main/java/com/beta/automl/GetOperationStatus.java +++ b/samples/snippets/src/main/java/beta/automl/GetOperationStatus.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_get_operation_status_beta] +// [START automl_tables_get_operation_status] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.longrunning.Operation; import java.io.IOException; @@ -54,4 +55,5 @@ static void getOperationStatus(String operationFullId) throws IOException { } } } +// [END automl_tables_get_operation_status] // [END automl_get_operation_status_beta] diff --git a/samples/snippets/src/main/java/com/beta/automl/ImportDataset.java b/samples/snippets/src/main/java/beta/automl/ImportDataset.java similarity index 99% rename from samples/snippets/src/main/java/com/beta/automl/ImportDataset.java rename to samples/snippets/src/main/java/beta/automl/ImportDataset.java index 890ac50eb..9d21ecc62 100644 --- a/samples/snippets/src/main/java/com/beta/automl/ImportDataset.java +++ b/samples/snippets/src/main/java/beta/automl/ImportDataset.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_import_dataset_beta] import com.google.api.gax.longrunning.OperationFuture; diff --git a/samples/snippets/src/main/java/com/beta/automl/ListDatasets.java b/samples/snippets/src/main/java/beta/automl/ListDatasets.java similarity index 83% rename from samples/snippets/src/main/java/com/beta/automl/ListDatasets.java rename to samples/snippets/src/main/java/beta/automl/ListDatasets.java index cc36b61db..e3a05e0ed 100644 --- a/samples/snippets/src/main/java/com/beta/automl/ListDatasets.java +++ b/samples/snippets/src/main/java/beta/automl/ListDatasets.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_video_classification_list_datasets_beta] // [START automl_video_object_tracking_list_datasets_beta] -// [START automl_tables_list_datasets_beta] +// [START automl_tables_list_datasets] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.AutoMlSettings; import com.google.cloud.automl.v1beta1.Dataset; @@ -40,20 +40,7 @@ static void listDatasets(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. After completing all of your requests, call // the "close" method on the client to safely clean up any remaining background resources. - AutoMlSettings.Builder autoMlSettingsBuilder = AutoMlSettings.newBuilder(); - - autoMlSettingsBuilder - .listDatasetsSettings() - .setRetrySettings( - autoMlSettingsBuilder - .listDatasetsSettings() - .getRetrySettings() - .toBuilder() - .setTotalTimeout(Duration.ofSeconds(15)) - .build()); - AutoMlSettings autoMlSettings = autoMlSettingsBuilder.build(); - - try (AutoMlClient client = AutoMlClient.create(autoMlSettings)) { + try (AutoMlClient client = AutoMlClient.create()) { // A resource that represents Google Cloud Platform location. LocationName projectLocation = LocationName.of(projectId, "us-central1"); ListDatasetsRequest request = @@ -76,7 +63,7 @@ static void listDatasets(String projectId) throws IOException { System.out.format("\tnanos: %s%n", dataset.getCreateTime().getNanos()); // [END automl_video_object_tracking_list_datasets_beta] - // [END automl_tables_list_datasets_beta] + // [END automl_tables_list_datasets] System.out.format( "Video classification dataset metadata: %s%n", dataset.getVideoClassificationDatasetMetadata()); @@ -88,7 +75,7 @@ static void listDatasets(String projectId) throws IOException { dataset.getVideoObjectTrackingDatasetMetadata()); // [END automl_video_object_tracking_list_datasets_beta] - // [START automl_tables_list_datasets_beta] + // [START automl_tables_list_datasets] System.out.format("Tables dataset metadata: %s%n", dataset.getTablesDatasetMetadata()); // [START automl_video_classification_list_datasets_beta] @@ -99,4 +86,4 @@ static void listDatasets(String projectId) throws IOException { } // [END automl_video_classification_list_datasets_beta] // [END automl_video_object_tracking_list_datasets_beta] -// [END automl_tables_list_datasets_beta] +// [END automl_tables_list_datasets] diff --git a/samples/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java b/samples/snippets/src/main/java/beta/automl/ListModelEvaluations.java similarity index 95% rename from samples/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java rename to samples/snippets/src/main/java/beta/automl/ListModelEvaluations.java index e165ec393..2fad4ea8e 100644 --- a/samples/snippets/src/main/java/com/beta/automl/ListModelEvaluations.java +++ b/samples/snippets/src/main/java/beta/automl/ListModelEvaluations.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; -// [START automl_tables_list_model_evaluations_beta] +// [START automl_tables_list_model_evaluations] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest; import com.google.cloud.automl.v1beta1.ModelEvaluation; @@ -63,4 +63,4 @@ static void listModelEvaluations(String projectId, String modelId) throws IOExce } } } -// [END automl_tables_list_model_evaluations_beta] +// [END automl_tables_list_model_evaluations] diff --git a/samples/snippets/src/main/java/com/beta/automl/ListModels.java b/samples/snippets/src/main/java/beta/automl/ListModels.java similarity index 84% rename from samples/snippets/src/main/java/com/beta/automl/ListModels.java rename to samples/snippets/src/main/java/beta/automl/ListModels.java index a96472b72..8f09dcb95 100644 --- a/samples/snippets/src/main/java/com/beta/automl/ListModels.java +++ b/samples/snippets/src/main/java/beta/automl/ListModels.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; +// [START automl_tables_list_models] // [START automl_list_models_beta] - import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.AutoMlSettings; import com.google.cloud.automl.v1beta1.ListModelsRequest; @@ -39,20 +39,7 @@ static void listModels(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. After completing all of your requests, call // the "close" method on the client to safely clean up any remaining background resources. - AutoMlSettings.Builder autoMlSettingsBuilder = AutoMlSettings.newBuilder(); - - autoMlSettingsBuilder - .listModelsSettings() - .setRetrySettings( - autoMlSettingsBuilder - .listModelsSettings() - .getRetrySettings() - .toBuilder() - .setTotalTimeout(Duration.ofSeconds(30)) - .build()); - AutoMlSettings autoMlSettings = autoMlSettingsBuilder.build(); - - try (AutoMlClient client = AutoMlClient.create(autoMlSettings)) { + try (AutoMlClient client = AutoMlClient.create()) { // A resource that represents Google Cloud Platform location. LocationName projectLocation = LocationName.of(projectId, "us-central1"); @@ -84,3 +71,4 @@ static void listModels(String projectId) throws IOException { } } // [END automl_list_models_beta] +// [END automl_tables_list_models] diff --git a/samples/snippets/src/main/java/com/beta/automl/SetEndpoint.java b/samples/snippets/src/main/java/beta/automl/SetEndpoint.java similarity index 98% rename from samples/snippets/src/main/java/com/beta/automl/SetEndpoint.java rename to samples/snippets/src/main/java/beta/automl/SetEndpoint.java index e28e3d558..4718b220a 100644 --- a/samples/snippets/src/main/java/com/beta/automl/SetEndpoint.java +++ b/samples/snippets/src/main/java/beta/automl/SetEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.AutoMlSettings; diff --git a/samples/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java b/samples/snippets/src/main/java/beta/automl/TablesBatchPredictBigQuery.java similarity index 96% rename from samples/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java rename to samples/snippets/src/main/java/beta/automl/TablesBatchPredictBigQuery.java index 9863beafd..73e964da4 100644 --- a/samples/snippets/src/main/java/com/beta/automl/TablesBatchPredictBigQuery.java +++ b/samples/snippets/src/main/java/beta/automl/TablesBatchPredictBigQuery.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; -// [START automl_tables_batch_predict_bigquery_beta] +// [START automl_tables_batch_predict_bq] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.automl.v1beta1.BatchPredictInputConfig; import com.google.cloud.automl.v1beta1.BatchPredictOutputConfig; @@ -79,4 +79,4 @@ static void batchPredict(String projectId, String modelId, String inputUri, Stri } } } -// [END automl_tables_batch_predict_bigquery_beta] +// [END automl_tables_batch_predict_bq] diff --git a/samples/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java b/samples/snippets/src/main/java/beta/automl/TablesCreateDataset.java similarity index 95% rename from samples/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java rename to samples/snippets/src/main/java/beta/automl/TablesCreateDataset.java index e48e4ab71..b5390f337 100644 --- a/samples/snippets/src/main/java/com/beta/automl/TablesCreateDataset.java +++ b/samples/snippets/src/main/java/beta/automl/TablesCreateDataset.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; -// [START automl_tables_create_dataset_beta] +// [START automl_tables_create_dataset] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.Dataset; import com.google.cloud.automl.v1beta1.LocationName; @@ -60,4 +60,4 @@ static void createDataset(String projectId, String displayName) throws IOExcepti } } } -// [END automl_tables_create_dataset_beta] +// [END automl_tables_create_dataset] diff --git a/samples/snippets/src/main/java/com/beta/automl/TablesCreateModel.java b/samples/snippets/src/main/java/beta/automl/TablesCreateModel.java similarity index 97% rename from samples/snippets/src/main/java/com/beta/automl/TablesCreateModel.java rename to samples/snippets/src/main/java/beta/automl/TablesCreateModel.java index 34cbca52b..9c95119e1 100644 --- a/samples/snippets/src/main/java/com/beta/automl/TablesCreateModel.java +++ b/samples/snippets/src/main/java/beta/automl/TablesCreateModel.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; -// [START automl_tables_create_model_beta] +// [START automl_tables_create_model] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.ColumnSpec; @@ -89,4 +89,4 @@ static void createModel( } } } -// [END automl_tables_create_model_beta] +// [END automl_tables_create_model] diff --git a/samples/snippets/src/main/java/com/beta/automl/TablesGetModel.java b/samples/snippets/src/main/java/beta/automl/TablesGetModel.java similarity index 99% rename from samples/snippets/src/main/java/com/beta/automl/TablesGetModel.java rename to samples/snippets/src/main/java/beta/automl/TablesGetModel.java index ea0cdd8c8..443491252 100644 --- a/samples/snippets/src/main/java/com/beta/automl/TablesGetModel.java +++ b/samples/snippets/src/main/java/beta/automl/TablesGetModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_tables_get_model] diff --git a/samples/snippets/src/main/java/com/beta/automl/TablesImportDataset.java b/samples/snippets/src/main/java/beta/automl/TablesImportDataset.java similarity index 96% rename from samples/snippets/src/main/java/com/beta/automl/TablesImportDataset.java rename to samples/snippets/src/main/java/beta/automl/TablesImportDataset.java index ee2d90981..ce0e5fc16 100644 --- a/samples/snippets/src/main/java/com/beta/automl/TablesImportDataset.java +++ b/samples/snippets/src/main/java/beta/automl/TablesImportDataset.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; -// [START automl_tables_import_dataset_beta] +// [START automl_tables_import_data] import com.google.cloud.automl.v1beta1.AutoMlClient; import com.google.cloud.automl.v1beta1.BigQuerySource; import com.google.cloud.automl.v1beta1.DatasetName; @@ -71,4 +71,4 @@ static void importDataset(String projectId, String datasetId, String path) } } } -// [END automl_tables_import_dataset_beta] +// [END automl_tables_import_data] diff --git a/samples/snippets/src/main/java/com/beta/automl/TablesPredict.java b/samples/snippets/src/main/java/beta/automl/TablesPredict.java similarity index 97% rename from samples/snippets/src/main/java/com/beta/automl/TablesPredict.java rename to samples/snippets/src/main/java/beta/automl/TablesPredict.java index 8e4b24f39..fd2257c89 100644 --- a/samples/snippets/src/main/java/com/beta/automl/TablesPredict.java +++ b/samples/snippets/src/main/java/beta/automl/TablesPredict.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; -// [START automl_tables_predict_beta] +// [START automl_tables_predict] import com.google.cloud.automl.v1beta1.AnnotationPayload; import com.google.cloud.automl.v1beta1.ExamplePayload; import com.google.cloud.automl.v1beta1.ModelName; @@ -84,4 +84,4 @@ static void predict(String projectId, String modelId, List values) throws } } } -// [END automl_tables_predict_beta] +// [END automl_tables_predict] diff --git a/samples/snippets/src/main/java/com/beta/automl/UndeployModel.java b/samples/snippets/src/main/java/beta/automl/UndeployModel.java similarity index 95% rename from samples/snippets/src/main/java/com/beta/automl/UndeployModel.java rename to samples/snippets/src/main/java/beta/automl/UndeployModel.java index 29722fe44..7325f519d 100644 --- a/samples/snippets/src/main/java/com/beta/automl/UndeployModel.java +++ b/samples/snippets/src/main/java/beta/automl/UndeployModel.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; +// [START automl_tables_undeploy_model] // [START automl_undeploy_model_beta] import com.google.api.gax.longrunning.OperationFuture; import com.google.cloud.automl.v1beta1.AutoMlClient; @@ -54,3 +55,4 @@ static void undeployModel(String projectId, String modelId) } } // [END automl_undeploy_model_beta] +// [END automl_tables_undeploy_model] diff --git a/samples/snippets/src/main/java/com/beta/automl/VideoClassificationCreateDataset.java b/samples/snippets/src/main/java/beta/automl/VideoClassificationCreateDataset.java similarity index 99% rename from samples/snippets/src/main/java/com/beta/automl/VideoClassificationCreateDataset.java rename to samples/snippets/src/main/java/beta/automl/VideoClassificationCreateDataset.java index ab0064625..1fe70c9f2 100644 --- a/samples/snippets/src/main/java/com/beta/automl/VideoClassificationCreateDataset.java +++ b/samples/snippets/src/main/java/beta/automl/VideoClassificationCreateDataset.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_video_classification_create_dataset_beta] import com.google.cloud.automl.v1beta1.AutoMlClient; diff --git a/samples/snippets/src/main/java/com/beta/automl/VideoClassificationCreateModel.java b/samples/snippets/src/main/java/beta/automl/VideoClassificationCreateModel.java similarity index 99% rename from samples/snippets/src/main/java/com/beta/automl/VideoClassificationCreateModel.java rename to samples/snippets/src/main/java/beta/automl/VideoClassificationCreateModel.java index 892bbd6de..94f3407d4 100644 --- a/samples/snippets/src/main/java/com/beta/automl/VideoClassificationCreateModel.java +++ b/samples/snippets/src/main/java/beta/automl/VideoClassificationCreateModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_video_classification_create_model_beta] import com.google.api.gax.longrunning.OperationFuture; diff --git a/samples/snippets/src/main/java/com/beta/automl/VideoObjectTrackingCreateDataset.java b/samples/snippets/src/main/java/beta/automl/VideoObjectTrackingCreateDataset.java similarity index 99% rename from samples/snippets/src/main/java/com/beta/automl/VideoObjectTrackingCreateDataset.java rename to samples/snippets/src/main/java/beta/automl/VideoObjectTrackingCreateDataset.java index f92e65814..61b2a1ada 100644 --- a/samples/snippets/src/main/java/com/beta/automl/VideoObjectTrackingCreateDataset.java +++ b/samples/snippets/src/main/java/beta/automl/VideoObjectTrackingCreateDataset.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_video_object_tracking_create_dataset_beta] import com.google.cloud.automl.v1beta1.AutoMlClient; diff --git a/samples/snippets/src/main/java/com/beta/automl/VideoObjectTrackingCreateModel.java b/samples/snippets/src/main/java/beta/automl/VideoObjectTrackingCreateModel.java similarity index 99% rename from samples/snippets/src/main/java/com/beta/automl/VideoObjectTrackingCreateModel.java rename to samples/snippets/src/main/java/beta/automl/VideoObjectTrackingCreateModel.java index ec2315144..29df78666 100644 --- a/samples/snippets/src/main/java/com/beta/automl/VideoObjectTrackingCreateModel.java +++ b/samples/snippets/src/main/java/beta/automl/VideoObjectTrackingCreateModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; // [START automl_video_object_tracking_create_model_beta] import com.google.api.gax.longrunning.OperationFuture; diff --git a/samples/snippets/src/main/java/com/example/automl/ListModels.java b/samples/snippets/src/main/java/com/example/automl/ListModels.java index 9b2e5427c..ffb6ad9d1 100644 --- a/samples/snippets/src/main/java/com/example/automl/ListModels.java +++ b/samples/snippets/src/main/java/com/example/automl/ListModels.java @@ -38,20 +38,7 @@ static void listModels(String projectId) throws IOException { // Initialize client that will be used to send requests. This client only needs to be created // once, and can be reused for multiple requests. After completing all of your requests, call // the "close" method on the client to safely clean up any remaining background resources. - AutoMlSettings.Builder autoMlSettingsBuilder = AutoMlSettings.newBuilder(); - - autoMlSettingsBuilder - .listModelsSettings() - .setRetrySettings( - autoMlSettingsBuilder - .listModelsSettings() - .getRetrySettings() - .toBuilder() - .setTotalTimeout(Duration.ofSeconds(20)) - .build()); - AutoMlSettings autoMlSettings = autoMlSettingsBuilder.build(); - - try (AutoMlClient client = AutoMlClient.create(autoMlSettings)) { + try (AutoMlClient client = AutoMlClient.create()) { // A resource that represents Google Cloud Platform location. LocationName projectLocation = LocationName.of(projectId, "us-central1"); diff --git a/samples/snippets/src/test/java/com/beta/automl/BatchPredictTest.java b/samples/snippets/src/test/java/beta/automl/BatchPredictTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/BatchPredictTest.java rename to samples/snippets/src/test/java/beta/automl/BatchPredictTest.java index f9d3c8407..96c783b65 100644 --- a/samples/snippets/src/test/java/com/beta/automl/BatchPredictTest.java +++ b/samples/snippets/src/test/java/beta/automl/BatchPredictTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/CancelOperationTest.java b/samples/snippets/src/test/java/beta/automl/CancelOperationTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/CancelOperationTest.java rename to samples/snippets/src/test/java/beta/automl/CancelOperationTest.java index a44366aea..89487d500 100644 --- a/samples/snippets/src/test/java/com/beta/automl/CancelOperationTest.java +++ b/samples/snippets/src/test/java/beta/automl/CancelOperationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/DeleteDatasetTest.java b/samples/snippets/src/test/java/beta/automl/DeleteDatasetTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/DeleteDatasetTest.java rename to samples/snippets/src/test/java/beta/automl/DeleteDatasetTest.java index 8f446bc1a..5f98603ba 100644 --- a/samples/snippets/src/test/java/com/beta/automl/DeleteDatasetTest.java +++ b/samples/snippets/src/test/java/beta/automl/DeleteDatasetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/DeleteModelTest.java b/samples/snippets/src/test/java/beta/automl/DeleteModelTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/DeleteModelTest.java rename to samples/snippets/src/test/java/beta/automl/DeleteModelTest.java index a56d98229..fe03799dc 100644 --- a/samples/snippets/src/test/java/com/beta/automl/DeleteModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/DeleteModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/DeployModelTest.java b/samples/snippets/src/test/java/beta/automl/DeployModelTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/DeployModelTest.java rename to samples/snippets/src/test/java/beta/automl/DeployModelTest.java index 5295c0239..144d6aa01 100644 --- a/samples/snippets/src/test/java/com/beta/automl/DeployModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/DeployModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/GetModelEvaluationTest.java b/samples/snippets/src/test/java/beta/automl/GetModelEvaluationTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/GetModelEvaluationTest.java rename to samples/snippets/src/test/java/beta/automl/GetModelEvaluationTest.java index 57b81be75..42a00f2b1 100644 --- a/samples/snippets/src/test/java/com/beta/automl/GetModelEvaluationTest.java +++ b/samples/snippets/src/test/java/beta/automl/GetModelEvaluationTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/GetModelTest.java b/samples/snippets/src/test/java/beta/automl/GetModelTest.java similarity index 98% rename from samples/snippets/src/test/java/com/beta/automl/GetModelTest.java rename to samples/snippets/src/test/java/beta/automl/GetModelTest.java index 1ed269c3f..7b80ec291 100644 --- a/samples/snippets/src/test/java/com/beta/automl/GetModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/GetModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/GetOperationStatusTest.java b/samples/snippets/src/test/java/beta/automl/GetOperationStatusTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/GetOperationStatusTest.java rename to samples/snippets/src/test/java/beta/automl/GetOperationStatusTest.java index 508bab09f..7f63f1ca2 100644 --- a/samples/snippets/src/test/java/com/beta/automl/GetOperationStatusTest.java +++ b/samples/snippets/src/test/java/beta/automl/GetOperationStatusTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/ImportDatasetTest.java b/samples/snippets/src/test/java/beta/automl/ImportDatasetTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/ImportDatasetTest.java rename to samples/snippets/src/test/java/beta/automl/ImportDatasetTest.java index f608b7c2a..5a06c4362 100644 --- a/samples/snippets/src/test/java/com/beta/automl/ImportDatasetTest.java +++ b/samples/snippets/src/test/java/beta/automl/ImportDatasetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/ListDatasetsTest.java b/samples/snippets/src/test/java/beta/automl/ListDatasetsTest.java similarity index 98% rename from samples/snippets/src/test/java/com/beta/automl/ListDatasetsTest.java rename to samples/snippets/src/test/java/beta/automl/ListDatasetsTest.java index 00daf10d6..62bdf6144 100644 --- a/samples/snippets/src/test/java/com/beta/automl/ListDatasetsTest.java +++ b/samples/snippets/src/test/java/beta/automl/ListDatasetsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/ListModelEvaluationsTest.java b/samples/snippets/src/test/java/beta/automl/ListModelEvaluationsTest.java similarity index 98% rename from samples/snippets/src/test/java/com/beta/automl/ListModelEvaluationsTest.java rename to samples/snippets/src/test/java/beta/automl/ListModelEvaluationsTest.java index 13541ffe8..d8c4cb6ac 100644 --- a/samples/snippets/src/test/java/com/beta/automl/ListModelEvaluationsTest.java +++ b/samples/snippets/src/test/java/beta/automl/ListModelEvaluationsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/ListModelsTest.java b/samples/snippets/src/test/java/beta/automl/ListModelsTest.java similarity index 98% rename from samples/snippets/src/test/java/com/beta/automl/ListModelsTest.java rename to samples/snippets/src/test/java/beta/automl/ListModelsTest.java index b995fcb9c..6b70440d6 100644 --- a/samples/snippets/src/test/java/com/beta/automl/ListModelsTest.java +++ b/samples/snippets/src/test/java/beta/automl/ListModelsTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/SetEndpointIT.java b/samples/snippets/src/test/java/beta/automl/SetEndpointIT.java similarity index 98% rename from samples/snippets/src/test/java/com/beta/automl/SetEndpointIT.java rename to samples/snippets/src/test/java/beta/automl/SetEndpointIT.java index 4ad7601c0..5f0dc5513 100644 --- a/samples/snippets/src/test/java/com/beta/automl/SetEndpointIT.java +++ b/samples/snippets/src/test/java/beta/automl/SetEndpointIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/TablesBatchPredictBigQueryTest.java b/samples/snippets/src/test/java/beta/automl/TablesBatchPredictBigQueryTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/TablesBatchPredictBigQueryTest.java rename to samples/snippets/src/test/java/beta/automl/TablesBatchPredictBigQueryTest.java index c99e9bef0..630f4379e 100644 --- a/samples/snippets/src/test/java/com/beta/automl/TablesBatchPredictBigQueryTest.java +++ b/samples/snippets/src/test/java/beta/automl/TablesBatchPredictBigQueryTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/TablesCreateDatasetTest.java b/samples/snippets/src/test/java/beta/automl/TablesCreateDatasetTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/TablesCreateDatasetTest.java rename to samples/snippets/src/test/java/beta/automl/TablesCreateDatasetTest.java index 5afacee40..d5aab148f 100644 --- a/samples/snippets/src/test/java/com/beta/automl/TablesCreateDatasetTest.java +++ b/samples/snippets/src/test/java/beta/automl/TablesCreateDatasetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/TablesCreateModelTest.java b/samples/snippets/src/test/java/beta/automl/TablesCreateModelTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/TablesCreateModelTest.java rename to samples/snippets/src/test/java/beta/automl/TablesCreateModelTest.java index 6d514a417..1f4c57988 100644 --- a/samples/snippets/src/test/java/com/beta/automl/TablesCreateModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/TablesCreateModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/TablesGetModelTest.java b/samples/snippets/src/test/java/beta/automl/TablesGetModelTest.java similarity index 97% rename from samples/snippets/src/test/java/com/beta/automl/TablesGetModelTest.java rename to samples/snippets/src/test/java/beta/automl/TablesGetModelTest.java index c1055e237..dd76b0646 100644 --- a/samples/snippets/src/test/java/com/beta/automl/TablesGetModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/TablesGetModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; @@ -50,7 +50,6 @@ private static String requireEnvVar(String varName) { public static void checkRequirements() { requireEnvVar("GOOGLE_APPLICATION_CREDENTIALS"); requireEnvVar("AUTOML_PROJECT_ID"); - requireEnvVar("TABLE_MODEL_ID"); } @Before diff --git a/samples/snippets/src/test/java/com/beta/automl/TablesImportDatasetTest.java b/samples/snippets/src/test/java/beta/automl/TablesImportDatasetTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/TablesImportDatasetTest.java rename to samples/snippets/src/test/java/beta/automl/TablesImportDatasetTest.java index ac96c7a17..c6c52f375 100644 --- a/samples/snippets/src/test/java/com/beta/automl/TablesImportDatasetTest.java +++ b/samples/snippets/src/test/java/beta/automl/TablesImportDatasetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/TablesPredictTest.java b/samples/snippets/src/test/java/beta/automl/TablesPredictTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/TablesPredictTest.java rename to samples/snippets/src/test/java/beta/automl/TablesPredictTest.java index 91075b1f4..0abb04b2e 100644 --- a/samples/snippets/src/test/java/com/beta/automl/TablesPredictTest.java +++ b/samples/snippets/src/test/java/beta/automl/TablesPredictTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/UndeployModelTest.java b/samples/snippets/src/test/java/beta/automl/UndeployModelTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/UndeployModelTest.java rename to samples/snippets/src/test/java/beta/automl/UndeployModelTest.java index 21ecb2266..4ec06dabf 100644 --- a/samples/snippets/src/test/java/com/beta/automl/UndeployModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/UndeployModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/VideoClassificationCreateDatasetTest.java b/samples/snippets/src/test/java/beta/automl/VideoClassificationCreateDatasetTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/VideoClassificationCreateDatasetTest.java rename to samples/snippets/src/test/java/beta/automl/VideoClassificationCreateDatasetTest.java index 72e7cb963..a29435f28 100644 --- a/samples/snippets/src/test/java/com/beta/automl/VideoClassificationCreateDatasetTest.java +++ b/samples/snippets/src/test/java/beta/automl/VideoClassificationCreateDatasetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/VideoClassificationCreateModelTest.java b/samples/snippets/src/test/java/beta/automl/VideoClassificationCreateModelTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/VideoClassificationCreateModelTest.java rename to samples/snippets/src/test/java/beta/automl/VideoClassificationCreateModelTest.java index b5382a2d1..50c6eb2d3 100644 --- a/samples/snippets/src/test/java/com/beta/automl/VideoClassificationCreateModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/VideoClassificationCreateModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/VideoObjectTrackingCreateDatasetTest.java b/samples/snippets/src/test/java/beta/automl/VideoObjectTrackingCreateDatasetTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/VideoObjectTrackingCreateDatasetTest.java rename to samples/snippets/src/test/java/beta/automl/VideoObjectTrackingCreateDatasetTest.java index 05a0cc458..db458e5ce 100644 --- a/samples/snippets/src/test/java/com/beta/automl/VideoObjectTrackingCreateDatasetTest.java +++ b/samples/snippets/src/test/java/beta/automl/VideoObjectTrackingCreateDatasetTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/beta/automl/VideoObjectTrackingCreateModelTest.java b/samples/snippets/src/test/java/beta/automl/VideoObjectTrackingCreateModelTest.java similarity index 99% rename from samples/snippets/src/test/java/com/beta/automl/VideoObjectTrackingCreateModelTest.java rename to samples/snippets/src/test/java/beta/automl/VideoObjectTrackingCreateModelTest.java index 9c47bc833..279574869 100644 --- a/samples/snippets/src/test/java/com/beta/automl/VideoObjectTrackingCreateModelTest.java +++ b/samples/snippets/src/test/java/beta/automl/VideoObjectTrackingCreateModelTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.beta.automl; +package beta.automl; import static com.google.common.truth.Truth.assertThat; import static junit.framework.TestCase.assertNotNull; diff --git a/samples/snippets/src/test/java/com/example/automl/ListModelsTest.java b/samples/snippets/src/test/java/com/example/automl/ListModelsTest.java index d6eadeb9e..98bed4560 100644 --- a/samples/snippets/src/test/java/com/example/automl/ListModelsTest.java +++ b/samples/snippets/src/test/java/com/example/automl/ListModelsTest.java @@ -64,10 +64,7 @@ public void tearDown() { System.setOut(originalPrintStream); } - // Skipping this test until backend is cleaned up. - // https://github.com/googleapis/java-automl/issues/291 @Test - @Ignore public void testListModels() throws IOException { ListModels.listModels(PROJECT_ID); String got = bout.toString(); diff --git a/synth.metadata b/synth.metadata index 915cc5617..0bcd13f2b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,30 +4,30 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-automl.git", - "sha": "fa0e4ebffc46fb9cb9899f8e82c1f9edc0114d58" + "sha": "78cbae425d4aa93b15b4a993ec1a02913b5a2ded" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "868615a5c1c1059c636bb3d82a555edb1d5a251e", - "internalRef": "324294521" + "sha": "bda7ce951def5ae6e5c4258d0e569188dd4ae02b", + "internalRef": "336180475" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "868615a5c1c1059c636bb3d82a555edb1d5a251e", - "internalRef": "324294521" + "sha": "bda7ce951def5ae6e5c4258d0e569188dd4ae02b", + "internalRef": "336180475" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "80003a3de2d8a75f5b47cb2e77e018f7f0f776cc" + "sha": "5f6ef0ec5501d33c4667885b37a7685a30d41a76" } } ], @@ -57,10 +57,14 @@ ".github/ISSUE_TEMPLATE/feature_request.md", ".github/ISSUE_TEMPLATE/support_request.md", ".github/PULL_REQUEST_TEMPLATE.md", + ".github/readme/synth.py", ".github/release-please.yml", + ".github/snippet-bot.yml", ".github/trusted-contribution.yml", + ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", ".github/workflows/ci.yaml", + ".github/workflows/formatting.yaml", ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/coerce_logs.sh", @@ -68,6 +72,7 @@ ".kokoro/common.sh", ".kokoro/continuous/common.cfg", ".kokoro/continuous/java8.cfg", + ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", @@ -89,6 +94,7 @@ ".kokoro/presubmit/java8.cfg", ".kokoro/presubmit/linkage-monitor.cfg", ".kokoro/presubmit/lint.cfg", + ".kokoro/readme.sh", ".kokoro/release/bump_snapshot.cfg", ".kokoro/release/common.cfg", ".kokoro/release/common.sh", @@ -106,7 +112,6 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", - "README.md", "codecov.yaml", "google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlClient.java", "google-cloud-automl/src/main/java/com/google/cloud/automl/v1/AutoMlSettings.java", diff --git a/versions.txt b/versions.txt index 6e2ee341d..399bb63a8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-automl-v1beta1:0.83.3:0.83.3 -proto-google-cloud-automl-v1:1.2.3:1.2.3 -grpc-google-cloud-automl-v1beta1:0.83.3:0.83.3 -grpc-google-cloud-automl-v1:1.2.3:1.2.3 -google-cloud-automl:1.2.3:1.2.3 \ No newline at end of file +proto-google-cloud-automl-v1beta1:0.84.0:0.84.0 +proto-google-cloud-automl-v1:1.3.0:1.3.0 +grpc-google-cloud-automl-v1beta1:0.84.0:0.84.0 +grpc-google-cloud-automl-v1:1.3.0:1.3.0 +google-cloud-automl:1.3.0:1.3.0 \ No newline at end of file