Skip to content

Commit ab0519d

Browse files
NaccOllNaccOll
committed
Normalize access levels and method name about the lock of MessageGroupStore
1 parent af5a737 commit ab0519d

File tree

11 files changed

+71
-72
lines changed

11 files changed

+71
-72
lines changed

‎spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public MessageGroupMetadata getGroupMetadata(Object groupId) {
205205
}
206206

207207
@Override
208-
public void addMessagesToGroupInner(Object groupId, Message<?>... messages) {
208+
protected void doAddMessagesToGroup(Object groupId, Message<?>... messages) {
209209
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
210210
Assert.notNull(messages, "'messages' must not be null");
211211

@@ -239,7 +239,7 @@ public void addMessagesToGroupInner(Object groupId, Message<?>... messages) {
239239
}
240240

241241
@Override
242-
public void removeMessagesFromGroupInner(Object groupId, Collection<Message<?>> messages) {
242+
protected void doRemoveMessagesFromGroup(Object groupId, Collection<Message<?>> messages) {
243243
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
244244
Assert.notNull(messages, "'messages' must not be null");
245245

@@ -282,7 +282,7 @@ public Message<?> getMessageFromGroup(Object groupId, UUID messageId) {
282282
}
283283

284284
@Override
285-
public boolean removeMessageFromGroupByIdInner(Object groupId, UUID messageId) {
285+
protected boolean doRemoveMessageFromGroupById(Object groupId, UUID messageId) {
286286
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
287287
Assert.notNull(messageId, "'messageId' must not be null");
288288
Object mgm = doRetrieve(this.groupPrefix + groupId);
@@ -304,7 +304,7 @@ public boolean removeMessageFromGroupByIdInner(Object groupId, UUID messageId) {
304304
}
305305

306306
@Override
307-
public void completeGroupInner(Object groupId) {
307+
protected void doCompleteGroup(Object groupId) {
308308
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
309309
MessageGroupMetadata metadata = getGroupMetadata(groupId);
310310
if (metadata != null) {
@@ -318,7 +318,7 @@ public void completeGroupInner(Object groupId) {
318318
* Remove the MessageGroup with the provided group ID.
319319
*/
320320
@Override
321-
public void removeMessageGroupInner(Object groupId) {
321+
protected void doRemoveMessageGroup(Object groupId) {
322322
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
323323
Object mgm = doRemove(this.groupPrefix + groupId);
324324
if (mgm != null) {
@@ -336,7 +336,7 @@ public void removeMessageGroupInner(Object groupId) {
336336
}
337337

338338
@Override
339-
public void setGroupConditionInner(Object groupId, String condition) {
339+
protected void doSetGroupCondition(Object groupId, String condition) {
340340
MessageGroupMetadata metadata = getGroupMetadata(groupId);
341341
if (metadata != null) {
342342
metadata.setCondition(condition);
@@ -345,7 +345,7 @@ public void setGroupConditionInner(Object groupId, String condition) {
345345
}
346346

347347
@Override
348-
public void setLastReleasedSequenceNumberForGroupInner(Object groupId, int sequenceNumber) {
348+
protected void doSetLastReleasedSequenceNumberForGroup(Object groupId, int sequenceNumber) {
349349
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
350350
MessageGroupMetadata metadata = getGroupMetadata(groupId);
351351
if (metadata == null) {
@@ -358,7 +358,7 @@ public void setLastReleasedSequenceNumberForGroupInner(Object groupId, int seque
358358
}
359359

360360
@Override
361-
public Message<?> pollMessageFromGroupInner(Object groupId) {
361+
protected Message<?> doPollMessageFromGroup(Object groupId) {
362362
MessageGroupMetadata groupMetadata = getGroupMetadata(groupId);
363363
if (groupMetadata != null) {
364364
UUID firstId = groupMetadata.firstId();

‎spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -224,18 +224,18 @@ public void removeMessagesFromGroup(Object key, Message<?>... messages) {
224224
@Override
225225
public void removeMessagesFromGroup(Object key, Collection<Message<?>> messages) {
226226
Assert.notNull(key, GROUP_ID_MUST_NOT_BE_NULL);
227-
lockExecute(key, () -> removeMessagesFromGroupInner(key, messages));
227+
executeLocked(key, () -> doRemoveMessagesFromGroup(key, messages));
228228
}
229229

230-
protected abstract void removeMessagesFromGroupInner(Object key, Collection<Message<?>> messages);
230+
protected abstract void doRemoveMessagesFromGroup(Object key, Collection<Message<?>> messages);
231231

232232
@Override
233233
public void addMessagesToGroup(Object groupId, Message<?>... messages) {
234234
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
235-
lockExecute(groupId, () -> addMessagesToGroupInner(groupId, messages));
235+
executeLocked(groupId, () -> doAddMessagesToGroup(groupId, messages));
236236
}
237237

238-
protected abstract void addMessagesToGroupInner(Object groupId, Message<?>... messages);
238+
protected abstract void doAddMessagesToGroup(Object groupId, Message<?>... messages);
239239

240240
@Override
241241
public MessageGroup addMessageToGroup(Object groupId, Message<?> message) {
@@ -246,54 +246,54 @@ public MessageGroup addMessageToGroup(Object groupId, Message<?> message) {
246246
@Override
247247
public void removeMessageGroup(Object groupId) {
248248
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
249-
lockExecute(groupId, () -> removeMessageGroupInner(groupId));
249+
executeLocked(groupId, () -> doRemoveMessageGroup(groupId));
250250
}
251251

252-
protected abstract void removeMessageGroupInner(Object groupId);
252+
protected abstract void doRemoveMessageGroup(Object groupId);
253253

254254
@Override
255255
public boolean removeMessageFromGroupById(Object groupId, UUID messageId) {
256256
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
257-
return lockExecute(groupId, () -> removeMessageFromGroupByIdInner(groupId, messageId));
257+
return executeLocked(groupId, () -> doRemoveMessageFromGroupById(groupId, messageId));
258258
}
259259

260-
protected boolean removeMessageFromGroupByIdInner(Object groupId, UUID messageId) {
260+
protected boolean doRemoveMessageFromGroupById(Object groupId, UUID messageId) {
261261
throw new UnsupportedOperationException("Not supported for this store");
262262
}
263263

264264
@Override
265265
public void setLastReleasedSequenceNumberForGroup(Object groupId, int sequenceNumber) {
266266
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
267-
lockExecute(groupId, () -> setLastReleasedSequenceNumberForGroupInner(groupId, sequenceNumber));
267+
executeLocked(groupId, () -> doSetLastReleasedSequenceNumberForGroup(groupId, sequenceNumber));
268268
}
269269

270-
protected abstract void setLastReleasedSequenceNumberForGroupInner(Object groupId, int sequenceNumber);
270+
protected abstract void doSetLastReleasedSequenceNumberForGroup(Object groupId, int sequenceNumber);
271271

272272
@Override
273273
public void completeGroup(Object groupId) {
274274
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
275-
lockExecute(groupId, () -> completeGroupInner(groupId));
275+
executeLocked(groupId, () -> doCompleteGroup(groupId));
276276
}
277277

278-
protected abstract void completeGroupInner(Object groupId);
278+
protected abstract void doCompleteGroup(Object groupId);
279279

280280
@Override
281281
public void setGroupCondition(Object groupId, String condition) {
282282
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
283-
lockExecute(groupId, () -> setGroupConditionInner(groupId, condition));
283+
executeLocked(groupId, () -> doSetGroupCondition(groupId, condition));
284284
}
285285

286-
protected abstract void setGroupConditionInner(Object groupId, String condition);
286+
protected abstract void doSetGroupCondition(Object groupId, String condition);
287287

288288
@Override
289289
public Message<?> pollMessageFromGroup(Object groupId) {
290290
Assert.notNull(groupId, GROUP_ID_MUST_NOT_BE_NULL);
291-
return lockExecute(groupId, () -> pollMessageFromGroupInner(groupId));
291+
return executeLocked(groupId, () -> doPollMessageFromGroup(groupId));
292292
}
293293

294-
protected abstract Message<?> pollMessageFromGroupInner(Object groupId);
294+
protected abstract Message<?> doPollMessageFromGroup(Object groupId);
295295

296-
protected <T, E extends RuntimeException> T lockExecute(Object groupId, CheckedCallable<T, E> runnable) {
296+
protected <T, E extends RuntimeException> T executeLocked(Object groupId, CheckedCallable<T, E> runnable) {
297297
try {
298298
return this.lockRegistry.executeLocked(groupId, runnable);
299299
}
@@ -303,7 +303,7 @@ protected <T, E extends RuntimeException> T lockExecute(Object groupId, CheckedC
303303
}
304304
}
305305

306-
protected <E extends RuntimeException> void lockExecute(Object groupId, CheckedRunnable<E> runnable) {
306+
protected <E extends RuntimeException> void executeLocked(Object groupId, CheckedRunnable<E> runnable) {
307307
try {
308308
this.lockRegistry.executeLocked(groupId, runnable);
309309
}

‎spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ protected MessageGroup copy(MessageGroup group) {
266266
}
267267

268268
@Override
269-
protected void addMessagesToGroupInner(Object groupId, Message<?>... messages) {
269+
protected void doAddMessagesToGroup(Object groupId, Message<?>... messages) {
270270
Assert.notNull(groupId, "'groupId' must not be null");
271271
Assert.notNull(messages, "'messages' must not be null");
272272

@@ -306,7 +306,7 @@ private MessagingException outOfCapacityException(Object groupId) {
306306
}
307307

308308
@Override
309-
protected void removeMessageGroupInner(Object groupId) {
309+
protected void doRemoveMessageGroup(Object groupId) {
310310
MessageGroup messageGroup = this.groupIdToMessageGroup.remove(groupId);
311311
if (messageGroup != null) {
312312
UpperBound upperBound = this.groupToUpperBound.remove(groupId);
@@ -316,7 +316,7 @@ protected void removeMessageGroupInner(Object groupId) {
316316
}
317317

318318
@Override
319-
protected void removeMessagesFromGroupInner(Object groupId, Collection<Message<?>> messages) {
319+
protected void doRemoveMessagesFromGroup(Object groupId, Collection<Message<?>> messages) {
320320
MessageGroup group = this.groupIdToMessageGroup.get(groupId);
321321
Assert.notNull(group,
322322
() -> MESSAGE_GROUP_FOR_GROUP_ID + groupId + "' " +
@@ -350,7 +350,7 @@ public Message<?> getMessageFromGroup(Object groupId, UUID messageId) {
350350
}
351351

352352
@Override
353-
protected boolean removeMessageFromGroupByIdInner(Object groupId, UUID messageId) {
353+
protected boolean doRemoveMessageFromGroupById(Object groupId, UUID messageId) {
354354
MessageGroup group = this.groupIdToMessageGroup.get(groupId);
355355
Assert.notNull(group,
356356
() -> MESSAGE_GROUP_FOR_GROUP_ID + groupId + "' " +
@@ -374,15 +374,15 @@ public Iterator<MessageGroup> iterator() {
374374
}
375375

376376
@Override
377-
protected void setGroupConditionInner(Object groupId, String condition) {
377+
protected void doSetGroupCondition(Object groupId, String condition) {
378378
MessageGroup group = this.groupIdToMessageGroup.get(groupId);
379379
if (group != null) {
380380
group.setCondition(condition);
381381
}
382382
}
383383

384384
@Override
385-
protected void setLastReleasedSequenceNumberForGroupInner(Object groupId, int sequenceNumber) {
385+
protected void doSetLastReleasedSequenceNumberForGroup(Object groupId, int sequenceNumber) {
386386
MessageGroup group = this.groupIdToMessageGroup.get(groupId);
387387
Assert.notNull(group,
388388
() -> MESSAGE_GROUP_FOR_GROUP_ID + groupId + "' " +
@@ -392,7 +392,7 @@ protected void setLastReleasedSequenceNumberForGroupInner(Object groupId, int se
392392
}
393393

394394
@Override
395-
protected void completeGroupInner(Object groupId) {
395+
protected void doCompleteGroup(Object groupId) {
396396
MessageGroup group = this.groupIdToMessageGroup.get(groupId);
397397
Assert.notNull(group,
398398
() -> MESSAGE_GROUP_FOR_GROUP_ID + groupId + "' " +
@@ -402,7 +402,7 @@ protected void completeGroupInner(Object groupId) {
402402
}
403403

404404
@Override
405-
protected Message<?> pollMessageFromGroupInner(Object groupId) {
405+
protected Message<?> doPollMessageFromGroup(Object groupId) {
406406
Collection<Message<?>> messageList = getMessageGroup(groupId).getMessages();
407407
Message<?> message = null;
408408
if (!CollectionUtils.isEmpty(messageList)) {

‎spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ public void testInt3483DeadlockOnMessageStoreRemoveMessageGroup() throws Interru
351351
SimpleMessageStore messageStore = new SimpleMessageStore() {
352352

353353
@Override
354-
public void removeMessageGroupInner(Object groupId) {
354+
protected void doRemoveMessageGroup(Object groupId) {
355355
throw new RuntimeException("intentional");
356356
}
357357
};

‎spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public Iterator<MessageGroup> iterator() {
9292
}
9393

9494
@Override
95-
protected void addMessagesToGroupInner(Object groupId, Message<?>... messages) {
95+
protected void doAddMessagesToGroup(Object groupId, Message<?>... messages) {
9696
throw new UnsupportedOperationException();
9797
}
9898

@@ -102,30 +102,30 @@ public MessageGroup getMessageGroup(Object correlationKey) {
102102
}
103103

104104
@Override
105-
protected void removeMessagesFromGroupInner(Object key, Collection<Message<?>> messages) {
105+
protected void doRemoveMessagesFromGroup(Object key, Collection<Message<?>> messages) {
106106
throw new UnsupportedOperationException();
107107
}
108108

109109
@Override
110-
protected void removeMessageGroupInner(Object correlationKey) {
110+
protected void doRemoveMessageGroup(Object correlationKey) {
111111
if (correlationKey.equals(testMessages.getGroupId())) {
112112
removed = true;
113113
}
114114
}
115115

116116
@Override
117-
protected void setLastReleasedSequenceNumberForGroupInner(Object groupId, int sequenceNumber) {
117+
protected void doSetLastReleasedSequenceNumberForGroup(Object groupId, int sequenceNumber) {
118118
throw new UnsupportedOperationException();
119119
}
120120

121121
@Override
122-
protected void completeGroupInner(Object groupId) {
122+
protected void doCompleteGroup(Object groupId) {
123123

124124
throw new UnsupportedOperationException();
125125
}
126126

127127
@Override
128-
protected Message<?> pollMessageFromGroupInner(Object groupId) {
128+
protected Message<?> doPollMessageFromGroup(Object groupId) {
129129
return null;
130130
}
131131

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ public <T> Message<T> addMessage(final Message<T> message) {
473473
}
474474

475475
@Override
476-
protected void addMessagesToGroupInner(Object groupId, Message<?>... messages) {
476+
protected void doAddMessagesToGroup(Object groupId, Message<?>... messages) {
477477
String groupKey = getKey(groupId);
478478
MessageGroupMetadata groupMetadata = getGroupMetadata(groupKey);
479479

@@ -577,7 +577,7 @@ public MessageGroupMetadata getGroupMetadata(Object groupId) {
577577
}
578578

579579
@Override
580-
protected void removeMessagesFromGroupInner(Object groupId, Collection<Message<?>> messages) {
580+
protected void doRemoveMessagesFromGroup(Object groupId, Collection<Message<?>> messages) {
581581
Assert.notNull(groupId, "'groupId' must not be null");
582582
Assert.notNull(messages, "'messages' must not be null");
583583

@@ -622,7 +622,7 @@ public Message<?> getMessageFromGroup(Object groupId, UUID messageId) {
622622
}
623623

624624
@Override
625-
protected boolean removeMessageFromGroupByIdInner(Object groupId, UUID messageId) {
625+
protected boolean doRemoveMessageFromGroupById(Object groupId, UUID messageId) {
626626
String groupKey = getKey(groupId);
627627
String messageKey = getKey(messageId);
628628
int messageToGroupRemoved =
@@ -635,7 +635,7 @@ protected boolean removeMessageFromGroupByIdInner(Object groupId, UUID messageId
635635
}
636636

637637
@Override
638-
protected void removeMessageGroupInner(Object groupId) {
638+
protected void doRemoveMessageGroup(Object groupId) {
639639
String groupKey = getKey(groupId);
640640

641641
this.jdbcTemplate.update(getQuery(Query.DELETE_MESSAGES_FROM_GROUP),
@@ -654,7 +654,7 @@ protected void removeMessageGroupInner(Object groupId) {
654654
}
655655

656656
@Override
657-
protected void completeGroupInner(Object groupId) {
657+
protected void doCompleteGroup(Object groupId) {
658658
final String groupKey = getKey(groupId);
659659

660660
if (logger.isDebugEnabled()) {
@@ -665,7 +665,7 @@ protected void completeGroupInner(Object groupId) {
665665
}
666666

667667
@Override
668-
protected void setGroupConditionInner(Object groupId, String condition) {
668+
protected void doSetGroupCondition(Object groupId, String condition) {
669669
Assert.notNull(groupId, "'groupId' must not be null");
670670
String groupKey = getKey(groupId);
671671
Timestamp updatedDate = new Timestamp(System.currentTimeMillis());
@@ -676,7 +676,7 @@ protected void setGroupConditionInner(Object groupId, String condition) {
676676
}
677677

678678
@Override
679-
protected void setLastReleasedSequenceNumberForGroupInner(Object groupId, int sequenceNumber) {
679+
protected void doSetLastReleasedSequenceNumberForGroup(Object groupId, int sequenceNumber) {
680680
Assert.notNull(groupId, "'groupId' must not be null");
681681
String groupKey = getKey(groupId);
682682

@@ -688,7 +688,7 @@ protected void setLastReleasedSequenceNumberForGroupInner(Object groupId, int se
688688
}
689689

690690
@Override
691-
protected Message<?> pollMessageFromGroupInner(Object groupId) {
691+
protected Message<?> doPollMessageFromGroup(Object groupId) {
692692
String key = getKey(groupId);
693693

694694
Message<?> polledMessage = doPollForMessage(key);

0 commit comments

Comments
 (0)