Improve buildSolutionDescriptor() return type

kiegroup · Jun 19, 2017 · 1c4a81f · 1c4a81f
1 parent 7ab3e9e
commit 1c4a81f
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 17 deletions.
diff --git a/...java/org/optaplanner/core/impl/testdata/domain/collection/TestdataArrayBasedSolution.java b/...java/org/optaplanner/core/impl/testdata/domain/collection/TestdataArrayBasedSolution.java
@@ -29,7 +29,7 @@
 @PlanningSolution
 public class TestdataArrayBasedSolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataArrayBasedSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataArrayBasedSolution.class, TestdataArrayBasedEntity.class);
     }
 

diff --git a/...t/java/org/optaplanner/core/impl/testdata/domain/collection/TestdataSetBasedSolution.java b/...t/java/org/optaplanner/core/impl/testdata/domain/collection/TestdataSetBasedSolution.java
@@ -31,7 +31,7 @@
 @PlanningSolution
 public class TestdataSetBasedSolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataSetBasedSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataSetBasedSolution.class, TestdataSetBasedEntity.class);
     }
 

diff --git a/...core/impl/testdata/domain/extended/abstractsolution/TestdataExtendedAbstractSolution.java b/...core/impl/testdata/domain/extended/abstractsolution/TestdataExtendedAbstractSolution.java
@@ -30,7 +30,7 @@
 @PlanningSolution
 public class TestdataExtendedAbstractSolution extends AbstractSolution<HardSoftScore> {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataExtendedAbstractSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataExtendedAbstractSolution.class, TestdataEntity.class);
     }
 

diff --git a/...a/domain/extended/abstractsolution/TestdataExtendedAbstractSolutionOverridesGetScore.java b/...a/domain/extended/abstractsolution/TestdataExtendedAbstractSolutionOverridesGetScore.java
@@ -31,8 +31,9 @@
 @PlanningSolution
 public class TestdataExtendedAbstractSolutionOverridesGetScore extends AbstractSolution<BendableScore> {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
-        return SolutionDescriptor.buildSolutionDescriptor(TestdataExtendedAbstractSolutionOverridesGetScore.class, TestdataEntity.class);
+    public static SolutionDescriptor<TestdataExtendedAbstractSolutionOverridesGetScore> buildSolutionDescriptor() {
+        return SolutionDescriptor.buildSolutionDescriptor(
+                TestdataExtendedAbstractSolutionOverridesGetScore.class, TestdataEntity.class);
     }
 
     private List<TestdataValue> valueList;

diff --git a/...optaplanner/core/impl/testdata/domain/extended/legacysolution/TestdataLegacySolution.java b/...optaplanner/core/impl/testdata/domain/extended/legacysolution/TestdataLegacySolution.java
@@ -32,7 +32,7 @@
 @Deprecated
 public class TestdataLegacySolution implements Solution<SimpleScore> {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataLegacySolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataLegacySolution.class, TestdataEntity.class);
     }
 

diff --git a/...va/org/optaplanner/core/impl/testdata/domain/reflect/generic/TestdataGenericSolution.java b/...va/org/optaplanner/core/impl/testdata/domain/reflect/generic/TestdataGenericSolution.java
@@ -31,7 +31,7 @@
 @PlanningSolution
 public class TestdataGenericSolution<T> extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataGenericSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataGenericSolution.class, TestdataGenericEntity.class);
     }
 

diff --git a/...ner/core/impl/testdata/domain/solutionproperties/TestdataProblemFactPropertySolution.java b/...ner/core/impl/testdata/domain/solutionproperties/TestdataProblemFactPropertySolution.java
@@ -33,7 +33,7 @@
 @PlanningSolution
 public class TestdataProblemFactPropertySolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataProblemFactPropertySolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataProblemFactPropertySolution.class, TestdataEntity.class);
     }
 

diff --git a/...ta/domain/solutionproperties/TestdataReadMethodProblemFactCollectionPropertySolution.java b/...ta/domain/solutionproperties/TestdataReadMethodProblemFactCollectionPropertySolution.java
@@ -33,8 +33,9 @@
 @PlanningSolution
 public class TestdataReadMethodProblemFactCollectionPropertySolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
-        return SolutionDescriptor.buildSolutionDescriptor(TestdataReadMethodProblemFactCollectionPropertySolution.class, TestdataEntity.class);
+    public static SolutionDescriptor<TestdataReadMethodProblemFactCollectionPropertySolution> buildSolutionDescriptor() {
+        return SolutionDescriptor.buildSolutionDescriptor(
+                TestdataReadMethodProblemFactCollectionPropertySolution.class, TestdataEntity.class);
     }
 
     private List<TestdataValue> valueList;

diff --git a/...pl/testdata/domain/solutionproperties/autodiscover/TestdataAutoDiscoverFieldSolution.java b/...pl/testdata/domain/solutionproperties/autodiscover/TestdataAutoDiscoverFieldSolution.java
@@ -30,7 +30,7 @@
 @PlanningSolution(autoDiscoverMemberType = AutoDiscoverMemberType.FIELD)
 public class TestdataAutoDiscoverFieldSolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataAutoDiscoverFieldSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataAutoDiscoverFieldSolution.class, TestdataEntity.class);
     }
 

diff --git a/...l/testdata/domain/solutionproperties/autodiscover/TestdataAutoDiscoverGetterSolution.java b/...l/testdata/domain/solutionproperties/autodiscover/TestdataAutoDiscoverGetterSolution.java
@@ -30,7 +30,7 @@
 @PlanningSolution(autoDiscoverMemberType = AutoDiscoverMemberType.GETTER)
 public class TestdataAutoDiscoverGetterSolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataAutoDiscoverGetterSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(TestdataAutoDiscoverGetterSolution.class, TestdataEntity.class);
     }
 

diff --git a/...solutionproperties/invalid/TestdataDuplicatePlanningEntityCollectionPropertySolution.java b/...solutionproperties/invalid/TestdataDuplicatePlanningEntityCollectionPropertySolution.java
@@ -32,7 +32,7 @@
 @PlanningSolution
 public class TestdataDuplicatePlanningEntityCollectionPropertySolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataDuplicatePlanningEntityCollectionPropertySolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(
                 TestdataDuplicatePlanningEntityCollectionPropertySolution.class, TestdataEntity.class);
     }

diff --git a/...ata/domain/solutionproperties/invalid/TestdataDuplicatePlanningScorePropertySolution.java b/...ata/domain/solutionproperties/invalid/TestdataDuplicatePlanningScorePropertySolution.java
@@ -32,7 +32,7 @@
 @PlanningSolution
 public class TestdataDuplicatePlanningScorePropertySolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataDuplicatePlanningScorePropertySolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(
                 TestdataDuplicatePlanningScorePropertySolution.class, TestdataEntity.class);
     }

diff --git a/...in/solutionproperties/invalid/TestdataDuplicateProblemFactCollectionPropertySolution.java b/...in/solutionproperties/invalid/TestdataDuplicateProblemFactCollectionPropertySolution.java
@@ -32,7 +32,7 @@
 @PlanningSolution
 public class TestdataDuplicateProblemFactCollectionPropertySolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataDuplicateProblemFactCollectionPropertySolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(
                 TestdataDuplicateProblemFactCollectionPropertySolution.class, TestdataEntity.class);
     }

diff --git a/...solutionproperties/invalid/TestdataProblemFactCollectionPropertyWithArgumentSolution.java b/...solutionproperties/invalid/TestdataProblemFactCollectionPropertyWithArgumentSolution.java
@@ -34,7 +34,7 @@
 @PlanningSolution
 public class TestdataProblemFactCollectionPropertyWithArgumentSolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataProblemFactCollectionPropertyWithArgumentSolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(
                 TestdataProblemFactCollectionPropertyWithArgumentSolution.class, TestdataEntity.class);
     }

diff --git a/...tionproperties/invalid/TestdataProblemFactIsPlanningEntityCollectionPropertySolution.java b/...tionproperties/invalid/TestdataProblemFactIsPlanningEntityCollectionPropertySolution.java
@@ -32,7 +32,7 @@
 @PlanningSolution
 public class TestdataProblemFactIsPlanningEntityCollectionPropertySolution extends TestdataObject {
 
-    public static SolutionDescriptor buildSolutionDescriptor() {
+    public static SolutionDescriptor<TestdataProblemFactIsPlanningEntityCollectionPropertySolution> buildSolutionDescriptor() {
         return SolutionDescriptor.buildSolutionDescriptor(
                 TestdataProblemFactIsPlanningEntityCollectionPropertySolution.class, TestdataEntity.class);
     }