Skip to content

Commit

Permalink
Merge pull request #610 from pascalgrimaud/split-package-json-related…
Browse files Browse the repository at this point in the history
…-to-dependencies

Refactoring and move package.json to dependencies/common
  • Loading branch information
pascalgrimaud authored Jan 28, 2022
2 parents 462303d + bd5ab9a commit 65f7951
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ updates:
labels:
- 'area: dependencies'
- package-ecosystem: 'npm'
directory: '/src/main/resources/generator/dependencies/'
directory: '/src/main/resources/generator/dependencies/common'
schedule:
interval: 'daily'
open-pull-requests-limit: 20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ private void addDevDependencies(Project project) {
List
.of("@prettier/plugin-xml", "husky", "lint-staged", "prettier", "prettier-plugin-java", "prettier-plugin-packagejson")
.forEach(dependency ->
npmService.getVersion(dependency).ifPresent(version -> npmService.addDevDependency(project, dependency, version))
npmService.getVersionInCommon(dependency).ifPresent(version -> npmService.addDevDependency(project, dependency, version))
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,15 @@ public void prettify(Project project) {
}

@Override
public Optional<String> getVersion(String name) {
public Optional<String> getVersionInCommon(String name) {
return getVersion("common", name);
}

private Optional<String> getVersion(String folderType, String name) {
Assert.notBlank("folderType", folderType);
Assert.notBlank("name", name);
return FileUtils
.readLineInClasspath(getPath(TEMPLATE_FOLDER, DEPENDENCIES_FOLDER, PACKAGE_JSON), DQ + name + DQ)
.readLineInClasspath(getPath(TEMPLATE_FOLDER, DEPENDENCIES_FOLDER, folderType, PACKAGE_JSON), DQ + name + DQ)
.map(readValue -> {
String[] result = readValue.split(":");
if (result.length == 2) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ public interface NpmService {
void install(Project project);
void prettify(Project project);

Optional<String> getVersion(String name);
Optional<String> getVersionInCommon(String name);
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public void init(Project project) {
Typescript
.devDependencies()
.forEach(dependency ->
npmService.getVersion(dependency).ifPresent(version -> npmService.addDevDependency(project, dependency, version))
npmService.getVersionInCommon(dependency).ifPresent(version -> npmService.addDevDependency(project, dependency, version))
);
Typescript.scripts().forEach((name, cmd) -> npmService.addScript(project, name, cmd));
Typescript.files().forEach(file -> projectRepository.add(project, SOURCE, file));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void shouldInit() {
@Test
void shouldAddPackageJson() {
Project project = tmpProject();
when(npmService.getVersion(anyString())).thenReturn(Optional.of("0.0.0"));
when(npmService.getVersionInCommon(anyString())).thenReturn(Optional.of("0.0.0"));

assertThatCode(() -> initDomainService.addPackageJson(project)).doesNotThrowAnyException();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,40 +76,40 @@ void shouldPrettify() {
}

@Nested
class GetVersionTest {
class GetVersionInCommonTest {

@Test
void shouldGetVersion() {
assertThat(npmDomainService.getVersion("prettier-plugin-java")).isNotEmpty();
assertThat(npmDomainService.getVersionInCommon("prettier-plugin-java")).isNotEmpty();
}

@Test
void shouldNotGetVersionForNull() {
assertThatThrownBy(() -> npmDomainService.getVersion(null))
assertThatThrownBy(() -> npmDomainService.getVersionInCommon(null))
.isExactlyInstanceOf(MissingMandatoryValueException.class)
.hasMessageContaining("name");
}

@Test
void shouldNotGetVersionForBlank() {
assertThatThrownBy(() -> npmDomainService.getVersion(" "))
assertThatThrownBy(() -> npmDomainService.getVersionInCommon(" "))
.isExactlyInstanceOf(MissingMandatoryValueException.class)
.hasMessageContaining("name");
}

@Test
void shouldNotGetVersion() {
assertThat(npmDomainService.getVersion("unknown")).isEmpty();
assertThat(npmDomainService.getVersionInCommon("unknown")).isEmpty();
}

@Test
void shouldNotGetVersionForDescription() {
assertThat(npmDomainService.getVersion("description")).isEmpty();
assertThat(npmDomainService.getVersionInCommon("description")).isEmpty();
}

@Test
void shouldNotGetVersionForCloseBracket() {
assertThat(npmDomainService.getVersion("}")).isEmpty();
assertThat(npmDomainService.getVersionInCommon("}")).isEmpty();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class TypescriptDomainServiceTest {
@Test
void shouldInit() {
Project project = tmpProject();
when(npmService.getVersion(anyString())).thenReturn(Optional.of("0.0.0"));
when(npmService.getVersionInCommon(anyString())).thenReturn(Optional.of("0.0.0"));

typescriptDomainService.init(project);

Expand Down

0 comments on commit 65f7951

Please sign in to comment.