Skip to content

Commit 16469cc

Browse files
committed
CDA-80 - implements support for entity like query parameter
1 parent a7d4541 commit 16469cc

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,13 @@ public static final class GetAll extends EndpointInput {
9090
static final String LOCATION_MASK_QUERY_PARAMETER = "location-mask";
9191
static final String DESIGNATOR_MASK_QUERY_PARAMETER = "designator-mask";
9292
static final String SOURCE_ENTITY_QUERY_PARAMETER = "source-entity";
93+
static final String SOURCE_ENTITY_LIKE_QUERY_PARAMETER = "source-entity-like";
9394
private String officeId;
9495
private String specIdMask;
9596
private String locationIdMask;
9697
private String designatorMask;
9798
private String sourceEntityId;
99+
private String sourceEntityLike;
98100

99101

100102
private GetAll() {
@@ -126,13 +128,19 @@ public ForecastSpecEndpointInput.GetAll sourceEntityId(String sourceEntityId) {
126128
return this;
127129
}
128130

131+
public ForecastSpecEndpointInput.GetAll sourceEntityLike(String sourceEntityLike) {
132+
this.sourceEntityLike = sourceEntityLike;
133+
return this;
134+
}
135+
129136
@Override
130137
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
131138
return httpRequestBuilder.addQueryParameter(ID_MASK_QUERY_PARAMETER, specIdMask)
132139
.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
133140
.addQueryParameter(LOCATION_MASK_QUERY_PARAMETER, locationIdMask)
134141
.addQueryParameter(DESIGNATOR_MASK_QUERY_PARAMETER, designatorMask)
135142
.addQueryParameter(SOURCE_ENTITY_QUERY_PARAMETER, sourceEntityId)
143+
.addQueryParameter(SOURCE_ENTITY_LIKE_QUERY_PARAMETER, sourceEntityLike)
136144
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
137145
}
138146
}

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@ void testGetAllQueryRequest() {
5454
.specIdMask("test-spec")
5555
.designatorMask("designator")
5656
.sourceEntityId("source-entity")
57-
.locationIdMask("location");
57+
.locationIdMask("location")
58+
.sourceEntityLike("%");
5859
input.addInputParameters(mockHttpRequestBuilder);
5960
assertEquals("SWT", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.OFFICE_QUERY_PARAMETER));
6061
assertEquals("test-spec", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.ID_MASK_QUERY_PARAMETER));
6162
assertEquals("designator", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.DESIGNATOR_MASK_QUERY_PARAMETER));
6263
assertEquals("source-entity", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_QUERY_PARAMETER));
6364
assertEquals("location", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.LOCATION_MASK_QUERY_PARAMETER));
65+
assertEquals("%", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_LIKE_QUERY_PARAMETER));
6466
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
6567
}
6668

@@ -74,6 +76,7 @@ void testGetAllQueryRequestDefaults() {
7476
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.DESIGNATOR_MASK_QUERY_PARAMETER));
7577
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_QUERY_PARAMETER));
7678
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.LOCATION_MASK_QUERY_PARAMETER));
79+
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_LIKE_QUERY_PARAMETER));
7780
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
7881
}
7982

0 commit comments

Comments
 (0)