Commit Graph

8377 Commits

Author SHA1 Message Date
Stephane Nicoll 6dd8e71d06 Merge pull request #5855 from mp911de:issue/cassandra-schema-action
* pr/5855:
  Polish "Add schemaAction property"
  Add schemaAction property to CassandraProperties
2016-06-28 10:22:13 +02:00
Stephane Nicoll 397c64d256 Polish "Add schemaAction property"
Closes gh-5855
2016-06-28 10:21:48 +02:00
Mark Paluch e85cb2c4c5 Add schemaAction property to CassandraProperties
Set schemaAction property in CassandraSessionFactoryBean. Use relaxed
property resolver for enum lookup of the configured schemaAction.

See gh-5855
2016-06-28 10:21:24 +02:00
Andy Wilkinson 4386732376 Merge pull request #6072 from Misagh Moayyed
* gh-6072:
  Polish “Allow connection timeout to be configured via the environment”
  Allow connection timeout to be configured via the environment
2016-06-27 16:57:37 +01:00
Andy Wilkinson 94ba6bdae2 Polish “Allow connection timeout to be configured via the environment”
- Preserve default connection timeout when server.connection-timeout
   has not been set
 - Apply standard coding conventions and formatting

See gh-6072
2016-06-27 16:56:16 +01:00
Misagh Moayyed 6007d7efc1 Allow connection timeout to be configured via the environment
Closes gh-6072
2016-06-27 16:56:16 +01:00
Stephane Nicoll 9891eb5432 Merge pull request #6018 from venilnoronha:issue-5982-fix
* pr/6018:
  Polish "Add ability to filter cookies in trace data"
  Add ability to filter cookies in trace data
2016-06-27 16:41:47 +02:00
Stephane Nicoll 84b2ff5c38 Polish "Add ability to filter cookies in trace data"
Closes gh-6018
2016-06-27 16:41:10 +02:00
Venil Noronha fde5e1b6a5 Add ability to filter cookies in trace data
See gh-6018
2016-06-27 15:43:47 +02:00
Stephane Nicoll 0de5988c0e Use Mongo 3.0 specific API
See gh-6176
2016-06-27 15:28:08 +02:00
Stephane Nicoll 958a0a45f1 Merge branch '1.3.x' 2016-06-27 15:21:03 +02:00
Stephane Nicoll 779537551e Merge pull request #6176 from magiccrafter:master
* pr/6176:
  Polish "Use missing MongoClientOptions in MongoProperties"
  Use missing MongoClientOptions in MongoProperties
2016-06-27 15:17:44 +02:00
Stephane Nicoll 4e07003e1d Polish "Use missing MongoClientOptions in MongoProperties"
Closes gh-6176
2016-06-27 15:14:24 +02:00
Nasko Vasilev 59f9cfb8a6 Use missing MongoClientOptions in MongoProperties
See gh-6176
2016-06-27 15:14:08 +02:00
Stephane Nicoll 33b1f52fa5 Merge branch '1.3.x' 2016-06-27 14:56:26 +02:00
Stephane Nicoll 13403a0f72 Merge pull request #6203 from julien-may:1.3.x
* pr/6203:
  Polish "Add condition on MongoClientFactoryBean"
  Add condition on MongoClientFactoryBean
2016-06-27 14:56:03 +02:00
Stephane Nicoll 7a5fabf59d Polish "Add condition on MongoClientFactoryBean"
Closes gh-6203
2016-06-27 14:55:47 +02:00
Julien May 2003c5e1ae Add condition on MongoClientFactoryBean
This commit makes sure that the condition that links a `MongoClient` to
the embedded mongo server kicks in only if `MongoClientFactoryBean` is
also on the classpath.

Previously, only a condition on the mongo driver existed, leading to
`ClassNotFoundException` if Spring Data MongoDB wasn't available.

See gh-6203
2016-06-27 14:39:20 +02:00
Stephane Nicoll 5656e83ba9 Enable logging of resolved exceptions
Previously, if an exception was resolved by a `HandlerExceptionResolver`
nothing the log indicated a failure to process the query.

This commit adds a new property `spring.mvc.log-resolved-exception` that
enables warning logs for supported `HandlerExceptionResolver` instances.

When Devtools is enabled, this flag is enabled by default.

Closes gh-2176
2016-06-27 14:37:44 +02:00
Andy Wilkinson 1175879fcc Merge pull request #6057 from Alex Antonov
* gh-6057:
  Polish “Allow management server SSL to be configured independently”
  Allow management server SSL to be configured independently
2016-06-27 13:25:02 +01:00
Andy Wilkinson 618535f576 Polish “Allow management server SSL to be configured independently”
This commit polishes b0fbc7e, throwing an exception when an attempt is
made to configure management-specific SSL without also configuring a
custom management port. The testing of management-specific SSL
configuration has also been improved.

See gh-6057
Closes gh-4810
2016-06-27 13:24:42 +01:00
Alex Antonov 3546ae399e Allow management server SSL to be configured independently
Closes gh-6057
2016-06-27 13:24:42 +01:00
Stephane Nicoll 5840a69150 Merge pull request #6234 from izeye:polish-20160627
* pr/6234:
  Polish
2016-06-27 14:19:49 +02:00
Johnny Lim 301574de09 Polish
Closes gh-6234
2016-06-27 14:19:26 +02:00
Stephane Nicoll 3151df624a Fix build failure 2016-06-27 12:12:07 +02:00
Stephane Nicoll e9fb51bdd7 Fix test 2016-06-27 12:08:48 +02:00
Stephane Nicoll 6631136f91 Merge branch '1.3.x' 2016-06-27 12:08:04 +02:00
Stephane Nicoll 17f8a244de Fix property names with successive capital letters
Previously, if a property name had successive capital letters, the
generated meta-data would clean it in such a way it is defined as a
regular word. For instance a `myFOO` property would be written as
`my-foo` in the meta-data.

It turns out this decision is wrong as the binder has no way to compute
back the name of the property and therefore `my-foo` wouldn't bind to
`setMyFOO` as it should.

This commit updates the meta-data name generation algorithm to properly
identify such cases: `myFOO` now translates to `my-f-o-o`. While the
generated name is a bit ugly, it now provides a consistent binding
experience.

Closes gh-5330
2016-06-27 12:02:34 +02:00
Phillip Webb a5cddf79a8 Reduce JarURLConnection allocations
Update JarURLConnection & Handler so that a shared static final
connection is returned for entries that cannot be found.

See gh-6215
2016-06-26 08:40:25 -07:00
Phillip Webb 44b7f29ee3 Merge branch 'gh-6142'
Closes gh-6142
2016-06-24 13:33:57 -07:00
Phillip Webb e8d4d0e2b1 Drop Neo4J SessionFactoryProvider
Remove SessionFactoryProvider since it's no longer needed for
auto-configuration.

See gh-6142
2016-06-24 12:49:13 -07:00
Phillip Webb 654801083b Provide unified @EntityScan annotation
Add a new `@EntiyScan` annotation that's used by auto-configuration to:
* Set JPA packagesToScan.
* Set Neo4J's SessionFactory packages.
* Set the initial entity set for Spring Data MongoDB, Cassandra and
  Couchbase mapping contexts.

Additionally deprecate `@org.springframework.boot.orm.jpa.EntityScan`.

See gh-6142
2016-06-24 12:49:12 -07:00
Phillip Webb 5d59193a09 Remove @NodeEntityScan annotation
Remove `@NodeEntityScan` in preparation for a unified `@EntityScan`
annotation.

See gh-6142
2016-06-24 12:49:12 -07:00
Phillip Webb 15670b8e28 Relocate Neo4J auto-configuration
Move Neo4J auto-configuration from `autoconfigure.neo4j` to
`autoconfigure.data.neo4j` since it's intrinsically linked to Spring
Data.

See gh-5458
See gh-6142
2016-06-24 12:49:11 -07:00
Phillip Webb c22a0e90a2 Polish 2016-06-24 11:52:43 -07:00
Andy Wilkinson 0d207d438a Improve the performance of JarURLConnection
This commit improves the performance of JarURLConnection. There are two
main changes:

Firstly, the way in which the spec is determined has been changed so
that it’s no longer necessary to create an absolute file. Instead,
the JarFile’s pathFromRoot is used to extract the spec from the URL
relative to the JarFile.

Secondly, the number of temporary Objects that are created has been
reduced, for example by tracking an index as we process a String
rather than creating a new substring for each iteration.

See gh-6215
2016-06-24 16:14:33 +01:00
Andy Wilkinson 9788a7bdda Merge branch '1.3.x' 2016-06-24 11:53:01 +01:00
Andy Wilkinson 8d491f278b Create FilePermission lazily in JarURLConnection
JarURLConnection is very performance sensitive. The change in 3772d9f
meant that every JarURLConnection would create a FilePermission,
irrespective of whether it was actually used.

This commit updates JarURLConnection to create its FilePermission
lazily. When there is no security manager a permission will no longer
be created at all.

Closes gh-5411
See gh-6215
2016-06-24 11:49:35 +01:00
Phillip Webb bdb0eb29a3 Cache JarURLConnection absoluteFile lookups
Update JarURLConnection.getNormalizedFileUrl so that expensive absolute
file lookups are cached.

See gh-6177
See gh-6109
2016-06-23 14:30:10 -07:00
Phillip Webb b03d8a5914 Skip antlib integration tests on -DskipTests 2016-06-23 14:29:11 -07:00
Andy Wilkinson 93307bbd5b Merge branch '1.3.x' 2016-06-23 12:59:55 +01:00
Andy Wilkinson 17546628f5 Remove springloaded from samples
springloaded isn't required in any of the samples, yet some of them
make use of it without being a springloaded-specific sample. This
is creating the false impression that springloaded is necessary in
cases where it's not.
2016-06-23 12:58:42 +01:00
Stephane Nicoll fda2505be6 Fix checkstyle violations 2016-06-23 11:14:28 +02:00
Stephane Nicoll cfe1fe8736 Merge branch '1.3.x' 2016-06-23 10:44:55 +02:00
Stephane Nicoll bffcb1aad2 Document available layouts
Closes gh-5524
2016-06-23 10:42:47 +02:00
Stephane Nicoll 2dc6e5b6fa Refactor Jest auto-configuration package space
This commit moves the Jest auto-configuration from `spring.jest` to
`spring.elasticsearch.jest`

Closes gh-6032
2016-06-23 10:39:16 +02:00
Phillip Webb 5182bc4f2b Improve startup times
Improve startup times (although not by much) by adding more background
pre-initializers and lazily evaluating the whitelabel SpEL view.

See gh-6177
2016-06-22 20:37:59 -07:00
Stephane Nicoll 0107d1134a Merge pull request #6202 from izeye:error
* pr/6202:
  Remove unnecessary constructor
2016-06-22 14:03:12 +02:00
Johnny Lim e0389cb9d8 Remove unnecessary constructor
Closes gh-6202
2016-06-22 14:02:37 +02:00
Andy Wilkinson a395679b95 Fix JarURLConnectionTests on Windows
Closes gh-6109
2016-06-22 10:02:42 +01:00