CWMS-2028: Added new LRTS interval identifier support (#270)

* Added new LRTS interval identifier support

Author: zack-rma

.github/coveragereport/badge_branchcoverage.svg

@@ -75,6 +75,9 @@ public HttpRequestBuilderImpl(ApiConnectionInfo apiConnectionInfo, String endpoi
         if (url == null) {
             throw new ServerNotFoundException("Invalid HTTP URL: " + apiRoot, apiRoot);
         }
+        if (System.getProperty("cwms.interval.localregular.new.enabled", "false").equalsIgnoreCase("true")) {
+            this.queryHeaders.put("X-CWMS-LRTS-Formatting", "true");
+        }
         this.httpUrl = url;
         this.endpoint = Objects.requireNonNull(endpoint, "Cannot process request against the API root endpoint");
         this.apiConnectionInfo = apiConnectionInfo;

cwms-http-client/src/main/java/mil/army/usace/hec/cwms/http/client/HttpRequestBuilderImpl.java

@@ -69,6 +69,36 @@ void testHttpRequestBuilderCreateGetRequest() throws IOException {
         assertEquals(root + endpoint, request.url().toString());
     }
 
+    @Test
+    void testHttpRequestBuilderCreateGetRequestLRTSInterval() throws IOException {
+        String root = "http://localhost:11524/cwms-data/";
+        String endpoint = "timeseries";
+        System.setProperty("cwms.interval.localregular.new.enabled", "true");
+        ApiConnectionInfo apiConnectionInfo = new ApiConnectionInfoBuilder(root).build();
+
+        HttpRequestBuilderImpl httpRequestBuilder = ((HttpRequestExecutorImpl) new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
+            .get()
+            .withMediaType(ACCEPT_HEADER_V1))
+            .getInstance();
+        Request request = httpRequestBuilder.createRequest();
+        assertEquals("true", request.header("X-CWMS-LRTS-Formatting"));
+    }
+
+    @Test
+    void testHttpRequestBuilderCreateGetRequestLegacyLRTSInterval() throws IOException {
+        String root = "http://localhost:11524/cwms-data/";
+        String endpoint = "timeseries";
+        System.setProperty("cwms.interval.localregular.new.enabled", "false");
+        ApiConnectionInfo apiConnectionInfo = new ApiConnectionInfoBuilder(root).build();
+
+        HttpRequestBuilderImpl httpRequestBuilder = ((HttpRequestExecutorImpl) new HttpRequestBuilderImpl(apiConnectionInfo, endpoint)
+            .get()
+            .withMediaType(ACCEPT_HEADER_V1))
+            .getInstance();
+        Request request = httpRequestBuilder.createRequest();
+        assertNull(request.header("X-CWMS-LRTS-Formatting"));
+    }
+
     @Test
     void testHttpRequestBuilderCreatePatchRequest() throws IOException {
         String root = "http://localhost:11524/cwms-data/";