Skip to content

CDA-80 - implements support for entity like query parameter #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rma-bryson wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CDA-80 - implements support for entity like query parameter #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...n/java/mil/army/usace/hec/cwms/data/api/client/controllers/ForecastSpecEndpointInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,13 @@ public static final class GetAll extends EndpointInput {
static final String LOCATION_MASK_QUERY_PARAMETER = "location-mask";
static final String DESIGNATOR_MASK_QUERY_PARAMETER = "designator-mask";
static final String SOURCE_ENTITY_QUERY_PARAMETER = "source-entity";
static final String SOURCE_ENTITY_LIKE_QUERY_PARAMETER = "source-entity-like";
private String officeId;
private String specIdMask;
private String locationIdMask;
private String designatorMask;
private String sourceEntityId;
private String sourceEntityLike;


private GetAll() {
Expand Down Expand Up @@ -126,13 +128,19 @@ public ForecastSpecEndpointInput.GetAll sourceEntityId(String sourceEntityId) {
return this;
}

public ForecastSpecEndpointInput.GetAll sourceEntityLike(String sourceEntityLike) {
this.sourceEntityLike = sourceEntityLike;
return this;
}

@Override
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
return httpRequestBuilder.addQueryParameter(ID_MASK_QUERY_PARAMETER, specIdMask)
.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
.addQueryParameter(LOCATION_MASK_QUERY_PARAMETER, locationIdMask)
.addQueryParameter(DESIGNATOR_MASK_QUERY_PARAMETER, designatorMask)
.addQueryParameter(SOURCE_ENTITY_QUERY_PARAMETER, sourceEntityId)
.addQueryParameter(SOURCE_ENTITY_LIKE_QUERY_PARAMETER, sourceEntityLike)
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
}
}
Expand Down
5 changes: 4 additions & 1 deletion ...va/mil/army/usace/hec/cwms/data/api/client/controllers/TestForecastSpecEndpointInput.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,15 @@ void testGetAllQueryRequest() {
.specIdMask("test-spec")
.designatorMask("designator")
.sourceEntityId("source-entity")
.locationIdMask("location");
.locationIdMask("location")
.sourceEntityLike("%");
input.addInputParameters(mockHttpRequestBuilder);
assertEquals("SWT", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.OFFICE_QUERY_PARAMETER));
assertEquals("test-spec", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.ID_MASK_QUERY_PARAMETER));
assertEquals("designator", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.DESIGNATOR_MASK_QUERY_PARAMETER));
assertEquals("source-entity", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_QUERY_PARAMETER));
assertEquals("location", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.LOCATION_MASK_QUERY_PARAMETER));
assertEquals("%", mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_LIKE_QUERY_PARAMETER));
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
}

Expand All @@ -74,6 +76,7 @@ void testGetAllQueryRequestDefaults() {
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.DESIGNATOR_MASK_QUERY_PARAMETER));
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_QUERY_PARAMETER));
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.LOCATION_MASK_QUERY_PARAMETER));
assertNull(mockHttpRequestBuilder.getQueryParameter(ForecastSpecEndpointInput.GetAll.SOURCE_ENTITY_LIKE_QUERY_PARAMETER));
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
}

Expand Down
Loading