Skip to content

Merge pure API mapper schema reference cleanup #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eviltester merged 6 commits into from
Jul 14, 2026
Merged

Merge pure API mapper schema reference cleanup #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa01605
Refine outside-in API boundaries
eviltester Jul 14, 2026
27390a7
Refactor API mappers to schema references
eviltester Jul 14, 2026
73465cc
Make application errors HTTP agnostic
eviltester Jul 14, 2026
2bd9a04
Remove write route display leakage
eviltester Jul 14, 2026
92bf9c2
Move URL query parsing to HTTP edge
eviltester Jul 14, 2026
07ddcea
Add DDD boundary guardrails
eviltester Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion challenger/src/main/java/uk/co/compendiumdev/challenge/ChallengeMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import uk.co.compendiumdev.challenge.apimodel.ChallengeApiModel;
import uk.co.compendiumdev.challenge.challengers.Challengers;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.http.ThingifierHttpApiRoutings;
import uk.co.compendiumdev.thingifier.adapter.spark.MainImplementation;
import uk.co.compendiumdev.thingifier.adapter.spark.ThingifierHttpApiRoutings;
import uk.co.compendiumdev.thingifier.core.repository.ThingStoreProviderConfig;

public class ChallengeMain {
Expand Down
2 changes: 1 addition & 1 deletion challenger/src/main/java/uk/co/compendiumdev/challenge/ChallengeRouteHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import uk.co.compendiumdev.challenge.practicemodes.simpleapi.SimpleApiRoutes;
import uk.co.compendiumdev.challenge.practicemodes.simulation.SimulationRoutes;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.http.ThingifierHttpApiRoutings;
import uk.co.compendiumdev.thingifier.adapter.spark.ThingifierHttpApiRoutings;
import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
import uk.co.compendiumdev.thingifier.htmlgui.htmlgen.DefaultGUIHTML;

Expand Down
6 changes: 3 additions & 3 deletions challenger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/AuthRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.HttpApiResponseToInternalHttpResponse;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpRequestToHttpApiRequest;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpResponseToSpark;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.SparkToInternalHttpRequest;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.adapter.spark.conversion.InternalHttpResponseToSpark;
import uk.co.compendiumdev.thingifier.adapter.spark.conversion.SparkToInternalHttpRequest;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingDefinition;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingStatus;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
Expand All @@ -33,7 +34,6 @@
import uk.co.compendiumdev.thingifier.core.domain.instances.EntityInstanceDraft;
import uk.co.compendiumdev.thingifier.core.domain.instances.validation.EntityInstanceStateValidator;
import uk.co.compendiumdev.thingifier.core.reporting.ValidationReport;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

// TODO: This should be using a Thingifier to do the work of XML JSON etc... like the simulation
public class AuthRoutes {
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/uk/co/compendiumdev/challenge/challengesrouting/ChallengerTrackingRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import uk.co.compendiumdev.challenge.challenges.ChallengeDefinitions;
import uk.co.compendiumdev.challenge.persistence.PersistenceLayer;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.api.docgen.*;
import uk.co.compendiumdev.thingifier.api.response.ApiResponseAsJson;
import uk.co.compendiumdev.thingifier.api.response.ApiResponseError;
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.FieldType;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

public class ChallengerTrackingRoutes {

Expand Down
4 changes: 2 additions & 2 deletions ...enger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/ChallengesRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
import uk.co.compendiumdev.challenge.apimodel.ChallengeThingifier;
import uk.co.compendiumdev.challenge.challengers.Challengers;
import uk.co.compendiumdev.challenge.challenges.ChallengeDefinitions;
import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.SparkApiRequestResponseHandler;
import uk.co.compendiumdev.thingifier.adapter.spark.AdhocDocumentedSparkRouteConfigurer;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.adapter.spark.routehandlers.SparkApiRequestResponseHandler;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingDefinition;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingStatus;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
Expand All @@ -17,7 +18,6 @@
import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
import uk.co.compendiumdev.thingifier.core.query.FilterBy;
import uk.co.compendiumdev.thingifier.core.query.QueryFilterParams;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

public class ChallengesRoutes {

Expand Down
2 changes: 1 addition & 1 deletion ...lenger/src/main/java/uk/co/compendiumdev/challenge/challengesrouting/HeartBeatRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import java.util.List;
import uk.co.compendiumdev.thingifier.adapter.spark.AdhocDocumentedSparkRouteConfigurer;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

public class HeartBeatRoutes {

Expand Down
4 changes: 2 additions & 2 deletions ...lenger/src/main/java/uk/co/compendiumdev/challenge/practicemodes/mirror/MirrorRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import java.util.List;
import spark.Route;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.http.ThingifierAutoDocGenRouting;
import uk.co.compendiumdev.thingifier.adapter.spark.AdhocDocumentedSparkRouteConfigurer;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.adapter.spark.ThingifierAutoDocGenRouting;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
import uk.co.compendiumdev.thingifier.htmlgui.htmlgen.DefaultGUIHTML;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

/*
Create a set of custom end points that do not use a thingifier, but
Expand Down
2 changes: 1 addition & 1 deletion ...enger/src/main/java/uk/co/compendiumdev/challenge/practicemodes/mirror/RequestMirror.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import spark.Response;
import uk.co.compendiumdev.challenge.spark.SparkMessageLengthValidator;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.SparkApiRequestResponseHandler;
import uk.co.compendiumdev.thingifier.adapter.spark.routehandlers.SparkApiRequestResponseHandler;
import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.AcceptHeaderParser;
import uk.co.compendiumdev.thingifier.core.domain.definitions.EntityDefinition;
import uk.co.compendiumdev.thingifier.core.domain.definitions.field.definition.Field;
Expand Down
6 changes: 3 additions & 3 deletions .../src/main/java/uk/co/compendiumdev/challenge/practicemodes/simpleapi/SimpleApiRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@

import java.util.List;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.http.ThingifierAutoDocGenRouting;
import uk.co.compendiumdev.thingifier.adapter.http.ThingifierHttpApiRoutings;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.adapter.spark.ThingifierAutoDocGenRouting;
import uk.co.compendiumdev.thingifier.adapter.spark.ThingifierHttpApiRoutings;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingDefinition;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingStatus;
import uk.co.compendiumdev.thingifier.api.docgen.RoutingVerb;
Expand All @@ -19,7 +20,6 @@
import uk.co.compendiumdev.thingifier.core.domain.definitions.validation.MaximumLengthValidationRule;
import uk.co.compendiumdev.thingifier.htmlgui.htmlgen.DefaultGUIHTML;
import uk.co.compendiumdev.thingifier.htmlgui.routing.DefaultGuiRoutings;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

/*
The simple API is a no-auth API where anyone can amend, create, delete items.
Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/uk/co/compendiumdev/challenge/practicemodes/simulation/SimulationRoutes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
import java.util.List;
import uk.co.compendiumdev.challenge.ChallengerConfig;
import uk.co.compendiumdev.thingifier.Thingifier;
import uk.co.compendiumdev.thingifier.adapter.http.ThingifierAutoDocGenRouting;
import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.HttpApiRequestHandler;
import uk.co.compendiumdev.thingifier.adapter.http.routehandlers.SparkApiRequestResponseHandler;
import uk.co.compendiumdev.thingifier.adapter.spark.SimpleSparkRouteCreator;
import uk.co.compendiumdev.thingifier.adapter.spark.ThingifierAutoDocGenRouting;
import uk.co.compendiumdev.thingifier.adapter.spark.routehandlers.SparkApiRequestResponseHandler;
import uk.co.compendiumdev.thingifier.api.docgen.ThingifierApiDocumentationDefn;
import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
Expand All @@ -26,7 +27,6 @@
import uk.co.compendiumdev.thingifier.core.repository.ThingStore;
import uk.co.compendiumdev.thingifier.core.repository.ThingStoreProviderConfig;
import uk.co.compendiumdev.thingifier.htmlgui.htmlgen.DefaultGUIHTML;
import uk.co.compendiumdev.thingifier.spark.SimpleSparkRouteCreator;

public class SimulationRoutes {

Expand Down
4 changes: 2 additions & 2 deletions ...lenger/src/main/java/uk/co/compendiumdev/challenge/spark/SparkMessageLengthValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import uk.co.compendiumdev.thingifier.adapter.internalhttp.InternalHttpRequest;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.HttpApiResponseToInternalHttpResponse;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpRequestToHttpApiRequest;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.InternalHttpResponseToSpark;
import uk.co.compendiumdev.thingifier.adapter.internalhttp.conversion.SparkToInternalHttpRequest;
import uk.co.compendiumdev.thingifier.adapter.spark.conversion.InternalHttpResponseToSpark;
import uk.co.compendiumdev.thingifier.adapter.spark.conversion.SparkToInternalHttpRequest;
import uk.co.compendiumdev.thingifier.api.ermodelconversion.JsonThing;
import uk.co.compendiumdev.thingifier.api.http.HttpApiRequest;
import uk.co.compendiumdev.thingifier.api.http.HttpApiResponse;
Expand Down
18 changes: 7 additions & 11 deletions .../challenger/restassured/_11_accept_challenges/C030GetTodosNotAcceptableHeader406Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.response.Response;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import uk.co.compendiumdev.challenger.restassured.api.ChallengesStatus;
Expand All @@ -13,16 +12,13 @@ public class C030GetTodosNotAcceptableHeader406Test extends RestAssuredBaseTest
@Test
void canGet406WhenUnsupportedAcceptHeaderSent() {

final Response response =
RestAssured.given()
.header("X-CHALLENGER", xChallenger)
.accept("application/gzip")
.get(apiPath("/todos"))
.then()
.statusCode(406)
.contentType(ContentType.JSON)
.extract()
.response();
RestAssured.given()
.header("X-CHALLENGER", xChallenger)
.accept("application/gzip")
.get(apiPath("/todos"))
.then()
.statusCode(406)
.contentType(ContentType.JSON);

ChallengesStatus statuses = new ChallengesStatus();
statuses.get();
Expand Down
22 changes: 9 additions & 13 deletions ...enger/restassured/_13_restore_session_challenges/C035PutRestoreChallengerSessionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,14 @@ public void canPutChallengerSessionToReset() {

challengerResponse.challengeStatus.CREATE_NEW_CHALLENGER = true;

nResponse =
RestAssured.given()
.header("X-CHALLENGER", xChallenger)
.accept("application/json")
.body(challengerResponse)
.put(apiPath("/challenger/" + xChallenger))
.then()
.statusCode(200)
. // updated existing
contentType(ContentType.JSON)
.and()
.extract()
.response();
RestAssured.given()
.header("X-CHALLENGER", xChallenger)
.accept("application/json")
.body(challengerResponse)
.put(apiPath("/challenger/" + xChallenger))
.then()
.statusCode(200)
. // updated existing
contentType(ContentType.JSON);
}
}
19 changes: 7 additions & 12 deletions ...llenger/restassured/_13_restore_session_challenges/C038PutRestoreChallengerTodosTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,13 @@ public void canGetAllTodosAndPutTodosToRestore() {
Assertions.assertNotNull(xChallenger);
Assertions.assertTrue(xChallenger.length() > 5);

Todos todosResponse =
RestAssured.given()
.header("X-CHALLENGER", xChallenger)
.accept("application/json")
.get(apiPath("/challenger/database/" + xChallenger))
.then()
.statusCode(200)
.contentType(ContentType.JSON)
.and()
.extract()
.response()
.as(Todos.class);
RestAssured.given()
.header("X-CHALLENGER", xChallenger)
.accept("application/json")
.get(apiPath("/challenger/database/" + xChallenger))
.then()
.statusCode(200)
.contentType(ContentType.JSON);

ChallengesStatus statuses = new ChallengesStatus();
statuses.get();
Expand Down
Loading
Loading