Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,020 Commits 18 Branches 0 Tags
d550eb152ceca8a9f721b3bb46a6526ccdb05a3c
Commit Graph

14020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
d550eb152c Polish contribution 
Closes gh-1307
 2017-01-27 14:17:13 +01:00
Ruben Dijkstra
f1c7e0f5b2 Check for null on the argument instead of the message 
See gh-1307
Issue: SPR-15196
 2017-01-27 14:15:24 +01:00
Brian Clozel
944d17f237 Harmonize Tomcat dependencies 
Use `tomcat-embed-core` instead of `tomcat-catalina`
for tomcat internal classes.
 2017-01-26 18:31:11 +01:00
Sebastien Deleuze
7ff257c0ea Prevent NPE in ScriptTemplateView when no view is found 
Issue: SPR-15064
 2017-01-26 15:29:55 +01:00
Sebastien Deleuze
2a5d1b086f Fix Spring MVC ScriptTemplateView locale support 
The locale should be set in resolveViewName() instead of
createView() in order to be taken in account with cached
views.

Issue: SPR-15064
 2017-01-26 14:33:21 +01:00
Rossen Stoyanchev
4aac7c2ee2 Minor refactoring in Tomcat/Jetty adapters 2017-01-26 07:37:46 -05:00
Rossen Stoyanchev
a2aaa05592 Polish 2017-01-26 07:25:22 -05:00
Violeta Georgieva
383375c35f Use separate reactive HttpHandler for Tomcat/Jetty 
Introduce separate adapters TomcatHttpHandlerAdapter/JettyHttpHandlerAdapter
so that each adapter can use the Tomcat/Jetty APIs for reading/writing
with ByteBuffer.
 2017-01-26 06:21:44 -05:00
Rossen Stoyanchev
ea67a637ae Align setup of SockJS and WebSocket integration tests 
Failures in JettySockJsIntegrationTests after the upgrade to 9.4 were
hidden due to the PERFORMANCE test group but were failing on the CI
performance build with IllegalStateException inside Jetty on
"Failure find the required ServletContext attribute
org.eclipse.jetty.util.DecoratedObjectFactory".
 2017-01-26 06:17:03 -05:00
Sam Brannen
871f5efeaa Clean up warnings in spring-test 2017-01-26 01:27:15 +01:00
Rossen Stoyanchev
ae034e9afe Polish content disposition 2017-01-25 17:19:30 -05:00
Rossen Stoyanchev
eabd8a2964 Support Servlet Part in Spring MVC Test 
Issue: SPR-14253
 2017-01-25 17:05:30 -05:00
Rossen Stoyanchev
c8f98ecd8d Add MockPart to spring-test 
Issue: SPR-14252
 2017-01-25 17:05:25 -05:00
Sam Brannen
3bc819799b Polishing 2017-01-25 19:40:08 +01:00
Rossen Stoyanchev
f5d2b88e3f "sharedHttpSession" shortcut for MockMvc builders 
Issue: SPR-13820
 2017-01-25 12:33:11 -05:00
Rossen Stoyanchev
1d35c7c55a Polish MockMvc setup classes 2017-01-25 12:33:11 -05:00
Sebastien Deleuze
2d95199466 Support i18n and nested templates in ScriptTemplateView 
This commit changes the 3rd parameter passed to the rendering
function from String url to RenderingContext renderingContext.

RenderingContext contains 4 properties:
 - ApplicationContext applicationContext
 - Locale locale
 - Function<String, String> templateLoader
 - String url

Issue: SPR-15064
 2017-01-25 17:23:20 +01:00
Juergen Hoeller
8038fb9c8b HandlerMethod pre-resolves parameter types at construction time 
Issue: SPR-15186
 2017-01-25 11:09:43 +01:00
Sam Brannen
4e65c10272 Fix broken test in SpringJUnit4ConcurrencyTests 
Prior to this commit, SpringJUnit4ConcurrencyTests was broken due to
recent additions of test methods in SampleTests.

This commit fixes the broken test by removing hard coded constants and
replacing them with dynamic lookups for JUnit 4 @Test methods.
 2017-01-25 05:56:02 +01:00
Violeta Georgieva
1443c0808d Enable suspend/resume on reactive JettyWebsocketSession 
Issue: SPR-15130
 2017-01-24 19:49:18 -05:00
Juergen Hoeller
4a57d4512e Reset cached ResolvableType on increaseNestingLevel/setContainingClass 
Issue: SPR-15160
 2017-01-25 00:30:05 +01:00
Juergen Hoeller
5e946c2700 Consistent type variable resolution for arrays/collections (in particular at field level) 
Dropping GenericCollectionTypeResolver in favor of direct ResolvableType usage.

Issue: SPR-15160
 2017-01-24 18:00:17 +01:00
Juergen Hoeller
e8776f80da Revised CookieLocaleResolver parse exception handling 
Issue: SPR-15182
 2017-01-24 17:48:54 +01:00
Juergen Hoeller
12973ac702 Polishing 2017-01-24 00:12:53 +01:00
Juergen Hoeller
cb242894a9 Upgrade to Jetty 9.4.1 2017-01-23 21:47:00 +01:00
Juergen Hoeller
f095aa20eb Polishing 2017-01-23 21:28:40 +01:00
Juergen Hoeller
e94fa3f34d WebSocketSession.getExtensions consistently exposes unmodifiable/empty list 
Issue: SPR-15180
 2017-01-23 21:28:30 +01:00
Juergen Hoeller
a0df36ddda HiddenHttpMethodFilter defensively proceeds with original request in case of error dispatch 
Issue: SPR-15179
 2017-01-23 21:25:21 +01:00
Juergen Hoeller
ecc22f7179 DispatcherServet.checkMultipart considers MultipartException cause as well 
Issue: SPR-15178
 2017-01-23 21:22:38 +01:00
Juergen Hoeller
7d3fcaa934 Consider abstract classes with @Lookup methods as candidate components 
Issue: SPR-14550
 2017-01-23 17:28:18 +01:00
Juergen Hoeller
ed40b1c8ee Remove outdated abstractions/delegates from core/util 
Issue: SPR-15159
 2017-01-23 13:41:55 +01:00
Juergen Hoeller
6fe7e56598 Document further configuration class restrictions 
Issue: SPR-14602
 2017-01-23 13:39:11 +01:00
Juergen Hoeller
253060c21c Only expose ASM-driven method order if the methods match 
Issue: SPR-14505
 2017-01-23 13:37:22 +01:00
Juergen Hoeller
a9ae2c3402 Polishing 2017-01-23 12:42:01 +01:00
Juergen Hoeller
e566e25b6f Clear nonAnnotatedClasses cache in afterSingletonsInstantiated 
Issue: SPR-15175
 2017-01-23 12:29:38 +01:00
Juergen Hoeller
55554143d7 Upgrade to Objenesis 2.5.1 
Issue: SPR-15146
 2017-01-23 11:21:13 +01:00
Sam Brannen
3ec6c0e424 Update example copyright dates 2017-01-21 03:16:42 +01:00
Rossen Stoyanchev
bc884023e4 Add ExpectedCount#never() 
Issue: SPR-15168
 2017-01-20 17:12:13 -05:00
Stephane Nicoll
f07a23e63d Merge pull request #1294 from echoAlexey:patch-1 
* pr/1294:
  Fix Javadoc for CronSequenceGenerator
 2017-01-20 17:28:08 +01:00
Alexey Nikolaenko
644b0b8beb Fix Javadoc for CronSequenceGenerator 
Closes gh-1294
 2017-01-20 17:26:49 +01:00
Stephane Nicoll
ab5f3e733b Merge pull request #1279 from jvz:updated-logging-docs 
* pr/1279:
  Polish contribution
  Update logging documentation to include Log4j 2
 2017-01-20 17:18:12 +01:00
Stephane Nicoll
3e15573628 Polish contribution 
Since Log4J 1.x is EOL there is no need to have a dedicated section for
it.

Closes gh-1279
Issue: SPR-15170
 2017-01-20 17:17:46 +01:00
Matt Sicker
e0100ea3f1 Update logging documentation to include Log4j 2 
This also updates the version numbers provided in the sample pom.xml
snippets for configuring logging for SLF4J and Log4j 1.x. A sample
log4j2.xml file is also given with the same configuration as
demonstrated in the log4j.properties example. The link to the Log4j 1.x
site has been fixed to point to the 1.2 URL (do note that Log4j 1.2 is
end of life and is not compatible with JDK 9+).

See gh-1279
 2017-01-20 16:54:43 +01:00
Sebastien Deleuze
0b08d0a246 Change repositories order to use the right Kotlin dependency 
A bogus pre-release of Kotlin 1.1.0-beta-17 seems to be
in Spring Artifactory cache, this change make Gradle using
the right one from Bintray. Using --refresh-dependencies
may be needed to pick-up the right one.
 2017-01-20 11:12:07 +01:00
Brian Clozel
5203bd13cc Upgrade to Tomcat 8.5.11 2017-01-20 09:53:39 +01:00
Andy Wilkinson
b1fed6f7c8 Only apply dependency-management and propdeps-maven to subprojects 
Previously, the dependency management and propdeps-maven plugins
were being applied to all projects. The latter caused a problem with
publishing to Artifactory as the buildSrc project now had the
propdeps-maven plugin applied to it.

This commit removes the logic that was applying the propdeps-plugin
to all projects so that it's only applied to subprojects excluding
the buildSrc project. The logic that applies the dependency management
plugin has been moved to the same location. It is applied after the
propdeps-maven plugin as, otherwise, the pom customization does not
work correctly and optional dependencies are not included in
generated poms.

Issue: SPR-15167
 2017-01-19 21:38:51 +00:00
Juergen Hoeller
54e2d63d6f Polishing 2017-01-19 21:21:01 +01:00
Juergen Hoeller
69326dbf9a Upgrade to Hibernate ORM 5.2.7 and Rome 1.7.1 2017-01-19 21:20:54 +01:00
Andy Wilkinson
6fe7b176c4 Apply propdeps-maven plugin to ensure the optional deps are in poms 
Issue: SPR-15167
 2017-01-19 17:27:43 +00:00
Kazuki Shimizu
053ac64101 Add "Problem Details for HTTP APIs" media types 
See RFC 7807: Problem Details for HTTP APIs

* application/problem+json
* application/problem+xml

Issue: SPR-15110
 2017-01-19 15:14:35 +01:00