Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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 @@ -16,6 +16,7 @@ public class BdkDatafeedConfig {
private String version = "v2";
private String idFilePath;
private BdkRetryConfig retry = new BdkRetryConfig(BdkRetryConfig.INFINITE_MAX_ATTEMPTS);
private boolean includeInvisible = false;

public void setVersion(String version) {
if ("v1".equalsIgnoreCase(version)) {
Expand Down
2 changes: 1 addition & 1 deletion symphony-bdk-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies {
}

// OpenAPI code generation
def apiBaseUrl = "https://raw.githubusercontent.com/finos/symphony-api-spec/ee09734380226ac1109a1513156ceefac3bd5a1e"
def apiBaseUrl = "https://raw.githubusercontent.com/finos/symphony-api-spec/5526c5e81cb2313c4aab18119b526534652ba98e"
def generatedFolder = "$buildDir/generated/openapi"
def apisToGenerate = [
Agent: 'agent/agent-api-public-deprecated.yaml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ public class DatafeedLoopV2 extends AbstractAckIdEventLoop {
private final RetryWithRecovery<V5Datafeed> createDatafeed;
private final RetryWithRecovery<Void> deleteDatafeed;

private final V5DatafeedCreateBody datafeedCreateBody;

private V5Datafeed datafeed;

public DatafeedLoopV2(DatafeedApi datafeedApi, AuthSession authSession, BdkConfig config, UserV2 botInfo) {
Expand Down Expand Up @@ -87,6 +89,11 @@ public DatafeedLoopV2(DatafeedApi datafeedApi, AuthSession authSession, BdkConfi
.supplier(this::doDeleteDatafeed)
.ignoreException(ApiException::isClientError)
.build();

datafeedCreateBody = new V5DatafeedCreateBody();
if(config.getDatafeed().isIncludeInvisible()) {
datafeedCreateBody.setIncludeInvisible(true);
}
}

@Override
Expand All @@ -108,7 +115,7 @@ private V5Datafeed doCreateDatafeed() throws ApiException {
return this.datafeedApi.createDatafeed(
this.authSession.getSessionToken(),
this.authSession.getKeyManagerToken(),
new V5DatafeedCreateBody()
datafeedCreateBody
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void testStartWithoutTag() throws ApiException, AuthUnauthorizedException {
void testStartInvalidExistingFeeds(String invalidExistingFeedId) throws ApiException, AuthUnauthorizedException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null))
.thenReturn(Collections.singletonList(new V5Datafeed().id(invalidExistingFeedId)));
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenReturn(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenReturn(
new V5Datafeed().id(DATAFEED_ID));

AckId ackId = new AckId().ackId(datafeedService.getAckId());
Expand All @@ -138,7 +138,7 @@ void testStartInvalidExistingFeeds(String invalidExistingFeedId) throws ApiExcep

this.datafeedService.start();

V5DatafeedCreateBody datafeedCreateBody = new V5DatafeedCreateBody();
V5DatafeedCreateBody datafeedCreateBody = new V5DatafeedCreateBody().includeInvisible(true);
verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, datafeedCreateBody);
verify(datafeedApi, times(1)).readDatafeed(DATAFEED_ID, TOKEN, TOKEN, ackId);
Expand All @@ -149,7 +149,7 @@ void testStartInvalidExistingFeeds(String invalidExistingFeedId) throws ApiExcep
void testStartValidExistingFeeds(String validExistingFeedId) throws ApiException, AuthUnauthorizedException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null))
.thenReturn(Collections.singletonList(new V5Datafeed().id(validExistingFeedId)));
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenReturn(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenReturn(
new V5Datafeed().id(validExistingFeedId));

AckId ackId = new AckId().ackId(datafeedService.getAckId());
Expand All @@ -160,7 +160,7 @@ void testStartValidExistingFeeds(String validExistingFeedId) throws ApiException

this.datafeedService.start();

V5DatafeedCreateBody datafeedCreateBody = new V5DatafeedCreateBody();
V5DatafeedCreateBody datafeedCreateBody = new V5DatafeedCreateBody().includeInvisible(true);
verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(0)).createDatafeed(TOKEN, TOKEN, datafeedCreateBody);
verify(datafeedApi, times(1)).readDatafeed(validExistingFeedId, TOKEN, TOKEN, ackId);
Expand Down Expand Up @@ -337,7 +337,7 @@ private ArgumentMatcher<AckId> eqAckId(String ackId) {
@Test
void testStartEmptyListDatafeed() throws ApiException, AuthUnauthorizedException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(Collections.emptyList());
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenReturn(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenReturn(
new V5Datafeed().id(DATAFEED_ID));
AckId initialAckId = new AckId().ackId("");
final String secondAckId = "ack-id";
Expand All @@ -349,11 +349,11 @@ void testStartEmptyListDatafeed() throws ApiException, AuthUnauthorizedException
this.datafeedService.start();

verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody());
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true));
verify(datafeedApi, times(1)).readDatafeed(DATAFEED_ID, TOKEN, TOKEN, initialAckId);
assertEquals(secondAckId, datafeedService.getAckId());
}

@Test
void testClientErrorTriggersDatafeedRecreation() throws ApiException, AuthUnauthorizedException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(
Expand All @@ -370,7 +370,7 @@ void testClientErrorTriggersDatafeedRecreation() throws ApiException, AuthUnauth
.thenThrow(new ApiException(400, ""));
when(datafeedApi.deleteDatafeed(DATAFEED_ID, TOKEN, TOKEN)).thenReturn(null);

when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenReturn(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenReturn(
new V5Datafeed().id(secondDatafeedId));
when(datafeedApi.readDatafeed(secondDatafeedId, TOKEN, TOKEN, initialAckId))
.thenReturn(new V5EventList().addEventsItem(
Expand Down Expand Up @@ -470,43 +470,43 @@ void testStartErrorListDatafeedThenRetrySuccess() throws ApiException, AuthUnaut
@Test
void testStartAuthErrorCreateDatafeed() throws ApiException, AuthUnauthorizedException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(Collections.emptyList());
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenThrow(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenThrow(
new ApiException(401, "unauthorized-error"));
doThrow(AuthUnauthorizedException.class).when(authSession).refresh();

assertThrows(AuthUnauthorizedException.class, this.datafeedService::start);
verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody());
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true));
}

@Test
void testStartClientErrorCreateDatafeed() throws ApiException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(Collections.emptyList());
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenThrow(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenThrow(
new ApiException(400, "client-error"));

assertThrows(ApiException.class, this.datafeedService::start);
verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(2)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody());
verify(datafeedApi, times(2)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true));
}

@Test
void testStartServerErrorCreateDatafeed() throws ApiException {
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(Collections.emptyList());
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenThrow(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenThrow(
new ApiException(502, "server-error"));

assertThrows(ApiException.class, this.datafeedService::start);
verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(2)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody());
verify(datafeedApi, times(2)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true));
}

@Test
void testStartClientErrorReadDatafeedAndClientErrorCreateDatafeed() throws ApiException, AuthUnauthorizedException {
AckId ackId = new AckId().ackId(datafeedService.getAckId());
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(
Collections.singletonList(new V5Datafeed().id(DATAFEED_ID)));
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody()))
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true)))
.thenThrow(new ApiException(400, "ALB: No matching rule found"))
.thenReturn(new V5Datafeed().id("recreate-df-id"));
when(datafeedApi.readDatafeed(DATAFEED_ID, TOKEN, TOKEN, ackId)).thenThrow(new ApiException(400, "client-error"));
Expand All @@ -520,7 +520,7 @@ void testStartClientErrorReadDatafeedAndClientErrorCreateDatafeed() throws ApiEx
verify(datafeedApi, times(1)).readDatafeed(DATAFEED_ID, TOKEN, TOKEN, ackId);
verify(datafeedApi, times(1)).readDatafeed("recreate-df-id", TOKEN, TOKEN, ackId);
verify(datafeedApi, times(1)).deleteDatafeed(DATAFEED_ID, TOKEN, TOKEN);
verify(datafeedApi, times(2)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody());
verify(datafeedApi, times(2)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true));
}

@Test
Expand Down Expand Up @@ -613,7 +613,7 @@ void testStartClientErrorDeleteDatafeed() throws ApiException, AuthUnauthorizedE
AckId ackId = new AckId().ackId(datafeedService.getAckId());
when(datafeedApi.listDatafeed(TOKEN, TOKEN, null)).thenReturn(
Collections.singletonList(new V5Datafeed().id(DATAFEED_ID)));
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody())).thenReturn(
when(datafeedApi.createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true))).thenReturn(
new V5Datafeed().id("recreate-df-id"));
when(datafeedApi.readDatafeed(DATAFEED_ID, TOKEN, TOKEN, ackId)).thenThrow(new ApiException(400, "client-error"));
when(datafeedApi.readDatafeed("recreate-df-id", TOKEN, TOKEN, ackId))
Expand All @@ -626,7 +626,7 @@ void testStartClientErrorDeleteDatafeed() throws ApiException, AuthUnauthorizedE
verify(datafeedApi, times(1)).listDatafeed(TOKEN, TOKEN, null);
verify(datafeedApi, times(1)).readDatafeed(DATAFEED_ID, TOKEN, TOKEN, ackId);
verify(datafeedApi, times(1)).readDatafeed("recreate-df-id", TOKEN, TOKEN, ackId);
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody());
verify(datafeedApi, times(1)).createDatafeed(TOKEN, TOKEN, new V5DatafeedCreateBody().includeInvisible(true));
verify(datafeedApi, times(1)).deleteDatafeed(DATAFEED_ID, TOKEN, TOKEN);
}

Expand Down
1 change: 1 addition & 0 deletions symphony-bdk-core/src/test/resources/config/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ app:
path: /Users/local/conf/agent/privatekey.pem

datafeed:
includeInvisible: true
retry:
maxAttempts: 2

Loading