mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge pull request #28367 from polarbear567
* gh-28367: Polish "Polish" Polish Closes gh-28367
This commit is contained in:
commit
8622418e5d
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -35,8 +35,8 @@ import org.springframework.web.bind.annotation.PostMapping;
|
||||
/**
|
||||
* Identifies a type as being an endpoint that is only exposed over Spring MVC or Spring
|
||||
* WebFlux. Mapped methods must be annotated with {@link GetMapping @GetMapping},
|
||||
* {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc annotations
|
||||
* rather than {@link ReadOperation @ReadOperation},
|
||||
* {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc.
|
||||
* annotations rather than {@link ReadOperation @ReadOperation},
|
||||
* {@link WriteOperation @WriteOperation}, {@link DeleteOperation @DeleteOperation}.
|
||||
* <p>
|
||||
* This annotation can be used when deeper Spring integration is required, but at the
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -36,8 +36,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
|
||||
/**
|
||||
* Identifies a type as being a REST endpoint that is only exposed over Spring MVC or
|
||||
* Spring WebFlux. Mapped methods must be annotated with {@link GetMapping @GetMapping},
|
||||
* {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc annotations
|
||||
* rather than {@link ReadOperation @ReadOperation},
|
||||
* {@link PostMapping @PostMapping}, {@link DeleteMapping @DeleteMapping}, etc.
|
||||
* annotations rather than {@link ReadOperation @ReadOperation},
|
||||
* {@link WriteOperation @WriteOperation}, {@link DeleteOperation @DeleteOperation}.
|
||||
* <p>
|
||||
* This annotation can be used when deeper Spring integration is required, but at the
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -30,7 +30,7 @@ import java.util.Map;
|
||||
public interface TraceableRequest {
|
||||
|
||||
/**
|
||||
* Returns the method (GET, POST, etc) of the request.
|
||||
* Returns the method (GET, POST, etc.) of the request.
|
||||
* @return the method
|
||||
*/
|
||||
String getMethod();
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -67,7 +67,7 @@ class MetricsEndpointTests {
|
||||
}
|
||||
|
||||
@Test
|
||||
void listNamesRecursesOverCompositeRegistries() {
|
||||
void listNamesResponseOverCompositeRegistries() {
|
||||
CompositeMeterRegistry composite = new CompositeMeterRegistry();
|
||||
SimpleMeterRegistry reg1 = new SimpleMeterRegistry();
|
||||
SimpleMeterRegistry reg2 = new SimpleMeterRegistry();
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -131,7 +131,7 @@ public @interface ConditionalOnProperty {
|
||||
/**
|
||||
* Specify if the condition should match if the property is not set. Defaults to
|
||||
* {@code false}.
|
||||
* @return if should match if the property is missing
|
||||
* @return if the condition should match if the property is missing
|
||||
*/
|
||||
boolean matchIfMissing() default false;
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2019 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -48,7 +48,8 @@ public class ParentAwareNamingStrategy extends MetadataNamingStrategy implements
|
||||
|
||||
/**
|
||||
* Set if unique runtime object names should be ensured.
|
||||
* @param ensureUniqueRuntimeObjectNames {@code true} if unique names should ensured.
|
||||
* @param ensureUniqueRuntimeObjectNames {@code true} if unique names should be
|
||||
* ensured.
|
||||
*/
|
||||
public void setEnsureUniqueRuntimeObjectNames(boolean ensureUniqueRuntimeObjectNames) {
|
||||
this.ensureUniqueRuntimeObjectNames = ensureUniqueRuntimeObjectNames;
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2020 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
|
@ -23,7 +23,7 @@ import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
|
||||
/**
|
||||
* Configuration for multiple {@link DataSource} (one being {@code @Primary}.
|
||||
* Configuration for multiple {@link DataSource} (one being {@code @Primary}).
|
||||
*
|
||||
* @author Phillip Webb
|
||||
* @author Kazuki Shimizu
|
||||
|
Loading…
Reference in New Issue
Block a user