FINERACT-1971: Event sequence id int overflow

apache · Jan 14, 2025 · c22844d · c22844d
1 parent 2151b19
commit c22844d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/fineract-avro-schemas/src/main/avro/BulkMessageItemV1.avsc b/fineract-avro-schemas/src/main/avro/BulkMessageItemV1.avsc
@@ -6,7 +6,7 @@
         {
             "name": "id",
             "doc": "The ID of the message to be sent",
-            "type": "int"
+            "type": "long"
         },
         {
             "name": "type",

diff --git a/fineract-avro-schemas/src/main/avro/MessageV1.avsc b/fineract-avro-schemas/src/main/avro/MessageV1.avsc
@@ -6,7 +6,7 @@
         {
             "name": "id",
             "doc": "The ID of the message to be sent",
-            "type": "int"
+            "type": "long"
         },
         {
             "name": "source",

diff --git a/.../java/org/apache/fineract/infrastructure/event/external/service/ExternalEventService.java b/.../java/org/apache/fineract/infrastructure/event/external/service/ExternalEventService.java
@@ -84,7 +84,7 @@ private ExternalEvent handleBulkBusinessEvent(BulkBusinessEvent bulkBusinessEven
         List<BusinessEvent<?>> events = bulkBusinessEvent.get();
         for (int i = 0; i < events.size(); i++) {
             BusinessEvent<?> event = events.get(i);
-            int id = i + 1;
+            long id = (long) i + 1;
             BulkMessageItemV1 message = bulkMessageItemFactory.createBulkMessageItem(id, event);
             messages.add(message);
         }

diff --git a/...apache/fineract/infrastructure/event/external/service/message/BulkMessageItemFactory.java b/...apache/fineract/infrastructure/event/external/service/message/BulkMessageItemFactory.java
@@ -38,7 +38,7 @@ public class BulkMessageItemFactory {
     private final ByteBufferConverter byteBufferConverter;
     private final DataEnricherProcessor dataEnricherProcessor;
 
-    public BulkMessageItemV1 createBulkMessageItem(int id, BusinessEvent<?> event) throws IOException {
+    public BulkMessageItemV1 createBulkMessageItem(long id, BusinessEvent<?> event) throws IOException {
         BusinessEventSerializer eventSerializer = serializerFactory.create(event);
         ByteBufferSerializable avroDto = dataEnricherProcessor.enrich(eventSerializer.toAvroDTO(event));
         ByteBuffer buffer = avroDto.toByteBuffer();

diff --git a/...a/org/apache/fineract/infrastructure/event/external/service/message/domain/MessageId.java b/...a/org/apache/fineract/infrastructure/event/external/service/message/domain/MessageId.java
@@ -25,5 +25,5 @@
 @Getter
 public class MessageId {
 
-    private final int id;
+    private final long id;
 }
diff --git a/...apache/fineract/infrastructure/event/external/jobs/SendAsynchronousEventsTaskletTest.java b/...apache/fineract/infrastructure/event/external/jobs/SendAsynchronousEventsTaskletTest.java
@@ -144,7 +144,7 @@ public void givenBatchSize2WhenTaskExecutionThenSend2Events() throws Exception {
                 createExternalEventView("aType", "aCategory", "aSchema", new byte[0], "aIdempotencyKey", 1L),
                 createExternalEventView("aType", "aCategory", "aSchema", new byte[0], "aIdempotencyKey", 1L));
         // Dummy Message
-        MessageV1 dummyMessage = new MessageV1(1, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
+        MessageV1 dummyMessage = new MessageV1(1L, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
                 "anidempotencyKey", "aSchema", Mockito.mock(ByteBuffer.class));
 
         when(repository.findByStatusOrderByBusinessDateAscIdAsc(Mockito.any(), Mockito.any())).thenReturn(events);
@@ -166,7 +166,7 @@ public void givenBatchSize2WhenEventSendFailsThenExecutionStops() throws Excepti
         List<ExternalEventView> events = Arrays.asList(
                 createExternalEventView("aType", "aCategory", "aSchema", new byte[0], "aIdempotencyKey", 1L),
                 createExternalEventView("aType", "aCategory", "aSchema", new byte[0], "aIdempotencyKey", 1L));
-        MessageV1 dummyMessage = new MessageV1(1, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
+        MessageV1 dummyMessage = new MessageV1(1L, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
                 "anidempotencyKey", "aSchema", Mockito.mock(ByteBuffer.class));
         when(repository.findByStatusOrderByBusinessDateAscIdAsc(Mockito.any(), Mockito.any())).thenReturn(events);
         when(messageFactory.createMessage(Mockito.any())).thenReturn(dummyMessage);
@@ -185,7 +185,7 @@ public void givenOneEventWhenEventSentThenEventStatusUpdates() throws Exception
         // given
         List<ExternalEventView> events = Arrays
                 .asList(createExternalEventView("aType", "aCategory", "aSchema", new byte[0], "aIdempotencyKey", 1L));
-        MessageV1 dummyMessage = new MessageV1(1, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
+        MessageV1 dummyMessage = new MessageV1(1L, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
                 "anidempotencyKey", "aSchema", Mockito.mock(ByteBuffer.class));
         when(repository.findByStatusOrderByBusinessDateAscIdAsc(Mockito.any(), Mockito.any())).thenReturn(events);
         when(messageFactory.createMessage(Mockito.any())).thenReturn(dummyMessage);
@@ -206,7 +206,7 @@ public void testExecuteShouldHandleNullAggregateId() throws Exception {
         // given
         List<ExternalEventView> events = Arrays
                 .asList(createExternalEventView("aType", "aCategory", "aSchema", new byte[0], "aIdempotencyKey", null));
-        MessageV1 dummyMessage = new MessageV1(1, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
+        MessageV1 dummyMessage = new MessageV1(1L, "aSource", "aType", "nocategory", "aCreateDate", "aBusinessDate", "aTenantId",
                 "anidempotencyKey", "aSchema", Mockito.mock(ByteBuffer.class));
         when(repository.findByStatusOrderByBusinessDateAscIdAsc(Mockito.any(), Mockito.any())).thenReturn(events);
         when(messageFactory.createMessage(Mockito.any())).thenReturn(dummyMessage);

diff --git a/...a/org/apache/fineract/infrastructure/event/external/service/ExternalEventServiceTest.java b/...a/org/apache/fineract/infrastructure/event/external/service/ExternalEventServiceTest.java
@@ -180,7 +180,7 @@ public void testPostEventShouldWorkWithBulkEvent() throws IOException {
 
         String idempotencyKey = "key";
         BusinessEvent event = mock(BusinessEvent.class);
-        BulkMessageItemV1 messageItem = new BulkMessageItemV1(1, "", "", "", ByteBuffer.wrap(new byte[0]));
+        BulkMessageItemV1 messageItem = new BulkMessageItemV1(1L, "", "", "", ByteBuffer.wrap(new byte[0]));
         BulkBusinessEvent bulkEvent = new BulkBusinessEvent(List.of(event));
         byte[] data = new byte[0];