build(deps): Bump geotools to 33.0 (#3905)

* Switch to jakarta annotations and bump required dependencies

* Add missing imports

Author: steffenaxer

Diff for: contribs/analysis/src/main/java/org/matsim/contrib/analysis/vsp/traveltimedistance/NetworkRouteValidator.java

@@ -11,7 +11,7 @@
 import org.matsim.core.trafficmonitoring.FreeSpeedTravelTime;
 import org.matsim.core.utils.collections.Tuple;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;

Diff for: contribs/application/src/main/java/org/matsim/application/analysis/traffic/TrafficStatsCalculator.java

@@ -8,7 +8,7 @@
 import org.matsim.core.network.NetworkUtils;
 import org.matsim.core.router.util.TravelTime;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Map;
 
 /**

Diff for: contribs/application/src/main/java/org/matsim/application/prepare/counts/NetworkIndex.java

@@ -16,7 +16,7 @@
 import org.matsim.core.utils.geometry.geotools.MGC;
 import org.matsim.core.utils.io.IOUtils;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.io.IOException;
 import java.util.*;
 import java.util.function.BiPredicate;

Diff for: contribs/commercialTrafficApplications/src/main/java/org/matsim/contrib/commercialTrafficApplications/jointDemand/JointDemandUtils.java

@@ -26,7 +26,7 @@
 import org.matsim.freight.carriers.CarrierVehicle;
 import org.matsim.freight.carriers.Carriers;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.*;
 import java.util.stream.Collectors;
 

Diff for: contribs/common/src/main/java/org/matsim/contrib/common/collections/PartialSort.java

@@ -25,7 +25,7 @@
 import java.util.PriorityQueue;
 import java.util.stream.Stream;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import com.google.common.base.Preconditions;
 

Diff for: contribs/common/src/main/java/org/matsim/contrib/common/zones/Zone.java

@@ -6,7 +6,7 @@
 import org.matsim.api.core.v01.Identifiable;
 import org.matsim.utils.objectattributes.attributable.Attributable;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public interface Zone extends BasicLocation, Identifiable<Zone>, Attributable {
 	@Nullable

Diff for: contribs/common/src/main/java/org/matsim/contrib/common/zones/ZoneImpl.java

@@ -7,7 +7,7 @@
 import org.matsim.utils.objectattributes.attributable.Attributes;
 import org.matsim.utils.objectattributes.attributable.AttributesImpl;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 public class ZoneImpl implements Zone {
 

Diff for: contribs/common/src/main/java/org/matsim/contrib/common/zones/ZoneSystemUtils.java

@@ -33,8 +33,8 @@
 import org.matsim.core.utils.geometry.geotools.MGC;
 import org.matsim.core.utils.gis.GeoFileReader;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import jakarta.annotation.Nonnull;
+import jakarta.annotation.Nullable;
 import java.io.File;
 import java.io.UncheckedIOException;
 import java.net.MalformedURLException;

Diff for: contribs/common/src/main/java/org/matsim/contrib/common/zones/systems/grid/GISFileZoneSystemParams.java

@@ -4,7 +4,7 @@
 import org.matsim.contrib.common.zones.ZoneSystemParams;
 import org.matsim.core.config.Config;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 /**
  * @author nkuehnel / MOIA

Diff for: contribs/common/src/main/java/org/matsim/contrib/common/zones/systems/grid/h3/H3GridZoneSystemParams.java

@@ -4,7 +4,7 @@
 import org.matsim.contrib.common.zones.ZoneSystemParams;
 import org.matsim.core.config.Config;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 
 /**

Diff for: contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/DrtWithExtensionsConfigGroup.java

@@ -27,7 +27,7 @@
 import org.matsim.contrib.drt.optimizer.constraints.DrtOptimizationConstraintsSet;
 import org.matsim.contrib.drt.run.DrtConfigGroup;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Optional;
 import java.util.function.Supplier;
 

Diff for: contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/insertion/ConfigurableCostCalculatorStrategy.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.matsim.contrib.drt.optimizer.insertion.CostCalculationStrategy;
 import org.matsim.contrib.drt.optimizer.insertion.InsertionCostCalculator;

Diff for: contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/insertion/constraints/VehicleRangeConstraint.java

@@ -1,6 +1,6 @@
 package org.matsim.contrib.drt.extension.insertion.constraints;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.matsim.contrib.drt.extension.insertion.DrtInsertionConstraint;
 import org.matsim.contrib.drt.extension.insertion.distances.DistanceApproximator;
@@ -15,7 +15,7 @@
 
 public class VehicleRangeConstraint implements DrtInsertionConstraint {
 	private final InsertionDistanceCalculator insertionCalculator;
-	
+
 	private final VehicleRangeSupplier rangeSupplier;
 	private final DistanceCalculator distanceCalculator;
 	private final DistanceApproximator distanceApproximator;

Diff for: contribs/drt-extensions/src/main/java/org/matsim/contrib/drt/extension/operations/DrtOperationsParams.java

@@ -12,7 +12,7 @@
 import org.matsim.contrib.drt.extension.operations.shifts.config.ShiftsParams;
 import org.matsim.contrib.common.util.ReflectiveConfigGroupWithConfigurableParameterSets;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Optional;
 
 /**

Diff for: contribs/drt-extensions/src/test/java/org/matsim/contrib/drt/extension/DrtTestScenario.java

@@ -28,7 +28,7 @@
 import org.matsim.testcases.MatsimTestUtils;
 import org.matsim.vehicles.VehicleType;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.net.URL;
 import java.util.HashSet;
 import java.util.List;

Diff for: contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtEventSequenceCollector.java

@@ -32,7 +32,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.events.PersonDepartureEvent;
@@ -159,9 +159,9 @@ public List<PersonMoneyEvent> getDrtFares() {
 		}
 
 		public boolean isCompleted() {
-			return submitted.getPersonIds().stream().allMatch(personId -> { 
+			return submitted.getPersonIds().stream().allMatch(personId -> {
 				var events = personEvents.get(personId);
-				return events != null && personEvents.get(personId).droppedOff != null; 
+				return events != null && personEvents.get(personId).droppedOff != null;
 			});
 		}
 	}

Diff for: contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/Waypoint.java

@@ -24,7 +24,7 @@
 import java.util.Optional;
 import java.util.stream.DoubleStream;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.contrib.drt.passenger.AcceptedDrtRequest;
@@ -161,7 +161,7 @@ public Stop(DrtStopTask task, DvrpLoad outgoingOccupancy, DvrpLoadType loadType)
 			latestArrivalTime = calcLatestArrivalTime();
 
 			// essentially the min of the latest possible pickup times at this stop
-			latestDepartureTime = calcLatestDepartureTime();	
+			latestDepartureTime = calcLatestDepartureTime();
 		}
 
 		public Stop(DrtStopTask task, double latestArrivalTime, double latestDepartureTime, DvrpLoad outgoingOccupancy, DvrpLoadType loadType) {
@@ -215,7 +215,7 @@ public DvrpLoad getOccupancyChange() {
 				return pickedUp.subtract(droppedOff);
 			}
 		}
-		
+
 		private double calcLatestArrivalTime() {
 			return getMaxTimeConstraint(
 				task.getDropoffRequests().values().stream().mapToDouble(AcceptedDrtRequest::getLatestArrivalTime),

Diff for: contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionDetourTimeCalculator.java

@@ -2,7 +2,7 @@
 
 import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.STOP;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.matsim.contrib.drt.optimizer.VehicleEntry;
 import org.matsim.contrib.drt.optimizer.insertion.InsertionGenerator.Insertion;
@@ -61,7 +61,7 @@ public PickupDetourInfo calcPickupDetourInfo(VehicleEntry vEntry, InsertionPoint
 			var times = calculatePickupIfSameLink(vEntry, pickup.index, toPickupDepartureTime, drtRequest);
 			return new PickupDetourInfo(times.departureTime, times.additionalStopDuration);
 		}
-		
+
 		double arrivalTime = toPickupDepartureTime + toPickupTT;
 		double departureTime = stopTimeCalculator.initEndTimeForPickup(vEntry.vehicle, arrivalTime, drtRequest);
 		double stopDuration = departureTime - arrivalTime;
@@ -83,13 +83,13 @@ public DropoffDetourInfo calcDropoffDetourInfo(Insertion insertion, double toDro
 		if (dropoff.newWaypoint.getLink() == dropoff.previousWaypoint.getLink()) {
 			double remainingPickupTimeLoss = calculateRemainingPickupTimeLossAtDropoff(insertion, pickupDetourInfo);
 			double arrivalTime = dropoff.previousWaypoint.getArrivalTime() + remainingPickupTimeLoss;
-			
+
 			DrtStopTask stopTask = findStopTaskIfSameLinkAsPrevious(vEntry, dropoff.index);
 			double departureTime = stopTimeCalculator.updateEndTimeForDropoff(vEntry.vehicle, stopTask, arrivalTime, drtRequest);
-			
+
 			double initialStopDuration = stopTask.getEndTime() - stopTask.getBeginTime();
 			double additionalStopDuration = departureTime - arrivalTime - initialStopDuration;
-			
+
 			return new DropoffDetourInfo(arrivalTime, additionalStopDuration);
 		}
 
@@ -109,7 +109,7 @@ private PickupDetourInfo calcPickupDetourInfoIfPickupToDropoffDetour(VehicleEntr
 
 		final double departureTime;
 		final double additionalStopDuration;
-		
+
 		if (pickup.newWaypoint.getLink() == pickup.previousWaypoint.getLink()) {
 			// no drive to pickup, but possible additional stop duration
 			var times = calculatePickupIfSameLink(vEntry, pickup.index, toPickupDepartureTime, drtRequest);
@@ -119,7 +119,7 @@ private PickupDetourInfo calcPickupDetourInfoIfPickupToDropoffDetour(VehicleEntr
 			departureTime = stopTimeCalculator.initEndTimeForPickup(vEntry.vehicle, toPickupDepartureTime + toPickupTT, drtRequest);
 			additionalStopDuration = departureTime - toPickupDepartureTime - toPickupTT;
 		}
-		
+
 		double replacedDriveTT = calculateReplacedDriveDuration(vEntry, pickup.index, toPickupDepartureTime);
 		double pickupTimeLoss = toPickupTT + additionalStopDuration + fromPickupTT - replacedDriveTT;
 		return new PickupDetourInfo(departureTime, pickupTimeLoss);
@@ -133,10 +133,10 @@ private DropoffDetourInfo calcDropoffDetourInfoIfPickupToDropoffDetour(double fr
 		double dropoffTimeLoss = stopDuration + fromDropoffTT;
 		return new DropoffDetourInfo(arrivalTime, dropoffTimeLoss);
 	}
-	
+
 	private PickupTimeInfo calculatePickupIfSameLink(VehicleEntry vEntry, int pickupIndex, double toPickupDepartureTime, DrtRequest request) {
 		DrtStopTask stopTask = findStopTaskIfSameLinkAsPrevious(vEntry, pickupIndex);
-		
+
 		if (stopTask == null) {
 			// case 1: previous waypoint is a drive, we create a new stop
 			// insertion time is the end time of previous waypoint
@@ -160,11 +160,11 @@ private PickupTimeInfo calculatePickupIfSameLink(VehicleEntry vEntry, int pickup
 			return new PickupTimeInfo(departureTime, additionalStopDuration);
 		}
 	}
-	
+
 	private DrtStopTask findStopTaskIfSameLinkAsPrevious(VehicleEntry vEntry, int insertionIdx) {
 		if (insertionIdx == 0) {
 			var startTask = vEntry.start.task;
-			
+
 			if (startTask.isPresent() && STOP.isBaseTypeOf(startTask.get())) {
 				// case 1: we have a preceding and ongoing (started) stop task
 				return (DrtStopTask) startTask.get();
@@ -173,7 +173,7 @@ private DrtStopTask findStopTaskIfSameLinkAsPrevious(VehicleEntry vEntry, int in
 			// case 2: we have a preceding (planned) stop task
 			return (DrtStopTask) vEntry.stops.get(insertionIdx - 1).task;
 		}
-		
+
 		return null; // otherwise, there is no stop task before
 	}
 
@@ -190,32 +190,32 @@ private double calculateReplacedDriveDuration(VehicleEntry vEntry, int insertion
 
 		double replacedDriveStartTime = vEntry.getWaypoint(insertionIdx).getDepartureTime();
 		double replacedDriveEndTime = vEntry.stops.get(insertionIdx).task.getBeginTime();
-		
+
 		// reduce by the idle time before the next stop, to get the actual drive time
 		return replacedDriveEndTime - replacedDriveStartTime - vEntry.getPrecedingStayTime(insertionIdx);
 	}
-	
+
 	/*
 	 * When inserting a pickup, we generate a "pickup loss" which describes by how
 	 * much time we have to shift all following tasks to the future.
-	 * 
+	 *
 	 * In the case that some of the following stops are prebooked, however, there
 	 * may be a stay time buffer between the insertion point and the stop. Hence, if
 	 * a following stop only happens in four hours, we may not need to shift the
 	 * task to the future. A preceding stay time, hence, reduces the introduced
 	 * pickup loss.
-	 * 
+	 *
 	 * The present function calculates the remaining pickup loss at the dropoff
 	 * insertion point after deducting all the stay times up to the dropoff.
 	 */
 	public static double calculateRemainingPickupTimeLossAtDropoff(Insertion insertion, PickupDetourInfo pickupDetourInfo) {
 		VehicleEntry vEntry = insertion.vehicleEntry;
 		double remainingPickupTimeLoss = pickupDetourInfo.pickupTimeLoss;
-		
+
 		for (int i = insertion.pickup.index + 1; i < insertion.dropoff.index; i++) {
 			remainingPickupTimeLoss = Math.max(remainingPickupTimeLoss - vEntry.getPrecedingStayTime(i), 0.0);
 		}
-		
+
 		return remainingPickupTimeLoss;
 	}
 
@@ -285,7 +285,7 @@ public String toString() {
 					.toString();
 		}
 	}
-	
+
 	private record PickupTimeInfo(double departureTime, double additionalStopDuration) {
 	}
 }

Diff for: contribs/drt/src/main/java/org/matsim/contrib/drt/prebooking/PrebookingManager.java

@@ -28,7 +28,7 @@
 import org.matsim.core.mobsim.qsim.agents.WithinDayAgentUtils;
 import org.matsim.core.mobsim.qsim.interfaces.MobsimEngine;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -408,10 +408,10 @@ private void processRejections(double now) {
 							// the agent is on an activity, let it get stuck further below
 							stuckUponActivity.add(passengerId);
 						} else {
-							// the agent is on a leg, so we cannot make it stuck directly. 
-							// instead, we set the next activity to an infinite duration and 
+							// the agent is on a leg, so we cannot make it stuck directly.
+							// instead, we set the next activity to an infinite duration and
 							// make the agent get stuck right after the activity starts
-							
+
 							while (index < plan.getPlanElements().size()) {
 								if (plan.getPlanElements().get(index) instanceof Activity activity) {
 									activity.setEndTime(Double.MAX_VALUE); // very long but not infinite (= regular last activity)
@@ -448,10 +448,10 @@ private void processRejections(double now) {
 	}
 
 	private void abortAgent(MobsimAgent agent, Activity activity, double now) {
-		// this would be the simple way, but then it looks like the agent is stuck 
-		// because of something related to the activity. however, we want to make 
+		// this would be the simple way, but then it looks like the agent is stuck
+		// because of something related to the activity. however, we want to make
 		//it clear that drt is the cause here
-		
+
 		// agent.setStateToAbort(now);
 		// internalInterface.arrangeNextAgentState(agent);
 

Diff for: contribs/drt/src/main/java/org/matsim/contrib/drt/run/DrtConfigGroup.java

@@ -55,7 +55,7 @@
 import org.matsim.core.config.groups.RoutingConfigGroup;
 import org.matsim.core.config.groups.ScoringConfigGroup;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;

Diff for: contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/AdvanceRequestProvider.java

@@ -1,13 +1,13 @@
 package org.matsim.contrib.dvrp.passenger;
 
-import javax.annotation.Nullable;
+import jakarta.annotation.Nullable;
 
 import org.matsim.api.core.v01.population.Leg;
 import org.matsim.core.mobsim.framework.MobsimAgent;
 
 public interface AdvanceRequestProvider {
 	static public AdvanceRequestProvider NONE = (MobsimAgent agent, Leg leg) -> null;
-	
+
 	@Nullable
 	PassengerRequest retrieveRequest(MobsimAgent agent, Leg leg);
 }