Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CIN-885] fix for delete event serialized issue #777

Merged
merged 2 commits into from
Dec 19, 2024
Merged

[CIN-885] fix for delete event serialized issue #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8edbc32
fix for delete event serialized issue
azakrzewski-hy Dec 19, 2024
b194ca8
updating delete body in RequestFiltersIntegrationTest
azakrzewski-hy Dec 19, 2024
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
2 changes: 1 addition & 1 deletion common-test/src/main/java/org/alfresco/hxi_connector/common/test/docker/util/DockerTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class DockerTags
private static final String TRANSFORM_ROUTER_TAG_DEFAULT = "4.0.1";
private static final String TRANSFORM_CORE_AIO_TAG_DEFAULT = "5.0.1";
private static final String SFS_TAG_DEFAULT = "4.0.1";
private static final String HXI_CONNECTOR_TAG_DEFAULT = "1.0.0-SNAPSHOT";
private static final String HXI_CONNECTOR_TAG_DEFAULT = "1.0.2-SNAPSHOT";
private static final String PROPERTIES_FILE = "docker-tags.properties";

private static Properties properties;
Expand Down
14 changes: 8 additions & 6 deletions ...i_connector/live_ingester/domain/usecase/e2e/repository/DeleteRequestIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ void testDeleteRequest()

// then
String expectedBody = """
{
"objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
"sourceId" : "alfresco-dummy-source-id-0a63de491876",
"eventType": "delete",
"sourceTimestamp": 1611656982995
}""";
[
{
"objectId": "d71dd823-82c7-477c-8490-04cb0e826e65",
"sourceId" : "alfresco-dummy-source-id-0a63de491876",
"eventType": "delete",
"sourceTimestamp": 1611656982995
}
]""";
containerSupport.expectHxIngestMessageReceived(expectedBody);
}
}
8 changes: 6 additions & 2 deletions ..._connector/live_ingester/domain/usecase/e2e/repository/RequestFiltersIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,12 +1179,14 @@ void testUpdateRequestWithAspectInAllowedFilterAndTypeInAllowedFilterAndAncestor

// then send a delete event
String expectedBody = """
{
[
{
"objectId" : "d71dd823-82c7-477c-8490-04cb0e826e14",
"sourceId" : "alfresco-dummy-source-id-0a63de491876",
"sourceTimestamp": 1611656982995,
"eventType" : "delete"
}
]
""";
containerSupport.expectHxIngestMessageReceived(expectedBody);
}
Expand Down Expand Up @@ -1261,12 +1263,14 @@ void testUpdateRequestWithAspectModifiedToFitDeniedFilterAndTypeInAllowedFilterA

// then send a delete event
String expectedBody = """
{
[
{
"objectId" : "d71dd823-82c7-477c-8490-04cb0e826e15",
"sourceId" : "alfresco-dummy-source-id-0a63de491876",
"sourceTimestamp" : 1611656982995,
"eventType" : "delete"
}
]
""";
containerSupport.expectHxIngestMessageReceived(expectedBody);
}
Expand Down
2 changes: 2 additions & 0 deletions ...fresco/hxi_connector/live_ingester/adapters/config/jackson/DeleteNodeEventSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public void serialize(DeleteNodeEvent event, JsonGenerator jgen, SerializerProvi
{
try
{
jgen.writeStartArray();
jgen.writeStartObject();

jgen.writeStringField("objectId", event.getObjectId());
Expand All @@ -63,6 +64,7 @@ public void serialize(DeleteNodeEvent event, JsonGenerator jgen, SerializerProvi
jgen.writeStringField("eventType", serializeEventType(event.getEventType()));

jgen.writeEndObject();
jgen.writeEndArray();
}
catch (Exception e)
{
Expand Down
Loading