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

Jump to bottom

fix(document): handle SDK document reference correctly in the serializer #3205

Merged
merged 1 commit into from
Aug 29, 2024
Merged

fix(document): handle SDK document reference correctly in the serializer #3205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion .../java/io/camunda/connector/document/annotation/jackson/serializer/DocumentSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,12 @@
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import io.camunda.connector.document.annotation.jackson.DocumentReferenceModel.CamundaDocumentReferenceModel;
import io.camunda.document.Document;
import io.camunda.document.operation.DocumentOperationExecutor;
import io.camunda.document.reference.DocumentReference.CamundaDocumentReference;
import java.io.IOException;
import java.util.Optional;

public class DocumentSerializer extends JsonSerializer<Document> {

Expand All @@ -37,6 +40,20 @@ public void serialize(
throws IOException {

var reference = document.reference();
jsonGenerator.writeObject(reference);
if (!(reference instanceof CamundaDocumentReference camundaReference)) {
throw new IllegalArgumentException("Unsupported document reference type: " + reference);
}
final CamundaDocumentReferenceModel model;
if (camundaReference instanceof CamundaDocumentReferenceModel camundaModel) {
model = camundaModel;
} else {
model =
new CamundaDocumentReferenceModel(
camundaReference.storeId(),
camundaReference.documentId(),
camundaReference.metadata().getKeys(),
Optional.empty());
}
jsonGenerator.writeObject(model);
}
}
25 changes: 24 additions & 1 deletion ...cument/src/test/java/io/camunda/connector/document/jackson/DocumentSerializationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
import io.camunda.connector.document.annotation.jackson.DocumentReferenceModel.CamundaDocumentReferenceModel;
import io.camunda.connector.document.annotation.jackson.JacksonModuleDocument;
import io.camunda.document.Document;
import io.camunda.document.DocumentMetadata;
import io.camunda.document.factory.DocumentFactory;
import io.camunda.document.operation.DocumentOperationExecutor;
import io.camunda.document.reference.CamundaDocumentReferenceImpl;
import java.util.Map;
import java.util.Optional;
import org.json.JSONException;
Expand All @@ -45,7 +47,7 @@ public class DocumentSerializationTest {
.registerModule(new Jdk8Module());

@Test
void sourceTypeDocument() throws JsonProcessingException, JSONException {
void sourceTypeDocument_jacksonInternalModel() throws JsonProcessingException, JSONException {
var ref = new CamundaDocumentReferenceModel("test", "test", Map.of(), Optional.empty());
var document = mock(Document.class);
when(document.reference()).thenReturn(ref);
Expand All @@ -65,5 +67,26 @@ void sourceTypeDocument() throws JsonProcessingException, JSONException {
JSONAssert.assertEquals(expectedResult, result, true);
}

@Test
void sourceTypeDocument_connectorSdkModel() throws JsonProcessingException, JSONException {
var ref = new CamundaDocumentReferenceImpl("test", "test", new DocumentMetadata(Map.of()));
var document = mock(Document.class);
when(document.reference()).thenReturn(ref);
var source = new SourceTypeDocument(document);
var result = objectMapper.writeValueAsString(source);
var expectedResult =
"""
{
"document": {
"documentType": "camunda",
"storeId": "test",
"documentId": "test",
"metadata": {}
}
}
""";
JSONAssert.assertEquals(expectedResult, result, true);
}

record SourceTypeDocument(Document document) {}
}