From 4687e9496b3ad07c56444ef7f91c23285da50818 Mon Sep 17 00:00:00 2001 From: Colin DAMON Date: Tue, 12 Jul 2022 08:56:39 +0200 Subject: [PATCH] Gradle migration This is not really a migration since gradle support is currently not working. We agreed to keep the templating and remove the endpoints. I also deleted some unused methods in project repository in the process --- .github/workflows/github-actions.yml | 1 - .../application/GradleApplicationService.java | 27 ----- .../buildtool/gradle/domain/Gradle.java | 20 +--- .../gradle/domain/GradleDomainService.java | 42 ------- .../gradle/domain/GradleModuleFactory.java | 37 ++++++ .../gradle/domain/GradleService.java | 5 - .../primary/rest/GradleResource.java | 53 --------- .../project/domain/ProjectRepository.java | 8 -- .../secondary/ProjectLocalRepository.java | 49 -------- .../gradle/build.gradle.kts.mustache | 2 +- .../gradle/settings.gradle.kts.mustache | 2 +- .../app/springboot/primary/Generator.vue | 22 +--- src/main/webapp/content/GradleLogo.png | Bin 1967 -> 0 bytes .../GradleApplicationServiceIT.java | 30 ----- .../gradle/application/GradleAssertFiles.java | 48 -------- .../domain/GradleDomainServiceTest.java | 37 +----- .../domain/GradleModuleFactoryTest.java | 37 ++++++ .../primary/rest/GradleResourceIT.java | 81 ------------- .../primary/rest/GitHubActionsResourceIT.java | 28 ++--- .../secondary/ProjectLocalRepositoryTest.java | 106 ------------------ .../secondary/TestJHipsterModules.java | 8 ++ tests-ci/config/gradleapp.json | 8 -- tests-ci/generate.sh | 5 - 23 files changed, 104 insertions(+), 552 deletions(-) delete mode 100644 src/main/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationService.java create mode 100644 src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java delete mode 100644 src/main/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResource.java delete mode 100644 src/main/webapp/content/GradleLogo.png delete mode 100644 src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationServiceIT.java delete mode 100644 src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleAssertFiles.java create mode 100644 src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java delete mode 100644 src/test/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResourceIT.java delete mode 100644 tests-ci/config/gradleapp.json diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index ee0dca92b95..f120b2136de 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -141,7 +141,6 @@ jobs: - consulapp - gatewayapp - mongodbapp - - gradleapp - angularapp - reactapp - vueapp diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationService.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationService.java deleted file mode 100644 index ffc858fa19b..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationService.java +++ /dev/null @@ -1,27 +0,0 @@ -package tech.jhipster.lite.generator.buildtool.gradle.application; - -import org.springframework.stereotype.Service; -import tech.jhipster.lite.generator.buildtool.gradle.domain.GradleService; -import tech.jhipster.lite.generator.project.domain.Project; - -@Service -public class GradleApplicationService { - - private final GradleService gradleService; - - public GradleApplicationService(GradleService gradleService) { - this.gradleService = gradleService; - } - - public void init(Project project) { - gradleService.initJava(project); - } - - public void addBuildGradle(Project project) { - gradleService.addJavaBuildGradleKts(project); - } - - public void addGradleWrapper(Project project) { - gradleService.addGradleWrapper(project); - } -} diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/Gradle.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/Gradle.java index 052296cd46a..8967301040f 100644 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/Gradle.java +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/Gradle.java @@ -1,30 +1,18 @@ package tech.jhipster.lite.generator.buildtool.gradle.domain; -import java.util.Map; import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency; public class Gradle { public static final String GRADLE_NEEDLE_DEPENDENCY = "// jhipster-needle-gradle-add-dependency"; - public static final String GRADLE_NEEDLE_REPOSITORY = "// jhipster-needle-gradle-repository"; - public static final String IMPLEMENTATION = "implementation(\""; - public static final String SEPARATOR = ":"; - public static final String END_IMPLEMENTATION = "\")"; - public static final String LF = "\n"; + private static final String IMPLEMENTATION = "implementation(\""; + private static final String SEPARATOR = ":"; + private static final String END_IMPLEMENTATION = "\")"; + private static final String LF = "\n"; private Gradle() {} - public static Map gradleWrapper() { - // prettier-ignore - return Map.of( - "gradlew", ".", - "gradlew.bat", ".", - "gradle-wrapper.jar", "gradle/wrapper", - "gradle-wrapper.properties", "gradle/wrapper" - ); - } - public static String getDependency(Dependency dependency) { return new StringBuilder() .append(IMPLEMENTATION) diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainService.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainService.java index aa9f326b13a..e4523f0efd1 100644 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainService.java +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainService.java @@ -4,16 +4,12 @@ import static tech.jhipster.lite.common.domain.WordUtils.*; import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.*; import static tech.jhipster.lite.generator.project.domain.Constants.*; -import static tech.jhipster.lite.generator.project.domain.DefaultConfig.*; -import java.util.List; import java.util.Optional; import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.common.domain.WordUtils; import tech.jhipster.lite.error.domain.Assert; import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency; import tech.jhipster.lite.generator.project.domain.Project; -import tech.jhipster.lite.generator.project.domain.ProjectFile; import tech.jhipster.lite.generator.project.domain.ProjectRepository; public class GradleDomainService implements GradleService { @@ -26,44 +22,6 @@ public GradleDomainService(ProjectRepository projectRepository) { this.projectRepository = projectRepository; } - @Override - public void initJava(Project project) { - addJavaBuildGradleKts(project); - addGradleWrapper(project); - } - - @Override - public void addJavaBuildGradleKts(Project project) { - project.addDefaultConfig(PACKAGE_NAME); - project.addDefaultConfig(PROJECT_NAME); - project.addDefaultConfig(BASE_NAME); - - String baseName = project.getBaseName().orElse(""); - project.addConfig("dasherizedBaseName", WordUtils.kebabCase(baseName)); - - projectRepository.template(ProjectFile.forProject(project).withSource(SOURCE, BUILD_GRADLE_KTS).withSameDestination()); - projectRepository.template(ProjectFile.forProject(project).withSource(SOURCE, SETTINGS_GRADLE_KTS).withSameDestination()); - } - - @Override - public void addGradleWrapper(Project project) { - List files = Gradle - .gradleWrapper() - .entrySet() - .stream() - .map(entry -> - ProjectFile - .forProject(project) - .withSource(getPath(SOURCE, entry.getValue()), entry.getKey()) - .withDestinationFolder(entry.getValue()) - ) - .toList(); - - projectRepository.add(files); - projectRepository.setExecutable(project, "", "gradlew"); - projectRepository.setExecutable(project, "", "gradlew.bat"); - } - @Override public void addDependency(Project project, Dependency dependency) { String newDependency = Gradle.getDependencyWithNeedle(dependency); diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java new file mode 100644 index 00000000000..4fa9706224b --- /dev/null +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactory.java @@ -0,0 +1,37 @@ +package tech.jhipster.lite.generator.buildtool.gradle.domain; + +import static tech.jhipster.lite.module.domain.JHipsterModule.*; + +import tech.jhipster.lite.error.domain.Assert; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterSource; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; + +public class GradleModuleFactory { + + private static final JHipsterSource SOURCE = from("buildtool/gradle"); + + public JHipsterModule buildModule(JHipsterModuleProperties properties) { + Assert.notNull("properties", properties); + + //@formatter:off + return moduleBuilder(properties) + .context() + .put("dasherizedBaseName", properties.projectBaseName().kebabCase()) + .and() + .files() + .batch(SOURCE, to(".")) + .template("build.gradle.kts") + .template("settings.gradle.kts") + .and() + .batch(SOURCE.append("gradle/wrapper"), to("gradle/wrapper")) + .file("gradle-wrapper.properties") + .file("gradle-wrapper.jar") + .and() + .addExecutable(SOURCE.file("gradlew"), to("gradlew")) + .addExecutable(SOURCE.file("gradlew.bat"), to("gradlew.bat")) + .and() + .build(); + //@formatter:on + } +} diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleService.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleService.java index 2c6f251bd2b..5dbe5d99b35 100644 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleService.java +++ b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleService.java @@ -5,12 +5,7 @@ import tech.jhipster.lite.generator.project.domain.Project; public interface GradleService { - void initJava(Project project); - void addDependency(Project project, Dependency dependency); - void addJavaBuildGradleKts(Project project); - void addGradleWrapper(Project project); - Optional getGroup(String folder); } diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResource.java b/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResource.java deleted file mode 100644 index d934fbc6e52..00000000000 --- a/src/main/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResource.java +++ /dev/null @@ -1,53 +0,0 @@ -package tech.jhipster.lite.generator.buildtool.gradle.infrastructure.primary.rest; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import tech.jhipster.lite.generator.buildtool.gradle.application.GradleApplicationService; -import tech.jhipster.lite.generator.project.domain.GeneratorAction; -import tech.jhipster.lite.generator.project.domain.Project; -import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; -import tech.jhipster.lite.technical.infrastructure.primary.annotation.GeneratorStep; - -@RestController -@RequestMapping("/api/build-tools/gradle") -@Tag(name = "Build Tool") -class GradleResource { - - private final GradleApplicationService gradleApplicationService; - - public GradleResource(GradleApplicationService gradleApplicationService) { - this.gradleApplicationService = gradleApplicationService; - } - - @Operation(summary = "Init", description = "Init Gradle project with build.gradle.kts and wrapper") - @ApiResponse(responseCode = "500", description = "An error occurred while initializing Gradle project") - @PostMapping - @GeneratorStep(id = GeneratorAction.GRADLE_JAVA) - public void init(@RequestBody ProjectDTO projectDTO) { - Project project = ProjectDTO.toProject(projectDTO); - gradleApplicationService.init(project); - } - - @Operation(summary = "Add build.gradle.kts") - @ApiResponse(responseCode = "500", description = "An error occurred while adding build.gradle.kts to project") - @PostMapping("/build-gradle") - @GeneratorStep(id = GeneratorAction.GRADLE_JAVA_BUILD_GRADLE_KTS) - public void addBuildGradleKts(@RequestBody ProjectDTO projectDTO) { - Project project = ProjectDTO.toProject(projectDTO); - gradleApplicationService.addBuildGradle(project); - } - - @Operation(summary = "Add Gradle Wrapper") - @ApiResponse(responseCode = "500", description = "An error occurred while adding Gradle Wrapper to project") - @PostMapping("/wrapper") - @GeneratorStep(id = GeneratorAction.GRADLE_WRAPPER) - public void addGradleWrapper(@RequestBody ProjectDTO projectDTO) { - Project project = ProjectDTO.toProject(projectDTO); - gradleApplicationService.addGradleWrapper(project); - } -} diff --git a/src/main/java/tech/jhipster/lite/generator/project/domain/ProjectRepository.java b/src/main/java/tech/jhipster/lite/generator/project/domain/ProjectRepository.java index 68c6269d3fd..e371bcf7321 100644 --- a/src/main/java/tech/jhipster/lite/generator/project/domain/ProjectRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/project/domain/ProjectRepository.java @@ -5,24 +5,18 @@ import tech.jhipster.lite.error.domain.Assert; public interface ProjectRepository { - void create(Project project); - void add(Collection files); void template(Collection files); void rename(Project project, String source, String sourceFilename, String destinationFilename); - String getComputedTemplate(Project project, String source, String sourceFilename); - boolean containsRegexp(Project project, String source, String sourceFilename, String regexp); void replaceText(Project project, String source, String sourceFilename, String oldText, String newText); void write(Project project, String text, String destination, String destinationFilename); - void setExecutable(Project project, String source, String sourceFilename); - void gitInit(Project project); void gitApplyPatch(Project project, String patchFilename); @@ -30,8 +24,6 @@ public interface ProjectRepository { byte[] download(Project project); - boolean isJHipsterLiteProject(String path); - default void add(ProjectFile file) { Assert.notNull("file", file); diff --git a/src/main/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepository.java b/src/main/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepository.java index dd22ad24596..9367cedf118 100644 --- a/src/main/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepository.java +++ b/src/main/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepository.java @@ -10,10 +10,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; -import java.nio.file.attribute.PosixFilePermission; import java.util.Collection; -import java.util.HashSet; -import java.util.Set; import java.util.function.Consumer; import org.eclipse.jgit.api.errors.GitAPIException; import org.springframework.stereotype.Repository; @@ -32,15 +29,6 @@ public class ProjectLocalRepository implements ProjectRepository { private static final String FILE_SEPARATOR = "/"; - @Override - public void create(Project project) { - try { - FileUtils.createFolder(project.getFolder()); - } catch (IOException ex) { - throw new GeneratorException("The folder can't be created"); - } - } - @Override public void add(Collection files) { Assert.field("files", files).notEmpty().noNullElement(); @@ -108,17 +96,6 @@ public void rename(Project project, String source, String sourceFilename, String } } - @Override - public String getComputedTemplate(Project project, String source, String sourceFilename) { - String filename = MustacheUtils.withExt(sourceFilename); - String filePath = getPath(TEMPLATE_FOLDER, source, filename); - try { - return MustacheUtils.template(filePath, project.getConfig()); - } catch (IOException e) { - throw new GeneratorException("The file " + filePath + " can't be read"); - } - } - @Override public boolean containsRegexp(Project project, String source, String sourceFilename, String regexp) { try { @@ -155,27 +132,6 @@ public void write(Project project, String text, String destination, String desti } } - @Override - public void setExecutable(Project project, String source, String sourceFilename) { - if (!FileUtils.isPosix()) { - return; - } - Set perms = new HashSet<>(); - perms.add(PosixFilePermission.OWNER_READ); - perms.add(PosixFilePermission.OWNER_WRITE); - perms.add(PosixFilePermission.OWNER_EXECUTE); - - perms.add(PosixFilePermission.GROUP_READ); - perms.add(PosixFilePermission.GROUP_WRITE); - perms.add(PosixFilePermission.GROUP_EXECUTE); - File file = new File(getPath(project.getFolder(), source, sourceFilename)); - try { - Files.setPosixFilePermissions(file.toPath(), perms); - } catch (IOException e) { - throw new GeneratorException("Can't change file permission for " + sourceFilename, e); - } - } - @Override public void gitInit(Project project) { try { @@ -216,11 +172,6 @@ public byte[] download(Project project) { } } - @Override - public boolean isJHipsterLiteProject(String path) { - return FileUtils.exists(getPath(path, JHIPSTER_FOLDER, HISTORY_JSON)); - } - private String getErrorWritingMessage(String filename) { return "Error when writing text to '" + filename + "'"; } diff --git a/src/main/resources/generator/buildtool/gradle/build.gradle.kts.mustache b/src/main/resources/generator/buildtool/gradle/build.gradle.kts.mustache index 41882523bf6..ab0bddd7f71 100644 --- a/src/main/resources/generator/buildtool/gradle/build.gradle.kts.mustache +++ b/src/main/resources/generator/buildtool/gradle/build.gradle.kts.mustache @@ -19,7 +19,7 @@ repositories { // jhipster-needle-gradle-repository } -group = "{{packageName}}{{^packageName}}com.mycompany.myapp{{/packageName}}" +group = "{{packageName}}" version = "0.0.1-SNAPSHOT" ext { diff --git a/src/main/resources/generator/buildtool/gradle/settings.gradle.kts.mustache b/src/main/resources/generator/buildtool/gradle/settings.gradle.kts.mustache index be2b8f4fd14..c78368717e9 100644 --- a/src/main/resources/generator/buildtool/gradle/settings.gradle.kts.mustache +++ b/src/main/resources/generator/buildtool/gradle/settings.gradle.kts.mustache @@ -1 +1 @@ -rootProject.name = "{{dasherizedBaseName}}{{^dasherizedBaseName}}jhipster{{/dasherizedBaseName}}" +rootProject.name = "{{dasherizedBaseName}}" diff --git a/src/main/webapp/app/springboot/primary/Generator.vue b/src/main/webapp/app/springboot/primary/Generator.vue index c56c13872ca..929fe6dbe0a 100644 --- a/src/main/webapp/app/springboot/primary/Generator.vue +++ b/src/main/webapp/app/springboot/primary/Generator.vue @@ -20,19 +20,19 @@
- +
- +
- +
- +
@@ -82,20 +82,6 @@ -
  • -
    - - -
    - -
    • diff --git a/src/main/webapp/content/GradleLogo.png b/src/main/webapp/content/GradleLogo.png deleted file mode 100644 index fd10a8d6658c5c08afdeedcc18fbd24191f3265d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1967 zcmV;g2T=HlP)ZN89)~3DAKV;$5JH$8xaEopiVlDShP!* z0O~v)a};JFF#svFG=ugI)3PW8+Ig9dJcU_|B|rvlh>qS0yQw@K6JcqkkzjCknWH1C zTO$pP;2IdXGo-p@oQ|BXpkru)2Ol>Up^pnHfY(PM&Q%m(jI_?pKW2kyqY(fev~4zo zbR=piFl{VE29V`*ixNpMiIGWn_<@-60k1b<@CZAXRd#OSX(0Q8DUxh~Ip?(ltPyz1 z5DiIqEeSMRFUiRGL_-1|qU~yp!Q+7?<5jt&B=Wr38idCK%PeEyI|>gaAkPaTEv&*) zH(}Q7Tucgyhrd4}x9{FF-|yM=6xs23y~^fCMP;AiV!Ep_s%;%*ZT$iH`15Pz%kNgq z_f~0Ye1aT4&`RDu-eta*@Q2M#C7%f3Sd8miQ-(jCGKY)|zR_n64;iNbvz`E1)V&{P zc<+9Ak$m*UHKlFZp3RV%kzp^>Znj6|lpt`#T41uOvi#F3=^wl3^|2w>D9p64H|_vu zM$d0*68zibx%bHWw_lS#eq1I$On*jBzS`xu-Sk&Cyx{jTM$RToe>s%|fINV#P_61Y z^pfN6Z{N8`4!(8TjL!Dp^7H&vw_RhRs&5NG7I}ZGr6dp9cC3GJ%g>>)BJg%!SZ7tw zsB^MgckY(nQ*C(o=s!)^QD0B?>@MYMdw1_5t^2~s<&nnVd+`0`V88bQh$)P5y9VA5 zGw;Je!pAJ%T-|cOvQhHTf&J!5OXO{V(j8nl_)HfmQVne0)Iip4Nr$0nSFYbMlUaKr z>nBQLAVmSpo>yM<(vm>O?ICF}L$`)U;db2zaN_+BNaG7HnQ`WLNKG&lYh3cok#5Hej7aR^DzKm_qg?|L*`kEUwFsK{ zbZ57cM&h#~>yYrXW@JmTu8Y=SQOS;rEJ&1kqFPxtNP(R}|2gB;^HK!}6Rs9P)ILn3 zchkKI+?z{VER#!AUGixl#m>v@LrtNJhYpS0bJe*Vfl#2hdM#tD=3@Qf@wJ8mQP9^&|6EfO8~a5;DAU z4P*;t3P}PO)~W@bzVLfUtlgN)Nr8vFFT}_TnXr~}T=Gc)h!tHSOMVMLwgNpL^vWae z!UPXigYp%js^-L}1MK^eO-aI94#(kHSL@qXsG=rzTwwm#b8VhEms@)Xl}va4fM@T| zY;caA7tYLy=3%TNu|P72lr1z**%HH|NDJM%7dTn3-Ws&RYqlTTyTP+wDAyEbXJeS! zSJpdlYU$@x{fg`qCQ=K`KZpb-Dl;b>c7@?0TiB!=%9Eng2cHz27{IBR3l>J|NIl#> zi(9!uka4FwH${_5SpQqJUv(#G+m}%~idL$DPTC61Q(ckZv>*ITQ?s-z?-N<3(#?kU z#o!S{ylRmSQPaishU+BUGpEUPv!Y+h+_8>EV6EOWY%b$<`+&^E`cYE4-LuwYgPl7G z1dv6Zjv9l=AH-7(43I%IACFW+0JE}BF_K;z!)|%61&B%y-cedy#CDuipSYn4Pbvxv zBJ=+bAM>MuHlK*_o`f#8c`kk*f9HFNFCrAnk;Y@5Bxiy=S5?;|KvDMLwx4uNz!jOl zTMD|Pl#Zie2a*vL+*KwyX0l5}FHR?Y`0IlSIjG$ff?%~t;A0sG6bx!{ZFaU9hO+j@sIS>E<002ovPDHLkV1jl% Bo2dW* diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationServiceIT.java b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationServiceIT.java deleted file mode 100644 index 5fb53e9f09d..00000000000 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleApplicationServiceIT.java +++ /dev/null @@ -1,30 +0,0 @@ -package tech.jhipster.lite.generator.buildtool.gradle.application; - -import static tech.jhipster.lite.TestUtils.assertFileContent; -import static tech.jhipster.lite.TestUtils.tmpProject; -import static tech.jhipster.lite.generator.buildtool.gradle.application.GradleAssertFiles.assertFilesGradle; -import static tech.jhipster.lite.generator.project.domain.Constants.BUILD_GRADLE_KTS; -import static tech.jhipster.lite.generator.project.domain.Constants.SETTINGS_GRADLE_KTS; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import tech.jhipster.lite.IntegrationTest; -import tech.jhipster.lite.generator.project.domain.Project; - -@IntegrationTest -class GradleApplicationServiceIT { - - @Autowired - GradleApplicationService gradleApplicationService; - - @Test - void shouldInit() { - Project project = tmpProject(); - - gradleApplicationService.init(project); - - assertFilesGradle(project); - assertFileContent(project, BUILD_GRADLE_KTS, "group = \"com.mycompany.myapp\""); - assertFileContent(project, SETTINGS_GRADLE_KTS, "rootProject.name = \"jhipster\""); - } -} diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleAssertFiles.java b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleAssertFiles.java deleted file mode 100644 index 02e81e867ce..00000000000 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/application/GradleAssertFiles.java +++ /dev/null @@ -1,48 +0,0 @@ -package tech.jhipster.lite.generator.buildtool.gradle.application; - -import static org.assertj.core.api.Assertions.assertThat; -import static tech.jhipster.lite.TestUtils.assertFileExist; -import static tech.jhipster.lite.common.domain.FileUtils.getPathOf; -import static tech.jhipster.lite.generator.project.domain.Constants.BUILD_GRADLE_KTS; -import static tech.jhipster.lite.generator.project.domain.Constants.SETTINGS_GRADLE_KTS; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.attribute.PosixFilePermission; -import java.util.Set; -import tech.jhipster.lite.common.domain.FileUtils; -import tech.jhipster.lite.generator.project.domain.Project; - -public class GradleAssertFiles { - - public static void assertFilesBuildGradleKts(Project project) { - assertFileExist(project, BUILD_GRADLE_KTS); - assertFileExist(project, SETTINGS_GRADLE_KTS); - } - - public static void assertFilesGradleWrapper(Project project) { - assertFileExist(project, "gradlew"); - assertExecutePermission(project, "gradlew"); - assertFileExist(project, "gradlew.bat"); - assertExecutePermission(project, "gradlew.bat"); - assertFileExist(project, "gradle/wrapper/gradle-wrapper.jar"); - assertFileExist(project, "gradle/wrapper/gradle-wrapper.properties"); - } - - private static void assertExecutePermission(Project project, String filename) { - if (!FileUtils.isPosix()) { - return; - } - try { - Set posixFilePermissions = Files.getPosixFilePermissions(getPathOf(project.getFolder(), filename)); - assertThat(posixFilePermissions).contains(PosixFilePermission.OWNER_EXECUTE); - } catch (IOException e) { - throw new AssertionError(e); - } - } - - public static void assertFilesGradle(Project project) { - assertFilesBuildGradleKts(project); - assertFilesGradleWrapper(project); - } -} diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainServiceTest.java b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainServiceTest.java index e659b1eef12..c94df711356 100644 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainServiceTest.java +++ b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleDomainServiceTest.java @@ -1,14 +1,12 @@ package tech.jhipster.lite.generator.buildtool.gradle.domain; import static org.assertj.core.api.Assertions.*; -import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import static tech.jhipster.lite.TestUtils.*; import static tech.jhipster.lite.common.domain.FileUtils.*; import static tech.jhipster.lite.common.domain.WordUtils.*; import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.*; import static tech.jhipster.lite.generator.project.domain.Constants.*; -import static tech.jhipster.lite.generator.project.domain.ProjectFilesAsserter.*; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -22,7 +20,6 @@ import tech.jhipster.lite.error.domain.MissingMandatoryValueException; import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency; import tech.jhipster.lite.generator.project.domain.Project; -import tech.jhipster.lite.generator.project.domain.ProjectFile; import tech.jhipster.lite.generator.project.domain.ProjectRepository; @UnitTest @@ -30,40 +27,10 @@ class GradleDomainServiceTest { @Mock - ProjectRepository projectRepository; + private ProjectRepository projectRepository; @InjectMocks - GradleDomainService gradleDomainService; - - @Test - void shouldInitJava() { - Project project = tmpProject(); - - gradleDomainService.initJava(project); - - verify(projectRepository, times(2)).template(any(ProjectFile.class)); - verify(projectRepository).add(filesCountArgument(4)); - verify(projectRepository, times(2)).setExecutable(any(Project.class), anyString(), anyString()); - } - - @Test - void shouldAddJavaBuildGradleKts() { - Project project = tmpProject(); - - gradleDomainService.addJavaBuildGradleKts(project); - - verify(projectRepository, times(2)).template(any(ProjectFile.class)); - } - - @Test - void shouldAddGradleWrapper() { - Project project = tmpProject(); - - gradleDomainService.addGradleWrapper(project); - - verify(projectRepository).add(filesCountArgument(4)); - verify(projectRepository, times(2)).setExecutable(any(Project.class), anyString(), anyString()); - } + private GradleDomainService gradleDomainService; @Test void shouldAddDependency() { diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java new file mode 100644 index 00000000000..b293f8cb040 --- /dev/null +++ b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/domain/GradleModuleFactoryTest.java @@ -0,0 +1,37 @@ +package tech.jhipster.lite.generator.buildtool.gradle.domain; + +import static tech.jhipster.lite.module.infrastructure.secondary.JHipsterModulesAssertions.*; + +import org.junit.jupiter.api.Test; +import tech.jhipster.lite.TestFileUtils; +import tech.jhipster.lite.UnitTest; +import tech.jhipster.lite.module.domain.JHipsterModule; +import tech.jhipster.lite.module.domain.JHipsterModulesFixture; +import tech.jhipster.lite.module.domain.properties.JHipsterModuleProperties; + +@UnitTest +class GradleModuleFactoryTest { + + private static final GradleModuleFactory factory = new GradleModuleFactory(); + + @Test + void shouldBuildModule() { + JHipsterModuleProperties properties = JHipsterModulesFixture + .propertiesBuilder(TestFileUtils.tmpDirForTest()) + .basePackage("com.jhipster.test") + .projectBaseName("myApp") + .build(); + + JHipsterModule module = factory.buildModule(properties); + + assertThatModule(module) + .createFile("build.gradle.kts") + .containing("group = \"com.jhipster.test\"") + .and() + .createFile("settings.gradle.kts") + .containing("my-app") + .and() + .createExecutableFiles("gradlew", "gradlew.bat") + .createPrefixedFiles("gradle/wrapper", "gradle-wrapper.jar", "gradle-wrapper.properties"); + } +} diff --git a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResourceIT.java b/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResourceIT.java deleted file mode 100644 index d399b131945..00000000000 --- a/src/test/java/tech/jhipster/lite/generator/buildtool/gradle/infrastructure/primary/rest/GradleResourceIT.java +++ /dev/null @@ -1,81 +0,0 @@ -package tech.jhipster.lite.generator.buildtool.gradle.infrastructure.primary.rest; - -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static tech.jhipster.lite.TestUtils.assertFileContent; -import static tech.jhipster.lite.TestUtils.readFileToObject; -import static tech.jhipster.lite.generator.buildtool.gradle.application.GradleAssertFiles.assertFilesBuildGradleKts; -import static tech.jhipster.lite.generator.buildtool.gradle.application.GradleAssertFiles.assertFilesGradle; -import static tech.jhipster.lite.generator.buildtool.gradle.application.GradleAssertFiles.assertFilesGradleWrapper; -import static tech.jhipster.lite.generator.project.domain.Constants.BUILD_GRADLE_KTS; -import static tech.jhipster.lite.generator.project.domain.Constants.SETTINGS_GRADLE_KTS; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; -import org.springframework.http.MediaType; -import org.springframework.test.web.servlet.MockMvc; -import tech.jhipster.lite.IntegrationTest; -import tech.jhipster.lite.TestFileUtils; -import tech.jhipster.lite.TestUtils; -import tech.jhipster.lite.generator.project.domain.Project; -import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; - -@IntegrationTest -@AutoConfigureMockMvc -class GradleResourceIT { - - @Autowired - MockMvc mockMvc; - - @Test - void shouldInit() throws Exception { - ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(TestFileUtils.tmpDirForTest()); - - mockMvc - .perform( - post("/api/build-tools/gradle").contentType(MediaType.APPLICATION_JSON).content(TestUtils.convertObjectToJsonBytes(projectDTO)) - ) - .andExpect(status().isOk()); - - Project project = ProjectDTO.toProject(projectDTO); - assertFilesGradle(project); - - assertFileContent(project, SETTINGS_GRADLE_KTS, "rootProject.name = \"chips\""); - assertFileContent(project, BUILD_GRADLE_KTS, "group = \"tech.jhipster.chips\""); - } - - @Test - void shouldAddBuildGradleKts() throws Exception { - ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(TestFileUtils.tmpDirForTest()); - - mockMvc - .perform( - post("/api/build-tools/gradle/build-gradle") - .contentType(MediaType.APPLICATION_JSON) - .content(TestUtils.convertObjectToJsonBytes(projectDTO)) - ) - .andExpect(status().isOk()); - - Project project = ProjectDTO.toProject(projectDTO); - assertFilesBuildGradleKts(project); - assertFileContent(project, SETTINGS_GRADLE_KTS, "rootProject.name = \"chips\""); - assertFileContent(project, BUILD_GRADLE_KTS, "group = \"tech.jhipster.chips\""); - } - - @Test - void shouldAddGradleWrapper() throws Exception { - ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(TestFileUtils.tmpDirForTest()); - - mockMvc - .perform( - post("/api/build-tools/gradle/wrapper") - .contentType(MediaType.APPLICATION_JSON) - .content(TestUtils.convertObjectToJsonBytes(projectDTO)) - ) - .andExpect(status().isOk()); - - Project project = ProjectDTO.toProject(projectDTO); - assertFilesGradleWrapper(project); - } -} diff --git a/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java b/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java index dbfb905fffa..8bc5a8c5ed7 100644 --- a/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java +++ b/src/test/java/tech/jhipster/lite/generator/ci/github/actions/infrastructure/primary/rest/GitHubActionsResourceIT.java @@ -1,10 +1,9 @@ package tech.jhipster.lite.generator.ci.github.actions.infrastructure.primary.rest; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; -import static tech.jhipster.lite.TestUtils.convertObjectToJsonBytes; -import static tech.jhipster.lite.TestUtils.readFileToObject; -import static tech.jhipster.lite.generator.ci.github.actions.application.GitHubActionsAssertFiles.assertFilesGitHubActions; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*; +import static tech.jhipster.lite.TestUtils.*; +import static tech.jhipster.lite.generator.ci.github.actions.application.GitHubActionsAssertFiles.*; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -13,27 +12,23 @@ import org.springframework.test.web.servlet.MockMvc; import tech.jhipster.lite.IntegrationTest; import tech.jhipster.lite.TestFileUtils; -import tech.jhipster.lite.generator.ci.github.actions.application.GitHubActionsApplicationService; import tech.jhipster.lite.generator.project.domain.Project; import tech.jhipster.lite.generator.project.infrastructure.primary.dto.ProjectDTO; +import tech.jhipster.lite.module.infrastructure.secondary.TestJHipsterModules; @IntegrationTest @AutoConfigureMockMvc class GitHubActionsResourceIT { @Autowired - MockMvc mockMvc; - - @Autowired - GitHubActionsApplicationService gitHubActionsApplicationService; + private MockMvc mockMvc; @Test void shouldAddGitHubActionsForMaven() throws Exception { ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(TestFileUtils.tmpDirForTest()); + Project project = ProjectDTO.toProject(projectDTO); - mockMvc - .perform(post("/api/build-tools/maven").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) - .andExpect(status().isOk()); + TestJHipsterModules.applyGradle(project); mockMvc .perform( @@ -41,17 +36,15 @@ void shouldAddGitHubActionsForMaven() throws Exception { ) .andExpect(status().isOk()); - Project project = ProjectDTO.toProject(projectDTO); assertFilesGitHubActions(project); } @Test void shouldAddGitHubActionsForGradle() throws Exception { ProjectDTO projectDTO = readFileToObject("json/chips.json", ProjectDTO.class).folder(TestFileUtils.tmpDirForTest()); + Project project = ProjectDTO.toProject(projectDTO); - mockMvc - .perform(post("/api/build-tools/gradle").contentType(MediaType.APPLICATION_JSON).content(convertObjectToJsonBytes(projectDTO))) - .andExpect(status().isOk()); + TestJHipsterModules.applyGradle(project); mockMvc .perform( @@ -59,7 +52,6 @@ void shouldAddGitHubActionsForGradle() throws Exception { ) .andExpect(status().isOk()); - Project project = ProjectDTO.toProject(projectDTO); assertFilesGitHubActions(project); } } diff --git a/src/test/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepositoryTest.java b/src/test/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepositoryTest.java index 195a04ccdaf..e82048f11de 100644 --- a/src/test/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepositoryTest.java +++ b/src/test/java/tech/jhipster/lite/generator/project/infrastructure/secondary/ProjectLocalRepositoryTest.java @@ -2,7 +2,6 @@ import static org.assertj.core.api.Assertions.*; import static org.mockito.ArgumentMatchers.*; -import static org.mockito.Mockito.*; import static tech.jhipster.lite.TestUtils.*; import static tech.jhipster.lite.common.domain.FileUtils.*; import static tech.jhipster.lite.generator.project.domain.Constants.*; @@ -13,12 +12,9 @@ import java.nio.file.CopyOption; import java.nio.file.Files; import java.nio.file.Path; -import java.nio.file.attribute.PosixFilePermission; import java.util.Collection; import java.util.List; -import java.util.Set; import java.util.UUID; -import java.util.stream.Collectors; import org.eclipse.jgit.api.errors.InvalidConfigurationException; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -41,26 +37,6 @@ class ProjectLocalRepositoryTest { @InjectMocks private ProjectLocalRepository repository; - @Test - void shouldCreate() { - Project project = tmpProject(); - - repository.create(project); - - assertFileExist(project.getFolder()); - } - - @Test - void shouldNotCreate() { - Project project = tmpProject(); - - try (MockedStatic fileUtils = Mockito.mockStatic(FileUtils.class)) { - fileUtils.when(() -> FileUtils.createFolder(anyString())).thenThrow(new IOException()); - - assertThatThrownBy(() -> repository.create(project)).isExactlyInstanceOf(GeneratorException.class); - } - } - @Test void shouldNotAddFileToUnknownFolder() { ProjectFile file = ProjectFile.forProject(tmpProject()).withSource("common", UUID.randomUUID().toString()).withSameDestination(); @@ -149,27 +125,6 @@ void shouldTemplateWithDestinationAndDestinationFilename() { assertFileExist(project, MAIN_RESOURCES, "FINAL-README.md"); } - @Test - void shouldGetComputedTemplate() { - Project project = tmpProject(); - - String result = repository.getComputedTemplate(project, "mustache", "README.md.mustache"); - - assertThat(result.lines().toList()).isEqualTo("The path is: ".lines().collect(Collectors.toList())); - } - - @Test - void shouldNotGetComputedTemplate() { - Project project = tmpProject(); - - try (MockedStatic mustacheUtils = Mockito.mockStatic(MustacheUtils.class)) { - mustacheUtils.when(() -> MustacheUtils.template(anyString(), any())).thenThrow(new IOException()); - - assertThatThrownBy(() -> repository.getComputedTemplate(project, "mustache", README_MD)) - .isExactlyInstanceOf(GeneratorException.class); - } - } - @Test void shouldContainsRegexp() { Project project = tmpProjectWithPomXml(); @@ -244,46 +199,6 @@ void shouldNotWriteWhenDestinationCantBeCreated() { .isExactlyInstanceOf(GeneratorException.class); } - @Test - void shouldNotSetExecutableForNonPosix() { - Project project = tmpProjectWithPomXml(); - try ( - MockedStatic fileUtilsMock = Mockito.mockStatic(FileUtils.class); - MockedStatic filesMock = Mockito.mockStatic(Files.class) - ) { - fileUtilsMock.when(() -> FileUtils.getPath(Mockito.any(String.class))).thenReturn(project.getFolder()); - fileUtilsMock.when(FileUtils::isPosix).thenReturn(false); - - repository.setExecutable(project, "", POM_XML); - filesMock.verify(() -> Files.setPosixFilePermissions(Mockito.any(), Mockito.any()), never()); - } - } - - @Test - void shouldSetExecutable() throws IOException { - if (!FileUtils.isPosix()) { - return; - } - Project project = tmpProjectWithPomXml(); - String pomXmlFolder = getPath(project.getFolder(), POM_XML); - Set posixFilePermissions = Files.getPosixFilePermissions(getPathOf(pomXmlFolder)); - assertThat(posixFilePermissions).doesNotContain(PosixFilePermission.OWNER_EXECUTE); - - repository.setExecutable(project, "", POM_XML); - - posixFilePermissions = Files.getPosixFilePermissions(getPathOf(pomXmlFolder)); - assertThat(posixFilePermissions).contains(PosixFilePermission.OWNER_EXECUTE); - } - - @Test - void shouldNotSetExecutable() { - if (!FileUtils.isPosix()) { - return; - } - Project project = tmpProject(); - assertThatThrownBy(() -> repository.setExecutable(project, "", POM_XML)).isExactlyInstanceOf(GeneratorException.class); - } - @Test void shouldNotWriteNullText() { Project project = tmpProject(); @@ -386,25 +301,4 @@ void shouldNotDownload() { assertThatThrownBy(() -> repository.download(project)).isExactlyInstanceOf(GeneratorException.class); } } - - @Test - void shouldBeJHipsterLiteProject() throws Exception { - Project project = tmpProject(); - FileUtils.createFolder(getPath(project.getFolder(), JHIPSTER_FOLDER)); - Files.createFile(getPathOf(project.getFolder(), JHIPSTER_FOLDER, HISTORY_JSON)); - - boolean result = repository.isJHipsterLiteProject(project.getFolder()); - - assertThat(result).isTrue(); - } - - @Test - void shouldNotBeJHipsterLiteProject() throws Exception { - Project project = tmpProject(); - FileUtils.createFolder(getPath(project.getFolder(), JHIPSTER_FOLDER)); - - boolean result = repository.isJHipsterLiteProject(project.getFolder()); - - assertThat(result).isFalse(); - } } diff --git a/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java index bd31cca9aef..989f19fb4fc 100644 --- a/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java +++ b/src/test/java/tech/jhipster/lite/module/infrastructure/secondary/TestJHipsterModules.java @@ -3,6 +3,7 @@ import static org.mockito.Mockito.*; import tech.jhipster.lite.error.domain.Assert; +import tech.jhipster.lite.generator.buildtool.gradle.domain.GradleModuleFactory; import tech.jhipster.lite.generator.buildtool.maven.domain.MavenModuleFactory; import tech.jhipster.lite.generator.client.angular.core.domain.AngularModuleFactory; import tech.jhipster.lite.generator.client.react.core.domain.ReactCoreModulesFactory; @@ -23,6 +24,7 @@ public final class TestJHipsterModules { private static final InitModuleFactory initModules = new InitModuleFactory(mock(GitRepository.class)); private static final MavenModuleFactory mavenModules = new MavenModuleFactory(); + private static final GradleModuleFactory gradleModules = new GradleModuleFactory(); private static final AngularModuleFactory angularModules = new AngularModuleFactory(); private static final ReactCoreModulesFactory reactModules = new ReactCoreModulesFactory(); private static final SpringBootCoreModuleFactory springBootModules = new SpringBootCoreModuleFactory(); @@ -41,6 +43,12 @@ public static void applyMaven(Project project) { applyer().module(mavenModules.buildModule(properties)).properties(properties).slug("maven-java").apply(); } + public static void applyGradle(Project project) { + JHipsterModuleProperties properties = new JHipsterModuleProperties(project.getFolder(), project.getConfig()); + + applyer().module(gradleModules.buildModule(properties)).properties(properties).slug("gradle").apply(); + } + public static void applyAngular(Project project) { JHipsterModuleProperties properties = new JHipsterModuleProperties(project.getFolder(), project.getConfig()); diff --git a/tests-ci/config/gradleapp.json b/tests-ci/config/gradleapp.json deleted file mode 100644 index 1df09bf38d6..00000000000 --- a/tests-ci/config/gradleapp.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folder": "/tmp/jhlite/gradleapp", - "generator-jhipster": { - "projectName": "GradleApp Project", - "baseName": "gradleapp", - "packageName": "tech.jhipster.gradleapp" - } -} diff --git a/tests-ci/generate.sh b/tests-ci/generate.sh index 98d346ba436..d340b070e18 100755 --- a/tests-ci/generate.sh +++ b/tests-ci/generate.sh @@ -210,11 +210,6 @@ elif [[ $application == 'mongodbapp' ]]; then callApi "/api/servers/spring-boot/databases/mongodb" callApi "/api/servers/spring-boot/database-migration-tools/mongock" -elif [[ $application == 'gradleapp' ]]; then - callApi "/api/inits/full" - callApi "/api/build-tools/gradle" - callApi "/api/servers/java/base" - elif [[ $application == 'angularapp' ]]; then springboot_mvc sonar_back_front