Skip to content

Commit 6beae16

Browse files
jxblummp911de
authored andcommitted
Fix spelling in SynchronizingMessageListener.SubscriptionSynchronizion.
Additionally, cleanup compiler warnings. Closes #2656 Original pull request: #2657
1 parent 70b5557 commit 6beae16

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

src/main/java/org/springframework/data/redis/connection/Message.java

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
import java.io.Serializable;
1919

20-
import org.springframework.lang.Nullable;
21-
2220
/**
2321
* Class encapsulating a Redis message body and its properties.
2422
*

src/main/java/org/springframework/data/redis/listener/RedisMessageListenerContainer.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@ else if (topic instanceof PatternTopic) {
671671
if (wasListening) {
672672
CompletableFuture<Void> future = new CompletableFuture<>();
673673

674-
getRequiredSubscriber().addSynchronization(new SynchronizingMessageListener.SubscriptionSynchronizion(patterns,
674+
getRequiredSubscriber().addSynchronization(new SynchronizingMessageListener.SubscriptionSynchronization(patterns,
675675
channels, () -> future.complete(null)));
676676
getRequiredSubscriber().subscribeChannel(channels.toArray(new byte[channels.size()][]));
677677
getRequiredSubscriber().subscribePattern(patterns.toArray(new byte[patterns.size()][]));
@@ -1212,7 +1212,7 @@ public CompletableFuture<Void> initialize(BackOffExecution backOffExecution, Col
12121212
void eventuallyPerformSubscription(RedisConnection connection, BackOffExecution backOffExecution,
12131213
CompletableFuture<Void> subscriptionDone, Collection<byte[]> patterns, Collection<byte[]> channels) {
12141214

1215-
addSynchronization(new SynchronizingMessageListener.SubscriptionSynchronizion(patterns, channels,
1215+
addSynchronization(new SynchronizingMessageListener.SubscriptionSynchronization(patterns, channels,
12161216
() -> subscriptionDone.complete(null)));
12171217

12181218
doSubscribe(connection, patterns, channels);
@@ -1240,7 +1240,7 @@ void doSubscribe(RedisConnection connection, Collection<byte[]> patterns, Collec
12401240
}
12411241
}
12421242

1243-
void addSynchronization(SynchronizingMessageListener.SubscriptionSynchronizion synchronizer) {
1243+
void addSynchronization(SynchronizingMessageListener.SubscriptionSynchronization synchronizer) {
12441244
this.synchronizingMessageListener.addSynchronization(synchronizer);
12451245
}
12461246

@@ -1413,7 +1413,7 @@ protected void eventuallyPerformSubscription(RedisConnection connection, BackOff
14131413
initiallySubscribeToChannels = Collections.emptySet();
14141414
// perform channel subscription later as the first call to (p)subscribe blocks the client
14151415
addSynchronization(
1416-
new SynchronizingMessageListener.SubscriptionSynchronizion(patterns, Collections.emptySet(), () -> {
1416+
new SynchronizingMessageListener.SubscriptionSynchronization(patterns, Collections.emptySet(), () -> {
14171417
try {
14181418
subscribeChannel(channels.toArray(new byte[0][]));
14191419
} catch (Exception e) {
@@ -1424,7 +1424,7 @@ protected void eventuallyPerformSubscription(RedisConnection connection, BackOff
14241424
initiallySubscribeToChannels = channels;
14251425
}
14261426

1427-
addSynchronization(new SynchronizingMessageListener.SubscriptionSynchronizion(patterns, channels,
1427+
addSynchronization(new SynchronizingMessageListener.SubscriptionSynchronization(patterns, channels,
14281428
() -> subscriptionDone.complete(null)));
14291429

14301430
executor.execute(() -> {

src/main/java/org/springframework/data/redis/listener/SynchronizingMessageListener.java

+18-18
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.util.concurrent.CopyOnWriteArrayList;
2525
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
2626
import java.util.function.BiFunction;
27-
import java.util.stream.Collectors;
2827

2928
import org.springframework.data.redis.connection.Message;
3029
import org.springframework.data.redis.connection.MessageListener;
@@ -34,7 +33,7 @@
3433

3534
/**
3635
* Synchronizing {@link MessageListener} and {@link SubscriptionListener} that allows notifying a {@link Runnable}
37-
* (through {@link SubscriptionSynchronizion}) upon completing subscriptions to channels or patterns.
36+
* (through {@link SubscriptionSynchronization}) upon completing subscriptions to channels or patterns.
3837
*
3938
* @author Mark Paluch
4039
* @since 3.0
@@ -43,19 +42,19 @@ class SynchronizingMessageListener implements MessageListener, SubscriptionListe
4342

4443
private final MessageListener messageListener;
4544
private final SubscriptionListener subscriptionListener;
46-
private final List<SubscriptionSynchronizion> synchronizations = new CopyOnWriteArrayList<>();
45+
private final List<SubscriptionSynchronization> synchronizations = new CopyOnWriteArrayList<>();
4746

4847
public SynchronizingMessageListener(MessageListener messageListener, SubscriptionListener subscriptionListener) {
4948
this.messageListener = messageListener;
5049
this.subscriptionListener = subscriptionListener;
5150
}
5251

5352
/**
54-
* Register a {@link SubscriptionSynchronizion}.
53+
* Register a {@link SubscriptionSynchronization}.
5554
*
5655
* @param synchronization must not be {@literal null}.
5756
*/
58-
public void addSynchronization(SubscriptionSynchronizion synchronization) {
57+
public void addSynchronization(SubscriptionSynchronization synchronization) {
5958
this.synchronizations.add(synchronization);
6059
}
6160

@@ -68,7 +67,7 @@ public void onMessage(Message message, @Nullable byte[] pattern) {
6867
public void onChannelSubscribed(byte[] channel, long count) {
6968

7069
subscriptionListener.onChannelSubscribed(channel, count);
71-
handleSubscription(channel, SubscriptionSynchronizion::onChannelSubscribed);
70+
handleSubscription(channel, SubscriptionSynchronization::onChannelSubscribed);
7271
}
7372

7473
@Override
@@ -80,7 +79,7 @@ public void onChannelUnsubscribed(byte[] channel, long count) {
8079
public void onPatternSubscribed(byte[] pattern, long count) {
8180

8281
subscriptionListener.onPatternSubscribed(pattern, count);
83-
handleSubscription(pattern, SubscriptionSynchronizion::onPatternSubscribed);
82+
handleSubscription(pattern, SubscriptionSynchronization::onPatternSubscribed);
8483
}
8584

8685
@Override
@@ -89,16 +88,16 @@ public void onPatternUnsubscribed(byte[] pattern, long count) {
8988
}
9089

9190
void handleSubscription(byte[] topic,
92-
BiFunction<SubscriptionSynchronizion, ByteArrayWrapper, Boolean> synchronizerCallback) {
91+
BiFunction<SubscriptionSynchronization, ByteArrayWrapper, Boolean> synchronizerCallback) {
9392

9493
if (synchronizations.isEmpty()) {
9594
return;
9695
}
9796

9897
ByteArrayWrapper binaryChannel = new ByteArrayWrapper(topic);
99-
List<SubscriptionSynchronizion> finalized = new ArrayList<>(synchronizations.size());
98+
List<SubscriptionSynchronization> finalized = new ArrayList<>(synchronizations.size());
10099

101-
for (SubscriptionSynchronizion synchronizer : synchronizations) {
100+
for (SubscriptionSynchronization synchronizer : synchronizations) {
102101

103102
if (synchronizerCallback.apply(synchronizer, binaryChannel)) {
104103
finalized.add(synchronizer);
@@ -111,37 +110,38 @@ void handleSubscription(byte[] topic,
111110
/**
112111
* Synchronization to await subscriptions for channels and patterns.
113112
*/
114-
static class SubscriptionSynchronizion {
113+
static class SubscriptionSynchronization {
115114

116-
private static final AtomicIntegerFieldUpdater<SubscriptionSynchronizion> DONE = AtomicIntegerFieldUpdater
117-
.newUpdater(SubscriptionSynchronizion.class, "done");
115+
private static final AtomicIntegerFieldUpdater<SubscriptionSynchronization> DONE = AtomicIntegerFieldUpdater
116+
.newUpdater(SubscriptionSynchronization.class, "done");
118117

119118
private static final int NOT_DONE = 0;
120119
private static final int DONE_DONE = 0;
121120

122121
private volatile int done = NOT_DONE;
123-
private final Set<ByteArrayWrapper> remainingPatterns;
124-
private final Set<ByteArrayWrapper> remainingChannels;
125122

126123
private final Runnable doneCallback;
127124

128-
public SubscriptionSynchronizion(Collection<byte[]> remainingPatterns, Collection<byte[]> remainingChannels,
125+
private final Set<ByteArrayWrapper> remainingPatterns;
126+
private final Set<ByteArrayWrapper> remainingChannels;
127+
128+
public SubscriptionSynchronization(Collection<byte[]> remainingPatterns, Collection<byte[]> remainingChannels,
129129
Runnable doneCallback) {
130130

131131
if (remainingPatterns.isEmpty()) {
132132
this.remainingPatterns = Collections.emptySet();
133133
} else {
134134
this.remainingPatterns = ConcurrentHashMap.newKeySet(remainingPatterns.size());
135135
this.remainingPatterns
136-
.addAll(remainingPatterns.stream().map(ByteArrayWrapper::new).collect(Collectors.toList()));
136+
.addAll(remainingPatterns.stream().map(ByteArrayWrapper::new).toList());
137137
}
138138

139139
if (remainingChannels.isEmpty()) {
140140
this.remainingChannels = Collections.emptySet();
141141
} else {
142142
this.remainingChannels = ConcurrentHashMap.newKeySet(remainingChannels.size());
143143
this.remainingChannels
144-
.addAll(remainingChannels.stream().map(ByteArrayWrapper::new).collect(Collectors.toList()));
144+
.addAll(remainingChannels.stream().map(ByteArrayWrapper::new).toList());
145145
}
146146

147147
this.doneCallback = doneCallback;

0 commit comments

Comments
 (0)