azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AllOpen, NoArg: Use presets in Maven plugins

Browse Source
This commit is contained in:
Yan Zhulanow
2017-01-31 19:19:06 +03:00
parent 52ecd05301
commit 277490b903
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-maven-allopen/src/main/kotlin/AllOpenMavenPluginExtensions.kt
+2 -9
View File
@@ -42,14 +42,7 @@ class KotlinAllOpenMavenPluginExtension : KotlinMavenPluginExtension {
@Component(role = KotlinMavenPluginExtension::class, hint = "spring") @Component(role = KotlinMavenPluginExtension::class, hint = "spring")
class KotlinSpringMavenPluginExtension : KotlinMavenPluginExtension { class KotlinSpringMavenPluginExtension : KotlinMavenPluginExtension {
private companion object { private companion object {
val ANNOTATIONS_ARG_NAME = "annotation" val PRESET_ARG_NAME = "preset"
val SPRING_ANNOTATIONS = listOf(
"org.springframework.stereotype.Component",
"org.springframework.transaction.annotation.Transactional",
"org.springframework.scheduling.annotation.Async",
"org.springframework.cache.annotation.Cacheable"
)
} }
override fun getCompilerPluginId() = ALLOPEN_COMPILER_PLUGIN_ID override fun getCompilerPluginId() = ALLOPEN_COMPILER_PLUGIN_ID
@@ -61,6 +54,6 @@ class KotlinSpringMavenPluginExtension : KotlinMavenPluginExtension {
override fun getPluginOptions(project: MavenProject, execution: MojoExecution): List<PluginOption> { override fun getPluginOptions(project: MavenProject, execution: MojoExecution): List<PluginOption> {
logger.debug("Loaded Maven plugin " + javaClass.name) 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"))
} }
} }
libraries/tools/kotlin-maven-noarg/src/main/kotlin/NoArgMavenPluginExtensions.kt
+2 -3
View File
@@ -42,8 +42,7 @@ class KotlinNoArgMavenPluginExtension : KotlinMavenPluginExtension {
@Component(role = KotlinMavenPluginExtension::class, hint = "jpa") @Component(role = KotlinMavenPluginExtension::class, hint = "jpa")
class KotlinJpaMavenPluginExtension : KotlinMavenPluginExtension { class KotlinJpaMavenPluginExtension : KotlinMavenPluginExtension {
private companion object { private companion object {
val ANNOTATIONS_ARG_NAME = "annotation" val PRESET_ARG_NAME = "preset"
val JPA_ANNOTATIONS = listOf("javax.persistence.Entity")
} }
override fun getCompilerPluginId() = NOARG_COMPILER_PLUGIN_ID override fun getCompilerPluginId() = NOARG_COMPILER_PLUGIN_ID
@@ -55,6 +54,6 @@ class KotlinJpaMavenPluginExtension : KotlinMavenPluginExtension {
override fun getPluginOptions(project: MavenProject, execution: MojoExecution): List<PluginOption> { override fun getPluginOptions(project: MavenProject, execution: MojoExecution): List<PluginOption> {
logger.debug("Loaded Maven plugin " + javaClass.name) 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"))
} }
} }