Commit Graph

50613 Commits

Author SHA1 Message Date
Dave Syer
9db86bbd2a Lookup metadata bean from context instead of injecting
That way, if there is one, it will always be the right one
(otherwise you might be processing teh parent context with
metadata from the child).

Fixes gh-1982
2014-11-23 11:16:45 +00:00
Dave Syer
f21d58ada7 Use constructor injection for Jersey sample 2014-11-23 07:27:49 +00:00
Dave Syer
9f7bd0cddc Inject ResourceConfig instance (not class) into Jersey
If you inject the class (via a servlet parameter) it seems that
Jersey tries to create all the beans for you (and fails). I thought
it was supposed to work (according to the docs), so I'm a bit confused
but the sample now has Spring DI and the tests pass.

Fixes gh-1981
2014-11-22 17:17:53 +00:00
Phillip Webb
e56a1ba561 Refine inner class detection algorithm
Update the ConfigurationMetadataAnnotationProcessor nested class
algorithm to prevent inner classes being added as both groups and
properties.

Fixes gh-1975
2014-11-21 14:16:37 -08:00
Phillip Webb
2a9a749329 Polish 2014-11-21 13:27:19 -08:00
Phillip Webb
5220f584db Revert spring-boot-configuration-metadata for now
See gh-1970
2014-11-21 11:43:34 -08:00
Stephane Nicoll
2f4a46a180 Associate logging.* properties to group 2014-11-21 17:43:32 +01:00
Stephane Nicoll
2b19955cee Remove useless System.out.println 2014-11-21 17:39:42 +01:00
Stephane Nicoll
7b4de0921f Remove useless @ConfigurationProperties
Fixes gh-1972
2014-11-21 17:39:12 +01:00
Stephane Nicoll
32efff3f30 Avoid creating a nested group for an Enum
Previously, an Enum that is defined as an inner class of a
@ConfigurationProperties pojo was wrongly detected as an nested group.

This case is now handled explicitly and covered by a test.

Fixes gh-1971
2014-11-21 17:20:35 +01:00
Stephane Nicoll
5f673c9e84 Fix usage of putIfAbsent 2014-11-21 16:13:26 +01:00
Stephane Nicoll
0f64a04780 Add easy way to consume configuration metadata
Add a companion module that IDE developers can use to read configuration
metadata from multiple sources into a single repository.

ConfigurationMetadataRepository provides access to groups and items as
well as an harmonized view on "sources" (that is the POJOs that have
contributed to a given group).

Closes gh-1970
2014-11-21 16:02:04 +01:00
Dave Syer
5b044356dc Clarify the deprecation status of HttpMapperProperties 2014-11-21 09:19:32 +00:00
Phillip Webb
08988fd182 Update docs about Jetty 9 and Tomcat 8
Fixes gh-1951
2014-11-20 17:55:15 -08:00
Phillip Webb
70a1438c6f Don't replace MappingJackson2HttpMessageConverter
Guard against Spring Data REST TypeConstrained Jackson converters
replacing the default MappingJackson2HttpMessageConverter.

Fixes gh-1968
2014-11-20 17:36:55 -08:00
Phillip Webb
bf0629522c Only use Gson if Jackson is missing
Update HttpMessageConvertersAutoConfiguration to only register Gson
support when Jackson is not on the classpath.

Fixes gh-1967
2014-11-20 17:21:25 -08:00
Phillip Webb
2b57c5a4dd Rename spring.data.mongo.repositories.enabled
Rename mongo to mongodb.

Fixes gh-1966
2014-11-20 14:57:49 -08:00
Phillip Webb
670ba33bec Improve MongoDataAutoConfiguration
Update MongoDataAutoConfiguration to provide easier configuration of
CustomConversions, the MappingMongoConverter, MongoMappingContext
and an authentication database.

Fixes gh-1619
Fixes gh-1730
2014-11-20 14:55:19 -08:00
Phillip Webb
eb035398b2 Add SqlScriptsTestExecutionListener
Update @IntegrationTest to include SqlScriptsTestExecutionListener.

Fixes gh-1965
2014-11-20 12:12:27 -08:00
Phillip Webb
2a8579026f Polish 2014-11-20 10:16:33 -08:00
Phillip Webb
182ce21542 Clarify configuration meta-data details
Update the configuration meta-data appendix to clarify a few things.
2014-11-20 10:07:02 -08:00
Phillip Webb
460bf7108d Merge branch '1.1.x' 2014-11-20 10:06:12 -08:00
Michael Freedman
3bad634915 Fix copy in README
(cherry picked from commit d4bf221f)
2014-11-20 10:02:38 -08:00
Dave Syer
cd092e02dc Remove unecessary Jackson dependency in trace filter 2014-11-20 17:53:38 +00:00
Dave Syer
08ddbe79cd Add GsonJsonParser 2014-11-20 17:53:38 +00:00
Stephane Nicoll
ab6878ab66 Add documentation for the deprecated field 2014-11-20 18:37:34 +01:00
Stephane Nicoll
3f3d9b992b Merge pull request #1963 from mikfreedman/master
* pull1963:
  fix copy in README
  Disable check of Groovy template location by default for CLI apps
2014-11-20 16:19:52 +01:00
Michael Freedman
d4bf221fd4 fix copy in README 2014-11-20 10:16:34 -05:00
Andy Wilkinson
0e2300cf85 Disable check of Groovy template location by default for CLI apps
In 1.1, the Groovy template support did not check that its configured
template location exists. A check was added in 1.2, however this
breaks CLI web applications that don't have the expected templates
location.

Rather than reintroducing 1.1's behaviour by removing the check, this
commit updates the CLI to set
spring.groovy.template.check-template-location to false by default.
This allows flow-blown applications to benefit from the check, while
allowing CLI apps to behave as they did in 1.1.

Closes gh-1959
2014-11-20 14:09:51 +00:00
Stephane Nicoll
11894a5412 Fix manual metadata format inconsistency
Fixes gh-1961
2014-11-20 13:58:39 +01:00
Dave Syer
689d49021b Merge branch '1.1.x' 2014-11-20 12:39:17 +00:00
Dave Syer
12a7df6c40 Be defensive about classloader in MessageSourceAutoConfiguration
Fixes gh-1960
2014-11-20 12:29:16 +00:00
Brian Clozel
404153a758 Minor fixes in howto documentation re:SSL config
Fixes a couple of typos in the documentation:
* `x-forwarded-protocol` is not the standard name for this header
* `require_https` is not an existing property, but rather `require_ssl`
2014-11-20 13:27:27 +01:00
Dave Syer
23e7028abb Ensure java.io.tmpdir is available before using it
Some environments do not have a tmpdir so it can be null.
2014-11-20 12:01:24 +00:00
Andy Wilkinson
d0f43d2e2b Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
	spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
2014-11-20 10:50:34 +00:00
Andy Wilkinson
59ebc3b320 When Logback is the logging system, ensure that JBoss logging uses it
Previously, if Logback was being used as Boot's logging system, but
Log4J was also on the classpath before SLF4J and Logback, JBoss
Logging would use Log4J for its logging. This lead to warning messages
being produced as Log4J was not configured:

log4j:WARN No appenders could be found for logger (org.jboss.logging).
log4j:WARN Please initialize the log4j system properly.

This commit updates LogbackLoggingSystem to set the
org.jboss.logging.provider to "slf4j". This ensure that JBoss Logging
will use SLF4J and Logback as intended even when Log4J is also on the
classpath.

Closes gh-1928
2014-11-20 10:41:43 +00:00
Phillip Webb
f75b266d64 Add 'deprecated' field to configuration meta-data
Update the ConfigurationMetadataAnnotationProcessor to detect the
@Deprecated annotation on getters or setters.

Fixes gh-1846
2014-11-19 14:15:35 -08:00
Phillip Webb
31253d0d76 Merge pull request #1931 from juzer/master
* pull1931:
  Fixed potential ClassCastException getting error
2014-11-19 13:37:09 -08:00
juzer
428d2caac1 Fixed potential ClassCastException getting error
Update DefaultErrorAttributes to expect a `Throwable` ERROR_ATTRIBUTE
rather than an `Exception`.

Fixes gh-1931
2014-11-19 13:36:57 -08:00
Phillip Webb
c34cfb27a3 Polish 2014-11-19 10:52:26 -08:00
Phillip Webb
b53d72e930 Restore Java 1.6 version 2014-11-19 10:04:59 -08:00
Phillip Webb
3a4d62fb3a Gracefully ignore placeholder exceptions
Update BeanTypeRegistry to gracefully ignore LoadBeanClassException and
BeanDefinitionStoreException exceptions in the same way as
DefaultListableBeanFactory.doGetBeanNamesForType() does.

Fixes gh-1955
2014-11-19 09:59:14 -08:00
Dave Syer
7fa0ea7c3b Add support for spring.jersey.type=filter
Fixes gh-1756
2014-11-19 16:51:55 +00:00
Dave Syer
3a4f1f6f39 Attempt to get Jersey working as filter 2014-11-19 15:57:31 +00:00
Stephane Nicoll
8f488bd019 Update init to new metadata format
Spring initializr now declares an improved metadata format (v2).

InitializrServiceMetadata has been updated to parse this format. Note
that the client could be further improved by using HAL generated links.

Closes gh-1953
2014-11-19 16:38:53 +01:00
Dave Syer
ae23ba13b5 Fix for Java < 1.8
Uses raw class instead of Java Type API (which has a
default method in 1.8, unavailble in 1.7).
2014-11-19 15:36:28 +00:00
Dave Syer
5d2d39e87d Add EndpointHandlerMappingCustomizer callback
Users can add @Beans of this type to customize the
EndpointHandlerMapping (e.g. add interceptors) even if
it is in a child context.

Fixes gh-1933
2014-11-19 15:21:55 +00:00
Dave Syer
1254508357 Fix tests some more
Eclipse (by default) does not create the JSON metadata when
it compiles the @ConfigurationProperties beans. So running on
the command lilne gets scarily different than in an IDE. Fixed
by externalizing the metadata location and setting it to something
empty in the tests.
2014-11-19 15:08:48 +00:00
Andy Wilkinson
90af8bf54a Add auto-configuration for Jetty 9's WebSocket support
Closes gh-1269
2014-11-19 14:44:54 +00:00
Dave Syer
0757d24d91 Fix /configprops tests 2014-11-19 14:33:49 +00:00