Skip to content

Commit 5733a27

Browse files
committed
GH-866 - Polishing.
Switch Oracle schema definition to make the serialized event column non null. Adapt test cases to always contain some content for the serialized event. Original pull request: GH-868.
1 parent 5dee1bd commit 5733a27

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

spring-modulith-events/spring-modulith-events-jdbc/src/main/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ private TargetEventPublication resultSetToPublication(ResultSet rs) throws SQLEx
400400
var completionDate = rs.getTimestamp("COMPLETION_DATE");
401401
var publicationDate = rs.getTimestamp("PUBLICATION_DATE").toInstant();
402402
var listenerId = rs.getString("LISTENER_ID");
403-
var serializedEvent = Optional.ofNullable(rs.getString("SERIALIZED_EVENT")).orElse("");
403+
var serializedEvent = rs.getString("SERIALIZED_EVENT");
404404

405405
return new JdbcEventPublication(id, publicationDate, listenerId,
406406
() -> serializer.deserialize(serializedEvent, eventClass),

spring-modulith-events/spring-modulith-events-jdbc/src/main/resources/schema-oracle.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS EVENT_PUBLICATION (
33
ID VARCHAR2(36) NOT NULL,
44
LISTENER_ID VARCHAR2(512) NOT NULL,
55
EVENT_TYPE VARCHAR2(512) NOT NULL,
6-
SERIALIZED_EVENT VARCHAR2(4000),
6+
SERIALIZED_EVENT VARCHAR2(4000) NOT NULL,
77
PUBLICATION_DATE TIMESTAMP(6) NOT NULL,
88
COMPLETION_DATE TIMESTAMP(6),
99
CONSTRAINT EVENT_PUBLICATION_PK PRIMARY KEY(ID)

spring-modulith-events/spring-modulith-events-jdbc/src/test/java/org/springframework/modulith/events/jdbc/JdbcEventPublicationRepositoryIntegrationTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -353,10 +353,10 @@ void returnsSameEventInstanceFromPublication() {
353353
var event = new Sample();
354354

355355
// Serialize to whatever
356-
doReturn("").when(serializer).serialize(event);
356+
doReturn("sample").when(serializer).serialize(event);
357357

358358
// Return fresh instances for every deserialization attempt
359-
doAnswer(__ -> new Sample()).when(serializer).deserialize("", Sample.class);
359+
doAnswer(__ -> new Sample()).when(serializer).deserialize("sample", Sample.class);
360360

361361
repository.create(TargetEventPublication.of(event, TARGET_IDENTIFIER));
362362

@@ -476,7 +476,7 @@ class MariaDBWithNoDefinedSchemaName extends WithNoDefinedSchemaName {}
476476

477477
@WithMariaDB
478478
class MariaDBWithDeleteCompletion extends WithDeleteCompletion {}
479-
479+
480480
// Oracle
481481

482482
@WithOracle
@@ -523,7 +523,7 @@ private static final class Sample {}
523523
@ActiveProfiles("mssql")
524524
@Retention(RetentionPolicy.RUNTIME)
525525
@interface WithMssql {}
526-
526+
527527
@Nested
528528
@ActiveProfiles("oracle")
529529
@Retention(RetentionPolicy.RUNTIME)

0 commit comments

Comments
 (0)