diff --git a/sample/build.gradle b/sample/build.gradle index fe6d768..aa6daf6 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -28,7 +28,6 @@ application { } test { - } run { @@ -50,8 +49,8 @@ dependencies { implementation 'com.google.api:gax:1.65.1' implementation 'com.google.api:gax-grpc:1.65.1' - implementation 'com.google.maps:gapic-google-maps-fleetengine-v1-java:0.0.3231' - implementation 'com.google.maps:gapic-google-maps-fleetengine-delivery-v1-java:0.0.3231' + implementation 'com.google.maps:gapic-google-maps-fleetengine-v1-java:1.0.0' + implementation 'com.google.maps:gapic-google-maps-fleetengine-delivery-v1-java:1.0.0' implementation project(':fleetengine-auth') testImplementation 'junit:junit:4.13.1' diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/CommandsFactoryServiceClient.java b/sample/src/main/java/com/google/fleetengine/auth/sample/CommandsFactoryServiceClient.java index 308a11e..5511601 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/CommandsFactoryServiceClient.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/CommandsFactoryServiceClient.java @@ -21,12 +21,12 @@ import com.google.fleetengine.auth.sample.validation.TripStub; import com.google.fleetengine.auth.sample.validation.VehicleCommands; import com.google.fleetengine.auth.sample.validation.VehicleStub; -import google.maps.fleetengine.delivery.v1.DeliveryServiceClient; -import google.maps.fleetengine.delivery.v1.DeliveryServiceSettings; -import google.maps.fleetengine.v1.TripServiceClient; -import google.maps.fleetengine.v1.TripServiceSettings; -import google.maps.fleetengine.v1.VehicleServiceClient; -import google.maps.fleetengine.v1.VehicleServiceSettings; +import com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient; +import com.google.maps.fleetengine.delivery.v1.DeliveryServiceSettings; +import com.google.maps.fleetengine.v1.TripServiceClient; +import com.google.maps.fleetengine.v1.TripServiceSettings; +import com.google.maps.fleetengine.v1.VehicleServiceClient; +import com.google.maps.fleetengine.v1.VehicleServiceSettings; import java.io.IOException; class CommandsFactoryServiceClient implements CommandsFactory { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java b/sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java index f2fdebd..ea0caf8 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/DeliveryServiceStubClient.java @@ -1,16 +1,16 @@ package com.google.fleetengine.auth.sample; import com.google.fleetengine.auth.sample.validation.DeliveryServiceStub; -import google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.CreateTaskRequest; -import google.maps.fleetengine.delivery.v1.DeliveryServiceClient; -import google.maps.fleetengine.delivery.v1.DeliveryVehicle; -import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.GetTaskRequest; -import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest; -import google.maps.fleetengine.delivery.v1.Task; -import google.maps.fleetengine.delivery.v1.TaskTrackingInfo; -import google.maps.fleetengine.delivery.v1.UpdateTaskRequest; +import com.google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.CreateTaskRequest; +import com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient; +import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle; +import com.google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.GetTaskRequest; +import com.google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest; +import com.google.maps.fleetengine.delivery.v1.Task; +import com.google.maps.fleetengine.delivery.v1.TaskTrackingInfo; +import com.google.maps.fleetengine.delivery.v1.UpdateTaskRequest; public class DeliveryServiceStubClient implements DeliveryServiceStub { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/LmfsSampleCommands.java b/sample/src/main/java/com/google/fleetengine/auth/sample/LmfsSampleCommands.java index 0647bcb..cc02718 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/LmfsSampleCommands.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/LmfsSampleCommands.java @@ -7,20 +7,20 @@ import com.google.fleetengine.auth.token.factory.FleetEngineTokenFactorySettings; import com.google.fleetengine.auth.token.factory.signer.ImpersonatedSigner; import com.google.fleetengine.auth.token.factory.signer.SignerInitializationException; +import com.google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.CreateTaskRequest; +import com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient; +import com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient.ListDeliveryVehiclesPagedResponse; +import com.google.maps.fleetengine.delivery.v1.DeliveryServiceSettings; +import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle; +import com.google.maps.fleetengine.delivery.v1.DeliveryVehicleLocation; +import com.google.maps.fleetengine.delivery.v1.DeliveryVehicleNavigationStatus; +import com.google.maps.fleetengine.delivery.v1.ListDeliveryVehiclesRequest; +import com.google.maps.fleetengine.delivery.v1.LocationInfo; +import com.google.maps.fleetengine.delivery.v1.Task; +import com.google.maps.fleetengine.delivery.v1.Task.State; import com.google.protobuf.Duration; import com.google.type.LatLng; -import google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.CreateTaskRequest; -import google.maps.fleetengine.delivery.v1.DeliveryServiceClient; -import google.maps.fleetengine.delivery.v1.DeliveryServiceClient.ListDeliveryVehiclesPagedResponse; -import google.maps.fleetengine.delivery.v1.DeliveryServiceSettings; -import google.maps.fleetengine.delivery.v1.DeliveryVehicle; -import google.maps.fleetengine.delivery.v1.DeliveryVehicleLocation; -import google.maps.fleetengine.delivery.v1.DeliveryVehicleNavigationStatus; -import google.maps.fleetengine.delivery.v1.ListDeliveryVehiclesRequest; -import google.maps.fleetengine.delivery.v1.LocationInfo; -import google.maps.fleetengine.delivery.v1.Task; -import google.maps.fleetengine.delivery.v1.Task.State; import java.io.IOException; import java.util.UUID; diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/OdrdSampleCommands.java b/sample/src/main/java/com/google/fleetengine/auth/sample/OdrdSampleCommands.java index 98d7b17..36c197c 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/OdrdSampleCommands.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/OdrdSampleCommands.java @@ -7,29 +7,29 @@ import com.google.fleetengine.auth.token.factory.FleetEngineTokenFactorySettings; import com.google.fleetengine.auth.token.factory.signer.ImpersonatedSigner; import com.google.fleetengine.auth.token.factory.signer.SignerInitializationException; +import com.google.maps.fleetengine.v1.CreateTripRequest; +import com.google.maps.fleetengine.v1.CreateVehicleRequest; +import com.google.maps.fleetengine.v1.ListVehiclesRequest; +import com.google.maps.fleetengine.v1.SearchTripsRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder; +import com.google.maps.fleetengine.v1.SearchVehiclesResponse; +import com.google.maps.fleetengine.v1.TerminalLocation; +import com.google.maps.fleetengine.v1.Trip; +import com.google.maps.fleetengine.v1.TripServiceClient; +import com.google.maps.fleetengine.v1.TripServiceClient.SearchTripsPagedResponse; +import com.google.maps.fleetengine.v1.TripServiceSettings; +import com.google.maps.fleetengine.v1.TripType; +import com.google.maps.fleetengine.v1.Vehicle; +import com.google.maps.fleetengine.v1.Vehicle.VehicleType; +import com.google.maps.fleetengine.v1.Vehicle.VehicleType.Category; +import com.google.maps.fleetengine.v1.VehicleLocation; +import com.google.maps.fleetengine.v1.VehicleMatch; +import com.google.maps.fleetengine.v1.VehicleServiceClient; +import com.google.maps.fleetengine.v1.VehicleServiceClient.ListVehiclesPagedResponse; +import com.google.maps.fleetengine.v1.VehicleServiceSettings; +import com.google.maps.fleetengine.v1.VehicleState; import com.google.type.LatLng; -import google.maps.fleetengine.v1.CreateTripRequest; -import google.maps.fleetengine.v1.CreateVehicleRequest; -import google.maps.fleetengine.v1.ListVehiclesRequest; -import google.maps.fleetengine.v1.SearchTripsRequest; -import google.maps.fleetengine.v1.SearchVehiclesRequest; -import google.maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder; -import google.maps.fleetengine.v1.SearchVehiclesResponse; -import google.maps.fleetengine.v1.TerminalLocation; -import google.maps.fleetengine.v1.Trip; -import google.maps.fleetengine.v1.TripServiceClient; -import google.maps.fleetengine.v1.TripServiceClient.SearchTripsPagedResponse; -import google.maps.fleetengine.v1.TripServiceSettings; -import google.maps.fleetengine.v1.TripType; -import google.maps.fleetengine.v1.Vehicle; -import google.maps.fleetengine.v1.Vehicle.VehicleType; -import google.maps.fleetengine.v1.Vehicle.VehicleType.Category; -import google.maps.fleetengine.v1.VehicleLocation; -import google.maps.fleetengine.v1.VehicleMatch; -import google.maps.fleetengine.v1.VehicleServiceClient; -import google.maps.fleetengine.v1.VehicleServiceClient.ListVehiclesPagedResponse; -import google.maps.fleetengine.v1.VehicleServiceSettings; -import google.maps.fleetengine.v1.VehicleState; import java.io.IOException; import java.util.UUID; diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/TripStubClient.java b/sample/src/main/java/com/google/fleetengine/auth/sample/TripStubClient.java index 56b74fe..6867840 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/TripStubClient.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/TripStubClient.java @@ -15,11 +15,11 @@ package com.google.fleetengine.auth.sample; import com.google.fleetengine.auth.sample.validation.TripStub; -import google.maps.fleetengine.v1.CreateTripRequest; -import google.maps.fleetengine.v1.GetTripRequest; -import google.maps.fleetengine.v1.Trip; -import google.maps.fleetengine.v1.TripServiceClient; -import google.maps.fleetengine.v1.UpdateTripRequest; +import com.google.maps.fleetengine.v1.CreateTripRequest; +import com.google.maps.fleetengine.v1.GetTripRequest; +import com.google.maps.fleetengine.v1.Trip; +import com.google.maps.fleetengine.v1.TripServiceClient; +import com.google.maps.fleetengine.v1.UpdateTripRequest; public class TripStubClient implements TripStub { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/VehicleStubClient.java b/sample/src/main/java/com/google/fleetengine/auth/sample/VehicleStubClient.java index 215db6f..842f81d 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/VehicleStubClient.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/VehicleStubClient.java @@ -15,13 +15,13 @@ package com.google.fleetengine.auth.sample; import com.google.fleetengine.auth.sample.validation.VehicleStub; -import google.maps.fleetengine.v1.CreateVehicleRequest; -import google.maps.fleetengine.v1.GetVehicleRequest; -import google.maps.fleetengine.v1.SearchVehiclesRequest; -import google.maps.fleetengine.v1.SearchVehiclesResponse; -import google.maps.fleetengine.v1.UpdateVehicleRequest; -import google.maps.fleetengine.v1.Vehicle; -import google.maps.fleetengine.v1.VehicleServiceClient; +import com.google.maps.fleetengine.v1.CreateVehicleRequest; +import com.google.maps.fleetengine.v1.GetVehicleRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesResponse; +import com.google.maps.fleetengine.v1.UpdateVehicleRequest; +import com.google.maps.fleetengine.v1.Vehicle; +import com.google.maps.fleetengine.v1.VehicleServiceClient; public class VehicleStubClient implements VehicleStub { private final VehicleServiceClient client; diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java index c098ab0..abef4c6 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerFleetReaderTokenValidationScript.java @@ -1,6 +1,6 @@ package com.google.fleetengine.auth.sample.validation; -import google.maps.fleetengine.delivery.v1.TaskTrackingInfo; +import com.google.maps.fleetengine.delivery.v1.TaskTrackingInfo; /** Validates that fleet reader tokens provide the correct access. */ public class DeliveryConsumerFleetReaderTokenValidationScript { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java index 48487d7..a6bf60f 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryConsumerTokenValidationScript.java @@ -1,7 +1,7 @@ package com.google.fleetengine.auth.sample.validation; import com.google.fleetengine.auth.token.TrackingClaims; -import google.maps.fleetengine.delivery.v1.TaskTrackingInfo; +import com.google.maps.fleetengine.delivery.v1.TaskTrackingInfo; /** Validates that consumer tokens provide the correct access. */ public class DeliveryConsumerTokenValidationScript { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java index 6cc15ca..c111605 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryFleetReaderTokenValidationScript.java @@ -1,6 +1,6 @@ package com.google.fleetengine.auth.sample.validation; -import google.maps.fleetengine.delivery.v1.TaskTrackingInfo; +import com.google.maps.fleetengine.delivery.v1.TaskTrackingInfo; /** Validates that fleet reader tokens provide the correct access. */ public class DeliveryFleetReaderTokenValidationScript { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java index d688a2e..ce010c2 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceCommands.java @@ -1,20 +1,20 @@ package com.google.fleetengine.auth.sample.validation; +import com.google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.CreateTaskRequest; +import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle; +import com.google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.GetTaskRequest; +import com.google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest; +import com.google.maps.fleetengine.delivery.v1.LocationInfo; +import com.google.maps.fleetengine.delivery.v1.Task; +import com.google.maps.fleetengine.delivery.v1.Task.State; +import com.google.maps.fleetengine.delivery.v1.Task.TaskOutcome; +import com.google.maps.fleetengine.delivery.v1.TaskTrackingInfo; +import com.google.maps.fleetengine.delivery.v1.UpdateTaskRequest; import com.google.protobuf.Duration; import com.google.protobuf.FieldMask; import com.google.type.LatLng; -import google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.CreateTaskRequest; -import google.maps.fleetengine.delivery.v1.DeliveryVehicle; -import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.GetTaskRequest; -import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest; -import google.maps.fleetengine.delivery.v1.LocationInfo; -import google.maps.fleetengine.delivery.v1.Task; -import google.maps.fleetengine.delivery.v1.Task.State; -import google.maps.fleetengine.delivery.v1.Task.TaskOutcome; -import google.maps.fleetengine.delivery.v1.TaskTrackingInfo; -import google.maps.fleetengine.delivery.v1.UpdateTaskRequest; public class DeliveryServiceCommands { private static final LatLng PLANNED_LOCATION = ProtosUtil.getLatLng(37.419646, -122.073885); diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java index 4ad0a1c..5b7c847 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/DeliveryServiceStub.java @@ -1,50 +1,53 @@ package com.google.fleetengine.auth.sample.validation; -import google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.CreateTaskRequest; -import google.maps.fleetengine.delivery.v1.DeliveryVehicle; -import google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest; -import google.maps.fleetengine.delivery.v1.GetTaskRequest; -import google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest; -import google.maps.fleetengine.delivery.v1.Task; -import google.maps.fleetengine.delivery.v1.TaskTrackingInfo; -import google.maps.fleetengine.delivery.v1.UpdateTaskRequest; - -/** Wraps {@link google.maps.fleetengine.delivery.v1.DeliveryServiceClient} for testing purposes. */ +import com.google.maps.fleetengine.delivery.v1.CreateDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.CreateTaskRequest; +import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle; +import com.google.maps.fleetengine.delivery.v1.GetDeliveryVehicleRequest; +import com.google.maps.fleetengine.delivery.v1.GetTaskRequest; +import com.google.maps.fleetengine.delivery.v1.GetTaskTrackingInfoRequest; +import com.google.maps.fleetengine.delivery.v1.Task; +import com.google.maps.fleetengine.delivery.v1.TaskTrackingInfo; +import com.google.maps.fleetengine.delivery.v1.UpdateTaskRequest; + +/** + * Wraps {@link com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient} for testing purposes. + */ public interface DeliveryServiceStub { /** * see: {@link - * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#createTask(CreateTaskRequest)} + * com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient#createTask(CreateTaskRequest)} */ Task createTask(CreateTaskRequest createTaskRequest); /** - * see: {@link google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getTask(GetTaskRequest)} + * see: {@link + * com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getTask(GetTaskRequest)} */ Task getTask(GetTaskRequest getTripRequest); /** * see: {@link - * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getTaskTrackingInfo(GetTaskTrackingInfoRequest)} + * com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getTaskTrackingInfo(GetTaskTrackingInfoRequest)} */ TaskTrackingInfo getTaskTrackingInfo(GetTaskTrackingInfoRequest getTaskTrackingInfoRequest); /** * see: {@link - * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#updateTask(UpdateTaskRequest)} + * com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient#updateTask(UpdateTaskRequest)} */ Task updateTask(UpdateTaskRequest updateTaskRequest); /** * see: {@link - * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#createDeliveryVehicle(CreateDeliveryVehicleRequest)} + * com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient#createDeliveryVehicle(CreateDeliveryVehicleRequest)} */ DeliveryVehicle createDeliveryVehicle(CreateDeliveryVehicleRequest createDeliveryVehicleRequest); /** * see: {@link - * google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getDeliveryVehicle(GetDeliveryVehicleRequest)} + * com.google.maps.fleetengine.delivery.v1.DeliveryServiceClient#getDeliveryVehicle(GetDeliveryVehicleRequest)} */ DeliveryVehicle getDeliveryVehicle(GetDeliveryVehicleRequest deliveryVehicleRequest); } diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/ServerTokenValidationScript.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/ServerTokenValidationScript.java index 7c2dba2..0c81e21 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/ServerTokenValidationScript.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/ServerTokenValidationScript.java @@ -14,7 +14,7 @@ package com.google.fleetengine.auth.sample.validation; -import google.maps.fleetengine.v1.VehicleMatch; +import com.google.maps.fleetengine.v1.VehicleMatch; import java.util.List; /** Validates that server tokens provide the correct level of access. */ diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripCommands.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripCommands.java index 986bec9..39cad6d 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripCommands.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripCommands.java @@ -14,15 +14,15 @@ package com.google.fleetengine.auth.sample.validation; +import com.google.maps.fleetengine.v1.CreateTripRequest; +import com.google.maps.fleetengine.v1.GetTripRequest; +import com.google.maps.fleetengine.v1.TerminalLocation; +import com.google.maps.fleetengine.v1.Trip; +import com.google.maps.fleetengine.v1.TripStatus; +import com.google.maps.fleetengine.v1.TripType; +import com.google.maps.fleetengine.v1.UpdateTripRequest; import com.google.protobuf.FieldMask; import com.google.type.LatLng; -import google.maps.fleetengine.v1.CreateTripRequest; -import google.maps.fleetengine.v1.GetTripRequest; -import google.maps.fleetengine.v1.TerminalLocation; -import google.maps.fleetengine.v1.Trip; -import google.maps.fleetengine.v1.TripStatus; -import google.maps.fleetengine.v1.TripType; -import google.maps.fleetengine.v1.UpdateTripRequest; /** Hardcoded commands against the trip service. */ public class TripCommands { diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripStub.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripStub.java index 314f15f..48d9a0c 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripStub.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/TripStub.java @@ -14,23 +14,20 @@ package com.google.fleetengine.auth.sample.validation; -import google.maps.fleetengine.v1.CreateTripRequest; -import google.maps.fleetengine.v1.GetTripRequest; -import google.maps.fleetengine.v1.Trip; -import google.maps.fleetengine.v1.UpdateTripRequest; +import com.google.maps.fleetengine.v1.CreateTripRequest; +import com.google.maps.fleetengine.v1.GetTripRequest; +import com.google.maps.fleetengine.v1.Trip; +import com.google.maps.fleetengine.v1.UpdateTripRequest; -/** - * Wraps {@link google.maps.fleetengine.v1.TripServiceClient} for testing - * purposes. - */ +/** Wraps {@link com.google.maps.fleetengine.v1.TripServiceClient} for testing purposes. */ public interface TripStub { - /** see: {@link google.maps.fleetengine.v1.TripServiceClient#createTrip(CreateTripRequest)} */ + /** see: {@link com.google.maps.fleetengine.v1.TripServiceClient#createTrip(CreateTripRequest)} */ Trip createTrip(CreateTripRequest createTripRequest); - /** see: {@link google.maps.fleetengine.v1.TripServiceClient#getTrip(GetTripRequest)} */ + /** see: {@link com.google.maps.fleetengine.v1.TripServiceClient#getTrip(GetTripRequest)} */ Trip getTrip(GetTripRequest getTripRequest); - /** see: {@link google.maps.fleetengine.v1.TripServiceClient#updateTrip(UpdateTripRequest)} */ + /** see: {@link com.google.maps.fleetengine.v1.TripServiceClient#updateTrip(UpdateTripRequest)} */ Trip updateTrip(UpdateTripRequest updateTripRequest); } diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleCommands.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleCommands.java index 19baeec..b7d97d2 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleCommands.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleCommands.java @@ -14,22 +14,22 @@ package com.google.fleetengine.auth.sample.validation; +import com.google.maps.fleetengine.v1.CreateVehicleRequest; +import com.google.maps.fleetengine.v1.GetVehicleRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder; +import com.google.maps.fleetengine.v1.SearchVehiclesResponse; +import com.google.maps.fleetengine.v1.TerminalLocation; +import com.google.maps.fleetengine.v1.TripType; +import com.google.maps.fleetengine.v1.UpdateVehicleRequest; +import com.google.maps.fleetengine.v1.Vehicle; +import com.google.maps.fleetengine.v1.Vehicle.VehicleType; +import com.google.maps.fleetengine.v1.Vehicle.VehicleType.Category; +import com.google.maps.fleetengine.v1.VehicleLocation; +import com.google.maps.fleetengine.v1.VehicleMatch; +import com.google.maps.fleetengine.v1.VehicleState; import com.google.protobuf.FieldMask; import com.google.type.LatLng; -import google.maps.fleetengine.v1.CreateVehicleRequest; -import google.maps.fleetengine.v1.GetVehicleRequest; -import google.maps.fleetengine.v1.SearchVehiclesRequest; -import google.maps.fleetengine.v1.SearchVehiclesRequest.VehicleMatchOrder; -import google.maps.fleetengine.v1.SearchVehiclesResponse; -import google.maps.fleetengine.v1.TerminalLocation; -import google.maps.fleetengine.v1.TripType; -import google.maps.fleetengine.v1.UpdateVehicleRequest; -import google.maps.fleetengine.v1.Vehicle; -import google.maps.fleetengine.v1.Vehicle.VehicleType; -import google.maps.fleetengine.v1.Vehicle.VehicleType.Category; -import google.maps.fleetengine.v1.VehicleLocation; -import google.maps.fleetengine.v1.VehicleMatch; -import google.maps.fleetengine.v1.VehicleState; import java.util.List; /** Runs a series of hardcoded examples against the Vehicle Service. */ diff --git a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleStub.java b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleStub.java index 8f8a47b..4dc4c95 100644 --- a/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleStub.java +++ b/sample/src/main/java/com/google/fleetengine/auth/sample/validation/VehicleStub.java @@ -14,36 +14,35 @@ package com.google.fleetengine.auth.sample.validation; -import google.maps.fleetengine.v1.CreateVehicleRequest; -import google.maps.fleetengine.v1.GetVehicleRequest; -import google.maps.fleetengine.v1.SearchVehiclesRequest; -import google.maps.fleetengine.v1.SearchVehiclesResponse; -import google.maps.fleetengine.v1.UpdateVehicleRequest; -import google.maps.fleetengine.v1.Vehicle; +import com.google.maps.fleetengine.v1.CreateVehicleRequest; +import com.google.maps.fleetengine.v1.GetVehicleRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesRequest; +import com.google.maps.fleetengine.v1.SearchVehiclesResponse; +import com.google.maps.fleetengine.v1.UpdateVehicleRequest; +import com.google.maps.fleetengine.v1.Vehicle; -/** - * Wraps {@link google.maps.fleetengine.v1.VehicleServiceClient} for - * testing purposes. - */ +/** Wraps {@link com.google.maps.fleetengine.v1.VehicleServiceClient} for testing purposes. */ public interface VehicleStub { /** * see: {@link - * google.maps.fleetengine.v1.VehicleServiceClient#createVehicle(CreateVehicleRequest)} + * com.google.maps.fleetengine.v1.VehicleServiceClient#createVehicle(CreateVehicleRequest)} */ Vehicle createVehicle(CreateVehicleRequest request); - /** see: {@link google.maps.fleetengine.v1.VehicleServiceClient#getVehicle(GetVehicleRequest)} */ + /** + * see: {@link com.google.maps.fleetengine.v1.VehicleServiceClient#getVehicle(GetVehicleRequest)} + */ Vehicle getVehicle(GetVehicleRequest request); /** * see: {@link - * google.maps.fleetengine.v1.VehicleServiceClient#updateVehicle(UpdateVehicleRequest)} + * com.google.maps.fleetengine.v1.VehicleServiceClient#updateVehicle(UpdateVehicleRequest)} */ Vehicle updateVehicle(UpdateVehicleRequest request); /** * see: {@link - * google.maps.fleetengine.v1.VehicleServiceClient#searchVehicles(SearchVehiclesRequest)} + * com.google.maps.fleetengine.v1.VehicleServiceClient#searchVehicles(SearchVehiclesRequest)} */ SearchVehiclesResponse searchVehicles(SearchVehiclesRequest request); } diff --git a/sample/src/test/java/com/google/fleetengine/auth/sample/ServerTokenValidationScriptTest.java b/sample/src/test/java/com/google/fleetengine/auth/sample/ServerTokenValidationScriptTest.java index 33e26a9..77c691b 100644 --- a/sample/src/test/java/com/google/fleetengine/auth/sample/ServerTokenValidationScriptTest.java +++ b/sample/src/test/java/com/google/fleetengine/auth/sample/ServerTokenValidationScriptTest.java @@ -21,7 +21,7 @@ import static org.mockito.Mockito.when; import com.google.fleetengine.auth.AuthTokenMinter; -import google.maps.fleetengine.v1.VehicleMatch; +import com.google.maps.fleetengine.v1.VehicleMatch; import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/sample/src/test/java/com/google/fleetengine/auth/sample/TripCommandsTest.java b/sample/src/test/java/com/google/fleetengine/auth/sample/TripCommandsTest.java index 0b7f76a..7875cf2 100644 --- a/sample/src/test/java/com/google/fleetengine/auth/sample/TripCommandsTest.java +++ b/sample/src/test/java/com/google/fleetengine/auth/sample/TripCommandsTest.java @@ -18,9 +18,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import google.maps.fleetengine.v1.CreateTripRequest; -import google.maps.fleetengine.v1.GetTripRequest; -import google.maps.fleetengine.v1.UpdateTripRequest; +import com.google.maps.fleetengine.v1.CreateTripRequest; +import com.google.maps.fleetengine.v1.GetTripRequest; +import com.google.maps.fleetengine.v1.UpdateTripRequest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/sample/src/test/java/com/google/fleetengine/auth/sample/VehicleCommandsTest.java b/sample/src/test/java/com/google/fleetengine/auth/sample/VehicleCommandsTest.java index 91864d4..2eedc7f 100644 --- a/sample/src/test/java/com/google/fleetengine/auth/sample/VehicleCommandsTest.java +++ b/sample/src/test/java/com/google/fleetengine/auth/sample/VehicleCommandsTest.java @@ -18,9 +18,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -import google.maps.fleetengine.v1.CreateVehicleRequest; -import google.maps.fleetengine.v1.GetVehicleRequest; -import google.maps.fleetengine.v1.UpdateVehicleRequest; +import com.google.maps.fleetengine.v1.CreateVehicleRequest; +import com.google.maps.fleetengine.v1.GetVehicleRequest; +import com.google.maps.fleetengine.v1.UpdateVehicleRequest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/version.properties b/version.properties index 52c288b..56a076f 100644 --- a/version.properties +++ b/version.properties @@ -15,5 +15,5 @@ ################################################################################ # Used by conventional commits in github. Do not touch. -libVersion=1.13.0 +libVersion=2.0.0 pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy