Merge pull request #1758 from lucasmippon/gradle-utils-methods-reposi…

…tory Add Gradle add repository util method
jhipster · May 18, 2022 · 1b9708c · 1b9708c
2 parents fd096cb + 7d356a1
commit 1b9708c
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 16 deletions.
diff --git a/...in/java/tech/jhipster/lite/generator/buildtool/generic/domain/BuildToolDomainService.java b/...in/java/tech/jhipster/lite/generator/buildtool/generic/domain/BuildToolDomainService.java
@@ -90,6 +90,8 @@ public void addProperty(Project project, String key, String value) {
   public void addRepository(Project project, Repository repository) {
     if (project.isMavenProject()) {
       mavenService.addRepository(project, repository);
+    } else if (project.isGradleProject()) {
+      gradleService.addRepository(project, repository);
     } else {
       throw new GeneratorException(EXCEPTION_NO_BUILD_TOOL);
     }

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
@@ -2,10 +2,12 @@
 
 import java.util.Map;
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
+import tech.jhipster.lite.generator.buildtool.generic.domain.Repository;
 
 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 = ":";
@@ -39,4 +41,15 @@ public static String getDependency(Dependency dependency) {
   public static String getDependencyWithNeedle(Dependency dependency) {
     return getDependency(dependency) + GRADLE_NEEDLE_DEPENDENCY.indent(2);
   }
+
+  public static String getRepositoryString(Repository repository) {
+    return """
+        maven {
+          url = uri("%s")
+        }
+        // jhipster-needle-gradle-repository
+      """.formatted(
+        repository.getUrl()
+      );
+  }
 }
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
@@ -2,15 +2,15 @@
 
 import static tech.jhipster.lite.common.domain.FileUtils.REGEXP_SPACE_STAR;
 import static tech.jhipster.lite.common.domain.FileUtils.getPath;
-import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.END_IMPLEMENTATION;
-import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.GRADLE_NEEDLE_DEPENDENCY;
+import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.*;
 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 static tech.jhipster.lite.generator.project.domain.DefaultConfig.*;
 
 import java.util.List;
 import tech.jhipster.lite.common.domain.WordUtils;
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
+import tech.jhipster.lite.generator.buildtool.generic.domain.Repository;
 import tech.jhipster.lite.generator.project.domain.Project;
 import tech.jhipster.lite.generator.project.domain.ProjectFile;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
@@ -78,4 +78,10 @@ public void deleteDependency(Project project, Dependency dependency) {
 
     projectRepository.replaceRegexp(project, "", BUILD_GRADLE_KTS, dependencyNodeRegExp, "");
   }
+
+  @Override
+  public void addRepository(Project project, Repository repository) {
+    String repositoryString = Gradle.getRepositoryString(repository);
+    projectRepository.replaceText(project, "", BUILD_GRADLE_KTS, REGEXP_SPACE_STAR + GRADLE_NEEDLE_REPOSITORY, repositoryString);
+  }
 }
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
@@ -1,15 +1,16 @@
 package tech.jhipster.lite.generator.buildtool.gradle.domain;
 
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
+import tech.jhipster.lite.generator.buildtool.generic.domain.Repository;
 import tech.jhipster.lite.generator.project.domain.Project;
 
 public interface GradleService {
   void initJava(Project project);
 
-  void addJavaBuildGradleKts(Project project);
-  void addGradleWrapper(Project project);
-
   void addDependency(Project project, Dependency dependency);
-
   void deleteDependency(Project project, Dependency dependency);
+  void addRepository(Project project, Repository repository);
+
+  void addJavaBuildGradleKts(Project project);
+  void addGradleWrapper(Project project);
 }
diff --git a/...ava/tech/jhipster/lite/generator/buildtool/generic/domain/BuildToolDomainServiceTest.java b/...ava/tech/jhipster/lite/generator/buildtool/generic/domain/BuildToolDomainServiceTest.java
@@ -200,6 +200,16 @@ void shouldDeleteDependency() {
 
       verify(gradleService).deleteDependency(project, dependency);
     }
+
+    @Test
+    void shouldAddRepository() {
+      Project project = tmpProjectWithBuildGradle();
+      Repository repository = getRepository();
+
+      buildToolDomainService.addRepository(project, repository);
+
+      verify(gradleService).addRepository(project, repository);
+    }
   }
 
   @Nested

diff --git a/...omain/gradle/GradleDomainServiceTest.java → ...radle/domain/GradleDomainServiceTest.java b/...omain/gradle/GradleDomainServiceTest.java → ...radle/domain/GradleDomainServiceTest.java
@@ -1,4 +1,15 @@
-package tech.jhipster.lite.generator.buildtool.gradle.domain.gradle;
+package tech.jhipster.lite.generator.buildtool.gradle.domain;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static tech.jhipster.lite.TestUtils.tmpProject;
+import static tech.jhipster.lite.TestUtils.tmpProjectWithBuildGradle;
+import static tech.jhipster.lite.common.domain.FileUtils.REGEXP_SPACE_STAR;
+import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.GRADLE_NEEDLE_DEPENDENCY;
+import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.GRADLE_NEEDLE_REPOSITORY;
+import static tech.jhipster.lite.generator.project.domain.ProjectFilesAsserter.filesCountArgument;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -7,20 +18,12 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import tech.jhipster.lite.UnitTest;
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
+import tech.jhipster.lite.generator.buildtool.generic.domain.Repository;
 import tech.jhipster.lite.generator.buildtool.gradle.domain.GradleDomainService;
 import tech.jhipster.lite.generator.project.domain.Project;
 import tech.jhipster.lite.generator.project.domain.ProjectFile;
 import tech.jhipster.lite.generator.project.domain.ProjectRepository;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
-import static tech.jhipster.lite.TestUtils.tmpProject;
-import static tech.jhipster.lite.TestUtils.tmpProjectWithBuildGradle;
-import static tech.jhipster.lite.common.domain.FileUtils.REGEXP_SPACE_STAR;
-import static tech.jhipster.lite.generator.buildtool.gradle.domain.Gradle.GRADLE_NEEDLE_DEPENDENCY;
-import static tech.jhipster.lite.generator.project.domain.ProjectFilesAsserter.filesCountArgument;
-
 @UnitTest
 @ExtendWith(MockitoExtension.class)
 class GradleDomainServiceTest {
@@ -82,4 +85,21 @@ void shouldDeleteDependency() {
     String regexToReplace = "(?s)" + "implementation(\"org.springframework.boot:spring-boot-starter.*\")\n".indent(2);
     verify(projectRepository).replaceRegexp(project, "", "build.gradle.kts", regexToReplace, "");
   }
+
+  @Test
+  void shouldAddRepository() {
+    Project project = tmpProjectWithBuildGradle();
+    Repository repository = Repository.builder().id("spring-milestone").url("https://repo.spring.io/milestone").build();
+
+    gradleDomainService.addRepository(project, repository);
+
+    String repositoryString =
+      """
+        maven {
+          url = uri("https://repo.spring.io/milestone")
+        }
+        // jhipster-needle-gradle-repository
+      """;
+    verify(projectRepository).replaceText(project, "", "build.gradle.kts", REGEXP_SPACE_STAR + GRADLE_NEEDLE_REPOSITORY, repositoryString);
+  }
 }