Add git methods to Project Repository

jhipster · Dec 1, 2021 · 3c13adc · 3c13adc
1 parent 9ff99e1
commit 3c13adc
Show file tree

Hide file tree

Showing 3 changed files with 105 additions and 0 deletions.
diff --git a/src/main/java/tech/jhipster/light/generator/project/domain/ProjectRepository.java b/src/main/java/tech/jhipster/light/generator/project/domain/ProjectRepository.java
@@ -12,4 +12,8 @@ public interface ProjectRepository {
   void template(Project project, String source, String sourceFilename, String destination, String destinationFilename);
 
   void write(Project project, String text, String destination, String destinationFilename);
+
+  void gitInit(Project project);
+  void gitAddAndCommit(Project project, String message);
+  void gitApplyPatch(Project project, String patchFilename);
 }
diff --git a/...ech/jhipster/light/generator/project/infrastructure/secondary/ProjectLocalRepository.java b/...ech/jhipster/light/generator/project/infrastructure/secondary/ProjectLocalRepository.java
@@ -9,6 +9,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import org.eclipse.jgit.api.errors.GitAPIException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
@@ -95,4 +96,31 @@ public void write(Project project, String text, String destination, String desti
       throw new GeneratorException("Error when writing text to '" + projectDestinationFilename + "'");
     }
   }
+
+  @Override
+  public void gitInit(Project project) {
+    try {
+      GitUtils.init(project.getFolder());
+    } catch (GitAPIException e) {
+      throw new GeneratorException("Error when git init", e);
+    }
+  }
+
+  @Override
+  public void gitAddAndCommit(Project project, String message) {
+    try {
+      GitUtils.addAndCommit(project.getFolder(), message);
+    } catch (GitAPIException | IOException e) {
+      throw new GeneratorException("Error when git add and commit", e);
+    }
+  }
+
+  @Override
+  public void gitApplyPatch(Project project, String patchFilename) {
+    try {
+      GitUtils.apply(project.getFolder(), patchFilename);
+    } catch (GitAPIException | IOException e) {
+      throw new GeneratorException("Error when git apply patch", e);
+    }
+  }
 }
diff --git a/...jhipster/light/generator/project/infrastructure/secondary/ProjectLocalRepositoryTest.java b/...jhipster/light/generator/project/infrastructure/secondary/ProjectLocalRepositoryTest.java
@@ -6,14 +6,19 @@
 import static tech.jhipster.light.TestUtils.*;
 import static tech.jhipster.light.common.domain.FileUtils.getPath;
 import static tech.jhipster.light.generator.project.domain.Constants.MAIN_RESOURCES;
+import static tech.jhipster.light.generator.project.domain.Constants.TEST_TEMPLATE_RESOURCES;
 
 import com.github.mustachejava.MustacheNotFoundException;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.CopyOption;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.UUID;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.api.errors.InvalidConfigurationException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -181,4 +186,72 @@ void shouldNotWriteNullText() {
       .isExactlyInstanceOf(MissingMandatoryValueException.class)
       .hasMessageContaining("text");
   }
+
+  @Test
+  void shouldGitInit() {
+    Project project = tmpProject();
+
+    repository.gitInit(project);
+
+    assertFileExist(project, ".git/config");
+  }
+
+  @Test
+  void shouldNotGitInit() {
+    Project project = tmpProject();
+
+    try (MockedStatic<GitUtils> gitUtils = Mockito.mockStatic(GitUtils.class)) {
+      gitUtils.when(() -> GitUtils.init(anyString())).thenThrow(new InvalidConfigurationException("error"));
+
+      assertThatThrownBy(() -> repository.gitInit(project)).isExactlyInstanceOf(GeneratorException.class);
+      assertFileNotExist(project, ".git/config");
+    }
+  }
+
+  @Test
+  void shouldInitThenAddAndCommit() throws Exception {
+    Project project = tmpProject();
+
+    repository.gitInit(project);
+    File file = File.createTempFile("hello", ".world", new File(project.getFolder()));
+    repository.gitAddAndCommit(project, "1st commit");
+
+    assertFileExist(project, ".git");
+    assertFileExist(project, file.getName());
+  }
+
+  @Test
+  void shouldNotAddAndCommit() {
+    Project project = tmpProject();
+
+    try (MockedStatic<GitUtils> gitUtils = Mockito.mockStatic(GitUtils.class)) {
+      gitUtils.when(() -> GitUtils.addAndCommit(anyString(), anyString())).thenThrow(new InvalidConfigurationException("error"));
+
+      assertThatThrownBy(() -> repository.gitAddAndCommit(project, "1st commit")).isExactlyInstanceOf(GeneratorException.class);
+      assertFileNotExist(project, ".git/config");
+    }
+  }
+
+  @Test
+  void shouldGitApplyPatch() {
+    Project project = tmpProject();
+
+    repository.gitInit(project);
+    repository.gitApplyPatch(project, getPath(TEST_TEMPLATE_RESOURCES, "utils", "example.patch"));
+
+    assertFileExist(project, "example.md");
+  }
+
+  @Test
+  void shouldNotApplyPatch() {
+    Project project = tmpProject();
+
+    try (MockedStatic<GitUtils> gitUtils = Mockito.mockStatic(GitUtils.class)) {
+      gitUtils.when(() -> GitUtils.apply(anyString(), anyString())).thenThrow(new InvalidConfigurationException("error"));
+
+      assertThatThrownBy(() -> repository.gitApplyPatch(project, getPath(TEST_TEMPLATE_RESOURCES, "utils", "example.patch")))
+        .isExactlyInstanceOf(GeneratorException.class);
+      assertFileNotExist(project, "example.md");
+    }
+  }
 }