From 3ea0066fa8741d4865eaab38479731bab95958c6 Mon Sep 17 00:00:00 2001
From: jnizet <jb@ninja-squad.com>
Date: Sun, 3 Mar 2019 09:43:15 +0100
Subject: [PATCH] Avoid applying Kotlin JPA plugin

Applying plugins imperatively is discouraged, and since the plugin is
added to the plugins block anyway, it is applied already.

See gh-853
---
 .../spring/code/kotlin/KotlinJpaGradleBuildCustomizer.java     | 1 -
 .../code/kotlin/KotlinJpaGradleBuildCustomizerTests.java       | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizer.java
index 0d269c0a..9b27d69a 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizer.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizer.java
@@ -45,7 +45,6 @@ public class KotlinJpaGradleBuildCustomizer implements BuildCustomizer<GradleBui
 		if (this.buildMetadataResolver.hasFacet(build, "jpa")) {
 			build.addPlugin("org.jetbrains.kotlin.plugin.jpa",
 					this.settings.getVersion());
-			build.applyPlugin("kotlin-jpa");
 		}
 	}
 
diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java
index d361bf4c..0f9fff9f 100644
--- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java
+++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaGradleBuildCustomizerTests.java
@@ -39,7 +39,7 @@ class KotlinJpaGradleBuildCustomizerTests {
 		Dependency dependency = Dependency.withId("foo");
 		dependency.setFacets(Collections.singletonList("jpa"));
 		GradleBuild build = getCustomizedBuild(dependency);
-		assertThat(build.getAppliedPlugins()).contains("kotlin-jpa");
+		assertThat(build.getAppliedPlugins()).isEmpty();
 		assertThat(build.getPlugins()).hasSize(1);
 		assertThat(build.getPlugins().get(0).getId())
 				.isEqualTo("org.jetbrains.kotlin.plugin.jpa");
@@ -50,7 +50,6 @@ class KotlinJpaGradleBuildCustomizerTests {
 	void customizeWhenJpaFacetAbsentShouldNotAddKotlinJpaPlugin() {
 		Dependency dependency = Dependency.withId("foo");
 		GradleBuild build = getCustomizedBuild(dependency);
-		assertThat(build.getAppliedPlugins()).hasSize(0);
 		assertThat(build.getPlugins()).hasSize(0);
 	}