Migrate API Gateway to standalone multi-module Gradle project

- Transform into multi-module structure with api-gateway-routing and api-gateway-main
- Update to Spring Boot 3.x with Jakarta EE namespace
- Migrate tests to JUnit 5
- Add HTTP contract stubs publishing from order-service-restapi
- Simplify build-and-test-all.sh to publish stubs at root level

Co-authored by Claude Code

Author: cer

build-and-test-all.sh

@@ -17,13 +17,12 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 echo ""
 
 # Services that publish contract stubs (must be built first)
-# Format: "service-dir:submodule-with-stubs"
 STUB_PUBLISHERS=(
-  "ftgo-order-service:order-service-event-publishing"
-  "ftgo-consumer-service:consumer-service-event-publishing"
-  "ftgo-kitchen-service:kitchen-service-event-publishing"
-  "ftgo-accounting-service:accounting-service-command-handlers"
-  "ftgo-restaurant-service:restaurant-service-event-publishing"
+  "ftgo-order-service"
+  "ftgo-consumer-service"
+  "ftgo-kitchen-service"
+  "ftgo-accounting-service"
+  "ftgo-restaurant-service"
 )
 
 # List of migrated services (add services as they are migrated)
@@ -35,16 +34,15 @@ MIGRATED_SERVICES=(
   "ftgo-restaurant-service"
   "ftgo-delivery-service"
   "ftgo-order-history-service"
+  "ftgo-api-gateway"
 )
 
 # Publish contract stubs from migrated services first
 echo "Publishing contract stubs from migrated services..."
-for entry in "${STUB_PUBLISHERS[@]}"; do
-  service="${entry%%:*}"
-  submodule="${entry##*:}"
-  echo "Publishing stubs: $service ($submodule)"
+for service in "${STUB_PUBLISHERS[@]}"; do
+  echo "Publishing stubs: $service"
   if [ -d "$service" ] && [ -f "$service/gradlew" ]; then
-    (cd "$service" && ./gradlew ":${submodule}:publishStubsPublicationToLocalRepository" $GRADLE_ARGS)
+    (cd "$service" && ./gradlew publishStubsPublicationToLocalRepository $GRADLE_ARGS)
   else
     echo "WARNING: Service '$service' not found or missing gradlew"
   fi

docs/features/upgrade-to-2026/upgrade-to-2026-plan.md

@@ -657,8 +657,8 @@ The `ftgo-order-history-service/` directory already exists. Transform it into a
 
 ### Task 7.7: Verify Order History Service integration
 
-- [ ] Run `./build-and-test-all.sh` and verify all seven services build
-- [ ] Commit all changes for Steel Thread 7
+- [x] Run `./build-and-test-all.sh` and verify all seven services build
+- [x] Commit all changes for Steel Thread 7
 
 ### Task 7.8: Standardize artifact coordinates for contract stubs
 
@@ -701,30 +701,30 @@ Migrate the API Gateway as the final service.
 
 The `ftgo-api-gateway/` directory already exists. Transform it into a multi-module project:
 
-- [ ] Create `settings.gradle` with pluginManagement block and subproject includes:
-  - [ ] `api-gateway-routing` - Route configurations and filters
-  - [ ] `api-gateway-main` - Spring Boot application
-- [ ] Create `gradle.properties` with version properties
-- [ ] Create root `build.gradle` with common configuration
-- [ ] Create each subproject's `build.gradle`
-- [ ] Add Spring Cloud Gateway dependencies for Spring Boot 3.x
-- [ ] Generate Gradle wrapper using `gradle wrapper`
-- [ ] Verify `./gradlew tasks` runs successfully
+- [x] Create `settings.gradle` with pluginManagement block and subproject includes:
+  - [x] `api-gateway-routing` - Route configurations and filters
+  - [x] `api-gateway-main` - Spring Boot application
+- [x] Create `gradle.properties` with version properties
+- [x] Create root `build.gradle` with common configuration
+- [x] Create each subproject's `build.gradle`
+- [x] Add Spring Cloud Gateway dependencies for Spring Boot 3.x
+- [x] Generate Gradle wrapper using `gradle wrapper`
+- [x] Verify `./gradlew tasks` runs successfully
 
 ### Task 8.2: Move source files to subprojects and migrate to Spring Boot 3.x / Jakarta EE
 
-- [ ] Move routing configuration to `api-gateway-routing/`
-- [ ] Move main class to `api-gateway-main/`
-- [ ] Update Spring Cloud Gateway configuration for Spring Boot 3.x
-- [ ] Perform `javax.*` to `jakarta.*` migration (if applicable)
-- [ ] Update route configurations for new service structure
+- [x] Move routing configuration to `api-gateway-routing/`
+- [x] Move main class to `api-gateway-main/`
+- [x] Update Spring Cloud Gateway configuration for Spring Boot 3.x
+- [x] Perform `javax.*` to `jakarta.*` migration (if applicable)
+- [x] Update route configurations for new service structure
 
 ### Task 8.3: Migrate API Gateway tests to appropriate subprojects
 
-- [ ] Move unit tests alongside source files
-- [ ] Update JUnit 4 to JUnit 5
-- [ ] Update `javax.*` to `jakarta.*` imports
-- [ ] Verify `./gradlew test` passes
+- [x] Move unit tests alongside source files
+- [x] Update JUnit 4 to JUnit 5
+- [x] Update `javax.*` to `jakarta.*` imports
+- [x] Verify `./gradlew test` passes
 - [ ] Create integration tests (if needed)
 - [ ] Verify `./gradlew integrationTest` passes
 
@@ -733,7 +733,7 @@ The `ftgo-api-gateway/` directory already exists. Transform it into a multi-modu
 - [ ] Update `ftgo-api-gateway/Dockerfile` for Java 17
 - [ ] Add `ftgo-api-gateway` to root `docker-compose.yaml`
 - [ ] Configure routing to all backend services
-- [ ] Update `build-and-test-all.sh` to include API Gateway
+- [x] Update `build-and-test-all.sh` to include API Gateway
 - [ ] Verify Docker build and service startup
 
 ### Task 8.5: Add end-to-end test for full system via gateway
@@ -744,8 +744,8 @@ The `ftgo-api-gateway/` directory already exists. Transform it into a multi-modu
 
 ### Task 8.6: Verify API Gateway integration
 
-- [ ] Run `./build-and-test-all.sh` and verify all eight services build
-- [ ] Commit all changes for Steel Thread 8
+- [x] Run `./build-and-test-all.sh` and verify all eight services build
+- [x] Commit all changes for Steel Thread 8
 
 ---
 

ftgo-api-gateway/api-gateway-main/build.gradle

@@ -0,0 +1,20 @@
+plugins {
+    id 'org.springframework.boot'
+}
+
+dependencies {
+    implementation project(':api-gateway-routing')
+
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'io.micrometer:micrometer-registry-prometheus'
+
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
+    testImplementation 'org.springframework.cloud:spring-cloud-starter-contract-stub-runner'
+    testImplementation 'io.projectreactor:reactor-test'
+}
+
+test {
+    def repoDir = file("${rootProject.projectDir}/../build/repo").absolutePath
+    systemProperty "stubrunner.repositoryRoot", "file://${repoDir}"
+}

…o/apiagateway/ApiGatewayApplication.java …o/apiagateway/ApiGatewayApplication.javaftgo-api-gateway/src/main/java/net/chrisrichardson/ftgo/apiagateway/ApiGatewayApplication.java renamed to ftgo-api-gateway/api-gateway-main/src/main/java/net/chrisrichardson/ftgo/apiagateway/ApiGatewayApplication.java ftgo-api-gateway/src/main/java/net/chrisrichardson/ftgo/apiagateway/ApiGatewayApplication.java renamed to ftgo-api-gateway/api-gateway-main/src/main/java/net/chrisrichardson/ftgo/apiagateway/ApiGatewayApplication.java

@@ -3,20 +3,15 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import net.chrisrichardson.ftgo.apiagateway.orders.OrderDetails;
 import net.chrisrichardson.ftgo.apiagateway.proxies.OrderInfo;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Value;
+import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.reactive.function.BodyInserters;
 import org.springframework.web.reactive.function.client.WebClient;
 
@@ -29,10 +24,9 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = ApiGatewayIntegrationTestConfiguration.class,
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
         properties={"order.destinations.orderServiceUrl=http://localhost:${wiremock.server.port}",
@@ -61,7 +55,7 @@ public void shouldProxyCreateOrder() {
 
         ResponseEntity<String> z = client
                 .post()
-                .body(BodyInserters.fromObject("{}"))
+                .body(BodyInserters.fromValue("{}"))
                 .exchange()
                 .flatMap(r -> r.toEntity(String.class))
                 .block();
@@ -103,7 +97,7 @@ public void shouldProxyGetOrderDetails() throws JsonProcessingException {
 
         assertNotNull(z);
         assertEquals(HttpStatus.OK, z.getStatusCode());
-        assertEquals(body, expectedOrderDetails, z.getBody());
+        assertEquals(expectedOrderDetails, z.getBody());
 
         verify(getRequestedFor(urlMatching(expectedPath)));
 

…rc/main/resources/application.properties …rc/main/resources/application.propertiesftgo-api-gateway/src/main/resources/application.properties renamed to ftgo-api-gateway/api-gateway-main/src/main/resources/application.properties ftgo-api-gateway/src/main/resources/application.properties renamed to ftgo-api-gateway/api-gateway-main/src/main/resources/application.properties

@@ -4,33 +4,33 @@
 import net.chrisrichardson.ftgo.apiagateway.proxies.OrderInfo;
 import net.chrisrichardson.ftgo.apiagateway.proxies.OrderNotFoundException;
 import net.chrisrichardson.ftgo.apiagateway.proxies.OrderServiceProxy;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.cloud.contract.stubrunner.spring.AutoConfigureStubRunner;
+import org.springframework.cloud.contract.stubrunner.spring.StubRunnerProperties;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes=TestConfiguration.class,
         webEnvironment= SpringBootTest.WebEnvironment.NONE)
 @AutoConfigureStubRunner(ids =
-        {"net.chrisrichardson.ftgo:ftgo-order-service"}
+        {"net.chrisrichardson.ftgo:order-service-restapi"},
+        stubsMode = StubRunnerProperties.StubsMode.REMOTE
 )
 @DirtiesContext
 public class OrderServiceProxyIntegrationTest {
 
-  @Value("${stubrunner.runningstubs.ftgo-order-service.port}")
+  @Value("${stubrunner.runningstubs.order-service-restapi.port}")
   private int port;
   private OrderDestinations orderDestinations;
   private OrderServiceProxy orderService;
 
-  @Before
+  @BeforeEach
   public void setUp() throws Exception {
     orderDestinations = new OrderDestinations();
     String orderServiceUrl = "http://localhost:" + port;
@@ -45,9 +45,11 @@ public void shouldVerifyExistingCustomer() {
     assertEquals("APPROVAL_PENDING", result.getState());
   }
 
-  @Test(expected = OrderNotFoundException.class)
+  @Test
   public void shouldFailToFindMissingOrder() {
-    orderService.findOrderById("555").block();
+    assertThrows(OrderNotFoundException.class, () -> {
+      orderService.findOrderById("555").block();
+    });
   }
 
 }