chore: remove the MapEnrichmentContext bean from definition

service/definition/src/main/java/ai/timefold/solver/service/definition/impl/enrichment/MapEnrichmentContext.java

@@ -0,0 +1,17 @@
+package ai.timefold.solver.service.definition.impl.enrichment;
+
+/**
+ * Stores the resolved map region during the enrichment phase to be sent over to the Platform later.
+ */
+public final class MapEnrichmentContext {
+
+    private String resolvedMapLocation;
+
+    public void setResolvedMapLocation(String location) {
+        resolvedMapLocation = location;
+    }
+
+    public String getResolvedMapLocation() {
+        return this.resolvedMapLocation;
+    }
+}

service/definition/src/main/java/ai/timefold/solver/service/definition/impl/storage/StorageObjectMapperProducer.java

@@ -1,5 +1,6 @@
 package ai.timefold.solver.service.definition.impl.storage;
 
+import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.enterprise.inject.Produces;
 import jakarta.inject.Inject;
 
@@ -10,6 +11,7 @@
 /**
  * Produces StorageObjectMapper instances with storage-specific (de)serialization settings.
  */
+@ApplicationScoped
 public class StorageObjectMapperProducer {
 
     private ObjectMapper quarkusObjectMapper;

service/maps/service-client/src/build/revapi-differences.json

@@ -3,7 +3,14 @@
     "extension": "revapi.differences",
     "configuration": {
       "differences": [
-
+        {
+          "ignore": true,
+          "code": "java.method.parameterTypeChanged",
+          "old": "parameter void ai.timefold.solver.service.maps.service.client.api.TravelTimeMatrixEnricher::<init>(ai.timefold.solver.service.maps.service.client.api.MapService, ai.timefold.solver.service.maps.service.client.impl.MapServiceOptionsSupplier, ===ai.timefold.solver.service.definition.internal.MapEnrichmentContext===, java.lang.Boolean)",
+          "new": "parameter void ai.timefold.solver.service.maps.service.client.api.TravelTimeMatrixEnricher::<init>(ai.timefold.solver.service.maps.service.client.api.MapService, ai.timefold.solver.service.maps.service.client.impl.MapServiceOptionsSupplier, ===ai.timefold.solver.service.definition.impl.enrichment.MapEnrichmentContext===, java.lang.Boolean)",
+          "parameterIndex": "2",
+          "justification": "TravelTimeMatrixEnricher constructor does not belong to a public API."
+        }
       ]
     }
   }

service/maps/service-client/src/main/java/ai/timefold/solver/service/maps/service/client/api/TravelTimeMatrixEnricher.java

@@ -11,7 +11,7 @@
 import jakarta.inject.Inject;
 
 import ai.timefold.solver.service.definition.api.enrichment.SolverModelEnricher;
-import ai.timefold.solver.service.definition.internal.MapEnrichmentContext;
+import ai.timefold.solver.service.definition.impl.enrichment.MapEnrichmentContext;
 import ai.timefold.solver.service.definition.internal.error.ErrorCodes;
 import ai.timefold.solver.service.definition.internal.error.TimefoldRuntimeException;
 import ai.timefold.solver.service.maps.api.DistanceMatrix;

service/maps/service-client/src/main/java/ai/timefold/solver/service/maps/service/client/impl/enrichment/MapEnrichmentContextProducer.java

@@ -0,0 +1,16 @@
+package ai.timefold.solver.service.maps.service.client.impl.enrichment;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+
+import ai.timefold.solver.service.definition.impl.enrichment.MapEnrichmentContext;
+
+@ApplicationScoped
+public class MapEnrichmentContextProducer {
+
+    @Produces
+    @ApplicationScoped
+    public MapEnrichmentContext produceMapEnrichmentContext() {
+        return new MapEnrichmentContext();
+    }
+}

service/maps/service-client/src/test/java/ai/timefold/solver/service/maps/service/client/api/TravelTimeMatrixEnricherTest.java

@@ -6,7 +6,7 @@
 
 import jakarta.inject.Inject;
 
-import ai.timefold.solver.service.definition.internal.MapEnrichmentContext;
+import ai.timefold.solver.service.definition.impl.enrichment.MapEnrichmentContext;
 import ai.timefold.solver.service.maps.api.model.Location;
 import ai.timefold.solver.service.maps.api.model.travel.TravelDistance;
 import ai.timefold.solver.service.maps.api.model.travel.TravelTime;

service/maps/service-client/src/test/java/ai/timefold/solver/service/maps/service/client/api/TravelTimeMatrixEnricherTrafficTest.java

@@ -12,7 +12,7 @@
 
 import ai.timefold.solver.core.api.domain.solution.ConstraintWeightOverrides;
 import ai.timefold.solver.core.api.score.HardSoftScore;
-import ai.timefold.solver.service.definition.internal.MapEnrichmentContext;
+import ai.timefold.solver.service.definition.impl.enrichment.MapEnrichmentContext;
 import ai.timefold.solver.service.definition.internal.error.TimefoldRuntimeException;
 import ai.timefold.solver.service.maps.api.DistanceMatrix;
 import ai.timefold.solver.service.maps.api.model.Location;

service/worker/src/main/java/ai/timefold/solver/service/worker/impl/SolverWorker.java

@@ -52,7 +52,7 @@
 import ai.timefold.solver.service.definition.api.validation.ModelValidator;
 import ai.timefold.solver.service.definition.api.validation.ValidationBuilder;
 import ai.timefold.solver.service.definition.api.validation.dto.ValidationResult;
-import ai.timefold.solver.service.definition.internal.MapEnrichmentContext;
+import ai.timefold.solver.service.definition.impl.enrichment.MapEnrichmentContext;
 import ai.timefold.solver.service.definition.internal.error.ErrorCodes;
 import ai.timefold.solver.service.definition.internal.error.ItemNotFoundException;
 import ai.timefold.solver.service.definition.internal.error.TimefoldRuntimeException;
@@ -183,7 +183,7 @@ public SolverWorker(@ConfigProperty(name = "timefold.model.name") Optional<Strin
             ModelConvertorBase modelConvertor,
             SolverModelEnricherService enricherService,
             SolverModelEnrichmentDirectorService enrichmentDirectorService,
-            MapEnrichmentContext mapEnrichmentContext,
+            Instance<MapEnrichmentContext> mapEnrichmentContext,
             TerminationService terminationService,
             ShutdownExecutor shutdownExecutor,
             ShutdownOnTerminate shutdownOnTerminate,
@@ -210,7 +210,8 @@ public SolverWorker(@ConfigProperty(name = "timefold.model.name") Optional<Strin
         this.modelConvertor = (ModelConvertor) modelConvertor;
         this.enricherService = enricherService;
         this.enrichmentDirectorService = enrichmentDirectorService;
-        this.mapEnrichmentContext = mapEnrichmentContext;
+        this.mapEnrichmentContext =
+                mapEnrichmentContext.isResolvable() ? mapEnrichmentContext.get() : new MapEnrichmentContext();
         this.terminationService = terminationService;
         this.shutdownExecutor = shutdownExecutor;
         this.shutdownOnTerminate = shutdownOnTerminate;