Browse Source

Merge branch '6.2.x'

pull/34869/head
Sam Brannen 9 months ago
parent
commit
e673345102
  1. 16
      spring-core/src/main/java/org/springframework/core/SpringProperties.java

16
spring-core/src/main/java/org/springframework/core/SpringProperties.java

@ -26,18 +26,20 @@ import org.jspecify.annotations.Nullable;
/** /**
* Static holder for local Spring properties, i.e. defined at the Spring library level. * Static holder for local Spring properties, i.e. defined at the Spring library level.
* *
* <p>Reads a {@code spring.properties} file from the root of the Spring library classpath, * <p>Reads a {@code spring.properties} file from the root of the classpath and
* and also allows for programmatically setting properties through {@link #setProperty}. * also allows for programmatically setting properties via {@link #setProperty}.
* When checking a property, local entries are being checked first, then falling back * When retrieving properties, local entries are checked first, with JVM-level
* to JVM-level system properties through a {@link System#getProperty} check. * system properties checked next as a fallback via {@link System#getProperty}.
* *
* <p>This is an alternative way to set Spring-related system properties such as * <p>This is an alternative way to set Spring-related system properties such as
* "spring.getenv.ignore" and "spring.beaninfo.ignore", in particular for scenarios * {@code spring.getenv.ignore} and {@code spring.beaninfo.ignore}, in particular
* where JVM system properties are locked on the target platform (for example, WebSphere). * for scenarios where JVM system properties are locked on the target platform
* See {@link #setFlag} for a convenient way to locally set such flags to "true". * (for example, WebSphere). See {@link #setFlag} for a convenient way to locally
* set such flags to {@code "true"}.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @since 3.2.7 * @since 3.2.7
* @see org.springframework.aot.AotDetector#AOT_ENABLED
* @see org.springframework.beans.StandardBeanInfoFactory#IGNORE_BEANINFO_PROPERTY_NAME * @see org.springframework.beans.StandardBeanInfoFactory#IGNORE_BEANINFO_PROPERTY_NAME
* @see org.springframework.beans.factory.support.DefaultListableBeanFactory#STRICT_LOCKING_PROPERTY_NAME * @see org.springframework.beans.factory.support.DefaultListableBeanFactory#STRICT_LOCKING_PROPERTY_NAME
* @see org.springframework.core.env.AbstractEnvironment#IGNORE_GETENV_PROPERTY_NAME * @see org.springframework.core.env.AbstractEnvironment#IGNORE_GETENV_PROPERTY_NAME

Loading…
Cancel
Save