Sineaggi commented on code in PR #3614:
URL: https://github.com/apache/avro/pull/3614#discussion_r2665766475
##########
lang/java/gradle-plugin/src/main/kotlin/eu/eventloopsoftware/avro/gradle/plugin/GradlePlugin.kt:
##########
@@ -0,0 +1,87 @@
+package eu.eventloopsoftware.avro.gradle.plugin
+
+import eu.eventloopsoftware.avro.gradle.plugin.extension.GradlePluginExtension
+import eu.eventloopsoftware.avro.gradle.plugin.tasks.CompileSchemaTask
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.internal.cc.base.logger
+import kotlin.collections.toSet
+
+abstract class GradlePlugin : Plugin<Project> {
+ override fun apply(project: Project) {
+ logger.info("Running Avro Gradle plugin for project: ${project.name}")
+
+ val extension: GradlePluginExtension =
project.extensions.create("avro", GradlePluginExtension::class.java)
+
+ // Needed for Android support
+ project.pluginManager.apply("java")
+
+ project.tasks.register("avroGenerateJavaClasses",
CompileSchemaTask::class.java) { compileSchemaTask ->
+ val sourceDirectory = extension.sourceDirectory.get()
+ val outputDirectory = extension.outputDirectory.get()
+ runPlugin(compileSchemaTask, extension, project, sourceDirectory,
outputDirectory)
+ }
+
+ project.tasks.register("avroGenerateTestJavaClasses",
CompileSchemaTask::class.java) { compileSchemaTask ->
+ val sourceDirectory = extension.testSourceDirectory.get()
+ val outputDirectory = extension.testOutputDirectory.get()
+ runPlugin(compileSchemaTask, extension, project, sourceDirectory,
outputDirectory)
+ }
+ }
+
+ private fun runPlugin(
+ compileTask: CompileSchemaTask,
+ extension: GradlePluginExtension,
+ project: Project,
+ sourceDirectory: String,
+ outputDirectory: String
+ ) {
+ val schemaType: SchemaType =
SchemaType.valueOf(extension.schemaType.get())
+
+ when (schemaType) {
+ SchemaType.schema -> {
+ compileTask.source(project.fileTree(sourceDirectory))
+ compileTask.sourceDirectory.set(sourceDirectory)
+ compileTask.outputDirectory.set(outputDirectory)
+ compileTask.fieldVisibility.set(extension.fieldVisibility)
+ compileTask.setExcludes(extension.excludes.get().toSet())
+ compileTask.setIncludes(setOf("**/*.avsc"))
+ compileTask.testExcludes.set(extension.testExcludes)
+ compileTask.stringType.set(extension.stringType)
+
compileTask.velocityToolsClassesNames.set(extension.velocityToolsClassesNames.get())
+ compileTask.templateDirectory.set(extension.templateDirectory)
+
compileTask.recordSpecificClass.set(extension.recordSpecificClass)
+
compileTask.errorSpecificClass.set(extension.errorSpecificClass)
+
compileTask.createOptionalGetters.set(extension.createOptionalGetters)
+
compileTask.gettersReturnOptional.set(extension.gettersReturnOptional)
+ compileTask.createSetters.set(extension.createSetters)
+
compileTask.createNullSafeAnnotations.set(extension.createNullSafeAnnotations)
+
compileTask.nullSafeAnnotationNullable.set(extension.nullSafeAnnotationNullable)
+
compileTask.nullSafeAnnotationNotNull.set(extension.nullSafeAnnotationNotNull)
+
compileTask.optionalGettersForNullableFieldsOnly.set(extension.optionalGettersForNullableFieldsOnly)
+ compileTask.customConversions.set(extension.customConversions)
+
compileTask.customLogicalTypeFactories.set(extension.customLogicalTypeFactories)
+
compileTask.enableDecimalLogicalType.set(extension.enableDecimalLogicalType)
+
+ addGeneratedSourcesToProject(project,
compileTask.outputDirectory.get())
+ }
+
+ SchemaType.protocol -> TODO()
+ }
+ }
+
+ private fun addGeneratedSourcesToProject(project: Project,
outputDirectory: String) {
+ val sourceSets =
project.extensions.getByType(JavaPluginExtension::class.java).sourceSets
+ val generatedSourcesDir =
project.layout.buildDirectory.dir(outputDirectory)
+ project.logger.debug("Generated sources directory:
${generatedSourcesDir.get()}")
+
+ // Add directory that contains the generated Java files to source set
+ sourceSets.getByName("main").java.srcDir(generatedSourcesDir)
Review Comment:
Something like
```kotlin
addGeneratedSourcesToProject(project, compileTask)
private fun addGeneratedSourcesToProject(project: Project, compileTask:
CompileTask) {
val sourceSets =
project.extensions.getByType(JavaPluginExtension::class.java).sourceSets
sourceSets.getByName("main").java.srcDir(compileTask.outputDirectory)
}
```
or move the `addGeneratedSourcesToProject` outside of the task
configuration, then it'd be something like
```kotlin
addGeneratedSourcesToProject(project, compileTask)
private fun addGeneratedSourcesToProject(project: Project, compileTask:
TaskProvider<CompileTask>) {
val sourceSets =
project.extensions.getByType(JavaPluginExtension::class.java).sourceSets
sourceSets.getByName("main").java.srcDir(compileTask.flatMap {
it.outputDirectory })
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
