Skip to content

Commit f620441

Browse files
committed
add include versions query parameter while I'm making updates
1 parent b5e496b commit f620441

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/controllers/TimeSeriesCatalogEndpointInput.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public final class TimeSeriesCatalogEndpointInput extends EndpointInput {
4040
static final String CATEGORY_LIKE_QUERY_PARAMETER = "timeseries-category-like";
4141
static final String GROUP_LIKE_QUERY_PARAMETER = "timeseries-group-like";
4242
static final String INCLUDE_EXTENTS_QUERY_PARAMETER = "include-extents";
43+
static final String INCLUDE_VERSIONS_QUERY_PARAMETER = "include-versions";
4344
static final String EXCLUDE_EMPTY_QUERY_PARAMETER = "exclude-empty";
4445

4546
private String cursor;
@@ -50,6 +51,7 @@ public final class TimeSeriesCatalogEndpointInput extends EndpointInput {
5051
private String categoryIdFilter;
5152
private String groupIdFilter;
5253
private boolean includeExtents = true;
54+
private boolean includeVersions = true;
5355
private boolean excludeEmpty = false;
5456

5557
public TimeSeriesCatalogEndpointInput cursor(String cursor) {
@@ -92,6 +94,11 @@ public TimeSeriesCatalogEndpointInput includeExtents(boolean includeExtents) {
9294
return this;
9395
}
9496

97+
public TimeSeriesCatalogEndpointInput includeVersions(boolean includeVersions) {
98+
this.includeVersions = includeVersions;
99+
return this;
100+
}
101+
95102
public TimeSeriesCatalogEndpointInput excludeEmpty(boolean excludeEmpty) {
96103
this.excludeEmpty = excludeEmpty;
97104
return this;
@@ -108,6 +115,7 @@ protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBu
108115
.addQueryParameter(CATEGORY_LIKE_QUERY_PARAMETER, categoryIdFilter)
109116
.addQueryParameter(GROUP_LIKE_QUERY_PARAMETER, groupIdFilter)
110117
.addQueryParameter(INCLUDE_EXTENTS_QUERY_PARAMETER, Boolean.toString(includeExtents))
118+
.addQueryParameter(INCLUDE_VERSIONS_QUERY_PARAMETER, Boolean.toString(includeVersions))
111119
.addQueryParameter(EXCLUDE_EMPTY_QUERY_PARAMETER, Boolean.toString(excludeEmpty))
112120
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
113121
}

cwms-data-api-client/src/test/java/mil/army/usace/hec/cwms/data/api/client/controllers/TestTimeSeriesCatalogEndpointInput.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.EXCLUDE_EMPTY_QUERY_PARAMETER;
3232
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.GROUP_LIKE_QUERY_PARAMETER;
3333
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.INCLUDE_EXTENTS_QUERY_PARAMETER;
34+
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.INCLUDE_VERSIONS_QUERY_PARAMETER;
3435
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.LIKE_QUERY_PARAMETER;
3536
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.OFFICE_QUERY_PARAMETER;
3637
import static mil.army.usace.hec.cwms.data.api.client.controllers.TimeSeriesCatalogEndpointInput.PAGE_SIZE_QUERY_PARAMETER;
@@ -53,6 +54,7 @@ void testQueryRequest() {
5354
.categoryIdFilter("CAT")
5455
.groupIdFilter("GROUP")
5556
.includeExtents(false)
57+
.includeVersions(false)
5658
.excludeEmpty(true);
5759
input.addInputParameters(mockHttpRequestBuilder);
5860
assertEquals("SWT", mockHttpRequestBuilder.getQueryParameter(OFFICE_QUERY_PARAMETER));
@@ -63,6 +65,7 @@ void testQueryRequest() {
6365
assertEquals("CAT", mockHttpRequestBuilder.getQueryParameter(CATEGORY_LIKE_QUERY_PARAMETER));
6466
assertEquals("GROUP", mockHttpRequestBuilder.getQueryParameter(GROUP_LIKE_QUERY_PARAMETER));
6567
assertEquals("false", mockHttpRequestBuilder.getQueryParameter(INCLUDE_EXTENTS_QUERY_PARAMETER));
68+
assertEquals("false", mockHttpRequestBuilder.getQueryParameter(INCLUDE_VERSIONS_QUERY_PARAMETER));
6669
assertEquals("true", mockHttpRequestBuilder.getQueryParameter(EXCLUDE_EMPTY_QUERY_PARAMETER));
6770
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
6871
}

0 commit comments

Comments
 (0)