Skip to content

Commit 605e247

Browse files
committed
Polishing
1 parent 304c85e commit 605e247

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/config/PropertyPlaceholderConfigurer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
*
3535
* <p>As of Spring 3.1, {@link org.springframework.context.support.PropertySourcesPlaceholderConfigurer
3636
* PropertySourcesPlaceholderConfigurer} should be used preferentially over this implementation; it is
37-
* more flexible through taking advantage of the {@link org.springframework.core.env.Environment Environment} and
38-
* {@link org.springframework.core.env.PropertySource PropertySource} mechanisms also made available in Spring 3.1.
37+
* more flexible through taking advantage of the {@link org.springframework.core.env.Environment} and
38+
* {@link org.springframework.core.env.PropertySource} mechanisms also made available in Spring 3.1.
3939
*
4040
* <p>{@link PropertyPlaceholderConfigurer} is still appropriate for use when:
4141
* <ul>
@@ -118,8 +118,8 @@ public void setSystemPropertiesMode(int systemPropertiesMode) {
118118
* to pass external values in as JVM system properties: This can easily be
119119
* achieved in a startup script, even for existing environment variables.
120120
* @see #setSystemPropertiesMode
121-
* @see java.lang.System#getProperty(String)
122-
* @see java.lang.System#getenv(String)
121+
* @see System#getProperty(String)
122+
* @see System#getenv(String)
123123
*/
124124
public void setSearchSystemEnvironment(boolean searchSystemEnvironment) {
125125
this.searchSystemEnvironment = searchSystemEnvironment;

spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -445,27 +445,23 @@ public void messageConvertersDefaultsOff() {
445445
}
446446

447447

448-
private void testChannel(String channelName, List<Class<? extends MessageHandler>> subscriberTypes,
449-
int interceptorCount) {
448+
private void testChannel(
449+
String channelName, List<Class<? extends MessageHandler>> subscriberTypes, int interceptorCount) {
450450

451451
AbstractSubscribableChannel channel = this.appContext.getBean(channelName, AbstractSubscribableChannel.class);
452-
453452
for (Class<? extends MessageHandler> subscriberType : subscriberTypes) {
454453
MessageHandler subscriber = this.appContext.getBean(subscriberType);
455454
assertNotNull("No subscription for " + subscriberType, subscriber);
456455
assertTrue(channel.hasSubscription(subscriber));
457456
}
458-
459457
List<ChannelInterceptor> interceptors = channel.getInterceptors();
460458
assertEquals(interceptorCount, interceptors.size());
461459
assertEquals(ImmutableMessageChannelInterceptor.class, interceptors.get(interceptors.size()-1).getClass());
462460
}
463461

464462
private void testExecutor(String channelName, int corePoolSize, int maxPoolSize, int keepAliveSeconds) {
465-
466463
ThreadPoolTaskExecutor taskExecutor =
467464
this.appContext.getBean(channelName + "Executor", ThreadPoolTaskExecutor.class);
468-
469465
assertEquals(corePoolSize, taskExecutor.getCorePoolSize());
470466
assertEquals(maxPoolSize, taskExecutor.getMaxPoolSize());
471467
assertEquals(keepAliveSeconds, taskExecutor.getKeepAliveSeconds());
@@ -483,6 +479,7 @@ private WebSocketHandler unwrapWebSocketHandler(WebSocketHandler handler) {
483479
return (handler instanceof WebSocketHandlerDecorator) ?
484480
((WebSocketHandlerDecorator) handler).getLastHandler() : handler;
485481
}
482+
486483
}
487484

488485

@@ -509,7 +506,6 @@ public boolean supportsReturnType(MethodParameter returnType) {
509506

510507
@Override
511508
public void handleReturnValue(Object returnValue, MethodParameter returnType, Message<?> message) throws Exception {
512-
513509
}
514510
}
515511

@@ -540,12 +536,15 @@ public void afterConnectionEstablished(WebSocketSession session) throws Exceptio
540536
class TestStompErrorHandler extends StompSubProtocolErrorHandler {
541537
}
542538

539+
543540
class TestValidator implements Validator {
541+
544542
@Override
545543
public boolean supports(Class<?> clazz) {
546544
return false;
547545
}
548546

549547
@Override
550-
public void validate(@Nullable Object target, Errors errors) { }
548+
public void validate(@Nullable Object target, Errors errors) {
549+
}
551550
}

0 commit comments

Comments
 (0)