Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Avoid StringIndexOutOfBoundsException in WebSocketMessageBrokerStats
Prior to this commit, if the TaskExecutor configured in WebSocketMessageBrokerStats for the inboundChannelExecutor or outboundChannelExecutor was not a ThreadPoolTaskExecutor, a StringIndexOutOfBoundsException was thrown when attempting to parse the results of invoking toString() on the executor. The reason is that ThreadPoolTaskExecutor delegates to a ThreadPoolExecutor whose toString() implementation generates text containing "pool size = ...", and WebSocketMessageBrokerStats' getExecutorStatsInfo() method relied on the presence of "pool" in the text returned from toString(). This commit fixes this bug by ensuring that the text returned from toString() contains "pool" before parsing the text. If "pool" is not present in the text, getExecutorStatsInfo() now returns "unknown" instead of throwing a StringIndexOutOfBoundsException. Closes gh-27209
- Loading branch information
Showing
2 changed files
with
120 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
92 changes: 92 additions & 0 deletions
92
...src/test/java/org/springframework/web/socket/config/WebSocketMessageBrokerStatsTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/* | ||
* Copyright 2002-2021 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.web.socket.config; | ||
|
||
import org.junit.jupiter.api.Test; | ||
|
||
import org.springframework.core.task.TaskExecutor; | ||
import org.springframework.scheduling.TaskScheduler; | ||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; | ||
import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; | ||
|
||
import static org.assertj.core.api.Assertions.assertThat; | ||
import static org.mockito.Mockito.mock; | ||
|
||
/** | ||
* Unit tests for {@link WebSocketMessageBrokerStats}. | ||
* | ||
* @author Sam Brannen | ||
* @since 5.3.10 | ||
* @see org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurationSupportTests | ||
*/ | ||
class WebSocketMessageBrokerStatsTests { | ||
|
||
private final WebSocketMessageBrokerStats stats = new WebSocketMessageBrokerStats(); | ||
|
||
@Test | ||
void nullValues() { | ||
String expected = "WebSocketSession[null], stompSubProtocol[null], stompBrokerRelay[null], " + | ||
"inboundChannel[null], outboundChannel[null], sockJsScheduler[null]"; | ||
assertThat(stats).hasToString(expected); | ||
} | ||
|
||
@Test | ||
void inboundAndOutboundChannelsWithThreadPoolTaskExecutor() { | ||
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); | ||
executor.afterPropertiesSet(); | ||
|
||
stats.setInboundChannelExecutor(executor); | ||
stats.setOutboundChannelExecutor(executor); | ||
|
||
assertThat(stats.getClientInboundExecutorStatsInfo()).as("inbound channel stats") | ||
.isEqualTo("pool size = 0, active threads = 0, queued tasks = 0, completed tasks = 0"); | ||
assertThat(stats.getClientOutboundExecutorStatsInfo()).as("outbound channel stats") | ||
.isEqualTo("pool size = 0, active threads = 0, queued tasks = 0, completed tasks = 0"); | ||
} | ||
|
||
@Test | ||
void inboundAndOutboundChannelsWithMockedTaskExecutor() { | ||
TaskExecutor executor = mock(TaskExecutor.class); | ||
|
||
stats.setInboundChannelExecutor(executor); | ||
stats.setOutboundChannelExecutor(executor); | ||
|
||
assertThat(stats.getClientInboundExecutorStatsInfo()).as("inbound channel stats").isEqualTo("unknown"); | ||
assertThat(stats.getClientOutboundExecutorStatsInfo()).as("outbound channel stats").isEqualTo("unknown"); | ||
} | ||
|
||
@Test | ||
void sockJsTaskSchedulerWithThreadPoolTaskScheduler() { | ||
ThreadPoolTaskScheduler scheduler = new ThreadPoolTaskScheduler(); | ||
scheduler.afterPropertiesSet(); | ||
|
||
stats.setSockJsTaskScheduler(scheduler); | ||
|
||
assertThat(stats.getSockJsTaskSchedulerStatsInfo()) | ||
.isEqualTo("pool size = 0, active threads = 0, queued tasks = 0, completed tasks = 0"); | ||
} | ||
|
||
@Test | ||
void sockJsTaskSchedulerWithMockedTaskScheduler() { | ||
TaskScheduler scheduler = mock(TaskScheduler.class); | ||
|
||
stats.setSockJsTaskScheduler(scheduler); | ||
|
||
assertThat(stats.getSockJsTaskSchedulerStatsInfo()).isEqualTo("unknown"); | ||
} | ||
|
||
} |