Simplify operatorsByPrecedence list

2 files changed, 1 insertions, 17 deletions

diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
index 6d6cbe13b5b..c9f818544e3 100755
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/RankingExpression.java
@@ -20,7 +20,6 @@ import java.io.Serializable;
 import java.io.StringReader;
 import java.util.Deque;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Map;
 
 /**
diff --git a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ArithmeticOperator.java b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ArithmeticOperator.java
index ebeb7f8ac01..959045a63a0 100644
--- a/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ArithmeticOperator.java
+++ b/searchlib/src/main/java/com/yahoo/searchlib/rankingexpression/rule/ArithmeticOperator.java
@@ -3,8 +3,6 @@ package com.yahoo.searchlib.rankingexpression.rule;
 
 import com.yahoo.searchlib.rankingexpression.evaluation.Value;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -40,7 +38,7 @@ public enum ArithmeticOperator {
     }};
 
     /** A list of all the operators in this in order of decreasing precedence */
-    public static final List<ArithmeticOperator> operatorsByPrecedence = operatorsByPrecedence();
+    public static final List<ArithmeticOperator> operatorsByPrecedence = List.of(POWER, MODULO, DIVIDE, MULTIPLY, MINUS, PLUS, AND, OR);
 
     private final int precedence;
     private final String image;
@@ -62,17 +60,4 @@ public enum ArithmeticOperator {
         return image;
     }
 
-    private static List<ArithmeticOperator> operatorsByPrecedence() {
-        List<ArithmeticOperator> operators = new ArrayList<>();
-        operators.add(POWER);
-        operators.add(MODULO);
-        operators.add(DIVIDE);
-        operators.add(MULTIPLY);
-        operators.add(MINUS);
-        operators.add(PLUS);
-        operators.add(AND);
-        operators.add(OR);
-        return Collections.unmodifiableList(operators);
-    }
-
 }