-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: re-apply custom-jhlite module to get npm/maven version readers
- Loading branch information
Showing
10 changed files
with
229 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
19 changes: 19 additions & 0 deletions
19
...ster/lite/extension/shared/dependencies/domain/JhliteExtensionSampleNpmVersionSource.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
package tech.jhipster.lite.extension.shared.dependencies.domain; | ||
|
||
import tech.jhipster.lite.module.domain.npm.NpmVersionSource; | ||
import tech.jhipster.lite.module.domain.npm.NpmVersionSourceFactory; | ||
|
||
public enum JhliteExtensionSampleNpmVersionSource implements NpmVersionSourceFactory { | ||
JHLITE_EXTENSION_SAMPLE("jhlite-extension-sample"); | ||
|
||
private final String source; | ||
|
||
JhliteExtensionSampleNpmVersionSource(String source) { | ||
this.source = source; | ||
} | ||
|
||
@Override | ||
public NpmVersionSource build() { | ||
return new NpmVersionSource(source); | ||
} | ||
} |
27 changes: 27 additions & 0 deletions
27
...d/dependencies/infrastructure/secondary/JhliteExtensionSampleMavenDependenciesReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package tech.jhipster.lite.extension.shared.dependencies.infrastructure.secondary; | ||
|
||
import org.springframework.core.Ordered; | ||
import org.springframework.core.annotation.Order; | ||
import org.springframework.stereotype.Repository; | ||
import tech.jhipster.lite.module.domain.ProjectFiles; | ||
import tech.jhipster.lite.module.domain.javadependency.JavaDependenciesVersions; | ||
import tech.jhipster.lite.module.infrastructure.secondary.javadependency.FileSystemMavenDependenciesReader; | ||
import tech.jhipster.lite.module.infrastructure.secondary.javadependency.JavaDependenciesReader; | ||
|
||
@Repository | ||
@Order(Ordered.HIGHEST_PRECEDENCE) | ||
public class JhliteExtensionSampleMavenDependenciesReader implements JavaDependenciesReader { | ||
|
||
private static final String CURRENT_VERSIONS_FILE = "/generator/jhlite-extension-sample-dependencies/pom.xml"; | ||
|
||
private final FileSystemMavenDependenciesReader reader; | ||
|
||
public JhliteExtensionSampleMavenDependenciesReader(ProjectFiles files) { | ||
this.reader = new FileSystemMavenDependenciesReader(files, CURRENT_VERSIONS_FILE); | ||
} | ||
|
||
@Override | ||
public JavaDependenciesVersions get() { | ||
return reader.get(); | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
...n/shared/dependencies/infrastructure/secondary/JhliteExtensionSampleNpmVersionReader.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package tech.jhipster.lite.extension.shared.dependencies.infrastructure.secondary; | ||
|
||
import java.util.List; | ||
import org.springframework.core.Ordered; | ||
import org.springframework.core.annotation.Order; | ||
import org.springframework.stereotype.Repository; | ||
import tech.jhipster.lite.extension.shared.dependencies.domain.JhliteExtensionSampleNpmVersionSource; | ||
import tech.jhipster.lite.module.domain.ProjectFiles; | ||
import tech.jhipster.lite.module.domain.npm.NpmPackagesVersions; | ||
import tech.jhipster.lite.module.infrastructure.secondary.npm.FileSystemNpmVersionReader; | ||
import tech.jhipster.lite.module.infrastructure.secondary.npm.NpmVersionsReader; | ||
|
||
@Repository | ||
@Order(Ordered.HIGHEST_PRECEDENCE) | ||
public class JhliteExtensionSampleNpmVersionReader implements NpmVersionsReader { | ||
|
||
private static final String PARENT_FOLDER = "/generator/jhlite-extension-sample-dependencies/"; | ||
|
||
private final FileSystemNpmVersionReader reader; | ||
|
||
public JhliteExtensionSampleNpmVersionReader(ProjectFiles projectFiles) { | ||
reader = new FileSystemNpmVersionReader(projectFiles, List.of(JhliteExtensionSampleNpmVersionSource.values()), PARENT_FOLDER); | ||
} | ||
|
||
@Override | ||
public NpmPackagesVersions get() { | ||
return reader.get(); | ||
} | ||
} |
2 changes: 2 additions & 0 deletions
2
src/main/java/tech/jhipster/lite/extension/shared/dependencies/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
@tech.jhipster.lite.extension.SharedKernel | ||
package tech.jhipster.lite.extension.shared.dependencies; |
5 changes: 5 additions & 0 deletions
5
...urces/generator/jhlite-extension-sample-dependencies/jhlite-extension-sample/package.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"dependencies": { | ||
"prettier-plugin-properties": "0.3.0" | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
src/main/resources/generator/jhlite-extension-sample-dependencies/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
<?xml version="1.0" encoding="UTF-8" ?> | ||
<project | ||
xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" | ||
> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<artifactId>jhlite-extension-sample-dependencies</artifactId> | ||
<version>0.0.7-SNAPSHOT</version> | ||
<name>JHLite Extension Sample dependencies</name> | ||
<description>JHLite Extension Sample dependencies list</description> | ||
<packaging>pom</packaging> | ||
|
||
<properties> | ||
<!-- Version slugs of dependencies added by jhipster-lite modules should be declared here --> | ||
</properties> | ||
|
||
<dependencyManagement> | ||
<dependencies> | ||
<!-- Dependencies that will be added by jhipster-lite modules should be declared here --> | ||
</dependencies> | ||
</dependencyManagement> | ||
</project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...pendencies/infrastructure/secondary/JhliteExtensionSampleMavenDependenciesReaderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
package tech.jhipster.lite.extension.shared.dependencies.infrastructure.secondary; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.mockito.ArgumentMatchers.anyString; | ||
import static org.mockito.Mockito.when; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.mockito.InjectMocks; | ||
import org.mockito.Mock; | ||
import org.mockito.junit.jupiter.MockitoExtension; | ||
import tech.jhipster.lite.extension.UnitTest; | ||
import tech.jhipster.lite.module.domain.ProjectFiles; | ||
import tech.jhipster.lite.module.domain.javabuild.VersionSlug; | ||
import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; | ||
import tech.jhipster.lite.module.domain.javadependency.Version; | ||
|
||
@UnitTest | ||
@ExtendWith(MockitoExtension.class) | ||
class JhliteExtensionSampleMavenDependenciesReaderTest { | ||
|
||
@Mock | ||
private ProjectFiles projectFiles; | ||
|
||
@InjectMocks | ||
private JhliteExtensionSampleMavenDependenciesReader reader; | ||
|
||
@Test | ||
void shouldGetVersionFromCustomSource() { | ||
mockProjectFiles(); | ||
|
||
JavaDependencyVersion version = reader.get().get(new VersionSlug("jacoco")); | ||
|
||
assertThat(version.version()).isEqualTo(new Version("0.8.12")); | ||
} | ||
|
||
private void mockProjectFiles() { | ||
when(projectFiles.readString(anyString())).thenReturn( | ||
""" | ||
<?xml version="1.0" encoding="UTF-8" ?> | ||
<project | ||
xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" | ||
> | ||
<properties> | ||
<jacoco.version>0.8.12</jacoco.version> | ||
</properties> | ||
<dependencyManagement> | ||
<dependencies> | ||
<dependency> | ||
<groupId>org.jacoco</groupId> | ||
<artifactId>jacoco-maven-plugin</artifactId> | ||
<version>${jacoco.version}</version> | ||
</dependency> | ||
</dependencies> | ||
</dependencyManagement> | ||
</project> | ||
""" | ||
); | ||
} | ||
} |
48 changes: 48 additions & 0 deletions
48
...ared/dependencies/infrastructure/secondary/JhliteExtensionSampleNpmVersionReaderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
package tech.jhipster.lite.extension.shared.dependencies.infrastructure.secondary; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.mockito.ArgumentMatchers.anyString; | ||
import static org.mockito.Mockito.when; | ||
import static tech.jhipster.lite.extension.shared.dependencies.domain.JhliteExtensionSampleNpmVersionSource.JHLITE_EXTENSION_SAMPLE; | ||
|
||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.ExtendWith; | ||
import org.mockito.InjectMocks; | ||
import org.mockito.Mock; | ||
import org.mockito.junit.jupiter.MockitoExtension; | ||
import tech.jhipster.lite.extension.UnitTest; | ||
import tech.jhipster.lite.module.domain.ProjectFiles; | ||
import tech.jhipster.lite.module.domain.npm.NpmPackageName; | ||
import tech.jhipster.lite.module.domain.npm.NpmPackageVersion; | ||
|
||
@UnitTest | ||
@ExtendWith(MockitoExtension.class) | ||
class JhliteExtensionSampleNpmVersionReaderTest { | ||
|
||
@Mock | ||
private ProjectFiles projectFiles; | ||
|
||
@InjectMocks | ||
private JhliteExtensionSampleNpmVersionReader reader; | ||
|
||
@Test | ||
void shouldGetVersionFromCustomSource() { | ||
mockProjectFiles(); | ||
|
||
NpmPackageVersion version = reader.get().get(new NpmPackageName("vue"), JHLITE_EXTENSION_SAMPLE.build()); | ||
|
||
assertThat(version).isEqualTo(new NpmPackageVersion("1.2.3")); | ||
} | ||
|
||
private void mockProjectFiles() { | ||
when(projectFiles.readString(anyString())).thenReturn( | ||
""" | ||
{ | ||
"dependencies": { | ||
"vue": "1.2.3" | ||
}, | ||
} | ||
""" | ||
); | ||
} | ||
} |