diff --git a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogClient.java b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogClient.java index cedc4b7b..c9406ae5 100644 --- a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogClient.java +++ b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogClient.java @@ -16,7 +16,6 @@ package com.google.cloud.privatecatalog.v1beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -504,12 +503,7 @@ public static ApiFuture createAsync( SearchCatalogsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public SearchCatalogsPagedResponse apply(SearchCatalogsPage input) { - return new SearchCatalogsPagedResponse(input); - } - }, + input -> new SearchCatalogsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -585,12 +579,7 @@ public static ApiFuture createAsync( SearchProductsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public SearchProductsPagedResponse apply(SearchProductsPage input) { - return new SearchProductsPagedResponse(input); - } - }, + input -> new SearchProductsPagedResponse(input), MoreExecutors.directExecutor()); } @@ -666,12 +655,7 @@ public static ApiFuture createAsync( SearchVersionsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public SearchVersionsPagedResponse apply(SearchVersionsPage input) { - return new SearchVersionsPagedResponse(input); - } - }, + input -> new SearchVersionsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogSettings.java b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogSettings.java index 1ea562f0..7d5c5418 100644 --- a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogSettings.java +++ b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/PrivateCatalogSettings.java @@ -179,14 +179,13 @@ public PrivateCatalogStubSettings.Builder getStubSettingsBuilder() { return ((PrivateCatalogStubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/GrpcPrivateCatalogStub.java b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/GrpcPrivateCatalogStub.java index 365fcf34..4a39430e 100644 --- a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/GrpcPrivateCatalogStub.java +++ b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/GrpcPrivateCatalogStub.java @@ -26,7 +26,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.privatecatalog.v1beta1.SearchCatalogsRequest; import com.google.cloud.privatecatalog.v1beta1.SearchCatalogsResponse; @@ -39,7 +38,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -147,13 +145,10 @@ protected GrpcPrivateCatalogStub( GrpcCallSettings.newBuilder() .setMethodDescriptor(searchCatalogsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SearchCatalogsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("resource", String.valueOf(request.getResource())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("resource", String.valueOf(request.getResource())); + return params.build(); }) .build(); GrpcCallSettings @@ -161,13 +156,10 @@ public Map extract(SearchCatalogsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(searchProductsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SearchProductsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("resource", String.valueOf(request.getResource())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("resource", String.valueOf(request.getResource())); + return params.build(); }) .build(); GrpcCallSettings @@ -175,13 +167,10 @@ public Map extract(SearchProductsRequest request) { GrpcCallSettings.newBuilder() .setMethodDescriptor(searchVersionsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(SearchVersionsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("resource", String.valueOf(request.getResource())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("resource", String.valueOf(request.getResource())); + return params.build(); }) .build(); diff --git a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/PrivateCatalogStubSettings.java b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/PrivateCatalogStubSettings.java index a6fa2bad..7021beb6 100644 --- a/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/PrivateCatalogStubSettings.java +++ b/google-cloud-private-catalog/src/main/java/com/google/cloud/privatecatalog/v1beta1/stub/PrivateCatalogStubSettings.java @@ -464,14 +464,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/pom.xml b/pom.xml index 2f5a79fe..a840859f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.google.cloud google-cloud-shared-dependencies - 1.4.0 + 2.0.0 pom import diff --git a/proto-google-cloud-private-catalog-v1beta1/clirr-ignored-differences.xml b/proto-google-cloud-private-catalog-v1beta1/clirr-ignored-differences.xml index 580ece38..48d9e76a 100644 --- a/proto-google-cloud-private-catalog-v1beta1/clirr-ignored-differences.xml +++ b/proto-google-cloud-private-catalog-v1beta1/clirr-ignored-differences.xml @@ -16,4 +16,28 @@ com/google/cloud/privatecatalog/v1beta1/*OrBuilder boolean has*(*) + + 8001 + com/google/cloud/privatecatalog/v1beta1/CatalogName + + + 8001 + com/google/cloud/privatecatalog/v1beta1/CatalogName$Builder + + + 8001 + com/google/cloud/privatecatalog/v1beta1/ProductName + + + 8001 + com/google/cloud/privatecatalog/v1beta1/ProductName$Builder + + + 8001 + com/google/cloud/privatecatalog/v1beta1/VersionName + + + 8001 + com/google/cloud/privatecatalog/v1beta1/VersionName$Builder + diff --git a/proto-google-cloud-private-catalog-v1beta1/pom.xml b/proto-google-cloud-private-catalog-v1beta1/pom.xml index 9054a5f9..2da562bd 100644 --- a/proto-google-cloud-private-catalog-v1beta1/pom.xml +++ b/proto-google-cloud-private-catalog-v1beta1/pom.xml @@ -21,14 +21,6 @@ com.google.api.grpc proto-google-common-protos - - com.google.api - api-common - - - com.google.guava - guava - diff --git a/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/CatalogName.java b/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/CatalogName.java deleted file mode 100644 index 9a002d84..00000000 --- a/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/CatalogName.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.privatecatalog.v1beta1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class CatalogName implements ResourceName { - private static final PathTemplate CATALOG = - PathTemplate.createWithoutUrlEncoding("catalogs/{catalog}"); - private volatile Map fieldValuesMap; - private final String catalog; - - @Deprecated - protected CatalogName() { - catalog = null; - } - - private CatalogName(Builder builder) { - catalog = Preconditions.checkNotNull(builder.getCatalog()); - } - - public String getCatalog() { - return catalog; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static CatalogName of(String catalog) { - return newBuilder().setCatalog(catalog).build(); - } - - public static String format(String catalog) { - return newBuilder().setCatalog(catalog).build().toString(); - } - - public static CatalogName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - CATALOG.validatedMatch( - formattedString, "CatalogName.parse: formattedString not in valid format"); - return of(matchMap.get("catalog")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (CatalogName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return CATALOG.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (catalog != null) { - fieldMapBuilder.put("catalog", catalog); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return CATALOG.instantiate("catalog", catalog); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - CatalogName that = ((CatalogName) o); - return Objects.equals(this.catalog, that.catalog); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(catalog); - return h; - } - - /** Builder for catalogs/{catalog}. */ - public static class Builder { - private String catalog; - - protected Builder() {} - - public String getCatalog() { - return catalog; - } - - public Builder setCatalog(String catalog) { - this.catalog = catalog; - return this; - } - - private Builder(CatalogName catalogName) { - this.catalog = catalogName.catalog; - } - - public CatalogName build() { - return new CatalogName(this); - } - } -} diff --git a/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/ProductName.java b/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/ProductName.java deleted file mode 100644 index 7342ff81..00000000 --- a/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/ProductName.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.privatecatalog.v1beta1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class ProductName implements ResourceName { - private static final PathTemplate PRODUCT = - PathTemplate.createWithoutUrlEncoding("products/{product}"); - private volatile Map fieldValuesMap; - private final String product; - - @Deprecated - protected ProductName() { - product = null; - } - - private ProductName(Builder builder) { - product = Preconditions.checkNotNull(builder.getProduct()); - } - - public String getProduct() { - return product; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static ProductName of(String product) { - return newBuilder().setProduct(product).build(); - } - - public static String format(String product) { - return newBuilder().setProduct(product).build().toString(); - } - - public static ProductName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - PRODUCT.validatedMatch( - formattedString, "ProductName.parse: formattedString not in valid format"); - return of(matchMap.get("product")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (ProductName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return PRODUCT.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (product != null) { - fieldMapBuilder.put("product", product); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return PRODUCT.instantiate("product", product); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - ProductName that = ((ProductName) o); - return Objects.equals(this.product, that.product); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(product); - return h; - } - - /** Builder for products/{product}. */ - public static class Builder { - private String product; - - protected Builder() {} - - public String getProduct() { - return product; - } - - public Builder setProduct(String product) { - this.product = product; - return this; - } - - private Builder(ProductName productName) { - this.product = productName.product; - } - - public ProductName build() { - return new ProductName(this); - } - } -} diff --git a/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/VersionName.java b/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/VersionName.java deleted file mode 100644 index 8992fd41..00000000 --- a/proto-google-cloud-private-catalog-v1beta1/src/main/java/com/google/cloud/privatecatalog/v1beta1/VersionName.java +++ /dev/null @@ -1,223 +0,0 @@ -/* - * Copyright 2021 Google LLC - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.cloud.privatecatalog.v1beta1; - -import com.google.api.pathtemplate.PathTemplate; -import com.google.api.resourcenames.ResourceName; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -@Generated("by gapic-generator-java") -public class VersionName implements ResourceName { - private static final PathTemplate CATALOG_PRODUCT_VERSION = - PathTemplate.createWithoutUrlEncoding( - "catalogs/{catalog}/products/{product}/versions/{version}"); - private volatile Map fieldValuesMap; - private final String catalog; - private final String product; - private final String version; - - @Deprecated - protected VersionName() { - catalog = null; - product = null; - version = null; - } - - private VersionName(Builder builder) { - catalog = Preconditions.checkNotNull(builder.getCatalog()); - product = Preconditions.checkNotNull(builder.getProduct()); - version = Preconditions.checkNotNull(builder.getVersion()); - } - - public String getCatalog() { - return catalog; - } - - public String getProduct() { - return product; - } - - public String getVersion() { - return version; - } - - public static Builder newBuilder() { - return new Builder(); - } - - public Builder toBuilder() { - return new Builder(this); - } - - public static VersionName of(String catalog, String product, String version) { - return newBuilder().setCatalog(catalog).setProduct(product).setVersion(version).build(); - } - - public static String format(String catalog, String product, String version) { - return newBuilder() - .setCatalog(catalog) - .setProduct(product) - .setVersion(version) - .build() - .toString(); - } - - public static VersionName parse(String formattedString) { - if (formattedString.isEmpty()) { - return null; - } - Map matchMap = - CATALOG_PRODUCT_VERSION.validatedMatch( - formattedString, "VersionName.parse: formattedString not in valid format"); - return of(matchMap.get("catalog"), matchMap.get("product"), matchMap.get("version")); - } - - public static List parseList(List formattedStrings) { - List list = new ArrayList<>(formattedStrings.size()); - for (String formattedString : formattedStrings) { - list.add(parse(formattedString)); - } - return list; - } - - public static List toStringList(List values) { - List list = new ArrayList<>(values.size()); - for (VersionName value : values) { - if (value == null) { - list.add(""); - } else { - list.add(value.toString()); - } - } - return list; - } - - public static boolean isParsableFrom(String formattedString) { - return CATALOG_PRODUCT_VERSION.matches(formattedString); - } - - @Override - public Map getFieldValuesMap() { - if (fieldValuesMap == null) { - synchronized (this) { - if (fieldValuesMap == null) { - ImmutableMap.Builder fieldMapBuilder = ImmutableMap.builder(); - if (catalog != null) { - fieldMapBuilder.put("catalog", catalog); - } - if (product != null) { - fieldMapBuilder.put("product", product); - } - if (version != null) { - fieldMapBuilder.put("version", version); - } - fieldValuesMap = fieldMapBuilder.build(); - } - } - } - return fieldValuesMap; - } - - public String getFieldValue(String fieldName) { - return getFieldValuesMap().get(fieldName); - } - - @Override - public String toString() { - return CATALOG_PRODUCT_VERSION.instantiate( - "catalog", catalog, "product", product, "version", version); - } - - @Override - public boolean equals(Object o) { - if (o == this) { - return true; - } - if (o != null || getClass() == o.getClass()) { - VersionName that = ((VersionName) o); - return Objects.equals(this.catalog, that.catalog) - && Objects.equals(this.product, that.product) - && Objects.equals(this.version, that.version); - } - return false; - } - - @Override - public int hashCode() { - int h = 1; - h *= 1000003; - h ^= Objects.hashCode(catalog); - h *= 1000003; - h ^= Objects.hashCode(product); - h *= 1000003; - h ^= Objects.hashCode(version); - return h; - } - - /** Builder for catalogs/{catalog}/products/{product}/versions/{version}. */ - public static class Builder { - private String catalog; - private String product; - private String version; - - protected Builder() {} - - public String getCatalog() { - return catalog; - } - - public String getProduct() { - return product; - } - - public String getVersion() { - return version; - } - - public Builder setCatalog(String catalog) { - this.catalog = catalog; - return this; - } - - public Builder setProduct(String product) { - this.product = product; - return this; - } - - public Builder setVersion(String version) { - this.version = version; - return this; - } - - private Builder(VersionName versionName) { - this.catalog = versionName.catalog; - this.product = versionName.product; - this.version = versionName.version; - } - - public VersionName build() { - return new VersionName(this); - } - } -}