From dd7d051ad910bc66ceba61ee22f5dc54b74902be Mon Sep 17 00:00:00 2001
From: Pavel Shvetsov <pavel_shvetsov@epam.com>
Date: Fri, 27 Apr 2018 10:28:58 +0300
Subject: [PATCH] [FLINK-9763] [Startup Shell Scripts] Flink SQL Client bat
 script

---
 .../flink-sql-client/bin/sql-client.bat       | 40 +++++++++++++++++++
 .../flink/table/client/cli/CliView.java       | 10 ++---
 2 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 flink-libraries/flink-sql-client/bin/sql-client.bat

diff --git a/flink-libraries/flink-sql-client/bin/sql-client.bat b/flink-libraries/flink-sql-client/bin/sql-client.bat
new file mode 100644
index 0000000000000..d29907620267e
--- /dev/null
+++ b/flink-libraries/flink-sql-client/bin/sql-client.bat
@@ -0,0 +1,40 @@
+::###############################################################################
+::  Licensed to the Apache Software Foundation (ASF) under one
+::  or more contributor license agreements.  See the NOTICE file
+::  distributed with this work for additional information
+::  regarding copyright ownership.  The ASF licenses this file
+::  to you under the Apache License, Version 2.0 (the
+::  "License"); you may not use this file except in compliance
+::  with the License.  You may obtain a copy of the License at
+::
+::      http://www.apache.org/licenses/LICENSE-2.0
+::
+::  Unless required by applicable law or agreed to in writing, software
+::  distributed under the License is distributed on an "AS IS" BASIS,
+::  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+::  See the License for the specific language governing permissions and
+:: limitations under the License.
+::###############################################################################
+
+@echo off
+setlocal
+
+SET bin=%~dp0
+SET FLINK_ROOT_DIR=%bin%..
+SET FLINK_LIB_DIR=%FLINK_ROOT_DIR%\lib
+SET FLINK_OPT_DIR=%FLINK_ROOT_DIR%\opt
+
+SET JVM_ARGS=-Xmx512m
+
+SET FLINK_JM_CLASSPATH=%FLINK_LIB_DIR%\*
+SET FLINK_SQL_CLIENT_CLASSPATH=%FLINK_OPT_DIR%\*
+
+FOR %%I IN ("%FLINK_OPT_DIR%\flink-sql-client*.jar") DO SET "FLINK_SQL_CLIENT_JAR=%%~fI"
+
+if exist %FLINK_LIB_DIR%\flink-sql-client*.jar (
+    java %JVM_ARGS% -cp "%FLINK_JM_CLASSPATH%"; org.apache.flink.table.client.SqlClient %*
+) else (
+    java %JVM_ARGS% -cp "%FLINK_JM_CLASSPATH%;%FLINK_SQL_CLIENT_CLASSPATH%"; org.apache.flink.table.client.SqlClient %* -jar %FLINK_SQL_CLIENT_JAR%
+)
+
+endlocal
diff --git a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java
index 7cc3bb7eb8269..a1208a8ebb8e4 100644
--- a/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java
+++ b/flink-libraries/flink-sql-client/src/main/java/org/apache/flink/table/client/cli/CliView.java
@@ -193,10 +193,10 @@ protected void display() {
 		final List<String> lines = new ArrayList<>();
 
 		// title part
-		client.getTerminal().writer().println(computeTitleLine().toAnsi());
+		client.getTerminal().writer().println(computeTitleLine().toAnsi(client.getTerminal()));
 
 		// header part
-		headerLines.forEach(l -> client.getTerminal().writer().println(l.toAnsi()));
+		headerLines.forEach(l -> client.getTerminal().writer().println(l.toAnsi(client.getTerminal())));
 
 		// main part
 		// update vertical offset
@@ -218,7 +218,7 @@ protected void display() {
 		Stream.concat(mainHeaderLines.stream(), windowedMainLines.stream()).forEach(l -> {
 			if (offsetX < l.length()) {
 				final AttributedString windowX = l.substring(offsetX, Math.min(l.length(), offsetX + width));
-				client.getTerminal().writer().println(windowX.toAnsi());
+				client.getTerminal().writer().println(windowX.toAnsi(client.getTerminal()));
 			} else {
 				client.getTerminal().writer().println(); // nothing to show for this line
 			}
@@ -233,9 +233,9 @@ protected void display() {
 		IntStream.range(0, footerLines.size()).forEach((i) -> {
 			final AttributedString l = footerLines.get(i);
 			if (i == footerLines.size() - 1) {
-				client.getTerminal().writer().print(l.toAnsi());
+				client.getTerminal().writer().print(l.toAnsi(client.getTerminal()));
 			} else {
-				client.getTerminal().writer().println(l.toAnsi());
+				client.getTerminal().writer().println(l.toAnsi(client.getTerminal()));
 			}
 		});