From bcd5e800c4526e705b659bd743e9601d25c68172 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Mon, 28 Nov 2016 11:11:10 +0000 Subject: [PATCH] Remove InputStream/OutputStream support --- .../sbt/internal/util/AdditionalFormats.scala | 19 ------------------- .../sbt/internal/util/CacheImplicits.scala | 1 - 2 files changed, 20 deletions(-) diff --git a/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala b/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala index 7ec9ecf17..34fbbcab7 100644 --- a/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala +++ b/internal/util-cache/src/main/scala/sbt/internal/util/AdditionalFormats.scala @@ -5,8 +5,6 @@ import sbt.internal.util.Types.:+: import sjsonnew.{ Builder, deserializationError, JsonFormat, Unbuilder } import sjsonnew.BasicJsonProtocol, BasicJsonProtocol.asSingleton -import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, InputStream, OutputStream } - trait HListFormat { implicit def HConsFormat[H: JsonFormat, T <: HList: JsonFormat]: JsonFormat[H :+: T] = new JsonFormat[H :+: T] { @@ -33,21 +31,4 @@ trait HListFormat { } implicit val HNilFormat: JsonFormat[HNil] = asSingleton(HNil) - -} - -trait StreamFormat { self: BasicJsonProtocol => - def streamFormat[T](write: (T, OutputStream) => Unit, read: InputStream => T): JsonFormat[T] = { - lazy val byteArrayFormat = implicitly[JsonFormat[Array[Byte]]] - val toBytes = (t: T) => { val bos = new ByteArrayOutputStream(); write(t, bos); bos.toByteArray } - val fromBytes = (bs: Array[Byte]) => read(new ByteArrayInputStream(bs)) - - new JsonFormat[T] { - override def read[J](jsOpt: Option[J], unbuilder: Unbuilder[J]): T = - fromBytes(byteArrayFormat.read(jsOpt, unbuilder)) - - override def write[J](obj: T, builder: Builder[J]): Unit = - byteArrayFormat.write(toBytes(obj), builder) - } - } } diff --git a/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala b/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala index b3d660074..00bb6beaa 100644 --- a/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala +++ b/internal/util-cache/src/main/scala/sbt/internal/util/CacheImplicits.scala @@ -5,4 +5,3 @@ import sjsonnew.BasicJsonProtocol object CacheImplicits extends BasicCacheImplicits with BasicJsonProtocol with HListFormat - with StreamFormat