pull/37745/head
Johnny Lim 1 year ago
parent 6c24ea01f1
commit 9ac7ef0c4c

@ -97,7 +97,7 @@ class DynatracePropertiesConfigAdapter extends StepRegistryPropertiesConfigAdapt
@Override @Override
public boolean exportMeterMetadata() { public boolean exportMeterMetadata() {
return (get(v2(V2::isExportMeterMetadata), DynatraceConfig.super::exportMeterMetadata)); return get(v2(V2::isExportMeterMetadata), DynatraceConfig.super::exportMeterMetadata);
} }
private <V> Function<DynatraceProperties, V> v1(Function<V1, V> getter) { private <V> Function<DynatraceProperties, V> v1(Function<V1, V> getter) {

@ -211,7 +211,7 @@ public class BraveAutoConfiguration {
// There's a chicken-and-egg problem here: to create a builder, we need a // There's a chicken-and-egg problem here: to create a builder, we need a
// factory. But the CompositePropagationFactory needs data from the builder. // factory. But the CompositePropagationFactory needs data from the builder.
// We create a throw-away builder with a throw-away factory, and then copy the // We create a throw-away builder with a throw-away factory, and then copy the
// config to the real builder // config to the real builder.
FactoryBuilder throwAwayBuilder = BaggagePropagation.newFactoryBuilder(createThrowAwayFactory()); FactoryBuilder throwAwayBuilder = BaggagePropagation.newFactoryBuilder(createThrowAwayFactory());
baggagePropagationCustomizers.orderedStream() baggagePropagationCustomizers.orderedStream()
.forEach((customizer) -> customizer.customize(throwAwayBuilder)); .forEach((customizer) -> customizer.customize(throwAwayBuilder));

@ -85,8 +85,7 @@ class CompositePropagationFactory extends Propagation.Factory {
} }
/** /**
* Creates a new {@link CompositePropagationFactory}, which uses the given * Creates a new {@link CompositePropagationFactory}.
* {@code injectionTypes} for injection and {@code extractionTypes} for extraction.
* @param properties the propagation properties * @param properties the propagation properties
* @return the {@link CompositePropagationFactory} * @return the {@link CompositePropagationFactory}
*/ */
@ -95,8 +94,7 @@ class CompositePropagationFactory extends Propagation.Factory {
} }
/** /**
* Creates a new {@link CompositePropagationFactory}, which uses the given * Creates a new {@link CompositePropagationFactory}.
* {@code injectionTypes} for injection and {@code extractionTypes} for extraction.
* @param properties the propagation properties * @param properties the propagation properties
* @param baggageManager the baggage manager to use, or {@code null} * @param baggageManager the baggage manager to use, or {@code null}
* @param localFields the local fields, or {@code null} * @param localFields the local fields, or {@code null}

@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.unit.DataSize; import org.springframework.util.unit.DataSize;
/** /**
* {@link ConfigurationProperties properties} for reactive codecs. * {@link ConfigurationProperties Properties} for reactive codecs.
* *
* @author Brian Clozel * @author Brian Clozel
* @since 2.2.1 * @since 2.2.1

@ -22,7 +22,7 @@ import java.util.Arrays;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
* {@link ConfigurationProperties properties} for Spring GraphQL. * {@link ConfigurationProperties Properties} for Spring GraphQL.
* *
* @author Brian Clozel * @author Brian Clozel
* @since 2.7.0 * @since 2.7.0

@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.hateoas;
import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.ConfigurationProperties;
/** /**
* {@link ConfigurationProperties properties} for Spring HATEOAS. * {@link ConfigurationProperties Properties} for Spring HATEOAS.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson

@ -25,7 +25,7 @@ import org.springframework.boot.web.server.Ssl;
import org.springframework.util.unit.DataSize; import org.springframework.util.unit.DataSize;
/** /**
* {@link ConfigurationProperties properties} for RSocket support. * {@link ConfigurationProperties Properties} for RSocket support.
* *
* @author Brian Clozel * @author Brian Clozel
* @author Chris Bono * @author Chris Bono

@ -20,7 +20,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
/** /**
* {@link ConfigurationProperties properties} for Spring WebFlux. * {@link ConfigurationProperties Properties} for Spring WebFlux.
* *
* @author Brian Clozel * @author Brian Clozel
* @author Vedran Pavic * @author Vedran Pavic

@ -27,7 +27,7 @@ import org.springframework.util.Assert;
import org.springframework.validation.DefaultMessageCodesResolver; import org.springframework.validation.DefaultMessageCodesResolver;
/** /**
* {@link ConfigurationProperties properties} for Spring MVC. * {@link ConfigurationProperties Properties} for Spring MVC.
* *
* @author Phillip Webb * @author Phillip Webb
* @author Sébastien Deleuze * @author Sébastien Deleuze

@ -816,7 +816,7 @@ bom {
library("Kotlin Serialization", "1.6.0") { library("Kotlin Serialization", "1.6.0") {
group("org.jetbrains.kotlinx") { group("org.jetbrains.kotlinx") {
imports = [ imports = [
"kotlinx-serialization-bom" "kotlinx-serialization-bom"
] ]
} }
} }

@ -594,7 +594,7 @@ If that is not what you want, you can disable transaction management for a test
include::code:MyTransactionalTests[] include::code:MyTransactionalTests[]
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`.
(See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".) (See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".)
@ -612,7 +612,7 @@ By default, Data JDBC tests are transactional and roll back at the end of each t
See the {spring-framework-docs}/testing.html#testcontext-tx-enabling-transactions[relevant section] in the Spring Framework Reference Documentation for more details. See the {spring-framework-docs}/testing.html#testcontext-tx-enabling-transactions[relevant section] in the Spring Framework Reference Documentation for more details.
If that is not what you want, you can disable transaction management for a test or for the whole test class as <<features#features.testing.spring-boot-applications.autoconfigured-jdbc,shown in the JDBC example>>. If that is not what you want, you can disable transaction management for a test or for the whole test class as <<features#features.testing.spring-boot-applications.autoconfigured-jdbc,shown in the JDBC example>>.
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`.
(See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".) (See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".)
@ -620,7 +620,7 @@ If you prefer your test to run against a real database, you can use the `@AutoCo
[[features.testing.spring-boot-applications.autoconfigured-spring-data-r2dbc]] [[features.testing.spring-boot-applications.autoconfigured-spring-data-r2dbc]]
==== Auto-configured Data R2DBC Tests ==== Auto-configured Data R2DBC Tests
`@DataR2dbcTest` is similar to `@DataJdbcTest` but is for tests that use Spring Data R2DBC repositories. `@DataR2dbcTest` is similar to `@DataJdbcTest` but is for tests that use Spring Data R2DBC repositories.
By default, it configures an in-memory embedded database, a `R2dbcEntityTemplate`, and Spring Data R2DBC repositories. By default, it configures an in-memory embedded database, an `R2dbcEntityTemplate`, and Spring Data R2DBC repositories.
Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataR2dbcTest` annotation is used. Regular `@Component` and `@ConfigurationProperties` beans are not scanned when the `@DataR2dbcTest` annotation is used.
`@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans. `@EnableConfigurationProperties` can be used to include `@ConfigurationProperties` beans.
@ -628,7 +628,7 @@ TIP: A list of the auto-configurations that are enabled by `@DataR2dbcTest` can
By default, Data R2DBC tests are not transactional. By default, Data R2DBC tests are not transactional.
If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `DataJpaTest`. If you prefer your test to run against a real database, you can use the `@AutoConfigureTestDatabase` annotation in the same way as for `@DataJpaTest`.
(See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".) (See "<<features#features.testing.spring-boot-applications.autoconfigured-spring-data-jpa>>".)

@ -264,7 +264,7 @@ Most standard media types are supported out-of-the-box, but you can also define
As of Spring Framework 5.3, Spring MVC supports two strategies for matching request paths to controllers. As of Spring Framework 5.3, Spring MVC supports two strategies for matching request paths to controllers.
By default, Spring Boot uses the `PathPatternParser` strategy. By default, Spring Boot uses the `PathPatternParser` strategy.
`PathPatternParser` is an https://spring.io/blog/2020/06/30/url-matching-with-pathpattern-in-spring-mvc[optimized implementation] but comes with some restrictions compared to the `AntPathMatcher` strategy. `PathPatternParser` is an https://spring.io/blog/2020/06/30/url-matching-with-pathpattern-in-spring-mvc[optimized implementation] but comes with some restrictions compared to the `AntPathMatcher` strategy.
`PathPatternParser` restricts usage of {spring-framework-docs}/web.html#mvc-ann-requestmapping-uri-templates[some path patterns variants]. `PathPatternParser` restricts usage of {spring-framework-docs}/web.html#mvc-ann-requestmapping-uri-templates[some path pattern variants].
It is also incompatible with configuring the `DispatcherServlet` with a path prefix (configprop:spring.mvc.servlet.path[]). It is also incompatible with configuring the `DispatcherServlet` with a path prefix (configprop:spring.mvc.servlet.path[]).
The strategy can be configured using the configprop:spring.mvc.pathmatch.matching-strategy[] configuration property, as shown in the following example: The strategy can be configured using the configprop:spring.mvc.pathmatch.matching-strategy[] configuration property, as shown in the following example:

@ -80,7 +80,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test @Test
void generateProject() throws Exception { void generateProject() throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip"; String fileName = UUID.randomUUID() + ".zip";
File file = new File(fileName); File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist(); assertThat(file).as("file should not exist").doesNotExist();
MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", fileName); MockHttpProjectGenerationRequest request = new MockHttpProjectGenerationRequest("application/zip", fileName);
@ -175,7 +175,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test @Test
void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws Exception { void generateProjectAndExtractUnsupportedArchive(@TempDir File tempDir) throws Exception {
String fileName = UUID.randomUUID().toString() + ".zip"; String fileName = UUID.randomUUID() + ".zip";
File file = new File(fileName); File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist(); assertThat(file).as("file should not exist").doesNotExist();
try { try {
@ -193,7 +193,7 @@ class InitCommandTests extends AbstractHttpClientMockTests {
@Test @Test
void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) { void generateProjectAndExtractUnknownContentType(@TempDir File tempDir) {
String fileName = UUID.randomUUID().toString() + ".zip"; String fileName = UUID.randomUUID() + ".zip";
File file = new File(fileName); File file = new File(fileName);
assertThat(file).as("file should not exist").doesNotExist(); assertThat(file).as("file should not exist").doesNotExist();
try { try {

@ -137,7 +137,7 @@ class DependencyFilterMojoTests {
} }
private static File createArtifactFile(String jarType) { private static File createArtifactFile(String jarType) {
Path jarPath = temp.resolve(UUID.randomUUID().toString() + ".jar"); Path jarPath = temp.resolve(UUID.randomUUID() + ".jar");
Manifest manifest = new Manifest(); Manifest manifest = new Manifest();
manifest.getMainAttributes().putValue("Manifest-Version", "1.0"); manifest.getMainAttributes().putValue("Manifest-Version", "1.0");
if (jarType != null) { if (jarType != null) {

Loading…
Cancel
Save