Merge pull request #24 from googlemaps/ebao-update-package

chore!: update to new Fleet Engine package name

Author: bart-at-google

beam/pom.xml

@@ -204,12 +204,12 @@
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>
-            <version>3.23.2</version>
+            <version>3.25.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java-util</artifactId>
-            <version>3.23.2</version>
+            <version>3.25.0</version>
         </dependency>
         <!-- slf4j API frontend binding with JUL backend -->
         <dependency>
@@ -231,7 +231,7 @@
         <dependency>
             <artifactId>grpc-google-maps-fleetengine-delivery-v1-java</artifactId>
             <groupId>com.google.maps</groupId>
-            <version>0.0.2357</version>
+            <version>1.0.0</version>
         </dependency>
         <!-- testing -->
         <dependency>

beam/src/main/java/com/google/fleetevents/beam/TaskOutcomeChange.java

@@ -27,8 +27,8 @@
 import com.google.fleetevents.beam.model.output.TaskOutcomeChangeOutputEvent;
 import com.google.fleetevents.beam.util.ProtoParser;
 import com.google.logging.v2.LogEntry;
+import com.google.maps.fleetengine.delivery.v1.Task;
 import com.google.protobuf.InvalidProtocolBufferException;
-import google.maps.fleetengine.delivery.v1.Task;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.UUID;

beam/src/main/java/com/google/fleetevents/beam/VehicleNotUpdating.java

@@ -22,8 +22,8 @@
 import com.google.fleetevents.beam.model.output.VehicleNotUpdatingOutputEvent;
 import com.google.fleetevents.beam.util.ProtoParser;
 import com.google.logging.v2.LogEntry;
+import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle;
 import com.google.protobuf.InvalidProtocolBufferException;
-import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
 import java.io.Serializable;
 import java.util.logging.Level;
 import java.util.logging.Logger;

beam/src/main/java/com/google/fleetevents/beam/model/output/TaskOutcomeChangeOutputEvent.java

@@ -18,7 +18,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.fleetevents.beam.util.ProtobufSerializer;
-import google.maps.fleetengine.delivery.v1.Task;
+import com.google.maps.fleetengine.delivery.v1.Task;
 import java.io.Serializable;
 
 public class TaskOutcomeChangeOutputEvent extends OutputEvent implements Serializable {

beam/src/main/java/com/google/fleetevents/beam/model/output/VehicleNotUpdatingOutputEvent.java

@@ -18,7 +18,7 @@
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.fleetevents.beam.util.ProtobufSerializer;
-import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
+import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle;
 import java.io.Serializable;
 
 public class VehicleNotUpdatingOutputEvent extends OutputEvent implements Serializable {

beam/src/test/java/com/google/fleetevents/beam/TaskOutcomeChangeTest.java

@@ -25,7 +25,7 @@
 import com.google.fleetevents.beam.model.output.OutputEvent;
 import com.google.fleetevents.beam.model.output.TaskOutcomeChangeOutputEvent;
 import com.google.fleetevents.beam.util.SampleLogs;
-import google.maps.fleetengine.delivery.v1.Task;
+import com.google.maps.fleetengine.delivery.v1.Task;
 import java.io.IOException;
 import java.util.Arrays;
 import org.apache.beam.sdk.extensions.protobuf.ProtoCoder;

beam/src/test/java/com/google/fleetevents/beam/util/SampleLogs.java

@@ -1,13 +1,13 @@
 package com.google.fleetevents.beam.util;
 
 import com.google.logging.v2.LogEntry;
+import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle;
+import com.google.maps.fleetengine.delivery.v1.Task;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
 import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
 import com.google.protobuf.util.JsonFormat;
-import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
-import google.maps.fleetengine.delivery.v1.Task;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.nio.file.Files;

cloud-functions/pom.xml

@@ -158,12 +158,14 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
+      <version>1.128.0</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.google.cloud/google-cloud-functions -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-functions</artifactId>
+      <version>2.38.0</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.google.cloud.functions/functions-framework-api -->
@@ -184,27 +186,27 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-logging</artifactId>
-      <version>3.15.1</version>
+      <version>3.17.0</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.google.maps/fleetengine-auth -->
     <dependency>
       <groupId>com.google.maps</groupId>
       <artifactId>fleetengine-auth</artifactId>
-      <version>1.11.0</version>
+      <version>2.0.0</version>
     </dependency>
 
     <dependency>
       <artifactId>grpc-google-maps-fleetengine-delivery-v1-java</artifactId>
       <groupId>com.google.maps</groupId>
-      <version>0.0.1961</version>
+      <version>1.0.0</version>
     </dependency>
 
 
     <dependency>
       <groupId>com.google.maps</groupId>
       <artifactId>gapic-google-maps-fleetengine-v1-java</artifactId>
-      <version>0.0.197</version>
+      <version>1.0.0</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/com.google.api/api-common -->
@@ -218,6 +220,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-firestore</artifactId>
+      <version>3.15.0</version>
     </dependency>
 
     <!-- https://mvnrepository.com/artifact/io.cloudevents/cloudevents-core -->
@@ -267,6 +270,7 @@
       <scope>test</scope>
     </dependency>
 
+
   </dependencies>
 
 
@@ -294,4 +298,4 @@
     </repository>
   </repositories>
 
-</project>
+</project>

cloud-functions/src/main/java/com/google/fleetevents/FleetEventCreatorBase.java

@@ -41,11 +41,11 @@
 import com.google.fleetevents.odrd.transactions.CreateTripTransaction;
 import com.google.fleetevents.odrd.transactions.UpdateTripTransaction;
 import com.google.logging.v2.LogEntry;
+import com.google.maps.fleetengine.delivery.v1.DeliveryVehicle;
+import com.google.maps.fleetengine.delivery.v1.Task;
+import com.google.maps.fleetengine.v1.Trip;
+import com.google.maps.fleetengine.v1.Vehicle;
 import com.google.protobuf.InvalidProtocolBufferException;
-import google.maps.fleetengine.delivery.v1.DeliveryVehicle;
-import google.maps.fleetengine.delivery.v1.Task;
-import google.maps.fleetengine.v1.Trip;
-import google.maps.fleetengine.v1.Vehicle;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -314,7 +314,7 @@ public void addExtraInfo(List<OutputEvent> outputs) {
         // Match each stop with a fleet stop, if available, and enrich with planned_location.
         for (VehicleJourneySegment rvjs :
             deliveryVehicleFleetEvent.newDeliveryVehicle().getRemainingVehicleJourneySegments()) {
-          Optional<google.maps.fleetengine.delivery.v1.VehicleStop> matchedStop =
+          Optional<com.google.maps.fleetengine.delivery.v1.VehicleStop> matchedStop =
               deliveryVehicle.getRemainingVehicleJourneySegmentsList().stream()
                   .map(x -> x.getStop())
                   .filter(stop -> isMatchingStop(rvjs.getVehicleStop(), stop))
@@ -336,7 +336,7 @@ public void addExtraInfo(List<OutputEvent> outputs) {
 
   // Returns true if any taskid from stop matches one from fleetStop
   private boolean isMatchingStop(
-      VehicleStop stop, google.maps.fleetengine.delivery.v1.VehicleStop fleetStop) {
+      VehicleStop stop, com.google.maps.fleetengine.delivery.v1.VehicleStop fleetStop) {
     for (TaskInfo info : stop.getTaskInfos()) {
       List<String> matches =
           fleetStop.getTasksList().stream()

cloud-functions/src/main/java/com/google/fleetevents/common/util/FleetEngineClient.java

@@ -24,11 +24,11 @@
 import com.google.fleetengine.auth.token.factory.signer.SignerInitializationException;
 import com.google.fleetengine.auth.token.factory.signer.SigningTokenException;
 import com.google.fleetevents.common.config.FleetEventConfig;
-import google.maps.fleetengine.delivery.v1.DeliveryServiceGrpc;
-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.Task;
+import com.google.maps.fleetengine.delivery.v1.DeliveryServiceGrpc;
+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.Task;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
 import io.grpc.Metadata;