From 218a2592b4d4c26585659d163a75d1827a00baea Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <odrotbohm@vmware.com>
Date: Wed, 25 Aug 2021 17:11:21 +0200
Subject: [PATCH] Hacking.

---
 .../main/java/org/jmolecules/ddd/types/AggregateRoot.java   | 2 +-
 .../src/main/java/org/jmolecules/ddd/types/Association.java | 6 +++---
 .../src/main/java/org/jmolecules/ddd/types/Entity.java      | 3 ++-
 .../main/java/org/jmolecules/ddd/types/Identifiable.java    | 2 +-
 .../src/main/java/org/jmolecules/ddd/types/Identifier.java  | 2 +-
 .../src/main/java/org/jmolecules/ddd/types/Repository.java  | 2 +-
 .../java/org/jmolecules/ddd/types/SimpleAssociation.java    | 2 +-
 .../java/org/jmolecules/ddd/types/AssociationUnitTests.java | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/AggregateRoot.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/AggregateRoot.java
index 5bf356c..fab461a 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/AggregateRoot.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/AggregateRoot.java
@@ -35,6 +35,6 @@
  * @see <a href="https://scabl.blogspot.com/2015/04/aeddd-9.html>John Sullivan - Advancing Enterprise DDD - Reinstating
  *      the Aggregate</a>
  */
-public interface AggregateRoot<T extends AggregateRoot<T, ID>, ID extends Identifier> extends Entity<T, ID> {
+public interface AggregateRoot<T extends AggregateRoot<T, ID>, ID extends Identifier<T, ID>> extends Entity<T, ID, T> {
 
 }
diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Association.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Association.java
index 6d27df7..18f391d 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Association.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Association.java
@@ -27,7 +27,7 @@
  * @see <a href="https://scabl.blogspot.com/2015/04/aeddd-9.html>John Sullivan - Advancing Enterprise DDD - Reinstating
  *      the Aggregate</a>
  */
-public interface Association<T extends AggregateRoot<T, ID>, ID extends Identifier> extends Identifiable<ID> {
+public interface Association<T extends AggregateRoot<T, ID>, ID extends Identifier<T, ID>> extends Identifiable<T, ID> {
 
 	/**
 	 * Creates an {@link Association} pointing to the {@link Identifier} of the given {@link AggregateRoot}.
@@ -39,7 +39,7 @@ public interface Association<T extends AggregateRoot<T, ID>, ID extends Identifi
 	 *         {@literal null}.
 	 * @since 1.2
 	 */
-	static <T extends AggregateRoot<T, ID>, ID extends Identifier> Association<T, ID> forAggregate(T aggregate) {
+	static <T extends AggregateRoot<T, ID>, ID extends Identifier<T, ID>> Association<T, ID> forAggregate(T aggregate) {
 
 		if (aggregate == null) {
 			throw new IllegalArgumentException("Aggregate must not be null!");
@@ -57,7 +57,7 @@ static <T extends AggregateRoot<T, ID>, ID extends Identifier> Association<T, ID
 	 * @return an {@link Association} pointing to the given {@link Identifier}, will never be {@literal null}.
 	 * @since 1.2
 	 */
-	static <T extends AggregateRoot<T, ID>, ID extends Identifier> Association<T, ID> forId(ID identifier) {
+	static <T extends AggregateRoot<T, ID>, ID extends Identifier<T, ID>> Association<T, ID> forId(ID identifier) {
 
 		if (identifier == null) {
 			throw new IllegalArgumentException("Identifier must not be null!");
diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Entity.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Entity.java
index 63ec325..f264c8d 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Entity.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Entity.java
@@ -32,4 +32,5 @@
  * @see <a href="https://scabl.blogspot.com/2015/04/aeddd-9.html>John Sullivan - Advancing Enterprise DDD - Reinstating
  *      the Aggregate</a>
  */
-public interface Entity<T extends AggregateRoot<T, ?>, ID> extends Identifiable<ID> {}
+public interface Entity<T extends AggregateRoot<T, ?>, ID extends Identifier<S, ID>, S extends Entity<T, ID, S>>
+		extends Identifiable<S, ID> {}
diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifiable.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifiable.java
index 61b6969..d403143 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifiable.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifiable.java
@@ -20,7 +20,7 @@
  *
  * @author Oliver Drotbohm
  */
-public interface Identifiable<ID> {
+public interface Identifiable<T extends Identifiable<T, ID>, ID extends Identifier<T, ID>> {
 
 	/**
 	 * Returns the identifier.
diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifier.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifier.java
index 4fce202..f069c34 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifier.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Identifier.java
@@ -22,6 +22,6 @@
  * @author Oliver Drotbohm
  * @see Identifiable
  */
-public interface Identifier {
+public interface Identifier<T extends Identifiable<T, ID>, ID extends Identifier<T, ID>> {
 
 }
diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Repository.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Repository.java
index a686106..f022f43 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Repository.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/Repository.java
@@ -33,4 +33,4 @@
  *      Reference (Evans) - Repositories</a>
  * @since 1.2
  */
-public interface Repository<T extends AggregateRoot<T, ID>, ID extends Identifier> {}
+public interface Repository<T extends AggregateRoot<T, ID>, ID extends Identifier<T, ID>> {}
diff --git a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/SimpleAssociation.java b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/SimpleAssociation.java
index 8914883..852b3ec 100644
--- a/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/SimpleAssociation.java
+++ b/jmolecules-ddd/src/main/java/org/jmolecules/ddd/types/SimpleAssociation.java
@@ -26,7 +26,7 @@
  * @see Association#forId(Identifier)
  * @see Association#forAggregate(AggregateRoot)
  */
-class SimpleAssociation<T extends AggregateRoot<T, ID>, ID extends Identifier> implements Association<T, ID> {
+class SimpleAssociation<T extends AggregateRoot<T, ID>, ID extends Identifier<T, ID>> implements Association<T, ID> {
 
 	private final Supplier<ID> identifier;
 
diff --git a/jmolecules-ddd/src/test/java/org/jmolecules/ddd/types/AssociationUnitTests.java b/jmolecules-ddd/src/test/java/org/jmolecules/ddd/types/AssociationUnitTests.java
index 8a9ea7c..d376390 100644
--- a/jmolecules-ddd/src/test/java/org/jmolecules/ddd/types/AssociationUnitTests.java
+++ b/jmolecules-ddd/src/test/java/org/jmolecules/ddd/types/AssociationUnitTests.java
@@ -81,7 +81,7 @@ void rejectsNullReferenceAggregate() {
 				.isThrownBy(() -> Association.forId(new SampleIdentifier()).pointsToSameAggregateAs(null));
 	}
 
-	static class SampleIdentifier implements Identifier {}
+	static class SampleIdentifier implements Identifier<SampleAggregate, SampleIdentifier> {}
 
 	static class SampleAggregate implements AggregateRoot<SampleAggregate, SampleIdentifier> {