Merge branch '2.6.x' into 2.7.x

pull/29884/head
Stephane Nicoll 3 years ago
commit 00279b6928

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -146,7 +146,7 @@ class BindableTests {
Bindable<String> bindable = Bindable.of(String.class).withExistingValue("foo").withAnnotations(annotation); Bindable<String> bindable = Bindable.of(String.class).withExistingValue("foo").withAnnotations(annotation);
assertThat(bindable.toString()) assertThat(bindable.toString())
.contains("type = java.lang.String, value = 'provided', annotations = array<Annotation>[" .contains("type = java.lang.String, value = 'provided', annotations = array<Annotation>["
+ "@org.springframework.boot.context.properties.bind.BindableTests$TestAnnotation()]"); + "@org.springframework.boot.context.properties.bind.BindableTests.TestAnnotation()]");
} }
@Test @Test

Loading…
Cancel
Save