From c9ca61015a9610ede88c70834188742abde995da Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Tue, 28 Feb 2017 10:07:05 +0100 Subject: [PATCH] Polish --- initializr-web/pom.xml | 11 +--- .../web/project/MainController.java | 56 +++++++++---------- .../AbstractInitializrIntegrationTests.java | 23 ++++---- pom.xml | 6 ++ 4 files changed, 47 insertions(+), 49 deletions(-) diff --git a/initializr-web/pom.xml b/initializr-web/pom.xml index 1fa0f417..de763af3 100644 --- a/initializr-web/pom.xml +++ b/initializr-web/pom.xml @@ -1,6 +1,7 @@ - + 4.0.0 io.spring.initializr @@ -39,12 +40,6 @@ org.apache.ant ant - - - org.apache.ant - ant-launcher - - org.json diff --git a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java index 0e2c4f75..4073954d 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/project/MainController.java @@ -16,10 +16,6 @@ package io.spring.initializr.web.project; -import static io.spring.initializr.util.Agent.AgentId.CURL; -import static io.spring.initializr.util.Agent.AgentId.HTTPIE; -import static io.spring.initializr.util.Agent.AgentId.SPRING_BOOT_CLI; - import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -29,31 +25,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.apache.tools.ant.Project; -import org.apache.tools.ant.taskdefs.Tar; -import org.apache.tools.ant.taskdefs.Tar.TarCompressionMethod; -import org.apache.tools.ant.taskdefs.Tar.TarFileSet; -import org.apache.tools.ant.taskdefs.Zip; -import org.apache.tools.ant.types.ZipFileSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.http.CacheControl; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; -import org.springframework.http.ResponseEntity.BodyBuilder; -import org.springframework.stereotype.Controller; -import org.springframework.util.DigestUtils; -import org.springframework.util.StreamUtils; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestHeader; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.resource.ResourceUrlProvider; - import com.samskivert.mustache.Mustache; - import io.spring.initializr.generator.BasicProjectRequest; import io.spring.initializr.generator.CommandLineHelpGenerator; import io.spring.initializr.generator.ProjectGenerator; @@ -70,6 +42,32 @@ import io.spring.initializr.web.mapper.InitializrMetadataJsonMapper; import io.spring.initializr.web.mapper.InitializrMetadataV21JsonMapper; import io.spring.initializr.web.mapper.InitializrMetadataV2JsonMapper; import io.spring.initializr.web.mapper.InitializrMetadataVersion; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Tar; +import org.apache.tools.ant.taskdefs.Zip; +import org.apache.tools.ant.types.TarFileSet; +import org.apache.tools.ant.types.ZipFileSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import org.springframework.http.CacheControl; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.http.ResponseEntity.BodyBuilder; +import org.springframework.stereotype.Controller; +import org.springframework.util.DigestUtils; +import org.springframework.util.StreamUtils; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.resource.ResourceUrlProvider; + +import static io.spring.initializr.util.Agent.AgentId.CURL; +import static io.spring.initializr.util.Agent.AgentId.HTTPIE; +import static io.spring.initializr.util.Agent.AgentId.SPRING_BOOT_CLI; /** * The main initializr controller provides access to the configured metadata and serves as @@ -309,7 +307,7 @@ public class MainController extends AbstractInitializrController { set.setExcludes(wrapperScript); set.setDefaultexcludes(false); zip.setDestFile(download.getCanonicalFile()); - TarCompressionMethod method = new TarCompressionMethod(); + Tar.TarCompressionMethod method = new Tar.TarCompressionMethod(); method.setValue("gzip"); zip.setCompression(method ); zip.execute(); diff --git a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java index e152e865..f1b38a5b 100644 --- a/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/AbstractInitializrIntegrationTests.java @@ -16,8 +16,6 @@ package io.spring.initializr.web; -import static org.junit.Assert.assertTrue; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -27,10 +25,17 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import io.spring.initializr.metadata.InitializrMetadata; +import io.spring.initializr.metadata.InitializrMetadataBuilder; +import io.spring.initializr.metadata.InitializrMetadataProvider; +import io.spring.initializr.metadata.InitializrProperties; +import io.spring.initializr.test.generator.ProjectAssert; +import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; +import io.spring.initializr.web.mapper.InitializrMetadataVersion; +import io.spring.initializr.web.support.DefaultInitializrMetadataProvider; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Expand; import org.apache.tools.ant.taskdefs.Untar; -import org.apache.tools.ant.taskdefs.Untar.UntarCompressionMethod; import org.json.JSONObject; import org.junit.Before; import org.junit.Rule; @@ -38,6 +43,7 @@ import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; @@ -53,14 +59,7 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.StreamUtils; import org.springframework.web.client.RestTemplate; -import io.spring.initializr.metadata.InitializrMetadata; -import io.spring.initializr.metadata.InitializrMetadataBuilder; -import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.metadata.InitializrProperties; -import io.spring.initializr.test.generator.ProjectAssert; -import io.spring.initializr.web.AbstractInitializrIntegrationTests.Config; -import io.spring.initializr.web.mapper.InitializrMetadataVersion; -import io.spring.initializr.web.support.DefaultInitializrMetadataProvider; +import static org.junit.Assert.assertTrue; /** * @author Stephane Nicoll @@ -204,7 +203,7 @@ public abstract class AbstractInitializrIntegrationTests { expand.setProject(new Project()); expand.setDest(project); expand.setSrc(archiveFile); - UntarCompressionMethod method = new UntarCompressionMethod(); + Untar.UntarCompressionMethod method = new Untar.UntarCompressionMethod(); method.setValue("gzip"); expand.setCompression(method ); expand.execute(); diff --git a/pom.xml b/pom.xml index 57138c8e..f44c456d 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,12 @@ org.apache.ant ant 1.10.1 + + + org.apache.ant + ant-launcher + +