Hacking.

$ Conflicts:
$	server/src/test/java/de/odrotbohm/restbucks/payment/PaymentsIntegrationTest.java

Author: odrotbohm

server/pom.xml

@@ -71,12 +71,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 			<artifactId>jmolecules-starter-ddd</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.jmolecules.integrations</groupId>
-			<artifactId>jmolecules-jpa</artifactId>
-			<scope>runtime</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.jmolecules.integrations</groupId>
 			<artifactId>jmolecules-jackson3</artifactId>
@@ -104,7 +98,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 
 		<dependency>
 			<groupId>org.springframework.modulith</groupId>
-			<artifactId>spring-modulith-starter-jpa</artifactId>
+			<artifactId>spring-modulith-starter-jdbc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.modulith</groupId>
+			<artifactId>spring-modulith-runtime</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
@@ -139,7 +139,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-jpa</artifactId>
+			<artifactId>spring-boot-starter-data-jdbc</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.liquibase</groupId>
+			<artifactId>liquibase-core</artifactId>
+			<scope>runtime</scope>
 		</dependency>
 
 		<dependency>
@@ -167,6 +173,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
 			<scope>runtime</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-flyway</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+
 		<!-- Misc -->
 
 		<dependency>

server/src/main/java/de/odrotbohm/restbucks/Restbucks.java

@@ -15,10 +15,28 @@
  */
 package de.odrotbohm.restbucks;
 
+import lombok.RequiredArgsConstructor;
+
+import java.time.Year;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+
+import javax.money.MonetaryAmount;
+import javax.money.format.MonetaryAmountFormat;
+import javax.money.format.MonetaryFormats;
+
+import org.javamoney.moneta.Money;
+import org.jspecify.annotations.Nullable;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
+import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.convert.ConverterBuilder;
+import org.springframework.data.convert.ConverterBuilder.ConverterAware;
+import org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration;
 import org.springframework.hateoas.UriTemplate;
 import org.springframework.hateoas.mediatype.hal.CurieProvider;
 import org.springframework.hateoas.mediatype.hal.DefaultCurieProvider;
@@ -54,4 +72,64 @@ CurieProvider curieProvider() {
 	public static void main(String[] args) {
 		SpringApplication.run(Restbucks.class, args);
 	}
+
+	@Configuration(proxyBeanMethods = false)
+	@RequiredArgsConstructor
+	static class PersistenceCustomizations extends AbstractJdbcConfiguration {
+
+		private static final MonetaryAmountFormat FORMAT = MonetaryFormats.getAmountFormat(Locale.ROOT);
+
+		private final ApplicationContext context;
+
+		@Bean
+		ConverterAware monetaryAmountConverter() {
+
+			return ConverterBuilder.writing(MonetaryAmount.class, String.class, this::convert)
+					.andReading(this::convertToEntityAttribute);
+		}
+
+		@Bean
+		ConverterAware yearAttributeConverter() {
+			return ConverterBuilder.writing(Year.class, Integer.class, Year::getValue).andReading(Year::of);
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.jdbc.repository.config.AbstractJdbcConfiguration#userConverters()
+		 */
+		@Override
+		protected List<?> userConverters() {
+
+			context.getBeansOfType(ConverterAware.class).values();
+
+			return new ArrayList<>(context.getBeansOfType(ConverterAware.class).values());
+		}
+
+		@Nullable
+		String convert(MonetaryAmount amount) {
+
+			return amount == null ? null
+					: String.format("%s %s", amount.getCurrency().toString(), amount.getNumber().toString());
+		}
+
+		Money convertToEntityAttribute(String source) {
+
+			if (source == null) {
+				return null;
+			}
+
+			try {
+				return Money.parse(source);
+			} catch (RuntimeException e) {
+
+				try {
+					return Money.parse(source, FORMAT);
+				} catch (RuntimeException inner) {
+
+					// Propagate the original exception in case the fallback fails
+					throw e;
+				}
+			}
+		}
+	}
 }

server/src/main/java/de/odrotbohm/restbucks/core/MonetaryAmountAttributeConverter.java

@@ -16,9 +16,9 @@
 package de.odrotbohm.restbucks.order;
 
 import de.odrotbohm.restbucks.drinks.Drink;
+import de.odrotbohm.restbucks.drinks.Drink.DrinkIdentifier;
 import de.odrotbohm.restbucks.drinks.Milk;
 import de.odrotbohm.restbucks.drinks.Size;
-import de.odrotbohm.restbucks.drinks.Drink.DrinkIdentifier;
 import de.odrotbohm.restbucks.order.LineItem.LineItemIdentifier;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -30,14 +30,15 @@
 import org.jmolecules.ddd.types.Association;
 import org.jmolecules.ddd.types.Entity;
 import org.jmolecules.ddd.types.Identifier;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * A line item.
  *
  * @author Oliver Drotbohm
  */
 @Getter
-@AllArgsConstructor
+@AllArgsConstructor(onConstructor = @__(@PersistenceCreator))
 public class LineItem implements Entity<Order, LineItemIdentifier> {
 
 	private final LineItemIdentifier id;

server/src/main/java/de/odrotbohm/restbucks/core/YearAttributeConverter.java

@@ -17,10 +17,8 @@
 
 import de.odrotbohm.restbucks.drinks.Drink;
 import de.odrotbohm.restbucks.order.Order.OrderIdentifier;
-import jakarta.persistence.Column;
-import jakarta.persistence.OrderColumn;
-import jakarta.persistence.Table;
-import jakarta.persistence.Version;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
 
@@ -36,7 +34,10 @@
 import org.jmolecules.ddd.types.AggregateRoot;
 import org.jmolecules.ddd.types.Identifier;
 import org.jmolecules.event.types.DomainEvent;
+import org.springframework.data.annotation.PersistenceCreator;
+import org.springframework.data.annotation.Version;
 import org.springframework.data.domain.AbstractAggregateRoot;
+import org.springframework.data.relational.core.mapping.Column;
 
 /**
  * An order.
@@ -45,7 +46,7 @@
  */
 @Getter
 @ToString(exclude = "lineItems")
-@Table(name = "RBOrder")
+@AllArgsConstructor(onConstructor = @__(@PersistenceCreator), access = AccessLevel.PRIVATE)
 public class Order extends AbstractAggregateRoot<Order> implements AggregateRoot<Order, OrderIdentifier> {
 
 	private final OrderIdentifier id;
@@ -54,9 +55,8 @@ public class Order extends AbstractAggregateRoot<Order> implements AggregateRoot
 	private Status status;
 	private @Version Long version;
 
-	@OrderColumn //
-	@Column(unique = true) //
-	private final List<LineItem> lineItems = new ArrayList<>();
+	@Column //
+	private final List<LineItem> lineItems;
 
 	/**
 	 * Creates a new {@link Order} for the given {@link LineItem}s and {@link Location}.
@@ -69,7 +69,7 @@ public Order(Collection<LineItem> lineItems, Location location) {
 		this.id = new OrderIdentifier(UUID.randomUUID());
 		this.location = location == null ? Location.TAKE_AWAY : location;
 		this.status = Status.PAYMENT_EXPECTED;
-		this.lineItems.addAll(lineItems);
+		this.lineItems = new ArrayList<>(lineItems);
 		this.orderedDate = LocalDateTime.now();
 		registerEvent(new OrderCreated(id, location));
 	}

server/src/main/java/de/odrotbohm/restbucks/order/LineItem.java

@@ -15,7 +15,6 @@
  */
 package de.odrotbohm.restbucks.payment;
 
-import jakarta.persistence.Column;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.ToString;
@@ -37,7 +36,7 @@
 @AllArgsConstructor(onConstructor = @__(@JsonCreator))
 public class CreditCard implements AggregateRoot<CreditCard, CreditCardNumber> {
 
-	private final @Getter @Column(unique = true) CreditCardNumber number;
+	private final @Getter CreditCardNumber number;
 	private final @Getter String cardHolderName;
 
 	private Month expiryMonth;

server/src/main/java/de/odrotbohm/restbucks/order/Order.java

@@ -18,9 +18,6 @@
 import de.odrotbohm.restbucks.order.Order;
 import de.odrotbohm.restbucks.order.Order.OrderIdentifier;
 import de.odrotbohm.restbucks.payment.Payment.PaymentIdentifier;
-import jakarta.persistence.Column;
-import jakarta.persistence.Inheritance;
-import jakarta.persistence.InheritanceType;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
@@ -32,6 +29,7 @@
 import org.jmolecules.ddd.types.AggregateRoot;
 import org.jmolecules.ddd.types.Association;
 import org.jmolecules.ddd.types.Identifier;
+import org.springframework.data.relational.core.mapping.Table;
 import org.springframework.util.Assert;
 
 /**
@@ -42,13 +40,11 @@
 @Getter
 @ToString
 @NoArgsConstructor(force = true)
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+@Table("CREDIT_CARD_PAYMENT")
 public abstract class Payment<T extends AggregateRoot<T, PaymentIdentifier>>
 		implements AggregateRoot<T, PaymentIdentifier> {
 
 	private final PaymentIdentifier id;
-
-	@Column(name = "rborder") //
 	private final Association<Order, OrderIdentifier> order;
 	private final LocalDateTime paymentDate;