immutable RunOrderParameters

Author: Tibor17

surefire-api/src/main/java/org/apache/maven/surefire/api/testset/RunOrderParameters.java

@@ -29,9 +29,9 @@ public class RunOrderParameters
 {
     private final RunOrder[] runOrder;
 
-    private File runStatisticsFile;
+    private final File runStatisticsFile;
 
-    private Long runOrderRandomSeed;
+    private final Long runOrderRandomSeed;
 
     public RunOrderParameters( RunOrder[] runOrder, File runStatisticsFile )
     {
@@ -76,11 +76,6 @@ public Long getRunOrderRandomSeed()
         return runOrderRandomSeed;
     }
 
-    public void setRunOrderRandomSeed( Long runOrderRandomSeed )
-    {
-        this.runOrderRandomSeed = runOrderRandomSeed;
-    }
-
     public File getRunStatisticsFile()
     {
         return runStatisticsFile;

surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultRunOrderCalculator.java

@@ -38,7 +38,7 @@
 public class DefaultRunOrderCalculator
     implements RunOrderCalculator
 {
-    private final Comparator<Class> sortOrder;
+    private final Comparator<Class<?>> sortOrder;
 
     private final RunOrder[] runOrder;
 
@@ -55,12 +55,7 @@ public DefaultRunOrderCalculator( RunOrderParameters runOrderParameters, int thr
         this.runOrder = runOrderParameters.getRunOrder();
         this.sortOrder = this.runOrder.length > 0 ? getSortOrderComparator( this.runOrder[0] ) : null;
         Long runOrderRandomSeed = runOrderParameters.getRunOrderRandomSeed();
-        if ( runOrderRandomSeed == null )
-        {
-            runOrderRandomSeed = System.nanoTime();
-            runOrderParameters.setRunOrderRandomSeed( runOrderRandomSeed );
-        }
-        this.random = new Random( runOrderRandomSeed );
+        this.random = new Random( runOrderRandomSeed == null ? System.nanoTime() : runOrderRandomSeed );
     }
 
     @Override
@@ -102,11 +97,11 @@ else if ( RunOrder.BALANCED.equals( runOrder ) )
         }
         else if ( sortOrder != null )
         {
-            Collections.sort( testClasses, sortOrder );
+            testClasses.sort( sortOrder );
         }
     }
 
-    private Comparator<Class> getSortOrderComparator( RunOrder runOrder )
+    private static Comparator<Class<?>> getSortOrderComparator( RunOrder runOrder )
     {
         if ( RunOrder.ALPHABETICAL.equals( runOrder ) )
         {
@@ -127,27 +122,13 @@ else if ( RunOrder.HOURLY.equals( runOrder ) )
         }
     }
 
-    private Comparator<Class> getReverseAlphabeticalComparator()
+    private static Comparator<Class<?>> getReverseAlphabeticalComparator()
     {
-        return new Comparator<Class>()
-        {
-            @Override
-            public int compare( Class o1, Class o2 )
-            {
-                return o2.getName().compareTo( o1.getName() );
-            }
-        };
+        return ( o1, o2 ) -> o2.getName().compareTo( o1.getName() );
     }
 
-    private Comparator<Class> getAlphabeticalComparator()
+    private static Comparator<Class<?>> getAlphabeticalComparator()
     {
-        return new Comparator<Class>()
-        {
-            @Override
-            public int compare( Class o1, Class o2 )
-            {
-                return o1.getName().compareTo( o2.getName() );
-            }
-        };
+        return Comparator.comparing( Class::getName );
     }
 }