1. 30 Sep, 2015 8 commits
    • Andy Wilkinson's avatar
      Merge branch 'gh-3977' · 968caf05
      Andy Wilkinson authored
      968caf05
    • Andy Wilkinson's avatar
      Polish contribution · 64bcba47
      Andy Wilkinson authored
       - Add @author tag
       - Remove unnecessary final modifiers
       - Avoid writing to volatile field when new gauge is used
      
      Closes gh-3977
      64bcba47
    • Jay Anderson's avatar
      Register dropwizard gauges once and then update them · 3fb0ae3e
      Jay Anderson authored
      The previous implementation would remove and add a new Gauge each time
      a metric was written. After this change the Gauge is registered once
      and the value is updated on subsequent calls.
      3fb0ae3e
    • Andy Wilkinson's avatar
      ff5e4631
    • Andy Wilkinson's avatar
      Restore LoggingSystems’ previous cleanup behaviour · a76e84ad
      Andy Wilkinson authored
      This commit reverts the changes made for gh-4026. Those changes updated
      each LoggingSystem to close/stop the underlying logging system as part
      of the clean up processing. Unfortunately, this approach doesn’t work
      in an environment where their are multiple application contexts and
      some have a shorter lifecycle than the “main” application context. In
      such an environment, closing an application context with a shorter
      lifecycle prior to the main application context being closed will
      close/stop the main application context’s logging system as, rather than
      being scoped to an application context, a logging system is shared
      across multiple application contexts. (The exact details of how widely
      shared the logging system is varies between logging systems and, in the
      case of Logback and Log4J2, also depends on which ContextSelector
      implementation is being used.
      a76e84ad
    • Stephane Nicoll's avatar
      Polish d01bc41e · e98aac43
      Stephane Nicoll authored
      Closes gh-2516
      e98aac43
    • Stephane Nicoll's avatar
      Merge pull request #4054 from zhanhb/patch-2 · 8a8c8272
      Stephane Nicoll authored
      * pr/4054:
        Fix typo
      8a8c8272
    • zhanhb's avatar
      Fix typo · b855a68b
      zhanhb authored
      Closes gh-4054
      b855a68b
  2. 29 Sep, 2015 15 commits
  3. 28 Sep, 2015 7 commits
  4. 26 Sep, 2015 8 commits
  5. 24 Sep, 2015 2 commits
    • Andy Wilkinson's avatar
      Simplify Jackson-related auto-configuration for HATEOAS and Data REST · c55900b4
      Andy Wilkinson authored
      This commit simplifies the Jackson-related auto-configuration that’s
      applied when Spring HATEOAS and Spring Data REST are on the classpath.
      
      Previously, Boot used Jackson2HalModule to apply the HAL-related
      ObjectMapper configuration to the context’s primary ObjectMapper. This
      was to allow HAL-formatted responses to be sent for requests accepted
      application/json (see gh-2147). This had the unwanted side-effect of
      polluting the primary ObjectMapper with HAL-specific functionality.
      Furthermore, Jackson2HalModule is an internal of Spring HATEOAS that
      @olivergierke has asked us to avoid using.
      
      This commit replaces the use of Jackson2HalModule with a new approach.
      Now, the message converters of any RequestMappingHandlerAdapter beans
      are examined and any TypeConstrainedMappingJackson2HttpMessageConverter
      instances are modified to support application/json in addition to their
      default support for application/hal+json. This behaviour can be disabled
      by setting spring.hateoas.use-hal-as-default-json-media-type to false.
      This property is named after Spring Data REST’s configuration option
      which has the same effect when using Spring Data REST. The new property
      replaces the old spring.hateoas.apply-to-primary-object-mapper property.
      
      Previously, when Spring Data REST was on the classpath,
      JacksonAutoConfiguration would be switched off resulting in the context
      containing multiple ObjectMappers, none of which was primary.
      
      This commit configures RepositoryRestMvcAutoConfiguration to run after
      JacksonAutoConfiguration. This gives the latter a chance to create its
      primary ObjectMapper before the former adds its ObjectMapper beans to
      the context.
      
      Previously, the actuator’s hypermedia support assumed that the
      HttpMessageConverters bean would contain every HttpMessageConverter
      being used by Spring MVC. When Spring HATEOAS is on the classpath this
      isn’t the case as it post-processes RequestMappingHandlerAdapter beans
      and adds a TypeConstrainedMappingJackson2HttpMessageConverter to them.
      This wasn’t a problem in the past as the primary ObjectMapper, used by a
      vanilla MappingJackson2HttpMessageConverter, was configured with Spring
      HATEOAS’sJackson2HalModule. Now that this pollution has been tidied up
      the assumption described above no longer holds true. MvcEndpointAdvice,
      which adds links to the actuator’s json responses, has been updated
      to look at the HttpMessageConverters of every
      RequestMappingHandlerAdapter when it’s trying to find a converter to
      use to write a response with additional hypermedia links.
      
      Integration tests have been added to spring-boot-actuator to ensure
      that the changes described above have not regressed the ability to
      configure its json output using spring.jackson.* properties (see
      gh-1729).
      
      Closes gh-3891
      c55900b4
    • Phillip Webb's avatar
      Fix checkstyle errors · 028fc047
      Phillip Webb authored
      028fc047