diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizer.java index 02b4e7ca..65dcd3ce 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizer.java @@ -19,6 +19,7 @@ package io.spring.initializr.generator.spring.build; import io.spring.initializr.generator.buildsystem.Build; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; import org.springframework.core.Ordered; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java index 49e5eec8..e48224f8 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizer.java @@ -28,6 +28,7 @@ import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Repository; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; import org.springframework.core.Ordered; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizer.java index a0071404..9072c379 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizer.java @@ -19,6 +19,7 @@ package io.spring.initializr.generator.spring.build; import io.spring.initializr.generator.buildsystem.Build; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; import org.springframework.core.Ordered; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java index e40089f0..7a8a1bcc 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java +++ b/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/maven/DefaultMavenBuildCustomizer.java @@ -20,10 +20,10 @@ import io.spring.initializr.generator.buildsystem.BillOfMaterials; import io.spring.initializr.generator.buildsystem.maven.MavenBuild; import io.spring.initializr.generator.project.ResolvedProjectDescription; import io.spring.initializr.generator.spring.build.BuildCustomizer; -import io.spring.initializr.generator.spring.build.MetadataBuildItemMapper; import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven; import io.spring.initializr.metadata.InitializrConfiguration.Env.Maven.ParentPom; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; /** * The default {@link Maven} {@link BuildCustomizer}. diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/AbstractComplianceTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/AbstractComplianceTests.java index 05586243..beb0382c 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/AbstractComplianceTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/AbstractComplianceTests.java @@ -26,7 +26,6 @@ import io.spring.initializr.generator.io.SimpleIndentStrategy; import io.spring.initializr.generator.language.Language; import io.spring.initializr.generator.project.ProjectDescription; import io.spring.initializr.generator.project.ProjectGenerationContext; -import io.spring.initializr.generator.spring.build.MetadataBuildItemResolver; import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.generator.spring.test.ProjectAssert; import io.spring.initializr.generator.test.project.ProjectGeneratorTester; @@ -34,6 +33,7 @@ import io.spring.initializr.generator.test.project.ProjectStructure; import io.spring.initializr.generator.version.Version; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.io.TempDir; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java index 32299fc8..f0c0aae3 100755 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildComplianceTests.java @@ -34,6 +34,7 @@ import io.spring.initializr.generator.version.VersionProperty; import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildMetadataResolverTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildMetadataResolverTests.java index 0a364c14..ad8db4e2 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildMetadataResolverTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/BuildMetadataResolverTests.java @@ -25,6 +25,7 @@ import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.MetadataElement; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizerTests.java index 8de1c209..3394d809 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DefaultStarterBuildCustomizerTests.java @@ -21,6 +21,7 @@ import io.spring.initializr.generator.buildsystem.maven.MavenBuild; import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java index 0d0ac27f..eb40565c 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/DependencyManagementBuildCustomizerTests.java @@ -24,6 +24,7 @@ import io.spring.initializr.generator.version.Version; import io.spring.initializr.metadata.BillOfMaterials; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizerTests.java index 6f2f60cd..a90b5844 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/build/WarPackagingWebStarterBuildCustomizerTests.java @@ -23,6 +23,7 @@ import io.spring.initializr.generator.buildsystem.maven.MavenBuild; import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java index 81b9a3e1..71e5568a 100755 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/CodeComplianceTests.java @@ -26,9 +26,9 @@ import io.spring.initializr.generator.language.java.JavaLanguage; import io.spring.initializr.generator.language.kotlin.KotlinLanguage; import io.spring.initializr.generator.packaging.Packaging; import io.spring.initializr.generator.spring.AbstractComplianceTests; -import io.spring.initializr.generator.spring.build.MetadataBuildItemMapper; import io.spring.initializr.generator.spring.test.ProjectAssert; import io.spring.initializr.generator.version.Version; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; 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 bb4e686d..c638116e 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 @@ -19,10 +19,10 @@ package io.spring.initializr.generator.spring.code.kotlin; import java.util.Collections; import io.spring.initializr.generator.buildsystem.gradle.GradleBuild; -import io.spring.initializr.generator.spring.build.MetadataBuildItemResolver; import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java index 0790aa77..67719c39 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/kotlin/KotlinJpaMavenBuildCustomizerTests.java @@ -20,10 +20,10 @@ import java.util.Collections; import io.spring.initializr.generator.buildsystem.maven.MavenBuild; import io.spring.initializr.generator.buildsystem.maven.MavenPlugin; -import io.spring.initializr.generator.spring.build.MetadataBuildItemResolver; import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/configuration/WebFoldersContributorTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/configuration/WebFoldersContributorTests.java index 1933fe90..6d6c020f 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/configuration/WebFoldersContributorTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/configuration/WebFoldersContributorTests.java @@ -22,10 +22,10 @@ import java.util.Collections; import io.spring.initializr.generator.buildsystem.Build; import io.spring.initializr.generator.buildsystem.maven.MavenBuild; -import io.spring.initializr.generator.spring.build.MetadataBuildItemResolver; import io.spring.initializr.generator.spring.test.InitializrMetadataTestBuilder; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/MetadataBuildItemMapper.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java similarity index 98% rename from initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/MetadataBuildItemMapper.java rename to initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java index 4f5796cb..1f7f3feb 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/MetadataBuildItemMapper.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.initializr.generator.spring.build; +package io.spring.initializr.metadata.support; import io.spring.initializr.generator.buildsystem.Build; import io.spring.initializr.generator.buildsystem.DependencyScope; diff --git a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/MetadataBuildItemResolver.java b/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemResolver.java similarity index 97% rename from initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/MetadataBuildItemResolver.java rename to initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemResolver.java index f25681eb..c49b7f55 100644 --- a/initializr-generator-spring/src/main/java/io/spring/initializr/generator/spring/build/MetadataBuildItemResolver.java +++ b/initializr-metadata/src/main/java/io/spring/initializr/metadata/support/MetadataBuildItemResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.initializr.generator.spring.build; +package io.spring.initializr.metadata.support; import io.spring.initializr.generator.buildsystem.BillOfMaterials; import io.spring.initializr.generator.buildsystem.BuildItemResolver; diff --git a/initializr-metadata/src/test/java/io/spring/initializr/metadata/support/MetadataBuildItemResolverTests.java b/initializr-metadata/src/test/java/io/spring/initializr/metadata/support/MetadataBuildItemResolverTests.java new file mode 100644 index 00000000..46b7a560 --- /dev/null +++ b/initializr-metadata/src/test/java/io/spring/initializr/metadata/support/MetadataBuildItemResolverTests.java @@ -0,0 +1,117 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package io.spring.initializr.metadata.support; + +import java.net.MalformedURLException; +import java.net.URL; + +import io.spring.initializr.generator.buildsystem.DependencyScope; +import io.spring.initializr.generator.buildsystem.MavenRepository; +import io.spring.initializr.metadata.BillOfMaterials; +import io.spring.initializr.metadata.Dependency; +import io.spring.initializr.metadata.DependencyGroup; +import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.Repository; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link MetadataBuildItemResolver}. + * + * @author Stephane Nicoll + */ +class MetadataBuildItemResolverTests { + + @Test + void resoleDependencyWithMatchingEntry() { + InitializrMetadata metadata = new InitializrMetadata(); + DependencyGroup group = DependencyGroup.create("test"); + group.getContent().add( + Dependency.withId("test-dep", "com.example", "test", "1.0.0", "runtime")); + metadata.getDependencies().getContent().add(group); + metadata.validate(); + MetadataBuildItemResolver resolver = new MetadataBuildItemResolver(metadata); + io.spring.initializr.generator.buildsystem.Dependency dependency = resolver + .resolveDependency("test-dep"); + assertThat(dependency.getGroupId()).isEqualTo("com.example"); + assertThat(dependency.getArtifactId()).isEqualTo("test"); + assertThat(dependency.getVersion()).hasToString("1.0.0"); + assertThat(dependency.getScope()).isEqualTo(DependencyScope.RUNTIME); + } + + @Test + void resoleDependencyWithNotMatchingEntry() { + InitializrMetadata metadata = new InitializrMetadata(); + DependencyGroup group = DependencyGroup.create("test"); + group.getContent().add( + Dependency.withId("test-dep", "com.example", "test", "1.0.0", "runtime")); + metadata.getDependencies().getContent().add(group); + metadata.validate(); + MetadataBuildItemResolver resolver = new MetadataBuildItemResolver(metadata); + assertThat(resolver.resolveDependency("does-not-exist")).isNull(); + } + + @Test + void resoleBomWithMatchingEntry() { + InitializrMetadata metadata = new InitializrMetadata(); + BillOfMaterials bom = BillOfMaterials.create("com.example", "bom", "2.0.0"); + metadata.getConfiguration().getEnv().getBoms().put("test-bom", bom); + metadata.validate(); + MetadataBuildItemResolver resolver = new MetadataBuildItemResolver(metadata); + io.spring.initializr.generator.buildsystem.BillOfMaterials resolvedBom = resolver + .resolveBom("test-bom"); + assertThat(resolvedBom.getGroupId()).isEqualTo("com.example"); + assertThat(resolvedBom.getArtifactId()).isEqualTo("bom"); + assertThat(resolvedBom.getVersion()).hasToString("2.0.0"); + } + + @Test + void resoleBomWithNotMatchingEntry() { + InitializrMetadata metadata = new InitializrMetadata(); + BillOfMaterials bom = BillOfMaterials.create("com.example", "bom", "2.0.0"); + metadata.getConfiguration().getEnv().getBoms().put("test-bom", bom); + metadata.validate(); + MetadataBuildItemResolver resolver = new MetadataBuildItemResolver(metadata); + assertThat(resolver.resolveBom("does-not-exost")).isNull(); + } + + @Test + void resoleRepositoryWithMatchingEntry() throws MalformedURLException { + InitializrMetadata metadata = new InitializrMetadata(); + metadata.getConfiguration().getEnv().getRepositories().put("test-repo", + new Repository("test", new URL("https://example.com/repo"), false)); + metadata.validate(); + MetadataBuildItemResolver resolver = new MetadataBuildItemResolver(metadata); + MavenRepository repository = resolver.resolveRepository("test-repo"); + assertThat(repository.getId()).isEqualTo("test-repo"); + assertThat(repository.getName()).isEqualTo("test"); + assertThat(repository.getUrl()).isEqualTo("https://example.com/repo"); + assertThat(repository.isSnapshotsEnabled()).isFalse(); + } + + @Test + void resoleRepositoryWithNonMatchingEntry() throws MalformedURLException { + InitializrMetadata metadata = new InitializrMetadata(); + metadata.getConfiguration().getEnv().getRepositories().put("test-repo", + new Repository("test", new URL("https://example.com/repo"), false)); + metadata.validate(); + MetadataBuildItemResolver resolver = new MetadataBuildItemResolver(metadata); + assertThat(resolver.resolveRepository("does-not-exist")).isNull(); + } + +} diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java index bedff1ae..3a02f452 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectGenerationInvoker.java @@ -34,9 +34,9 @@ import io.spring.initializr.generator.project.ProjectGenerationException; import io.spring.initializr.generator.project.ProjectGenerator; import io.spring.initializr.generator.project.ResolvedProjectDescription; import io.spring.initializr.generator.spring.build.BuildWriter; -import io.spring.initializr.generator.spring.build.MetadataBuildItemResolver; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.metadata.support.MetadataBuildItemResolver; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEventPublisher; diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java index 8cf9ddf0..f921468a 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/ProjectRequestToDescriptionConverter.java @@ -24,12 +24,12 @@ import io.spring.initializr.generator.buildsystem.BuildSystem; import io.spring.initializr.generator.language.Language; import io.spring.initializr.generator.packaging.Packaging; import io.spring.initializr.generator.project.ProjectDescription; -import io.spring.initializr.generator.spring.build.MetadataBuildItemMapper; import io.spring.initializr.generator.version.Version; import io.spring.initializr.metadata.DefaultMetadataElement; import io.spring.initializr.metadata.Dependency; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.Type; +import io.spring.initializr.metadata.support.MetadataBuildItemMapper; import org.springframework.util.StringUtils;