diff --git a/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml b/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml new file mode 100644 index 000000000..e5e71ddf1 --- /dev/null +++ b/gapic-google-cloud-storage-v2/clirr-ignored-differences.xml @@ -0,0 +1,30 @@ + + + + + + 7002 + com/google/storage/v2/StorageSettings + * *HttpJson*Builder() + + + 7002 + com/google/storage/v2/stub/StorageStubSettings + * *HttpJson*Builder() + + + 7002 + com/google/storage/v2/stub/StorageStubSettings + * defaultGrpcApiClientHeaderProviderBuilder() + + + + 8001 + com/google/storage/v2/stub/HttpJsonStorageCallableFactory + + + 8001 + com/google/storage/v2/stub/HttpJsonStorageStub + + + diff --git a/gapic-google-cloud-storage-v2/pom.xml b/gapic-google-cloud-storage-v2/pom.xml index e7415c14d..3cf111023 100644 --- a/gapic-google-cloud-storage-v2/pom.xml +++ b/gapic-google-cloud-storage-v2/pom.xml @@ -62,10 +62,6 @@ com.google.api gax-grpc - - com.google.api - gax-httpjson - com.google.guava guava @@ -81,12 +77,6 @@ testlib test - - com.google.api - gax-httpjson - testlib - test - diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java index a44ad1a9d..636c1ce82 100644 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java +++ b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java @@ -128,19 +128,6 @@ * StorageClient storageClient = StorageClient.create(storageSettings); * } * - *

To use REST (HTTP1.1/JSON) transport (instead of gRPC) for sending and receiving requests over - * the wire: - * - * 

{@code
- * // This snippet has been automatically generated and should be regarded as a code template only.
- * // It will require modifications to work:
- * // - It may require correct/in-range values for request initialization.
- * // - It may require specifying regional endpoints when creating the service client as shown in
- * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
- * StorageSettings storageSettings = StorageSettings.newHttpJsonBuilder().build();
- * StorageClient storageClient = StorageClient.create(storageSettings);
- * }
- * *

Please refer to the GitHub repository's samples for more quickstart code snippets. */ @Generated("by gapic-generator-java") diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageSettings.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageSettings.java index 23fc6ac91..8c693857c 100644 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageSettings.java +++ b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageSettings.java @@ -26,7 +26,6 @@ import com.google.api.gax.core.GoogleCredentialsProvider; import com.google.api.gax.core.InstantiatingExecutorProvider; import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; -import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; import com.google.api.gax.rpc.ApiClientHeaderProvider; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.ClientSettings; @@ -266,18 +265,11 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde return StorageStubSettings.defaultCredentialsProviderBuilder(); } - /** Returns a builder for the default gRPC ChannelProvider for this service. */ + /** Returns a builder for the default ChannelProvider for this service. */ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { return StorageStubSettings.defaultGrpcTransportProviderBuilder(); } - /** Returns a builder for the default REST ChannelProvider for this service. */ - @BetaApi - public static InstantiatingHttpJsonChannelProvider.Builder - defaultHttpJsonTransportProviderBuilder() { - return StorageStubSettings.defaultHttpJsonTransportProviderBuilder(); - } - public static TransportChannelProvider defaultTransportChannelProvider() { return StorageStubSettings.defaultTransportChannelProvider(); } @@ -287,17 +279,11 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil return StorageStubSettings.defaultApiClientHeaderProviderBuilder(); } - /** Returns a new gRPC builder for this class. */ + /** Returns a new builder for this class. */ public static Builder newBuilder() { return Builder.createDefault(); } - /** Returns a new REST builder for this class. */ - @BetaApi - public static Builder newHttpJsonBuilder() { - return Builder.createHttpJsonDefault(); - } - /** Returns a new builder for this class. */ public static Builder newBuilder(ClientContext clientContext) { return new Builder(clientContext); @@ -335,11 +321,6 @@ private static Builder createDefault() { return new Builder(StorageStubSettings.newBuilder()); } - @BetaApi - private static Builder createHttpJsonDefault() { - return new Builder(StorageStubSettings.newHttpJsonBuilder()); - } - public StorageStubSettings.Builder getStubSettingsBuilder() { return ((StorageStubSettings.Builder) getStubSettings()); } diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/HttpJsonStorageCallableFactory.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/HttpJsonStorageCallableFactory.java deleted file mode 100644 index 320b57f4c..000000000 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/HttpJsonStorageCallableFactory.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright 2022 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.storage.v2.stub; - -import com.google.api.core.BetaApi; -import com.google.api.gax.httpjson.HttpJsonCallSettings; -import com.google.api.gax.httpjson.HttpJsonCallableFactory; -import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable; -import com.google.api.gax.httpjson.HttpJsonStubCallableFactory; -import com.google.api.gax.httpjson.longrunning.stub.OperationsStub; -import com.google.api.gax.rpc.BatchingCallSettings; -import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.OperationCallSettings; -import com.google.api.gax.rpc.OperationCallable; -import com.google.api.gax.rpc.PagedCallSettings; -import com.google.api.gax.rpc.ServerStreamingCallSettings; -import com.google.api.gax.rpc.ServerStreamingCallable; -import com.google.api.gax.rpc.UnaryCallSettings; -import com.google.api.gax.rpc.UnaryCallable; -import com.google.longrunning.Operation; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -/** - * REST callable factory implementation for the Storage service API. - * - *

This class is for advanced usage. - */ -@Generated("by gapic-generator-java") -@BetaApi -public class HttpJsonStorageCallableFactory - implements HttpJsonStubCallableFactory { - - @Override - public UnaryCallable createUnaryCallable( - HttpJsonCallSettings httpJsonCallSettings, - UnaryCallSettings callSettings, - ClientContext clientContext) { - return HttpJsonCallableFactory.createUnaryCallable( - httpJsonCallSettings, callSettings, clientContext); - } - - @Override - public - UnaryCallable createPagedCallable( - HttpJsonCallSettings httpJsonCallSettings, - PagedCallSettings callSettings, - ClientContext clientContext) { - return HttpJsonCallableFactory.createPagedCallable( - httpJsonCallSettings, callSettings, clientContext); - } - - @Override - public UnaryCallable createBatchingCallable( - HttpJsonCallSettings httpJsonCallSettings, - BatchingCallSettings callSettings, - ClientContext clientContext) { - return HttpJsonCallableFactory.createBatchingCallable( - httpJsonCallSettings, callSettings, clientContext); - } - - @BetaApi( - "The surface for long-running operations is not stable yet and may change in the future.") - @Override - public - OperationCallable createOperationCallable( - HttpJsonCallSettings httpJsonCallSettings, - OperationCallSettings callSettings, - ClientContext clientContext, - OperationsStub operationsStub) { - UnaryCallable innerCallable = - HttpJsonCallableFactory.createBaseUnaryCallable( - httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext); - HttpJsonOperationSnapshotCallable initialCallable = - new HttpJsonOperationSnapshotCallable( - innerCallable, - httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory()); - return HttpJsonCallableFactory.createOperationCallable( - callSettings, clientContext, operationsStub.longRunningClient(), initialCallable); - } - - @Override - public - ServerStreamingCallable createServerStreamingCallable( - HttpJsonCallSettings httpJsonCallSettings, - ServerStreamingCallSettings callSettings, - ClientContext clientContext) { - return HttpJsonCallableFactory.createServerStreamingCallable( - httpJsonCallSettings, callSettings, clientContext); - } -} diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/HttpJsonStorageStub.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/HttpJsonStorageStub.java deleted file mode 100644 index 5c9f6f729..000000000 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/HttpJsonStorageStub.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright 2022 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.storage.v2.stub; - -import com.google.api.core.BetaApi; -import com.google.api.core.InternalApi; -import com.google.api.gax.core.BackgroundResource; -import com.google.api.gax.core.BackgroundResourceAggregation; -import com.google.api.gax.httpjson.ApiMethodDescriptor; -import com.google.api.gax.httpjson.HttpJsonStubCallableFactory; -import com.google.api.gax.rpc.ClientContext; -import com.google.protobuf.TypeRegistry; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; -import javax.annotation.Generated; - -// AUTO-GENERATED DOCUMENTATION AND CLASS. -/** - * REST stub implementation for the Storage service API. - * - *

This class is for advanced usage and reflects the underlying API directly. - */ -@Generated("by gapic-generator-java") -@BetaApi -public class HttpJsonStorageStub extends StorageStub { - private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); - - private final BackgroundResource backgroundResources; - private final HttpJsonStubCallableFactory callableFactory; - - public static final HttpJsonStorageStub create(StorageStubSettings settings) throws IOException { - return new HttpJsonStorageStub(settings, ClientContext.create(settings)); - } - - public static final HttpJsonStorageStub create(ClientContext clientContext) throws IOException { - return new HttpJsonStorageStub(StorageStubSettings.newHttpJsonBuilder().build(), clientContext); - } - - public static final HttpJsonStorageStub create( - ClientContext clientContext, HttpJsonStubCallableFactory callableFactory) throws IOException { - return new HttpJsonStorageStub( - StorageStubSettings.newHttpJsonBuilder().build(), clientContext, callableFactory); - } - - /** - * Constructs an instance of HttpJsonStorageStub, using the given settings. This is protected so - * that it is easy to make a subclass, but otherwise, the static factory methods should be - * preferred. - */ - protected HttpJsonStorageStub(StorageStubSettings settings, ClientContext clientContext) - throws IOException { - this(settings, clientContext, new HttpJsonStorageCallableFactory()); - } - - /** - * Constructs an instance of HttpJsonStorageStub, using the given settings. This is protected so - * that it is easy to make a subclass, but otherwise, the static factory methods should be - * preferred. - */ - protected HttpJsonStorageStub( - StorageStubSettings settings, - ClientContext clientContext, - HttpJsonStubCallableFactory callableFactory) - throws IOException { - this.callableFactory = callableFactory; - - this.backgroundResources = - new BackgroundResourceAggregation(clientContext.getBackgroundResources()); - } - - @InternalApi - public static List getMethodDescriptors() { - List methodDescriptors = new ArrayList<>(); - return methodDescriptors; - } - - @Override - public final void close() { - try { - backgroundResources.close(); - } catch (RuntimeException e) { - throw e; - } catch (Exception e) { - throw new IllegalStateException("Failed to close resource", e); - } - } - - @Override - public void shutdown() { - backgroundResources.shutdown(); - } - - @Override - public boolean isShutdown() { - return backgroundResources.isShutdown(); - } - - @Override - public boolean isTerminated() { - return backgroundResources.isTerminated(); - } - - @Override - public void shutdownNow() { - backgroundResources.shutdownNow(); - } - - @Override - public boolean awaitTermination(long duration, TimeUnit unit) throws InterruptedException { - return backgroundResources.awaitTermination(duration, unit); - } -} diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java index 2a0c7cb53..0e89bd6b2 100644 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java +++ b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java @@ -30,9 +30,6 @@ import com.google.api.gax.grpc.GaxGrpcProperties; import com.google.api.gax.grpc.GrpcTransportChannel; import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; -import com.google.api.gax.httpjson.GaxHttpJsonProperties; -import com.google.api.gax.httpjson.HttpJsonTransportChannel; -import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.ApiCallContext; import com.google.api.gax.rpc.ApiClientHeaderProvider; @@ -584,11 +581,6 @@ public StorageStub createStub() throws IOException { .equals(GrpcTransportChannel.getGrpcTransportName())) { return GrpcStorageStub.create(this); } - if (getTransportChannelProvider() - .getTransportName() - .equals(HttpJsonTransportChannel.getHttpJsonTransportName())) { - return HttpJsonStorageStub.create(this); - } throw new UnsupportedOperationException( String.format( "Transport not supported: %s", getTransportChannelProvider().getTransportName())); @@ -621,54 +613,29 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde .setUseJwtAccessWithScope(true); } - /** Returns a builder for the default gRPC ChannelProvider for this service. */ + /** Returns a builder for the default ChannelProvider for this service. */ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { return InstantiatingGrpcChannelProvider.newBuilder() .setMaxInboundMessageSize(Integer.MAX_VALUE); } - /** Returns a builder for the default REST ChannelProvider for this service. */ - @BetaApi - public static InstantiatingHttpJsonChannelProvider.Builder - defaultHttpJsonTransportProviderBuilder() { - return InstantiatingHttpJsonChannelProvider.newBuilder(); - } - public static TransportChannelProvider defaultTransportChannelProvider() { return defaultGrpcTransportProviderBuilder().build(); } @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") - public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() { + public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { return ApiClientHeaderProvider.newBuilder() .setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(StorageStubSettings.class)) .setTransportToken( GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion()); } - @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") - public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() { - return ApiClientHeaderProvider.newBuilder() - .setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(StorageStubSettings.class)) - .setTransportToken( - GaxHttpJsonProperties.getHttpJsonTokenName(), - GaxHttpJsonProperties.getHttpJsonVersion()); - } - - public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { - return StorageStubSettings.defaultGrpcApiClientHeaderProviderBuilder(); - } - - /** Returns a new gRPC builder for this class. */ + /** Returns a new builder for this class. */ public static Builder newBuilder() { return Builder.createDefault(); } - /** Returns a new REST builder for this class. */ - public static Builder newHttpJsonBuilder() { - return Builder.createHttpJsonDefault(); - } - /** Returns a new builder for this class. */ public static Builder newBuilder(ClientContext clientContext) { return new Builder(clientContext); @@ -953,19 +920,6 @@ private static Builder createDefault() { return initDefaults(builder); } - private static Builder createHttpJsonDefault() { - Builder builder = new Builder(((ClientContext) null)); - - builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build()); - builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); - builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); - builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); - builder.setSwitchToMtlsEndpointAllowed(true); - - return initDefaults(builder); - } - private static Builder initDefaults(Builder builder) { builder .deleteBucketSettings() diff --git a/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientHttpJsonTest.java b/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientHttpJsonTest.java deleted file mode 100644 index 5b599f062..000000000 --- a/gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientHttpJsonTest.java +++ /dev/null @@ -1,243 +0,0 @@ -/* - * Copyright 2022 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.storage.v2; - -import com.google.api.gax.core.NoCredentialsProvider; -import com.google.api.gax.httpjson.testing.MockHttpService; -import com.google.storage.v2.stub.HttpJsonStorageStub; -import java.io.IOException; -import javax.annotation.Generated; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -@Generated("by gapic-generator-java") -public class StorageClientHttpJsonTest { - private static MockHttpService mockService; - private static StorageClient client; - - @BeforeClass - public static void startStaticServer() throws IOException { - mockService = - new MockHttpService( - HttpJsonStorageStub.getMethodDescriptors(), StorageSettings.getDefaultEndpoint()); - StorageSettings settings = - StorageSettings.newHttpJsonBuilder() - .setTransportChannelProvider( - StorageSettings.defaultHttpJsonTransportProviderBuilder() - .setHttpTransport(mockService) - .build()) - .setCredentialsProvider(NoCredentialsProvider.create()) - .build(); - client = StorageClient.create(settings); - } - - @AfterClass - public static void stopServer() { - client.close(); - } - - @Before - public void setUp() {} - - @After - public void tearDown() throws Exception { - mockService.reset(); - } - - @Test - public void deleteBucketUnsupportedMethodTest() throws Exception { - // The deleteBucket() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void getBucketUnsupportedMethodTest() throws Exception { - // The getBucket() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void createBucketUnsupportedMethodTest() throws Exception { - // The createBucket() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void listBucketsUnsupportedMethodTest() throws Exception { - // The listBuckets() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void lockBucketRetentionPolicyUnsupportedMethodTest() throws Exception { - // The lockBucketRetentionPolicy() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void getIamPolicyUnsupportedMethodTest() throws Exception { - // The getIamPolicy() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void setIamPolicyUnsupportedMethodTest() throws Exception { - // The setIamPolicy() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void testIamPermissionsUnsupportedMethodTest() throws Exception { - // The testIamPermissions() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void updateBucketUnsupportedMethodTest() throws Exception { - // The updateBucket() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void deleteNotificationUnsupportedMethodTest() throws Exception { - // The deleteNotification() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void getNotificationUnsupportedMethodTest() throws Exception { - // The getNotification() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void createNotificationUnsupportedMethodTest() throws Exception { - // The createNotification() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void listNotificationsUnsupportedMethodTest() throws Exception { - // The listNotifications() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void composeObjectUnsupportedMethodTest() throws Exception { - // The composeObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void deleteObjectUnsupportedMethodTest() throws Exception { - // The deleteObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void cancelResumableWriteUnsupportedMethodTest() throws Exception { - // The cancelResumableWrite() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void getObjectUnsupportedMethodTest() throws Exception { - // The getObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void readObjectUnsupportedMethodTest() throws Exception { - // The readObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void updateObjectUnsupportedMethodTest() throws Exception { - // The updateObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void writeObjectUnsupportedMethodTest() throws Exception { - // The writeObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void listObjectsUnsupportedMethodTest() throws Exception { - // The listObjects() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void rewriteObjectUnsupportedMethodTest() throws Exception { - // The rewriteObject() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void startResumableWriteUnsupportedMethodTest() throws Exception { - // The startResumableWrite() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void queryWriteStatusUnsupportedMethodTest() throws Exception { - // The queryWriteStatus() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void getServiceAccountUnsupportedMethodTest() throws Exception { - // The getServiceAccount() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void createHmacKeyUnsupportedMethodTest() throws Exception { - // The createHmacKey() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void deleteHmacKeyUnsupportedMethodTest() throws Exception { - // The deleteHmacKey() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void getHmacKeyUnsupportedMethodTest() throws Exception { - // The getHmacKey() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void listHmacKeysUnsupportedMethodTest() throws Exception { - // The listHmacKeys() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } - - @Test - public void updateHmacKeyUnsupportedMethodTest() throws Exception { - // The updateHmacKey() method is not supported in REST transport. - // This empty test is generated for technical reasons. - } -} diff --git a/google-cloud-storage/clirr-ignored-differences.xml b/google-cloud-storage/clirr-ignored-differences.xml index 1afd91a66..e16670753 100644 --- a/google-cloud-storage/clirr-ignored-differences.xml +++ b/google-cloud-storage/clirr-ignored-differences.xml @@ -1,72 +1,5 @@ - - com/google/cloud/storage/BucketInfo* - 7013 - * setCustomPlacementConfig(com.google.cloud.storage.BucketInfo$CustomPlacementConfig) - - - - com/google/cloud/storage/BucketInfo* - 7013 - * setAutoclass(com.google.cloud.storage.BucketInfo$Autoclass) - - - - 7002 - com/google/cloud/storage/HmacKey$HmacKeyMetadata - * toPb() - - - - - 3005 - com/google/cloud/storage/StorageOptions - - - 3005 - com/google/cloud/storage/StorageOptions$Builder - - - - - 7002 - com/google/cloud/storage/StorageOptions - * getStorageRpcV1() - - - 7002 - com/google/cloud/storage/StorageOptions$Builder - * setTransportOptions(*) - - - - - 7012 - com/google/cloud/storage/Storage - void close() - - - - - 3005 - com/google/cloud/storage/CopyWriter - diff --git a/proto-google-cloud-storage-v2/clirr-ignored-differences.xml b/proto-google-cloud-storage-v2/clirr-ignored-differences.xml index 3b4182d73..70e35c153 100644 --- a/proto-google-cloud-storage-v2/clirr-ignored-differences.xml +++ b/proto-google-cloud-storage-v2/clirr-ignored-differences.xml @@ -1,42 +1,5 @@ - - - 6011 - com/google/storage/v2/DeleteObjectRequest - UPLOAD_ID_FIELD_NUMBER - - - 7002 - com/google/storage/v2/** - * *UploadId*(*) - - - - - 7012 - com/google/storage/v2/WriteObjectSpecOrBuilder - * *ObjectSize() - - - - - 7012 - com/google/storage/v2/BucketAccessControlOrBuilder - * *EntityAlt*() - - - 7012 - com/google/storage/v2/ObjectAccessControlOrBuilder - * *EntityAlt*() - - - - - 7012 - com/google/storage/v2/Bucket$RetentionPolicyOrBuilder - boolean hasRetentionPeriod() -