Skip to content

Commit 2f6b10c

Browse files
rma-brysonrma-bryson
committed
CWMS-1231 Renamed radar packages to cwms-data-api
1 parent b677de3 commit 2f6b10c

463 files changed

Lines changed: 1521 additions & 1767 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: ReportGenerator
3030
uses: danielpalme/ReportGenerator-GitHub-Action@5.3.11
3131
with:
32-
reports: cwms-aaa-client/build/reports/jacoco/test/jacocoTestReport.xml;cwms-http-client/build/reports/jacoco/test/jacocoTestReport.xml;cwms-radar-client/build/reports/jacoco/test/jacocoTestReport.xml
32+
reports: cwms-aaa-client/build/reports/jacoco/test/jacocoTestReport.xml;cwms-http-client/build/reports/jacoco/test/jacocoTestReport.xml;cwms-data-api-client/build/reports/jacoco/test/jacocoTestReport.xml
3333
targetdir: .github/coveragereport
3434
reporttypes: Html;MarkdownSummaryGithub;Badges
3535
- name: Upload coverage report artifact

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Please [fork](https://help.github.com/en/articles/fork-a-repo) the repository on
112112
Once you have made your changes submit a [pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork).
113113
Please submit all PRs to the develop branch.
114114

115-
Barring nothing working at all or the code not being related to CWMS RADAR your contributions will be accepted.
115+
Barring nothing working at all or the code not being related to CWMS DATA API your contributions will be accepted.
116116

117117
### Branching/Tag
118118

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ rename effort.
1212
# cwms-http-client
1313
An HTTP client API for performing REST calls as well as adding authentication and HTTPS support.
1414

15-
# cwms-radar-client
15+
# cwms-data-api-client
1616

1717
Client Side libraries to assist with Accessing CWMS Data API.
1818

19-
# cwms-radar-model
19+
# cwms-data-api-model
2020

2121
Data objects serialized from CWMS Data API for client use.
2222

@@ -28,8 +28,8 @@ Client API access for the CWMS_AAA web app used to authenticate calls to CWMS Da
2828
Artifacts are deployed to [HEC Nexus](https://www.hec.usace.army.mil/nexus) with browsable links below:
2929

3030
- [cwms-http-client](https://www.hec.usace.army.mil/nexus/#browse/browse:maven-public:mil%2Farmy%2Fusace%2Fhec%2Fcwms-http-client)
31-
- [cwms-radar-client](https://www.hec.usace.army.mil/nexus/#browse/browse:maven-public:mil%2Farmy%2Fusace%2Fhec%2Fcwms-radar-client)
32-
- [cwms-radar-model](https://www.hec.usace.army.mil/nexus/#browse/browse:maven-public:mil%2Farmy%2Fusace%2Fhec%2Fcwms-radar-model)
31+
- [cwms-data-api-client](https://www.hec.usace.army.mil/nexus/#browse/browse:maven-public:mil%2Farmy%2Fusace%2Fhec%2Fcwms-data-api-client)
32+
- [cwms-data-api-model](https://www.hec.usace.army.mil/nexus/#browse/browse:maven-public:mil%2Farmy%2Fusace%2Fhec%2Fcwms-data-api-model)
3333
- [cwms-aaa-client](https://www.hec.usace.army.mil/nexus/#browse/browse:maven-public:mil%2Farmy%2Fusace%2Fhec%2Fcwms-aaa-client)
3434

3535
# Debug Logging

cwms-radar-client/build.gradle renamed to cwms-data-api-client/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ plugins {
3131
dependencies {
3232
api(project(":cwms-http-client"))
3333
api(project(":cwbi-auth-http-client"))
34-
api(project(":cwms-radar-model"))
34+
api(project(":cwms-data-api-model"))
3535

3636
implementation(libs.swagger.parser)
3737

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/auth/CdaTokenProviderFactory.java renamed to cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/auth/CdaTokenProviderFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
* SOFTWARE.
2323
*/
24-
package mil.army.usace.hec.cwms.radar.client.auth;
24+
package mil.army.usace.hec.cwms.data.api.client.auth;
2525

2626
import hec.army.usace.hec.cwbi.auth.http.client.CwbiAuthSslSocketFactory;
2727
import hec.army.usace.hec.cwbi.auth.http.client.DiscoveredCwbiAuthTokenProvider;

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/auth/CdaTokenUrlDiscoveryService.java renamed to cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/auth/CdaTokenUrlDiscoveryService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@
2121
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2222
* SOFTWARE.
2323
*/
24-
package mil.army.usace.hec.cwms.radar.client.auth;
24+
package mil.army.usace.hec.cwms.data.api.client.auth;
2525

2626
import hec.army.usace.hec.cwbi.auth.http.client.TokenUrlDiscoveryService;
2727
import java.io.IOException;
2828
import java.util.Objects;
29+
import mil.army.usace.hec.cwms.data.api.client.controllers.CdaOpenIdTokenController;
2930
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
3031
import mil.army.usace.hec.cwms.http.client.SslSocketData;
31-
import mil.army.usace.hec.cwms.radar.client.controllers.CdaOpenIdTokenController;
3232

3333
final class CdaTokenUrlDiscoveryService implements TokenUrlDiscoveryService {
3434

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/controllers/BasinController.java renamed to cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/controllers/BasinController.java

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,36 @@
1-
package mil.army.usace.hec.cwms.radar.client.controllers;
1+
package mil.army.usace.hec.cwms.data.api.client.controllers;
22

33
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
44
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
55
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
66
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
7-
import mil.army.usace.hec.cwms.radar.client.model.Basin;
8-
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
7+
import mil.army.usace.hec.cwms.data.api.client.model.Basin;
8+
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;
99

1010
import java.io.IOException;
1111
import java.util.List;
1212

13-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
14-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
15-
1613
public final class BasinController {
1714
private static final String BASIN_ENDPOINT = "basins";
1815

1916
public Basin retrieveBasin(ApiConnectionInfo apiConnectionInfo, BasinEndpointInput.GetOne input) throws IOException {
2017
String endpoint = BASIN_ENDPOINT + "/" + input.basinId();
2118
HttpRequestExecutor executor = new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
22-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
19+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1)
2320
.addEndpointInput(input)
2421
.get()
25-
.withMediaType(ACCEPT_HEADER_V1);
22+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V1);
2623
try (HttpRequestResponse response = executor.execute()) {
2724
return RadarObjectMapper.mapJsonToObject(response.getBody(), Basin.class);
2825
}
2926
}
3027

3128
public List<Basin> retrieveBasins(ApiConnectionInfo apiConnectionInfo, BasinEndpointInput.GetAll input) throws IOException {
3229
HttpRequestExecutor executor = new HttpRequestBuilderImpl(apiConnectionInfo, BASIN_ENDPOINT)
33-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
30+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1)
3431
.addEndpointInput(input)
3532
.get()
36-
.withMediaType(ACCEPT_HEADER_V1);
33+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V1);
3734
try (HttpRequestResponse response = executor.execute()) {
3835
return RadarObjectMapper.mapJsonToListOfObjects(response.getBody(), Basin.class);
3936
}
@@ -42,32 +39,32 @@ public List<Basin> retrieveBasins(ApiConnectionInfo apiConnectionInfo, BasinEndp
4239
public void storeBasin(ApiConnectionInfo apiConnectionInfo, BasinEndpointInput.Post input) throws IOException {
4340
String body = RadarObjectMapper.mapObjectToJson(input.basin());
4441
new HttpRequestBuilderImpl(apiConnectionInfo, BASIN_ENDPOINT)
45-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
42+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1)
4643
.addEndpointInput(input)
4744
.post()
4845
.withBody(body)
49-
.withMediaType(ACCEPT_HEADER_V1)
46+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V1)
5047
.execute()
5148
.close();
5249
}
5350

5451
public void renameBasin(ApiConnectionInfo apiConnectionInfo, BasinEndpointInput.Patch input) throws IOException {
5552
new HttpRequestBuilderImpl(apiConnectionInfo, BASIN_ENDPOINT + "/" + input.oldBasinId())
56-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
53+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1)
5754
.addEndpointInput(input)
5855
.patch()
59-
.withMediaType(ACCEPT_HEADER_V1)
56+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V1)
6057
.execute()
6158
.close();
6259
}
6360

6461
public void deleteBasin(ApiConnectionInfo apiConnectionInfo, BasinEndpointInput.Delete input) throws IOException {
6562
String endpoint = BASIN_ENDPOINT + "/" + input.basinId();
6663
new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
67-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1)
64+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1)
6865
.addEndpointInput(input)
6966
.delete()
70-
.withMediaType(ACCEPT_HEADER_V1)
67+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V1)
7168
.execute()
7269
.close();
7370
}

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/controllers/BasinEndpointInput.java renamed to cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/controllers/BasinEndpointInput.java

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
package mil.army.usace.hec.cwms.radar.client.controllers;
2-
3-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
4-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
1+
package mil.army.usace.hec.cwms.data.api.client.controllers;
52

63
import java.util.Objects;
74
import mil.army.usace.hec.cwms.http.client.EndpointInput;
85
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;
9-
import mil.army.usace.hec.cwms.radar.client.model.Basin;
10-
import mil.army.usace.hec.cwms.radar.client.model.DeleteMethod;
6+
import mil.army.usace.hec.cwms.data.api.client.model.Basin;
7+
import mil.army.usace.hec.cwms.data.api.client.model.DeleteMethod;
118

129

1310
public final class BasinEndpointInput {
@@ -58,7 +55,7 @@ public GetAll units(String units) {
5855
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
5956
return httpRequestBuilder.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
6057
.addQueryParameter(UNIT_QUERY_PARAMETER, units)
61-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
58+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1);
6259
}
6360
}
6461

@@ -87,7 +84,7 @@ String basinId() {
8784
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
8885
return httpRequestBuilder.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
8986
.addQueryParameter(UNIT_QUERY_PARAMETER, units)
90-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
87+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1);
9188
}
9289
}
9390

@@ -105,7 +102,7 @@ Basin basin() {
105102

106103
@Override
107104
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
108-
return httpRequestBuilder.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
105+
return httpRequestBuilder.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1);
109106
}
110107
}
111108

@@ -130,7 +127,7 @@ String basinId() {
130127
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
131128
return httpRequestBuilder.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
132129
.addQueryParameter(METHOD_QUERY_PARAMETER, deleteMethod.toString())
133-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
130+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1);
134131
}
135132
}
136133

@@ -155,7 +152,7 @@ String oldBasinId() {
155152
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
156153
return httpRequestBuilder.addQueryParameter(OFFICE_QUERY_PARAMETER, officeId)
157154
.addQueryParameter(NAME_QUERY_PARAMETER, newBasinId)
158-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
155+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1);
159156
}
160157
}
161158
}

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/controllers/BinaryTimeSeriesController.java renamed to cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/controllers/BinaryTimeSeriesController.java

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,18 @@
2222
* SOFTWARE.
2323
*/
2424

25-
package mil.army.usace.hec.cwms.radar.client.controllers;
25+
package mil.army.usace.hec.cwms.data.api.client.controllers;
2626

2727
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
28-
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfoFactory;
2928
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
3029
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
3130
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
32-
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeries;
33-
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeriesRow;
34-
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
31+
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeries;
32+
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeriesRow;
33+
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;
3534

3635
import java.io.IOException;
3736

38-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
39-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
40-
4137
public final class BinaryTimeSeriesController {
4238

4339
private static final String BINARY_TIME_SERIES_ENDPOINT = "timeseries/binary";
@@ -46,10 +42,10 @@ public BinaryTimeSeries retrieveTimeSeries(ApiConnectionInfo apiConnectionInfo,
4642
throws IOException {
4743
BinaryTimeSeries retVal;
4844
HttpRequestExecutor executor = new HttpRequestBuilderImpl(apiConnectionInfo, BINARY_TIME_SERIES_ENDPOINT)
49-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
45+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V2)
5046
.addEndpointInput(input)
5147
.get()
52-
.withMediaType(ACCEPT_HEADER_V2);
48+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V2);
5349
try (HttpRequestResponse response = executor.execute()) {
5450
retVal = RadarObjectMapper.mapJsonToObject(response.getBody(), BinaryTimeSeries.class);
5551
}
@@ -59,22 +55,22 @@ public BinaryTimeSeries retrieveTimeSeries(ApiConnectionInfo apiConnectionInfo,
5955
public void storeTimeSeries(ApiConnectionInfo apiConnectionInfo, BinaryTimeSeriesEndpointInput.Post input) throws IOException {
6056
String body = RadarObjectMapper.mapObjectToJson(input.timeSeries());
6157
new HttpRequestBuilderImpl(apiConnectionInfo, BINARY_TIME_SERIES_ENDPOINT)
62-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
58+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V2)
6359
.addEndpointInput(input)
6460
.post()
6561
.withBody(body)
66-
.withMediaType(ACCEPT_HEADER_V2)
62+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V2)
6763
.execute()
6864
.close();
6965
}
7066

7167
public void deleteTimeSeries(ApiConnectionInfo apiConnectionInfo, BinaryTimeSeriesEndpointInput.Delete input) throws IOException {
7268
String endpoint = BINARY_TIME_SERIES_ENDPOINT + "/" + input.timeSeriesId();
7369
new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
74-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2)
70+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V2)
7571
.addEndpointInput(input)
7672
.delete()
77-
.withMediaType(ACCEPT_HEADER_V2)
73+
.withMediaType(RadarEndpointConstants.ACCEPT_HEADER_V2)
7874
.execute()
7975
.close();
8076
}

cwms-radar-client/src/main/java/mil/army/usace/hec/cwms/radar/client/controllers/BinaryTimeSeriesEndpointInput.java renamed to cwms-data-api-client/src/main/java/mil/army/usace/hec/cwms/data/api/client/controllers/BinaryTimeSeriesEndpointInput.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,16 @@
2222
* SOFTWARE.
2323
*/
2424

25-
package mil.army.usace.hec.cwms.radar.client.controllers;
25+
package mil.army.usace.hec.cwms.data.api.client.controllers;
2626

2727
import mil.army.usace.hec.cwms.http.client.EndpointInput;
2828
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;
29-
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeries;
29+
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeries;
3030

3131
import java.time.Instant;
3232
import java.util.Objects;
3333
import java.util.Optional;
3434

35-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
36-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
37-
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
38-
3935
public final class BinaryTimeSeriesEndpointInput {
4036

4137
private BinaryTimeSeriesEndpointInput() {
@@ -113,7 +109,7 @@ protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBu
113109
.addQueryParameter(VERSION_DATE_QUERY_PARAMETER, versionDateString)
114110
.addQueryParameter(PAGE_QUERY_PARAMETER, page)
115111
.addQueryParameter(PAGE_SIZE_QUERY_PARAMETER, pageSizeString)
116-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
112+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V2);
117113
}
118114
}
119115

@@ -138,7 +134,7 @@ public Post replaceAll(boolean replaceAll) {
138134
@Override
139135
protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBuilder) {
140136
return httpRequestBuilder.addQueryParameter(REPLACE_ALL_PARAMETER, Boolean.toString(replaceAll))
141-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V2);
137+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V2);
142138
}
143139
}
144140

@@ -194,7 +190,7 @@ protected HttpRequestBuilder addInputParameters(HttpRequestBuilder httpRequestBu
194190
.addQueryParameter(BEGIN_PARAMETER_QUERY, beginString)
195191
.addQueryParameter(END_PARAMETER_QUERY, endString)
196192
.addQueryParameter(VERSION_DATE_QUERY_PARAMETER, versionDateString)
197-
.addQueryHeader(ACCEPT_QUERY_HEADER, ACCEPT_HEADER_V1);
193+
.addQueryHeader(RadarEndpointConstants.ACCEPT_QUERY_HEADER, RadarEndpointConstants.ACCEPT_HEADER_V1);
198194
}
199195
}
200196
}

0 commit comments

Comments
 (0)