Commit Graph

9642 Commits

Author SHA1 Message Date
Stephane Nicoll 4b23528eb4 Merge pull request #6613 from eddumelendez:gh-6610
* pr/6613:
  Polish contribution
  Add support for multiple beans in the Flyway and Liquibase endpoints
2016-12-22 11:45:51 +01:00
Stephane Nicoll 5d909a969f Polish contribution
Closes gh-6613
2016-12-22 11:44:49 +01:00
Eddú Meléndez 53d25999f3 Add support for multiple beans in the Flyway and Liquibase endpoints
Closes gh-6610
See gh-6613
2016-12-22 11:44:12 +01:00
Stephane Nicoll eb294956d8 Allow to customize Cluster.Builder rather than Cluster
Rework cb3d14a so that the customizer operates on the Builder rather than
the Cluster. The former exposes many more options.

See gh-7320
Closes gh-7669
2016-12-22 10:32:54 +01:00
Phillip Webb 78ee8637bc Merge pull request #7718 from artembilan/GH-2037
* pr/7718:
  Polish @IntegrationComponentScan auto-configuration
  Add @IntegrationComponentScan auto-configuration
2016-12-21 22:22:51 -08:00
Phillip Webb 982f41b70c Polish @IntegrationComponentScan auto-configuration
See gh-2037
See gh-7718
2016-12-21 22:22:50 -08:00
Artem Bilan a79f71cbe8 Add @IntegrationComponentScan auto-configuration
Update Spring Integration auto-configuration so that
`@IntegrationComponentScan` from `AutoConfigurationPackages` is
implicitly applied. Prior to this commit `@MessagingGateway` interfaces
would only get picked up if `@IntegrationComponentScan` was added
alongside with the `@SpringBootApplication`.

Fixes gh-2037
Closes gh-7718
2016-12-21 20:18:07 -08:00
Phillip Webb 02917ff00a Merge pull request #7722 from artembilan/IntegrationManagement
* pr/7722:
  Polish Spring Integration metrics support
  Refactor Spring Integration metrics support
2016-12-21 20:18:06 -08:00
Phillip Webb b87e02dde0 Polish Spring Integration metrics support
See gh-7722
2016-12-21 20:18:06 -08:00
Artem Bilan d69e43b433 Refactor Spring Integration metrics support
Update Spring Integration metrics support since Spring Integration
`4.3.6`+ no longer needs `spring-integration-jmx` enable
`MessageChannel`, `MessageHandler` and `MessageSource` metrics.

- Add `IntegrationManagementConfiguration` conditional auto-configuration
  to provide `@EnableIntegrationManagement` when JMX is `enabled` or there
  is no `IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME` bean.
  By default this bean doesn't exist and you explicitly should declare it
  (e.g. via `@EnableIntegrationManagement`) if you would like to collect
  metrics. At the same time Spring Integration enables it when JMX
  management is present (that is a purpose of that new
  `IntegrationManagementConfiguration`)

- Change `SpringIntegrationMetricReader` to read metrics from the
  `IntegrationManagementConfigurer`, not `IntegrationMBeanExporter`

- Change `PublicMetricsAutoConfiguration` to register
  `IntegrationManagementConfigurer.MANAGEMENT_CONFIGURER_NAME` bean if
  not present. Since we are here in `actuator`, therefore we are
  interested in the metrics for SI as well.

- Since we don't need JMX for the metrics any more, remove SI-JMX
  dependency from the `spring-boot-starter-integration`.

- Remove `IntegrationManagementConfiguration` modification from the
  `integrationMbeanExporter()`, since that looks like mutation of an
  external object, when end-user would prefer their own options.
  Therefore we don't need `ObjectProvider<IntegrationManagementConfigurer>`, too

- Add missed `MessageSourceMetrics` gathering for the
  `SpringIntegrationMetricReader`

Closes gh-7722
2016-12-21 20:18:06 -08:00
Phillip Webb 2e0f87e753 Merge pull request #7723 from artembilan/KafkaPropertiesTypes
* pr/7723:
  Fix typo in Kafka sample
  Fix compatibility with Apache Kafka 0.10.1
2016-12-21 20:18:05 -08:00
Artem Bilan c700cf28cc Fix typo in Kafka sample 2016-12-21 20:18:05 -08:00
Phillip Webb f21e7940ba Merge pull request #7714 from izeye/polish-20161221
* pr/7714:
  Polish
2016-12-21 20:18:04 -08:00
Artem Bilan 28474aa30a Fix compatibility with Apache Kafka 0.10.1
Update KafkaProperties since  Apache Kafka `0.10.1` changed the type
for the `ConsumerConfig.AUTO_COMMIT_INTERVAL_MS_CONFIG` from the
`Long` to `Integer`.

Kafka includes the following conversion logic:

    case LONG:
        if (value instanceof Integer)
            return ((Integer) value).longValue();
        if (value instanceof Long)
            return (Long) value;
        else if (value instanceof String)
            return Long.parseLong(trimmed);

So we remain compatible with both `0.10.0` and `0.10.1`

Closes gh-7723
2016-12-21 20:18:04 -08:00
Johnny Lim e12b4a944f Polish 2016-12-21 20:18:04 -08:00
Phillip Webb 4aac1e3f90 Refine LoggingApplicationListenerTests
Update the Tomcat logging test to be more like the real scenario.

See gh-7639
2016-12-21 20:18:03 -08:00
Phillip Webb 765fd1dca0 Merge branch '1.4.x' into 1.5.x 2016-12-21 20:15:54 -08:00
Kazuki Shimizu 8ed769ae34 Update to Spring Secuirty 4.1.4
Closes gh-7721
2016-12-21 11:42:56 -08:00
Phillip Webb 2c00b4f76e Upgrade to Spring Data Hopper SR6
Closes gh-7602
2016-12-21 11:42:56 -08:00
Phillip Webb 138b96cf5f Use unique `testRestTemplate` bean name
Update `SpringBootTestContextCustomizer` to use the full qualified
TestRestTemplate as the registered bean name. Prior to this commit it
was possible that the customizer would replace the relatively common
bean name `testRestTemplate`.

Fixes gh-7711
2016-12-21 11:42:56 -08:00
Phillip Webb c23d8fb375 Ignore unresolvable placeholder in log properties
Update the RelaxedPropertyResolver used to load log properties so that
`${...}` patterns are ignored when possible.

Fixes gh-7719
2016-12-21 11:42:56 -08:00
Stephane Nicoll 33a655791c Merge branch '1.4.x' into 1.5.x 2016-12-21 18:49:34 +01:00
Stephane Nicoll a2cf7bed63 Upgrade to Spring Integration 4.3.6.RELEASE
Closes gh-7710
2016-12-21 18:47:48 +01:00
Stephane Nicoll 8becbcd6af Upgrade to Spring AMQP 1.6.6.RELEASE
Closes gh-7707
2016-12-21 18:47:36 +01:00
Stephane Nicoll d87d3fde02 Merge branch '1.4.x' into 1.5.x 2016-12-21 13:29:15 +01:00
Stephane Nicoll d4b8755a7d Start building against Spring AMQP snapshots
See gh-7707
2016-12-21 13:25:33 +01:00
Stephane Nicoll 1673ce4a31 Start building against Spring Integration snapshots
See gh-7710
2016-12-21 13:24:46 +01:00
Stephane Nicoll 718ede943b Upgrade to Spring Framework 4.3.5.RELEASE
Closes gh-7601
2016-12-21 13:18:53 +01:00
Stephane Nicoll 7a973cb4c4 Merge branch '1.4.x' into 1.5.x 2016-12-21 11:42:06 +01:00
Stephane Nicoll ac9eb8a9a9 Fix Maven warning in samples
Closes gh-7716
2016-12-21 11:40:14 +01:00
Phillip Webb faa03788a8 Merge pull request #7395 from maust/master
* pr/7395:
  Polish `spring.redis.url` support
  Add support for `spring.redis.url` property
2016-12-20 21:16:43 -08:00
Phillip Webb 8f7efbe12a Polish `spring.redis.url` support
See gh-7395
2016-12-20 21:16:42 -08:00
Marco Aust 90eb58252e Add support for `spring.redis.url` property
Update `RedisAutoConfiguration` to optionally configure Redis using a
`spring.redis.url` property`.

Closes gh-7395
2016-12-20 21:16:42 -08:00
Phillip Webb 16ed59e92f Merge pull request #7544 from jhrishikesh/gh-7478
* pr/7544:
  Add more debug logging to DevTools
2016-12-20 21:16:41 -08:00
Hrishikesh Joshi c2992e3736 Add more debug logging to DevTools
Add debug logging for the included and excluded URL patterns and
matching URLs.

Fixes gh-7478
Closes gh-7544
2016-12-20 21:16:41 -08:00
Phillip Webb 38f7389eab Polish loggers 2016-12-20 21:16:40 -08:00
Phillip Webb e6097fb3e4 Merge pull request #7634 from mbhave/gh-7605
* pr/7634:
  Refine error message from Endpoint MVC security
  Send error with message from Endpoint MVC security
2016-12-20 18:49:56 -08:00
Phillip Webb c76bd2d81e Refine error message from Endpoint MVC security
Update the error message to return less information to the client.
Details of how to disable security are now written to the log instead.

See gh-7605
See gh-7634
2016-12-20 18:47:39 -08:00
Madhura Bhave 38eeae2166 Send error with message from Endpoint MVC security
Update `MvcEndpointSecurityInterceptor` to that it sends an error in the
same way as Spring Security. Prior to this commit the `ErrorController`
would not handle endpoint security errors.

Fixes gh-7605
Closes gh-7634
2016-12-20 18:27:25 -08:00
Phillip Webb 9aaae808a6 Merge pull request #7655 from mbhave/gh-7629
* pr/7655:
  Polish CF management skip SSL opt-in
  Switch CF management skip SSL to opt-in
2016-12-20 18:26:56 -08:00
Phillip Webb dba8ef2ba8 Polish CF management skip SSL opt-in
See gh-7629
See gh-7655
2016-12-20 18:25:32 -08:00
Madhura Bhave 34712cbf76 Switch CF management skip SSL to opt-in
Change CloudFoundryActuatorAutoConfiguration so that skipping of SSL
verification is now opt-in rather than enabled by default.

Fixes gh-7629
Closes gh-7655
2016-12-20 18:24:15 -08:00
Phillip Webb 85ed90282d Merge pull request #7672 from garyrussell/GH-7646
* pr/7672:
  Polish Kafka properties
  Support arbitrary Kafka properties
2016-12-20 18:16:50 -08:00
Phillip Webb 1f7b3cad45 Polish Kafka properties
Closes gh-7672
2016-12-20 18:15:11 -08:00
Gary Russell bdda470305 Support arbitrary Kafka properties
Add support for arbitrary Kafka properties via
`spring.kafka.properties.*` and also a `spring.kafka.max.poll.records`
property.

See gh-7672
2016-12-20 18:14:55 -08:00
Phillip Webb ef671e79e0 Merge pull request #7561 from kazuki43zoo/support-externalized-properties-on-tx
* pr/7561:
  Polish spring transaction manager properties
  Support spring transaction manager properties
2016-12-20 18:01:07 -08:00
Phillip Webb 99e72664d9 Polish spring transaction manager properties
Polish and update contribution so that TransactionManager properties can
be defined per technology, rather than globally.

Closes gh-7561
2016-12-20 17:59:19 -08:00
Kazuki Shimizu 80eee6b30f Support spring transaction manager properties
Add Spring TransactionManager properties to allow timeout and rollback
settings to be configured.

See gh-7561
2016-12-20 17:57:17 -08:00
Phillip Webb 30ea1338de Merge pull request #7171 from lucassaldanha/gh-7121
* pr/7171:
  Make stop wait time in the launch script configurable
2016-12-20 15:18:43 -08:00
Lucas Saldanha 534a9db6fd Make stop wait time in the launch script configurable
Create a parameter `STOP_WAIT_TIME` for the startup script
that configures the time in seconds to wait for a normal
shutdown. Because of #4941 we also send a shutdown half
way the countdown.

Fixes gh-7121
2016-12-20 15:15:12 -08:00