From e914233801ff5de1b1f4b1042b1e36ec89b9cb24 Mon Sep 17 00:00:00 2001 From: HuaizhiDai Date: Wed, 16 Jul 2025 17:14:09 +1000 Subject: [PATCH 1/2] restructure --- .../java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java | 2 ++ .../java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java index 89912760..b252d5ca 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ConceptModel.java @@ -12,4 +12,6 @@ public class ConceptModel { protected String id; protected String url; + protected String description; + protected String title; } diff --git a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java index 6825d2e6..1a2adbcf 100644 --- a/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java +++ b/server/src/main/java/au/org/aodn/ogcapi/server/core/model/ThemeModel.java @@ -13,8 +13,6 @@ @AllArgsConstructor public class ThemeModel { protected String scheme; - protected String description; - protected String title; protected List concepts; } From 91987d5c219943d02511dbb71a84321b95956963 Mon Sep 17 00:00:00 2001 From: HuaizhiDai Date: Thu, 17 Jul 2025 11:21:04 +1000 Subject: [PATCH 2/2] test fix --- .../ogcapi/server/core/mapper/StacToCollectionTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java b/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java index c15abd14..cfcca69e 100644 --- a/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java +++ b/server/src/test/java/au/org/aodn/ogcapi/server/core/mapper/StacToCollectionTest.java @@ -91,9 +91,9 @@ public void verifyAddingPropertyWorks() { .build(); var theme = ThemeModel.builder() .scheme("scheme") - .description("description") - .title("title") - .concepts(Collections.singletonList(ConceptModel.builder().id("id").url("url").build())) + .concepts(Collections.singletonList( + ConceptModel.builder().id("id").url("url").description("description").title("title").build() + )) .build(); var citationString = "{\"suggestedCitation\":\"this is suggested Citation\",\"useLimitations\":[\"this is useLimitations1\",\"this is useLimitations2\"],\"otherConstraints\":[\"this is otherConstraints1\",\"this is otherConstraints2\"]}"; var statement = "This is the statement of this record";