Juergen Hoeller
4fa4886e70
Consistent trace log messages and general polishing
...
(cherry picked from commit 5626384
2015-12-16 17:38:08 +01:00
Brian Clozel
46016d090b
Use LinkedHashmap to preserve insert order
...
In several places in the spring-webmvc module, URL patterns / objects
relationships are kept in `HashMap`s. When matching with actual URLs,
the algorithm uses a pattern comparator to sort the matching patterns
and select the most specific. But the underlying collection
implementation does not keep the original order which can lead to
inconsistencies.
This commit changes the underlying collection implementation to
`LinkedHashmap`s, in order to keep the insert order if the comparator
does not reorder entries.
Issue: SPR-13798
(cherry picked from commit 3be35c0
2015-12-16 17:34:34 +01:00
Juergen Hoeller
241dfbf855
Polishing
...
(cherry picked from commit 9e03e0e
2015-12-15 12:55:02 +01:00
Juergen Hoeller
bc492b9251
Defensive error reporting when StandardAnnotationMetadata introspects declared methods
...
Issue: SPR-13791
(cherry picked from commit a36c0a5
2015-12-14 15:57:45 +01:00
Juergen Hoeller
8c8380715d
Polishing (backported from master)
2015-12-14 00:47:33 +01:00
Andy Clement
b64d752906
Fix SpEL compilation of static method/property/field operations
...
Before this change the compilation of a method reference or property/field
access was not properly cleaning up the stack if compilation meant
calling a static method or accessing a static field. In these cases there
is no need for a target object on the stack and it should be removed if
present. For a simple expression it is harmless since the end result of
the expression is the thing on the top of the stack, but for nested
expressions if the inner expression suffered this issue, the outer
expression can find itself operating on the wrong element.
The particular issue covered the case of a static field access but this
fix (and associated tests) cover static method, property and field access.
Issue: SPR-13781
(cherry picked from commit a28fc76
2015-12-14 00:41:39 +01:00
Juergen Hoeller
1d0c2f6f0e
Polishing
...
(cherry picked from commit ca9a078
2015-12-10 00:57:06 +01:00
Juergen Hoeller
4b27a6ddee
SimpAnnotationMethodMessageHandler ignores empty marker annotations
...
Issue: SPR-13704
(cherry picked from commit f119962
2015-12-10 00:55:52 +01:00
Juergen Hoeller
3403e8d843
Jdbc4SqlXmlHandler returns null as documented (instead of throwing NPE)
...
Issue: SPR-13782
(cherry picked from commit 78dad4c
2015-12-09 16:19:27 +01:00
Juergen Hoeller
d573bbc6b8
Polishing
2015-12-09 15:00:35 +01:00
Stephane Nicoll
f7492348ba
Polish cache javadoc
...
Issue: SPR-13746
(cherry picked from commit 34b596c
2015-12-09 14:52:28 +01:00
Juergen Hoeller
e4faaa3786
Reset BytesMessage after payload extraction
...
Issue: SPR-13769
(cherry picked from commit 8346eed
2015-12-09 14:50:56 +01:00
Juergen Hoeller
d04f785094
Introduced createMethodJmsListenerEndpoint template method
...
Issue: SPR-13774
(cherry picked from commit 9589749
2015-12-09 14:50:32 +01:00
Juergen Hoeller
e37b75b165
Upgrade to Tomcat 8.0.30
2015-12-07 21:35:00 +01:00
Juergen Hoeller
f54aac1003
Polishing
2015-12-07 19:44:07 +01:00
Juergen Hoeller
c2fed6e7f1
StatementCreatorUtils detects Microsoft SQL Server driver 4.0 as well
...
Issue: SPR-13772
(cherry picked from commit d2ad2c3
2015-12-07 19:20:04 +01:00
Juergen Hoeller
242acda970
Javadoc fixes
...
Issue: SPR-13765
2015-12-07 19:19:33 +01:00
Juergen Hoeller
66c44524d7
AbstractRequestLoggingFilter unwraps request to find ContentCachingRequestWrapper
...
Issue: SPR-13764
(cherry picked from commit b1ef6ec
2015-12-07 19:17:01 +01:00
Juergen Hoeller
0230c49a82
AnnotationConfigWebApplicationContext allows for custom AnnotatedBeanDefinitionReader/ClassPathBeanDefinitionScanner
...
Issue: SPR-9324
(cherry picked from commit 20beace
2015-12-07 19:15:39 +01:00
Rossen Stoyanchev
f7f801c501
Configure view controllers with ApplicationContext
...
Issue: SPR-13762
2015-12-04 13:21:38 -05:00
Juergen Hoeller
83c9ec43da
Efficient and consistent setAllowedOrigins collection type
...
Issue: SPR-13761
(cherry picked from commit 3d1ae9c
2015-12-04 18:51:02 +01:00
Juergen Hoeller
d03d8cb456
WebSocket namespace consistently applies resolvable allowed-origins value
...
Issue: SPR-13760
(cherry picked from commit cd4ce87
2015-12-04 17:05:20 +01:00
Juergen Hoeller
6963e27c7a
ControllerAdviceBean accepts bean types without @ControllerAdvice annotation (as in 3.2)
...
Issue: SPR-13759
(cherry picked from commit d64ac32
2015-12-04 17:03:28 +01:00
Juergen Hoeller
7a7877040f
Polishing
2015-12-03 21:18:58 +01:00
Juergen Hoeller
e38cea610c
Polishing
2015-12-03 13:35:13 +01:00
Juergen Hoeller
57d980130e
Avoid mismatch between cached top-level versus nested parameter type
...
Issue: SPR-13755
(cherry picked from commit c909789
2015-12-03 13:35:06 +01:00
Rossen Stoyanchev
ff8bbc93f3
lastSessionCheckTime updated after session check
...
Issue: SPR-13745
2015-12-02 15:29:23 -05:00
Juergen Hoeller
6f11d4f06c
Backported fix for lower-case media type lookups
...
Issue: SPR-13747
2015-12-02 14:42:40 +01:00
Brian Clozel
f53d01b00a
Do not rewrite relative links with FixedVersionStrategy
...
Prior to this change, the resource handling FixedVersionStrategy would
be applied on all links that match the configured pattern. This is
problematic for relative links and can lead to rewritten links such as
"/fixedversion/../css/main.css" which breaks.
This commit prevents that Strategy from being applied to such links.
Of course, one should avoid to use that VersionStrategy with relative
links, but this change aims at not breaking existing links even if it
means not prefixing the version as expected.
Issue: SPR-13727
(cherry picked from commit c226753
2015-12-02 14:29:07 +01:00
Juergen Hoeller
b3eefa2ae0
Documented units for send-time limit and buffer-size limit
...
Issue: SPR-13753
(cherry picked from commit 747863d
2015-12-02 14:09:29 +01:00
Juergen Hoeller
5ac42bf9f8
Fixed formatting in AOP documentation
...
Issue: SPR-13750
2015-12-02 14:08:16 +01:00
Juergen Hoeller
79ded1ca72
MockHttpServletResponse.setIntHeader supports 'Content-Length' header as well
...
Issue: SPR-13752
(cherry picked from commit a4f5c46
2015-12-02 14:07:15 +01:00
Juergen Hoeller
fad0c9589d
Latest applicable dependency updates (JOpt Simple 4.9, C3P0 0.9.5.1, H2 1.4.190, HSQLDB 2.3.3)
2015-12-01 21:03:55 +01:00
Juergen Hoeller
85863a5442
Polishing
2015-12-01 19:16:16 +01:00
Juergen Hoeller
948ab21f43
Aligned class name quoting with ConversionFailedException
...
(cherry picked from commit 7589c1f
2015-12-01 19:16:11 +01:00
Juergen Hoeller
c56d1a6677
Document destruction callback behavior for inner beans in case of scope mismatch
...
Issue: SPR-13739
(cherry picked from commit 998da2f
2015-11-30 22:16:18 +01:00
Juergen Hoeller
e6d3c28ec2
Avoid instantiation of non-selected beans in BeanFactoryAnnotationUtils.qualifiedBeanOfType
...
Issue: SPR-13741
(cherry picked from commit 8ed2c47
2015-11-30 22:03:25 +01:00
Juergen Hoeller
a730b6e1aa
Backported exception message refinements from 4.2.x
2015-11-30 12:24:38 +01:00
Juergen Hoeller
6c4f0a4d9f
Backported conversion service test updates from 4.2.x
2015-11-30 12:18:56 +01:00
Juergen Hoeller
3bc2a97776
Unit tests for @Value Resource resolution
...
Issue: SPR-13731
(cherry picked from commit def1034
2015-11-30 12:11:15 +01:00
Juergen Hoeller
ce315b223e
Upgrade to Tomcat 8.0.29 and SLF4J 1.7.13
2015-11-27 13:52:20 +01:00
Juergen Hoeller
5bfa82db12
Javadoc fixes
...
(cherry picked from commit 9bb72e8
2015-11-27 13:51:51 +01:00
Juergen Hoeller
97148ce889
Polishing
2015-11-26 01:10:31 +01:00
Andy Clement
e410129aaf
Ensure cast correctly included for OpPlus compilation
...
When the plus operator is used between strings in a SpEL
expression and that expression is compiled, it is
important to include a cast if computation of any of
the operands isn't obviously leaving strings on the
stack. Likewise if the stack contents are known to
be strings, a cast should not be included.
Issue: SPR-12426
(cherry picked from commit 58756b0
2015-11-26 01:10:04 +01:00
Juergen Hoeller
55494362ef
SimpAnnotationMethodMessageHandler skips template variable check in case of no pattern
...
Issue: SPR-13704
(cherry picked from commit e8417ea
2015-11-26 01:09:57 +01:00
Juergen Hoeller
393e36c29e
Latest applicable server engine updates (Jetty 9.2.14, Netty 4.0.33, Undertow 1.1.9)
2015-11-15 00:25:20 +01:00
Juergen Hoeller
5a95156dcc
Fixed class name in debug log message
2015-11-14 23:58:27 +01:00
Juergen Hoeller
71fc2ba174
Polishing
2015-11-14 23:32:36 +01:00
Juergen Hoeller
48838d48d2
Fixed various code examples in documentation
...
Issue: SPR-13666
Issue: SPR-13485
Issue: SPR-10474
2015-11-14 23:32:07 +01:00
Juergen Hoeller
5d6aab34cb
Reduced warn log entry without stacktrace for startup exceptions
...
Also, AbstractApplicationContext.isRunning avoids IllegalStateException now.
Issue: SPR-13663
Issue: SPR-13667
2015-11-14 23:27:20 +01:00
