update DTO's to ensure default formats are V1/V2 (USACE#820)

default aliases are used for the default (*/*) and default JSON (application/json)
rma-rripken · Aug 2, 2024 · 0abb215 · 0abb215
1 parent 240f393
commit 0abb215
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 13 deletions.
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/Catalog.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/Catalog.java
@@ -18,7 +18,7 @@
 
 @JsonRootName("catalog")
 @FormattableWith(contentType = Formats.XML, formatter = XMLv1.class)
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @FormattableWith(contentType = Formats.JSONV2, formatter = JsonV2.class)
 public class Catalog extends CwmsDTOPaginated {
     @Schema(

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/CwmsId.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/CwmsId.java
@@ -34,10 +34,8 @@
 import cwms.cda.formatters.Formats;
 import cwms.cda.formatters.annotations.FormattableWith;
 import cwms.cda.formatters.json.JsonV1;
-import java.util.ArrayList;
-import java.util.List;
 
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @JsonDeserialize(builder = CwmsId.Builder.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/LocationCategory.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/LocationCategory.java
@@ -33,7 +33,7 @@
 
 @Schema(description = "A representation of a location category")
 @JsonRootName("location_category")
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class LocationCategory extends CwmsDTO
 {
 	private final String id;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/LocationGroup.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/LocationGroup.java
@@ -38,7 +38,7 @@
 @Schema(description = "A representation of a location group")
 @JsonRootName("location_group")
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @FormattableWith(contentType = Formats.CSV, formatter = CsvV1.class)
 public class LocationGroup extends CwmsDTO {
     private String id;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/Property.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/Property.java
@@ -37,7 +37,7 @@
 import java.util.Objects;
 
 @JsonRootName("property")
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @JsonDeserialize(builder = Property.Builder.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/RecentValue.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/RecentValue.java
@@ -4,7 +4,7 @@
 import cwms.cda.formatters.json.JsonV1;
 import cwms.cda.formatters.Formats;
 
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class RecentValue extends CwmsDTOBase
 {
 	String id;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/TimeSeriesCategory.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/TimeSeriesCategory.java
@@ -33,7 +33,7 @@
 
 @Schema(description = "A representation of a TimeSeries category")
 @JsonRootName("timeseries-category")
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class TimeSeriesCategory extends CwmsDTO
 {
 	private String id;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/TimeSeriesGroup.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/TimeSeriesGroup.java
@@ -39,7 +39,7 @@
 @Schema(description = "A representation of a timeseries group")
 @JsonRootName("timeseries-group")
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class TimeSeriesGroup extends CwmsDTO {
     private String id;
     private TimeSeriesCategory timeSeriesCategory;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/project/LockRevokerRights.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/project/LockRevokerRights.java
@@ -38,7 +38,7 @@
 @JsonDeserialize(builder = LockRevokerRights.Builder.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class LockRevokerRights extends CwmsDTO {
 
     private final String projectId;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/project/ProjectLock.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/project/ProjectLock.java
@@ -39,7 +39,7 @@
 @JsonDeserialize(builder = ProjectLock.Builder.class)
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV2.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV2.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class ProjectLock extends CwmsDTO {
     // officeId held by CwmsDTO
     private final String projectId;

diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/project/ProjectLockId.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/project/ProjectLockId.java
@@ -35,7 +35,7 @@
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonNaming(PropertyNamingStrategies.KebabCaseStrategy.class)
-@FormattableWith(contentType = Formats.JSON, formatter = JsonV1.class)
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 public class ProjectLockId extends CwmsDTOBase {
     private final String id;