Skip to content

Commit

Permalink
release(v1.5.0)
Browse files Browse the repository at this point in the history
  • Loading branch information
@actions-user
actions-user committed May 6, 2024
1 parent 1d10e91 commit 76e32c8
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 79 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<name>Zeebe Exporter Protobuf Schema</name>
<groupId>io.zeebe</groupId>
<artifactId>zeebe-exporter-protobuf</artifactId>
<version>1.4.1-SNAPSHOT</version>
<version>1.5.0</version>
<packaging>jar</packaging>

<url>https://github.com/camunda-community-hub/zeebe-exporter-protobuf</url>
Expand Down
38 changes: 19 additions & 19 deletions src/main/java/io/zeebe/exporter/proto/RecordTransformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,7 @@ private static Schema.DeploymentRecord.DecisionMetadata toDecisionMetadata(
.build();
}

private static Schema.DeploymentRecord.FormMetadata toFormMetadata(
FormMetadataValue form) {
private static Schema.DeploymentRecord.FormMetadata toFormMetadata(FormMetadataValue form) {
return Schema.DeploymentRecord.FormMetadata.newBuilder()
.setFormId(form.getFormId())
.setVersion(form.getVersion())
Expand Down Expand Up @@ -767,26 +766,27 @@ private static Schema.FormRecord toFormRecord(Record<Form> record) {
final Form value = record.getValue();

return Schema.FormRecord.newBuilder()
.setFormId(value.getFormId())
.setVersion(value.getVersion())
.setFormKey(value.getFormKey())
.setResourceName(value.getResourceName())
.setChecksum(ByteString.copyFrom(value.getChecksum()))
.setIsDuplicate(value.isDuplicate())
.setResource(ByteString.copyFrom(value.getResource()))
.setMetadata(toMetadata(record))
.setTenantId(toTenantId(value))
.build();
}

private static Schema.ResourceDeletionRecord toResourceDeletionRecord(Record<ResourceDeletionRecordValue> record) {
.setFormId(value.getFormId())
.setVersion(value.getVersion())
.setFormKey(value.getFormKey())
.setResourceName(value.getResourceName())
.setChecksum(ByteString.copyFrom(value.getChecksum()))
.setIsDuplicate(value.isDuplicate())
.setResource(ByteString.copyFrom(value.getResource()))
.setMetadata(toMetadata(record))
.setTenantId(toTenantId(value))
.build();
}

private static Schema.ResourceDeletionRecord toResourceDeletionRecord(
Record<ResourceDeletionRecordValue> record) {
final var value = record.getValue();

return Schema.ResourceDeletionRecord.newBuilder()
.setResourceKey(value.getResourceKey())
.setMetadata(toMetadata(record))
.setTenantId(toTenantId(value))
.build();
.setResourceKey(value.getResourceKey())
.setMetadata(toMetadata(record))
.setTenantId(toTenantId(value))
.build();
}

private static Schema.UserTaskRecord toUserTaskRecord(Record<UserTaskRecordValue> record) {
Expand Down
94 changes: 35 additions & 59 deletions src/test/java/io/zeebe/exporter/proto/RecordTransformTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,23 +142,16 @@ public void shouldTransformDeployment() {
assertThat(formMetadataList).hasSize(1);

final var transformedFormMetadata = formMetadataList.get(0);
final var formMetadata =
deploymentRecordValue.getFormMetadata().get(0);

assertThat(transformedFormMetadata.getFormId())
.isEqualTo(formMetadata.getFormId());
assertThat(transformedFormMetadata.getVersion())
.isEqualTo(formMetadata.getVersion());
assertThat(transformedFormMetadata.getFormKey())
.isEqualTo(formMetadata.getFormKey());
assertThat(transformedFormMetadata.getResourceName())
.isEqualTo(formMetadata.getResourceName());
final var formMetadata = deploymentRecordValue.getFormMetadata().get(0);

assertThat(transformedFormMetadata.getFormId()).isEqualTo(formMetadata.getFormId());
assertThat(transformedFormMetadata.getVersion()).isEqualTo(formMetadata.getVersion());
assertThat(transformedFormMetadata.getFormKey()).isEqualTo(formMetadata.getFormKey());
assertThat(transformedFormMetadata.getResourceName()).isEqualTo(formMetadata.getResourceName());
assertThat(transformedFormMetadata.getChecksum().toByteArray())
.isEqualTo(formMetadata.getChecksum());
assertThat(transformedFormMetadata.getIsDuplicate())
.isEqualTo(formMetadata.isDuplicate());
assertThat(transformedFormMetadata.getTenantId())
.isEqualTo(formMetadata.getTenantId());
.isEqualTo(formMetadata.getChecksum());
assertThat(transformedFormMetadata.getIsDuplicate()).isEqualTo(formMetadata.isDuplicate());
assertThat(transformedFormMetadata.getTenantId()).isEqualTo(formMetadata.getTenantId());
}

@Test
Expand Down Expand Up @@ -891,27 +884,21 @@ public void shouldTransformSignalSubscriptionRecord() {
public void shouldTransformFormRecord() {
// given
final var recordValue = mockFormRecordValue();
final Record<Form> mockedRecord =
mockRecord(recordValue, ValueType.FORM, FormIntent.CREATED);
final Record<Form> mockedRecord = mockRecord(recordValue, ValueType.FORM, FormIntent.CREATED);

// when
final var transformedRecord =
(Schema.FormRecord) RecordTransformer.toProtobufMessage(mockedRecord);
(Schema.FormRecord) RecordTransformer.toProtobufMessage(mockedRecord);

// then
assertMetadata(transformedRecord.getMetadata(), "FORM", "CREATED");

assertThat(transformedRecord.getFormId())
.isEqualTo(recordValue.getFormId());
assertThat(transformedRecord.getVersion())
.isEqualTo(recordValue.getVersion());
assertThat(transformedRecord.getFormId()).isEqualTo(recordValue.getFormId());
assertThat(transformedRecord.getVersion()).isEqualTo(recordValue.getVersion());
assertThat(transformedRecord.getFormKey()).isEqualTo(recordValue.getFormKey());
assertThat(transformedRecord.getResourceName())
.isEqualTo(recordValue.getResourceName());
assertThat(transformedRecord.getChecksum().toByteArray())
.isEqualTo(recordValue.getChecksum());
assertThat(transformedRecord.getResource().toByteArray())
.isEqualTo(recordValue.getResource());
assertThat(transformedRecord.getResourceName()).isEqualTo(recordValue.getResourceName());
assertThat(transformedRecord.getChecksum().toByteArray()).isEqualTo(recordValue.getChecksum());
assertThat(transformedRecord.getResource().toByteArray()).isEqualTo(recordValue.getResource());
assertThat(transformedRecord.getTenantId()).isEqualTo(recordValue.getTenantId());
}

Expand All @@ -920,17 +907,16 @@ public void shouldTransformResourceDeletionRecord() {
// given
final var recordValue = mockResourceDeletionRecordValue();
final Record<ResourceDeletionRecordValue> mockedRecord =
mockRecord(recordValue, ValueType.RESOURCE_DELETION, ResourceDeletionIntent.DELETED);
mockRecord(recordValue, ValueType.RESOURCE_DELETION, ResourceDeletionIntent.DELETED);

// when
final var transformedRecord =
(Schema.ResourceDeletionRecord) RecordTransformer.toProtobufMessage(mockedRecord);
(Schema.ResourceDeletionRecord) RecordTransformer.toProtobufMessage(mockedRecord);

// then
assertMetadata(transformedRecord.getMetadata(), "RESOURCE_DELETION", "DELETED");

assertThat(transformedRecord.getResourceKey())
.isEqualTo(recordValue.getResourceKey());
assertThat(transformedRecord.getResourceKey()).isEqualTo(recordValue.getResourceKey());
assertThat(transformedRecord.getTenantId()).isEqualTo(recordValue.getTenantId());
}

Expand All @@ -939,41 +925,32 @@ public void shouldTransformUserTaskRecord() {
// given
final var recordValue = mockUserTaskRecordValue();
final Record<UserTaskRecordValue> mockedRecord =
mockRecord(recordValue, ValueType.USER_TASK, UserTaskIntent.CREATED);
mockRecord(recordValue, ValueType.USER_TASK, UserTaskIntent.CREATED);

// when
final var transformedRecord =
(Schema.UserTaskRecord) RecordTransformer.toProtobufMessage(mockedRecord);
(Schema.UserTaskRecord) RecordTransformer.toProtobufMessage(mockedRecord);

// then
assertMetadata(transformedRecord.getMetadata(), "USER_TASK", "CREATED");

assertThat(transformedRecord.getUserTaskKey())
.isEqualTo(recordValue.getUserTaskKey());
assertThat(transformedRecord.getAssignee())
.isEqualTo(recordValue.getAssignee());
assertThat(transformedRecord.getCandidateGroups())
.isEqualTo(recordValue.getCandidateGroups());
assertThat(transformedRecord.getCandidateUsers())
.isEqualTo(recordValue.getCandidateUsers());
assertThat(transformedRecord.getDueDate())
.isEqualTo(recordValue.getDueDate());
assertThat(transformedRecord.getFollowUpDate())
.isEqualTo(recordValue.getFollowUpDate());
assertThat(transformedRecord.getFormKey())
.isEqualTo(recordValue.getFormKey());
assertThat(transformedRecord.getBpmnProcessId())
.isEqualTo(recordValue.getBpmnProcessId());
assertThat(transformedRecord.getUserTaskKey()).isEqualTo(recordValue.getUserTaskKey());
assertThat(transformedRecord.getAssignee()).isEqualTo(recordValue.getAssignee());
assertThat(transformedRecord.getCandidateGroups()).isEqualTo(recordValue.getCandidateGroups());
assertThat(transformedRecord.getCandidateUsers()).isEqualTo(recordValue.getCandidateUsers());
assertThat(transformedRecord.getDueDate()).isEqualTo(recordValue.getDueDate());
assertThat(transformedRecord.getFollowUpDate()).isEqualTo(recordValue.getFollowUpDate());
assertThat(transformedRecord.getFormKey()).isEqualTo(recordValue.getFormKey());
assertThat(transformedRecord.getBpmnProcessId()).isEqualTo(recordValue.getBpmnProcessId());
assertThat(transformedRecord.getProcessDefinitionVersion())
.isEqualTo(recordValue.getProcessDefinitionVersion());
.isEqualTo(recordValue.getProcessDefinitionVersion());
assertThat(transformedRecord.getProcessDefinitionKey())
.isEqualTo(recordValue.getProcessDefinitionKey());
.isEqualTo(recordValue.getProcessDefinitionKey());
assertThat(transformedRecord.getProcessInstanceKey())
.isEqualTo(recordValue.getProcessInstanceKey());
assertThat(transformedRecord.getElementId())
.isEqualTo(recordValue.getElementId());
.isEqualTo(recordValue.getProcessInstanceKey());
assertThat(transformedRecord.getElementId()).isEqualTo(recordValue.getElementId());
assertThat(transformedRecord.getElementInstanceKey())
.isEqualTo(recordValue.getElementInstanceKey());
.isEqualTo(recordValue.getElementInstanceKey());
assertThat(transformedRecord.getTenantId()).isEqualTo(recordValue.getTenantId());
assertVariables(transformedRecord.getVariables());
}
Expand Down Expand Up @@ -1206,7 +1183,6 @@ private DeploymentRecordValue mockDeploymentRecordValue() {
formMetadata.add(mockFormRecordValue());
when(deploymentRecordValue.getFormMetadata()).thenReturn(formMetadata);


final List<DeploymentResource> resources = new ArrayList<>();
final DeploymentResource deploymentResource = mock(DeploymentResource.class);
when(deploymentResource.getResource()).thenReturn("resourceContent".getBytes());
Expand Down Expand Up @@ -1427,6 +1403,7 @@ private ResourceDeletionRecordValue mockResourceDeletionRecordValue() {
when(value.getTenantId()).thenReturn(TENANT_ID);
return value;
}

private UserTaskRecordValue mockUserTaskRecordValue() {
final var value = mock(UserTaskRecordValue.class);
when(value.getUserTaskKey()).thenReturn(1L);
Expand All @@ -1447,7 +1424,6 @@ private UserTaskRecordValue mockUserTaskRecordValue() {
return value;
}


private void assertVariables(final Struct payload) {
assertThat(payload.getFieldsCount()).isEqualTo(1);
assertThat(payload.getFieldsMap())
Expand Down

0 comments on commit 76e32c8

Please sign in to comment.