Skip to content

Commit ddb89cc

Browse files
fix: update gapic-generator-java with mock service generation fixes (googleapis#428)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 457524730 Source-Link: googleapis/googleapis@917e7f2 Source-Link: https://github.com/googleapis/googleapis-gen/commit/2497f9a069d3f6b2d6810d5a4e239cda1e7e5a39 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMjQ5N2Y5YTA2OWQzZjZiMmQ2ODEwZDVhNGUyMzljZGExZTdlNWEzOSJ9
1 parent 7593ccb commit ddb89cc

158 files changed

Lines changed: 297 additions & 556 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

java-security-private-ca/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClient.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.google.api.core.ApiFuture;
2020
import com.google.api.core.ApiFutures;
21+
import com.google.api.core.BetaApi;
2122
import com.google.api.gax.core.BackgroundResource;
2223
import com.google.api.gax.httpjson.longrunning.OperationsClient;
2324
import com.google.api.gax.longrunning.OperationFuture;
@@ -211,6 +212,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
211212
* Returns the OperationsClient that can be used to query the status of a long-running operation
212213
* returned by another API method call.
213214
*/
215+
@BetaApi
214216
public final OperationsClient getHttpJsonOperationsClient() {
215217
return httpJsonOperationsClient;
216218
}

java-security-private-ca/google-cloud-security-private-ca/src/main/java/com/google/cloud/security/privateca/v1beta1/CertificateAuthorityServiceClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
204204
* Returns the OperationsClient that can be used to query the status of a long-running operation
205205
* returned by another API method call.
206206
*/
207+
@BetaApi
207208
public final OperationsClient getHttpJsonOperationsClient() {
208209
return httpJsonOperationsClient;
209210
}

java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/security/privateca/v1/CertificateAuthorityServiceClientTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,11 @@
3535
import com.google.cloud.location.ListLocationsRequest;
3636
import com.google.cloud.location.ListLocationsResponse;
3737
import com.google.cloud.location.Location;
38-
import com.google.cloud.location.MockLocations;
3938
import com.google.common.collect.Lists;
4039
import com.google.iam.v1.AuditConfig;
4140
import com.google.iam.v1.Binding;
4241
import com.google.iam.v1.GetIamPolicyRequest;
4342
import com.google.iam.v1.GetPolicyOptions;
44-
import com.google.iam.v1.MockIAMPolicy;
4543
import com.google.iam.v1.Policy;
4644
import com.google.iam.v1.SetIamPolicyRequest;
4745
import com.google.iam.v1.TestIamPermissionsRequest;

java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/iam/v1/MockIAMPolicy.java renamed to java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/security/privateca/v1/MockIAMPolicy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.iam.v1;
17+
package com.google.cloud.security.privateca.v1;
1818

1919
import com.google.api.core.BetaApi;
2020
import com.google.api.gax.grpc.testing.MockGrpcService;

java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/iam/v1/MockIAMPolicyImpl.java renamed to java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/security/privateca/v1/MockIAMPolicyImpl.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.iam.v1;
17+
package com.google.cloud.security.privateca.v1;
1818

1919
import com.google.api.core.BetaApi;
20+
import com.google.iam.v1.GetIamPolicyRequest;
2021
import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase;
22+
import com.google.iam.v1.Policy;
23+
import com.google.iam.v1.SetIamPolicyRequest;
24+
import com.google.iam.v1.TestIamPermissionsRequest;
25+
import com.google.iam.v1.TestIamPermissionsResponse;
2126
import com.google.protobuf.AbstractMessage;
2227
import io.grpc.stub.StreamObserver;
2328
import java.util.ArrayList;

java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/location/MockLocations.java renamed to java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/security/privateca/v1/MockLocations.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.location;
17+
package com.google.cloud.security.privateca.v1;
1818

1919
import com.google.api.core.BetaApi;
2020
import com.google.api.gax.grpc.testing.MockGrpcService;

java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/location/MockLocationsImpl.java renamed to java-security-private-ca/google-cloud-security-private-ca/src/test/java/com/google/cloud/security/privateca/v1/MockLocationsImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.google.cloud.location;
17+
package com.google.cloud.security.privateca.v1;
1818

1919
import com.google.api.core.BetaApi;
20+
import com.google.cloud.location.GetLocationRequest;
21+
import com.google.cloud.location.ListLocationsRequest;
22+
import com.google.cloud.location.ListLocationsResponse;
23+
import com.google.cloud.location.Location;
2024
import com.google.cloud.location.LocationsGrpc.LocationsImplBase;
2125
import com.google.protobuf.AbstractMessage;
2226
import io.grpc.stub.StreamObserver;

java-security-private-ca/samples/snippets/generated/com/google/cloud/security/privateca/v1/certificateauthorityserviceclient/activatecertificateauthority/AsyncActivateCertificateAuthority.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.security.privateca.v1.samples;
1818

19-
// [START
20-
// privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_async]
19+
// [START privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_async]
2120
import com.google.api.core.ApiFuture;
2221
import com.google.cloud.security.privateca.v1.ActivateCertificateAuthorityRequest;
2322
import com.google.cloud.security.privateca.v1.CertificateAuthorityName;

java-security-private-ca/samples/snippets/generated/com/google/cloud/security/privateca/v1/certificateauthorityserviceclient/activatecertificateauthority/AsyncActivateCertificateAuthorityLRO.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.security.privateca.v1.samples;
1818

19-
// [START
20-
// privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_lro_async]
19+
// [START privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_lro_async]
2120
import com.google.api.gax.longrunning.OperationFuture;
2221
import com.google.cloud.security.privateca.v1.ActivateCertificateAuthorityRequest;
2322
import com.google.cloud.security.privateca.v1.CertificateAuthority;
@@ -56,5 +55,4 @@ public static void asyncActivateCertificateAuthorityLRO() throws Exception {
5655
}
5756
}
5857
}
59-
// [END
60-
// privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_lro_async]
58+
// [END privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_lro_async]

java-security-private-ca/samples/snippets/generated/com/google/cloud/security/privateca/v1/certificateauthorityserviceclient/activatecertificateauthority/SyncActivateCertificateAuthority.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.security.privateca.v1.samples;
1818

19-
// [START
20-
// privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_sync]
19+
// [START privateca_v1_generated_certificateauthorityserviceclient_activatecertificateauthority_sync]
2120
import com.google.cloud.security.privateca.v1.ActivateCertificateAuthorityRequest;
2221
import com.google.cloud.security.privateca.v1.CertificateAuthority;
2322
import com.google.cloud.security.privateca.v1.CertificateAuthorityName;

0 commit comments

Comments
 (0)