[8.13.x][RHPAM-4644] Bump protobuf-java to 3.19.6 (kiegroup#863)

* [RHPAM-4644][7.67.x-blue] Bump protobuf-java from 3.19.6 * Upgrade Graphhopper to match protobuf (#1) Co-authored-by: Radovan Synek <[email protected]> --------- Co-authored-by: Radovan Synek <[email protected]> Co-authored-by: Radovan Synek <[email protected]>
yurloc · May 4, 2023 · 3196dfd · 3196dfd
1 parent 73a6283
commit 3196dfd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/...ng-backend/src/main/java/org/optaweb/vehiclerouting/plugin/routing/GraphHopperRouter.java b/...ng-backend/src/main/java/org/optaweb/vehiclerouting/plugin/routing/GraphHopperRouter.java
@@ -33,6 +33,7 @@
 
 import com.graphhopper.GHRequest;
 import com.graphhopper.GHResponse;
+import com.graphhopper.config.Profile;
 import com.graphhopper.reader.osm.GraphHopperOSM;
 import com.graphhopper.util.PointList;
 import com.graphhopper.util.shapes.BBox;
@@ -46,11 +47,14 @@
 @IfBuildProperty(name = "app.routing.engine", stringValue = "GRAPHHOPPER", enableIfMissing = true)
 class GraphHopperRouter implements Router, DistanceCalculator, Region {
 
+    private static final String CAR_PROFILE = "car";
+
     private final GraphHopperOSM graphHopper;
 
     @Inject
     GraphHopperRouter(GraphHopperOSM graphHopper) {
         this.graphHopper = graphHopper;
+        this.graphHopper.setProfiles(new Profile(CAR_PROFILE));
     }
 
     @Override
@@ -60,6 +64,7 @@ public List<Coordinates> getPath(Coordinates from, Coordinates to) {
                 from.longitude().doubleValue(),
                 to.latitude().doubleValue(),
                 to.longitude().doubleValue());
+        ghRequest.setProfile(CAR_PROFILE);
         PointList points = graphHopper.route(ghRequest).getBest().getPoints();
         return StreamSupport.stream(points.spliterator(), false)
                 .map(ghPoint3D -> Coordinates.of(ghPoint3D.lat, ghPoint3D.lon))
@@ -73,6 +78,7 @@ public long travelTimeMillis(Coordinates from, Coordinates to) {
                 from.longitude().doubleValue(),
                 to.latitude().doubleValue(),
                 to.longitude().doubleValue());
+        ghRequest.setProfile(CAR_PROFILE);
         GHResponse ghResponse = graphHopper.route(ghRequest);
         // TODO return wrapper that can hold both the result and error explanation instead of throwing exception
         if (ghResponse.hasErrors()) {

diff --git a/...ackend/src/test/java/org/optaweb/vehiclerouting/plugin/routing/GraphHopperRouterTest.java b/...ackend/src/test/java/org/optaweb/vehiclerouting/plugin/routing/GraphHopperRouterTest.java
@@ -33,7 +33,7 @@
 
 import com.graphhopper.GHRequest;
 import com.graphhopper.GHResponse;
-import com.graphhopper.PathWrapper;
+import com.graphhopper.ResponsePath;
 import com.graphhopper.reader.osm.GraphHopperOSM;
 import com.graphhopper.storage.GraphHopperStorage;
 import com.graphhopper.util.PointList;
@@ -50,7 +50,7 @@ class GraphHopperRouterTest {
     @Mock
     private GHResponse ghResponse;
     @Mock
-    private PathWrapper pathWrapper;
+    private ResponsePath pathWrapper;
     @Mock
     private GraphHopperStorage graphHopperStorage;
 

diff --git a/pom.xml b/pom.xml
@@ -43,14 +43,14 @@
   </modules>
 
   <properties>
-    <version.com.graphhopper>0.13.0-pre13</version.com.graphhopper>
+    <version.com.graphhopper>1.0</version.com.graphhopper>
     <version.com.neovisionaries>1.27</version.com.neovisionaries>
     <version.frontend-maven-plugin>1.11.3</version.frontend-maven-plugin>
     <version.node>v12.16.2</version.node>
     <version.npm>6.14.18</version.npm>
     <!-- Override protobuf version from Quarkus to make it compatible with GraphHopper. -->
-    <protobuf-java.version>3.6.1</protobuf-java.version>
-    <version.com.google.protobuf>3.6.1</version.com.google.protobuf>
+    <protobuf-java.version>3.19.6</protobuf-java.version>
+    <version.com.google.protobuf>3.19.6</version.com.google.protobuf>
   </properties>
 
   <dependencyManagement>