Skip to content

Commit 83a76c7

Browse files
rma-brysonrma-bryson
committed
Updated to accept header v1
1 parent b9f4bdd commit 83a76c7

3 files changed

Lines changed: 23 additions & 23 deletions

File tree

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
package mil.army.usace.hec.cwms.data.api.client.controllers;
2626

27-
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
27+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
2828
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
2929

3030
import java.io.IOException;
@@ -43,21 +43,21 @@ public final class EntityController {
4343
public Entity retrieveEntity(ApiConnectionInfo apiConnectionInfo, EntityEndpointInput.GetOne input) throws IOException {
4444
String endpoint = ENTITY_ENDPOINT + "/" + input.entityId();
4545
HttpRequestExecutor executor = new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
46-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
46+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
4747
.addEndpointInput(input)
4848
.get()
49-
.withMediaType(ACCEPT_HEADER_V2);
49+
.withMediaType(ACCEPT_HEADER_V1);
5050
try (HttpRequestResponse response = executor.execute()) {
5151
return RadarObjectMapper.mapJsonToObject(response.getBody(), Entity.class);
5252
}
5353
}
5454

5555
public List<Entity> retrieveEntities(ApiConnectionInfo apiConnectionInfo, EntityEndpointInput.GetAll input) throws IOException {
5656
HttpRequestExecutor executor = new HttpRequestBuilderImpl(apiConnectionInfo, ENTITY_ENDPOINT)
57-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
57+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
5858
.addEndpointInput(input)
5959
.get()
60-
.withMediaType(ACCEPT_HEADER_V2);
60+
.withMediaType(ACCEPT_HEADER_V1);
6161
try (HttpRequestResponse response = executor.execute()) {
6262
return RadarObjectMapper.mapJsonToListOfObjects(response.getBody(), Entity.class);
6363
}
@@ -66,34 +66,34 @@ public List<Entity> retrieveEntities(ApiConnectionInfo apiConnectionInfo, Entity
6666
public void storeEntity(ApiConnectionInfo apiConnectionInfo, EntityEndpointInput.Post input) throws IOException {
6767
String body = RadarObjectMapper.mapObjectToJson(input.entity());
6868
new HttpRequestBuilderImpl(apiConnectionInfo, ENTITY_ENDPOINT)
69-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
69+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
7070
.addEndpointInput(input)
7171
.post()
7272
.withBody(body)
73-
.withMediaType(ACCEPT_HEADER_V2)
73+
.withMediaType(ACCEPT_HEADER_V1)
7474
.execute()
7575
.close();
7676
}
7777

7878
public void updateEntity(ApiConnectionInfo apiConnectionInfo, EntityEndpointInput.Patch input) throws IOException {
7979
String body = RadarObjectMapper.mapObjectToJson(input.entity());
8080
new HttpRequestBuilderImpl(apiConnectionInfo, ENTITY_ENDPOINT + "/" + input.entity().getId().getName())
81-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
81+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
8282
.addEndpointInput(input)
8383
.patch()
8484
.withBody(body)
85-
.withMediaType(ACCEPT_HEADER_V2)
85+
.withMediaType(ACCEPT_HEADER_V1)
8686
.execute()
8787
.close();
8888
}
8989

9090
public void deleteEntity(ApiConnectionInfo apiConnectionInfo, EntityEndpointInput.Delete input) throws IOException {
9191
String endpoint = ENTITY_ENDPOINT + "/" + input.entityId();
9292
new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
93-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
93+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
9494
.addEndpointInput(input)
9595
.delete()
96-
.withMediaType(ACCEPT_HEADER_V2)
96+
.withMediaType(ACCEPT_HEADER_V1)
9797
.execute()
9898
.close();
9999
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
package mil.army.usace.hec.cwms.data.api.client.controllers;
2626

27-
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
27+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
2828
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
2929

3030
import java.util.Objects;
@@ -116,7 +116,7 @@ protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBu
116116
.addQueryParameter(CATEGORY_ID_QUERY_PARAMETER, categoryId)
117117
.addQueryParameter(LONG_NAME_QUERY_PARAMETER, longName)
118118
.addQueryParameter(MATCH_NULL_PARENTS_QUERY_PARAMETER, Boolean.toString(matchNullParents))
119-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
119+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
120120
}
121121
}
122122

@@ -137,7 +137,7 @@ String entityId() {
137137
@Override
138138
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
139139
return httpRequestBuilder.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
140-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
140+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
141141
}
142142
}
143143

@@ -154,7 +154,7 @@ Entity entity() {
154154

155155
@Override
156156
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
157-
return httpRequestBuilder.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
157+
return httpRequestBuilder.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
158158
}
159159
}
160160

@@ -171,7 +171,7 @@ Entity entity() {
171171

172172
@Override
173173
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
174-
return httpRequestBuilder.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
174+
return httpRequestBuilder.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
175175
}
176176
}
177177

@@ -197,7 +197,7 @@ protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBu
197197
return httpRequestBuilder
198198
.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
199199
.addQueryParameter(CASCADE_DELETE_QUERY_PARAMETER, Boolean.toString(cascadeDelete))
200-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
200+
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
201201
}
202202
}
203203
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
package mil.army.usace.hec.cwms.data.api.client.controllers;
2626

27-
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
27+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
2828
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
2929
import static org.junit.jupiter.api.Assertions.assertEquals;
3030
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -52,7 +52,7 @@ void testGetAllQueryRequest() {
5252
assertEquals("GOV", mockHttpRequestBuilder.getQueryParameter(EntityEndpointInput.GetAll.CATEGORY_ID_QUERY_PARAMETER));
5353
assertEquals("National Weather Service", mockHttpRequestBuilder.getQueryParameter(EntityEndpointInput.GetAll.LONG_NAME_QUERY_PARAMETER));
5454
assertEquals("true", mockHttpRequestBuilder.getQueryParameter(EntityEndpointInput.GetAll.MATCH_NULL_PARENTS_QUERY_PARAMETER));
55-
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
55+
assertEquals(ACCEPT_HEADER_V1, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
5656
}
5757

5858
@Test
@@ -61,7 +61,7 @@ void testGetOneQueryRequest() {
6161
EntityEndpointInput.GetOne input = EntityEndpointInput.getOne("NWS", "SPK");
6262
input.addInputParameters(mockHttpRequestBuilder);
6363
assertEquals("SPK", mockHttpRequestBuilder.getQueryParameter(EntityEndpointInput.GetOne.OFFICE_QUERY_PARAMETER));
64-
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
64+
assertEquals(ACCEPT_HEADER_V1, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
6565
}
6666

6767
@Test
@@ -78,7 +78,7 @@ void testPostQueryRequest() {
7878
EntityEndpointInput.Post input = EntityEndpointInput.post(entity);
7979
input.addInputParameters(mockHttpRequestBuilder);
8080
assertEquals(entity, input.entity());
81-
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
81+
assertEquals(ACCEPT_HEADER_V1, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
8282
}
8383

8484
@Test
@@ -94,7 +94,7 @@ void testPatch() {
9494
EntityEndpointInput.Patch input = EntityEndpointInput.patch(entity);
9595
input.addInputParameters(mockHttpRequestBuilder);
9696
assertEquals(entity, input.entity());
97-
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
97+
assertEquals(ACCEPT_HEADER_V1, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
9898
}
9999

100100
@Test
@@ -109,7 +109,7 @@ void testDeleteQueryRequest() {
109109
input.addInputParameters(mockHttpRequestBuilder);
110110
assertEquals("SPK", mockHttpRequestBuilder.getQueryParameter(EntityEndpointInput.Delete.OFFICE_QUERY_PARAMETER));
111111
assertEquals("true", mockHttpRequestBuilder.getQueryParameter(EntityEndpointInput.Delete.CASCADE_DELETE_QUERY_PARAMETER));
112-
assertEquals(ACCEPT_HEADER_V2, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
112+
assertEquals(ACCEPT_HEADER_V1, mockHttpRequestBuilder.getQueryHeader(ACCEPT_QUERY_HEADER));
113113
}
114114

115115
@Test

0 commit comments

Comments
 (0)