repackage

http4k · May 8, 2017 · e805086 · e805086
1 parent c163761
commit e805086
Show file tree

Hide file tree

Showing 125 changed files with 594 additions and 596 deletions.
diff --git a/http4k-client-apache/src/main/kotlin/org/http4k/client/ApacheHttpClient.kt b/http4k-client-apache/src/main/kotlin/org/http4k/client/ApacheHttpClient.kt
@@ -12,12 +12,12 @@ import org.apache.http.entity.ByteArrayEntity
 import org.apache.http.impl.client.CloseableHttpClient
 import org.apache.http.impl.client.HttpClients
 import org.apache.http.util.EntityUtils.toByteArray
-import org.http4k.http.core.Body
-import org.http4k.http.core.Headers
-import org.http4k.http.core.HttpHandler
-import org.http4k.http.core.Request
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status
+import org.http4k.core.Body
+import org.http4k.core.Headers
+import org.http4k.core.HttpHandler
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status
 import java.net.URI
 import java.nio.ByteBuffer
 

diff --git a/http4k-client-apache/src/test/kotlin/org/http4k/client/ApacheHttpClientTest.kt b/http4k-client-apache/src/test/kotlin/org/http4k/client/ApacheHttpClientTest.kt
@@ -3,8 +3,8 @@ package org.http4k.client
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.containsSubstring
 import com.natpryce.hamkrest.equalTo
-import org.http4k.http.core.Request.Companion.get
-import org.http4k.http.core.Status.Companion.OK
+import org.http4k.core.Request.Companion.get
+import org.http4k.core.Status.Companion.OK
 import org.junit.Test
 
 class ApacheHttpClientTest {

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/BasePath.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/BasePath.kt
@@ -1,6 +1,6 @@
 package org.http4k.contract
 
-import org.http4k.http.core.Request
+import org.http4k.core.Request
 
 sealed class BasePath {
     abstract val parent: BasePath

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/Module.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/Module.kt
@@ -1,11 +1,11 @@
 package org.http4k.contract
 
-import org.http4k.http.core.HttpHandler
-import org.http4k.http.core.Request
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.BAD_REQUEST
-import org.http4k.http.core.Status.Companion.NOT_FOUND
-import org.http4k.http.lens.LensFailure
+import org.http4k.core.HttpHandler
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.BAD_REQUEST
+import org.http4k.core.Status.Companion.NOT_FOUND
+import org.http4k.lens.LensFailure
 
 typealias Router = (Request) -> HttpHandler?
 

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/ModuleRenderer.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/ModuleRenderer.kt
@@ -1,7 +1,7 @@
 package org.http4k.contract
 
-import org.http4k.http.core.Response
-import org.http4k.http.lens.Failure
+import org.http4k.core.Response
+import org.http4k.lens.Failure
 
 interface ModuleRenderer {
     fun notFound(): Response

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/NoRenderer.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/NoRenderer.kt
@@ -1,10 +1,10 @@
 package org.http4k.contract
 
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.BAD_REQUEST
-import org.http4k.http.core.Status.Companion.NOT_FOUND
-import org.http4k.http.core.Status.Companion.OK
-import org.http4k.http.lens.Failure
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.BAD_REQUEST
+import org.http4k.core.Status.Companion.NOT_FOUND
+import org.http4k.core.Status.Companion.OK
+import org.http4k.lens.Failure
 
 object NoRenderer : ModuleRenderer {
     override fun description(moduleRoot: BasePath, security: Security, routes: List<ServerRoute>) = Response(OK)

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/PathBinder.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/PathBinder.kt
@@ -1,13 +1,13 @@
 package org.http4k.contract
 
-import org.http4k.http.core.HttpHandler
-import org.http4k.http.core.Request
-import org.http4k.http.core.Method
-import org.http4k.http.core.then
-import org.http4k.http.lens.LensFailure
-import org.http4k.http.lens.Meta
-import org.http4k.http.lens.Path
-import org.http4k.http.lens.PathLens
+import org.http4k.core.HttpHandler
+import org.http4k.core.Method
+import org.http4k.core.Request
+import org.http4k.core.then
+import org.http4k.lens.LensFailure
+import org.http4k.lens.Meta
+import org.http4k.lens.Path
+import org.http4k.lens.PathLens
 
 
 class ServerRoute internal constructor(private val pathBinder: PathBinder, private val toHandler: (ExtractedParts) -> HttpHandler) {

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/Route.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/Route.kt
@@ -1,18 +1,18 @@
 package org.http4k.contract
 
 import org.http4k.contract.PathBinder.Companion.Core
-import org.http4k.http.core.ContentType
-import org.http4k.http.core.Filter
-import org.http4k.http.core.Method
-import org.http4k.http.core.Request
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status
-import org.http4k.http.lens.BodyLens
-import org.http4k.http.lens.Failure
-import org.http4k.http.lens.HeaderLens
-import org.http4k.http.lens.Lens
-import org.http4k.http.lens.LensFailure
-import org.http4k.http.lens.QueryLens
+import org.http4k.core.ContentType
+import org.http4k.core.Filter
+import org.http4k.core.Method
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status
+import org.http4k.lens.BodyLens
+import org.http4k.lens.Failure
+import org.http4k.lens.HeaderLens
+import org.http4k.lens.Lens
+import org.http4k.lens.LensFailure
+import org.http4k.lens.QueryLens
 
 class Route private constructor(internal val core: Core) {
     constructor(name: String, description: String? = null) : this(Core(name, description, null))

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/RouteModule.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/RouteModule.kt
@@ -1,13 +1,13 @@
 package org.http4k.contract
 
 import org.http4k.contract.PathBinder.Companion.Core
-import org.http4k.http.core.Filter
-import org.http4k.http.core.HttpHandler
-import org.http4k.http.core.Method.GET
-import org.http4k.http.core.Request
-import org.http4k.http.core.then
-import org.http4k.http.core.with
-import org.http4k.http.filters.ServerFilters
+import org.http4k.core.Filter
+import org.http4k.core.HttpHandler
+import org.http4k.core.Method.GET
+import org.http4k.core.Request
+import org.http4k.core.then
+import org.http4k.core.with
+import org.http4k.filters.ServerFilters
 
 class RouteModule private constructor(private val router: ModuleRouter) : Module {
 

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/Security.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/Security.kt
@@ -1,11 +1,11 @@
 package org.http4k.contract
 
-import org.http4k.http.core.Filter
-import org.http4k.http.core.Request
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.UNAUTHORIZED
-import org.http4k.http.lens.Lens
-import org.http4k.http.lens.LensFailure
+import org.http4k.core.Filter
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.UNAUTHORIZED
+import org.http4k.lens.Lens
+import org.http4k.lens.LensFailure
 
 
 /**

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/SimpleJson.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/SimpleJson.kt
@@ -1,11 +1,11 @@
 package org.http4k.contract
 
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.OK
-import org.http4k.http.core.with
-import org.http4k.http.formats.Json
-import org.http4k.http.formats.JsonErrorResponseRenderer
-import org.http4k.http.lens.Failure
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.OK
+import org.http4k.core.with
+import org.http4k.formats.Json
+import org.http4k.formats.JsonErrorResponseRenderer
+import org.http4k.lens.Failure
 
 class SimpleJson<ROOT : NODE, out NODE : Any>(private val json: Json<ROOT, NODE>) : ModuleRenderer {
 

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/StaticModule.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/StaticModule.kt
@@ -1,11 +1,11 @@
 package org.http4k.contract
 
-import org.http4k.http.core.Filter
-import org.http4k.http.core.Request
-import org.http4k.http.core.ResourceLoader
-import org.http4k.http.core.StaticContent
-import org.http4k.http.core.Status.Companion.NOT_FOUND
-import org.http4k.http.core.then
+import org.http4k.core.Filter
+import org.http4k.core.Request
+import org.http4k.core.ResourceLoader
+import org.http4k.core.StaticContent
+import org.http4k.core.Status.Companion.NOT_FOUND
+import org.http4k.core.then
 
 class StaticModule(basePath: BasePath,
                    resourceLoader: ResourceLoader = ResourceLoader.Classpath("/"),

diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/constants.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/constants.kt
@@ -1,5 +1,5 @@
 package org.http4k.contract
 
-import org.http4k.http.lens.Header.optional
+import org.http4k.lens.Header.optional
 
 val X_REEKWEST_ROUTE_IDENTITY = optional("x-http4k-route-identity")
diff --git a/http4k-contract/src/main/kotlin/org/http4k/contract/util/JsonSchema.kt b/http4k-contract/src/main/kotlin/org/http4k/contract/util/JsonSchema.kt
@@ -1,12 +1,12 @@
 package util
 
-import org.http4k.http.formats.Json
-import org.http4k.http.formats.JsonType
-import org.http4k.http.lens.ParamMeta
-import org.http4k.http.lens.ParamMeta.BooleanParam
-import org.http4k.http.lens.ParamMeta.IntegerParam
-import org.http4k.http.lens.ParamMeta.NumberParam
-import org.http4k.http.lens.ParamMeta.StringParam
+import org.http4k.formats.Json
+import org.http4k.formats.JsonType
+import org.http4k.lens.ParamMeta
+import org.http4k.lens.ParamMeta.BooleanParam
+import org.http4k.lens.ParamMeta.IntegerParam
+import org.http4k.lens.ParamMeta.NumberParam
+import org.http4k.lens.ParamMeta.StringParam
 
 class IllegalSchemaException(message: String) : Exception(message)
 

diff --git a/http4k-contract/src/main/kotlin/org/http4k/filters/ResponseFilters.kt b/http4k-contract/src/main/kotlin/org/http4k/filters/ResponseFilters.kt
@@ -1,8 +1,7 @@
 package org.http4k.filters
 
 import org.http4k.contract.X_REEKWEST_ROUTE_IDENTITY
-import org.http4k.http.core.Filter
-import org.http4k.http.filters.ResponseFilters
+import org.http4k.core.Filter
 import java.time.Clock
 import java.time.Duration
 

diff --git a/http4k-contract/src/test/kotlin/org/http4k/contract/ModuleRendererContract.kt b/http4k-contract/src/test/kotlin/org/http4k/contract/ModuleRendererContract.kt
@@ -3,29 +3,29 @@ package org.http4k.contract
 import argo.jdom.JsonRootNode
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
+import org.http4k.core.ContentType
+import org.http4k.core.ContentType.Companion.APPLICATION_JSON
+import org.http4k.core.Method.GET
+import org.http4k.core.Method.POST
+import org.http4k.core.Request.Companion.get
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.OK
 import org.http4k.format.Argo.json
 import org.http4k.format.Argo.parse
-import org.http4k.http.core.ContentType
-import org.http4k.http.core.ContentType.Companion.APPLICATION_JSON
-import org.http4k.http.core.Method.GET
-import org.http4k.http.core.Method.POST
-import org.http4k.http.core.Request.Companion.get
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.OK
-import org.http4k.http.lens.BiDiBodyLens
-import org.http4k.http.lens.Body
-import org.http4k.http.lens.FormField
-import org.http4k.http.lens.FormValidator.Strict
-import org.http4k.http.lens.Header
-import org.http4k.http.lens.Invalid
-import org.http4k.http.lens.Meta
-import org.http4k.http.lens.Missing
-import org.http4k.http.lens.ParamMeta.StringParam
-import org.http4k.http.lens.Path
-import org.http4k.http.lens.Query
-import org.http4k.http.lens.boolean
-import org.http4k.http.lens.int
-import org.http4k.http.lens.webForm
+import org.http4k.lens.BiDiBodyLens
+import org.http4k.lens.Body
+import org.http4k.lens.FormField
+import org.http4k.lens.FormValidator.Strict
+import org.http4k.lens.Header
+import org.http4k.lens.Invalid
+import org.http4k.lens.Meta
+import org.http4k.lens.Missing
+import org.http4k.lens.ParamMeta.StringParam
+import org.http4k.lens.Path
+import org.http4k.lens.Query
+import org.http4k.lens.boolean
+import org.http4k.lens.int
+import org.http4k.lens.webForm
 import org.junit.Test
 
 abstract class ModuleRendererContract(private val renderer: ModuleRenderer) {

diff --git a/http4k-contract/src/test/kotlin/org/http4k/contract/ModuleTest.kt b/http4k-contract/src/test/kotlin/org/http4k/contract/ModuleTest.kt
@@ -2,14 +2,14 @@ package org.http4k.contract
 
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
-import org.http4k.http.core.Method.GET
-import org.http4k.http.core.Request
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.BAD_REQUEST
-import org.http4k.http.core.Status.Companion.NOT_FOUND
-import org.http4k.http.core.Status.Companion.OK
-import org.http4k.http.core.Uri.Companion.uri
-import org.http4k.http.lens.LensFailure
+import org.http4k.core.Method.GET
+import org.http4k.core.Request
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.BAD_REQUEST
+import org.http4k.core.Status.Companion.NOT_FOUND
+import org.http4k.core.Status.Companion.OK
+import org.http4k.core.Uri.Companion.uri
+import org.http4k.lens.LensFailure
 import org.junit.Test
 
 class ModuleTest {

diff --git a/http4k-contract/src/test/kotlin/org/http4k/contract/NoRendererTest.kt b/http4k-contract/src/test/kotlin/org/http4k/contract/NoRendererTest.kt
@@ -2,8 +2,8 @@ package org.http4k.contract
 
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status
+import org.http4k.core.Response
+import org.http4k.core.Status
 import org.junit.Test
 
 class NoRendererTest {

diff --git a/http4k-contract/src/test/kotlin/org/http4k/contract/RouteModuleTest.kt b/http4k-contract/src/test/kotlin/org/http4k/contract/RouteModuleTest.kt
@@ -2,17 +2,17 @@ package org.http4k.contract
 
 import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
+import org.http4k.core.Filter
+import org.http4k.core.Method.GET
+import org.http4k.core.Request.Companion.get
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.OK
+import org.http4k.core.Status.Companion.UNAUTHORIZED
+import org.http4k.core.with
 import org.http4k.format.Argo
-import org.http4k.http.core.Filter
-import org.http4k.http.core.Method.GET
-import org.http4k.http.core.Request.Companion.get
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.OK
-import org.http4k.http.core.Status.Companion.UNAUTHORIZED
-import org.http4k.http.core.with
-import org.http4k.http.lens.Header
-import org.http4k.http.lens.Path
-import org.http4k.http.lens.Query
+import org.http4k.lens.Header
+import org.http4k.lens.Path
+import org.http4k.lens.Query
 import org.junit.Test
 
 class RouteModuleTest {

diff --git a/http4k-contract/src/test/kotlin/org/http4k/contract/RouteTest.kt b/http4k-contract/src/test/kotlin/org/http4k/contract/RouteTest.kt
@@ -5,20 +5,20 @@ import com.natpryce.hamkrest.assertion.assertThat
 import com.natpryce.hamkrest.equalTo
 import com.natpryce.hamkrest.present
 import com.natpryce.hamkrest.throws
-import org.http4k.http.core.ContentType.Companion.TEXT_PLAIN
-import org.http4k.http.core.Method.GET
-import org.http4k.http.core.Request
-import org.http4k.http.core.Request.Companion.get
-import org.http4k.http.core.Request.Companion.post
-import org.http4k.http.core.Response
-import org.http4k.http.core.Status.Companion.OK
-import org.http4k.http.core.with
-import org.http4k.http.lens.Body
-import org.http4k.http.lens.Header
-import org.http4k.http.lens.LensFailure
-import org.http4k.http.lens.Path
-import org.http4k.http.lens.Query
-import org.http4k.http.lens.missing
+import org.http4k.core.ContentType.Companion.TEXT_PLAIN
+import org.http4k.core.Method.GET
+import org.http4k.core.Request
+import org.http4k.core.Request.Companion.get
+import org.http4k.core.Request.Companion.post
+import org.http4k.core.Response
+import org.http4k.core.Status.Companion.OK
+import org.http4k.core.with
+import org.http4k.lens.Body
+import org.http4k.lens.Header
+import org.http4k.lens.LensFailure
+import org.http4k.lens.Path
+import org.http4k.lens.Query
+import org.http4k.lens.missing
 import org.junit.Test
 
 class RouteTest {