Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: ReportGenerator
uses: danielpalme/ReportGenerator-GitHub-Action@5.3.11
with:
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
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
targetdir: .github/coveragereport
reporttypes: Html;MarkdownSummaryGithub;Badges
- name: Upload coverage report artifact
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Please [fork](https://help.github.com/en/articles/fork-a-repo) the repository on
Once you have made your changes submit a [pull request](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork).
Please submit all PRs to the develop branch.

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

### Branching/Tag

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ rename effort.
# cwms-http-client
An HTTP client API for performing REST calls as well as adding authentication and HTTPS support.

# cwms-radar-client
# cwms-data-api-client

Client Side libraries to assist with Accessing CWMS Data API.

# cwms-radar-model
# cwms-data-api-model

Data objects serialized from CWMS Data API for client use.

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

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

# Debug Logging
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ plugins {
dependencies {
api(project(":cwms-http-client"))
api(project(":cwbi-auth-http-client"))
api(project(":cwms-radar-model"))
api(project(":cwms-data-api-model"))

implementation(libs.swagger.parser)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package mil.army.usace.hec.cwms.radar.client.auth;
package mil.army.usace.hec.cwms.data.api.client.auth;

import hec.army.usace.hec.cwbi.auth.http.client.CwbiAuthSslSocketFactory;
import hec.army.usace.hec.cwbi.auth.http.client.DiscoveredCwbiAuthTokenProvider;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package mil.army.usace.hec.cwms.radar.client.auth;
package mil.army.usace.hec.cwms.data.api.client.auth;

import hec.army.usace.hec.cwbi.auth.http.client.TokenUrlDiscoveryService;
import java.io.IOException;
import java.util.Objects;
import mil.army.usace.hec.cwms.data.api.client.controllers.CdaOpenIdTokenController;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.SslSocketData;
import mil.army.usace.hec.cwms.radar.client.controllers.CdaOpenIdTokenController;

final class CdaTokenUrlDiscoveryService implements TokenUrlDiscoveryService {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
package mil.army.usace.hec.cwms.radar.client.controllers;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
import mil.army.usace.hec.cwms.radar.client.model.Basin;
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.data.api.client.model.Basin;
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;

import java.io.IOException;
import java.util.List;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;

public final class BasinController {
private static final String BASIN_ENDPOINT = "basins";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package mil.army.usace.hec.cwms.radar.client.controllers;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.util.Objects;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.EndpointInput;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;
import mil.army.usace.hec.cwms.radar.client.model.Basin;
import mil.army.usace.hec.cwms.radar.client.model.DeleteMethod;
import mil.army.usace.hec.cwms.data.api.client.model.Basin;
import mil.army.usace.hec.cwms.data.api.client.model.DeleteMethod;


public final class BasinEndpointInput {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,20 @@
* SOFTWARE.
*/

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

import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfoFactory;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeries;
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeriesRow;
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeries;
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeriesRow;
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;

import java.io.IOException;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;

public final class BinaryTimeSeriesController {

private static final String BINARY_TIME_SERIES_ENDPOINT = "timeseries/binary";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,19 @@
* SOFTWARE.
*/

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

import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.EndpointInput;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;
import mil.army.usace.hec.cwms.radar.client.model.BinaryTimeSeries;
import mil.army.usace.hec.cwms.data.api.client.model.BinaryTimeSeries;

import java.time.Instant;
import java.util.Objects;
import java.util.Optional;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;

public final class BinaryTimeSeriesEndpointInput {

private BinaryTimeSeriesEndpointInput() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,23 @@
* SOFTWARE.
*/

package mil.army.usace.hec.cwms.radar.client.controllers;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.io.IOException;
import java.util.List;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
import mil.army.usace.hec.cwms.radar.client.model.County;
import mil.army.usace.hec.cwms.radar.client.model.DbTimeZone;
import mil.army.usace.hec.cwms.radar.client.model.LocationCatalog;
import mil.army.usace.hec.cwms.radar.client.model.Parameter;
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.radar.client.model.State;
import mil.army.usace.hec.cwms.radar.client.model.TimeSeriesCatalog;
import mil.army.usace.hec.cwms.radar.client.model.Unit;
import mil.army.usace.hec.cwms.data.api.client.model.County;
import mil.army.usace.hec.cwms.data.api.client.model.DbTimeZone;
import mil.army.usace.hec.cwms.data.api.client.model.LocationCatalog;
import mil.army.usace.hec.cwms.data.api.client.model.Parameter;
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.data.api.client.model.State;
import mil.army.usace.hec.cwms.data.api.client.model.TimeSeriesCatalog;
import mil.army.usace.hec.cwms.data.api.client.model.Unit;

public final class CatalogController {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
* SOFTWARE.
*/

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

final class RadarEndpointConstants {
final class CdaEndpointConstants {

static final String ACCEPT_QUERY_HEADER = "accept";
static final String ACCEPT_HEADER_JSON = "application/json";
Expand All @@ -34,7 +34,7 @@ final class RadarEndpointConstants {
static final String ACCEPT_XML_HEADER_V2 = "application/xml;version=2";
static final String CACHE_CONTROL = "Cache-Control";

private RadarEndpointConstants() {
private CdaEndpointConstants() {
throw new AssertionError("Utility class");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package mil.army.usace.hec.cwms.radar.client.controllers;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import hec.army.usace.hec.cwbi.auth.http.client.OpenIdTokenController;
import io.swagger.v3.oas.models.OpenAPI;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,17 @@
* SOFTWARE.
*/

package mil.army.usace.hec.cwms.radar.client.controllers;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.io.IOException;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
import mil.army.usace.hec.cwms.radar.client.model.Clob;
import mil.army.usace.hec.cwms.radar.client.model.Clobs;
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.data.api.client.model.Clob;
import mil.army.usace.hec.cwms.data.api.client.model.Clobs;
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;

public final class ClobController {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@
* SOFTWARE.
*/

package mil.army.usace.hec.cwms.radar.client.controllers;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.util.Objects;
import java.util.Optional;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.EndpointInput;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;
import mil.army.usace.hec.cwms.radar.client.model.Clob;
import mil.army.usace.hec.cwms.data.api.client.model.Clob;

public final class ClobEndpointInput {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,13 @@
* SOFTWARE.
*/

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

import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.EndpointInput;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V2;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;

public final class CountyCatalogEndpointInput extends EndpointInput {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package mil.army.usace.hec.cwms.radar.client.controllers;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,20 @@
* SOFTWARE.
*/

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

import static java.lang.String.format;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;

import java.io.IOException;
import java.util.List;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.radar.client.model.StreamLocation;
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.data.api.client.model.StreamLocation;

public final class DownstreamLocationsController {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
* SOFTWARE.
*/

package mil.army.usace.hec.cwms.radar.client.controllers;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.util.Objects;
import java.util.Optional;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.EndpointInput;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilder;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,18 @@
* SOFTWARE.
*/

package mil.army.usace.hec.cwms.radar.client.controllers;

import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.radar.client.controllers.RadarEndpointConstants.ACCEPT_QUERY_HEADER;
package mil.army.usace.hec.cwms.data.api.client.controllers;

import java.io.IOException;
import java.util.List;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_HEADER_V1;
import static mil.army.usace.hec.cwms.data.api.client.controllers.CdaEndpointConstants.ACCEPT_QUERY_HEADER;
import mil.army.usace.hec.cwms.http.client.ApiConnectionInfo;
import mil.army.usace.hec.cwms.http.client.HttpRequestBuilderImpl;
import mil.army.usace.hec.cwms.http.client.HttpRequestResponse;
import mil.army.usace.hec.cwms.http.client.request.HttpRequestExecutor;
import mil.army.usace.hec.cwms.radar.client.model.Embankment;
import mil.army.usace.hec.cwms.radar.client.model.RadarObjectMapper;
import mil.army.usace.hec.cwms.data.api.client.model.Embankment;
import mil.army.usace.hec.cwms.data.api.client.model.RadarObjectMapper;

public final class EmbankmentController {
private static final String EMBANKMENT_ENDPOINT = "projects/embankments";
Expand Down
Loading
Loading