Ref #25533: prevent extra sort

Author: LEDfan

src/main/java/eu/openanalytics/containerproxy/model/runtime/AllowedParametersForUser.java

@@ -33,15 +33,15 @@ public class AllowedParametersForUser {
      * The integer represents the index of the parameter.
      * The list is sorted by the index.
      */
-    private final Map<String, List<Pair<Integer, String>>> values;
+    private final Map<String, List<String>> values;
 
     /**
      * List of all allowed combinations of the parameters for this specific user.
      */
     private final HashSet<List<Integer>> allowedCombinations;
 
 
-    public AllowedParametersForUser(Map<String, List<Pair<Integer, String>>> values, HashSet<List<Integer>> allowedCombinations) {
+    public AllowedParametersForUser(Map<String, List<String>> values, HashSet<List<Integer>> allowedCombinations) {
         this.values = values;
         this.allowedCombinations = allowedCombinations;
     }
@@ -50,7 +50,7 @@ public HashSet<List<Integer>> getAllowedCombinations() {
         return allowedCombinations;
     }
 
-    public Map<String, List<Pair<Integer, String>>> getValues() {
+    public Map<String, List<String>> getValues() {
         return values;
     }
 }

src/main/java/eu/openanalytics/containerproxy/service/ParametersService.java

@@ -182,7 +182,7 @@ public AllowedParametersForUser calculateAllowedParametersForUser(Authentication
         // 2. compute a unique (per parameter id) index for every value
         // mapping of parameter id to a mapping of an allowed value and its index
         Map<String, Map<String, Integer>> valuesToIndex = new HashMap<>();
-        Map<String, List<Pair<Integer, String>>> values = new HashMap<>();
+        Map<String, List<String>> values = new HashMap<>();
         // for every set of allowed values
         for (Parameters.ValueSet valueSet : allowedValueSets) {
             // for every parameter in this set
@@ -193,21 +193,13 @@ public AllowedParametersForUser calculateAllowedParametersForUser(Authentication
                 for (String value : valueSet.getParameterValues(parameterId)) {
                     if (!valuesToIndex.get(parameterId).containsKey(value)) {
                         // add it to allValues if it does not yet exist
-                        Integer newIndex = valuesToIndex.get(parameterId).size() + 1;
+                        Integer newIndex = values.get(parameterId).size() + 1;
                         valuesToIndex.get(parameterId).put(value, newIndex);
-                        values.get(parameterId).add(Pair.of(newIndex, value));
+                        values.get(parameterId).add(value);
                     }
                 }
             }
         }
-        // sort values
-        values = values.entrySet()
-                .stream()
-                .collect(Collectors.toMap(
-                        Map.Entry::getKey,
-                        (v) -> v.getValue()
-                                .stream().sorted(Comparator.comparingInt(Pair::getKey))
-                                .collect(Collectors.toList())));
 
         // 3. compute the set of allowed values
         HashSet<List<Integer>> allowedCombinations = new HashSet<>();