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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@
import cwms.cda.data.dao.TimeSeriesDao;
import cwms.cda.data.dao.TimeSeriesDaoImpl;
import cwms.cda.data.dto.RecentValue;
import cwms.cda.data.dto.Tsv;
import cwms.cda.formatters.ContentType;
import cwms.cda.formatters.Formats;
import io.javalin.core.util.Header;
Expand Down Expand Up @@ -117,7 +116,7 @@ private TimeSeriesDao getTimeSeriesDao(DSLContext dsl) {
},
responses = {
@OpenApiResponse(status = STATUS_200, content = {
@OpenApiContent(isArray = true, from = Tsv.class, type = Formats.JSON)}),
@OpenApiContent(isArray = true, from = RecentValue.class, type = Formats.JSON)}),
@OpenApiResponse(status = STATUS_404, description = "Based on the combination of "
+ "inputs provided the timeseries group(s) were not found."),
@OpenApiResponse(status = STATUS_501, description = "request format is not "
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@

import static org.junit.jupiter.api.Assertions.*;

import cwms.cda.data.dto.RecentValue;
import cwms.cda.data.dto.TimeSeries;
import cwms.cda.formatters.ContentType;
import cwms.cda.formatters.Formats;
import io.javalin.http.Context;
import io.javalin.plugin.openapi.annotations.OpenApi;
import io.javalin.plugin.openapi.annotations.OpenApiResponse;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.reflect.Method;
import java.nio.charset.StandardCharsets;
import java.sql.Timestamp;
import java.time.Duration;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.TimeZone;

Expand Down Expand Up @@ -279,5 +285,17 @@ void testGetIds(){

}

@Test
void testRecentOpenApiResponseUsesRecentValue() throws NoSuchMethodException {
Method handle = TimeSeriesRecentController.class.getMethod("handle", Context.class);
OpenApi openApi = handle.getAnnotation(OpenApi.class);
OpenApiResponse okResponse = Arrays.stream(openApi.responses())
.filter(response -> Controllers.STATUS_200.equals(response.status()))
.findFirst()
.orElseThrow();

assertEquals(1, okResponse.content().length);
assertEquals(RecentValue.class, okResponse.content()[0].from());
}

}
}
Loading