chore: change it back to a boolean

Christopher-Chianelli · Christopher-Chianelli · commit 1e502ff0dfc3 · 2026-04-15T14:47:13.000-04:00
diff --git a/core/src/main/java/ai/timefold/solver/core/config/score/director/EnableAutomaticNodeSharing.java b/core/src/main/java/ai/timefold/solver/core/config/score/director/EnableAutomaticNodeSharing.java
diff --git a/core/src/main/java/ai/timefold/solver/core/config/score/director/ScoreDirectorFactoryConfig.java b/core/src/main/java/ai/timefold/solver/core/config/score/director/ScoreDirectorFactoryConfig.java
@@ -41,7 +41,7 @@ public final class ScoreDirectorFactoryConfig extends AbstractConfig<ScoreDirect
     @XmlJavaTypeAdapter(JaxbCustomPropertiesAdapter.class)
     private Map<String, String> constraintProviderCustomProperties = null;
     @Nullable
-    private EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing;
+    private Boolean constraintStreamAutomaticNodeSharing;
     private Boolean constraintStreamProfilingEnabled;
 
     private Class<? extends IncrementalScoreCalculator> incrementalScoreCalculatorClass = null;
@@ -93,12 +93,12 @@ public void setConstraintProviderCustomProperties(
         this.constraintProviderCustomProperties = constraintProviderCustomProperties;
     }
 
-    public @Nullable EnableAutomaticNodeSharing getConstraintStreamAutomaticNodeSharing() {
+    public @Nullable Boolean getConstraintStreamAutomaticNodeSharing() {
         return constraintStreamAutomaticNodeSharing;
     }
 
     public void
-            setConstraintStreamAutomaticNodeSharing(@Nullable EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing) {
+            setConstraintStreamAutomaticNodeSharing(@Nullable Boolean constraintStreamAutomaticNodeSharing) {
         this.constraintStreamAutomaticNodeSharing = constraintStreamAutomaticNodeSharing;
     }
 
@@ -195,7 +195,7 @@ public void setAssertionScoreDirectorFactory(@Nullable ScoreDirectorFactoryConfi
     }
 
     public @NonNull ScoreDirectorFactoryConfig
-            withConstraintStreamAutomaticNodeSharing(@NonNull EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing) {
+            withConstraintStreamAutomaticNodeSharing(@NonNull Boolean constraintStreamAutomaticNodeSharing) {
         this.constraintStreamAutomaticNodeSharing = constraintStreamAutomaticNodeSharing;
         return this;
     }
diff --git a/core/src/main/java/ai/timefold/solver/core/impl/score/director/stream/BavetConstraintStreamScoreDirectorFactory.java b/core/src/main/java/ai/timefold/solver/core/impl/score/director/stream/BavetConstraintStreamScoreDirectorFactory.java
@@ -7,7 +7,6 @@
 import ai.timefold.solver.core.api.score.Score;
 import ai.timefold.solver.core.api.score.stream.ConstraintMetaModel;
 import ai.timefold.solver.core.api.score.stream.ConstraintProvider;
-import ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing;
 import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
 import ai.timefold.solver.core.config.util.ConfigUtils;
@@ -49,20 +48,16 @@ public final class BavetConstraintStreamScoreDirectorFactory<Solution_, Score_ e
     private static Class<? extends ConstraintProvider> getConstraintProviderClass(ScoreDirectorFactoryConfig config,
             Class<? extends ConstraintProvider> providedConstraintProviderClass) {
         var automaticNodeSharing = Objects.requireNonNullElse(config.getConstraintStreamAutomaticNodeSharing(),
-                EnableAutomaticNodeSharing.AUTO);
-        return switch (automaticNodeSharing) {
-            case OFF -> providedConstraintProviderClass;
-            case ON -> {
-                var enterpriseService =
-                        TimefoldSolverEnterpriseService
-                                .loadOrFail(TimefoldSolverEnterpriseService.Feature.AUTOMATIC_NODE_SHARING);
-                yield enterpriseService.createNodeSharer().buildNodeSharedConstraintProvider(providedConstraintProviderClass);
-            }
-            case AUTO -> TimefoldSolverEnterpriseService.loadOrDefault(
+                true);
+
+        if (automaticNodeSharing) {
+            return TimefoldSolverEnterpriseService.loadOrDefault(
                     enterpriseService -> enterpriseService.createNodeSharer()
                             .buildNodeSharedConstraintProvider(providedConstraintProviderClass),
                     () -> providedConstraintProviderClass);
-        };
+        } else {
+            return providedConstraintProviderClass;
+        }
     }
 
     private final BavetConstraintSessionFactory<Solution_, Score_> constraintSessionFactory;
diff --git a/core/src/main/resources/solver.xsd b/core/src/main/resources/solver.xsd
@@ -103,7 +103,7 @@
                     
           <xs:element minOccurs="0" name="constraintProviderCustomProperties" type="tns:jaxbAdaptedMap"/>
                     
-          <xs:element minOccurs="0" name="constraintStreamAutomaticNodeSharing" type="tns:enableAutomaticNodeSharing"/>
+          <xs:element minOccurs="0" name="constraintStreamAutomaticNodeSharing" type="xs:boolean"/>
                     
           <xs:element minOccurs="0" name="constraintStreamProfilingEnabled" type="xs:boolean"/>
                     
@@ -1539,20 +1539,6 @@
       
   </xs:simpleType>
     
-  <xs:simpleType name="enableAutomaticNodeSharing">
-        
-    <xs:restriction base="xs:string">
-            
-      <xs:enumeration value="ON"/>
-            
-      <xs:enumeration value="OFF"/>
-            
-      <xs:enumeration value="AUTO"/>
-          
-    </xs:restriction>
-      
-  </xs:simpleType>
-    
   <xs:simpleType name="terminationCompositionStyle">
         
     <xs:restriction base="xs:string">
diff --git a/quarkus-integration/quarkus/deployment/src/main/java/ai/timefold/solver/quarkus/deployment/config/SolverBuildTimeConfig.java b/quarkus-integration/quarkus/deployment/src/main/java/ai/timefold/solver/quarkus/deployment/config/SolverBuildTimeConfig.java
@@ -4,7 +4,6 @@
 import java.util.Set;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintProvider;
-import ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing;
 import ai.timefold.solver.core.config.solver.PreviewFeature;
 import ai.timefold.solver.core.config.solver.SolverConfig;
 import ai.timefold.solver.quarkus.config.SolverRuntimeConfig;
@@ -58,11 +57,11 @@ public interface SolverBuildTimeConfig {
      * so nodes share lambdas when possible, improving performance.
      * When enabled, breakpoints placed in the {@link ConstraintProvider}
      * will no longer be triggered.
-     * Defaults to "false".
+     * Defaults to "true".
      * <p>
      * Note: this setting is only available in Timefold Solver
      * <a href="https://timefold.ai/docs/timefold-solver/latest/enterprise-edition/enterprise-edition">Enterprise Edition</a>.
      */
     // Build time - modifies the ConstraintProvider class if set
-    Optional<EnableAutomaticNodeSharing> constraintStreamAutomaticNodeSharing();
+    Optional<Boolean> constraintStreamAutomaticNodeSharing();
 }
diff --git a/quarkus-integration/quarkus/deployment/src/test/java/ai/timefold/solver/quarkus/TimefoldProcessorNodeSharingFailFastTest.java b/quarkus-integration/quarkus/deployment/src/test/java/ai/timefold/solver/quarkus/TimefoldProcessorNodeSharingFailFastTest.java
@@ -4,7 +4,6 @@
 
 import jakarta.inject.Inject;
 
-import ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing;
 import ai.timefold.solver.core.config.solver.SolverConfig;
 import ai.timefold.solver.quarkus.testdomain.normal.TestdataQuarkusConstraintProvider;
 import ai.timefold.solver.quarkus.testdomain.normal.TestdataQuarkusEntity;
@@ -33,7 +32,7 @@ public class TimefoldProcessorNodeSharingFailFastTest {
 
     @Test
     void isEnabledInSolverConfig() {
-        assertEquals(EnableAutomaticNodeSharing.ON,
+        assertEquals(true,
                 solverConfig.getScoreDirectorFactoryConfig().getConstraintStreamAutomaticNodeSharing());
     }
 
diff --git a/quarkus-integration/quarkus/deployment/src/test/resources/ai/timefold/solver/quarkus/solverConfigWithNodeSharing.xml b/quarkus-integration/quarkus/deployment/src/test/resources/ai/timefold/solver/quarkus/solverConfigWithNodeSharing.xml
@@ -2,6 +2,6 @@
 <solver xmlns="https://timefold.ai/xsd/solver" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="https://timefold.ai/xsd/solver https://timefold.ai/xsd/solver/solver.xsd">
   <scoreDirectorFactory>
-    <constraintStreamAutomaticNodeSharing>ON</constraintStreamAutomaticNodeSharing>
+    <constraintStreamAutomaticNodeSharing>true</constraintStreamAutomaticNodeSharing>
   </scoreDirectorFactory>
 </solver>
diff --git a/spring-integration/spring-boot-autoconfigure/src/main/java/ai/timefold/solver/spring/boot/autoconfigure/TimefoldSolverAutoConfiguration.java b/spring-integration/spring-boot-autoconfigure/src/main/java/ai/timefold/solver/spring/boot/autoconfigure/TimefoldSolverAutoConfiguration.java
@@ -31,7 +31,6 @@
 import ai.timefold.solver.core.api.solver.SolutionManager;
 import ai.timefold.solver.core.api.solver.SolverFactory;
 import ai.timefold.solver.core.api.solver.SolverManager;
-import ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing;
 import ai.timefold.solver.core.config.score.director.ScoreDirectorFactoryConfig;
 import ai.timefold.solver.core.config.solver.SolverConfig;
 import ai.timefold.solver.core.config.solver.termination.DiminishedReturnsTerminationConfig;
@@ -264,33 +263,19 @@ private void applyScoreDirectorFactoryProperties(IncludeAbstractClassesEntitySca
             SolverConfig solverConfig, SolverProperties solverProperties) {
         applyScoreDirectorFactoryProperties(entityScanner, solverConfig);
         if (solverProperties.getConstraintStreamAutomaticNodeSharing() != null) {
-            Objects.requireNonNull(solverConfig.getScoreDirectorFactoryConfig())
-                    .setConstraintStreamAutomaticNodeSharing(switch (Objects.requireNonNullElse(
-                            solverProperties.getConstraintStreamAutomaticNodeSharing(),
-                            EnableAutomaticNodeSharing.AUTO)) {
-                        case ON -> {
-                            if (NativeDetector.inNativeImage()) {
-                                throw new UnsupportedOperationException(
-                                        "Constraint stream automatic node sharing is unsupported in a Spring native image.");
-                            }
-                            yield EnableAutomaticNodeSharing.ON;
-                        }
-                        case OFF -> EnableAutomaticNodeSharing.OFF;
-                        case AUTO -> {
-                            if (NativeDetector.inNativeImage()) {
-                                if (TimefoldSolverEnterpriseService.loadOrDefault(
-                                        ignored -> true,
-                                        () -> false)) {
-                                    // We are in enterprise, so log a note
-                                    LOG.debug("""
-                                            Constraint stream automatic node sharing was disabled because it \
-                                            is unsupported in a Spring native image.""");
-                                }
-                                yield EnableAutomaticNodeSharing.OFF;
-                            }
-                            yield EnableAutomaticNodeSharing.AUTO;
-                        }
-                    });
+            if (NativeDetector.inNativeImage()) {
+                if (solverProperties.getConstraintStreamAutomaticNodeSharing()) {
+                    // We are in enterprise, so log a note
+                    LOG.debug("""
+                            Constraint stream automatic node sharing was disabled because it \
+                            is unsupported in a Spring native image.""");
+                }
+                Objects.requireNonNull(solverConfig.getScoreDirectorFactoryConfig())
+                        .setConstraintStreamAutomaticNodeSharing(false);
+            } else {
+                Objects.requireNonNull(solverConfig.getScoreDirectorFactoryConfig())
+                        .setConstraintStreamAutomaticNodeSharing(solverProperties.getConstraintStreamAutomaticNodeSharing());
+            }
         } else if (NativeDetector.inNativeImage()) {
             // Explicitly set it to disabled in a native image if unspecified so
             // the solver does not try to node share when enterprise is used.
@@ -303,7 +288,7 @@ private void applyScoreDirectorFactoryProperties(IncludeAbstractClassesEntitySca
                         is unsupported in a Spring native image.""");
             }
             Objects.requireNonNull(solverConfig.getScoreDirectorFactoryConfig())
-                    .setConstraintStreamAutomaticNodeSharing(EnableAutomaticNodeSharing.OFF);
+                    .setConstraintStreamAutomaticNodeSharing(false);
         }
         if (solverProperties.getConstraintStreamProfilingEnabled() != null) {
             Objects.requireNonNull(solverConfig.getScoreDirectorFactoryConfig())
diff --git a/spring-integration/spring-boot-autoconfigure/src/main/java/ai/timefold/solver/spring/boot/autoconfigure/config/SolverProperties.java b/spring-integration/spring-boot-autoconfigure/src/main/java/ai/timefold/solver/spring/boot/autoconfigure/config/SolverProperties.java
@@ -5,7 +5,6 @@
 import java.util.TreeSet;
 
 import ai.timefold.solver.core.api.score.stream.ConstraintProvider;
-import ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
 import ai.timefold.solver.core.config.solver.PreviewFeature;
 import ai.timefold.solver.core.impl.heuristic.selector.common.nearby.NearbyDistanceMeter;
@@ -57,9 +56,9 @@ public class SolverProperties {
      * so nodes share lambdas when possible, improving performance.
      * When enabled, breakpoints placed in the {@link ConstraintProvider}
      * will no longer be triggered.
-     * Defaults to "AUTO".
+     * Defaults to "true".
      */
-    private EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing;
+    private Boolean constraintStreamAutomaticNodeSharing;
 
     /**
      * Configuration of the random seed.
@@ -129,11 +128,11 @@ public void setConstraintStreamProfilingEnabled(Boolean constraintStreamProfilin
         this.constraintStreamProfilingEnabled = constraintStreamProfilingEnabled;
     }
 
-    public EnableAutomaticNodeSharing getConstraintStreamAutomaticNodeSharing() {
+    public Boolean getConstraintStreamAutomaticNodeSharing() {
         return constraintStreamAutomaticNodeSharing;
     }
 
-    public void setConstraintStreamAutomaticNodeSharing(EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing) {
+    public void setConstraintStreamAutomaticNodeSharing(Boolean constraintStreamAutomaticNodeSharing) {
         this.constraintStreamAutomaticNodeSharing = constraintStreamAutomaticNodeSharing;
     }
 
diff --git a/spring-integration/spring-boot-autoconfigure/src/main/java/ai/timefold/solver/spring/boot/autoconfigure/config/SolverProperty.java b/spring-integration/spring-boot-autoconfigure/src/main/java/ai/timefold/solver/spring/boot/autoconfigure/config/SolverProperty.java
@@ -10,7 +10,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing;
 import ai.timefold.solver.core.config.solver.EnvironmentMode;
 import ai.timefold.solver.core.config.solver.PreviewFeature;
 import ai.timefold.solver.core.impl.heuristic.selector.common.nearby.NearbyDistanceMeter;
@@ -46,7 +45,7 @@ public enum SolverProperty {
             value -> Boolean.valueOf(value.toString())),
     CONSTRAINT_STREAM_AUTOMATIC_NODE_SHARING("constraint-stream-automatic-node-sharing",
             SolverProperties::setConstraintStreamAutomaticNodeSharing,
-            value -> EnableAutomaticNodeSharing.valueOf(value.toString())),
+            value -> Boolean.valueOf(value.toString())),
     RANDOM_SEED("random-seed", SolverProperties::setRandomSeed, value -> Long.parseLong(value.toString())),
     TERMINATION("termination", SolverProperties::setTermination, value -> {
         if (value instanceof TerminationProperties terminationProperties) {
diff --git a/spring-integration/spring-boot-autoconfigure/src/main/resources/META-INF/native-image/ai.timefold.solver/timefold-solver-spring-boot-autoconfigure/reflect-config.json b/spring-integration/spring-boot-autoconfigure/src/main/resources/META-INF/native-image/ai.timefold.solver/timefold-solver-spring-boot-autoconfigure/reflect-config.json
@@ -575,10 +575,6 @@
       }
     ]
   },
-  {
-    "name": "ai.timefold.solver.core.config.score.director.EnableAutomaticNodeSharing",
-    "allDeclaredFields": true
-  },
   {
     "name": "ai.timefold.solver.core.config.solver.PreviewFeature",
     "allDeclaredFields": true
diff --git a/spring-integration/spring-boot-autoconfigure/src/test/java/ai/timefold/solver/spring/boot/autoconfigure/TimefoldSolverConstraintAutoConfigurationTest.java b/spring-integration/spring-boot-autoconfigure/src/test/java/ai/timefold/solver/spring/boot/autoconfigure/TimefoldSolverConstraintAutoConfigurationTest.java
@@ -133,21 +133,6 @@ void readOnlyConcreteProviderClass() {
                 .doesNotThrowAnyException();
     }
 
-    @Test
-    void nodeSharingFailFastInNativeImage() {
-        try (var nativeDetectorMock = Mockito.mockStatic(NativeDetector.class)) {
-            nativeDetectorMock.when(NativeDetector::inNativeImage).thenReturn(true);
-            fakeNativeWithNodeSharingContextRunner
-                    .run(context -> {
-                        Throwable startupFailure = context.getStartupFailure();
-                        assertThat(startupFailure)
-                                .isInstanceOf(UnsupportedOperationException.class)
-                                .hasMessageContainingAll("node sharing", "unsupported", "native");
-                    });
-        }
-
-    }
-
     @Test
     void nodeSharingDisabledWorksInNativeImage() {
         try (var nativeDetectorMock = Mockito.mockStatic(NativeDetector.class)) {
diff --git a/tools/benchmark/src/main/resources/benchmark.xsd b/tools/benchmark/src/main/resources/benchmark.xsd
@@ -446,7 +446,7 @@
           <xs:element minOccurs="0" name="constraintProviderCustomProperties" type="tns:jaxbAdaptedMap"/>
                               
           
-          <xs:element minOccurs="0" name="constraintStreamAutomaticNodeSharing" type="tns:enableAutomaticNodeSharing"/>
+          <xs:element minOccurs="0" name="constraintStreamAutomaticNodeSharing" type="xs:boolean"/>
                               
           
           <xs:element minOccurs="0" name="constraintStreamProfilingEnabled" type="xs:boolean"/>
@@ -2570,27 +2570,6 @@
   </xs:simpleType>
       
   
-  <xs:simpleType name="enableAutomaticNodeSharing">
-            
-    
-    <xs:restriction base="xs:string">
-                  
-      
-      <xs:enumeration value="ON"/>
-                  
-      
-      <xs:enumeration value="OFF"/>
-                  
-      
-      <xs:enumeration value="AUTO"/>
-                
-    
-    </xs:restriction>
-          
-  
-  </xs:simpleType>
-      
-  
   <xs:simpleType name="terminationCompositionStyle">
             
     

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public final class ScoreDirectorFactoryConfig extends AbstractConfig<ScoreDirect`
`41`	`41`	`@XmlJavaTypeAdapter(JaxbCustomPropertiesAdapter.class)`
`42`	`42`	`private Map<String, String> constraintProviderCustomProperties = null;`
`43`	`43`	`@Nullable`
`44`		`- private EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing;`
	`44`	`+ private Boolean constraintStreamAutomaticNodeSharing;`
`45`	`45`	`private Boolean constraintStreamProfilingEnabled;`
`46`	`46`
`47`	`47`	`private Class<? extends IncrementalScoreCalculator> incrementalScoreCalculatorClass = null;`
`@@ -93,12 +93,12 @@ public void setConstraintProviderCustomProperties(`
`93`	`93`	`this.constraintProviderCustomProperties = constraintProviderCustomProperties;`
`94`	`94`	`}`
`95`	`95`
`96`		`- public @Nullable EnableAutomaticNodeSharing getConstraintStreamAutomaticNodeSharing() {`
	`96`	`+ public @Nullable Boolean getConstraintStreamAutomaticNodeSharing() {`
`97`	`97`	`return constraintStreamAutomaticNodeSharing;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public void`
`101`		`- setConstraintStreamAutomaticNodeSharing(@Nullable EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing) {`
	`101`	`+ setConstraintStreamAutomaticNodeSharing(@Nullable Boolean constraintStreamAutomaticNodeSharing) {`
`102`	`102`	`this.constraintStreamAutomaticNodeSharing = constraintStreamAutomaticNodeSharing;`
`103`	`103`	`}`
`104`	`104`
`@@ -195,7 +195,7 @@ public void setAssertionScoreDirectorFactory(@Nullable ScoreDirectorFactoryConfi`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`public @NonNull ScoreDirectorFactoryConfig`
`198`		`- withConstraintStreamAutomaticNodeSharing(@NonNull EnableAutomaticNodeSharing constraintStreamAutomaticNodeSharing) {`
	`198`	`+ withConstraintStreamAutomaticNodeSharing(@NonNull Boolean constraintStreamAutomaticNodeSharing) {`
`199`	`199`	`this.constraintStreamAutomaticNodeSharing = constraintStreamAutomaticNodeSharing;`
`200`	`200`	`return this;`
`201`	`201`	`}`