From 478c0c41c62a99c25c6dbe8972068bd55d16dd5e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 8 Feb 2019 10:56:41 +0100 Subject: [PATCH] Relocate Agent to web module --- .../initializr/actuate/stat/ProjectRequestDocument.java | 2 +- .../actuate/stat/ProjectRequestDocumentFactory.java | 2 +- .../initializr/web/autoconfigure/InitializrWebConfig.java | 6 +++--- .../io/spring/initializr/web/project/MainController.java | 4 ++-- .../main/java/io/spring/initializr/web/support}/Agent.java | 4 ++-- .../java/io/spring/initializr/web/support}/AgentTests.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) rename {initializr-generator/src/main/java/io/spring/initializr/util => initializr-web/src/main/java/io/spring/initializr/web/support}/Agent.java (97%) rename {initializr-generator/src/test/java/io/spring/initializr/util => initializr-web/src/test/java/io/spring/initializr/web/support}/AgentTests.java (98%) diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java index 3ff65ac7..60e86430 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocument.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.StringJoiner; import io.spring.initializr.generator.version.Version; -import io.spring.initializr.util.Agent; +import io.spring.initializr.web.support.Agent; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java index 463e10e3..551d8900 100644 --- a/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java +++ b/initializr-actuator/src/main/java/io/spring/initializr/actuate/stat/ProjectRequestDocumentFactory.java @@ -26,11 +26,11 @@ import io.spring.initializr.actuate.stat.ProjectRequestDocument.ErrorStateInform import io.spring.initializr.actuate.stat.ProjectRequestDocument.VersionInformation; import io.spring.initializr.generator.version.Version; import io.spring.initializr.metadata.InitializrMetadata; -import io.spring.initializr.util.Agent; import io.spring.initializr.web.project.ProjectFailedEvent; import io.spring.initializr.web.project.ProjectRequest; import io.spring.initializr.web.project.ProjectRequestEvent; import io.spring.initializr.web.project.WebProjectRequest; +import io.spring.initializr.web.support.Agent; import org.springframework.util.StringUtils; diff --git a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java index 868b2042..62c5b02b 100644 --- a/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/autoconfigure/InitializrWebConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * 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. @@ -21,8 +21,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; -import io.spring.initializr.util.Agent; -import io.spring.initializr.util.Agent.AgentId; +import io.spring.initializr.web.support.Agent; +import io.spring.initializr.web.support.Agent.AgentId; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; 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 1a5504fb..2a29f71d 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 @@ -34,13 +34,13 @@ import io.spring.initializr.metadata.DependencyMetadata; import io.spring.initializr.metadata.DependencyMetadataProvider; import io.spring.initializr.metadata.InitializrMetadata; import io.spring.initializr.metadata.InitializrMetadataProvider; -import io.spring.initializr.util.Agent; -import io.spring.initializr.util.Agent.AgentId; import io.spring.initializr.web.mapper.DependencyMetadataV21JsonMapper; 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 io.spring.initializr.web.support.Agent; +import io.spring.initializr.web.support.Agent.AgentId; import io.spring.initializr.web.support.CommandLineHelpGenerator; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Tar; diff --git a/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java b/initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java similarity index 97% rename from initializr-generator/src/main/java/io/spring/initializr/util/Agent.java rename to initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java index 4430869d..5510191a 100644 --- a/initializr-generator/src/main/java/io/spring/initializr/util/Agent.java +++ b/initializr-web/src/main/java/io/spring/initializr/web/support/Agent.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.initializr.util; +package io.spring.initializr.web.support; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java b/initializr-web/src/test/java/io/spring/initializr/web/support/AgentTests.java similarity index 98% rename from initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java rename to initializr-web/src/test/java/io/spring/initializr/web/support/AgentTests.java index b52dd955..b7c5295a 100755 --- a/initializr-generator/src/test/java/io/spring/initializr/util/AgentTests.java +++ b/initializr-web/src/test/java/io/spring/initializr/web/support/AgentTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.spring.initializr.util; +package io.spring.initializr.web.support; import org.junit.jupiter.api.Test;