commit d593e6487aa36a806bab075d19c8b831ca096a28
author Vadim Pakhnushev <8614891+valepakh@users.noreply.github.com> Wed Apr 24 15:27:12 2024 +0300
committer GitHub <noreply@github.com> Wed Apr 24 15:27:12 2024 +0300
tree 80bcc3d4b27ee18808496d03372d579dc8e4c08c
parent 478ee5de9fc5355f64982978762c60bb8a2a95db

IGNITE-21824 Revert workaround for jline bug (#3647)

gradle/libs.versions.toml

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b423f3a..881e96a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@
 javapoet = "1.13.0"
 javax = "1.3.2"
 jetbrainsAnnotations = "24.1.0"
-jline = "3.25.1"
+jline = "3.26.1"
 jmh = "1.37"
 junit5 = "5.10.2"
 junitPioneer = "2.2.0"

modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java

diff --git a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java
index 914d1a2..b760c2b 100644
--- a/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java
+++ b/modules/cli/src/main/java/org/apache/ignite/internal/cli/core/repl/executor/IgnitePicocliCommands.java
@@ -19,7 +19,6 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -221,8 +220,6 @@
                     candidates.add(staticCandidate(c));
                 }
             }
-
-            sortCandidates(candidates);
         }
 
         private Candidate dynamicCandidate(String one) {
@@ -236,36 +233,5 @@
         private Candidate staticCandidate(String one) {
             return new Candidate(one, one, null, null, null, null, true, 10);
         }
-
-        /**
-         * When custom sort order is used, sort candidates list and reassign sort order according to candidates order.
-         * TODO https://issues.apache.org/jira/browse/IGNITE-21824
-         *
-         * @param candidates List of candidates.
-         */
-        private void sortCandidates(List<Candidate> candidates) {
-            boolean customOrder = candidates.stream().anyMatch(c -> c.sort() != 0);
-            if (!customOrder) {
-                return;
-            }
-            Collections.sort(candidates);
-            List<Candidate> newCandidates = new ArrayList<>(candidates.size());
-            for (int i = 0; i < candidates.size(); i++) {
-                Candidate candidate = candidates.get(i);
-                Candidate newCandidate = new Candidate(
-                        candidate.value(),
-                        candidate.displ(),
-                        candidate.group(),
-                        candidate.descr(),
-                        candidate.suffix(),
-                        candidate.key(),
-                        candidate.complete(),
-                        i // override sort order
-                );
-                newCandidates.add(newCandidate);
-            }
-            candidates.clear();
-            candidates.addAll(newCandidates);
-        }
     }
 }