Skip to content

Commit 21b63d1

Browse files
authored
JDBC message stores: Rename column to MESSAGE_CONTENT (#10524)
The reason for this change is that content in the target DB might not always be a byte array. And we already have an outstanding work for providing JSON format for a message content. Related to: #9312
1 parent aced4dc commit 21b63d1

18 files changed

+41
-37
lines changed

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcMessageStore.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ SELECT COUNT(MESSAGE_ID)
129129
"""),
130130

131131
LIST_MESSAGES_BY_GROUP_KEY("""
132-
SELECT MESSAGE_ID, MESSAGE_BYTES, CREATED_DATE
132+
SELECT MESSAGE_ID, MESSAGE_CONTENT, CREATED_DATE
133133
from %PREFIX%MESSAGE
134134
where MESSAGE_ID in (SELECT MESSAGE_ID from %PREFIX%GROUP_TO_MESSAGE where GROUP_KEY = ? and REGION = ?)
135135
and REGION = ?
136136
ORDER BY CREATED_DATE
137137
"""),
138138

139139
POLL_FROM_GROUP("""
140-
SELECT %PREFIX%MESSAGE.MESSAGE_ID, %PREFIX%MESSAGE.MESSAGE_BYTES
140+
SELECT %PREFIX%MESSAGE.MESSAGE_ID, %PREFIX%MESSAGE.MESSAGE_CONTENT
141141
from %PREFIX%MESSAGE
142142
where %PREFIX%MESSAGE.MESSAGE_ID = (
143143
SELECT min(m.MESSAGE_ID)
@@ -159,13 +159,13 @@ SELECT min(CREATED_DATE)
159159
"""),
160160

161161
GET_MESSAGE("""
162-
SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_BYTES
162+
SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_CONTENT
163163
from %PREFIX%MESSAGE
164164
where MESSAGE_ID=? and REGION=?
165165
"""),
166166

167167
GET_MESSAGE_FROM_GROUP("""
168-
SELECT m.MESSAGE_ID, m.CREATED_DATE, m.MESSAGE_BYTES
168+
SELECT m.MESSAGE_ID, m.CREATED_DATE, m.MESSAGE_CONTENT
169169
from %PREFIX%MESSAGE m
170170
inner join %PREFIX%GROUP_TO_MESSAGE gm
171171
on m.MESSAGE_ID = gm.MESSAGE_ID
@@ -187,7 +187,7 @@ and MESSAGE_ID not in (
187187
"""),
188188

189189
CREATE_MESSAGE("""
190-
INSERT into %PREFIX%MESSAGE(MESSAGE_ID, REGION, CREATED_DATE, MESSAGE_BYTES)
190+
INSERT into %PREFIX%MESSAGE(MESSAGE_ID, REGION, CREATED_DATE, MESSAGE_CONTENT)
191191
values (?, ?, ?, ?)
192192
"""),
193193

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/ChannelMessageStoreQueryProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
public interface ChannelMessageStoreQueryProvider {
3333

3434
String SELECT_COMMON = """
35-
SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES
35+
SELECT %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_CONTENT
3636
from %PREFIX%CHANNEL_MESSAGE
3737
where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key and %PREFIX%CHANNEL_MESSAGE.REGION = :region
3838
""";
@@ -53,7 +53,7 @@ default String getCountAllMessagesInGroupQuery() {
5353
*/
5454
default String getMessageQuery() {
5555
return """
56-
SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_BYTES
56+
SELECT MESSAGE_ID, CREATED_DATE, MESSAGE_CONTENT
5757
from %PREFIX%CHANNEL_MESSAGE
5858
where MESSAGE_ID=? and GROUP_KEY=? and REGION=?
5959
""";
@@ -87,7 +87,7 @@ default String getCreateMessageQuery() {
8787
REGION,
8888
CREATED_DATE,
8989
MESSAGE_PRIORITY,
90-
MESSAGE_BYTES)
90+
MESSAGE_CONTENT)
9191
values (?, ?, ?, ?, ?, ?)
9292
""";
9393
}

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/H2ChannelMessageStoreQueryProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class H2ChannelMessageStoreQueryProvider implements ChannelMessageStoreQu
3131
@Override
3232
public String getCreateMessageQuery() {
3333
return "INSERT into %PREFIX%CHANNEL_MESSAGE(MESSAGE_ID, GROUP_KEY, REGION, CREATED_DATE, MESSAGE_PRIORITY, " +
34-
"MESSAGE_SEQUENCE, MESSAGE_BYTES) " +
34+
"MESSAGE_SEQUENCE, MESSAGE_CONTENT) " +
3535
"values (?, ?, ?, ?, ?, NEXT VALUE FOR %PREFIX%MESSAGE_SEQ, ?)";
3636
}
3737

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/HsqlChannelMessageStoreQueryProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public String getCreateMessageQuery() {
3636
CREATED_DATE,
3737
MESSAGE_PRIORITY,
3838
MESSAGE_SEQUENCE,
39-
MESSAGE_BYTES)
39+
MESSAGE_CONTENT)
4040
values (?, ?, ?, ?, ?, NEXT VALUE FOR %PREFIX%MESSAGE_SEQ, ?)
4141
""";
4242
}

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public MessageRowMapper(AllowListDeserializingConverter deserializer) {
5353

5454
@Override
5555
public Message<?> mapRow(ResultSet rs, int rowNum) throws SQLException {
56-
byte[] blobAsBytes = rs.getBytes("MESSAGE_BYTES");
56+
byte[] blobAsBytes = rs.getBytes("MESSAGE_CONTENT");
5757
return (Message<?>) this.deserializer.convert(Objects.requireNonNull(blobAsBytes));
5858
}
5959

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/OracleChannelMessageStoreQueryProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class OracleChannelMessageStoreQueryProvider implements ChannelMessageSto
3434
@Override
3535
public String getCreateMessageQuery() {
3636
return "INSERT into %PREFIX%CHANNEL_MESSAGE(MESSAGE_ID, GROUP_KEY, REGION, CREATED_DATE, MESSAGE_PRIORITY, "
37-
+ "MESSAGE_SEQUENCE, MESSAGE_BYTES)"
37+
+ "MESSAGE_SEQUENCE, MESSAGE_CONTENT)"
3838
+ " values (?, ?, ?, ?, ?, %PREFIX%MESSAGE_SEQ.NEXTVAL, ?)";
3939
}
4040

@@ -55,7 +55,7 @@ public String getPollFromGroupQuery() {
5555
public String getPriorityPollFromGroupExcludeIdsQuery() {
5656
return """
5757
SELECT /*+ INDEX(%PREFIX%CHANNEL_MESSAGE %PREFIX%CHANNEL_MSG_PRIORITY_IDX) */
58-
%PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES
58+
%PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_CONTENT
5959
from %PREFIX%CHANNEL_MESSAGE
6060
where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key
6161
and %PREFIX%CHANNEL_MESSAGE.REGION = :region
@@ -68,7 +68,7 @@ public String getPriorityPollFromGroupExcludeIdsQuery() {
6868
public String getPriorityPollFromGroupQuery() {
6969
return """
7070
SELECT /*+ INDEX(%PREFIX%CHANNEL_MESSAGE %PREFIX%CHANNEL_MSG_PRIORITY_IDX) */
71-
%PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_BYTES
71+
%PREFIX%CHANNEL_MESSAGE.MESSAGE_ID, %PREFIX%CHANNEL_MESSAGE.MESSAGE_CONTENT
7272
from %PREFIX%CHANNEL_MESSAGE
7373
where %PREFIX%CHANNEL_MESSAGE.GROUP_KEY = :group_key
7474
and %PREFIX%CHANNEL_MESSAGE.REGION = :region

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/PostgresChannelMessageStoreQueryProvider.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public String getPollFromGroupExcludeIdsQuery() {
3838
and %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID not in (:message_ids)
3939
order by CREATED_DATE, MESSAGE_SEQUENCE
4040
limit 1 for update skip locked)
41-
returning MESSAGE_ID, MESSAGE_BYTES;
41+
returning MESSAGE_ID, MESSAGE_CONTENT;
4242
""";
4343
}
4444

@@ -53,7 +53,7 @@ public String getPollFromGroupQuery() {
5353
and %PREFIX%CHANNEL_MESSAGE.REGION = :region
5454
order by CREATED_DATE, MESSAGE_SEQUENCE
5555
limit 1 for update skip locked)
56-
returning MESSAGE_ID, MESSAGE_BYTES;
56+
returning MESSAGE_ID, MESSAGE_CONTENT;
5757
""";
5858
}
5959

@@ -69,7 +69,7 @@ public String getPriorityPollFromGroupExcludeIdsQuery() {
6969
and %PREFIX%CHANNEL_MESSAGE.MESSAGE_ID not in (:message_ids)
7070
order by MESSAGE_PRIORITY DESC NULLS LAST, CREATED_DATE, MESSAGE_SEQUENCE
7171
limit 1 for update skip locked)
72-
returning MESSAGE_ID, MESSAGE_BYTES;
72+
returning MESSAGE_ID, MESSAGE_CONTENT;
7373
""";
7474
}
7575

@@ -84,7 +84,7 @@ public String getPriorityPollFromGroupQuery() {
8484
and %PREFIX%CHANNEL_MESSAGE.REGION = :region
8585
order by MESSAGE_PRIORITY DESC NULLS LAST, CREATED_DATE, MESSAGE_SEQUENCE
8686
limit 1 for update skip locked)
87-
returning MESSAGE_ID, MESSAGE_BYTES;
87+
returning MESSAGE_ID, MESSAGE_CONTENT;
8888
""";
8989
}
9090

spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/SqlServerChannelMessageStoreQueryProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public String getCreateMessageQuery() {
6262
CREATED_DATE,
6363
MESSAGE_PRIORITY,
6464
MESSAGE_SEQUENCE,
65-
MESSAGE_BYTES)
65+
MESSAGE_CONTENT)
6666
values (?, ?, ?, ?, ?,(NEXT VALUE FOR %PREFIX%MESSAGE_SEQ), ?)
6767
""";
6868
}

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-db2.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE (
22
MESSAGE_ID CHAR(36) NOT NULL,
33
REGION VARCHAR(100) NOT NULL,
44
CREATED_DATE TIMESTAMP NOT NULL,
5-
MESSAGE_BYTES BLOB,
5+
MESSAGE_CONTENT BLOB,
66
constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION)
77
);
88

@@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE (
4343
CREATED_DATE BIGINT NOT NULL,
4444
MESSAGE_PRIORITY BIGINT,
4545
MESSAGE_SEQUENCE BIGINT NOT NULL ,
46-
MESSAGE_BYTES BLOB,
46+
MESSAGE_CONTENT BLOB,
4747
REGION VARCHAR(100) NOT NULL,
4848
constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE)
4949
);

spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/schema-derby.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE TABLE INT_MESSAGE (
22
MESSAGE_ID CHAR(36) NOT NULL,
33
REGION VARCHAR(100) NOT NULL,
44
CREATED_DATE TIMESTAMP NOT NULL,
5-
MESSAGE_BYTES BLOB,
5+
MESSAGE_CONTENT BLOB,
66
constraint INT_MESSAGE_PK primary key (MESSAGE_ID, REGION)
77
);
88

@@ -43,7 +43,7 @@ CREATE TABLE INT_CHANNEL_MESSAGE (
4343
CREATED_DATE BIGINT NOT NULL,
4444
MESSAGE_PRIORITY BIGINT,
4545
MESSAGE_SEQUENCE BIGINT NOT NULL GENERATED ALWAYS AS IDENTITY (START WITH 1, INCREMENT BY 1),
46-
MESSAGE_BYTES BLOB,
46+
MESSAGE_CONTENT BLOB,
4747
REGION VARCHAR(100) NOT NULL,
4848
constraint INT_CHANNEL_MESSAGE_PK primary key (REGION, GROUP_KEY, CREATED_DATE, MESSAGE_SEQUENCE)
4949
);

0 commit comments

Comments
 (0)