Springdoc / remove old contains dependency method

jhipster · May 31, 2022 · b1d1383 · b1d1383
1 parent 2ea291f
commit b1d1383
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 83 deletions.
diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/Maven.java b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/Maven.java
@@ -72,8 +72,6 @@ public class Maven {
   public static final String PLUGIN_REPOSITORY_BEGIN = "<pluginRepository>";
   public static final String PLUGIN_REPOSITORY_END = "</pluginRepository>";
 
-  public static final String DEPENDENCY_REGEX_FORMAT = "^\\s+<artifactId>%s<\\/artifactId>\\s+";
-
   private Maven() {}
 
   public static String getParent(Parent parent) {

diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenDomainService.java b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenDomainService.java
@@ -16,7 +16,6 @@
 import static tech.jhipster.lite.generator.project.domain.DefaultConfig.PRETTIER_DEFAULT_INDENT;
 import static tech.jhipster.lite.generator.project.domain.DefaultConfig.PROJECT_NAME;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.regex.Matcher;
@@ -286,11 +285,4 @@ public Optional<String> getName(String folder) {
 
     return FileUtils.getValueBetween(getPath(folder, POM_XML), NAME_BEGIN, NAME_END);
   }
-
-  @Override
-  public boolean containsDependency(Project project, String dependencyName) throws IOException {
-    String pomContent = FileUtils.read(getPath(project.getFolder(), POM_XML));
-    String regex = DEPENDENCY_REGEX_FORMAT.formatted(dependencyName);
-    return Pattern.compile(regex, Pattern.MULTILINE).matcher(pomContent).find();
-  }
 }
diff --git a/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenService.java b/src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenService.java
@@ -1,6 +1,5 @@
 package tech.jhipster.lite.generator.buildtool.maven.domain;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import tech.jhipster.lite.generator.buildtool.generic.domain.Dependency;
@@ -32,6 +31,4 @@ public interface MavenService {
   Optional<String> getGroupId(String folder);
 
   Optional<String> getName(String folder);
-
-  boolean containsDependency(Project project, String dependencyName) throws IOException;
 }
diff --git a/...ava/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenDomainServiceTest.java b/...ava/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenDomainServiceTest.java
@@ -6,12 +6,15 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static tech.jhipster.lite.TestUtils.*;
+import static tech.jhipster.lite.TestUtils.tmpProject;
+import static tech.jhipster.lite.TestUtils.tmpProjectWithPomXml;
 import static tech.jhipster.lite.common.domain.FileUtils.getPath;
-import static tech.jhipster.lite.generator.buildtool.maven.domain.Maven.*;
+import static tech.jhipster.lite.generator.buildtool.maven.domain.Maven.GROUP_ID_BEGIN;
+import static tech.jhipster.lite.generator.buildtool.maven.domain.Maven.GROUP_ID_END;
+import static tech.jhipster.lite.generator.buildtool.maven.domain.Maven.NAME_BEGIN;
+import static tech.jhipster.lite.generator.buildtool.maven.domain.Maven.NAME_END;
 import static tech.jhipster.lite.generator.project.domain.Constants.POM_XML;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import org.junit.jupiter.api.Nested;
@@ -282,71 +285,4 @@ void shouldNotGetVersionForWrongPattern() {
       }
     }
   }
-
-  @Nested
-  class ContainsDependencyTest {
-
-    @Test
-    void shouldReturnTrueWhenFound() throws IOException {
-      Project project = Project.builder().folder("/folder").build();
-      try (MockedStatic<FileUtils> fileUtilsMock = Mockito.mockStatic(FileUtils.class)) {
-        String pomContent =
-          """
-            <dependency>
-              <groupId>org.springframework.boot</groupId>
-              <artifactId>spring-boot</artifactId>
-              <version>${spring-boot.version}</version>
-            </dependency>
-            <dependency>
-             <groupId>org.springframework.boot</groupId>
-             <artifactId>spring-boot-starter-web</artifactId>
-           </dependency>
-          """;
-        fileUtilsMock.when(() -> FileUtils.getPath(project.getFolder(), "pom.xml")).thenReturn("/folder/pom.xml");
-        fileUtilsMock.when(() -> FileUtils.read("/folder/pom.xml")).thenReturn(pomContent);
-
-        assertThat(mavenDomainService.containsDependency(project, "spring-boot")).isTrue();
-      }
-    }
-
-    @Test
-    void shouldReturnFalseWhenNotFound() throws IOException {
-      Project project = Project.builder().folder("/folder").build();
-      try (MockedStatic<FileUtils> fileUtilsMock = Mockito.mockStatic(FileUtils.class)) {
-        fileUtilsMock.when(() -> FileUtils.getPath(project.getFolder(), "pom.xml")).thenReturn("/folder/pom.xml");
-        fileUtilsMock
-          .when(() -> FileUtils.read("/folder/pom.xml"))
-          .thenReturn(
-            """
-              <dependency>
-               <groupId>org.springframework.boot</groupId>
-               <artifactId>spring-boot-starter-web</artifactId>
-             </dependency>
-            """
-          );
-
-        assertThat(mavenDomainService.containsDependency(project, "spring-boot")).isFalse();
-      }
-    }
-
-    @Test
-    void shouldReturnFalseWhenCommented() throws IOException {
-      Project project = Project.builder().folder("/folder").build();
-      try (MockedStatic<FileUtils> fileUtilsMock = Mockito.mockStatic(FileUtils.class)) {
-        fileUtilsMock.when(() -> FileUtils.getPath(project.getFolder(), "pom.xml")).thenReturn("/folder/pom.xml");
-        fileUtilsMock
-          .when(() -> FileUtils.read("/folder/pom.xml"))
-          .thenReturn(
-            """
-            <!--    <dependency>-->
-            <!--      <groupId>org.springframework.boot</groupId>-->
-            <!--      <artifactId>spring-boot-starter</artifactId>-->
-            <!--    </dependency>-->
-            """
-          );
-
-        assertThat(mavenDomainService.containsDependency(project, "spring-boot-starter")).isFalse();
-      }
-    }
-  }
 }