[maven-surefire] branch master updated: immutable RunOrderParameters

[tibordigana]

This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c06971af immutable RunOrderParameters
1c06971af is described below

commit 1c06971af95a01b93011ffb555d984fd5b92b13e
Author: tibor.digana <tibordig...@apache.org>
AuthorDate: Thu Apr 7 02:01:44 2022 +0200

    immutable RunOrderParameters
---
 .../surefire/api/testset/RunOrderParameters.java   |  9 ++----
 .../api/util/DefaultRunOrderCalculator.java        | 35 +++++-----------------
 2 files changed, 10 insertions(+), 34 deletions(-)

diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/RunOrderParameters.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/RunOrderParameters.java
index 07e3b3ea9..92828e975 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/RunOrderParameters.java
+++ 
b/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 class RunOrderParameters
         return runOrderRandomSeed;
     }
 
-    public void setRunOrderRandomSeed( Long runOrderRandomSeed )
-    {
-        this.runOrderRandomSeed = runOrderRandomSeed;
-    }
-
     public File getRunStatisticsFile()
     {
         return runStatisticsFile;
diff --git 
a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultRunOrderCalculator.java
 
b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultRunOrderCalculator.java
index 8ced06afa..3a2db958c 100644
--- 
a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultRunOrderCalculator.java
+++ 
b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultRunOrderCalculator.java
@@ -38,7 +38,7 @@ import java.util.Random;
 public class DefaultRunOrderCalculator
     implements RunOrderCalculator
 {
-    private final Comparator<Class> sortOrder;
+    private final Comparator<Class<?>> sortOrder;
 
     private final RunOrder[] runOrder;
 
@@ -55,12 +55,7 @@ public class DefaultRunOrderCalculator
         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 @@ public class DefaultRunOrderCalculator
         }
         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 @@ public class DefaultRunOrderCalculator
         }
     }
 
-    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 );
     }
 }