From c2886679d6e90304e43373e6e02e4358c2282910 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Fri, 23 Aug 2019 11:36:22 +0200
Subject: [PATCH] Fix package tangle

Closes gh-992
---
 .../BuildProjectGenerationConfiguration.java  | 23 -------------------
 ...ationDefaultContributorsConfiguration.java | 14 +++++++++++
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java
index 70ee8239..f5ea7eaa 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/BuildProjectGenerationConfiguration.java
@@ -20,20 +20,12 @@ import io.spring.initializr.generator.buildsystem.Build;
 import io.spring.initializr.generator.buildsystem.Dependency;
 import io.spring.initializr.generator.buildsystem.Dependency.Exclusion;
 import io.spring.initializr.generator.buildsystem.DependencyScope;
-import io.spring.initializr.generator.buildsystem.gradle.GradleBuildSystem;
-import io.spring.initializr.generator.buildsystem.maven.MavenBuildSystem;
-import io.spring.initializr.generator.condition.ConditionalOnBuildSystem;
-import io.spring.initializr.generator.condition.ConditionalOnLanguage;
 import io.spring.initializr.generator.condition.ConditionalOnPackaging;
 import io.spring.initializr.generator.condition.ConditionalOnPlatformVersion;
-import io.spring.initializr.generator.language.kotlin.KotlinLanguage;
 import io.spring.initializr.generator.packaging.war.WarPackaging;
 import io.spring.initializr.generator.project.ProjectGenerationConfiguration;
 import io.spring.initializr.generator.project.ResolvedProjectDescription;
 import io.spring.initializr.generator.spring.build.maven.DefaultMavenBuildCustomizer;
-import io.spring.initializr.generator.spring.code.kotlin.KotlinJpaGradleBuildCustomizer;
-import io.spring.initializr.generator.spring.code.kotlin.KotlinJpaMavenBuildCustomizer;
-import io.spring.initializr.generator.spring.code.kotlin.KotlinProjectSettings;
 import io.spring.initializr.metadata.InitializrMetadata;
 
 import org.springframework.context.annotation.Bean;
@@ -91,21 +83,6 @@ public class BuildProjectGenerationConfiguration {
 		return new WarPackagingWebStarterBuildCustomizer(metadata);
 	}
 
-	@Bean
-	@ConditionalOnLanguage(KotlinLanguage.ID)
-	@ConditionalOnBuildSystem(GradleBuildSystem.ID)
-	public KotlinJpaGradleBuildCustomizer kotlinJpaGradleBuildCustomizer(InitializrMetadata metadata,
-			KotlinProjectSettings settings) {
-		return new KotlinJpaGradleBuildCustomizer(metadata, settings);
-	}
-
-	@Bean
-	@ConditionalOnLanguage(KotlinLanguage.ID)
-	@ConditionalOnBuildSystem(MavenBuildSystem.ID)
-	public KotlinJpaMavenBuildCustomizer kotlinJpaMavenBuildCustomizer(InitializrMetadata metadata) {
-		return new KotlinJpaMavenBuildCustomizer(metadata);
-	}
-
 	@Bean
 	public DependencyManagementBuildCustomizer dependencyManagementBuildCustomizer(
 			ResolvedProjectDescription projectDescription, InitializrMetadata metadata) {
diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java
index b7ceea3b..2992e8f8 100644
--- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java
+++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/code/kotlin/KotlinProjectGenerationDefaultContributorsConfiguration.java
@@ -38,6 +38,7 @@ import io.spring.initializr.generator.spring.build.BuildCustomizer;
 import io.spring.initializr.generator.spring.code.MainCompilationUnitCustomizer;
 import io.spring.initializr.generator.spring.code.ServletInitializerCustomizer;
 import io.spring.initializr.generator.spring.code.TestApplicationTypeCustomizer;
+import io.spring.initializr.metadata.InitializrMetadata;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -77,6 +78,19 @@ class KotlinProjectGenerationDefaultContributorsConfiguration {
 		return new KotlinDependenciesConfigurer(projectDescription.getPlatformVersion());
 	}
 
+	@Bean
+	@ConditionalOnBuildSystem(GradleBuildSystem.ID)
+	KotlinJpaGradleBuildCustomizer kotlinJpaGradleBuildCustomizer(InitializrMetadata metadata,
+			KotlinProjectSettings settings) {
+		return new KotlinJpaGradleBuildCustomizer(metadata, settings);
+	}
+
+	@Bean
+	@ConditionalOnBuildSystem(MavenBuildSystem.ID)
+	KotlinJpaMavenBuildCustomizer kotlinJpaMavenBuildCustomizer(InitializrMetadata metadata) {
+		return new KotlinJpaMavenBuildCustomizer(metadata);
+	}
+
 	/**
 	 * Configuration for Kotlin projects using Spring Boot 1.5.
 	 */