From 372802a2038b7c180a3e65a4ef3c4ccff9401c9e Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Sat, 16 Mar 2019 08:23:22 +0100 Subject: [PATCH] Polish "Order the search locations in javadoc by precedence order" Closes gh-16099 --- .../boot/context/config/ConfigFileApplicationListener.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java index f186397761..efc3f82aa8 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2018 the original author or authors. + * Copyright 2012-2019 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. @@ -72,14 +72,15 @@ import org.springframework.util.StringUtils; /** * {@link EnvironmentPostProcessor} that configures the context environment by loading * properties from well known file locations. By default properties will be loaded from - * 'application.properties' and/or 'application.yml' files in the following locations - * ordered by the search order: + * 'application.properties' and/or 'application.yml' files in the following locations: * + * The list is ordered by precedence (properties defined in locations higher in the list + * override those defined in lower locations). *

* Alternative search locations and names can be specified using * {@link #setSearchLocations(String)} and {@link #setSearchNames(String)}.