Skip to content

Commit a2281b0

Browse files
committed
code review
1 parent 28d989a commit a2281b0

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "org.springdoc"
12-
version = "1.6.1-SNAPSHOT"
12+
version = "1.7.0"
1313

1414
sonarqube {
1515
properties {
@@ -46,7 +46,7 @@ publishing {
4646

4747
dependencies {
4848
implementation(kotlin("reflect"))
49-
implementation("com.google.code.gson:gson:2.8.6")
49+
implementation("com.google.code.gson:gson:2.8.9")
5050
implementation("org.awaitility:awaitility-kotlin:4.0.3")
5151
implementation("com.github.psxpaul:gradle-execfork-plugin:0.2.0")
5252
implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.6")
@@ -55,7 +55,7 @@ dependencies {
5555
testImplementation(platform("org.junit:junit-bom:5.7.1"))
5656
testImplementation("org.junit.jupiter:junit-jupiter")
5757
testImplementation("com.beust:klaxon:5.5")
58-
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.13.2")
58+
testImplementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.15.2")
5959
testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2")
6060

6161
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0")

src/main/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGeneratorTask.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import java.net.HttpURLConnection
1919
import java.net.URL
2020
import java.time.Duration
2121
import java.time.temporal.ChronoUnit.SECONDS
22+
import java.util.*
2223

2324
private const val MAX_HTTP_STATUS_CODE = 299
2425

@@ -65,7 +66,7 @@ open class OpenApiGeneratorTask : DefaultTask() {
6566

6667
private fun generateApiDocs(url: String, fileName: String) {
6768
try {
68-
val isYaml = url.toLowerCase().matches(Regex(".+[./]yaml(/.+)*"))
69+
val isYaml = url.lowercase(Locale.getDefault()).matches(Regex(".+[./]yaml(/.+)*"))
6970
await ignoreException ConnectException::class withPollInterval Durations.ONE_SECOND atMost Duration.of(
7071
waitTimeInSeconds.get().toLong(),
7172
SECONDS

src/main/kotlin/org/springdoc/openapi/gradle/plugin/OpenApiGradlePlugin.kt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ open class OpenApiGradlePlugin : Plugin<Project> {
2121
tasks.register(FORKED_SPRING_BOOT_RUN_TASK_NAME, JavaExecFork::class.java)
2222
tasks.register(OPEN_API_TASK_NAME, OpenApiGeneratorTask::class.java)
2323

24-
generate(this)
24+
generate(this)
2525
}
2626
}
2727

@@ -31,7 +31,6 @@ open class OpenApiGradlePlugin : Plugin<Project> {
3131
// The task, used to run the Spring Boot application (`bootRun`)
3232
val bootRunTask = tasks.named(SPRING_BOOT_RUN_TASK_NAME)
3333
// The task, used to resolve the application's main class (`bootRunMainClassName`)
34-
3534
val bootRunMainClassNameTask =
3635
try {
3736
val task=tasks.named(SPRING_BOOT_RUN_MAIN_CLASS_NAME_TASK_NAME)
@@ -46,8 +45,7 @@ open class OpenApiGradlePlugin : Plugin<Project> {
4645
val extension = extensions.findByName(EXTENSION_NAME) as OpenApiExtension
4746
val customBootRun = extension.customBootRun
4847
// Create a forked version spring boot run task
49-
50-
val forkedSpringBoot = tasks.register(FORKED_SPRING_BOOT_RUN_TASK_NAME, JavaExecFork::class.java) { fork ->
48+
val forkedSpringBoot = tasks.named(FORKED_SPRING_BOOT_RUN_TASK_NAME, JavaExecFork::class.java) { fork ->
5149
fork.dependsOn(tasks.named(bootRunMainClassNameTask.name))
5250
fork.onlyIf { needToFork(bootRunTask, customBootRun, fork) }
5351
}
@@ -65,9 +63,8 @@ open class OpenApiGradlePlugin : Plugin<Project> {
6563
val tasksNames = tasks.names
6664
val boot2TaskName = "bootRunMainClassName"
6765
val boot3TaskName = "resolveMainClassName"
68-
if (!tasksNames.contains(boot2TaskName) && tasksNames.contains(boot3TaskName)) {
66+
if (!tasksNames.contains(boot2TaskName) && tasksNames.contains(boot3TaskName))
6967
tasks.register(boot2TaskName) { it.dependsOn(tasks.named(boot3TaskName)) }
70-
}
7168
}
7269

7370
private fun needToFork(

0 commit comments

Comments
 (0)