From 7973da3ee8fee6835b4d13f3ffe2b12c71b3011d Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Sat, 19 Aug 2023 11:37:16 +0800 Subject: [PATCH] ass compile on 2.13 --- build.sbt | 7 +++-- .../kernel/protocol/v5/client/Utilities.scala | 19 ++++++------ .../CoursierDependencyDownloader.scala | 4 +-- .../toree/magic/InternalClassLoader.scala | 2 +- .../apache/toree/utils/MultiClassLoader.scala | 2 +- .../v5/handler/CommInfoRequestHandler.scala | 11 +++---- .../kernel/protocol/v5/kernel/Utilities.scala | 19 ++++++------ .../apache/toree/magic/builtin/AddDeps.scala | 2 +- .../v5/kernel/socket/SocketConfigSpec.scala | 2 +- .../v5/stream/KernelOuputStreamSpec.scala | 2 +- .../scala/test/utils/DummyInterpreter.scala | 5 ++-- macros/project/plugins.sbt | 4 ++- .../apache/toree/plugins/PluginSearcher.scala | 4 +-- .../dependencies/ClassLoaderHelper.scala | 29 +++++++++++++++++++ .../toree/kernel/protocol/v5/package.scala | 2 +- .../toree/kernel/protocol/v5/HeaderSpec.scala | 2 +- .../protocol/v5/content/ClearOutputSpec.scala | 2 +- .../protocol/v5/content/CommCloseSpec.scala | 2 +- .../protocol/v5/content/CommMsgSpec.scala | 2 +- .../protocol/v5/content/CommOpenSpec.scala | 2 +- .../v5/content/CompleteReplyErrorSpec.scala | 2 +- .../v5/content/CompleteReplyOkSpec.scala | 2 +- .../v5/content/CompleteReplySpec.scala | 2 +- .../v5/content/CompleteRequestSpec.scala | 2 +- .../v5/content/ConnectReplySpec.scala | 2 +- .../v5/content/ConnectRequestSpec.scala | 2 +- .../protocol/v5/content/DisplayDataSpec.scala | 2 +- .../v5/content/ErrorContentSpec.scala | 2 +- .../v5/content/ExecuteInputSpec.scala | 2 +- .../v5/content/ExecuteReplyAbortSpec.scala | 2 +- .../v5/content/ExecuteReplyErrorSpec.scala | 2 +- .../v5/content/ExecuteReplyOkSpec.scala | 2 +- .../v5/content/ExecuteReplySpec.scala | 2 +- .../v5/content/ExecuteRequestSpec.scala | 2 +- .../v5/content/ExecuteResultSpec.scala | 2 +- .../v5/content/HistoryReplySpec.scala | 2 +- .../v5/content/HistoryRequestSpec.scala | 2 +- .../protocol/v5/content/InputReplySpec.scala | 2 +- .../v5/content/InputRequestSpec.scala | 2 +- .../v5/content/InspectReplyErrorSpec.scala | 2 +- .../v5/content/InspectReplyOkSpec.scala | 2 +- .../v5/content/InspectReplySpec.scala | 2 +- .../v5/content/InspectRequestSpec.scala | 2 +- .../v5/content/KernelInfoReplySpec.scala | 2 +- .../v5/content/KernelInfoRequestSpec.scala | 2 +- .../v5/content/KernelStatusSpec.scala | 2 +- .../v5/content/ShutdownReplySpec.scala | 2 +- .../v5/content/ShutdownRequestSpec.scala | 2 +- .../v5/content/StreamContentSpec.scala | 2 +- 49 files changed, 108 insertions(+), 74 deletions(-) create mode 100644 plugins/src/test/scala-2.13/org/apache/toree/plugins/dependencies/ClassLoaderHelper.scala diff --git a/build.sbt b/build.sbt index cf86d3c5f..c6a6ffa63 100644 --- a/build.sbt +++ b/build.sbt @@ -22,8 +22,9 @@ ThisBuild / version := Properties.envOrElse("VERSION", "0.0.0-dev") + (if ((ThisBuild / isSnapshot ).value) "-SNAPSHOT" else "") ThisBuild / isSnapshot := Properties.envOrElse("IS_SNAPSHOT","true").toBoolean ThisBuild / organization := "org.apache.toree.kernel" -ThisBuild / crossScalaVersions := Seq("2.13.10") -ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions ).value.head +ThisBuild / crossScalaVersions := Seq("2.13.8", "2.12.15") +//ThisBuild / crossScalaVersions := Seq("2.12.15", "2.13.8") +ThisBuild / scalaVersion := (ThisBuild / crossScalaVersions).value.head ThisBuild / Dependencies.sparkVersion := { val envVar = "APACHE_SPARK_VERSION" val defaultVersion = "3.3.2" @@ -40,7 +41,7 @@ ThisBuild / Dependencies.sparkVersion := { // Compiler settings ThisBuild / scalacOptions ++= Seq( - "-deprecation", +// "-deprecation", "-unchecked", "-feature", // "-Xfatal-warnings", diff --git a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala index 184d78ead..cf93b25ee 100644 --- a/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala +++ b/client/src/main/scala/org/apache/toree/kernel/protocol/v5/client/Utilities.scala @@ -26,6 +26,7 @@ import org.apache.toree.kernel.protocol.v5.content.ExecuteRequest import org.apache.toree.utils.LogLike import play.api.libs.json.{JsPath, Json, JsonValidationError, Reads} +import scala.collection.mutable import scala.concurrent.duration._ object Utilities extends LogLike { @@ -78,15 +79,15 @@ object Utilities extends LogLike { } implicit def KernelMessageToZMQMessage(kernelMessage : KernelMessage) : ZMQMessage = { - var frames: Seq[ByteString] = Seq() - kernelMessage.ids.map((id : Array[Byte]) => frames = frames :+ ByteString.apply(id) ) - frames = frames :+ "" - frames = frames :+ kernelMessage.signature - frames = frames :+ Json.toJson(kernelMessage.header).toString() - frames = frames :+ Json.toJson(kernelMessage.parentHeader).toString() - frames = frames :+ Json.toJson(kernelMessage.metadata).toString - frames = frames :+ kernelMessage.contentString - ZMQMessage(frames : _*) + val frames: mutable.ListBuffer[ByteString] = scala.collection.mutable.ListBuffer() + kernelMessage.ids.map((id: Array[Byte]) => frames += ByteString.apply(id)) + frames += "" + frames += kernelMessage.signature + frames += Json.toJson(kernelMessage.header).toString() + frames += Json.toJson(kernelMessage.parentHeader).toString() + frames += Json.toJson(kernelMessage.metadata).toString + frames += kernelMessage.contentString + ZMQMessage(frames.toSeq : _*) } def parseAndHandle[T](json: String, reads: Reads[T], handler: T => Unit) : Unit = { diff --git a/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala index 82f9728e2..03a0aa21d 100644 --- a/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala +++ b/kernel-api/src/main/scala/org/apache/toree/dependencies/CoursierDependencyDownloader.scala @@ -298,11 +298,11 @@ object Credentials { p } - private def findKey(keys: collection.Seq[String]) = keys + private def findKey(keys: collection.Seq[String]): String = keys .iterator .map(props.getProperty) .filter(_ != null) - .to(LazyList) + .toStream .headOption .getOrElse { throw new NoSuchElementException(s"${keys.head} key in $file") diff --git a/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala b/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala index b79a70159..6d571d23f 100644 --- a/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala +++ b/kernel-api/src/main/scala/org/apache/toree/magic/InternalClassLoader.scala @@ -29,7 +29,7 @@ class InternalClassLoader( // TODO: Provides an exposed reference to the super loadClass to be stubbed // out in tests. - private[magic] def parentLoadClass(name: String, resolve: Boolean) = + private[magic] def parentLoadClass(name: String, resolve: Boolean): Class[_] = super.loadClass(name, resolve) /** diff --git a/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala b/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala index b836e5acc..aa61c570b 100644 --- a/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala +++ b/kernel-api/src/main/scala/org/apache/toree/utils/MultiClassLoader.scala @@ -42,7 +42,7 @@ class MultiClassLoader( private val classLoaders: collection.Seq[ClassLoader] ) extends URLClassLoader( classLoaders.flatMap({ - case urlClassLoader: URLClassLoader => urlClassLoader.getURLs.to(collection.Seq) + case urlClassLoader: URLClassLoader => urlClassLoader.getURLs.toSeq case _ => Nil }).distinct.toArray, /* Create a parent chain based on a each classloader's parent */ { diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CommInfoRequestHandler.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CommInfoRequestHandler.scala index 43ec7540c..5af955cd0 100644 --- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CommInfoRequestHandler.scala +++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/handler/CommInfoRequestHandler.scala @@ -40,10 +40,10 @@ class CommInfoRequestHandler( extends BaseHandler(actorLoader) with MessageLogSupport { - def buildCommMap(targetName: String) = { + def buildCommMap(targetName: String): Map[UUID, Map[UUID, UUID]] = { commStorage.getCommIdsFromTarget(targetName) match { case Some(commVector) => { - commVector.map(x => Map(x -> Map("target_name" -> targetName))).flatten.toMap + commVector.flatMap(x => Map(x -> Map("target_name" -> targetName))).toMap } case _ => { Map() @@ -54,13 +54,14 @@ class CommInfoRequestHandler( override def process(kernelMessage: KernelMessage): Future[_] = Future { logKernelMessageAction("Initiating CommInfo request for", kernelMessage) import scala.language.existentials - val commMap = (Json.parse(kernelMessage.contentString) \ "target_name").asOpt[String] match { + val commMap: Map[String, Map[String, String]] = + (Json.parse(kernelMessage.contentString) \ "target_name").asOpt[String] match { case Some(targetName) => { buildCommMap(targetName) } case None => { - //target_name is missing from the kernel message so return all comms over every target - commStorage.getTargets().map(buildCommMap(_)) + // target_name is missing from the kernel message so return all comms over every target + commStorage.getTargets().map(buildCommMap).reduce(_ ++ _) } } val commInfoReply = CommInfoReply(commMap.asInstanceOf[Map[String, Map[String, String]]]) diff --git a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/kernel/Utilities.scala b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/kernel/Utilities.scala index 0d4a7c681..edaea2f76 100644 --- a/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/kernel/Utilities.scala +++ b/kernel/src/main/scala/org/apache/toree/kernel/protocol/v5/kernel/Utilities.scala @@ -26,6 +26,7 @@ import org.apache.toree.utils.LogLike import play.api.libs.json.JsonValidationError import play.api.libs.json.{JsPath, Json, Reads} +import scala.collection.mutable import scala.concurrent.duration._ object Utilities extends LogLike { @@ -77,15 +78,15 @@ object Utilities extends LogLike { } implicit def KernelMessageToZMQMessage(kernelMessage : KernelMessage) : ZMQMessage = { - var frames: Seq[ByteString] = Seq() - kernelMessage.ids.map((id : Array[Byte]) => frames = frames :+ ByteString.apply(id) ) - frames = frames :+ "" - frames = frames :+ kernelMessage.signature - frames = frames :+ Json.toJson(kernelMessage.header).toString() - frames = frames :+ Json.toJson(kernelMessage.parentHeader).toString() - frames = frames :+ Json.toJson(kernelMessage.metadata).toString - frames = frames :+ kernelMessage.contentString - ZMQMessage(frames : _*) + val frames: mutable.ListBuffer[ByteString] = mutable.ListBuffer() + kernelMessage.ids.map((id: Array[Byte]) => frames += ByteString.apply(id)) + frames += "" + frames += kernelMessage.signature + frames += Json.toJson(kernelMessage.header).toString() + frames += Json.toJson(kernelMessage.parentHeader).toString() + frames += Json.toJson(kernelMessage.metadata).toString + frames += kernelMessage.contentString + ZMQMessage(frames.toSeq : _*) } def parseAndHandle[T, U](json: String, reads: Reads[T], diff --git a/kernel/src/main/scala/org/apache/toree/magic/builtin/AddDeps.scala b/kernel/src/main/scala/org/apache/toree/magic/builtin/AddDeps.scala index eb0112760..466dce10c 100644 --- a/kernel/src/main/scala/org/apache/toree/magic/builtin/AddDeps.scala +++ b/kernel/src/main/scala/org/apache/toree/magic/builtin/AddDeps.scala @@ -91,7 +91,7 @@ class AddDeps extends LineMagic with IncludeInterpreter } else { (x, "*") } - }: (String, String)).to(collection.Set) + }: (String, String)).toSet val repositoriesWithCreds = dependencyDownloader.resolveRepositoriesAndCredentials(repository, credentials) diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala index f276ed130..c516aeab6 100644 --- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala +++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/kernel/socket/SocketConfigSpec.scala @@ -71,7 +71,7 @@ class SocketConfigSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = socketConfigJson.validate[SocketConfig] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: SocketConfig) => valid ) should be (socketConfig) } diff --git a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala index c52f5ee31..f70e2cd3d 100644 --- a/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala +++ b/kernel/src/test/scala/org/apache/toree/kernel/protocol/v5/stream/KernelOuputStreamSpec.scala @@ -239,7 +239,7 @@ class KernelOuputStreamSpec val message = kernelOutputRelayProbe .receiveOne(MaxAkkaTestTimeout).asInstanceOf[KernelMessage] - message.ids(0).deep should equal (MessageType.Outgoing.Stream.toString.getBytes.deep) + message.ids.head.toIndexedSeq should equal (MessageType.Outgoing.Stream.toString.getBytes.toIndexedSeq) } it("should set the message type in the header of the kernel message to an execute_result") { diff --git a/kernel/src/test/scala/test/utils/DummyInterpreter.scala b/kernel/src/test/scala/test/utils/DummyInterpreter.scala index d7c7fab5f..2ef0434cc 100644 --- a/kernel/src/test/scala/test/utils/DummyInterpreter.scala +++ b/kernel/src/test/scala/test/utils/DummyInterpreter.scala @@ -17,13 +17,12 @@ package test.utils -import java.net.URL - import org.apache.toree.interpreter.Results.Result import org.apache.toree.interpreter.{ExecuteFailure, ExecuteOutput, Interpreter, LanguageInfo} import org.apache.toree.kernel.api.KernelLike -import scala.tools.nsc.interpreter.{InputStream, OutputStream} +import java.io.{InputStream, OutputStream} +import java.net.URL class DummyInterpreter(kernel: KernelLike) extends Interpreter { /** diff --git a/macros/project/plugins.sbt b/macros/project/plugins.sbt index 69d839d1c..106430432 100644 --- a/macros/project/plugins.sbt +++ b/macros/project/plugins.sbt @@ -16,4 +16,6 @@ */ resolvers += Resolver.sonatypeRepo("releases") -addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full) +if (scalaBinaryVersion.value == "2.12") { + addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full) +} diff --git a/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala b/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala index 9ed47058c..9f3b69896 100644 --- a/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala +++ b/plugins/src/main/scala/org/apache/toree/plugins/PluginSearcher.scala @@ -75,8 +75,8 @@ class PluginSearcher { s"Failed to load class info from classpath: ${classFinder.classpath.mkString(",")}", _: Throwable )) - val stream = tryStream.getOrElse(LazyList.empty) - ClassFinder.classInfoMap(stream.iterator) + val stream = tryStream.getOrElse(Stream.empty) + ClassFinder.classInfoMap(stream.toIterator) } /** diff --git a/plugins/src/test/scala-2.13/org/apache/toree/plugins/dependencies/ClassLoaderHelper.scala b/plugins/src/test/scala-2.13/org/apache/toree/plugins/dependencies/ClassLoaderHelper.scala new file mode 100644 index 000000000..20e185659 --- /dev/null +++ b/plugins/src/test/scala-2.13/org/apache/toree/plugins/dependencies/ClassLoaderHelper.scala @@ -0,0 +1,29 @@ +/* + * 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 + */ +package org.apache.toree.plugins.dependencies + +import java.net.URL +import java.lang.{ClassLoader => JClassLoader} + +import scala.reflect.internal.util.ScalaClassLoader + +object ClassLoaderHelper { + + def URLClassLoader(urls: Seq[URL], parent: JClassLoader): ScalaClassLoader.URLClassLoader = { + new scala.reflect.internal.util.ScalaClassLoader.URLClassLoader(urls, parent) + } +} diff --git a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala index 71864d528..45c060638 100644 --- a/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala +++ b/protocol/src/main/scala/org/apache/toree/kernel/protocol/v5/package.scala @@ -36,7 +36,7 @@ package object v5 { Map.empty } else { // triple quotes due https://github.com/scala/bug/issues/6476 - kv.toMap.view.mapValues(v => Json.parse(s""""$v"""")).toMap + kv.toMap.mapValues(v => Json.parse(s""""$v"""")).toMap } } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala index 798ed38bb..92cf21c4a 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/HeaderSpec.scala @@ -63,7 +63,7 @@ class HeaderSpec extends AnyFunSpec with Matchers { val headerResults = headerJson.validate[Header] headerResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: Header) => valid ) should be (header) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala index d951d7a98..50c01e8ca 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ClearOutputSpec.scala @@ -59,7 +59,7 @@ class ClearOutputSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = clearOutputJson.validate[ClearOutput] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ClearOutput) => valid ) should be (clearOutput) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala index c0ee54c78..815fd16ef 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommCloseSpec.scala @@ -60,7 +60,7 @@ class CommCloseSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = commCloseJson.validate[CommClose] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CommClose) => valid ) should be (commClose) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala index a018f725a..3e353b14f 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommMsgSpec.scala @@ -88,7 +88,7 @@ class CommMsgSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = commMsgJson.validate[CommMsg] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CommMsg) => valid ) should be (commMsg) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala index 364a6b4dd..b45b80ca4 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CommOpenSpec.scala @@ -61,7 +61,7 @@ class CommOpenSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = commOpenJson.validate[CommOpen] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CommOpen) => valid ) should be (commOpen) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala index 47ddbf8ad..63646c7cf 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyErrorSpec.scala @@ -61,7 +61,7 @@ class CompleteReplyErrorSpec extends AnyFunSpec with Matchers { val CompleteReplyOkResults = completeReplyErrorJson.validate[CompleteReplyError] CompleteReplyOkResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CompleteReplyError) => valid ) should be (completeReplyError) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala index eecda7074..95fbf7f44 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplyOkSpec.scala @@ -57,7 +57,7 @@ class CompleteReplyOkSpec extends AnyFunSpec with Matchers { val CompleteReplyOkResults = completeReplyOkJson.validate[CompleteReplyOk] CompleteReplyOkResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CompleteReplyOk) => valid ) should be (completeReplyOk) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala index a37a5a3f0..c9754628b 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteReplySpec.scala @@ -64,7 +64,7 @@ class CompleteReplySpec extends AnyFunSpec with Matchers { val CompleteReplyResults = completeReplyJson.validate[CompleteReply] CompleteReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CompleteReply) => valid ) should be (completeReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala index afec715d8..8e7a8f069 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/CompleteRequestSpec.scala @@ -60,7 +60,7 @@ class CompleteRequestSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = completeRequestJson.validate[CompleteRequest] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: CompleteRequest) => valid ) should be (completeRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala index 94c6dceee..e8a2f52d7 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectReplySpec.scala @@ -62,7 +62,7 @@ class ConnectReplySpec extends AnyFunSpec with Matchers { val ConnectReplyResults = connectReplyJson.validate[ConnectReply] ConnectReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ConnectReply) => valid ) should be (connectReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala index 593181108..e3465b815 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ConnectRequestSpec.scala @@ -55,7 +55,7 @@ class ConnectRequestSpec extends AnyFunSpec with Matchers { val ConnectRequestResults = connectRequestJson.validate[ConnectRequest] ConnectRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ConnectRequest) => valid ) should be (connectRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala index 206104299..0e45087de 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/DisplayDataSpec.scala @@ -62,7 +62,7 @@ class DisplayDataSpec extends AnyFunSpec with Matchers { val displayDataResults = displayDataJson.validate[DisplayData] displayDataResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: DisplayData) => valid ) should be (displayData) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala index ac9b57a41..9095097f8 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ErrorContentSpec.scala @@ -58,7 +58,7 @@ class ErrorContentSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = errorJson.validate[ErrorContent] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ErrorContent) => valid ) should be (error) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala index 5a360a47e..7f2647f20 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteInputSpec.scala @@ -60,7 +60,7 @@ class ExecuteInputSpec extends AnyFunSpec with Matchers { val executeInputResults = executeInputJson.validate[ExecuteInput] executeInputResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteInput) => valid ) should be (executeInput) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala index 9669f2b8d..33bd0f081 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyAbortSpec.scala @@ -55,7 +55,7 @@ class ExecuteReplyAbortSpec extends AnyFunSpec with Matchers { val ExecuteReplyAbortResults = executeReplyAbortJson.validate[ExecuteReplyAbort] ExecuteReplyAbortResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteReplyAbort) => valid ) should be (executeReplyAbort) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala index 4140e5def..df371be01 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyErrorSpec.scala @@ -59,7 +59,7 @@ class ExecuteReplyErrorSpec extends AnyFunSpec with Matchers { val ExecuteReplyErrorResults = executeReplyErrorJson.validate[ExecuteReplyError] ExecuteReplyErrorResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteReplyError) => valid ) should be (executeReplyError) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala index bb235b010..8bf3ad2f7 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplyOkSpec.scala @@ -58,7 +58,7 @@ class ExecuteReplyOkSpec extends AnyFunSpec with Matchers { val executeReplyOkResults = executeReplyOkJson.validate[ExecuteReplyOk] executeReplyOkResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteReplyOk) => valid ) should be (executeReplyOk) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala index d7abd0f05..0016ad63a 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteReplySpec.scala @@ -61,7 +61,7 @@ class ExecuteReplySpec extends AnyFunSpec with Matchers { val executeReplyResults = executeReplyJson.validate[ExecuteReply] executeReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteReply) => valid ) should be (executeReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala index 2678af280..e712b9c23 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteRequestSpec.scala @@ -64,7 +64,7 @@ class ExecuteRequestSpec extends AnyFunSpec with Matchers { val executeRequestResults = executeRequestJson.validate[ExecuteRequest] executeRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteRequest) => valid ) should be (executeRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala index e5155e58c..dd40618f7 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ExecuteResultSpec.scala @@ -97,7 +97,7 @@ class ExecuteResultSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = executeResultJson.validate[ExecuteResult] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ExecuteResult) => valid ) should be (executeResult) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala index 260e94631..bbc2142bc 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryReplySpec.scala @@ -61,7 +61,7 @@ class HistoryReplySpec extends AnyFunSpec with Matchers { val CompleteRequestResults = historyReplyJson.validate[HistoryReply] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: HistoryReply) => valid ) should be (historyReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala index b79348442..7d5cdcb38 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/HistoryRequestSpec.scala @@ -67,7 +67,7 @@ class HistoryRequestSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = historyRequestJson.validate[HistoryRequest] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: HistoryRequest) => valid ) should be (historyRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala index ab27e0733..04dcc789d 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputReplySpec.scala @@ -59,7 +59,7 @@ class InputReplySpec extends AnyFunSpec with Matchers { val CompleteReplyResults = inputReplyJson.validate[InputReply] CompleteReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: InputReply) => valid ) should be (inputReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala index ce98889bd..9b7b657a5 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InputRequestSpec.scala @@ -60,7 +60,7 @@ class InputRequestSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = inputRequestJson.validate[InputRequest] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: InputRequest) => valid ) should be (inputRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala index dcbb44362..34ab89b2f 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyErrorSpec.scala @@ -59,7 +59,7 @@ class InspectReplyErrorSpec extends AnyFunSpec with Matchers { val InspectReplyErrorResults = inspectReplyErrorJson.validate[InspectReplyError] InspectReplyErrorResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: InspectReplyError) => valid ) should be (inspectReplyError) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala index d31f349a0..a474cb3ab 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplyOkSpec.scala @@ -57,7 +57,7 @@ class InspectReplyOkSpec extends AnyFunSpec with Matchers { val InspectReplyOkResults = inspectReplyOkJson.validate[InspectReplyOk] InspectReplyOkResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: InspectReplyOk) => valid ) should be (inspectReplyOk) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala index 5d7ab6b74..4917cae69 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectReplySpec.scala @@ -61,7 +61,7 @@ class InspectReplySpec extends AnyFunSpec with Matchers { val InspectReplyResults = inspectReplyJson.validate[InspectReply] InspectReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: InspectReply) => valid ) should be (inspectReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala index 127e720fc..3fb8aa83c 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/InspectRequestSpec.scala @@ -61,7 +61,7 @@ class InspectRequestSpec extends AnyFunSpec with Matchers { val InspectRequestResults = inspectRequestJson.validate[InspectRequest] InspectRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: InspectRequest) => valid ) should be (inspectRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala index 924653dd6..fddff4cf5 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoReplySpec.scala @@ -64,7 +64,7 @@ class KernelInfoReplySpec extends AnyFunSpec with Matchers { val kernelInfoReplyResults = kernelInfoReplyJson.validate[KernelInfoReply] kernelInfoReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: KernelInfoReply) => valid ) should be (kernelInfoReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala index a35496d25..1f7cc2415 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelInfoRequestSpec.scala @@ -56,7 +56,7 @@ class KernelInfoRequestSpec extends AnyFunSpec with Matchers { val KernelInfoRequestResults = kernelInfoRequestJson.validate[KernelInfoRequest] KernelInfoRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: KernelInfoRequest) => valid ) should be (kernelInfoRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala index 5be379639..814283fc9 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/KernelStatusSpec.scala @@ -57,7 +57,7 @@ class KernelStatusSpec extends AnyFunSpec with Matchers { val kernelStatusResults = kernelStatusJson.validate[KernelStatus] kernelStatusResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: KernelStatus) => valid ) should be (kernelStatus) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala index a407d0fb8..bebf93f22 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownReplySpec.scala @@ -59,7 +59,7 @@ class ShutdownReplySpec extends AnyFunSpec with Matchers { val ShutdownReplyResults = shutdownReplyJson.validate[ShutdownReply] ShutdownReplyResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ShutdownReply) => valid ) should be (shutdownReply) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala index afa4798fa..bd956416b 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/ShutdownRequestSpec.scala @@ -59,7 +59,7 @@ class ShutdownRequestSpec extends AnyFunSpec with Matchers { val ShutdownRequestResults = shutdownRequestJson.validate[ShutdownRequest] ShutdownRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: ShutdownRequest) => valid ) should be (shutdownRequest) } diff --git a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala index abd660034..aeaad77a2 100644 --- a/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala +++ b/protocol/src/test/scala/org/apache/toree/kernel/protocol/v5/content/StreamContentSpec.scala @@ -58,7 +58,7 @@ class StreamContentSpec extends AnyFunSpec with Matchers { val CompleteRequestResults = streamJson.validate[StreamContent] CompleteRequestResults.fold( - (invalid: Seq[(JsPath, Seq[JsonValidationError])]) => println("Failed!"), + (invalid: collection.Seq[(JsPath, collection.Seq[JsonValidationError])]) => println("Failed!"), (valid: StreamContent) => valid ) should be (stream) }