Fixes rh-messaging#586: remove CliJavaNullValueConverter picocli wo…

…rkaround
jiridanek · Apr 11, 2023 · 4b5c70a · 4b5c70a
1 parent 38e8470
commit 4b5c70a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 35 deletions.
diff --git a/cli-protonj2/src/main/java/com/redhat/mqe/CliJavaNullValueConverter.java b/cli-protonj2/src/main/java/com/redhat/mqe/CliJavaNullValueConverter.java
diff --git a/cli-protonj2/src/main/java/com/redhat/mqe/CliProtonJ2Sender.java b/cli-protonj2/src/main/java/com/redhat/mqe/CliProtonJ2Sender.java
@@ -96,7 +96,7 @@ public class CliProtonJ2Sender extends CliProtonJ2SenderReceiver implements Call
     private Long msgTtl;
 
     // e.g. `--msg-content-list-item --msg-content-list-item "String"`
-    @CommandLine.Option(names = {"--msg-content-list-item"}, arity = "0..1", fallbackValue = Main.CLI_JAVA_NULL_VALUE, converter = CliJavaNullValueConverter.class)
+    @CommandLine.Option(names = {"--msg-content-list-item"}, arity = "0..1", fallbackValue = CommandLine.Option.NULL_VALUE)
     private List<String> msgContentListItem;
 
     @CommandLine.Option(names = {"--msg-content-map-item"})

diff --git a/cli-protonj2/src/main/java/com/redhat/mqe/Main.java b/cli-protonj2/src/main/java/com/redhat/mqe/Main.java
@@ -22,8 +22,6 @@
     }
 )
 class Main implements Callable<Integer> {
-    public static final String CLI_JAVA_NULL_VALUE = "CLI_JAVA_" + CommandLine.Option.NULL_VALUE;
-
     @Override
     public Integer call() throws Exception { // your business logic goes here...
         return 0;