chore(filestore): add common_java_proto dep to java_assembly_pkg (#79)

- [x] Regenerate this pull request now. PiperOrigin-RevId: 403182344 Source-Link: googleapis/googleapis@b44c45c Source-Link: googleapis/googleapis-gen@35bc860 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMzViYzg2MGY2YTFiMGM0MzMwZmQ4OTViZDMwYTdmYWE0NDZiMjhiMSJ9 fix(filestore): add missing operation_metadata.proto import
googleapis · Oct 20, 2021 · 20d3623 · 20d3623
1 parent 5b7aac4
commit 20d3623
Show file tree

Hide file tree

Showing 43 changed files with 541 additions and 530 deletions.
diff --git a/google-cloud-filestore/src/main/java/com/google/cloud/filestore/v1/package-info.java b/google-cloud-filestore/src/main/java/com/google/cloud/filestore/v1/package-info.java
@@ -15,7 +15,9 @@
  */
 
 /**
- * The interfaces provided are listed below, along with usage samples.
+ * A client to Cloud Filestore API
+ *
+ * <p>The interfaces provided are listed below, along with usage samples.
  *
  * <p>======================= CloudFilestoreManagerClient =======================
  *

diff --git a/...e/src/main/java/com/google/cloud/filestore/v1/stub/CloudFilestoreManagerStubSettings.java b/...e/src/main/java/com/google/cloud/filestore/v1/stub/CloudFilestoreManagerStubSettings.java
@@ -380,7 +380,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/.../main/java/com/google/cloud/filestore/v1beta1/stub/CloudFilestoreManagerStubSettings.java b/.../main/java/com/google/cloud/filestore/v1beta1/stub/CloudFilestoreManagerStubSettings.java
@@ -381,7 +381,9 @@ public static List<String> getDefaultServiceScopes() {
 
   /** Returns a builder for the default credentials for this service. */
   public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() {
-    return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
+    return GoogleCredentialsProvider.newBuilder()
+        .setScopesToApply(DEFAULT_SERVICE_SCOPES)
+        .setUseJwtAccessWithScope(true);
   }
 
   /** Returns a builder for the default ChannelProvider for this service. */

diff --git a/proto-google-cloud-filestore-v1/src/main/java/com/google/cloud/common/OperationMetadata.java b/proto-google-cloud-filestore-v1/src/main/java/com/google/cloud/common/OperationMetadata.java
@@ -505,19 +505,19 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (endTime_ != null) {
       output.writeMessage(2, getEndTime());
     }
-    if (!getTargetBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 3, target_);
     }
-    if (!getVerbBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(verb_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 4, verb_);
     }
-    if (!getStatusDetailBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusDetail_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 5, statusDetail_);
     }
     if (cancelRequested_ != false) {
       output.writeBool(6, cancelRequested_);
     }
-    if (!getApiVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 7, apiVersion_);
     }
     unknownFields.writeTo(output);
@@ -535,19 +535,19 @@ public int getSerializedSize() {
     if (endTime_ != null) {
       size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
     }
-    if (!getTargetBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(target_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, target_);
     }
-    if (!getVerbBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(verb_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, verb_);
     }
-    if (!getStatusDetailBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(statusDetail_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(5, statusDetail_);
     }
     if (cancelRequested_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(6, cancelRequested_);
     }
-    if (!getApiVersionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, apiVersion_);
     }
     size += unknownFields.getSerializedSize();

diff --git a/proto-google-cloud-filestore-v1/src/main/java/com/google/cloud/filestore/v1/Backup.java b/proto-google-cloud-filestore-v1/src/main/java/com/google/cloud/filestore/v1/Backup.java
@@ -737,8 +737,8 @@ public long getCapacityGb() {
    *
    *
    * <pre>
-   * Output only. The size of the storage used by the backup. As backups share storage,
-   * this number is expected to change with backup creation/deletion.
+   * Output only. The size of the storage used by the backup. As backups share
+   * storage, this number is expected to change with backup creation/deletion.
    * </pre>
    *
    * <code>int64 storage_bytes = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -860,8 +860,8 @@ public com.google.protobuf.ByteString getSourceFileShareBytes() {
    *
    *
    * <pre>
-   * Output only. The service tier of the source Cloud Filestore instance that this backup
-   * is created from.
+   * Output only. The service tier of the source Cloud Filestore instance that
+   * this backup is created from.
    * </pre>
    *
    * <code>
@@ -878,8 +878,8 @@ public int getSourceInstanceTierValue() {
    *
    *
    * <pre>
-   * Output only. The service tier of the source Cloud Filestore instance that this backup
-   * is created from.
+   * Output only. The service tier of the source Cloud Filestore instance that
+   * this backup is created from.
    * </pre>
    *
    * <code>
@@ -902,9 +902,9 @@ public com.google.cloud.filestore.v1.Instance.Tier getSourceInstanceTier() {
    *
    *
    * <pre>
-   * Output only. Amount of bytes that will be downloaded if the backup is restored. This
-   * may be different than storage bytes, since sequential backups of the same
-   * disk will share storage.
+   * Output only. Amount of bytes that will be downloaded if the backup is
+   * restored. This may be different than storage bytes, since sequential
+   * backups of the same disk will share storage.
    * </pre>
    *
    * <code>int64 download_bytes = 11 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -984,10 +984,10 @@ public final boolean isInitialized() {
 
   @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
     }
-    if (!getDescriptionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
     }
     if (state_ != com.google.cloud.filestore.v1.Backup.State.STATE_UNSPECIFIED.getNumber()) {
@@ -1004,10 +1004,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (storageBytes_ != 0L) {
       output.writeInt64(7, storageBytes_);
     }
-    if (!getSourceInstanceBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceInstance_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 8, sourceInstance_);
     }
-    if (!getSourceFileShareBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceFileShare_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 9, sourceFileShare_);
     }
     if (sourceInstanceTier_
@@ -1029,10 +1029,10 @@ public int getSerializedSize() {
     if (size != -1) return size;
 
     size = 0;
-    if (!getNameBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
     }
-    if (!getDescriptionBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
     }
     if (state_ != com.google.cloud.filestore.v1.Backup.State.STATE_UNSPECIFIED.getNumber()) {
@@ -1057,10 +1057,10 @@ public int getSerializedSize() {
     if (storageBytes_ != 0L) {
       size += com.google.protobuf.CodedOutputStream.computeInt64Size(7, storageBytes_);
     }
-    if (!getSourceInstanceBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceInstance_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(8, sourceInstance_);
     }
-    if (!getSourceFileShareBytes().isEmpty()) {
+    if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(sourceFileShare_)) {
       size += com.google.protobuf.GeneratedMessageV3.computeStringSize(9, sourceFileShare_);
     }
     if (sourceInstanceTier_
@@ -2246,8 +2246,8 @@ public Builder clearCapacityGb() {
      *
      *
      * <pre>
-     * Output only. The size of the storage used by the backup. As backups share storage,
-     * this number is expected to change with backup creation/deletion.
+     * Output only. The size of the storage used by the backup. As backups share
+     * storage, this number is expected to change with backup creation/deletion.
      * </pre>
      *
      * <code>int64 storage_bytes = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2262,8 +2262,8 @@ public long getStorageBytes() {
      *
      *
      * <pre>
-     * Output only. The size of the storage used by the backup. As backups share storage,
-     * this number is expected to change with backup creation/deletion.
+     * Output only. The size of the storage used by the backup. As backups share
+     * storage, this number is expected to change with backup creation/deletion.
      * </pre>
      *
      * <code>int64 storage_bytes = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2281,8 +2281,8 @@ public Builder setStorageBytes(long value) {
      *
      *
      * <pre>
-     * Output only. The size of the storage used by the backup. As backups share storage,
-     * this number is expected to change with backup creation/deletion.
+     * Output only. The size of the storage used by the backup. As backups share
+     * storage, this number is expected to change with backup creation/deletion.
      * </pre>
      *
      * <code>int64 storage_bytes = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2528,8 +2528,8 @@ public Builder setSourceFileShareBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Output only. The service tier of the source Cloud Filestore instance that this backup
-     * is created from.
+     * Output only. The service tier of the source Cloud Filestore instance that
+     * this backup is created from.
      * </pre>
      *
      * <code>
@@ -2546,8 +2546,8 @@ public int getSourceInstanceTierValue() {
      *
      *
      * <pre>
-     * Output only. The service tier of the source Cloud Filestore instance that this backup
-     * is created from.
+     * Output only. The service tier of the source Cloud Filestore instance that
+     * this backup is created from.
      * </pre>
      *
      * <code>
@@ -2567,8 +2567,8 @@ public Builder setSourceInstanceTierValue(int value) {
      *
      *
      * <pre>
-     * Output only. The service tier of the source Cloud Filestore instance that this backup
-     * is created from.
+     * Output only. The service tier of the source Cloud Filestore instance that
+     * this backup is created from.
      * </pre>
      *
      * <code>
@@ -2588,8 +2588,8 @@ public com.google.cloud.filestore.v1.Instance.Tier getSourceInstanceTier() {
      *
      *
      * <pre>
-     * Output only. The service tier of the source Cloud Filestore instance that this backup
-     * is created from.
+     * Output only. The service tier of the source Cloud Filestore instance that
+     * this backup is created from.
      * </pre>
      *
      * <code>
@@ -2612,8 +2612,8 @@ public Builder setSourceInstanceTier(com.google.cloud.filestore.v1.Instance.Tier
      *
      *
      * <pre>
-     * Output only. The service tier of the source Cloud Filestore instance that this backup
-     * is created from.
+     * Output only. The service tier of the source Cloud Filestore instance that
+     * this backup is created from.
      * </pre>
      *
      * <code>
@@ -2634,9 +2634,9 @@ public Builder clearSourceInstanceTier() {
      *
      *
      * <pre>
-     * Output only. Amount of bytes that will be downloaded if the backup is restored. This
-     * may be different than storage bytes, since sequential backups of the same
-     * disk will share storage.
+     * Output only. Amount of bytes that will be downloaded if the backup is
+     * restored. This may be different than storage bytes, since sequential
+     * backups of the same disk will share storage.
      * </pre>
      *
      * <code>int64 download_bytes = 11 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2651,9 +2651,9 @@ public long getDownloadBytes() {
      *
      *
      * <pre>
-     * Output only. Amount of bytes that will be downloaded if the backup is restored. This
-     * may be different than storage bytes, since sequential backups of the same
-     * disk will share storage.
+     * Output only. Amount of bytes that will be downloaded if the backup is
+     * restored. This may be different than storage bytes, since sequential
+     * backups of the same disk will share storage.
      * </pre>
      *
      * <code>int64 download_bytes = 11 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -2671,9 +2671,9 @@ public Builder setDownloadBytes(long value) {
      *
      *
      * <pre>
-     * Output only. Amount of bytes that will be downloaded if the backup is restored. This
-     * may be different than storage bytes, since sequential backups of the same
-     * disk will share storage.
+     * Output only. Amount of bytes that will be downloaded if the backup is
+     * restored. This may be different than storage bytes, since sequential
+     * backups of the same disk will share storage.
      * </pre>
      *
      * <code>int64 download_bytes = 11 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>

diff --git a/...oogle-cloud-filestore-v1/src/main/java/com/google/cloud/filestore/v1/BackupOrBuilder.java b/...oogle-cloud-filestore-v1/src/main/java/com/google/cloud/filestore/v1/BackupOrBuilder.java
@@ -215,8 +215,8 @@ public interface BackupOrBuilder
    *
    *
    * <pre>
-   * Output only. The size of the storage used by the backup. As backups share storage,
-   * this number is expected to change with backup creation/deletion.
+   * Output only. The size of the storage used by the backup. As backups share
+   * storage, this number is expected to change with backup creation/deletion.
    * </pre>
    *
    * <code>int64 storage_bytes = 7 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>
@@ -285,8 +285,8 @@ public interface BackupOrBuilder
    *
    *
    * <pre>
-   * Output only. The service tier of the source Cloud Filestore instance that this backup
-   * is created from.
+   * Output only. The service tier of the source Cloud Filestore instance that
+   * this backup is created from.
    * </pre>
    *
    * <code>
@@ -300,8 +300,8 @@ public interface BackupOrBuilder
    *
    *
    * <pre>
-   * Output only. The service tier of the source Cloud Filestore instance that this backup
-   * is created from.
+   * Output only. The service tier of the source Cloud Filestore instance that
+   * this backup is created from.
    * </pre>
    *
    * <code>
@@ -316,9 +316,9 @@ public interface BackupOrBuilder
    *
    *
    * <pre>
-   * Output only. Amount of bytes that will be downloaded if the backup is restored. This
-   * may be different than storage bytes, since sequential backups of the same
-   * disk will share storage.
+   * Output only. Amount of bytes that will be downloaded if the backup is
+   * restored. This may be different than storage bytes, since sequential
+   * backups of the same disk will share storage.
    * </pre>
    *
    * <code>int64 download_bytes = 11 [(.google.api.field_behavior) = OUTPUT_ONLY];</code>