diff --git a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java index 9eb2c91c650..396bc0b5188 100644 --- a/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java +++ b/spring-core/src/main/java/org/springframework/util/AntPathMatcher.java @@ -529,7 +529,7 @@ public class AntPathMatcher implements PathMatcher { * the first pattern contains a file extension match (e.g., {@code *.html}). * In that case, the second pattern will be merged into the first. Otherwise, * an {@code IllegalArgumentException} will be thrown. - *

Examples

+ *

Examples

* * * diff --git a/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java b/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java index 875e6abf858..337df27254f 100644 --- a/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java +++ b/spring-test/src/main/java/org/springframework/test/context/TestPropertySource.java @@ -112,11 +112,11 @@ public @interface TestPropertySource { * {@code Environment}'s set of {@code PropertySources}. Each location * will be added to the enclosing {@code Environment} as its own property * source, in the order declared. - *

Supported File Formats

+ *

Supported File Formats

*

Both traditional and XML-based properties file formats are supported * — for example, {@code "classpath:/com/example/test.properties"} * or {@code "file:/path/to/file.xml"}. - *

Path Resource Semantics

+ *

Path Resource Semantics

*

Each path will be interpreted as a Spring * {@link org.springframework.core.io.Resource Resource}. A plain path * — for example, {@code "test.properties"} — will be treated as a @@ -134,9 +134,9 @@ public @interface TestPropertySource { * in paths (i.e., ${...}) will be * {@linkplain org.springframework.core.env.Environment#resolveRequiredPlaceholders(String) resolved} * against the {@code Environment}. - *

Default Properties File Detection

+ *

Default Properties File Detection

*

See the class-level Javadoc for a discussion on detection of defaults. - *

Precedence

+ *

Precedence

*

Properties loaded from resource locations have lower precedence than * inlined {@link #properties}. *

This attribute may not be used in conjunction with @@ -209,7 +209,7 @@ public @interface TestPropertySource { * {@code ApplicationContext} is loaded for the test. All key-value pairs * will be added to the enclosing {@code Environment} as a single test * {@code PropertySource} with the highest precedence. - *

Supported Syntax

+ *

Supported Syntax

*

The supported syntax for key-value pairs is the same as the * syntax defined for entries in a Java * {@linkplain java.util.Properties#load(java.io.Reader) properties file}: @@ -218,7 +218,7 @@ public @interface TestPropertySource { *

  • {@code "key:value"}
  • *
  • {@code "key value"}
  • * - *

    Precedence

    + *

    Precedence

    *

    Properties declared via this attribute have higher precedence than * properties loaded from resource {@link #locations}. *

    This attribute may be used in conjunction with {@link #value} diff --git a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java index 7e167a79ada..546256efa6c 100644 --- a/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java +++ b/spring-test/src/main/java/org/springframework/test/context/jdbc/Sql.java @@ -91,7 +91,7 @@ public @interface Sql { * {@link #value}, but it may be used instead of {@link #value}. Similarly, * this attribute may be used in conjunction with or instead of * {@link #statements}. - *

    Path Resource Semantics

    + *

    Path Resource Semantics

    *

    Each path will be interpreted as a Spring * {@link org.springframework.core.io.Resource Resource}. A plain path * — for example, {@code "schema.sql"} — will be treated as a @@ -103,7 +103,7 @@ public @interface Sql { * {@link org.springframework.util.ResourceUtils#CLASSPATH_URL_PREFIX classpath:}, * {@link org.springframework.util.ResourceUtils#FILE_URL_PREFIX file:}, * {@code http:}, etc.) will be loaded using the specified resource protocol. - *

    Default Script Detection

    + *

    Default Script Detection

    *

    If no SQL scripts or {@link #statements} are specified, an attempt will * be made to detect a default script depending on where this * annotation is declared. If a default cannot be detected, an @@ -127,7 +127,7 @@ public @interface Sql { * Inlined SQL statements to execute. *

    This attribute may be used in conjunction with or instead of * {@link #scripts}. - *

    Ordering

    + *

    Ordering

    *

    Statements declared via this attribute will be executed after * statements loaded from resource {@link #scripts}. If you wish to have * inlined statements executed before scripts, simply declare multiple diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java index bf709e52401..c6c4e37ff41 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurer.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,7 +51,7 @@ public interface TransactionManagementConfigurer { * Return the default transaction manager bean to use for annotation-driven database * transaction management, i.e. when processing {@code @Transactional} methods. *

    There are two basic approaches to implementing this method: - *

    1. Implement the method and annotate it with {@code @Bean}

    + *

    1. Implement the method and annotate it with {@code @Bean}

    * In this case, the implementing {@code @Configuration} class implements this method, * marks it with {@code @Bean}, and configures and returns the transaction manager * directly within the method body: @@ -61,8 +61,8 @@ public interface TransactionManagementConfigurer { * public PlatformTransactionManager annotationDrivenTransactionManager() { * return new DataSourceTransactionManager(dataSource()); * } - *

    2. Implement the method without {@code @Bean} and delegate to another existing - * {@code @Bean} method

    + *

    2. Implement the method without {@code @Bean} and delegate to another existing + * {@code @Bean} method

    *
     	 * @Bean
     	 * public PlatformTransactionManager txManager() {
    
    Pattern 1Pattern 2Result
    {@code null}{@code null}