[karaf] branch master updated: [KARAF-6362][karaf-maven-plugin] client goal:only one command in script file could be executed

[ffang]

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

ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 2f966c6  [KARAF-6362][karaf-maven-plugin] client goal:only one command 
in script file could be executed
2f966c6 is described below

commit 2f966c675cd478f4cd0a5b6b4cf938a9f0064b88
Author: Freeman Fang <freeman.f...@gmail.com>
AuthorDate: Mon Jul 22 15:07:17 2019 -0400

    [KARAF-6362][karaf-maven-plugin] client goal:only one command in script 
file could be executed
---
 .../main/java/org/apache/karaf/tooling/client/ClientMojo.java  | 10 ++++++++--
 .../org/apache/karaf/tooling/client/CommandDescriptor.java     |  6 +++---
 .../java/org/apache/karaf/tooling/client/SortedCommand.java    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
index 1d5cc1e..389e724 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/ClientMojo.java
@@ -103,13 +103,14 @@ public class ClientMojo extends AbstractMojo {
             return;
         }
         // ranking the commands and scripts
-        Comparator<CommandDescriptor> comparator = 
Comparator.comparingInt(CommandDescriptor::getRank);
+        Comparator<CommandDescriptor> comparator = 
Comparator.comparingDouble(CommandDescriptor::getRank);
         SortedSet<CommandDescriptor> sortedCommands = new 
TreeSet<>(comparator);
         if (scripts != null) {
             for (ScriptDescriptor script : scripts) {
                 File file = script.getScript();
                 try (BufferedReader br = new BufferedReader(new 
FileReader(file))) {
                     String line;
+                    int lineIndex = 0;
                     while ((line = br.readLine()) != null) {
                         line = line.trim();
                         if (line.isEmpty()) {
@@ -117,7 +118,12 @@ public class ClientMojo extends AbstractMojo {
                         }
                         CommandDescriptor descriptor = new CommandDescriptor();
                         descriptor.setCommand(line);
-                        descriptor.setRank(script.getRank());
+                        double rankSuffix = 0.5;
+                        for (int j = 0; j < lineIndex; j++) {
+                            rankSuffix = rankSuffix * 0.1;
+                        }
+                        descriptor.setRank(script.getRank() + rankSuffix);
+                        lineIndex++;
                         sortedCommands.add(descriptor);
                     }
                 } catch (Exception e) {
diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/CommandDescriptor.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/CommandDescriptor.java
index c532360..ed9e893 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/CommandDescriptor.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/client/CommandDescriptor.java
@@ -18,14 +18,14 @@ package org.apache.karaf.tooling.client;
 
 public class CommandDescriptor {
 
-    private int rank;
+    private double rank;
     private String command;
 
-    public int getRank() {
+    public double getRank() {
         return rank;
     }
 
-    public void setRank(int rank) {
+    public void setRank(double rank) {
         this.rank = rank;
     }
 
diff --git 
a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/client/SortedCommand.java
 
b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/client/SortedCommand.java
index b50a8f1..98bad3b 100644
--- 
a/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/client/SortedCommand.java
+++ 
b/tooling/karaf-maven-plugin/src/test/java/org/apache/karaf/tooling/client/SortedCommand.java
@@ -39,7 +39,7 @@ public class SortedCommand {
         commands.add(command);
 
         // ranking the commands and scripts
-        Comparator<CommandDescriptor> comparator = 
Comparator.comparingInt(CommandDescriptor::getRank);
+        Comparator<CommandDescriptor> comparator = 
Comparator.comparingDouble(CommandDescriptor::getRank);
         SortedSet<CommandDescriptor> sortedCommands = new 
TreeSet<>(comparator);
         sortedCommands.addAll(commands);