language
stringclasses
1 value
owner
stringlengths
2
15
repo
stringlengths
2
21
sha
stringlengths
45
45
message
stringlengths
7
36.3k
path
stringlengths
1
199
patch
stringlengths
15
102k
is_multipart
bool
2 classes
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-oxm/src/test/resources/log4j.properties
@@ -1,6 +1,8 @@ -log4j.rootCategory=INFO, stdout -log4j.logger.org.springframework.oxm=DEBUG +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=INFO, co...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-test/src/test/resources/log4j.properties
@@ -0,0 +1,24 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.file=build/spring-test.log +log4...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-test/src/test/resources/log4j.xml
@@ -1,63 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - ...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-tx/src/test/resources/log4j.properties
@@ -0,0 +1,10 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springf...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-tx/src/test/resources/log4j.xml
@@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - ...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-web/src/test/resources/log4j.properties
@@ -0,0 +1,12 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springf...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-web/src/test/resources/log4j.xml
@@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - ...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-webmvc-portlet/src/test/resources/log4j.properties
@@ -0,0 +1,10 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springf...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-webmvc-portlet/src/test/resources/log4j.xml
@@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - ...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-webmvc-tiles3/src/test/resources/log4j.properties
@@ -1,7 +1,8 @@ -log4j.rootCategory=INFO, stdout +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender....
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-webmvc/src/test/resources/log4j.properties
@@ -0,0 +1,10 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springf...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-webmvc/src/test/resources/log4j.xml
@@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - ...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-websocket/src/test/resources/log4j.properties
@@ -0,0 +1,10 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.web=DEBUG +log4j.logger.org.springfr...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
spring-websocket/src/test/resources/log4j.xml
@@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" "log4j.dtd"> -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Tar...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
src/test/resources/log4j.properties
@@ -0,0 +1,11 @@ +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%c] - %m%n + +log4j.rootCategory=WARN, console +log4j.logger.org.springframework.beans=WARN +log4j.logger.org.springf...
true
Other
spring-projects
spring-framework
4cd818b9e45298237950e2e108e4629539cbcc4a.json
Harmonize log configuration Prior to this commit, the codebase was using a mix of log4j.xml and log4j.properties for test-related logging configuration. This can be an issue as log4j takes the xml variant first when looking for a default bootstrap configuration. In practice, some modules declaring the properties vari...
src/test/resources/log4j.xml
@@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> - - <!-- Appenders --> - <appender name="console" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out" /> - ...
true
Other
spring-projects
spring-framework
1fa4a7d34f56b85753fb38f54a4bc6d5f1c837db.json
Fix minor issue in STOMP broker relay
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -81,6 +81,7 @@ public class StompBrokerRelayMessageHandler extends AbstractBrokerMessageHandler static { SimpMessageHeaderAccessor headers = SimpMessageHeaderAccessor.create(SimpMessageType.HEARTBEAT); HEARTBEAT_MESSAGE = MessageBuilder.withPayload(new byte[] {'\n'}).setHeaders(headers).build(); + EMPTY_TAS...
false
Other
spring-projects
spring-framework
9552c82e2d81bcb6c781793e1fe14708bd4db25b.json
Remove use of simple executor in WebSocket clients Issue: SPR-11580
spring-websocket/src/main/java/org/springframework/web/socket/client/jetty/JettyWebSocketClient.java
@@ -28,11 +28,10 @@ import org.eclipse.jetty.websocket.client.WebSocketClient; import org.springframework.context.SmartLifecycle; import org.springframework.core.task.AsyncListenableTaskExecutor; -import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; impor...
true
Other
spring-projects
spring-framework
9552c82e2d81bcb6c781793e1fe14708bd4db25b.json
Remove use of simple executor in WebSocket clients Issue: SPR-11580
spring-websocket/src/main/java/org/springframework/web/socket/client/standard/StandardWebSocketClient.java
@@ -34,11 +34,11 @@ import javax.websocket.WebSocketContainer; import org.springframework.core.task.AsyncListenableTaskExecutor; -import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; import org.springframework.http.HttpHeaders; import org.springframewor...
true
Other
spring-projects
spring-framework
9552c82e2d81bcb6c781793e1fe14708bd4db25b.json
Remove use of simple executor in WebSocket clients Issue: SPR-11580
spring-websocket/src/test/java/org/springframework/web/socket/client/jetty/JettyWebSocketClientTests.java
@@ -28,6 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.util.CollectionUtils; import org.springframework.util.SocketUtils; import org.springframework.web.socket.WebSocketHandler; @@ -88,6 +8...
true
Other
spring-projects
spring-framework
9552c82e2d81bcb6c781793e1fe14708bd4db25b.json
Remove use of simple executor in WebSocket clients Issue: SPR-11580
spring-websocket/src/test/java/org/springframework/web/socket/client/standard/StandardWebSocketClientTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -30,6 +30,9 @@ import org.junit.Test; impo...
true
Other
spring-projects
spring-framework
8aefcb9a550886fe93b11d7e276f2236840944d3.json
Set DB_CLOSE_ON_EXIT=false in H2EmbeddedDbConfig This commit sets the DB_CLOSE_ON_EXIT flag to false for embedded H2 databases loaded using H2EmbeddedDatabaseConfigurer (i.e., via Spring's <jdbc:embedded-database /> XML namespace, EmbeddedDatabaseBuilder, EmbeddedDatabaseFactory, and EmbeddedDatabaseFactoryBean). Iss...
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/H2EmbeddedDatabaseConfigurer.java
@@ -26,6 +26,7 @@ * * @author Oliver Gierke * @author Juergen Hoeller + * @author Sam Brannen * @since 3.0 */ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigurer { @@ -36,7 +37,7 @@ final class H2EmbeddedDatabaseConfigurer extends AbstractEmbeddedDatabaseConfigu /** - *...
true
Other
spring-projects
spring-framework
8aefcb9a550886fe93b11d7e276f2236840944d3.json
Set DB_CLOSE_ON_EXIT=false in H2EmbeddedDbConfig This commit sets the DB_CLOSE_ON_EXIT flag to false for embedded H2 databases loaded using H2EmbeddedDatabaseConfigurer (i.e., via Spring's <jdbc:embedded-database /> XML namespace, EmbeddedDatabaseBuilder, EmbeddedDatabaseFactory, and EmbeddedDatabaseFactoryBean). Iss...
spring-jdbc/src/test/java/org/springframework/jdbc/config/JdbcNamespaceIntegrationTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -42,123 +42,130 @@ * @author Dave Syer *...
true
Other
spring-projects
spring-framework
8aefcb9a550886fe93b11d7e276f2236840944d3.json
Set DB_CLOSE_ON_EXIT=false in H2EmbeddedDbConfig This commit sets the DB_CLOSE_ON_EXIT flag to false for embedded H2 databases loaded using H2EmbeddedDatabaseConfigurer (i.e., via Spring's <jdbc:embedded-database /> XML namespace, EmbeddedDatabaseBuilder, EmbeddedDatabaseFactory, and EmbeddedDatabaseFactoryBean). Iss...
spring-jdbc/src/test/resources/org/springframework/jdbc/config/jdbc-destroy-nested-config-h2.xml
@@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:jdbc="http://www.springframework.org/schema/jdbc" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springfra...
true
Other
spring-projects
spring-framework
dc6d67510d65393eabf420cc6648e8f31acb6586.json
Improve configurability of EmbeddedDatabaseBuilder This commit improves the configurability of EmbeddedDatabaseBuilder by exposing the following new configuration methods. - setDataSourceFactory(DataSourceFactory) - addScripts(String...) - setScriptEncoding(String) - setSeparator(String) - setCommentPrefix(Strin...
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilder.java
@@ -16,17 +16,28 @@ package org.springframework.jdbc.datasource.embedded; +import javax.sql.DataSource; + import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; +import org.springfram...
true
Other
spring-projects
spring-framework
dc6d67510d65393eabf420cc6648e8f31acb6586.json
Improve configurability of EmbeddedDatabaseBuilder This commit improves the configurability of EmbeddedDatabaseBuilder by exposing the following new configuration methods. - setDataSourceFactory(DataSourceFactory) - addScripts(String...) - setScriptEncoding(String) - setSeparator(String) - setCommentPrefix(Strin...
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseBuilderTests.java
@@ -17,72 +17,151 @@ package org.springframework.jdbc.datasource.embedded; import org.junit.Test; - import org.springframework.core.io.ClassRelativeResourceLoader; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.init.CannotReadScriptException; import static org.ju...
true
Other
spring-projects
spring-framework
dc6d67510d65393eabf420cc6648e8f31acb6586.json
Improve configurability of EmbeddedDatabaseBuilder This commit improves the configurability of EmbeddedDatabaseBuilder by exposing the following new configuration methods. - setDataSourceFactory(DataSourceFactory) - addScripts(String...) - setScriptEncoding(String) - setSeparator(String) - setCommentPrefix(Strin...
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactoryBeanTests.java
@@ -19,8 +19,8 @@ import javax.sql.DataSource; import org.junit.Test; - -import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.ClassRelativeResourceLoader; +import org.springframework.core.io.Resource; import org.springframework.jdbc.core.JdbcTemplate; import org.springframewor...
true
Other
spring-projects
spring-framework
dc6d67510d65393eabf420cc6648e8f31acb6586.json
Improve configurability of EmbeddedDatabaseBuilder This commit improves the configurability of EmbeddedDatabaseBuilder by exposing the following new configuration methods. - setDataSourceFactory(DataSourceFactory) - addScripts(String...) - setScriptEncoding(String) - setSeparator(String) - setCommentPrefix(Strin...
spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-block-comments.sql
@@ -0,0 +1,9 @@ +{* + these are custom block comments +*} +drop table T_TEST if exists; + +{* + these are custom block comments +*} +create table T_TEST (NAME varchar(50) not null); \ No newline at end of file
true
Other
spring-projects
spring-framework
dc6d67510d65393eabf420cc6648e8f31acb6586.json
Improve configurability of EmbeddedDatabaseBuilder This commit improves the configurability of EmbeddedDatabaseBuilder by exposing the following new configuration methods. - setDataSourceFactory(DataSourceFactory) - addScripts(String...) - setScriptEncoding(String) - setSeparator(String) - setCommentPrefix(Strin...
spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-custom-comments.sql
@@ -0,0 +1,5 @@ +~ Failed DROP can be ignored if necessary +drop table T_TEST if exists; + +~ Create the test table +create table T_TEST (NAME varchar(50) not null); \ No newline at end of file
true
Other
spring-projects
spring-framework
dc6d67510d65393eabf420cc6648e8f31acb6586.json
Improve configurability of EmbeddedDatabaseBuilder This commit improves the configurability of EmbeddedDatabaseBuilder by exposing the following new configuration methods. - setDataSourceFactory(DataSourceFactory) - addScripts(String...) - setScriptEncoding(String) - setSeparator(String) - setCommentPrefix(Strin...
spring-jdbc/src/test/resources/org/springframework/jdbc/datasource/embedded/db-schema-derby.sql
@@ -1 +0,0 @@ -create table T_TEST (NAME varchar(50) not null); \ No newline at end of file
true
Other
spring-projects
spring-framework
b640b9fdfe2c1d554aa2bb8ea38401d20c2ed2dd.json
Update TODOs for SPR-11574 Issue: SPR-11574
spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java
@@ -130,7 +130,7 @@ public void postProcessorWorksWithComposedConfigurationWithAttributeOverridesUsi postProcessorWorksWithComposedConfigurationWithAttributeOverrides(beanDefinition); } - // TODO Remove expected exception when SPR-XXXXX is resolved. + // TODO Remove expected exception when SPR-11574 is resolved....
false
Other
spring-projects
spring-framework
87e58a6d7b7209f5f932b0d34e509452c62405d6.json
Improve Javadoc for DatabasePopulator
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
@@ -20,18 +20,20 @@ import java.sql.SQLException; /** - * Strategy used to populate a database during initialization. + * Strategy used to populate, initialize, or clean up a database. * * @author Keith Donald * @author Sam Brannen * @since 3.0 * @see ResourceDatabasePopulator * @see DatabasePopulatorUt...
false
Other
spring-projects
spring-framework
a372b683cde47651fcec6ef0cec9004d79c4975e.json
Use custom config read in ReactorTcpClient Use a custom ConfigReader to enforce the use of SynchronousDispatcher and no other dispatchers otherwise created by default. Avoids the creation thread pools never to be used.
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -16,6 +16,7 @@ package org.springframework.messaging.simp.stomp; +import java.io.IOException; import java.util.Collection; import java.util.Map; import java.util.concurrent.Callable;
true
Other
spring-projects
spring-framework
a372b683cde47651fcec6ef0cec9004d79c4975e.json
Use custom config read in ReactorTcpClient Use a custom ConfigReader to enforce the use of SynchronousDispatcher and no other dispatchers otherwise created by default. Avoids the creation thread pools never to be used.
spring-messaging/src/main/java/org/springframework/messaging/tcp/reactor/ReactorTcpClient.java
@@ -18,6 +18,9 @@ import java.lang.reflect.Modifier; import java.net.InetSocketAddress; +import java.util.Arrays; +import java.util.Collections; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,6 +37,9 @@ import reactor.core.composable.Pr...
true
Other
spring-projects
spring-framework
92eb99a5abaaf43f4fddeaf00020dad2f3dd73eb.json
Favor ScriptException over SQLException In ScriptUtils and related classes, SQLExceptions are now caught and wrapped in ScriptExceptions wherever feasible. Affected "throws" declarations have also been revised as appropriate. Issue: SPR-11564
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/CompositeDatabasePopulator.java
@@ -13,10 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.jdbc.datasource.init; import java.sql.Connection; import java.sql.SQLException; + import java.util.ArrayList; import java.util.Arrays; import java.uti...
true
Other
spring-projects
spring-framework
92eb99a5abaaf43f4fddeaf00020dad2f3dd73eb.json
Favor ScriptException over SQLException In ScriptUtils and related classes, SQLExceptions are now caught and wrapped in ScriptExceptions wherever feasible. Affected "throws" declarations have also been revised as appropriate. Issue: SPR-11564
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/DatabasePopulator.java
@@ -31,7 +31,12 @@ public interface DatabasePopulator { /** - * Populate the database using the JDBC connection provided. + * Populate the database using the provided JDBC connection. + * <p>Concrete implementations <em>may</em> throw an {@link SQLException} if + * an error is encountered but are <em>strongly ...
true
Other
spring-projects
spring-framework
92eb99a5abaaf43f4fddeaf00020dad2f3dd73eb.json
Favor ScriptException over SQLException In ScriptUtils and related classes, SQLExceptions are now caught and wrapped in ScriptExceptions wherever feasible. Affected "throws" declarations have also been revised as appropriate. Issue: SPR-11564
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
@@ -17,7 +17,6 @@ package org.springframework.jdbc.datasource.init; import java.sql.Connection; -import java.sql.SQLException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -183,7 +182,7 @@ public void setIgnoreFailedDrops(boolean ignoreFailedDrops) { * {@inheritDoc} */ @...
true
Other
spring-projects
spring-framework
92eb99a5abaaf43f4fddeaf00020dad2f3dd73eb.json
Favor ScriptException over SQLException In ScriptUtils and related classes, SQLExceptions are now caught and wrapped in ScriptExceptions wherever feasible. Affected "throws" declarations have also been revised as appropriate. Issue: SPR-11564
spring-jdbc/src/main/java/org/springframework/jdbc/datasource/init/ScriptUtils.java
@@ -99,6 +99,7 @@ private ScriptUtils() { * @param script the SQL script * @param separator character separating each statement &mdash; typically a ';' * @param statements the list that will contain the individual statements + * @throws ScriptException if an error occurred while splitting the SQL script * ...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -30,9 +30,10 @@ import org.springframework....
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/main/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandler.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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.
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/main/java/org/springframework/messaging/simp/config/AbstractMessageBrokerConfiguration.java
@@ -355,7 +355,7 @@ public Validator getValidator() { } - private static final AbstractBrokerMessageHandler noopBroker = new AbstractBrokerMessageHandler(null) { + private static final AbstractBrokerMessageHandler noopBroker = new AbstractBrokerMessageHandler() { @Override protected void startInternal() {
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -126,7 +126,6 @@ public StompBrokerRelayMessageHandler(SubscribableChannel clientInChannel, Messa Assert.notNull(clientOutChannel, "'clientOutChannel' must not be null"); Assert.notNull(brokerChannel, "'brokerChannel' must not be null"); - this.clientInboundChannel = clientInChannel; this.clientOutboun...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/BrokerMessageHandlerTests.java
@@ -0,0 +1,157 @@ +/* + * Copyright 2002-2014 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + ...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/test/java/org/springframework/messaging/simp/broker/SimpleBrokerMessageHandlerTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -36,6 +36,7 @@ import static org.mockito.Mo...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/test/java/org/springframework/messaging/simp/config/StompBrokerRelayRegistrationTests.java
@@ -23,6 +23,7 @@ import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.simp.stomp.StompBrokerRelayMessageHandler; +import java.util.ArrayList; import java.util.Arrays; import static org.junit.Assert.assertEquals; @@ -57,7 +58,9 @@ public void test() { StompBrokerRe...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
@@ -164,18 +164,6 @@ public void publishSubscribe() throws Exception { this.responseHandler.awaitAndAssert(); } - @Test - public void brokerUnvailableErrorFrameOnConnect() throws Exception { - - stopActiveMqBrokerAndAwait(); - - MessageExchange connect = MessageExchangeBuilder.connectWithError("sess1").build()...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerTests.java
@@ -19,13 +19,18 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.Callable; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; +import org.springframework.context.ApplicationEvent; +import org.springfra...
true
Other
spring-projects
spring-framework
6bcbb94abac229b70a8b0a89b12ce461d4321a8b.json
Refine BrokerAvailabilityEvent behavior Add accessor for brokerAvailable in AbstractBrokerMessageHandler Ensure brokerAvailable is set even if eventPublisher is not Add tests BrokerMessageHandlerTests Turn off brokerAvailable when StompBrokerRelayMessageHandler stops Actually stop message handling when brokerAvailabl...
spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
@@ -16,7 +16,9 @@ package org.springframework.web.socket.config; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.List; import org.hamcrest.Matchers; @@ -127,7 +129,8 @@ public void simpleBroker() { SimpleBrokerMessageHandler brokerMessageHandler = thi...
true
Other
spring-projects
spring-framework
14a8f19670d2df932b9e05b122390848944173e8.json
Add links to class-level Javadoc in JdbcTestUtils
spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -45,6 +45,10 @@ * @author Phillip Webb * @author Chris Baldwin * @since 2.5.4 + * @see org.springframework.jdbc.core.JdbcTemplate + * @see org.springframework.jdbc.datasource.init.ScriptUtils + * @see org.springframework.jdbc.datasource.init.ResourceDatabasePopulator + * @see org.springframework.jdbc.datasourc...
false
Other
spring-projects
spring-framework
a006ca254272bebe7b8e3828dd6cd53a8b52542b.json
Remove trailing whitespace
spring-context/src/test/java/org/springframework/beans/factory/xml/XmlBeanFactoryTests.java
@@ -72,7 +72,7 @@ /** * Miscellaneous tests for XML bean definitions. - * + * * @author Juergen Hoeller * @author Rod Johnson * @author Rick Evans
true
Other
spring-projects
spring-framework
a006ca254272bebe7b8e3828dd6cd53a8b52542b.json
Remove trailing whitespace
spring-test/src/main/java/org/springframework/test/context/MetaAnnotationUtils.java
@@ -145,7 +145,7 @@ private static <T extends Annotation> AnnotationDescriptor<T> findAnnotationDesc * * <p>This method traverses the annotations and superclasses of the specified * {@code clazz} if no annotation can be found on the given class itself. - * + * * <p>This method explicitly handles class-le...
true
Other
spring-projects
spring-framework
a006ca254272bebe7b8e3828dd6cd53a8b52542b.json
Remove trailing whitespace
spring-test/src/main/java/org/springframework/test/jdbc/JdbcTestUtils.java
@@ -255,7 +255,7 @@ public static String readScript(LineNumberReader lineNumberReader) throws IOExce * @param commentPrefix the prefix that identifies comments in the SQL script &mdash; typically "--" * @return a {@code String} containing the script lines * @deprecated as of Spring 4.0.3, in favor of using - ...
true
Other
spring-projects
spring-framework
a006ca254272bebe7b8e3828dd6cd53a8b52542b.json
Remove trailing whitespace
spring-test/src/test/java/org/springframework/test/context/hierarchies/meta/MetaContextHierarchyConfig.java
@@ -30,7 +30,7 @@ /** * Custom context hierarchy configuration annotation. - * + * * @author Sam Brannen * @since 4.0.3 */
true
Other
spring-projects
spring-framework
a006ca254272bebe7b8e3828dd6cd53a8b52542b.json
Remove trailing whitespace
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/session/AbstractSockJsSession.java
@@ -44,7 +44,7 @@ /** * An abstract base class for SockJS sessions implementing {@link SockJsSession}. - * + * * @author Rossen Stoyanchev * @author Sam Brannen * @since 4.0
true
Other
spring-projects
spring-framework
7a6ec6952357d23b3f17694236a253f385b14e10.json
Fix custom config with older HttpClient Since HttpClient 4.3, custom configuration such as the connection timeout and the socket timeout are set in a RequestConfig object stored in the HttpContext. Unfortunately, older HttpClients are not supporting this infrastructure and new clients throw an exception when the depr...
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequest.java
@@ -70,6 +70,9 @@ public URI getURI() { return this.httpRequest.getURI(); } + HttpContext getHttpContext() { + return httpContext; + } @Override protected ClientHttpResponse executeInternal(HttpHeaders headers, byte[] bufferedOutput) throws IOException {
true
Other
spring-projects
spring-framework
7a6ec6952357d23b3f17694236a253f385b14e10.json
Fix custom config with older HttpClient Since HttpClient 4.3, custom configuration such as the connection timeout and the socket timeout are set in a RequestConfig object stored in the HttpContext. Unfortunately, older HttpClients are not supporting this infrastructure and new clients throw an exception when the depr...
spring-web/src/main/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactory.java
@@ -113,6 +113,7 @@ public HttpClient getHttpClient() { public void setConnectTimeout(int timeout) { Assert.isTrue(timeout >= 0, "Timeout must be a non-negative value"); this.connectTimeout = timeout; + setLegacyConnectionTimeout(getHttpClient(), connectTimeout); } /** @@ -123,6 +124,7 @@ public vo...
true
Other
spring-projects
spring-framework
7a6ec6952357d23b3f17694236a253f385b14e10.json
Fix custom config with older HttpClient Since HttpClient 4.3, custom configuration such as the connection timeout and the socket timeout are set in a RequestConfig object stored in the HttpContext. Unfortunately, older HttpClients are not supporting this infrastructure and new clients throw an exception when the depr...
spring-web/src/test/java/org/springframework/http/client/HttpComponentsClientHttpRequestFactoryTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -16,6 +16,16 @@ package org.springframewo...
true
Other
spring-projects
spring-framework
9e52004222addfe6498ed9eb6d8d8ad926ce21ea.json
Add support for asserting JSON Based on the JSONassert library. Issue: SPR-10113
build.gradle
@@ -906,6 +906,7 @@ project("spring-test") { optional("org.aspectj:aspectjweaver:${aspectjVersion}") optional("org.hamcrest:hamcrest-core:1.3") optional("com.jayway.jsonpath:json-path:0.9.0") + optional("org.skyscreamer:jsonassert:1.2.3") optional("xmlunit:xmlunit:1.5") testCompile(project(":spring-cont...
true
Other
spring-projects
spring-framework
9e52004222addfe6498ed9eb6d8d8ad926ce21ea.json
Add support for asserting JSON Based on the JSONassert library. Issue: SPR-10113
spring-test/src/main/java/org/springframework/test/util/JsonExpectationsHelper.java
@@ -0,0 +1,57 @@ +/* + * Copyright 2002-2014 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + ...
true
Other
spring-projects
spring-framework
9e52004222addfe6498ed9eb6d8d8ad926ce21ea.json
Add support for asserting JSON Based on the JSONassert library. Issue: SPR-10113
spring-test/src/main/java/org/springframework/test/web/servlet/result/ContentResultMatchers.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -28,6 +28,7 @@ import org.hamcrest.Matche...
true
Other
spring-projects
spring-framework
9e52004222addfe6498ed9eb6d8d8ad926ce21ea.json
Add support for asserting JSON Based on the JSONassert library. Issue: SPR-10113
spring-test/src/test/java/org/springframework/test/web/servlet/result/ContentResultMatchersTests.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -20,7 +20,6 @@ import org.junit.Test; impo...
true
Other
spring-projects
spring-framework
f6fbdafb6a5b364bc2538b4f05a85fcc9be9fc51.json
Introduce RequestEntity and builder This commit introduces the RequestEntity, a class similar to ResponseEntity, but meant for HTTP requests rather than responses. The RequestEntity can be used both in RestTemplate as well as @MVC scenarios. The class also comes with a builder, similar to the one found in ResponseEnt...
spring-web/src/main/java/org/springframework/http/RequestEntity.java
@@ -0,0 +1,597 @@ +/* + * Copyright 2002-2014 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 +...
true
Other
spring-projects
spring-framework
f6fbdafb6a5b364bc2538b4f05a85fcc9be9fc51.json
Introduce RequestEntity and builder This commit introduces the RequestEntity, a class similar to ResponseEntity, but meant for HTTP requests rather than responses. The RequestEntity can be used both in RestTemplate as well as @MVC scenarios. The class also comes with a builder, similar to the one found in ResponseEnt...
spring-web/src/main/java/org/springframework/web/client/RestOperations.java
@@ -24,6 +24,7 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; +import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; /** @@ -461,6 +462,46 @@ <T> ResponseEntity<T> exchange(String url...
true
Other
spring-projects
spring-framework
f6fbdafb6a5b364bc2538b4f05a85fcc9be9fc51.json
Introduce RequestEntity and builder This commit introduces the RequestEntity, a class similar to ResponseEntity, but meant for HTTP requests rather than responses. The RequestEntity can be used both in RestTemplate as well as @MVC scenarios. The class also comes with a builder, similar to the one found in ResponseEnt...
spring-web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -31,6 +31,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; +import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpRequest; import org...
true
Other
spring-projects
spring-framework
f6fbdafb6a5b364bc2538b4f05a85fcc9be9fc51.json
Introduce RequestEntity and builder This commit introduces the RequestEntity, a class similar to ResponseEntity, but meant for HTTP requests rather than responses. The RequestEntity can be used both in RestTemplate as well as @MVC scenarios. The class also comes with a builder, similar to the one found in ResponseEnt...
spring-web/src/test/java/org/springframework/http/RequestEntityTests.java
@@ -0,0 +1,147 @@ +/* + * Copyright 2002-2014 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 +...
true
Other
spring-projects
spring-framework
f6fbdafb6a5b364bc2538b4f05a85fcc9be9fc51.json
Introduce RequestEntity and builder This commit introduces the RequestEntity, a class similar to ResponseEntity, but meant for HTTP requests rather than responses. The RequestEntity can be used both in RestTemplate as well as @MVC scenarios. The class also comes with a builder, similar to the one found in ResponseEnt...
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java
@@ -25,6 +25,7 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpInputMessage; +import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; import org.springframework.http.converter.HttpMessageConverter...
true
Other
spring-projects
spring-framework
f6fbdafb6a5b364bc2538b4f05a85fcc9be9fc51.json
Introduce RequestEntity and builder This commit introduces the RequestEntity, a class similar to ResponseEntity, but meant for HTTP requests rather than responses. The RequestEntity can be used both in RestTemplate as well as @MVC scenarios. The class also comes with a builder, similar to the one found in ResponseEnt...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorMockTests.java
@@ -17,6 +17,7 @@ package org.springframework.web.servlet.mvc.method.annotation; import java.lang.reflect.Method; +import java.net.URI; import java.util.Arrays; import java.util.Collections; @@ -27,9 +28,11 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org...
true
Other
spring-projects
spring-framework
669386abacf3774f5e9c3799b0d3533525032b10.json
Organize imports in Spring MVC Test classes
spring-test/src/main/java/org/springframework/test/web/client/MockRestServiceServer.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -13,27 +13,23 @@ * See the License for the...
true
Other
spring-projects
spring-framework
669386abacf3774f5e9c3799b0d3533525032b10.json
Organize imports in Spring MVC Test classes
spring-test/src/main/java/org/springframework/test/web/client/RequestMatcherClientHttpRequest.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -13,6 +13,7 @@ * See the License for the s...
true
Other
spring-projects
spring-framework
06d3e1b94ef482c9055805abcff19be613ae31c4.json
Fix Javadoc typo
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java
@@ -56,7 +56,7 @@ public interface WebSocketMessageBrokerConfigurer { /** * Configure the {@link org.springframework.messaging.MessageChannel} used for - * incoming messages from WebSocket clients. By default the channel is backed + * outbound messages to WebSocket clients. By default the channel is backed ...
false
Other
spring-projects
spring-framework
71b942698de314cc0ebe0a235188029675922349.json
Fix sniff task warnings
spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
@@ -137,6 +137,7 @@ public void setExposeUnconfigurableExecutor(boolean exposeUnconfigurableExecutor @Override + @UsesJava7 protected ExecutorService initializeExecutor( ThreadFactory threadFactory, RejectedExecutionHandler rejectedExecutionHandler) {
true
Other
spring-projects
spring-framework
71b942698de314cc0ebe0a235188029675922349.json
Fix sniff task warnings
spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -31,6 +31,7 @@ import org.springframework.core.task.AsyncListenableTaskExecutor; import org.springframework.core.task.TaskRejectedException; +import org.springframework.lang.UsesJava7; import org.springframework.scheduling.SchedulingTaskExecutor; import org.springframework.scheduling.TaskScheduler; import org...
true
Other
spring-projects
spring-framework
71b942698de314cc0ebe0a235188029675922349.json
Fix sniff task warnings
spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java
@@ -17,8 +17,6 @@ package org.springframework.web.socket.config; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.util.ClassUtils; -import org.springframework.web.socket.config.annotation.WebSocketConfigurationSupport; import org.w3c.dom.Element; import org.s...
true
Other
spring-projects
spring-framework
71b942698de314cc0ebe0a235188029675922349.json
Fix sniff task warnings
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
@@ -18,11 +18,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; -import org.springframework.util.ClassUtils; import org.springframework.web.servlet.HandlerMapping; -import java.util.concurrent.ScheduledThreadPoolExecutor; - /** *...
true
Other
spring-projects
spring-framework
71b942698de314cc0ebe0a235188029675922349.json
Fix sniff task warnings
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java
@@ -17,14 +17,12 @@ package org.springframework.web.socket.config.annotation; import java.util.Collections; -import java.util.concurrent.ScheduledThreadPoolExecutor; import org.springframework.beans.factory.config.CustomScopeConfigurer; import org.springframework.context.annotation.Bean; import org.springframe...
true
Other
spring-projects
spring-framework
b1aebb2c0cd65d7aeaa153465a7797412b222747.json
Fix failing test
spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java
@@ -33,6 +33,8 @@ import org.springframework.web.socket.sockjs.transport.handler.DefaultSockJsService; import org.springframework.web.socket.sockjs.transport.handler.WebSocketTransportHandler; +import java.util.concurrent.ScheduledThreadPoolExecutor; + /** * Provides utility methods for parsing common WebSocket ...
true
Other
spring-projects
spring-framework
b1aebb2c0cd65d7aeaa153465a7797412b222747.json
Fix failing test
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
@@ -21,6 +21,8 @@ import org.springframework.util.ClassUtils; import org.springframework.web.servlet.HandlerMapping; +import java.util.concurrent.ScheduledThreadPoolExecutor; + /** * Configuration support for WebSocket request handling. * @@ -31,7 +33,7 @@ public class WebSocketConfigurationSupport { // Ch...
true
Other
spring-projects
spring-framework
b1aebb2c0cd65d7aeaa153465a7797412b222747.json
Fix failing test
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java
@@ -17,6 +17,7 @@ package org.springframework.web.socket.config.annotation; import java.util.Collections; +import java.util.concurrent.ScheduledThreadPoolExecutor; import org.springframework.beans.factory.config.CustomScopeConfigurer; import org.springframework.context.annotation.Bean; @@ -44,7 +45,7 @@ public ...
true
Other
spring-projects
spring-framework
cb40908a7d3c6fb330d3813692f7679501d9a54b.json
Fix warnings from the sniff task
spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java
@@ -17,6 +17,8 @@ package org.springframework.web.socket.config; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.util.ClassUtils; +import org.springframework.web.socket.config.annotation.WebSocketConfigurationSupport; import org.w3c.dom.Element; import org.s...
true
Other
spring-projects
spring-framework
cb40908a7d3c6fb330d3813692f7679501d9a54b.json
Fix warnings from the sniff task
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
@@ -18,6 +18,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.util.ClassUtils; import org.springframework.web.servlet.HandlerMapping; /** @@ -28,6 +29,11 @@ */ public class WebSocketConfigurationSupp...
true
Other
spring-projects
spring-framework
cb40908a7d3c6fb330d3813692f7679501d9a54b.json
Fix warnings from the sniff task
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java
@@ -23,6 +23,7 @@ import org.springframework.messaging.simp.SimpSessionScope; import org.springframework.messaging.simp.config.AbstractMessageBrokerConfiguration; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; +import org.springframework.util.ClassUtils; import org.springframework.web.ser...
true
Other
spring-projects
spring-framework
2b1ff4c5db781a3d0b5b83fab44e47cd7e64dbd6.json
Fix condition in SubProtocolWebSocketHandler Issue: SPR-11884
spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
@@ -70,7 +70,7 @@ public class SubProtocolWebSocketHandler implements WebSocketHandler, * connection isn't doing well (proxy issue, slow network?) and can be closed. * @see #checkSessions() */ - private final int TIME_TO_FIRST_MESSAGE = 60 * 1000; + private static final int TIME_TO_FIRST_MESSAGE = 60 * 1000; ...
true
Other
spring-projects
spring-framework
2b1ff4c5db781a3d0b5b83fab44e47cd7e64dbd6.json
Fix condition in SubProtocolWebSocketHandler Issue: SPR-11884
spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java
@@ -165,6 +165,7 @@ public void checkSession() throws Exception { new DirectFieldAccessor(sessions.get("id1")).setPropertyValue("createTime", sixtyOneSecondsAgo); new DirectFieldAccessor(sessions.get("id2")).setPropertyValue("createTime", sixtyOneSecondsAgo); + this.webSocketHandler.start(); this.webSocketH...
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-context/src/main/java/org/springframework/scheduling/concurrent/ScheduledExecutorFactoryBean.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -24,9 +24,11 @@ import java.util.concurrent...
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-context/src/main/java/org/springframework/scheduling/concurrent/ThreadPoolTaskScheduler.java
@@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -31,11 +31,13 @@ import org.springframewo...
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketNamespaceUtils.java
@@ -16,7 +16,7 @@ package org.springframework.web.socket.config; -import org.springframework.web.socket.sockjs.transport.SockJsThreadPoolTaskScheduler; +import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.w3c.dom.Element; import org.springframework.beans.factory.config.BeanDefi...
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketConfigurationSupport.java
@@ -19,8 +19,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.web.servlet.HandlerMapping; -import org.springframework.web.servlet.handler.AbstractHandlerMapping; -import org.springframework.web.socket.sockjs....
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurationSupport.java
@@ -26,7 +26,6 @@ import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler; -import org.springframework.web.socket.sockjs.transport.SockJsThreadPoolTaskScheduler; /** * Extends {@lin...
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/SockJsThreadPoolTaskScheduler.java
@@ -1,66 +0,0 @@ -/* - * Copyright 2002-2014 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - *...
true
Other
spring-projects
spring-framework
7441f2301281049cff7224bf650646490388080e.json
Add support for removeOnCancelPolicy This change removes the recently added SockJsThreadPoolTaskScheduler and instead builds support for the removeOnCancelPolicy property in ThreadPoolTaskScheduler and ScheduledExecutorFactoryBean. Issue: SPR-11918
spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java
@@ -170,7 +170,7 @@ public void checkSession() throws Exception { assertTrue(session1.isOpen()); assertFalse(session2.isOpen()); assertNull(session1.getCloseStatus()); - assertEquals(CloseStatus.PROTOCOL_ERROR, session2.getCloseStatus()); + assertEquals(CloseStatus.SESSION_NOT_RELIABLE, session2.getCloseStat...
true
Other
spring-projects
spring-framework
7da3fb4ce6dc90048b2a3f661fa80f38bede8ed9.json
Support STOMP DISCONNECT with receipt Issue: SPR-11599
spring-messaging/src/main/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandler.java
@@ -759,7 +759,7 @@ else if (logger.isTraceEnabled()) { @Override public void onSuccess(Void result) { if (accessor.getCommand() == StompCommand.DISCONNECT) { - clearConnection(); + afterDisconnectSent(accessor); } } @Override @@ -775,6 +775,21 @@ else if (logger.isErrorEnabled...
true
Other
spring-projects
spring-framework
7da3fb4ce6dc90048b2a3f661fa80f38bede8ed9.json
Support STOMP DISCONNECT with receipt Issue: SPR-11599
spring-messaging/src/test/java/org/springframework/messaging/simp/stomp/StompBrokerRelayMessageHandlerIntegrationTests.java
@@ -223,11 +223,6 @@ public void relayReconnectsIfBrokerComesBackUp() throws Exception { startActiveMqBroker(); this.eventPublisher.expectBrokerAvailabilityEvent(true); - - // TODO The event publisher assertions show that the broker's back up and the system relay session - // has reconnected. We need to decid...
true
Other
spring-projects
spring-framework
7dc2b2927e0168080619839ba63db5c4e820a6da.json
Use SESSION_NOT_RELIABLE when no messages received When a WebSocket session is closed after not having received any messages, we'll use SESSION_NOT_RELIABLE to indicate to other parts of the session closing code not to send anything further (e.g. SockJS "Go Away!" frame). Issue: SPR-11884
spring-websocket/src/main/java/org/springframework/web/socket/CloseStatus.java
@@ -135,11 +135,10 @@ public final class CloseStatus { /** - * Indicates that a session has become unreliable (e.g. timed out while sending - * a message) and extra care should be exercised while closing the session in - * order to avoid locking additional threads. - * - * <p><strong>NOTE:</strong> Spring Fr...
true
Other
spring-projects
spring-framework
7dc2b2927e0168080619839ba63db5c4e820a6da.json
Use SESSION_NOT_RELIABLE when no messages received When a WebSocket session is closed after not having received any messages, we'll use SESSION_NOT_RELIABLE to indicate to other parts of the session closing code not to send anything further (e.g. SockJS "Go Away!" frame). Issue: SPR-11884
spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
@@ -356,8 +356,13 @@ private String resolveSessionId(Message<?> message) { } /** - * Periodically check sessions to ensure they have received at least one - * message or otherwise close them. + * When a session is connected through a higher-level protocol it has a chance + * to use heartbeat management to shu...
true
Other
spring-projects
spring-framework
7a5b3c1eed58b3d4b3051a8f19509e02a74e2ba9.json
Append suffx to user dest in SimpMessagingTemplate Isssue: SPR-11868
spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java
@@ -77,8 +77,9 @@ public MessageChannel getMessageChannel() { * @see org.springframework.messaging.simp.user.UserDestinationMessageHandler */ public void setUserDestinationPrefix(String prefix) { - Assert.notNull(prefix, "UserDestinationPrefix must not be null"); - this.userDestinationPrefix = prefix; + Asse...
true
Other
spring-projects
spring-framework
7a5b3c1eed58b3d4b3051a8f19509e02a74e2ba9.json
Append suffx to user dest in SimpMessagingTemplate Isssue: SPR-11868
spring-messaging/src/test/java/org/springframework/messaging/simp/SimpMessagingTemplateTests.java
@@ -118,6 +118,25 @@ public void convertAndSendWithCustomHeaderNonNative() { assertNull(headerAccessor.getNativeHeader("key")); } + // SPR-11868 + + @Test + public void convertAndSendWithCustomDestinationPrefix() { + this.messagingTemplate.setUserDestinationPrefix("/prefix"); + this.messagingTemplate.convertAn...
true
Other
spring-projects
spring-framework
7a5b3c1eed58b3d4b3051a8f19509e02a74e2ba9.json
Append suffx to user dest in SimpMessagingTemplate Isssue: SPR-11868
spring-websocket/src/test/java/org/springframework/web/socket/config/MessageBrokerBeanDefinitionParserTests.java
@@ -264,7 +264,7 @@ public void annotationMethodMessageHandler() { SimpMessagingTemplate simpMessagingTemplate = this.appContext.getBean(SimpMessagingTemplate.class); assertNotNull(simpMessagingTemplate); - assertEquals("/personal", simpMessagingTemplate.getUserDestinationPrefix()); + assertEquals("/personal/...
true
Other
spring-projects
spring-framework
a3fa9c979777e554efad0df429041767f05dfdb8.json
Add check for unused WebSocket sessions Sessions connected to a STOMP endpoint are expected to receive some client messages. Having received none after successfully connecting could be an indication of proxy or network issue. This change adds periodic checks to see if we have not received any messages on a session whi...
spring-websocket/src/main/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandler.java
@@ -16,6 +16,7 @@ package org.springframework.web.socket.messaging; +import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -24,6 +25,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; +import java.util.co...
true
Other
spring-projects
spring-framework
a3fa9c979777e554efad0df429041767f05dfdb8.json
Add check for unused WebSocket sessions Sessions connected to a STOMP endpoint are expected to receive some client messages. Having received none after successfully connecting could be an indication of proxy or network issue. This change adds periodic checks to see if we have not received any messages on a session whi...
spring-websocket/src/test/java/org/springframework/web/socket/messaging/SubProtocolWebSocketHandlerTests.java
@@ -17,16 +17,24 @@ package org.springframework.web.socket.messaging; import java.util.Arrays; +import java.util.Map; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.beans.DirectFieldAccessor; import org.springframewo...
true
Other
spring-projects
spring-framework
0f47732523865e360bfe8de4ba9ec708e0accaa0.json
Fix failing test
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/transport/SockJsThreadPoolTaskScheduler.java
@@ -40,7 +40,7 @@ public class SockJsThreadPoolTaskScheduler extends ThreadPoolTaskScheduler { // Check for setRemoveOnCancelPolicy method - available on JDK 7 and higher private static boolean hasRemoveOnCancelPolicyMethod = ClassUtils.hasMethod( - ScheduledThreadPoolExecutor.class, "setRemoveOnCancelPolicy", ...
false