refactor(bulk-model-sync-gradle): simplify property declarations

Author: mhuster23

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ExportFromModelServer.kt

@@ -20,7 +20,6 @@ import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
 import org.gradle.api.tasks.Input
@@ -36,32 +35,31 @@ import org.modelix.model.client2.ModelClientV2PlatformSpecificBuilder
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.sync.bulk.ModelExporter
 import org.modelix.model.sync.bulk.isModuleIncluded
-import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
-abstract class ExportFromModelServer @Inject constructor(of: ObjectFactory) : DefaultTask() {
+abstract class ExportFromModelServer : DefaultTask() {
 
-    @Input
-    val url: Property<String> = of.property(String::class.java)
+    @get:Input
+    abstract val url: Property<String>
 
-    @Input
-    @Optional
-    val repositoryId: Property<String> = of.property(String::class.java)
+    @get:Input
+    @get:Optional
+    abstract val repositoryId: Property<String>
 
     @get:InputFile
-    val revisionFile: RegularFileProperty = of.fileProperty()
+    abstract val revisionFile: RegularFileProperty
 
-    @OutputDirectory
-    val outputDir: DirectoryProperty = of.directoryProperty()
+    @get:OutputDirectory
+    abstract val outputDir: DirectoryProperty
 
-    @Input
-    val includedModules: SetProperty<String> = of.setProperty(String::class.java)
+    @get:Input
+    abstract val includedModules: SetProperty<String>
 
-    @Input
-    val includedModulePrefixes: SetProperty<String> = of.setProperty(String::class.java)
+    @get:Input
+    abstract val includedModulePrefixes: SetProperty<String>
 
-    @Input
-    val requestTimeoutSeconds: Property<Int> = of.property(Int::class.java)
+    @get:Input
+    abstract val requestTimeoutSeconds: Property<Int>
 
     @TaskAction
     fun export() = runBlocking {

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ImportIntoModelServer.kt

@@ -19,7 +19,6 @@ package org.modelix.model.sync.bulk.gradle.tasks
 import kotlinx.coroutines.runBlocking
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.DirectoryProperty
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.MapProperty
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.SetProperty
@@ -39,38 +38,37 @@ import org.modelix.model.operations.OTBranch
 import org.modelix.model.sync.bulk.ModelImporter
 import org.modelix.model.sync.bulk.importFilesAsRootChildren
 import org.modelix.model.sync.bulk.isModuleIncluded
-import javax.inject.Inject
 import kotlin.time.Duration.Companion.seconds
 
-abstract class ImportIntoModelServer @Inject constructor(of: ObjectFactory) : DefaultTask() {
+abstract class ImportIntoModelServer : DefaultTask() {
 
-    @InputDirectory
-    @PathSensitive(PathSensitivity.RELATIVE)
-    val inputDir: DirectoryProperty = of.directoryProperty()
+    @get:InputDirectory
+    @get:PathSensitive(PathSensitivity.RELATIVE)
+    abstract val inputDir: DirectoryProperty
 
-    @Input
-    val repositoryId: Property<String> = of.property(String::class.java)
+    @get:Input
+    abstract val repositoryId: Property<String>
 
-    @Input
-    val branchName: Property<String> = of.property(String::class.java)
+    @get:Input
+    abstract val branchName: Property<String>
 
-    @Input
-    val url: Property<String> = of.property(String::class.java)
+    @get:Input
+    abstract val url: Property<String>
 
-    @Input
-    val includedModules: SetProperty<String> = of.setProperty(String::class.java)
+    @get:Input
+    abstract val includedModules: SetProperty<String>
 
-    @Input
-    val includedModulePrefixes: SetProperty<String> = of.setProperty(String::class.java)
+    @get:Input
+    abstract val includedModulePrefixes: SetProperty<String>
 
-    @Input
-    val continueOnError: Property<Boolean> = of.property(Boolean::class.java)
+    @get:Input
+    abstract val continueOnError: Property<Boolean>
 
-    @Input
-    val requestTimeoutSeconds: Property<Int> = of.property(Int::class.java)
+    @get:Input
+    abstract val requestTimeoutSeconds: Property<Int>
 
-    @Input
-    val metaProperties: MapProperty<String, String> = of.mapProperty(String::class.java, String::class.java)
+    @get:Input
+    abstract val metaProperties: MapProperty<String, String>
 
     @TaskAction
     fun import() = runBlocking {

bulk-model-sync-gradle/src/main/kotlin/org/modelix/model/sync/bulk/gradle/tasks/ValidateSyncSettings.kt

@@ -17,7 +17,6 @@
 package org.modelix.model.sync.bulk.gradle.tasks
 
 import org.gradle.api.DefaultTask
-import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Input
@@ -28,18 +27,17 @@ import org.modelix.model.sync.bulk.gradle.config.ModelSyncGradleSettings
 import org.modelix.model.sync.bulk.gradle.config.ServerSource
 import org.modelix.model.sync.bulk.gradle.config.ServerTarget
 import org.modelix.model.sync.bulk.gradle.config.SyncDirection
-import javax.inject.Inject
 
 /**
  * Instead of throwing exceptions for single configuration errors,
  * this task collects all configuration errors and puts them into a single exception,
  * so the user can see all steps that must be taken at a glance.
  */
 @CacheableTask
-abstract class ValidateSyncSettings @Inject constructor(of: ObjectFactory) : DefaultTask() {
+abstract class ValidateSyncSettings : DefaultTask() {
 
-    @Input
-    val settings: Property<ModelSyncGradleSettings> = of.property(ModelSyncGradleSettings::class.java)
+    @get:Input
+    abstract val settings: Property<ModelSyncGradleSettings>
 
     private val errorMsgBuilder = StringBuilder()