Commit Graph

8395 Commits (cca6a38558673f0491b5ec559be52b97733e7357)
 

Author SHA1 Message Date
Phillip Webb cca6a38558 Updated to Spring Security 4.1.2 SNAPSHOT
See gh-6390
8 years ago
Stephane Nicoll 6d33adc5dd Add "Merging YAML lists" documentation
Add a dedicated section to explain how YAML lists are merged.

See gh-4313
8 years ago
Stephane Nicoll 1d5549ff01 Merge complex types from multiple source correctly
Update PropertySourcesPropertyValues so that source detection logic for
collection values also considers complex types. Prior to this commit
properties of the following form were processed correctly:

	PropertySource-A
	  list[0]=x

	PropertySource-B
	  list[0]=y
	  list[1]=z

But properties of the form were not:

	PropertySource-A
	  list[0].name=x

	PropertySource-B
	  list[0].name=y
	  list[1].name=z

Fixes gh-4313
See gh-2611
8 years ago
Phillip Webb e6f6e83c39 Polish 8 years ago
Phillip Webb d9e8676f77 Merge branch '1.3.x' 8 years ago
Phillip Webb fd6c0029dc Formatting 8 years ago
Andy Wilkinson f84f31b47d Add setReadTimeout and setConnectTimeout to RestTemplateBuilder
Closes gh-6346
8 years ago
Dave Syer 9fdef15d50 Merge branch '1.3.x' 8 years ago
Dave Syer af426d0856 Be more defensive about a null password in Undertow SSL
Fixes gh-6387
8 years ago
Andy Wilkinson 041da3b6cd Document how to configure a component that Hibernate depends upon
Closes gh-6333
8 years ago
Andy Wilkinson bf618d505c Merge branch '1.3.x 8 years ago
Andy Wilkinson b1dd92881d Retry class file upload to remote application that fails to connect
Closes gh-6339
8 years ago
Andy Wilkinson b8ad9537a6 Merge branch '1.3.x 8 years ago
Andy Wilkinson 68fb5789ca Create one SpringApplicationAdminMXBeanRegistrar per context hierarchy
Previously, one SpringApplicationAdminMXBeanRegistrar was created
per context. When there was more then one context this would result
in a javax.management.InstanceAlreadyExistsException being thrown
as an attempt was made to register the MBean more than once.

This commit updates SpringApplicationAdminJmxAutoConfiguration so
that the registrar is only created when there's no such existing bean
in the context hierarchy.

Closes gh-6378
8 years ago
Andy Wilkinson 91df749839 Improve usage of ConcurrentMap
- Call get rather than containsKey then get
- Only call putIfAbsent after get has returned null to avoid unnecessary
  object creation

Closes gh-6382
8 years ago
Stephane Nicoll 6bd7a2fedd Deprecate HornetQ support
Closes gh-6377
8 years ago
Andy Wilkinson 8319291efd Merge pull request #6379 from Adrian Cole
* gh-6379:
  Improves metrics performance by not guarding map.get
8 years ago
Adrian Cole 38e3b39d3b Improves metrics performance by not guarding map.get
ConcurrentHashMap implements `containsKey` with `get`. By removing a
redundant call to `containsKey`, we guarantee better performance in our
counter services.

The geek inside measured this with JMH, and found under 4 threads of
contention, throughput on this check was 40% higher in success case.

Benchmark                                  Mode  Cnt     Score     Error   Units
TestBenchmarks.containsKeyAndGet_success  thrpt   30   432.389 ±  20.616  ops/us
TestBenchmarks.get_success                thrpt   30   606.789 ±  10.848  ops/us

Closes gh-6379
8 years ago
Andy Wilkinson 0792d43a93 Merge branch '1.3.x 8 years ago
Andy Wilkinson 49302b3449 Merge pull request #6381 from Raja Dilip Kolli
* gh-6381:
  Upgrade to Thymeleaf 2.1.5.RELEASE
8 years ago
Raja Dilip Kolli e49ec03215 Upgrade to Thymeleaf 2.1.5.RELEASE
Closes gh-6381
8 years ago
Andy Wilkinson db83e89922 Add support for Thymeleaf 3 while keeping Thymeleaf 2 as the default
Closes gh-4393
8 years ago
Andy Wilkinson 18d99245dd Merge branch '1.3.x 8 years ago
Andy Wilkinson c2db9fa385 Update admin MBean to only be ready when its own context is ready
Previously, if there was a hierarchy of SpringApplications, the admin
MBean would report that the application was ready as soon as any
application in the hierarchy was ready. This could lead to a client
trying to query a property in the environment before it's available.

This commit updates the MBean registrar to that the MBean only reports
that the application is ready when the context that contains the
registrar has refreshed and fired its ApplicationReadyEvent.

Closes gh-6362
8 years ago
Stephane Nicoll bf8a8167aa Merge pull request #6374 from izeye:polish-20160712
* pr/6374:
  Polish
8 years ago
Johnny Lim a9f6ae4422 Polish
Closes gh-6374
8 years ago
Phillip Webb 43afc149a1 Consider WebAppConfiguration in @SpringBootTest
Update SpringBootTestContextBootstrapper to consider the
`@WebAppConfiguration` annotation and use sensible resourceBasePath
defaults.

Fixes gh-6371
8 years ago
Phillip Webb df8dfb093b Fix package tangle in jOOQ sample
Use a custom GeneratorStrategy to fix the package tangles that jOOQ
creates by default.

Fixes gh-6372
8 years ago
Andy Wilkinson 8b987e29c1 Fix spring-boot-gradle-plugin package tangle
Relocate `SpringBootPlugin` to fix a package tangle.

Fixes gh-6355
8 years ago
Phillip Webb 3e62933096 Polish 8 years ago
Andy Wilkinson 8e669e2eef Merge branch '1.3.x 8 years ago
Andy Wilkinson 4963cfd67b Reset thread's interrupted flag when catching InterruptedException
Closes gh-6360
8 years ago
Andy Wilkinson eb995cc07a Add dependency management for jackson-datatype-jaxrs
Closes gh-6369
8 years ago
Stephane Nicoll fcf535901e Polish doc
Closes gh-6008
8 years ago
Stephane Nicoll 9a98113a2c Fix gradle samples replacement regex
Closes gh-6357
8 years ago
Andy Wilkinson 50d2d492ed Merge branch '1.3.x 8 years ago
Andy Wilkinson e53d3167ab Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
8 years ago
Andy Wilkinson c974de0119 Merge branch '1.3.x 8 years ago
Stephane Nicoll 277da462ce Document differences between @Value and @ConfigurationProperties
Closes gh-4892
8 years ago
Andy Wilkinson 5f751fe356 Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
8 years ago
Stephane Nicoll a72e494896 Merge branch '1.3.x' 8 years ago
Stephane Nicoll 78879f4bdb Fix documentation
Closes gh-6358
8 years ago
Stephane Nicoll ca14c06e18 Merge pull request #6365 from artembilan:SI_Java_DSL-1.1.3
* pr/6365:
  Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
8 years ago
Artem Bilan f152111685 Upgrade to Spring Integration Java DSL 1.1.3.RELEASE
Closes gh-6365
8 years ago
Andy Wilkinson 25ba9a56e6 Merge branch '1.3.x 8 years ago
Andy Wilkinson 26a233a870 Upgrade to Hikari 2.4.7
Closes gh-6344
8 years ago
Stephane Nicoll 7f66335e6d Merge pull request #6350 from eddumelendez:spring_security_4.1.1
* pr/6350:
  Upgrade to Spring Security 4.1.1.RELEASE
8 years ago
Eddú Meléndez 8c273c35fa Upgrade to Spring Security 4.1.1.RELEASE
Closes gh-6350
8 years ago
Phillip Webb 629ce6a527 Clarify @EntityScan deprecated Javadoc
Closes gh-6340
8 years ago
Stephane Nicoll 17b71df2dd Merge branch '1.3.x' 8 years ago