Skip to content
This repository has been archived by the owner on Jul 17, 2023. It is now read-only.

fix: update gapic-generator-java with mock service generation fixes #178

Merged
merged 2 commits into from
Jun 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import com.google.api.core.ApiFuture;
import com.google.api.core.ApiFutures;
import com.google.api.core.BetaApi;
import com.google.api.gax.core.BackgroundResource;
import com.google.api.gax.httpjson.longrunning.OperationsClient;
import com.google.api.gax.longrunning.OperationFuture;
Expand Down Expand Up @@ -191,6 +192,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
* Returns the OperationsClient that can be used to query the status of a long-running operation
* returned by another API method call.
*/
@BetaApi
public final OperationsClient getHttpJsonOperationsClient() {
return httpJsonOperationsClient;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public final com.google.longrunning.OperationsClient getOperationsClient() {
* Returns the OperationsClient that can be used to query the status of a long-running operation
* returned by another API method call.
*/
@BetaApi
public final OperationsClient getHttpJsonOperationsClient() {
return httpJsonOperationsClient;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import com.google.cloud.location.ListLocationsRequest;
import com.google.cloud.location.ListLocationsResponse;
import com.google.cloud.location.Location;
import com.google.cloud.location.MockLocations;
import com.google.common.collect.Lists;
import com.google.longrunning.Operation;
import com.google.protobuf.AbstractMessage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.google.cloud.location;
package com.google.cloud.datastream.v1;

import com.google.api.core.BetaApi;
import com.google.api.gax.grpc.testing.MockGrpcService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@
* limitations under the License.
*/

package com.google.cloud.location;
package com.google.cloud.datastream.v1;

import com.google.api.core.BetaApi;
import com.google.cloud.location.GetLocationRequest;
import com.google.cloud.location.ListLocationsRequest;
import com.google.cloud.location.ListLocationsResponse;
import com.google.cloud.location.Location;
import com.google.cloud.location.LocationsGrpc.LocationsImplBase;
import com.google.protobuf.AbstractMessage;
import io.grpc.stub.StreamObserver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
// [START datastream_v1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
import com.google.cloud.datastream.v1.ConnectionProfile;
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.LocationName;
Expand All @@ -43,5 +42,4 @@ public static void syncCreateConnectionProfileLocationnameConnectionprofileStrin
}
}
}
// [END
// datastream_v1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
// [END datastream_v1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
// [START datastream_v1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
import com.google.cloud.datastream.v1.ConnectionProfile;
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.LocationName;
Expand All @@ -42,5 +41,4 @@ public static void syncCreateConnectionProfileStringConnectionprofileString() th
}
}
}
// [END
// datastream_v1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
// [END datastream_v1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
// [START datastream_v1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.LocationName;
import com.google.cloud.datastream.v1.PrivateConnection;
Expand All @@ -43,5 +42,4 @@ public static void syncCreatePrivateConnectionLocationnamePrivateconnectionStrin
}
}
}
// [END
// datastream_v1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
// [END datastream_v1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
// [START datastream_v1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.LocationName;
import com.google.cloud.datastream.v1.PrivateConnection;
Expand All @@ -42,5 +41,4 @@ public static void syncCreatePrivateConnectionStringPrivateconnectionString() th
}
}
}
// [END
// datastream_v1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
// [END datastream_v1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_createroute_privateconnectionnameroutestring_sync]
// [START datastream_v1_generated_datastreamclient_createroute_privateconnectionnameroutestring_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.PrivateConnectionName;
import com.google.cloud.datastream.v1.Route;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.datastream.v1.ConnectionProfileName;
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.DeleteConnectionProfileRequest;
import com.google.protobuf.Empty;

public class SyncDeleteConnectionProfile {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_deleteconnectionprofile_connectionprofilename_sync]
// [START datastream_v1_generated_datastreamclient_deleteconnectionprofile_connectionprofilename_sync]
import com.google.cloud.datastream.v1.ConnectionProfileName;
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.protobuf.Empty;

public class SyncDeleteConnectionProfileConnectionprofilename {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1_generated_datastreamclient_deleteconnectionprofile_string_sync]
import com.google.cloud.datastream.v1.ConnectionProfileName;
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.protobuf.Empty;

public class SyncDeleteConnectionProfileString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.DeletePrivateConnectionRequest;
import com.google.cloud.datastream.v1.PrivateConnectionName;
import com.google.protobuf.Empty;

public class SyncDeletePrivateConnection {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_deleteprivateconnection_privateconnectionname_sync]
// [START datastream_v1_generated_datastreamclient_deleteprivateconnection_privateconnectionname_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.PrivateConnectionName;
import com.google.protobuf.Empty;

public class SyncDeletePrivateConnectionPrivateconnectionname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1_generated_datastreamclient_deleteprivateconnection_string_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.PrivateConnectionName;
import com.google.protobuf.Empty;

public class SyncDeletePrivateConnectionString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.DeleteRouteRequest;
import com.google.cloud.datastream.v1.RouteName;
import com.google.protobuf.Empty;

public class SyncDeleteRoute {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1_generated_datastreamclient_deleteroute_routename_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.RouteName;
import com.google.protobuf.Empty;

public class SyncDeleteRouteRoutename {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1_generated_datastreamclient_deleteroute_string_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.RouteName;
import com.google.protobuf.Empty;

public class SyncDeleteRouteString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.DeleteStreamRequest;
import com.google.cloud.datastream.v1.StreamName;
import com.google.protobuf.Empty;

public class SyncDeleteStream {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1_generated_datastreamclient_deletestream_streamname_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.StreamName;
import com.google.protobuf.Empty;

public class SyncDeleteStreamStreamname {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1_generated_datastreamclient_deletestream_string_sync]
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.cloud.datastream.v1.StreamName;
import com.google.protobuf.Empty;

public class SyncDeleteStreamString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1.samples;

// [START
// datastream_v1_generated_datastreamclient_updateconnectionprofile_connectionprofilefieldmask_sync]
// [START datastream_v1_generated_datastreamclient_updateconnectionprofile_connectionprofilefieldmask_sync]
import com.google.cloud.datastream.v1.ConnectionProfile;
import com.google.cloud.datastream.v1.DatastreamClient;
import com.google.protobuf.FieldMask;
Expand All @@ -39,5 +38,4 @@ public static void syncUpdateConnectionProfileConnectionprofileFieldmask() throw
}
}
}
// [END
// datastream_v1_generated_datastreamclient_updateconnectionprofile_connectionprofilefieldmask_sync]
// [END datastream_v1_generated_datastreamclient_updateconnectionprofile_connectionprofilefieldmask_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1alpha1.samples;

// [START
// datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
// [START datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
import com.google.cloud.datastream.v1alpha1.ConnectionProfile;
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.LocationName;
Expand All @@ -43,5 +42,4 @@ public static void syncCreateConnectionProfileLocationnameConnectionprofileStrin
}
}
}
// [END
// datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
// [END datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_locationnameconnectionprofilestring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1alpha1.samples;

// [START
// datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
// [START datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
import com.google.cloud.datastream.v1alpha1.ConnectionProfile;
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.LocationName;
Expand All @@ -42,5 +41,4 @@ public static void syncCreateConnectionProfileStringConnectionprofileString() th
}
}
}
// [END
// datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
// [END datastream_v1alpha1_generated_datastreamclient_createconnectionprofile_stringconnectionprofilestring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1alpha1.samples;

// [START
// datastream_v1alpha1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
// [START datastream_v1alpha1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.LocationName;
import com.google.cloud.datastream.v1alpha1.PrivateConnection;
Expand All @@ -43,5 +42,4 @@ public static void syncCreatePrivateConnectionLocationnamePrivateconnectionStrin
}
}
}
// [END
// datastream_v1alpha1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
// [END datastream_v1alpha1_generated_datastreamclient_createprivateconnection_locationnameprivateconnectionstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1alpha1.samples;

// [START
// datastream_v1alpha1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
// [START datastream_v1alpha1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.LocationName;
import com.google.cloud.datastream.v1alpha1.PrivateConnection;
Expand All @@ -42,5 +41,4 @@ public static void syncCreatePrivateConnectionStringPrivateconnectionString() th
}
}
}
// [END
// datastream_v1alpha1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
// [END datastream_v1alpha1_generated_datastreamclient_createprivateconnection_stringprivateconnectionstring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@

package com.google.cloud.datastream.v1alpha1.samples;

// [START
// datastream_v1alpha1_generated_datastreamclient_createroute_privateconnectionnameroutestring_sync]
// [START datastream_v1alpha1_generated_datastreamclient_createroute_privateconnectionnameroutestring_sync]
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.PrivateConnectionName;
import com.google.cloud.datastream.v1alpha1.Route;
Expand All @@ -40,5 +39,4 @@ public static void syncCreateRoutePrivateconnectionnameRouteString() throws Exce
}
}
}
// [END
// datastream_v1alpha1_generated_datastreamclient_createroute_privateconnectionnameroutestring_sync]
// [END datastream_v1alpha1_generated_datastreamclient_createroute_privateconnectionnameroutestring_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.datastream.v1alpha1.ConnectionProfileName;
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.DeleteConnectionProfileRequest;
import com.google.protobuf.Empty;

public class SyncDeleteConnectionProfile {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

package com.google.cloud.datastream.v1alpha1.samples;

// [START
// datastream_v1alpha1_generated_datastreamclient_deleteconnectionprofile_connectionprofilename_sync]
// [START datastream_v1alpha1_generated_datastreamclient_deleteconnectionprofile_connectionprofilename_sync]
import com.google.cloud.datastream.v1alpha1.ConnectionProfileName;
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.protobuf.Empty;

public class SyncDeleteConnectionProfileConnectionprofilename {

Expand All @@ -37,5 +37,4 @@ public static void syncDeleteConnectionProfileConnectionprofilename() throws Exc
}
}
}
// [END
// datastream_v1alpha1_generated_datastreamclient_deleteconnectionprofile_connectionprofilename_sync]
// [END datastream_v1alpha1_generated_datastreamclient_deleteconnectionprofile_connectionprofilename_sync]
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
// [START datastream_v1alpha1_generated_datastreamclient_deleteconnectionprofile_string_sync]
import com.google.cloud.datastream.v1alpha1.ConnectionProfileName;
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.protobuf.Empty;

public class SyncDeleteConnectionProfileString {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.google.cloud.datastream.v1alpha1.DatastreamClient;
import com.google.cloud.datastream.v1alpha1.DeletePrivateConnectionRequest;
import com.google.cloud.datastream.v1alpha1.PrivateConnectionName;
import com.google.protobuf.Empty;

public class SyncDeletePrivateConnection {

Expand Down
Loading