Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Delete maven module parts #2486

Merged
merged 1 commit into from
Jul 11, 2022
Merged

Delete maven module parts #2486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions ...ava/tech/jhipster/lite/generator/buildtool/maven/application/MavenApplicationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,4 @@ public void addRepository(Project project, Repository repository) {
public void addPluginRepository(Project project, Repository repository) {
mavenService.addPluginRepository(project, repository);
}

public void addPomXml(Project project) {
mavenService.addJavaPomXml(project);
}

public void addMavenWrapper(Project project) {
mavenService.addMavenWrapper(project);
}
}
49 changes: 4 additions & 45 deletions src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenDomainService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,22 @@
package tech.jhipster.lite.generator.buildtool.maven.domain;

import static tech.jhipster.lite.common.domain.FileUtils.REGEXP_PREFIX_MULTILINE;
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.common.domain.WordUtils.DEFAULT_INDENTATION;
import static tech.jhipster.lite.common.domain.WordUtils.LF;
import static tech.jhipster.lite.common.domain.WordUtils.indent;
import static tech.jhipster.lite.common.domain.FileUtils.*;
import static tech.jhipster.lite.common.domain.WordUtils.*;
import static tech.jhipster.lite.generator.buildtool.maven.domain.Maven.*;
import static tech.jhipster.lite.generator.project.domain.Constants.DEPENDENCIES_FOLDER;
import static tech.jhipster.lite.generator.project.domain.Constants.POM_XML;
import static tech.jhipster.lite.generator.project.domain.Constants.TEMPLATE_FOLDER;
import static tech.jhipster.lite.generator.project.domain.DefaultConfig.BASE_NAME;
import static tech.jhipster.lite.generator.project.domain.DefaultConfig.PACKAGE_NAME;
import static tech.jhipster.lite.generator.project.domain.DefaultConfig.PRETTIER_DEFAULT_INDENT;
import static tech.jhipster.lite.generator.project.domain.DefaultConfig.PROJECT_NAME;
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 java.util.regex.Matcher;
import java.util.regex.Pattern;
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.buildtool.generic.domain.Parent;
import tech.jhipster.lite.generator.buildtool.generic.domain.Plugin;
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;

public class MavenDomainService implements MavenService {
Expand Down Expand Up @@ -216,36 +205,6 @@ private void addRepository(Project project, Repository repository, String needle
}
}

@Override
public void addJavaPomXml(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, POM_XML).withSameDestination());
}

@Override
public void addMavenWrapper(Project project) {
projectRepository.add(ProjectFile.forProject(project).withSource(SOURCE, "mvnw").withSameDestination());
projectRepository.setExecutable(project, "", "mvnw");

projectRepository.add(ProjectFile.forProject(project).withSource(SOURCE, "mvnw.cmd").withSameDestination());
projectRepository.setExecutable(project, "", "mvnw.cmd");

String sourceWrapper = getPath(SOURCE, ".mvn", "wrapper");
String destinationWrapper = getPath(".mvn", "wrapper");
projectRepository.add(
ProjectFile.forProject(project).withSource(sourceWrapper, "maven-wrapper.jar").withDestinationFolder(destinationWrapper)
);
projectRepository.add(
ProjectFile.forProject(project).withSource(sourceWrapper, "maven-wrapper.properties").withDestinationFolder(destinationWrapper)
);
}

@Override
public Optional<String> getVersion(String name) {
Assert.notBlank("name", name);
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/tech/jhipster/lite/generator/buildtool/maven/domain/MavenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ public interface MavenService {
void addRepository(Project project, Repository repository);
void addPluginRepository(Project project, Repository repository);

void addJavaPomXml(Project project);
void addMavenWrapper(Project project);

Optional<String> getVersion(String name);

Optional<String> getGroupId(String folder);
Expand Down
44 changes: 0 additions & 44 deletions ...ch/jhipster/lite/generator/buildtool/maven/infrastructure/primary/rest/MavenResource.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/main/java/tech/jhipster/lite/generator/project/domain/GeneratorAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ private GeneratorAction() {}
// Init
public static final String DOWNLOAD = "download";

// Maven
public static final String MAVEN_JAVA_POM_XML = "maven-java-pom-xml";
public static final String MAVEN_WRAPPER = "maven-wrapper";

// Gradle
public static final String GRADLE_JAVA = "gradle-java";
public static final String GRADLE_JAVA_BUILD_GRADLE_KTS = "gradle-java-build-gradle-kts";
Expand Down
23 changes: 1 addition & 22 deletions ...a/tech/jhipster/lite/generator/buildtool/maven/application/MavenApplicationServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import static org.assertj.core.api.Assertions.*;
import static tech.jhipster.lite.TestUtils.*;
import static tech.jhipster.lite.common.domain.WordUtils.*;
import static tech.jhipster.lite.generator.buildtool.maven.application.MavenAssertFiles.*;
import static tech.jhipster.lite.generator.project.domain.Constants.*;

import java.util.List;
Expand All @@ -23,7 +22,7 @@
class MavenApplicationServiceIT {

@Autowired
MavenApplicationService mavenApplicationService;
private MavenApplicationService mavenApplicationService;

@Test
void shouldAddParent() {
Expand Down Expand Up @@ -626,24 +625,4 @@ void shouldAddPluginRepositoryOnlyOneTime() throws Exception {
1
);
}

@Test
void shouldAddPomXml() {
Project project = tmpProject();

mavenApplicationService.addPomXml(project);

assertFilesPomXml(project);
assertFileContent(project, POM_XML, "<name>jhipster</name>");
assertFileContent(project, POM_XML, "<description>JHipster Project</description>");
}

@Test
void shouldAddMavenWrapper() {
Project project = tmpProject();

mavenApplicationService.addMavenWrapper(project);

assertFilesMavenWrapper(project);
}
}
46 changes: 0 additions & 46 deletions src/test/java/tech/jhipster/lite/generator/buildtool/maven/application/MavenAssertFiles.java
View file
Open in desktop

This file was deleted.

41 changes: 7 additions & 34 deletions ...ava/tech/jhipster/lite/generator/buildtool/maven/domain/maven/MavenDomainServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
package tech.jhipster.lite.generator.buildtool.maven.domain.maven;

import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
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.tmpProjectWithPomXml;
import static tech.jhipster.lite.common.domain.FileUtils.getPath;
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 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.buildtool.maven.domain.Maven.*;
import static tech.jhipster.lite.generator.project.domain.Constants.*;

import java.util.List;
import java.util.Optional;
Expand All @@ -34,7 +27,6 @@
import tech.jhipster.lite.generator.buildtool.generic.domain.Repository;
import tech.jhipster.lite.generator.buildtool.maven.domain.MavenDomainService;
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
Expand Down Expand Up @@ -165,25 +157,6 @@ void shouldAddPluginRepository() {
verify(projectRepository).replaceText(any(Project.class), anyString(), anyString(), anyString(), anyString());
}

@Test
void shouldAddJavaPomXml() {
Project project = tmpProject();

mavenDomainService.addJavaPomXml(project);

verify(projectRepository).template(any(ProjectFile.class));
}

@Test
void shouldAddMavenWrapper() {
Project project = tmpProject();

mavenDomainService.addMavenWrapper(project);

verify(projectRepository, times(4)).add(any(ProjectFile.class));
verify(projectRepository, times(2)).setExecutable(any(Project.class), anyString(), anyString());
}

@Nested
class GetGroupIdTest {

Expand Down
78 changes: 0 additions & 78 deletions .../jhipster/lite/generator/buildtool/maven/infrastructure/primary/rest/MavenResourceIT.java
View file
Open in desktop

This file was deleted.

Loading