Skip to content

Commit 053ab07

Browse files
authored
Merge pull request #596 from jsonschema2dataclass/plugin-spotless
Apply KtLint spotless to the plugin
2 parents e9491d8 + 020475b commit 053ab07

File tree

5 files changed

+11
-17
lines changed

5 files changed

+11
-17
lines changed

plugin/src/main/kotlin/org/jsonschema2dataclass/Js2dPlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import org.gradle.api.Task
77
import org.gradle.api.artifacts.Configuration
88
import org.gradle.api.file.DirectoryProperty
99
import org.gradle.api.file.FileCollection
10-
import org.gradle.api.plugins.JavaPlugin
1110
import org.gradle.api.tasks.TaskProvider
1211
import org.gradle.kotlin.dsl.apply
1312
import org.gradle.util.GradleVersion

plugin/src/main/kotlin/org/jsonschema2dataclass/js2p/Js2pConfig.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ private fun <E : Enum<E>?> fromEnum(value: String?, enumClass: Class<E>): E? {
317317
}
318318
}
319319

320-
321320
private inline fun <reified V : Enum<V>?> maybeDefaultEnum(
322321
value: String?,
323322
vFunction: Function<DefaultGenerationConfig, V>,

plugin/src/main/kotlin/org/jsonschema2dataclass/js2p/Js2pConfiguration.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.jsonschema2dataclass.js2p
22

3-
import groovy.lang.Closure
43
import org.gradle.api.Action
54
import org.gradle.api.Named
65
import org.gradle.api.file.ConfigurableFileCollection
@@ -292,7 +291,6 @@ abstract class Js2pConfiguration @Inject constructor(
292291
@get:Optional
293292
abstract val klass: PluginConfigJs2pClass
294293

295-
296294
@get:Nested
297295
@get:Optional
298296
abstract val methods: PluginConfigJs2pMethod
@@ -313,11 +311,10 @@ abstract class Js2pConfiguration @Inject constructor(
313311
action(methods)
314312
}
315313

316-
fun fields(action: Action<PluginConfigJs2pField>) {
314+
fun fields(action: Action<PluginConfigJs2pField>) {
317315
action(fields)
318316
}
319-
fun dateTime(action: Action<PluginConfigJs2pDateTime>) {
317+
fun dateTime(action: Action<PluginConfigJs2pDateTime>) {
320318
action(dateTime)
321319
}
322-
323320
}

plugin/src/main/kotlin/org/jsonschema2dataclass/js2p/Js2pGenerationTask.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ internal abstract class Js2pGenerationTask @Inject constructor(
3333

3434
@get:Classpath
3535
val js2dConfigurationPlugins: NamedDomainObjectProvider<Configuration> = project.configurations.named(
36-
JS2D_PLUGINS_CONFIGURATION_NAME
36+
JS2D_PLUGINS_CONFIGURATION_NAME,
3737
)
3838

3939
@TaskAction
@@ -42,7 +42,7 @@ internal abstract class Js2pGenerationTask @Inject constructor(
4242
throw GradleException("Invalid task setup")
4343
}
4444

45-
val workerClassPath = js2dConfiguration.get() + js2dConfigurationPlugins
45+
val workerClassPath = js2dConfiguration.get() + js2dConfigurationPlugins
4646
val workQueue = workerExecutor.processIsolation {
4747
// Set encoding (work-around for https://github.com/gradle/gradle/issues/13843)
4848
forkOptions.environment("LANG", System.getenv("LANG") ?: "C.UTF-8")
@@ -54,6 +54,5 @@ internal abstract class Js2pGenerationTask @Inject constructor(
5454
workQueue.submit(Js2pWorker::class.java) {
5555
config = js2pConfig
5656
}
57-
5857
}
5958
}

plugin/src/main/kotlin/org/jsonschema2dataclass/js2p/Js2pWorkerConfig.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ internal class Js2pWorkerConfig(
1414
internal val methods: Js2pWorkerConfigMethod,
1515
internal val fields: Js2pWorkerConfigFields,
1616
internal val dateTime: Js2pWorkerConfigDateTime,
17-
) : Serializable{
17+
) : Serializable {
1818
companion object {
1919
fun fromConfig(
2020
targetDirectory: DirectoryProperty,
@@ -42,7 +42,7 @@ internal class Js2pWorkerConfigIO(
4242
val sourceSortOrder: String?,
4343
val sourceType: String?,
4444
val targetJavaVersion: String?,
45-
): Serializable
45+
) : Serializable
4646

4747
internal class Js2pWorkerConfigClass(
4848
val androidParcelable: Boolean?,
@@ -57,14 +57,14 @@ internal class Js2pWorkerConfigClass(
5757
val nameSuffix: String?,
5858
val nameUseTitle: Boolean?,
5959
val targetPackage: String?,
60-
): Serializable
60+
) : Serializable
6161

6262
internal class Js2pWorkerConfigConstructor(
6363
val allProperties: Boolean?,
6464
val annotateConstructorProperties: Boolean?,
6565
val copyConstructor: Boolean?,
6666
val requiredProperties: Boolean?,
67-
): Serializable
67+
) : Serializable
6868

6969
internal class Js2pWorkerConfigMethod(
7070
val additionalProperties: Boolean?,
@@ -82,7 +82,7 @@ internal class Js2pWorkerConfigMethod(
8282
val settersDynamic: Boolean?,
8383
val toStringExcludes: Set<String>?,
8484
val toStringMethod: Boolean?,
85-
): Serializable
85+
) : Serializable
8686

8787
internal class Js2pWorkerConfigFields(
8888
val floatUseBigDecimal: Boolean?,
@@ -92,7 +92,7 @@ internal class Js2pWorkerConfigFields(
9292
val integerUseBigInteger: Boolean?,
9393
val integerUseLong: Boolean?,
9494
val usePrimitives: Boolean?,
95-
): Serializable
95+
) : Serializable
9696

9797
internal class Js2pWorkerConfigDateTime(
9898
val dateFormat: Boolean?,
@@ -107,7 +107,7 @@ internal class Js2pWorkerConfigDateTime(
107107
val timeFormat: Boolean?,
108108
val timePattern: String?,
109109
val timeType: String?,
110-
): Serializable
110+
) : Serializable
111111

112112
private fun workerConvert(io: PluginConfigJs2pIO): Js2pWorkerConfigIO =
113113
Js2pWorkerConfigIO(

0 commit comments

Comments
 (0)