Override default picocli help renderer

Author: Alan-Gomes

README.md

@@ -1,7 +1,7 @@
 # Spring Boot Spigot Starter
 
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Alan-Gomes/mcspring-boot/fork)
-[![Maven Central](https://img.shields.io/maven-central/v/dev.alangomes/spigot-spring-boot-starter.svg)](https://search.maven.org/#artifactdetails%7Cdev.alangomes%7Cspigot-spring-boot-starter%7C0.11.0%7Cjar)
+[![Maven Central](https://img.shields.io/maven-central/v/dev.alangomes/spigot-spring-boot-starter.svg)](https://search.maven.org/#artifactdetails%7Cdev.alangomes%7Cspigot-spring-boot-starter%7C0.11.1%7Cjar)
 [![License](https://img.shields.io/github/license/Alan-Gomes/mcspring-boot.svg?style=popout)](https://github.com/Alan-Gomes/mcspring-boot/blob/master/LICENSE)
 [![Coverage Status](https://img.shields.io/coveralls/github/Alan-Gomes/mcspring-boot/master.svg)](https://coveralls.io/github/Alan-Gomes/mcspring-boot?branch=master)
 [![GitHub Issues](https://img.shields.io/github/issues/Alan-Gomes/mcspring-boot.svg)](https://github.com/Alan-Gomes/mcspring-boot/issues)
@@ -29,7 +29,7 @@ Add the Spring boot starter to your project
 <dependency>
   <groupId>dev.alangomes</groupId>
   <artifactId>spigot-spring-boot-starter</artifactId>
-  <version>0.11.0</version>
+  <version>0.11.1</version>
 </dependency>
 ```
 

pom.xml

@@ -9,7 +9,7 @@
     <groupId>dev.alangomes</groupId>
     <artifactId>spigot-spring-boot-starter</artifactId>
     <packaging>jar</packaging>
-    <version>0.11.0</version>
+    <version>0.11.1</version>
     <description>Spring support for spigot plugins</description>
     <url>https://github.com/Alan-Gomes/mcspring-boot</url>
 

src/main/java/dev/alangomes/springspigot/picocli/CommandLineDefinition.java

@@ -6,10 +6,14 @@
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.BeanFactory;
 import picocli.CommandLine;
+import picocli.CommandLine.IHelpSectionRenderer;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Getter
 public class CommandLineDefinition {
@@ -42,6 +46,8 @@ public CommandLine build(BeanFactory factory) {
                 commandLine.addSubcommand(key, value);
             }
         });
+
+        overrideHelpRenderers(commandLine);
         return commandLine;
     }
 
@@ -58,4 +64,16 @@ public Set<String> getCommandNames() {
         return Collections.unmodifiableSet(subcommands.keySet());
     }
 
+    private void overrideHelpRenderers(CommandLine commandLine) {
+        Map<String, IHelpSectionRenderer> renderers = commandLine.getHelpSectionMap().keySet()
+                .stream()
+                .collect(Collectors.toMap(Function.identity(), (k) -> overrideRenderer(commandLine.getHelpSectionMap().get(k))));
+        commandLine.setHelpSectionMap(renderers);
+    }
+
+    private IHelpSectionRenderer overrideRenderer(IHelpSectionRenderer renderer) {
+        // strip carriage returns when running inside a windows server
+        return (h) -> renderer.render(h).replaceAll("\\r", "");
+    }
+
 }