From 277490b903df6276c3aa4593094bf8de6f48d7b2 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 31 Jan 2017 19:19:06 +0300 Subject: [PATCH] AllOpen, NoArg: Use presets in Maven plugins --- .../src/main/kotlin/AllOpenMavenPluginExtensions.kt | 13 +++---------- .../src/main/kotlin/NoArgMavenPluginExtensions.kt | 5 ++--- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/libraries/tools/kotlin-maven-allopen/src/main/kotlin/AllOpenMavenPluginExtensions.kt b/libraries/tools/kotlin-maven-allopen/src/main/kotlin/AllOpenMavenPluginExtensions.kt index 15b3c451cd3..a690f8fcee4 100644 --- a/libraries/tools/kotlin-maven-allopen/src/main/kotlin/AllOpenMavenPluginExtensions.kt +++ b/libraries/tools/kotlin-maven-allopen/src/main/kotlin/AllOpenMavenPluginExtensions.kt @@ -42,14 +42,7 @@ class KotlinAllOpenMavenPluginExtension : KotlinMavenPluginExtension { @Component(role = KotlinMavenPluginExtension::class, hint = "spring") class KotlinSpringMavenPluginExtension : KotlinMavenPluginExtension { private companion object { - val ANNOTATIONS_ARG_NAME = "annotation" - - val SPRING_ANNOTATIONS = listOf( - "org.springframework.stereotype.Component", - "org.springframework.transaction.annotation.Transactional", - "org.springframework.scheduling.annotation.Async", - "org.springframework.cache.annotation.Cacheable" - ) + val PRESET_ARG_NAME = "preset" } override fun getCompilerPluginId() = ALLOPEN_COMPILER_PLUGIN_ID @@ -61,6 +54,6 @@ class KotlinSpringMavenPluginExtension : KotlinMavenPluginExtension { override fun getPluginOptions(project: MavenProject, execution: MojoExecution): List { logger.debug("Loaded Maven plugin " + javaClass.name) - return SPRING_ANNOTATIONS.map { PluginOption(ALLOPEN_COMPILER_PLUGIN_ID, ANNOTATIONS_ARG_NAME, it) } + return listOf(PluginOption("spring", ALLOPEN_COMPILER_PLUGIN_ID, PRESET_ARG_NAME, "spring")) } -} +} \ No newline at end of file diff --git a/libraries/tools/kotlin-maven-noarg/src/main/kotlin/NoArgMavenPluginExtensions.kt b/libraries/tools/kotlin-maven-noarg/src/main/kotlin/NoArgMavenPluginExtensions.kt index c9e108dffbc..e5d4e7f8fe4 100644 --- a/libraries/tools/kotlin-maven-noarg/src/main/kotlin/NoArgMavenPluginExtensions.kt +++ b/libraries/tools/kotlin-maven-noarg/src/main/kotlin/NoArgMavenPluginExtensions.kt @@ -42,8 +42,7 @@ class KotlinNoArgMavenPluginExtension : KotlinMavenPluginExtension { @Component(role = KotlinMavenPluginExtension::class, hint = "jpa") class KotlinJpaMavenPluginExtension : KotlinMavenPluginExtension { private companion object { - val ANNOTATIONS_ARG_NAME = "annotation" - val JPA_ANNOTATIONS = listOf("javax.persistence.Entity") + val PRESET_ARG_NAME = "preset" } override fun getCompilerPluginId() = NOARG_COMPILER_PLUGIN_ID @@ -55,6 +54,6 @@ class KotlinJpaMavenPluginExtension : KotlinMavenPluginExtension { override fun getPluginOptions(project: MavenProject, execution: MojoExecution): List { logger.debug("Loaded Maven plugin " + javaClass.name) - return JPA_ANNOTATIONS.map { PluginOption(NOARG_COMPILER_PLUGIN_ID, ANNOTATIONS_ARG_NAME, it) } + return listOf(PluginOption("jpa", NOARG_COMPILER_PLUGIN_ID, PRESET_ARG_NAME, "jpa")) } }