Skip to content

Commit

Permalink
refactor(preset): delete ModulesSlugs.java from the "project" bounded…
Browse files Browse the repository at this point in the history
… context and use JHipsterModuleSlugs.java from the "module" bounded context instead
  • Loading branch information
renanfranca committed Sep 24, 2024
1 parent fbddcdc commit 789394b
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 38 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package tech.jhipster.lite.module.domain;

import java.util.Collection;
import tech.jhipster.lite.shared.error.domain.Assert;

public record JHipsterModuleSlugs(Collection<JHipsterModuleSlug> modules) {
public JHipsterModuleSlugs {
Assert.notEmpty("modules", modules);
}

public static JHipsterModuleSlugs from(Collection<String> modules) {
return new JHipsterModuleSlugs(modules.stream().map(JHipsterModuleSlug::new).toList());
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package tech.jhipster.lite.module.domain.preset;

import tech.jhipster.lite.project.domain.ModulesSlugs;
import tech.jhipster.lite.module.domain.JHipsterModuleSlugs;
import tech.jhipster.lite.shared.error.domain.Assert;

public record Preset(PresetName name, ModulesSlugs modules) {
public record Preset(PresetName name, JHipsterModuleSlugs modules) {
public Preset {
Assert.notNull("name", name);
Assert.notNull("modules", modules);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package tech.jhipster.lite.module.infrastructure.primary;

import io.swagger.v3.oas.annotations.media.Schema;
import tech.jhipster.lite.project.domain.ModuleSlug;
import tech.jhipster.lite.module.domain.JHipsterModuleSlug;

@Schema(name = "ModuleToApply", description = "Information for a module to apply")
record RestModuleToApply(@Schema(description = "Slug of the module to apply") String slug) {
public static RestModuleToApply from(ModuleSlug moduleSlug) {
public static RestModuleToApply from(JHipsterModuleSlug moduleSlug) {
return new RestModuleToApply(moduleSlug.get());
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package tech.jhipster.lite.module.infrastructure.secondary;

import java.util.Collection;
import tech.jhipster.lite.module.domain.JHipsterModuleSlugs;
import tech.jhipster.lite.module.domain.preset.Preset;
import tech.jhipster.lite.module.domain.preset.PresetName;
import tech.jhipster.lite.project.domain.ModulesSlugs;

record PersistedPreset(String name, Collection<String> modules) {
public Preset toDomain() {
return new Preset(PresetName.from(name), ModulesSlugs.from(modules));
return new Preset(PresetName.from(name), JHipsterModuleSlugs.from(modules));
}
}
14 changes: 0 additions & 14 deletions src/main/java/tech/jhipster/lite/project/domain/ModulesSlugs.java

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import org.junit.jupiter.api.Test;
import tech.jhipster.lite.JsonHelper;
import tech.jhipster.lite.UnitTest;
import tech.jhipster.lite.module.domain.JHipsterModuleSlug;
import tech.jhipster.lite.module.domain.JHipsterModuleSlugs;
import tech.jhipster.lite.module.domain.preset.Preset;
import tech.jhipster.lite.module.domain.preset.PresetName;
import tech.jhipster.lite.project.domain.ModuleSlug;
import tech.jhipster.lite.project.domain.ModulesSlugs;

@UnitTest
class RestPresetsTest {
Expand All @@ -24,11 +24,11 @@ private static Collection<Preset> presets() {
return List.of(
new Preset(
new PresetName("test preset one"),
new ModulesSlugs(List.of(new ModuleSlug("test-module-one"), new ModuleSlug("test-module-two")))
new JHipsterModuleSlugs(List.of(new JHipsterModuleSlug("test-module-one"), new JHipsterModuleSlug("test-module-two")))
),
new Preset(
new PresetName("test preset two"),
new ModulesSlugs(List.of(new ModuleSlug("test-module-three"), new ModuleSlug("test-module-four")))
new JHipsterModuleSlugs(List.of(new JHipsterModuleSlug("test-module-three"), new JHipsterModuleSlug("test-module-four")))
)
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
import org.junit.jupiter.api.Test;
import tech.jhipster.lite.JsonHelper;
import tech.jhipster.lite.UnitTest;
import tech.jhipster.lite.module.domain.JHipsterModuleSlug;
import tech.jhipster.lite.module.domain.JHipsterModuleSlugs;
import tech.jhipster.lite.module.domain.ProjectFiles;
import tech.jhipster.lite.module.domain.preset.Preset;
import tech.jhipster.lite.module.domain.preset.PresetName;
import tech.jhipster.lite.project.domain.ModuleSlug;
import tech.jhipster.lite.project.domain.ModulesSlugs;
import tech.jhipster.lite.shared.error.domain.GeneratorException;

@UnitTest
Expand Down Expand Up @@ -95,19 +95,19 @@ private static ProjectFiles mockProjectFilesWithValidPresetJson() {
private static Preset expectedPreset() {
return new Preset(
new PresetName("angular + spring boot"),
new ModulesSlugs(
new JHipsterModuleSlugs(
List.of(
new ModuleSlug("init"),
new ModuleSlug("application-service-hexagonal-architecture-documentation"),
new ModuleSlug("maven-java"),
new ModuleSlug("prettier"),
new ModuleSlug("angular-core"),
new ModuleSlug("java-base"),
new ModuleSlug("maven-wrapper"),
new ModuleSlug("spring-boot"),
new ModuleSlug("spring-boot-mvc-empty"),
new ModuleSlug("logs-spy"),
new ModuleSlug("spring-boot-tomcat")
new JHipsterModuleSlug("init"),
new JHipsterModuleSlug("application-service-hexagonal-architecture-documentation"),
new JHipsterModuleSlug("maven-java"),
new JHipsterModuleSlug("prettier"),
new JHipsterModuleSlug("angular-core"),
new JHipsterModuleSlug("java-base"),
new JHipsterModuleSlug("maven-wrapper"),
new JHipsterModuleSlug("spring-boot"),
new JHipsterModuleSlug("spring-boot-mvc-empty"),
new JHipsterModuleSlug("logs-spy"),
new JHipsterModuleSlug("spring-boot-tomcat")
)
)
);
Expand Down

0 comments on commit 789394b

Please sign in to comment.