Skip to content

Commit 4a0b1ea

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

463 files changed

Lines changed: 1236 additions & 1309 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: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
package mil.army.usace.hec.cwms.radar.client.controllers;
1+
package mil.army.usace.hec.cwms.data.api.client.controllers;
22

3+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
4+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
35
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
46
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
57
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
68
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;
9+
import mil.army.usace.hec.cwms.data.api.client.model.Basin;
10+
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;
911

1012
import java.io.IOException;
1113
import java.util.List;
1214

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-
1615
public final class BasinController {
1716
private static final String BASIN_ENDPOINT = "basins";
1817

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: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
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;
4+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
5+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
76
import mil.army.usace.hec.cwms.http.client.EndpointInput;
87
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;
8+
import mil.army.usace.hec.cwms.data.api.client.model.Basin;
9+
import mil.army.usace.hec.cwms.data.api.client.model.DeleteMethod;
1110

1211

1312
public final class BasinEndpointInput {

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: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,20 @@
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

27+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
28+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
2729
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
28-
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfoFactory;
2930
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
3031
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
3132
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;
33+
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeries;
34+
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeriesRow;
35+
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;
3536

3637
import java.io.IOException;
3738

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-
4139
public final class BinaryTimeSeriesController {
4240

4341
private static final String BINARY_TIME_SERIES_ENDPOINT = "timeseries/binary";

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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,19 @@
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

27+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
28+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
29+
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
2730
import mil.army.usace.hec.cwms.http.client.EndpointInput;
2831
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;
29-
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeries;
32+
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeries;
3033

3134
import java.time.Instant;
3235
import java.util.Objects;
3336
import java.util.Optional;
3437

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-
3938
public final class BinaryTimeSeriesEndpointInput {
4039

4140
private BinaryTimeSeriesEndpointInput() {

0 commit comments

Comments
 (0)