Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,496 Commits 23 Branches 0 Tags
5beb7edfbb4ca56892a5c682aae36b6ad81007ee
Commit Graph

22496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Clozel
5beb7edfbb Reinstate RSocket codecs configuration ordering 
Since spring-projects/spring-framework#23314 and the following commit
spring-projects/spring-framework@be4facef1b, the RSocket codec selection
is relaxed and the order of configured commits matters again.

This commit ensures that the CBOR codec is configured ahead of the JSON
codec so that it can be chosen first if no data mime type is specified
when a connection is established with a client requester.
 2019-07-24 20:39:55 +02:00
Brian Clozel
1996952e68 Update RSocket configuration after Framework changes 
Since spring-projects/spring-framework#23314, the `RSocketStrategies`
provide more codecs by default, and there is no need to order them to
avoid conflicts during mime type selection.

This commit also ensures that the `PayloadDecoder.ZERO_COPY` is
configured on the RSocket server if the configured `DataBufferFactory`
is compatible with that strategy.
 2019-07-24 15:51:27 +02:00
Phillip Webb
5a4ec081f6 Merge branch '2.1.x' 
Closes gh-17624
 2019-07-24 14:40:50 +01:00
Phillip Webb
0da0bff397 Merge pull request #17497 from nosan 
* pr/17497:
  Trim OAuth2 provider property whitespace

Closes gh-17497
 2019-07-24 14:38:38 +01:00
Dmytro Nosan
efce9388e7 Trim OAuth2 provider property whitespace 
Update `OAuth2ClientPropertiesRegistrationAdapter` to trim whitespace
of the "provider" property.

See gh-17497
 2019-07-24 14:32:41 +01:00
Stephane Nicoll
7a2f4e83d4 Upgrade to Jedis 3.1.0 
Closes gh-17622
 2019-07-24 14:44:04 +02:00
Phillip Webb
8bc780762a Merge branch '2.1.x' 2019-07-24 11:42:48 +01:00
Phillip Webb
fb1dd8fe93 Merge branch '2.0.x' into 2.1.x 2019-07-24 11:41:32 +01:00
Phillip Webb
913e831f4e Merge '1.5.x' into 2.0.x 2019-07-24 11:39:58 +01:00
Phillip Webb
ff36074401 Update copyright header for changed files 
Effectively all files have been touched this year due to the nohttp
work.
 2019-07-24 11:37:23 +01:00
Stephane Nicoll
0d324812c7 Add Java 13 CI 
Closes gh-16970
 2019-07-24 12:12:42 +02:00
Stephane Nicoll
ad51972e3b Add reference to grizzly starter 
Closes gh-17620
 2019-07-24 11:44:54 +02:00
Stephane Nicoll
5ed3185d04 Merge branch '2.1.x' 
Closes gh-17621
 2019-07-24 11:37:13 +02:00
Stephane Nicoll
5a019cf14a Merge pull request #17567 from lihongmingming 
* pr/17567:
  Polish "Clarify description of "logging.file.max-history""
  Clarify description of "logging.file.max-history"

Closes gh-17567
 2019-07-24 11:36:37 +02:00
Stephane Nicoll
057ca8f6a8 Polish "Clarify description of "logging.file.max-history"" 
See gh-17567
 2019-07-24 11:36:15 +02:00
lihongmingming
00a5528d7f Clarify description of "logging.file.max-history" 
See gh-17567
 2019-07-24 11:36:15 +02:00
Stephane Nicoll
fbe876d907 Merge pull request #17612 from dreis2211 
* pr/17612:
  Extend JavaVersion tests

Closes gh-17612
 2019-07-24 11:14:38 +02:00
dreis2211
e47d56c76d Extend JavaVersion tests 
See gh-17612
 2019-07-24 11:13:07 +02:00
Stephane Nicoll
1215495d44 Merge pull request #17611 from dreis2211 
* pr/17611:
  Align JavaVersion.NINE name with JDK versioning

Closes gh-17611
 2019-07-24 11:12:35 +02:00
dreis2211
c8097692ea Align JavaVersion.NINE name with JDK versioning 
See gh-17611
 2019-07-24 11:12:02 +02:00
Stephane Nicoll
2e0ad19d8d Merge pull request #17614 from dreis2211 
* pr/17614:
  Remove obsolete UnauthenticatedAccessExample

Closes gh-17614
 2019-07-24 11:07:18 +02:00
dreis2211
4805208716 Remove obsolete UnauthenticatedAccessExample 
See gh-17614
 2019-07-24 11:06:43 +02:00
Stephane Nicoll
a7da46e60a Merge pull request #17616 from izeye 
* pr/17616:
  Polish

Closes gh-17616
 2019-07-24 11:03:42 +02:00
Johnny Lim
43345b36e6 Polish 
See gh-17616
 2019-07-24 11:00:40 +02:00
Stephane Nicoll
f3a138da16 Skip Gradle Plugin test when building with JDK 13 
See gh-16970
 2019-07-24 08:49:52 +02:00
Stephane Nicoll
19eaf86efa Update multi release test jar to include Java 12 
See gh-16970
 2019-07-24 08:06:22 +02:00
Andy Wilkinson
6a0d24be0b Merge pull request #15834 from artembilan 
* gh-15834:
  Polish "Document `@EmbeddedKafka` and its interaction with Spring Boot"
  Document `@EmbeddedKafka` and its interaction with Spring Boot

Closes gh-15834
 2019-07-23 17:20:59 +01:00
Andy Wilkinson
e7b94be9cd Polish "Document @EmbeddedKafka and its interaction with Spring Boot" 
See gh-15834
 2019-07-23 17:20:46 +01:00
Artem Bilan
4e79408bb0 Document @EmbeddedKafka and its interaction with Spring Boot 
See gh-15834
 2019-07-23 16:59:04 +01:00
Phillip Webb
6c0dbacfce Polish 2019-07-23 15:43:51 +01:00
Phillip Webb
0d92af7d55 Add hasJsonPath and doesNotHaveJsonPath asserts 
Extend `JsonContentAssert` with `hasJsonPath` and `doesNotHaveJsonPath`
methods which can be used to check the path regardless of the value it
may or may not contain.

Prior to this commit there wasn't an easy way to assert that the
Jackson `@JsonInclude(JsonInclude.Include.NON_NULL)` annotation was
applied since `assertDoesNotHavePathValue` would pass for both
`{"name" : null}` and `{}`.

Closes gh-17608
 2019-07-23 15:43:51 +01:00
Phillip Webb
900ec9f3ec Fix error message formatting placeholders 
Fix the formatting message placeholders to '%s' since '{}' isn't
supported by AssertJ.

See gh-15569
 2019-07-23 15:43:51 +01:00
Stephane Nicoll
690019ba8f Polish "Disable tests that are failing on Java 13" 
See gh-17607
 2019-07-23 15:51:21 +02:00
Stephane Nicoll
5f3fff6470 Disable tests that are failing on Java 13 
Hazelcast YAML support does not work with Java 13 so this commit
disables relevant tests when Java 13 is detected

See https://github.com/hazelcast/hazelcast/issues/15348

See gh-17607
 2019-07-23 12:41:24 +02:00
Stephane Nicoll
42075ddf28 Merge pull request #16449 from chang-chao 
* pr/16449:
  Polish "Make Actuator dedicated ConversionService configurable"
  Make Actuator dedicated ConversionService configurable

Closes gh-16449
 2019-07-23 12:31:21 +02:00
Stephane Nicoll
94c35ae1de Polish "Make Actuator dedicated ConversionService configurable" 
See gh-16449
 2019-07-23 12:27:00 +02:00
chao.chang
2aea437536 Make Actuator dedicated ConversionService configurable 
See gh-16449
 2019-07-23 11:16:27 +02:00
Stephane Nicoll
38a42a8600 Improve NoSuchMethodError message parsing 
Closes gh-17544
 2019-07-23 10:42:33 +02:00
Stephane Nicoll
26ee9150b2 Document WebFilter is scanned by @WebFluxTest 
See gh-17601
 2019-07-23 09:01:32 +02:00
Stephane Nicoll
94a757113d Document HandlerInterceptor is scanned by @WebMvcTest 
See gh-17601
 2019-07-23 08:57:09 +02:00
Madhura Bhave
6580d39465 Merge pull request #17601 from nosan 
* pr/17601:
  Include WebFilter beans in WebFluxTest slice

Closes gh-17601
 2019-07-22 12:39:26 -07:00
Dmytro Nosan
9d052bbe5e Include WebFilter beans in WebFluxTest slice 
See gh-17601
 2019-07-22 12:38:48 -07:00
Madhura Bhave
9f69b61d49 Merge pull request #17600 from nosan 
* pr/17600:
  Include HandlerInterceptor beans in WebMvcTest slice

Closes gh-17600
 2019-07-22 12:35:50 -07:00
Dmytro Nosan
6859a89cf3 Include HandlerInterceptor beans in WebMvcTest slice 
See gh-17600
 2019-07-22 12:34:11 -07:00
Brian Clozel
53afbbe233 Update RouteMatcher configuration for RSocket 
This commit updates the `RouteMatcher` configuration after the latest
Spring Framework changes. The default route matcher implementation based
on the `PathPattern` infrastructure is now tailored for the messaging
use case (path separator, path encoding options and trailing separator).

See spring-projects/spring-framework#23310
 2019-07-22 15:30:40 +02:00
Stephane Nicoll
a1f32bbd7a Merge branch '2.1.x' 
Closes gh-17603
 2019-07-22 15:29:58 +02:00
Stephane Nicoll
30fe10613d Improve how to configure configuration keys of a custom starter 
Closes gh-17573
 2019-07-22 15:28:17 +02:00
Stephane Nicoll
300f07b2a8 Polish 2019-07-22 15:20:37 +02:00
Stephane Nicoll
c82e33e1d7 Merge branch '2.1.x' 2019-07-22 13:19:03 +02:00
Stephane Nicoll
3c7ac4fe7f Polish 2019-07-22 13:17:51 +02:00