Skip to content

Commit daa627d

Browse files
fix: update gapic-generator-java with mock service generation fixes (#659)
- [ ] 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 0dae74e commit daa627d

16 files changed

+25
-32
lines changed

java-redis/google-cloud-redis/src/main/java/com/google/cloud/redis/v1/CloudRedisClient.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
}

java-redis/google-cloud-redis/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisClient.java

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

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstance.java

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

2425
public class SyncDeleteInstance {
2526

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java

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

2324
public class SyncDeleteInstanceInstancename {
2425

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java

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

2324
public class SyncDeleteInstanceString {
2425

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java

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

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

19-
// [START
20-
// redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]
19+
// [START redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]
2120
import com.google.cloud.redis.v1.CloudRedisClient;
2221
import com.google.cloud.redis.v1.FailoverInstanceRequest;
2322
import com.google.cloud.redis.v1.Instance;
@@ -41,5 +40,4 @@ public static void syncFailoverInstanceInstancenameFailoverinstancerequestdatapr
4140
}
4241
}
4342
}
44-
// [END
45-
// redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]
43+
// [END redis_v1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java

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

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

19-
// [START
20-
// redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]
19+
// [START redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]
2120
import com.google.cloud.redis.v1.CloudRedisClient;
2221
import com.google.cloud.redis.v1.FailoverInstanceRequest;
2322
import com.google.cloud.redis.v1.Instance;
@@ -41,5 +40,4 @@ public static void syncFailoverInstanceStringFailoverinstancerequestdataprotecti
4140
}
4241
}
4342
}
44-
// [END
45-
// redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]
43+
// [END redis_v1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java

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

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

19-
// [START
20-
// redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]
19+
// [START redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]
2120
import com.google.cloud.redis.v1.CloudRedisClient;
2221
import com.google.cloud.redis.v1.Instance;
2322
import com.google.cloud.redis.v1.InstanceName;
@@ -46,5 +45,4 @@ public static void main(String[] args) throws Exception {
4645
}
4746
}
4847
}
49-
// [END
50-
// redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]
48+
// [END redis_v1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java

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

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

19-
// [START
20-
// redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]
19+
// [START redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]
2120
import com.google.cloud.redis.v1.CloudRedisClient;
2221
import com.google.cloud.redis.v1.Instance;
2322
import com.google.cloud.redis.v1.InstanceName;
@@ -45,5 +44,4 @@ public static void main(String[] args) throws Exception {
4544
}
4645
}
4746
}
48-
// [END
49-
// redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]
47+
// [END redis_v1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstance.java

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

2425
public class SyncDeleteInstance {
2526

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceInstancename.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_instancename_sync]
2020
import com.google.cloud.redis.v1beta1.CloudRedisClient;
2121
import com.google.cloud.redis.v1beta1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceInstancename {
2425

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/deleteinstance/SyncDeleteInstanceString.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
// [START redis_v1beta1_generated_cloudredisclient_deleteinstance_string_sync]
2020
import com.google.cloud.redis.v1beta1.CloudRedisClient;
2121
import com.google.cloud.redis.v1beta1.InstanceName;
22+
import com.google.protobuf.Empty;
2223

2324
public class SyncDeleteInstanceString {
2425

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceInstancenameFailoverinstancerequestdataprotectionmode.java

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

1717
package com.google.cloud.redis.v1beta1.samples;
1818

19-
// [START
20-
// redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]
19+
// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]
2120
import com.google.cloud.redis.v1beta1.CloudRedisClient;
2221
import com.google.cloud.redis.v1beta1.FailoverInstanceRequest;
2322
import com.google.cloud.redis.v1beta1.Instance;
@@ -41,5 +40,4 @@ public static void syncFailoverInstanceInstancenameFailoverinstancerequestdatapr
4140
}
4241
}
4342
}
44-
// [END
45-
// redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]
43+
// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_instancenamefailoverinstancerequestdataprotectionmode_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/failoverinstance/SyncFailoverInstanceStringFailoverinstancerequestdataprotectionmode.java

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

1717
package com.google.cloud.redis.v1beta1.samples;
1818

19-
// [START
20-
// redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]
19+
// [START redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]
2120
import com.google.cloud.redis.v1beta1.CloudRedisClient;
2221
import com.google.cloud.redis.v1beta1.FailoverInstanceRequest;
2322
import com.google.cloud.redis.v1beta1.Instance;
@@ -41,5 +40,4 @@ public static void syncFailoverInstanceStringFailoverinstancerequestdataprotecti
4140
}
4241
}
4342
}
44-
// [END
45-
// redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]
43+
// [END redis_v1beta1_generated_cloudredisclient_failoverinstance_stringfailoverinstancerequestdataprotectionmode_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceInstancenameReschedulemaintenancerequestrescheduletypeTimestamp.java

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

1717
package com.google.cloud.redis.v1beta1.samples;
1818

19-
// [START
20-
// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]
19+
// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]
2120
import com.google.cloud.redis.v1beta1.CloudRedisClient;
2221
import com.google.cloud.redis.v1beta1.Instance;
2322
import com.google.cloud.redis.v1beta1.InstanceName;
@@ -46,5 +45,4 @@ public static void main(String[] args) throws Exception {
4645
}
4746
}
4847
}
49-
// [END
50-
// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]
48+
// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_instancenamereschedulemaintenancerequestrescheduletypetimestamp_sync]

java-redis/samples/snippets/generated/com/google/cloud/redis/v1beta1/cloudredisclient/reschedulemaintenance/SyncRescheduleMaintenanceStringReschedulemaintenancerequestrescheduletypeTimestamp.java

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

1717
package com.google.cloud.redis.v1beta1.samples;
1818

19-
// [START
20-
// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]
19+
// [START redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]
2120
import com.google.cloud.redis.v1beta1.CloudRedisClient;
2221
import com.google.cloud.redis.v1beta1.Instance;
2322
import com.google.cloud.redis.v1beta1.InstanceName;
@@ -45,5 +44,4 @@ public static void main(String[] args) throws Exception {
4544
}
4645
}
4746
}
48-
// [END
49-
// redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]
47+
// [END redis_v1beta1_generated_cloudredisclient_reschedulemaintenance_stringreschedulemaintenancerequestrescheduletypetimestamp_sync]

0 commit comments

Comments
 (0)