Skip to content

Move API write and read boundaries to application services #38

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 3 commits into from
Jul 13, 2026
Merged

Move API write and read boundaries to application services #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa69fdd
Move write handling to application commands
eviltester Jul 13, 2026
74c57d1
Move read handling to application queries
eviltester Jul 13, 2026
af46248
Run Spotless formatting on Java 21
eviltester Jul 13, 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
17 changes: 15 additions & 2 deletions .github/workflows/run-juit-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,24 @@ on:


jobs:
format:
runs-on: ubuntu-latest
name: Java formatting
steps:
- uses: actions/checkout@v4
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 21
cache: maven
- name: Check Java formatting
run: mvn -B spotless:check

build:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
# list of Java versions
#java: [ 8, 8.0.192, 9.0.x, 10, 11.0.x, 11.0.3, 12, 13 ]
Expand All @@ -24,7 +39,5 @@ jobs:
distribution: temurin
java-version: ${{ matrix.java }}
cache: maven
- name: Check Java formatting
run: mvn -B spotless:check
- name: Build with Maven
run: mvn -B clean test
14 changes: 8 additions & 6 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 @@ -19,7 +19,6 @@
import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.BearerAuthHeaderParser;
import uk.co.compendiumdev.thingifier.api.http.headers.headerparser.ContentTypeHeaderParser;
import uk.co.compendiumdev.thingifier.api.response.ApiResponse;
import uk.co.compendiumdev.thingifier.api.restapihandlers.ThingCreation;
import uk.co.compendiumdev.thingifier.application.internalhttp.InternalHttpRequest;
import uk.co.compendiumdev.thingifier.application.internalhttpconversion.HttpApiResponseToInternalHttpResponse;
import uk.co.compendiumdev.thingifier.application.internalhttpconversion.InternalHttpRequestToHttpApiRequest;
Expand Down Expand Up @@ -308,11 +307,14 @@ public void configure(
if (httpApiResponse == null) {

ApiResponse response =
new ThingCreation(this.secretNoteStore)
.with(
new BodyParser(myRequest, List.of("secretnote")),
this.secretNote,
EntityRelModel.DEFAULT_DATABASE_NAME);
this.secretNoteStore
.api()
.post(
"secretnote",
new BodyParser(
myRequest,
this.secretNoteStore.getThingNames()),
myRequest.getHeaders());
if (!response.isErrorResponse()) {

EntityInstance returnedInstance = response.getReturnedInstance();
Expand Down
50 changes: 14 additions & 36 deletions ...odel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersBooleanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,7 @@ public void canFilterBooleanMatchesTrue() {
QueryFilterParams params = new QueryFilterParams();
params.put("truefalse", "true");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -80,12 +75,7 @@ public void canFilterBooleanMatchesFalse() {
QueryFilterParams params = new QueryFilterParams();
params.put("truefalse", "false");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -97,12 +87,7 @@ public void canFilterBooleanMatchesNotFalse() {
QueryFilterParams params = new QueryFilterParams();
params.put("truefalse", "!false");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -114,12 +99,7 @@ public void canFilterBooleanMatchesNotTrue() {
QueryFilterParams params = new QueryFilterParams();
params.put("truefalse", "!true");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -131,12 +111,7 @@ public void canSortBooleanMatchesAsc() {
QueryFilterParams params = new QueryFilterParams();
params.put("sortBy", "+truefalse");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -153,12 +128,7 @@ public void canSortBooleanMatchesDesc() {
QueryFilterParams params = new QueryFilterParams();
params.put("sortBy", "-truefalse");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -169,4 +139,12 @@ public void canSortBooleanMatchesDesc() {
Assertions.assertEquals(true, instances.get(2).getFieldValue("truefalse").asBoolean());
Assertions.assertEquals(false, instances.get(3).getFieldValue("truefalse").asBoolean());
}

private RepositoryQuery queryThings(final QueryFilterParams params) {
return new RepositoryQuery(
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
RepositoryQuerySpec.collection(
erModel.getSchema().getEntityDefinitionNamed("thing")))
.performQuery(params);
}
}
71 changes: 17 additions & 54 deletions ...emodel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersFloatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,7 @@ public void canFilterFloatEquals() {
QueryFilterParams params = new QueryFilterParams();
params.put("float", "1.1");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);
Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Assertions.assertEquals(1, instances.size(), "expected 1 value");
Expand All @@ -72,12 +67,7 @@ public void canFilterFloatNotEquals() {
params.put("float", "!1.1");
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);
Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Assertions.assertEquals(3, instances.size(), "expected 3 value");
Expand All @@ -95,12 +85,7 @@ public void canFilterFloatCombinationOfConditions() {
params.put("float", "!3.3"); // and not equal to 3
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);
Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Assertions.assertEquals(2, instances.size(), "expected 2 value");
Expand All @@ -114,12 +99,7 @@ public void canFilterFloatGreaterThan() {
params.put("float", ">1.1");
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -135,12 +115,7 @@ public void canFilterFloatLessThan() {
params.put("float", "<2.0");
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -154,12 +129,7 @@ public void canFilterFloatLessThanNotMatching() {
params.put("float", "<1.1");
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -172,12 +142,7 @@ public void canFilterFloatGreaterThanEquals() {
params.put("float", ">=3.3");
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -192,12 +157,7 @@ public void canFilterFloatLessThanEquals() {
params.put("float", "<=3.3");
params.put("sortby", "+float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -213,12 +173,7 @@ public void canFilterFloatLessThanEqualsSortDesc() {
params.put("float", "<=3.3");
params.put("sortby", "-float");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -227,4 +182,12 @@ public void canFilterFloatLessThanEqualsSortDesc() {
Assertions.assertEquals(2.2F, instances.get(1).getFieldValue("float").asFloat());
Assertions.assertEquals(1.1F, instances.get(2).getFieldValue("float").asFloat());
}

private RepositoryQuery queryThings(final QueryFilterParams params) {
return new RepositoryQuery(
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
RepositoryQuerySpec.collection(
erModel.getSchema().getEntityDefinitionNamed("thing")))
.performQuery(params);
}
}
22 changes: 10 additions & 12 deletions ercoremodel/src/test/java/uk/co/compendiumdev/thingifier/core/query/QueryFiltersIdTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,7 @@ public void canFilterAndSortIdAsc() {
params.put("id", ">=3");
params.put("sortBy", "+id");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Expand All @@ -77,17 +72,20 @@ public void canFilterAndSortIdDesc() {
params.put("id", "<3");
params.put("sortBy", "-id");

RepositoryUrlQuery queryResults =
new RepositoryUrlQuery(
erModel.getSchema(),
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
"things")
.performQuery(params);
RepositoryQuery queryResults = queryThings(params);

Assertions.assertTrue(queryResults.isResultACollection(), "result should be a collection");
List<EntityInstance> instances = queryResults.getListEntityInstances();
Assertions.assertEquals(2, instances.size(), "expected 2 true values");
Assertions.assertEquals(2, instances.get(0).getFieldValue("fakeid").asInteger());
Assertions.assertEquals(1, instances.get(1).getFieldValue("fakeid").asInteger());
}

private RepositoryQuery queryThings(final QueryFilterParams params) {
return new RepositoryQuery(
erModel.getStore(EntityRelModel.DEFAULT_DATABASE_NAME),
RepositoryQuerySpec.collection(
erModel.getSchema().getEntityDefinitionNamed("thing")))
.performQuery(params);
}
}
Loading
Loading