Rename withTermination() to withTerminationConfig() + move endingNow(…

…) up to parent + release notes
kiegroup · Apr 1, 2019 · 47e4667 · 47e4667
1 parent 1bbd99f
commit 47e4667
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/config/solver/SolverConfig.java b/optaplanner-core/src/main/java/org/optaplanner/core/config/solver/SolverConfig.java
@@ -278,7 +278,7 @@ public SolverConfig withScoreDirectorFactory(ScoreDirectorFactoryConfig scoreDir
         return this;
     }
 
-    public SolverConfig withTermination(TerminationConfig terminationConfig) {
+    public SolverConfig withTerminationConfig(TerminationConfig terminationConfig) {
         this.terminationConfig = terminationConfig;
         return this;
     }

diff --git a/...anner-core/src/main/java/org/optaplanner/core/impl/partitionedsearch/PartitionSolver.java b/...anner-core/src/main/java/org/optaplanner/core/impl/partitionedsearch/PartitionSolver.java
@@ -135,7 +135,6 @@ public void solvingStarted(DefaultSolverScope<Solution_> solverScope) {
     @Override
     public void solvingEnded(DefaultSolverScope<Solution_> solverScope) {
         super.solvingEnded(solverScope);
-        solverScope.endingNow();
         solverScope.getScoreDirector().close();
         // TODO log?
     }

diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/impl/solver/AbstractSolver.java b/optaplanner-core/src/main/java/org/optaplanner/core/impl/solver/AbstractSolver.java
@@ -100,6 +100,7 @@ public void solvingEnded(DefaultSolverScope<Solution_> solverScope) {
         phaseLifecycleSupport.fireSolvingEnded(solverScope);
         termination.solvingEnded(solverScope);
         bestSolutionRecaller.solvingEnded(solverScope);
+        solverScope.endingNow();
     }
 
     // ************************************************************************

diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/impl/solver/DefaultSolver.java b/optaplanner-core/src/main/java/org/optaplanner/core/impl/solver/DefaultSolver.java
@@ -218,12 +218,6 @@ public void solvingStarted(DefaultSolverScope<Solution_> solverScope) {
                 (randomFactory != null ? randomFactory : "not fixed"));
     }
 
-    @Override
-    public void solvingEnded(DefaultSolverScope<Solution_> solverScope) {
-        super.solvingEnded(solverScope);
-        solverScope.endingNow();
-    }
-
     public void outerSolvingEnded(DefaultSolverScope<Solution_> solverScope) {
         // Must be kept open for doProblemFactChange
         solverScope.getScoreDirector().close();

diff --git a/...r-docs/src/main/asciidoc/PlannerConfiguration/PlannerConfiguration-chapter.adoc b/...r-docs/src/main/asciidoc/PlannerConfiguration/PlannerConfiguration-chapter.adoc
@@ -123,16 +123,18 @@ For example, to change the running time based on user input, before building the
         SolverFactory<NQueens> solverFactory = SolverFactory.createFromXmlResource(
                 "org/optaplanner/examples/nqueens/solver/nqueensSolverConfig.xml");
 
-        TerminationConfig terminationConfig = new TerminationConfig();
+        solverFactory.getSolverConfig()
-        terminationConfig.setMinutesSpentLimit(userInput);
+                .withTerminationConfig(new TerminationConfig()
-        solverFactory.getSolverConfig().setTerminationConfig(terminationConfig);
+                        .withMinutesSpentLimit(userInput));
 
         Solver<NQueens> solver = solverFactory.buildSolver();
 ----
 
-Every element in the solver configuration XML is available as a `$$*$$Config` class or a property on a `$$*$$Config` class in the package namespace ``org.optaplanner.core.config``.
+Every element in the solver configuration XML is available as a `$$*$$Config` class
+or a property on a `$$*$$Config` class in the package namespace ``org.optaplanner.core.config``.
 These `$$*$$Config` classes are the Java representation of the XML format.
-They build the runtime components (of the package namespace ``org.optaplanner.core.impl``) and assemble them into an efficient ``Solver``.
+They build the runtime components (of the package namespace ``org.optaplanner.core.impl``)
+and assemble them into an efficient ``Solver``.
 
 [IMPORTANT]
 ====