-
-
Notifications
You must be signed in to change notification settings - Fork 215
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7091 from murdos/gradle-remove-dependency
Gradle : support for removing direct dependency
- Loading branch information
Showing
3 changed files
with
227 additions
and
58 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
112 changes: 112 additions & 0 deletions
112
.../jhipster/lite/module/infrastructure/secondary/javadependency/gradle/VersionsCatalog.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,112 @@ | ||
| package tech.jhipster.lite.module.infrastructure.secondary.javadependency.gradle; | ||
|
|
||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.function.Predicate; | ||
|
|
||
| import com.electronwill.nightconfig.core.Config; | ||
| import com.electronwill.nightconfig.core.Config.Entry; | ||
| import com.electronwill.nightconfig.core.UnmodifiableConfig; | ||
| import com.electronwill.nightconfig.core.file.FileConfig; | ||
| import com.electronwill.nightconfig.core.io.ParsingException; | ||
|
|
||
| import tech.jhipster.lite.module.domain.javabuild.DependencySlug; | ||
| import tech.jhipster.lite.module.domain.javadependency.DependencyId; | ||
| import tech.jhipster.lite.module.domain.javadependency.JavaDependency; | ||
| import tech.jhipster.lite.module.domain.javadependency.JavaDependencyVersion; | ||
| import tech.jhipster.lite.module.domain.properties.JHipsterProjectFolder; | ||
|
|
||
| class VersionsCatalog { | ||
|
|
||
| private static final String VERSIONS_TOML_KEY = "versions"; | ||
| private static final String LIBRARIES_TOML_KEY = "libraries"; | ||
|
|
||
| private final FileConfig tomlConfigFile; | ||
|
|
||
| public VersionsCatalog(JHipsterProjectFolder projectFolder) { | ||
| Path tomlVersionCatalogFile = tomlVersionCatalogPath(projectFolder); | ||
| tomlConfigFile = FileConfig.builder(tomlVersionCatalogFile) | ||
| .sync() | ||
| .build(); | ||
|
|
||
| // Missing TOML file will be automatically created, but its parent folder should exist | ||
| if (!Files.exists(tomlVersionCatalogFile.getParent())) { | ||
| tomlVersionCatalogFile.toFile().getParentFile().mkdirs(); | ||
| } | ||
|
|
||
| try { | ||
| tomlConfigFile.load(); | ||
| } catch (ParsingException exception) { | ||
| throw new InvalidTomlVersionCatalogException(exception); | ||
| } | ||
| } | ||
|
|
||
| private static Path tomlVersionCatalogPath(JHipsterProjectFolder projectFolder) { | ||
| return projectFolder.filePath("gradle").resolve("libs.versions.toml"); | ||
| } | ||
|
|
||
| private void save() { | ||
| tomlConfigFile.save(); | ||
| } | ||
|
|
||
| public static String dependencySlug(JavaDependency dependency) { | ||
| return dependency.slug().map(DependencySlug::slug).orElse(dependency.id().artifactId().get()); | ||
| } | ||
|
|
||
| public void setVersion(JavaDependencyVersion javaDependencyVersion) { | ||
| tomlConfigFile.set(List.of(VERSIONS_TOML_KEY, javaDependencyVersion.slug().slug()), javaDependencyVersion.version().get()); | ||
| save(); | ||
| } | ||
|
|
||
| public void addLibrary(JavaDependency dependency) { | ||
| Config libraryConfig = Config.inMemory(); | ||
| libraryConfig.set("group", dependency.id().groupId().get()); | ||
| libraryConfig.set("name", dependency.id().artifactId().get()); | ||
| dependency.version().ifPresent(versionSlug -> libraryConfig.set("version.ref", versionSlug.slug())); | ||
| String libraryEntryKey = dependencySlug(dependency); | ||
| tomlConfigFile.set(List.of(LIBRARIES_TOML_KEY, libraryEntryKey), libraryConfig); | ||
| save(); | ||
| } | ||
|
|
||
| public void removeLibrary(DependencyId dependency) { | ||
| libraryEntriesMatchingDependency(dependency).forEach(libraryConfig -> tomlConfigFile.remove(List.of(LIBRARIES_TOML_KEY, libraryConfig.getKey()))); | ||
| save(); | ||
| } | ||
|
|
||
| private List<? extends Entry> libraryEntriesMatchingDependency(DependencyId dependency) { | ||
| return tomlConfigFile.entrySet().stream() | ||
| .filter(entry -> entry.getKey().equals(LIBRARIES_TOML_KEY)) | ||
| .map(Entry::getValue) | ||
| .filter(Config.class::isInstance) | ||
| .map(Config.class::cast) | ||
| .map(Config::entrySet) | ||
| .flatMap(Collection::stream) | ||
| .filter(groupShouldMatch(dependency)) | ||
| .filter(nameShouldMatch(dependency)) | ||
| .toList(); | ||
| } | ||
|
|
||
| private static Predicate<Entry> groupShouldMatch(DependencyId dependency) { | ||
| return libraryConfig -> { | ||
| Object groupProperty = ((Config) libraryConfig.getValue()).get("group"); | ||
| return dependency.groupId().get().equals(groupProperty); | ||
| }; | ||
| } | ||
|
|
||
| private static Predicate<Entry> nameShouldMatch(DependencyId dependency) { | ||
| return libraryConfig -> { | ||
| Object groupProperty = ((Config) libraryConfig.getValue()).get("name"); | ||
| return dependency.artifactId().get().equals(groupProperty); | ||
| }; | ||
| } | ||
|
|
||
| public Collection<DependencySlug> retrieveDependencySlugsFrom(DependencyId dependency) { | ||
| return libraryEntriesMatchingDependency(dependency) | ||
| .stream() | ||
| .map(UnmodifiableConfig.Entry::getKey) | ||
| .map(DependencySlug::new) | ||
| .toList(); | ||
| } | ||
| } |
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