From e87f069c5bb589f7296252824a9768b887c97c99 Mon Sep 17 00:00:00 2001 From: DemchaAV Date: Wed, 1 Jul 2026 22:30:28 +0100 Subject: [PATCH] refactor(templates): drop the v2 suffix from the cover-letter package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Third of the four per-family suffix drops. Move the coverletter.v2 sub-packages (data, components, presets) up to templates.coverletter and rewrite every import and doc reference across the engine, tests, and examples. The cv.v2 cross-imports (CvIdentity, CvName, SectionLookup) are untouched until the cv rename. Pure rename — the visual parity test passes against the unchanged committed baselines, so every letter preset renders identically. Tests: ./mvnw verify javadoc:javadoc -pl . — 1378 tests, 0 failures, javadoc clean; examples + benchmarks compile; perf-smoke + examples-generation smoke (85) green. --- .../demcha/examples/GenerateAllExamples.java | 30 ++++++++-------- .../examples/support/ExampleDataFactory.java | 2 +- ...CoverLetterTemplateGalleryFileExample.java | 34 +++++++++---------- .../v2/CvBlueBannerLetterV2Example.java | 6 ++-- .../v2/CvBoxedSectionsLetterV2Example.java | 6 ++-- .../v2/CvCenteredHeadlineLetterV2Example.java | 6 ++-- .../v2/CvClassicSerifLetterV2Example.java | 6 ++-- .../v2/CvCompactMonoLetterV2Example.java | 6 ++-- .../v2/CvEditorialBlueLetterV2Example.java | 6 ++-- .../CvEngineeringResumeLetterV2Example.java | 6 ++-- .../v2/CvExecutiveLetterV2Example.java | 6 ++-- .../v2/CvMintEditorialLetterV2Example.java | 6 ++-- .../CvModernProfessionalLetterV2Example.java | 6 ++-- .../v2/CvMonogramSidebarLetterV2Example.java | 6 ++-- .../v2/CvNordicCleanLetterV2Example.java | 6 ++-- .../v2/CvPanelLetterV2Example.java | 6 ++-- .../v2/CvSidebarPortraitLetterV2Example.java | 6 ++-- .../v2/CvTimelineMinimalLetterV2Example.java | 6 ++-- .../{v2 => }/components/LetterBody.java | 4 +-- .../{v2 => }/components/package-info.java | 4 +-- .../{v2 => }/data/CoverLetterDocument.java | 2 +- .../{v2 => }/data/package-info.java | 4 +-- .../templates/coverletter/package-info.java | 6 ++-- .../{v2 => }/presets/BlueBannerLetter.java | 6 ++-- .../{v2 => }/presets/BoxedSectionsLetter.java | 6 ++-- .../presets/CenteredHeadlineLetter.java | 6 ++-- .../{v2 => }/presets/ClassicSerifLetter.java | 6 ++-- .../{v2 => }/presets/CompactMonoLetter.java | 6 ++-- .../{v2 => }/presets/EditorialBlueLetter.java | 6 ++-- .../presets/EngineeringResumeLetter.java | 6 ++-- .../{v2 => }/presets/ExecutiveLetter.java | 8 ++--- .../{v2 => }/presets/MintEditorialLetter.java | 6 ++-- .../presets/ModernProfessionalLetter.java | 6 ++-- .../presets/MonogramSidebarLetter.java | 6 ++-- .../{v2 => }/presets/NordicCleanLetter.java | 6 ++-- .../{v2 => }/presets/PanelLetter.java | 6 ++-- .../presets/SidebarPortraitLetter.java | 6 ++-- .../presets/TimelineMinimalLetter.java | 6 ++-- .../{v2 => }/presets/package-info.java | 4 +-- .../presets/CoverLetterV2SmokeTest.java | 4 +-- .../CoverLetterV2VisualParityTest.java | 4 +-- 41 files changed, 140 insertions(+), 140 deletions(-) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/components/LetterBody.java (97%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/components/package-info.java (68%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/data/CoverLetterDocument.java (98%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/data/package-info.java (65%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/BlueBannerLetter.java (93%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/BoxedSectionsLetter.java (94%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/CenteredHeadlineLetter.java (95%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/ClassicSerifLetter.java (96%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/CompactMonoLetter.java (96%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/EditorialBlueLetter.java (95%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/EngineeringResumeLetter.java (97%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/ExecutiveLetter.java (96%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/MintEditorialLetter.java (98%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/ModernProfessionalLetter.java (96%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/MonogramSidebarLetter.java (97%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/NordicCleanLetter.java (96%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/PanelLetter.java (97%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/SidebarPortraitLetter.java (96%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/TimelineMinimalLetter.java (98%) rename src/main/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/package-info.java (73%) rename src/test/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/CoverLetterV2SmokeTest.java (97%) rename src/test/java/com/demcha/compose/document/templates/coverletter/{v2 => }/presets/CoverLetterV2VisualParityTest.java (98%) diff --git a/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java b/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java index def43f327..15d6c8cdd 100644 --- a/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java +++ b/examples/src/main/java/com/demcha/examples/GenerateAllExamples.java @@ -47,21 +47,21 @@ import com.demcha.examples.flagships.FinancialReportExample; import com.demcha.examples.flagships.MasterShowcaseExample; import com.demcha.examples.flagships.ModuleFirstFileExample; -import com.demcha.examples.templates.coverletter.v2.CvBlueBannerLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvBoxedSectionsLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvCenteredHeadlineLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvClassicSerifLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvCompactMonoLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvEditorialBlueLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvEngineeringResumeLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvExecutiveLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvMintEditorialLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvModernProfessionalLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvMonogramSidebarLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvNordicCleanLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvPanelLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvSidebarPortraitLetterV2Example; -import com.demcha.examples.templates.coverletter.v2.CvTimelineMinimalLetterV2Example; +import com.demcha.examples.templates.coverletter.CvBlueBannerLetterV2Example; +import com.demcha.examples.templates.coverletter.CvBoxedSectionsLetterV2Example; +import com.demcha.examples.templates.coverletter.CvCenteredHeadlineLetterV2Example; +import com.demcha.examples.templates.coverletter.CvClassicSerifLetterV2Example; +import com.demcha.examples.templates.coverletter.CvCompactMonoLetterV2Example; +import com.demcha.examples.templates.coverletter.CvEditorialBlueLetterV2Example; +import com.demcha.examples.templates.coverletter.CvEngineeringResumeLetterV2Example; +import com.demcha.examples.templates.coverletter.CvExecutiveLetterV2Example; +import com.demcha.examples.templates.coverletter.CvMintEditorialLetterV2Example; +import com.demcha.examples.templates.coverletter.CvModernProfessionalLetterV2Example; +import com.demcha.examples.templates.coverletter.CvMonogramSidebarLetterV2Example; +import com.demcha.examples.templates.coverletter.CvNordicCleanLetterV2Example; +import com.demcha.examples.templates.coverletter.CvPanelLetterV2Example; +import com.demcha.examples.templates.coverletter.CvSidebarPortraitLetterV2Example; +import com.demcha.examples.templates.coverletter.CvTimelineMinimalLetterV2Example; import com.demcha.examples.templates.cv.v2.CvBlueBannerExample; import com.demcha.examples.templates.cv.v2.CvBoxedV2Example; import com.demcha.examples.templates.cv.v2.CvCenteredHeadlineExample; diff --git a/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java b/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java index b13aef343..1347c75bc 100644 --- a/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java +++ b/examples/src/main/java/com/demcha/examples/support/ExampleDataFactory.java @@ -1,6 +1,6 @@ package com.demcha.examples.support; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.cv.v2.data.CvDocument; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvSkill; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java index 966b6e28a..b0dbedb7e 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/CoverLetterTemplateGalleryFileExample.java @@ -4,22 +4,22 @@ import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.BlueBannerLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.BoxedSectionsLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.CenteredHeadlineLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.ClassicSerifLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.CompactMonoLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.EditorialBlueLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.EngineeringResumeLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.ExecutiveLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.MintEditorialLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.ModernProfessionalLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.MonogramSidebarLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.NordicCleanLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.PanelLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.SidebarPortraitLetter; -import com.demcha.compose.document.templates.coverletter.v2.presets.TimelineMinimalLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.BlueBannerLetter; +import com.demcha.compose.document.templates.coverletter.presets.BoxedSectionsLetter; +import com.demcha.compose.document.templates.coverletter.presets.CenteredHeadlineLetter; +import com.demcha.compose.document.templates.coverletter.presets.ClassicSerifLetter; +import com.demcha.compose.document.templates.coverletter.presets.CompactMonoLetter; +import com.demcha.compose.document.templates.coverletter.presets.EditorialBlueLetter; +import com.demcha.compose.document.templates.coverletter.presets.EngineeringResumeLetter; +import com.demcha.compose.document.templates.coverletter.presets.ExecutiveLetter; +import com.demcha.compose.document.templates.coverletter.presets.MintEditorialLetter; +import com.demcha.compose.document.templates.coverletter.presets.ModernProfessionalLetter; +import com.demcha.compose.document.templates.coverletter.presets.MonogramSidebarLetter; +import com.demcha.compose.document.templates.coverletter.presets.NordicCleanLetter; +import com.demcha.compose.document.templates.coverletter.presets.PanelLetter; +import com.demcha.compose.document.templates.coverletter.presets.SidebarPortraitLetter; +import com.demcha.compose.document.templates.coverletter.presets.TimelineMinimalLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; @@ -30,7 +30,7 @@ /** * Renders all 15 layered cover-letter presets ({@code - * coverletter.v2.presets.*} — the polished current standard) against + * coverletter.presets.*} — the polished current standard) against * the same shared sample {@link CoverLetterDocument}. Each PDF lands in * {@code examples/target/generated-pdfs/templates/coverletter/cover-letter-.pdf} * where {@code } is the paired CV preset's stable identifier (e.g. diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBlueBannerLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBlueBannerLetterV2Example.java index 60d4ea9bb..ae8c70648 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBlueBannerLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBlueBannerLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.BlueBannerLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.BlueBannerLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBoxedSectionsLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBoxedSectionsLetterV2Example.java index 5e6ad8036..574dd842b 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBoxedSectionsLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvBoxedSectionsLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.BoxedSectionsLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.BoxedSectionsLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCenteredHeadlineLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCenteredHeadlineLetterV2Example.java index 7614cd972..4a93c4ef9 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCenteredHeadlineLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCenteredHeadlineLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.CenteredHeadlineLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.CenteredHeadlineLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvClassicSerifLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvClassicSerifLetterV2Example.java index 6a2724acb..0348e43e0 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvClassicSerifLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvClassicSerifLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.ClassicSerifLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.ClassicSerifLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCompactMonoLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCompactMonoLetterV2Example.java index 5161265b0..0e477bdc5 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCompactMonoLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvCompactMonoLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.CompactMonoLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.CompactMonoLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEditorialBlueLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEditorialBlueLetterV2Example.java index 1b3cdbde4..29686c904 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEditorialBlueLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEditorialBlueLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.EditorialBlueLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.EditorialBlueLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEngineeringResumeLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEngineeringResumeLetterV2Example.java index 209bf3007..e532a433a 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEngineeringResumeLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvEngineeringResumeLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.EngineeringResumeLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.EngineeringResumeLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvExecutiveLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvExecutiveLetterV2Example.java index db9fa34c5..eb3b264dd 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvExecutiveLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvExecutiveLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.ExecutiveLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.ExecutiveLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java index 73c686d68..cf5880a6e 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMintEditorialLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.MintEditorialLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.MintEditorialLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvModernProfessionalLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvModernProfessionalLetterV2Example.java index 07bfe2e7d..be32255f1 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvModernProfessionalLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvModernProfessionalLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.ModernProfessionalLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.ModernProfessionalLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMonogramSidebarLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMonogramSidebarLetterV2Example.java index 6b66fc6f9..6e85e2efe 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMonogramSidebarLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvMonogramSidebarLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.MonogramSidebarLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.MonogramSidebarLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvNordicCleanLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvNordicCleanLetterV2Example.java index f72529d3b..e68c9bdee 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvNordicCleanLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvNordicCleanLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.NordicCleanLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.NordicCleanLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvPanelLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvPanelLetterV2Example.java index 913e11a89..7446f5f8c 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvPanelLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvPanelLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.PanelLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.PanelLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvSidebarPortraitLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvSidebarPortraitLetterV2Example.java index 4bfb6174b..1767585a3 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvSidebarPortraitLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvSidebarPortraitLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.SidebarPortraitLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.SidebarPortraitLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvTimelineMinimalLetterV2Example.java b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvTimelineMinimalLetterV2Example.java index 384e2f672..c1a0d175e 100644 --- a/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvTimelineMinimalLetterV2Example.java +++ b/examples/src/main/java/com/demcha/examples/templates/coverletter/v2/CvTimelineMinimalLetterV2Example.java @@ -1,11 +1,11 @@ -package com.demcha.examples.templates.coverletter.v2; +package com.demcha.examples.templates.coverletter; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.coverletter.v2.presets.TimelineMinimalLetter; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.presets.TimelineMinimalLetter; import com.demcha.examples.support.ExampleDataFactory; import com.demcha.examples.support.ExampleOutputPaths; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java b/src/main/java/com/demcha/compose/document/templates/coverletter/components/LetterBody.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/components/LetterBody.java index c12592697..42fdd3958 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/components/LetterBody.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.coverletter.v2.components; +package com.demcha.compose.document.templates.coverletter.components; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; import com.demcha.compose.document.templates.core.theme.BrandTheme; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/package-info.java b/src/main/java/com/demcha/compose/document/templates/coverletter/components/package-info.java similarity index 68% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/package-info.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/components/package-info.java index fd9d69fda..7aba4cf46 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/components/package-info.java @@ -1,10 +1,10 @@ /** * Shared rendering components for Templates v2 cover letters. * - *

{@link com.demcha.compose.document.templates.coverletter.v2.components.LetterBody} + *

{@link com.demcha.compose.document.templates.coverletter.components.LetterBody} * is the letter analog of the CV {@code SectionDispatcher}: every * letter preset delegates its greeting / paragraphs / closing to it so * all letters share one reading rhythm and inline-markdown handling * (via the reused {@code core.text.RichParagraphRenderer}).

*/ -package com.demcha.compose.document.templates.coverletter.v2.components; +package com.demcha.compose.document.templates.coverletter.components; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/data/CoverLetterDocument.java b/src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/data/CoverLetterDocument.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java index 6b5b5a1a9..9b6d72fd3 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/data/CoverLetterDocument.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/data/CoverLetterDocument.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.data; +package com.demcha.compose.document.templates.coverletter.data; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/data/package-info.java b/src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java similarity index 65% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/data/package-info.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java index 7237adabb..3fa0ace28 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/data/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/data/package-info.java @@ -1,10 +1,10 @@ /** * User-facing data records for Templates v2 cover letters. * - *

{@link com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument} + *

{@link com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument} * is the single input type — it reuses * {@link com.demcha.compose.document.templates.cv.v2.data.CvIdentity} * for the masthead so a CV and its paired letter share one identity * object and render identical headers.

*/ -package com.demcha.compose.document.templates.coverletter.v2.data; +package com.demcha.compose.document.templates.coverletter.data; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/package-info.java b/src/main/java/com/demcha/compose/document/templates/coverletter/package-info.java index 2bd13f3c7..48ed26d59 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/package-info.java @@ -1,9 +1,9 @@ /** * Cover-letter template family. * - *

The shipping cover-letter surface is the layered stack under - * {@code coverletter.v2} (data / theme / components / widgets / presets), - * built on the shared {@code templates.core} layer and a {@code BrandTheme}.

+ *

The cover-letter surface is a layered stack (data / components / + * presets) built on the shared {@code templates.core} layer and a + * {@code BrandTheme}.

* *

Naming note: the user-facing concept is "cover-letter" * with a hyphen, but Java packages cannot contain hyphens. The package name diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java similarity index 93% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java index 4226e31ba..d35ac4827 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BlueBannerLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BlueBannerLetter.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.document.templates.core.identity.Headline; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java similarity index 94% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java index d037f79dc..f31f40443 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/BoxedSectionsLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/BoxedSectionsLetter.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; import com.demcha.compose.document.templates.core.identity.Headline; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java index bda81c9ee..c0c0b1548 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CenteredHeadlineLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.LineBuilder; @@ -7,8 +7,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java index b51a0fc7c..822c4fd1e 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ClassicSerifLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -7,8 +7,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java index defab276b..34d7f19e9 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/CompactMonoLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -7,8 +7,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java index 7f786ed62..9c7a6d2bc 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EditorialBlueLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -7,8 +7,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.Masthead; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java index 1c4706298..bb5e30bda 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/EngineeringResumeLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.templates.core.identity.Link; @@ -9,8 +9,8 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java index a5dfb0830..7d43308cc 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ExecutiveLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.templates.core.identity.Link; @@ -12,8 +12,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; @@ -39,7 +39,7 @@ * because the CV's header is itself preset-local (V1 splits meta and * links across two rows — no shared v2 contact widget has that exact * shape today). When a second brand needs the same header shape, this - * block should be promoted to a shared {@code coverletter/v2/widgets} + * block should be promoted to a shared {@code coverletter/widgets} * letterhead widget the CV preset can also adopt.

*/ public final class ExecutiveLetter { diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java index 8c94063bd..742de5ec0 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MintEditorialLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -10,8 +10,8 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java index 7eec19c8f..5988c0ce9 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/ModernProfessionalLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -6,8 +6,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.core.identity.ContactLine; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java index 26d2330ec..e3b4c818e 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/MonogramSidebarLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.*; @@ -8,8 +8,8 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java index 54539c166..da6dfd347 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/NordicCleanLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -7,8 +7,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java index 05fca820a..fe142d3d2 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/PanelLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.templates.core.identity.Link; @@ -9,8 +9,8 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java similarity index 96% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java index d31121529..ef18a8467 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/SidebarPortraitLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; @@ -7,8 +7,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java index dcaef1bdc..b12c7abe9 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/TimelineMinimalLetter.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.document.templates.core.identity.Link; @@ -13,8 +13,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.components.LetterBody; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; import com.demcha.compose.document.templates.core.text.TextOrnaments; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/package-info.java b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/package-info.java similarity index 73% rename from src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/package-info.java rename to src/main/java/com/demcha/compose/document/templates/coverletter/presets/package-info.java index 2390df6ea..59bd08b75 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/presets/package-info.java @@ -5,7 +5,7 @@ * spacing from its paired {@code BrandTheme.()} (the single source * of truth shared with the CV), renders the same masthead treatment as * the CV, and delegates the letter body to the shared - * {@code coverletter.v2.components.LetterBody}. The result is a CV and a + * {@code coverletter.components.LetterBody}. The result is a CV and a * cover letter that read as one matched set.

*/ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; diff --git a/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java b/src/test/java/com/demcha/compose/document/templates/coverletter/presets/CoverLetterV2SmokeTest.java similarity index 97% rename from src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java rename to src/test/java/com/demcha/compose/document/templates/coverletter/presets/CoverLetterV2SmokeTest.java index 5cbf664fe..aaf6088b2 100644 --- a/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2SmokeTest.java +++ b/src/test/java/com/demcha/compose/document/templates/coverletter/presets/CoverLetterV2SmokeTest.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2VisualParityTest.java b/src/test/java/com/demcha/compose/document/templates/coverletter/presets/CoverLetterV2VisualParityTest.java similarity index 98% rename from src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2VisualParityTest.java rename to src/test/java/com/demcha/compose/document/templates/coverletter/presets/CoverLetterV2VisualParityTest.java index b8cd501df..01e4739e7 100644 --- a/src/test/java/com/demcha/compose/document/templates/coverletter/v2/presets/CoverLetterV2VisualParityTest.java +++ b/src/test/java/com/demcha/compose/document/templates/coverletter/presets/CoverLetterV2VisualParityTest.java @@ -1,10 +1,10 @@ -package com.demcha.compose.document.templates.coverletter.v2.presets; +package com.demcha.compose.document.templates.coverletter.presets; import com.demcha.compose.GraphCompose; import com.demcha.compose.document.api.DocumentPageSize; import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; +import com.demcha.compose.document.templates.coverletter.data.CoverLetterDocument; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.testing.visual.PdfVisualRegression; import org.junit.jupiter.params.ParameterizedTest;