[flink] 02/02: [hotfix] Remove StandaloneMiniCluster from ScalaShellITCase

[tr...@apache.org]

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

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

commit cc334db80face215250154047685466f7e01cb97
Author: Till Rohrmann <tr...@apache.org>
AuthorDate: Thu Sep 27 16:13:57 2018 +0200

    [hotfix] Remove StandaloneMiniCluster from ScalaShellITCase
---
 .../scala/org/apache/flink/api/scala/ScalaShellITCase.scala  | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
index 6a41793..54bb16f 100644
--- a/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
+++ b/flink-scala-shell/src/test/scala/org/apache/flink/api/scala/ScalaShellITCase.scala
@@ -20,10 +20,9 @@ package org.apache.flink.api.scala
 
 import java.io._
 
-import org.apache.flink.configuration.{Configuration, CoreOptions, RestOptions, TaskManagerOptions}
+import org.apache.flink.configuration.{Configuration, CoreOptions, RestOptions}
 import org.apache.flink.runtime.clusterframework.BootstrapTools
-import org.apache.flink.runtime.minicluster.{MiniCluster, MiniClusterConfiguration, StandaloneMiniCluster}
-import org.apache.flink.test.util.TestBaseUtils
+import org.apache.flink.runtime.minicluster.{MiniCluster, MiniClusterConfiguration}
 import org.apache.flink.util.TestLogger
 import org.junit._
 import org.junit.rules.TemporaryFolder
@@ -312,7 +311,7 @@ class ScalaShellITCase extends TestLogger {
 object ScalaShellITCase {
 
   val configuration = new Configuration()
-  var cluster: Option[Either[MiniCluster, StandaloneMiniCluster]] = None
+  var cluster: Option[MiniCluster] = None
 
   var port: Int = _
   var hostname : String = _
@@ -333,7 +332,7 @@ object ScalaShellITCase {
     port = miniCluster.getRestAddress.getPort
     hostname = miniCluster.getRestAddress.getHost
 
-    cluster = Some(Left(miniCluster))
+    cluster = Some(miniCluster)
   }
 
   @AfterClass
@@ -342,8 +341,7 @@ object ScalaShellITCase {
     Thread.currentThread().setContextClassLoader(classOf[ScalaShellITCase].getClassLoader)
 
     cluster.foreach {
-      case Left(miniCluster) => miniCluster.close()
-      case Right(miniCluster) => miniCluster.close()
+      miniCluster => miniCluster.close()
     }
   }