Skip to content

Commit 7d45e1d

Browse files
bennespbennesp
authored
Merge pull request #177 from bennesp/update-to-ktor-v3
Update to ktor v3
2 parents ec71e36 + 61c16cd commit 7d45e1d

File tree

10 files changed

+26
-28
lines changed

10 files changed

+26
-28
lines changed

Diff for: ‎build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repositories {
1414

1515
dependencies {
1616
@Suppress("LocalVariableName")
17-
val ktor_version = "2.3.13"
17+
val ktor_version = "3.0.3"
1818

1919
@Suppress("LocalVariableName")
2020
val logback_version = "1.5.16"

Diff for: ‎src/main/kotlin/it/bennes/jsonSchemaGenerator/Application.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
package it.bennes.jsonSchemaGenerator
22

3-
import it.bennes.jsonSchemaGenerator.exceptions.HTTPException
43
import io.ktor.http.*
54
import io.ktor.server.application.*
65
import io.ktor.server.plugins.callid.*
7-
import io.ktor.server.plugins.callloging.*
6+
import io.ktor.server.plugins.calllogging.*
87
import io.ktor.server.plugins.compression.*
98
import io.ktor.server.plugins.statuspages.*
109
import io.ktor.server.response.*
1110
import io.ktor.server.routing.*
11+
import it.bennes.jsonSchemaGenerator.exceptions.HTTPException
1212

1313
fun Application.module() {
1414
val log = environment.log

Diff for: ‎src/main/kotlin/it/bennes/jsonSchemaGenerator/Routes.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
package it.bennes.jsonSchemaGenerator
22

3-
import it.bennes.jsonSchemaGenerator.encoding.Encoding
4-
import it.bennes.jsonSchemaGenerator.exceptions.BadRequestException
5-
import it.bennes.jsonSchemaGenerator.formats.Format
63
import io.ktor.client.statement.*
7-
import io.ktor.server.application.*
84
import io.ktor.server.response.*
95
import io.ktor.server.routing.*
6+
import it.bennes.jsonSchemaGenerator.encoding.Encoding
7+
import it.bennes.jsonSchemaGenerator.exceptions.BadRequestException
8+
import it.bennes.jsonSchemaGenerator.formats.Format
109
import it.bennes.jsonSchemaGenerator.model.JsonSchemaInferrer
1110
import it.bennes.jsonSchemaGenerator.model.Request
1211

Diff for: ‎src/main/kotlin/it/bennes/jsonSchemaGenerator/model/Request.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package it.bennes.jsonSchemaGenerator.model
22

3+
import io.ktor.http.*
34
import it.bennes.jsonSchemaGenerator.encoding.Encoding
45
import it.bennes.jsonSchemaGenerator.exceptions.BadRequestException
56
import it.bennes.jsonSchemaGenerator.formats.Format
6-
import io.ktor.http.*
77
import org.apache.commons.validator.routines.UrlValidator
88
import java.net.InetAddress
99
import java.net.URI

Diff for: ‎src/main/resources/logback.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<configuration>
2-
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />
3-
<!--
4-
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5-
<encoder>
6-
<pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %X{call-id} %-5level %logger{36} - %msg%n</pattern>
7-
</encoder>
8-
</appender>
9-
-->
2+
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
3+
<!--
4+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
5+
<encoder>
6+
<pattern>%d{YYYY-MM-dd HH:mm:ss.SSS} [%thread] %X{call-id} %-5level %logger{36} - %msg%n</pattern>
7+
</encoder>
8+
</appender>
9+
-->
1010
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
1111
<layout class="ch.qos.logback.contrib.json.classic.JsonLayout">
1212
<appendLineSeparator>true</appendLineSeparator>
13-
<jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter" />
13+
<jsonFormatter class="ch.qos.logback.contrib.jackson.JacksonJsonFormatter"/>
1414
<timestampFormat>yyyy-MM-dd' 'HH:mm:ss.SSS</timestampFormat>
1515
</layout>
1616
</appender>

Diff for: ‎src/test/kotlin/it/bennes/jsonSchemaGenerator/SchemaServiceTest.kt

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class SchemaServiceTest {
3232
fun `valid simple generate`() {
3333
val schemaService = SchemaService(JsonSchemaInferrer(), Format.Json, Format.Json)
3434
val input = """{"a":1}"""
35-
val expected = """{"${"$"}schema":"http://json-schema.org/draft-04/schema#","type":"object","properties":{"a":{"type":"integer"}}}"""
35+
val expected =
36+
"""{"${"$"}schema":"http://json-schema.org/draft-04/schema#","type":"object","properties":{"a":{"type":"integer"}}}"""
3637
val actual = schemaService.generate(schemaService.parse(input))
3738

3839
assertEquals(expected, actual.toString())

Diff for: ‎src/test/kotlin/it/bennes/jsonSchemaGenerator/encoding/EncodingTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package it.bennes.jsonSchemaGenerator.encoding
22

3+
import kotlin.test.Test
34
import kotlin.test.assertEquals
45
import kotlin.test.assertFailsWith
5-
import kotlin.test.Test
66

77
class EncodingTest {
88

Diff for: ‎src/test/kotlin/it/bennes/jsonSchemaGenerator/encoding/HexDecoderTest.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package it.bennes.jsonSchemaGenerator.encoding
22

33

4-
import java.lang.IllegalArgumentException
5-
import kotlin.test.assertEquals
64
import kotlin.test.Test
5+
import kotlin.test.assertEquals
76
import kotlin.test.assertFailsWith
87

98
class HexDecoderTest {

Diff for: ‎src/test/kotlin/it/bennes/jsonSchemaGenerator/exceptions/BadRequestExceptionTest.kt

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import kotlin.test.assertEquals
66

77
class BadRequestExceptionTest {
88

9-
@Test
10-
fun `test constructor`() {
11-
val exception = BadRequestException("message")
12-
assertEquals("message", exception.message)
13-
assertEquals(HttpStatusCode.BadRequest, exception.statusCode)
14-
}
9+
@Test
10+
fun `test constructor`() {
11+
val exception = BadRequestException("message")
12+
assertEquals("message", exception.message)
13+
assertEquals(HttpStatusCode.BadRequest, exception.statusCode)
14+
}
1515
}

Diff for: ‎src/test/kotlin/it/bennes/jsonSchemaGenerator/formats/FormatTest.kt

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package it.bennes.jsonSchemaGenerator.formats
22

3-
import java.lang.IllegalArgumentException
43
import kotlin.test.Test
54
import kotlin.test.assertFailsWith
65

0 commit comments

Comments
 (0)