rename generic type Sol to Solution_ for consistency

optaplanner-core/src/main/java/org/optaplanner/core/impl/score/director/easy/EasyScoreCalculator.java

@@ -24,17 +24,17 @@
  * Used for easy java {@link Score} calculation. This is non-incremental calculation, which is slow.
  * <p>
  * An implementation must be stateless.
- * @param <Sol> Subclass of {@link Solution}
+ * @param <Solution_> Subclass of {@link Solution}
  * @see EasyScoreDirector
  */
-public interface EasyScoreCalculator<Sol extends Solution> {
+public interface EasyScoreCalculator<Solution_ extends Solution> {
 
     /**
      * This method is only called if the {@link Score} cannot be predicted.
      * The {@link Score} can be predicted for example after an undo {@link Move}.
      * @param solution never null
      * @return never null
      */
-    Score calculateScore(Sol solution);
+    Score calculateScore(Solution_ solution);
 
 }

optaplanner-core/src/main/java/org/optaplanner/core/impl/score/director/incremental/AbstractIncrementalScoreCalculator.java

@@ -22,6 +22,6 @@
  * Abstract superclass for {@link IncrementalScoreCalculator}.
  * @see IncrementalScoreCalculator
  */
-public abstract class AbstractIncrementalScoreCalculator<Sol extends Solution> implements IncrementalScoreCalculator<Sol> {
+public abstract class AbstractIncrementalScoreCalculator<Solution_ extends Solution> implements IncrementalScoreCalculator<Solution_> {
 
 }

optaplanner-core/src/main/java/org/optaplanner/core/impl/score/director/incremental/ConstraintMatchAwareIncrementalScoreCalculator.java

@@ -26,11 +26,11 @@
  * Allows a {@link IncrementalScoreCalculator} to report {@link ConstraintMatchTotal}s
  * for explaining a score (= which score constraints match for how much)
  * and also for score corruption analysis.
- * @param <Sol> Subclass of {@link Solution}
+ * @param <Solution_> Subclass of {@link Solution}
  * @see IncrementalScoreCalculator
  */
-public interface ConstraintMatchAwareIncrementalScoreCalculator<Sol extends Solution>
-        extends IncrementalScoreCalculator<Sol> {
+public interface ConstraintMatchAwareIncrementalScoreCalculator<Solution_ extends Solution>
+        extends IncrementalScoreCalculator<Solution_> {
 
     /**
      * Allows for increased performance by tracking only if constraintMatchEnabled is true.
@@ -40,7 +40,7 @@ public interface ConstraintMatchAwareIncrementalScoreCalculator<Sol extends Solu
      * @param workingSolution never null, to pass to {@link #resetWorkingSolution(Solution)}.
      * @param constraintMatchEnabled true if {@link #getConstraintMatchTotals()} might be called.
      */
-    void resetWorkingSolution(Sol workingSolution, boolean constraintMatchEnabled);
+    void resetWorkingSolution(Solution_ workingSolution, boolean constraintMatchEnabled);
 
     /**
      * @return never null

optaplanner-core/src/main/java/org/optaplanner/core/impl/score/director/incremental/IncrementalScoreCalculator.java

@@ -28,17 +28,17 @@
  * This is much faster than {@link EasyScoreCalculator} but requires much more code to implement too.
  * <p>
  * Any implementation is naturally stateful.
- * @param <Sol> Subclass of {@link Solution}
+ * @param <Solution_> Subclass of {@link Solution}
  * @see IncrementalScoreDirector
  */
-public interface IncrementalScoreCalculator<Sol extends Solution> {
+public interface IncrementalScoreCalculator<Solution_ extends Solution> {
 
     /**
      * There are no {@link #beforeEntityAdded(Object)} and {@link #afterEntityAdded(Object)} calls
      * for entities that are already present in the workingSolution.
      * @param workingSolution never null
      */
-    void resetWorkingSolution(Sol workingSolution);
+    void resetWorkingSolution(Solution_ workingSolution);
 
     /**
      * @param entity never null, an instance of a {@link PlanningEntity} class

optaplanner-core/src/test/java/org/optaplanner/core/impl/domain/solution/cloner/AbstractSolutionClonerTest.java

@@ -28,7 +28,6 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.optaplanner.core.api.domain.solution.Solution;
 import org.optaplanner.core.api.domain.solution.cloner.SolutionCloner;
@@ -66,7 +65,7 @@
 
 public abstract class AbstractSolutionClonerTest {
 
-    protected abstract <Sol extends Solution> SolutionCloner<Sol> createSolutionCloner(
+    protected abstract <Solution_ extends Solution> SolutionCloner<Solution_> createSolutionCloner(
             SolutionDescriptor solutionDescriptor);
 
     @Test

optaplanner-core/src/test/java/org/optaplanner/core/impl/domain/solution/cloner/FieldAccessingSolutionClonerTest.java

@@ -22,9 +22,9 @@
 public class FieldAccessingSolutionClonerTest extends AbstractSolutionClonerTest {
 
     @Override
-    protected <Sol extends Solution> FieldAccessingSolutionCloner<Sol> createSolutionCloner(
+    protected <Solution_ extends Solution> FieldAccessingSolutionCloner<Solution_> createSolutionCloner(
             SolutionDescriptor solutionDescriptor) {
-        return new FieldAccessingSolutionCloner<Sol>(solutionDescriptor);
+        return new FieldAccessingSolutionCloner<Solution_>(solutionDescriptor);
     }
 
 }