Rename content to type

DaikonWeb · Dec 4, 2019 · 5abff3e · 5abff3e
1 parent 26dda2b
commit 5abff3e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ repositories {
 ```
 - Add the dependency
 ```
-implementation 'com.github.DaikonWeb:daikon:0.5.2'
+implementation 'com.github.DaikonWeb:daikon:0.6.0'
 ```
 
 ### Maven
@@ -40,7 +40,7 @@ implementation 'com.github.DaikonWeb:daikon:0.5.2'
 <dependency>
     <groupId>com.github.DaikonWeb</groupId>
     <artifactId>daikon</artifactId>
-    <version>0.5.2</version>
+    <version>0.6.0</version>
 </dependency>
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'com.github.fracassi-marco'
-version '0.5.2'
+version '0.6.0'
 
 repositories {
     mavenCentral()

diff --git a/src/main/kotlin/daikon/DefaultRouteAction.kt b/src/main/kotlin/daikon/DefaultRouteAction.kt
@@ -8,7 +8,7 @@ class DefaultRouteAction : RouteAction {
     override fun handle(request: Request, response: Response) {
         if (request.method() == GET && request.path() == "/") {
             response.status(OK_200)
-            response.content("text/html")
+            response.type("text/html")
             response.write(html())
         } else {
             response.status(NOT_FOUND_404)

diff --git a/src/main/kotlin/daikon/HttpResponse.kt b/src/main/kotlin/daikon/HttpResponse.kt
@@ -19,8 +19,8 @@ class HttpResponse(private val response: HttpServletResponse) : Response {
         header("Location", path)
     }
 
-    override fun content(type: String) {
-       response.contentType = type
+    override fun type(contentType: String) {
+       response.contentType = contentType
     }
 
     override fun status(code: Int) {

diff --git a/src/main/kotlin/daikon/Response.kt b/src/main/kotlin/daikon/Response.kt
@@ -5,7 +5,7 @@ import org.eclipse.jetty.http.HttpStatus.MOVED_TEMPORARILY_302
 interface Response {
     fun write(text: String)
     fun status(code: Int)
-    fun content(type: String)
+    fun type(contentType: String)
     fun header(name: String, value: String)
     fun body(): String
     fun redirect(path: String, status: Int = MOVED_TEMPORARILY_302)

diff --git a/src/test/kotlin/daikon/DefaultRouteActionTest.kt b/src/test/kotlin/daikon/DefaultRouteActionTest.kt
@@ -29,7 +29,7 @@ class DefaultRouteActionTest {
         DefaultRouteAction().handle(request, response)
 
         verify(response).status(OK_200)
-        verify(response).content("text/html")
+        verify(response).type("text/html")
         verify(response).write(contains("You are eating a Daikon!!"))
     }
 }
diff --git a/src/test/kotlin/daikon/ResponseTest.kt b/src/test/kotlin/daikon/ResponseTest.kt
@@ -1,7 +1,6 @@
 package daikon
 
 import daikon.Localhost.get
-import daikon.Localhost.post
 import org.assertj.core.api.Assertions.assertThat
 import org.eclipse.jetty.http.HttpStatus.CREATED_201
 import org.eclipse.jetty.http.HttpStatus.MOVED_PERMANENTLY_301
@@ -21,7 +20,7 @@ class ResponseTest {
     @Test
     fun `content type`() {
         HttpServer()
-            .any("/") { _, res -> res.content("application/json") }
+            .any("/") { _, res -> res.type("application/json") }
             .start().use {
                 assertThat(get("/").headers["Content-Type"]).isEqualTo("application/json")
             }