Make build() return the context type from newBuilder()

The builder now remembers the context type passed to newBuilder() and
build() returns C directly, eliminating the redundant build(Class) overload.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: vanrogu

sliceworkz-eventmodeling-api/src/main/java/org/sliceworkz/eventmodeling/boundedcontext/BoundedContext.java

@@ -54,6 +54,7 @@ public static <C extends BoundedContext<?,?,?>> BoundedContextBuilder<C> newBuil
 				". Ensure it extends EventTypes with concrete type arguments.");
 		}
 		BoundedContextBuilder<C> result = ServiceLoader.load(BoundedContextBuilder.class).findFirst().get();
+		result.contextType(contextType);
 		result.eventTypes((Class<?>) typeArgs[0], (Class<?>) typeArgs[1], (Class<?>) typeArgs[2]);
 		return result;
 	}

sliceworkz-eventmodeling-api/src/main/java/org/sliceworkz/eventmodeling/boundedcontext/BoundedContextBuilder.java

@@ -35,6 +35,8 @@ public interface BoundedContextBuilder<C extends BoundedContext<?,?,?>> {
 
 	BoundedContextBuilder<C> name(String name);
 
+	BoundedContextBuilder<C> contextType(Class<C> contextType);
+
 	BoundedContextBuilder<C> eventTypes(
 			Class<?> domainEventRootType,
 			Class<?> inboundEventRootType,
@@ -107,8 +109,6 @@ BoundedContextBuilder<C> historicalEventTypes(
 	 */
 	<T> T port(Class<T> portType, String qualification);
 
-	<T> T build( );
-
-	<T> T build(Class<T> returnType);
+	C build();
 
 }

sliceworkz-eventmodeling-benchmark/src/main/java/org/sliceworkz/eventmodeling/benchmark/BenchmarkApplication.java

@@ -107,7 +107,7 @@ public static void main ( String[] args ) throws InterruptedException {
 				.features()
 					.rootPackage(BenchmarkApplication.class.getPackage())
 					.done()
-				.build(OrderProcessing.class);
+				.build();
 
 		bc.start();
 

sliceworkz-eventmodeling-examples/src/main/java/org/sliceworkz/eventmodeling/examples/banking/BankingClosingTheBooksExample.java

@@ -100,7 +100,7 @@ public static void main(String[] args) {
 			.rootPackage(BankingClosingTheBooksExample.class.getPackage())
 			.done();
 
-		ClosingTheBooks bc = builder.build(ClosingTheBooks.class);
+		ClosingTheBooks bc = builder.build();
 
 		bc.start();
 

sliceworkz-eventmodeling-examples/src/main/java/org/sliceworkz/eventmodeling/examples/banking/BankingExample.java

@@ -61,7 +61,7 @@ public static void main ( String[] args ) {
 			.features()
 				.rootPackage(BankingExample.class.getPackage())
 				.done()
-			.build(Banking.class);
+			.build();
 
 		bc.start();
 

sliceworkz-eventmodeling-impl/src/main/java/org/sliceworkz/eventmodeling/module/boundedcontext/BoundedContextBuilderImpl.java

@@ -82,6 +82,7 @@ public class BoundedContextBuilderImpl<C extends BoundedContext<?,?,?>> implemen
 	private static final String PURPOSE_OUTBOUND = "outbound";
 	private static final String PURPOSE_OBSERVABILITY = "observability";
 
+	private Class<C> contextType;
 	private String name;
 
 	private List<LiveModelSpecificationImpl> liveModelSpecs = new ArrayList<>();
@@ -109,6 +110,12 @@ public class BoundedContextBuilderImpl<C extends BoundedContext<?,?,?>> implemen
 
 	private final AdapterRegistry adapterRegistry = new AdapterRegistry();
 
+	@Override
+	public BoundedContextBuilder<C> contextType(Class<C> contextType) {
+		this.contextType = contextType;
+		return this;
+	}
+
 	@Override
 	public BoundedContextBuilder<C> name ( String name ) {
 		this.name = name;
@@ -260,12 +267,8 @@ public <T> T port(Class<T> portType, String qualification) {
 	}
 
 	@Override
-	public <T> T build ( ) {
-		return build((Class<T>) BoundedContext.class);
-	}
-
-	@Override
-	public <T> T build ( Class<T> returnType ) {
+	public C build ( ) {
+		Class<?> returnType = contextType != null ? contextType : BoundedContext.class;
 
 		if ( instance == null ) {
 			throw new IllegalArgumentException("instance not set");
@@ -360,11 +363,11 @@ public <T> T build ( Class<T> returnType ) {
 		am.setCapabilitiesDelegate(bc);
 		im.setCapabilitiesDelegate(bc);
 
-		T result;
+		C result;
 		if ( returnType.isInterface()) {
 			result = proxy(bc, returnType);
 		} else {
-			result = (T)bc;
+			result = (C)bc;
 		}
 		bc.setSelfReference((BoundedContext<?,?,?>) result);
 		return result;

sliceworkz-eventmodeling-testing/src/main/java/org/sliceworkz/eventmodeling/testing/AbstractBoundedContextTest.java

@@ -73,7 +73,7 @@ void setUp ( ) {
 		// let subclasses do any needed configuration
 		configure(builder);
 
-		this.boundedContext = builder.build(BoundedContext.class);
+		this.boundedContext = (BoundedContext<DOMAIN_EVENT_TYPE, INBOUND_EVENT_TYPE, OUTBOUND_EVENT_TYPE>) builder.build();
 	}
 
 	public abstract Class<DOMAIN_EVENT_TYPE> domainEventType ( );

sliceworkz-eventmodeling-tests-inmem/src/test/java/org/sliceworkz/eventmodeling/mock/boundedcontext/AbstractMockDomainTest.java

@@ -21,8 +21,9 @@
 
 public abstract class AbstractMockDomainTest extends AbstractBoundedContextTest<MockDomainEvent,MockInboundEvent,MockOutboundEvent> {
 
+	@SuppressWarnings("unchecked")
 	protected Mock buildBoundedContext ( BoundedContextBuilder<?> boundedContextBuilder ) {
-		Mock result = boundedContextBuilder.build(Mock.class);
+		Mock result = (Mock) boundedContextBuilder.build();
 		this.boundedContext = result;
 		this.boundedContext.start();
 		return result;

sliceworkz-eventmodeling-tests-inmem/src/test/java/org/sliceworkz/eventmodeling/module/historical/HistoricalDomainEventTest.java

@@ -55,6 +55,7 @@
  * annotations and {@link Upcast} implementations to transparently transform old events
  * to current types when read from the event store.</p>
  */
+@SuppressWarnings("unchecked")
 public class HistoricalDomainEventTest {
 
 	private EventStorage eventStorage;
@@ -104,7 +105,7 @@ void historicalEventsAreUpcastedAndVisibleThroughReadModel() {
 
 		builder.readmodel(ItemCountReadModel.class).live();
 
-		boundedContext = builder.build();
+		boundedContext = (BoundedContext<CurrentDomainEvent, InboundEvent, OutboundEvent>) (BoundedContext<?,?,?>) builder.build();
 		boundedContext.start();
 
 		// Step 3: Execute a command that adds a NEW event (using the current schema)
@@ -139,7 +140,7 @@ void historicalEventsAreUpcastedAndVisibleThroughCommand() {
 
 		builder.readmodel(ItemCountReadModel.class).live();
 
-		boundedContext = builder.build();
+		boundedContext = (BoundedContext<CurrentDomainEvent, InboundEvent, OutboundEvent>) (BoundedContext<?,?,?>) builder.build();
 		boundedContext.start();
 
 		// Execute a command that raises a new event