diff options
author | adamw <adam@warski.org> | 2017-08-29 13:11:29 +0200 |
---|---|---|
committer | adamw <adam@warski.org> | 2017-08-29 13:11:29 +0200 |
commit | e0fb4123d94e22e0003f12d681ed4539ffcaaebf (patch) | |
tree | 1cded1f913cfbe25fbf8c11da2c15db7e9952234 /core | |
parent | 36adc7902a8ce64c654637df6934e482397eeaed (diff) | |
download | sttp-e0fb4123d94e22e0003f12d681ed4539ffcaaebf.tar.gz sttp-e0fb4123d94e22e0003f12d681ed4539ffcaaebf.tar.bz2 sttp-e0fb4123d94e22e0003f12d681ed4539ffcaaebf.zip |
Removing the model package, flattening the structure
Diffstat (limited to 'core')
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala | 2 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/Method.scala (renamed from core/src/main/scala/com/softwaremill/sttp/model/Method.scala) | 2 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/Multipart.scala | 2 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/RequestBody.scala (renamed from core/src/main/scala/com/softwaremill/sttp/model/RequestBody.scala) | 4 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/RequestT.scala | 2 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/ResponseAs.scala (renamed from core/src/main/scala/com/softwaremill/sttp/model/ResponseAs.scala) | 4 | ||||
-rw-r--r-- | core/src/main/scala/com/softwaremill/sttp/package.scala | 2 |
7 files changed, 3 insertions, 15 deletions
diff --git a/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala b/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala index dd208f4..2fdce76 100644 --- a/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala +++ b/core/src/main/scala/com/softwaremill/sttp/HttpURLConnectionSttpHandler.scala @@ -7,8 +7,6 @@ import java.nio.charset.CharacterCodingException import java.nio.file.Files import java.util.zip.{GZIPInputStream, InflaterInputStream} -import com.softwaremill.sttp.model._ - import scala.annotation.tailrec import scala.io.Source import scala.collection.JavaConverters._ diff --git a/core/src/main/scala/com/softwaremill/sttp/model/Method.scala b/core/src/main/scala/com/softwaremill/sttp/Method.scala index 6f2ea68..83b2c05 100644 --- a/core/src/main/scala/com/softwaremill/sttp/model/Method.scala +++ b/core/src/main/scala/com/softwaremill/sttp/Method.scala @@ -1,4 +1,4 @@ -package com.softwaremill.sttp.model +package com.softwaremill.sttp case class Method(m: String) extends AnyVal object Method { diff --git a/core/src/main/scala/com/softwaremill/sttp/Multipart.scala b/core/src/main/scala/com/softwaremill/sttp/Multipart.scala index c54c615..86a4494 100644 --- a/core/src/main/scala/com/softwaremill/sttp/Multipart.scala +++ b/core/src/main/scala/com/softwaremill/sttp/Multipart.scala @@ -1,7 +1,5 @@ package com.softwaremill.sttp -import com.softwaremill.sttp.model.BasicRequestBody - /** * Use the factory methods `multipart` to conveniently create instances of * this class. A part can be then further customised using `fileName`, diff --git a/core/src/main/scala/com/softwaremill/sttp/model/RequestBody.scala b/core/src/main/scala/com/softwaremill/sttp/RequestBody.scala index 5d43298..a8be76b 100644 --- a/core/src/main/scala/com/softwaremill/sttp/model/RequestBody.scala +++ b/core/src/main/scala/com/softwaremill/sttp/RequestBody.scala @@ -1,12 +1,10 @@ -package com.softwaremill.sttp.model +package com.softwaremill.sttp import java.io.InputStream import java.net.URLEncoder import java.nio.ByteBuffer import java.nio.file.Path -import com.softwaremill.sttp._ - import scala.collection.immutable.Seq sealed trait RequestBody[+S] diff --git a/core/src/main/scala/com/softwaremill/sttp/RequestT.scala b/core/src/main/scala/com/softwaremill/sttp/RequestT.scala index 1461ac6..88f64e3 100644 --- a/core/src/main/scala/com/softwaremill/sttp/RequestT.scala +++ b/core/src/main/scala/com/softwaremill/sttp/RequestT.scala @@ -5,8 +5,6 @@ import java.nio.ByteBuffer import java.nio.file.Path import java.util.Base64 -import com.softwaremill.sttp.model._ - import scala.collection.immutable.Seq import scala.language.higherKinds diff --git a/core/src/main/scala/com/softwaremill/sttp/model/ResponseAs.scala b/core/src/main/scala/com/softwaremill/sttp/ResponseAs.scala index 5a008ed..14d3606 100644 --- a/core/src/main/scala/com/softwaremill/sttp/model/ResponseAs.scala +++ b/core/src/main/scala/com/softwaremill/sttp/ResponseAs.scala @@ -1,10 +1,8 @@ -package com.softwaremill.sttp.model +package com.softwaremill.sttp import java.io.{File, FileOutputStream, IOException, InputStream} import java.net.URLDecoder -import com.softwaremill.sttp.{MonadError, transfer} - import scala.collection.immutable.Seq import scala.language.higherKinds import scala.util.Try diff --git a/core/src/main/scala/com/softwaremill/sttp/package.scala b/core/src/main/scala/com/softwaremill/sttp/package.scala index bbd777e..69f20f0 100644 --- a/core/src/main/scala/com/softwaremill/sttp/package.scala +++ b/core/src/main/scala/com/softwaremill/sttp/package.scala @@ -4,8 +4,6 @@ import java.io._ import java.nio.ByteBuffer import java.nio.file.Path -import com.softwaremill.sttp.model._ - import scala.annotation.{implicitNotFound, tailrec} import scala.language.higherKinds import scala.collection.immutable.Seq |