From 97b693725c7210f19ede7e532b9dcf8bba9659a3 Mon Sep 17 00:00:00 2001
From: Kai Martins-Turner <martins-turner@vsp.tu-berlin.de>
Date: Fri, 15 Nov 2024 15:27:21 +0100
Subject: [PATCH] remove dependency to vsp contrib, as it is no longer needed

update import for annotation

remove NotNull annotation
---
 pom.xml                                                     | 6 ------
 .../ExampleTwoLspsGroceryDeliveryMultipleChains.java        | 3 +--
 ...ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java | 3 +--
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffa13b01..3e938dc1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,12 +37,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.matsim.contrib</groupId>
-			<artifactId>vsp</artifactId>
-			<version>${project.parent.version}</version>
-		</dependency>
-		
 		<!--MATSim examples. Not transitive -->
 		<dependency>
 			<groupId>org.matsim</groupId>
diff --git a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java
index 80462bde..5c6a4c0d 100644
--- a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java
+++ b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChains.java
@@ -47,7 +47,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
 import org.matsim.api.core.v01.TransportMode;
@@ -173,7 +172,7 @@ private static Config prepareConfig(String[] args) {
     return config;
   }
 
-  private static @NotNull Controler prepareControler(Scenario scenario) {
+  private static Controler prepareControler(Scenario scenario) {
     log.info("Prepare controler");
     Controler controler = new Controler(scenario);
     controler.addOverridingModule(
diff --git a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java
index c1d277be..e27b2e27 100644
--- a/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java
+++ b/src/main/java/org/matsim/freight/logistics/examples/multipleChains/ExampleTwoLspsGroceryDeliveryMultipleChainsWithToll.java
@@ -26,7 +26,6 @@
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.matsim.analysis.personMoney.PersonMoneyEventsAnalysisModule;
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.Scenario;
@@ -159,7 +158,7 @@ private static Config prepareConfig(String[] args) {
     return config;
   }
 
-  private static @NotNull Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
+  private static Controler prepareControler(Scenario scenario, RoadPricingScheme rpScheme) {
     log.info("Prepare controler");
     Controler controler = new Controler(scenario);
     controler.addOverridingModule(