From a677a8792c4566a79d7e3b8c0782c617ec1276ad Mon Sep 17 00:00:00 2001
From: Hanxiao Liu <hanli@microsoft.com>
Date: Fri, 19 Nov 2021 16:47:29 +0800
Subject: [PATCH] Migrate to use ConsoleTextTerminal in web app config mojo

---
 .../com/microsoft/azure/maven/webapp/ConfigMojo.java   | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/ConfigMojo.java b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/ConfigMojo.java
index d3a962ad38..ca0917115c 100644
--- a/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/ConfigMojo.java
+++ b/azure-webapp-maven-plugin/src/main/java/com/microsoft/azure/maven/webapp/ConfigMojo.java
@@ -38,8 +38,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.beryx.textio.TextIO;
-import org.beryx.textio.TextIoFactory;
+import org.beryx.textio.console.ConsoleTextTerminal;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.dom4j.DocumentException;
 
@@ -490,8 +489,7 @@ private WebAppConfiguration chooseExistingWebappForConfiguration()
             final List<WebAppOption> javaOrDockerWebapps = webAppOptionList.stream().filter(app -> app.isJavaWebApp() || app.isDockerWebapp())
                     .filter(app -> checkWebAppVisible(isContainer, isDockerOnly, app.isJavaSE(), app.isDockerWebapp())).sorted()
                     .collect(Collectors.toList());
-            final TextIO textIO = TextIoFactory.getTextIO();
-            final WebAppOption selectedApp = selectAzureWebApp(textIO, javaOrDockerWebapps,
+            final WebAppOption selectedApp = selectAzureWebApp(javaOrDockerWebapps,
                     getWebAppTypeByPackaging(this.project.getPackaging()), az.getDefaultSubscription());
             if (selectedApp == null || selectedApp.isCreateNew()) {
                 return null;
@@ -511,7 +509,7 @@ private WebAppConfiguration chooseExistingWebappForConfiguration()
         }
     }
 
-    private static WebAppOption selectAzureWebApp(TextIO textIO, List<WebAppOption> javaOrDockerWebapps, String webAppType, Subscription targetSubscription) {
+    private static WebAppOption selectAzureWebApp(List<WebAppOption> javaOrDockerWebapps, String webAppType, Subscription targetSubscription) {
         final List<WebAppOption> options = new ArrayList<>();
         options.add(WebAppOption.CREATE_NEW);
         // check empty: second time
@@ -520,7 +518,7 @@ private static WebAppOption selectAzureWebApp(TextIO textIO, List<WebAppOption>
             return null;
         }
         options.addAll(javaOrDockerWebapps);
-        return new CustomTextIoStringListReader<WebAppOption>(textIO::getTextTerminal, null)
+        return new CustomTextIoStringListReader<WebAppOption>(ConsoleTextTerminal::new, null)
                 .withCustomPrompt(String.format("Please choose a %s Web App%s: ", webAppType, highlightDefaultValue(WebAppOption.CREATE_NEW.toString())))
                 .withNumberedPossibleValues(options).withDefaultValue(WebAppOption.CREATE_NEW)
                 .read(String.format("%s Web Apps in subscription %s:", webAppType, TextUtils.blue(targetSubscription.getName())));