Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit c459a20

Browse files
fix: update gapic-generator-java with mock service generation fixes (#646)
- [ ] 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 71c61d1 commit c459a20

18 files changed

+28
-38
lines changed

google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1/CloudMemcacheClient.java

+2
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;
@@ -206,6 +207,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
206207
* Returns the OperationsClient that can be used to query the status of a long-running operation
207208
* returned by another API method call.
208209
*/
210+
@BetaApi
209211
public final OperationsClient getHttpJsonOperationsClient() {
210212
return httpJsonOperationsClient;
211213
}

google-cloud-memcache/src/main/java/com/google/cloud/memcache/v1beta2/CloudMemcacheClient.java

+1
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
208208
* Returns the OperationsClient that can be used to query the status of a long-running operation
209209
* returned by another API method call.
210210
*/
211+
@BetaApi
211212
public final OperationsClient getHttpJsonOperationsClient() {
212213
return httpJsonOperationsClient;
213214
}

samples/snippets/generated/com/google/cloud/memcache/v1/cloudmemcacheclient/applyparameters/SyncApplyParametersInstancenameListstringBoolean.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1.samples;
1818

19-
// [START
20-
// memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
19+
// [START memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
2120
import com.google.cloud.memcache.v1.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1.Instance;
2322
import com.google.cloud.memcache.v1.InstanceName;
@@ -41,5 +40,4 @@ public static void syncApplyParametersInstancenameListstringBoolean() throws Exc
4140
}
4241
}
4342
}
44-
// [END
45-
// memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
43+
// [END memcache_v1_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]

samples/snippets/generated/com/google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstance.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.memcache.v1.CloudMemcacheClient;
2121
import com.google.cloud.memcache.v1.DeleteInstanceRequest;
2222
import com.google.cloud.memcache.v1.InstanceName;
23+
import com.google.protobuf.Empty;
2324

2425
public class SyncDeleteInstance {
2526

samples/snippets/generated/com/google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceInstancename.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START memcache_v1_generated_cloudmemcacheclient_deleteinstance_instancename_sync]
2020
import com.google.cloud.memcache.v1.CloudMemcacheClient;
2121
import com.google.cloud.memcache.v1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceInstancename {
2425

samples/snippets/generated/com/google/cloud/memcache/v1/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceString.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START memcache_v1_generated_cloudmemcacheclient_deleteinstance_string_sync]
2020
import com.google.cloud.memcache.v1.CloudMemcacheClient;
2121
import com.google.cloud.memcache.v1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceString {
2425

samples/snippets/generated/com/google/cloud/memcache/v1/cloudmemcacheclient/updateparameters/SyncUpdateParametersInstancenameFieldmaskMemcacheparameters.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1.samples;
1818

19-
// [START
20-
// memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
19+
// [START memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
2120
import com.google.cloud.memcache.v1.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1.Instance;
2322
import com.google.cloud.memcache.v1.InstanceName;
@@ -43,5 +42,4 @@ public static void syncUpdateParametersInstancenameFieldmaskMemcacheparameters()
4342
}
4443
}
4544
}
46-
// [END
47-
// memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
45+
// [END memcache_v1_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]

samples/snippets/generated/com/google/cloud/memcache/v1/cloudmemcacheclient/updateparameters/SyncUpdateParametersStringFieldmaskMemcacheparameters.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1.samples;
1818

19-
// [START
20-
// memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
19+
// [START memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
2120
import com.google.cloud.memcache.v1.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1.Instance;
2322
import com.google.cloud.memcache.v1.InstanceName;
@@ -42,5 +41,4 @@ public static void syncUpdateParametersStringFieldmaskMemcacheparameters() throw
4241
}
4342
}
4443
}
45-
// [END
46-
// memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
44+
// [END memcache_v1_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/applyparameters/SyncApplyParametersInstancenameListstringBoolean.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -41,5 +40,4 @@ public static void syncApplyParametersInstancenameListstringBoolean() throws Exc
4140
}
4241
}
4342
}
44-
// [END
45-
// memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]
43+
// [END memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_instancenameliststringboolean_sync]

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/applyparameters/SyncApplyParametersStringListstringBoolean.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_stringliststringboolean_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_applyparameters_stringliststringboolean_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.InstanceName;

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/applysoftwareupdate/SyncApplySoftwareUpdateInstancenameListstringBoolean.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -42,5 +41,4 @@ public static void syncApplySoftwareUpdateInstancenameListstringBoolean() throws
4241
}
4342
}
4443
}
45-
// [END
46-
// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]
44+
// [END memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_instancenameliststringboolean_sync]

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/applysoftwareupdate/SyncApplySoftwareUpdateStringListstringBoolean.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -42,5 +41,4 @@ public static void syncApplySoftwareUpdateStringListstringBoolean() throws Excep
4241
}
4342
}
4443
}
45-
// [END
46-
// memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]
44+
// [END memcache_v1beta2_generated_cloudmemcacheclient_applysoftwareupdate_stringliststringboolean_sync]

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/createinstance/SyncCreateInstanceLocationnameStringInstance.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.LocationName;
@@ -40,5 +39,4 @@ public static void syncCreateInstanceLocationnameStringInstance() throws Excepti
4039
}
4140
}
4241
}
43-
// [END
44-
// memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]
42+
// [END memcache_v1beta2_generated_cloudmemcacheclient_createinstance_locationnamestringinstance_sync]

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstance.java

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2121
import com.google.cloud.memcache.v1beta2.DeleteInstanceRequest;
2222
import com.google.cloud.memcache.v1beta2.InstanceName;
23+
import com.google.protobuf.Empty;
2324

2425
public class SyncDeleteInstance {
2526

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceInstancename.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START memcache_v1beta2_generated_cloudmemcacheclient_deleteinstance_instancename_sync]
2020
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2121
import com.google.cloud.memcache.v1beta2.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceInstancename {
2425

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/deleteinstance/SyncDeleteInstanceString.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START memcache_v1beta2_generated_cloudmemcacheclient_deleteinstance_string_sync]
2020
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2121
import com.google.cloud.memcache.v1beta2.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceString {
2425

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/updateparameters/SyncUpdateParametersInstancenameFieldmaskMemcacheparameters.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -43,5 +42,4 @@ public static void syncUpdateParametersInstancenameFieldmaskMemcacheparameters()
4342
}
4443
}
4544
}
46-
// [END
47-
// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]
45+
// [END memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_instancenamefieldmaskmemcacheparameters_sync]

samples/snippets/generated/com/google/cloud/memcache/v1beta2/cloudmemcacheclient/updateparameters/SyncUpdateParametersStringFieldmaskMemcacheparameters.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616

1717
package com.google.cloud.memcache.v1beta2.samples;
1818

19-
// [START
20-
// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
19+
// [START memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
2120
import com.google.cloud.memcache.v1beta2.CloudMemcacheClient;
2221
import com.google.cloud.memcache.v1beta2.Instance;
2322
import com.google.cloud.memcache.v1beta2.InstanceName;
@@ -42,5 +41,4 @@ public static void syncUpdateParametersStringFieldmaskMemcacheparameters() throw
4241
}
4342
}
4443
}
45-
// [END
46-
// memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]
44+
// [END memcache_v1beta2_generated_cloudmemcacheclient_updateparameters_stringfieldmaskmemcacheparameters_sync]

0 commit comments

Comments
 (0)