refactor to split concerns and make the test pass

Signed-off-by: Romain Rochegude <[email protected]>

Author: RoRoche

archunit/src/main/java/com/tngtech/archunit/library/adr/markdown/MdAdr.java

@@ -17,136 +17,16 @@
 
 import com.tngtech.archunit.PublicAPI;
 import com.tngtech.archunit.library.adr.Adr;
-import com.tngtech.archunit.library.adr.Metadata;
-import com.tngtech.archunit.library.adr.OptionProsAndCons;
-
-import java.util.List;
-import java.util.Optional;
+import com.tngtech.archunit.library.adr.envelopes.AdrEnvelope;
 
 import static com.tngtech.archunit.PublicAPI.Usage.ACCESS;
 
 @PublicAPI(usage = ACCESS)
-public final class MdAdr implements Adr {
-
-    private Metadata metadata;
-    private final String title;
-    private final String contextAndProblemStatement;
-    private List<String> decisionDrivers;
-    private final List<String> consideredOptions;
-    private final String decisionOutcome;
-    private List<String> consequences;
-    private String confirmation;
-    private List<OptionProsAndCons> optionProsAndCons;
-    private String moreInformation;
-
-    @PublicAPI(usage = ACCESS)
-    public MdAdr(final String title, final String contextAndProblemStatement, final List<String> consideredOptions, final String decisionOutcome) {
-        this.title = title;
-        this.contextAndProblemStatement = contextAndProblemStatement;
-        this.consideredOptions = consideredOptions;
-        this.decisionOutcome = decisionOutcome;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<Metadata> metadata() {
-        return Optional.ofNullable(this.metadata);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Adr withMetadata(final Metadata metadata) {
-        this.metadata = metadata;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public String title() {
-        return this.title;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public String contextAndProblemStatement() {
-        return this.contextAndProblemStatement;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<List<String>> decisionDrivers() {
-        return Optional.ofNullable(this.decisionDrivers);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Adr withDecisionDrivers(final List<String> decisionDrivers) {
-        this.decisionDrivers = decisionDrivers;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public List<String> consideredOptions() {
-        return this.consideredOptions;
-    }
+public final class MdAdr extends AdrEnvelope {
 
     @PublicAPI(usage = ACCESS)
-    @Override
-    public String decisionOutcome() {
-        return this.decisionOutcome;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<List<String>> consequences() {
-        return Optional.ofNullable(this.consequences);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Adr withConsequences(final List<String> consequences) {
-        this.consequences = consequences;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<String> confirmation() {
-        return Optional.ofNullable(this.confirmation);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Adr withConfirmation(final String confirmation) {
-        this.confirmation = confirmation;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<List<OptionProsAndCons>> optionProsAndCons() {
-        return Optional.ofNullable(this.optionProsAndCons);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Adr withOptionProsAndCons(final List<OptionProsAndCons> optionProsAndCons) {
-        this.optionProsAndCons = optionProsAndCons;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<String> moreInformation() {
-        return Optional.ofNullable(this.moreInformation);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Adr withMoreInformation(final String moreInformation) {
-        this.moreInformation = moreInformation;
-        return this;
+    public MdAdr(final Adr delegate) {
+        super(delegate);
     }
 
     @PublicAPI(usage = ACCESS)

archunit/src/main/java/com/tngtech/archunit/library/adr/markdown/MdMetadata.java

@@ -17,87 +17,16 @@
 
 import com.tngtech.archunit.PublicAPI;
 import com.tngtech.archunit.library.adr.Metadata;
-
-import java.util.List;
-import java.util.Optional;
+import com.tngtech.archunit.library.adr.envelopes.MetadataEnvelope;
 
 import static com.tngtech.archunit.PublicAPI.Usage.ACCESS;
 
 @PublicAPI(usage = ACCESS)
-public final class MdMetadata implements Metadata {
-
-    private String status;
-    private String date;
-    private List<String> decisionMakers;
-    private List<String> consulted;
-    private List<String> informed;
-
-    @PublicAPI(usage = ACCESS)
-    public MdMetadata() {}
+public final class MdMetadata extends MetadataEnvelope {
 
     @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<String> status() {
-        return Optional.ofNullable(this.status);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Metadata withStatus(final String status) {
-        this.status = status;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<String> date() {
-        return Optional.ofNullable(this.date);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Metadata withDate(final String date) {
-        this.date = date;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<List<String>> decisionMakers() {
-        return Optional.ofNullable(this.decisionMakers);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Metadata withDecisionMakers(final List<String> decisionMakers) {
-        this.decisionMakers = decisionMakers;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<List<String>> consulted() {
-        return Optional.ofNullable(this.consulted);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Metadata withConsulted(final List<String> consulted) {
-        this.consulted = consulted;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<List<String>> informed() {
-        return Optional.ofNullable(this.informed);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Metadata withInformed(final List<String> informed) {
-        this.informed = informed;
-        return this;
+    public MdMetadata(final Metadata delegate) {
+        super(delegate);
     }
 
     @PublicAPI(usage = ACCESS)

archunit/src/main/java/com/tngtech/archunit/library/adr/markdown/MdOptionProsAndCons.java

@@ -17,61 +17,16 @@
 
 import com.tngtech.archunit.PublicAPI;
 import com.tngtech.archunit.library.adr.OptionProsAndCons;
-
-import java.util.List;
-import java.util.Optional;
+import com.tngtech.archunit.library.adr.envelopes.OptionProsAndConsEnvelope;
 
 import static com.tngtech.archunit.PublicAPI.Usage.ACCESS;
 
 @PublicAPI(usage = ACCESS)
-public final class MdOptionProsAndCons implements OptionProsAndCons {
-    private final String title;
-    private String description;
-    private String example;
-    private final List<String> prosAndCons;
-
-    @PublicAPI(usage = ACCESS)
-    public MdOptionProsAndCons(final String title, final List<String> prosAndCons) {
-        this.title = title;
-        this.prosAndCons = prosAndCons;
-    }
+public final class MdOptionProsAndCons extends OptionProsAndConsEnvelope {
 
     @PublicAPI(usage = ACCESS)
-    @Override
-    public String title() {
-        return this.title;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<String> description() {
-        return Optional.ofNullable(this.description);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public OptionProsAndCons withDescription(final String description) {
-        this.description = description;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public Optional<String> example() {
-        return Optional.ofNullable(this.example);
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public OptionProsAndCons withExample(final String example) {
-        this.example = example;
-        return this;
-    }
-
-    @PublicAPI(usage = ACCESS)
-    @Override
-    public List<String> prosAndCons() {
-        return this.prosAndCons;
+    public MdOptionProsAndCons(final OptionProsAndCons delegate) {
+        super(delegate);
     }
 
     @PublicAPI(usage = ACCESS)