diff --git a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java index d6f72395..09b739b1 100644 --- a/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java +++ b/initializr-generator-spring/src/test/java/io/spring/initializr/generator/spring/code/SourceCodeProjectGenerationConfigurationTests.java @@ -98,8 +98,10 @@ class SourceCodeProjectGenerationConfigurationTests { this.projectTester.generate(description, (context) -> { ServletInitializerContributor bean = context .getBean(ServletInitializerContributor.class); - SourceCode sourceCode = mock(SourceCode.class); - CompilationUnit compilationUnit = mock(CompilationUnit.class); + SourceCode> sourceCode = mock( + SourceCode.class); + CompilationUnit compilationUnit = mock( + CompilationUnit.class); given(sourceCode.createCompilationUnit(any(), any())) .willReturn(compilationUnit); TypeDeclaration typeDeclaration = mock(TypeDeclaration.class); diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/io/IndentingWriterTests.java b/initializr-generator/src/test/java/io/spring/initializr/generator/io/IndentingWriterTests.java index ec3234c3..8f2f3001 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/io/IndentingWriterTests.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/io/IndentingWriterTests.java @@ -16,6 +16,7 @@ package io.spring.initializr.generator.io; +import java.io.IOException; import java.io.StringWriter; import org.junit.jupiter.api.Test; @@ -74,17 +75,18 @@ class IndentingWriterTests { } @Test - void customIndentStrategyIsUsed() { - IndentingWriter customIndentingWriter = new IndentingWriter(this.stringWriter, - new SimpleIndentStrategy("\t")); - customIndentingWriter.println("a"); - customIndentingWriter.indented(() -> { - customIndentingWriter.println("b"); + void customIndentStrategyIsUsed() throws IOException { + try (IndentingWriter customIndentingWriter = new IndentingWriter( + this.stringWriter, new SimpleIndentStrategy("\t"))) { + customIndentingWriter.println("a"); customIndentingWriter.indented(() -> { - customIndentingWriter.print("c"); - customIndentingWriter.println("e"); + customIndentingWriter.println("b"); + customIndentingWriter.indented(() -> { + customIndentingWriter.print("c"); + customIndentingWriter.println("e"); + }); }); - }); + } assertThat(this.stringWriter.toString()).isEqualTo("a\n\tb\n\t\tce\n"); } diff --git a/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java b/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java index 46febb68..da5fe017 100644 --- a/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java +++ b/initializr-generator/src/test/java/io/spring/initializr/generator/test/project/AbstractProjectGenerationTester.java @@ -34,6 +34,7 @@ import io.spring.initializr.generator.project.ProjectGenerationException; /** * Base tester for project generation. * + * @param concrete type of the tester * @author Stephane Nicoll */ public abstract class AbstractProjectGenerationTester> { diff --git a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java index 976db34b..e5a7017a 100755 --- a/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java +++ b/initializr-metadata/src/test/java/io/spring/initializr/metadata/InitializrMetadataBuilderTests.java @@ -196,7 +196,6 @@ class InitializrMetadataBuilderTests { InitializrMetadata metadata = InitializrMetadataBuilder .fromInitializrProperties(config) .withInitializrProperties(forceSslConfig, true).build(); - InitializrConfiguration.Env defaultEnv = new InitializrConfiguration().getEnv(); InitializrConfiguration.Env actualEnv = metadata.getConfiguration().getEnv(); assertThat(actualEnv.isForceSsl()).isEqualTo(true); } 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 775574db..bedff1ae 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 @@ -25,7 +25,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import io.spring.initializr.generator.buildsystem.Build; import io.spring.initializr.generator.buildsystem.BuildItemResolver; import io.spring.initializr.generator.project.DefaultProjectAssetGenerator; import io.spring.initializr.generator.project.ProjectAssetGenerator; @@ -201,7 +200,6 @@ public class ProjectGenerationInvoker { private void publishProjectGeneratedEvent(ProjectRequest request, ProjectGenerationContext context) { - Build build = context.getBeanProvider(Build.class).getIfAvailable(); InitializrMetadata metadata = context.getBean(InitializrMetadata.class); ProjectGeneratedEvent event = new ProjectGeneratedEvent(request, metadata); this.eventPublisher.publishEvent(event);