diff --git a/CHANGELOG.md b/CHANGELOG.md index 32c8bd9f..c508d54d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [1.25.0] - 2024-02-21 ### Changed - Join between CSV table and shapefile has been updated based on Geotools update [#272](https://github.com/IN-CORE/incore-services/issues/272) @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Added - Add retrofit information to the mapping set class [#252](https://github.com/IN-CORE/incore-services/issues/252) +### Fixed +- Fix broken Semantics Type embedded in data viewer [#273](https://github.com/IN-CORE/incore-services/issues/273) ## [1.24.0] - 2024-02-07 diff --git a/server/build.gradle b/server/build.gradle index c722204b..e4a725a4 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -48,7 +48,7 @@ apply plugin: 'war' // This will not apply to the war files we build unless we put it within project loop // at the end of this file. This is only for the docker build to pull a version war { - archiveVersion = '1.24.0' + archiveVersion = '1.25.0' } apply plugin: 'org.gretty' diff --git a/server/data-service/src/main/java/edu/illinois/ncsa/incore/service/data/controllers/DatasetController.java b/server/data-service/src/main/java/edu/illinois/ncsa/incore/service/data/controllers/DatasetController.java index 5b8b1634..4dc2ea0e 100644 --- a/server/data-service/src/main/java/edu/illinois/ncsa/incore/service/data/controllers/DatasetController.java +++ b/server/data-service/src/main/java/edu/illinois/ncsa/incore/service/data/controllers/DatasetController.java @@ -71,7 +71,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Data Service for creating and accessing datasets", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Data Service API", contact = @Contact( name = "IN-CORE Dev Team", diff --git a/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/FragilityController.java b/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/FragilityController.java index 56a60e28..b1591412 100644 --- a/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/FragilityController.java +++ b/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/FragilityController.java @@ -56,7 +56,7 @@ @OpenAPIDefinition( info = @Info( - version = "1.24.0", + version = "1.25.0", description = "IN-CORE Service For Fragilities and Fragility mappings", title = "IN-CORE v2 Fragility Service API", diff --git a/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RepairController.java b/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RepairController.java index 4db332b1..d28d0c98 100644 --- a/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RepairController.java +++ b/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RepairController.java @@ -49,7 +49,7 @@ @OpenAPIDefinition( info = @Info( - version = "1.24.0", + version = "1.25.0", description = "IN-CORE Service For Repair and Repair mappings", title = "IN-CORE v2 DFR3 Service API", diff --git a/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RestorationController.java b/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RestorationController.java index 98dbaa73..29239102 100644 --- a/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RestorationController.java +++ b/server/dfr3-service/src/main/java/edu/illinois/ncsa/incore/service/dfr3/controllers/RestorationController.java @@ -47,7 +47,7 @@ @OpenAPIDefinition( info = @Info( - version = "1.24.0", + version = "1.25.0", description = "IN-CORE Service For Restoration and Restoration mappings", title = "IN-CORE v2 DFR3 Service API", diff --git a/server/hazard-service/src/main/java/edu/illinois/ncsa/incore/service/hazard/controllers/EarthquakeController.java b/server/hazard-service/src/main/java/edu/illinois/ncsa/incore/service/hazard/controllers/EarthquakeController.java index 2e3fe8a0..5636bea1 100644 --- a/server/hazard-service/src/main/java/edu/illinois/ncsa/incore/service/hazard/controllers/EarthquakeController.java +++ b/server/hazard-service/src/main/java/edu/illinois/ncsa/incore/service/hazard/controllers/EarthquakeController.java @@ -81,7 +81,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Hazard Service For Earthquake, Tornado, Tsunami, Hurricane and Flood", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Hazard Service API", contact = @Contact( name = "IN-CORE Dev Team", diff --git a/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/StatusController.java b/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/StatusController.java index 2d73b022..d845fd43 100644 --- a/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/StatusController.java +++ b/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/StatusController.java @@ -16,7 +16,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Semantics Services for type and data type", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Semantics Service API", contact = @Contact( name = "IN-CORE Dev Team", diff --git a/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/TypeController.java b/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/TypeController.java index 4e40e42a..94a8a94c 100644 --- a/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/TypeController.java +++ b/server/semantics-service/src/main/java/edu/illinois/ncsa/incore/service/semantics/controllers/TypeController.java @@ -47,7 +47,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Semantics Services for type and data type", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Semantics Service API", contact = @Contact( name = "IN-CORE Dev Team", @@ -223,7 +223,7 @@ public Response getTypeAsHtml( if (matchedType != null) { ObjectMapper objectMapper = new ObjectMapper(); // Convert the Type to JSONObject - String jsonString = objectMapper.writeValueAsString(matchedType); + String jsonString = objectMapper.writeValueAsString(matchedType.constructOutput()); JSONObject typeJson = new JSONObject(jsonString); JSONObject tableSchema = typeJson.getJSONObject("tableSchema"); JSONArray columnsArray = tableSchema.getJSONArray("columns"); diff --git a/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/AllocationsController.java b/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/AllocationsController.java index 1fa4f22c..86f18f46 100644 --- a/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/AllocationsController.java +++ b/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/AllocationsController.java @@ -38,7 +38,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Allocations Service for getting the user's allocation information.", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Allocation Service API", contact = @Contact( name = "IN-CORE Dev Team", diff --git a/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/SpaceController.java b/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/SpaceController.java index a594d302..0da88d59 100644 --- a/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/SpaceController.java +++ b/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/SpaceController.java @@ -51,7 +51,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Space Service for creating and accessing spaces", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Space Service API", contact = @Contact( name = "IN-CORE Dev Team", diff --git a/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/UsageController.java b/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/UsageController.java index d005b4c1..df227882 100644 --- a/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/UsageController.java +++ b/server/space-service/src/main/java/edu/illinois/ncsa/incore/service/space/controllers/UsageController.java @@ -40,7 +40,7 @@ @OpenAPIDefinition( info = @Info( description = "IN-CORE Usage Service for getting the user's usage information.", - version = "1.24.0", + version = "1.25.0", title = "IN-CORE v2 Usage Service API", contact = @Contact( name = "IN-CORE Dev Team",