Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate CommandLinePropertySource and associated implementations

Browse Source 
Closes gh-31207
This commit is contained in:
Sam Brannen
2023-09-13 13:52:27 +02:00
parent e7cf54d4e2
commit c598f0565a
6 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2020 the original author or authors.
* Copyright 2002-2023 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,6 @@ import org.junit.jupiter.api.Test
import org.springframework.beans.factory.NoSuchBeanDefinitionException
import org.springframework.beans.factory.getBean
import org.springframework.context.support.BeanDefinitionDsl.*
import org.springframework.core.env.SimpleCommandLinePropertySource
import org.springframework.core.env.get
import org.springframework.core.testfixture.env.MockPropertySource
import java.util.stream.Collectors
@@ -77,6 +76,7 @@ class BeanDefinitionDslTests {
}
@Test
@Suppress("DEPRECATION")
fun `Declare beans using environment condition with the functional Kotlin DSL`() {
val beans = beans {
bean<Foo>()
@@ -90,7 +90,7 @@ class BeanDefinitionDslTests {
}
val context = GenericApplicationContext().apply {
environment.propertySources.addFirst(SimpleCommandLinePropertySource("--name=foofoo"))
environment.propertySources.addFirst(org.springframework.core.env.SimpleCommandLinePropertySource("--name=foofoo"))
beans.initialize(this)
refresh()
}

2
spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java vendored
View File

@@ -204,7 +204,9 @@ import org.springframework.util.StringUtils;
* @see PropertySource
* @see SimpleCommandLinePropertySource
* @see JOptCommandLinePropertySource
* @deprecated since 6.1 with no plans for a replacement
*/
@Deprecated(since = "6.1")
public abstract class CommandLinePropertySource<T> extends EnumerablePropertySource<T> {
/** The default name given to {@link CommandLinePropertySource} instances: {@value}. */

2
spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java vendored
View File

@@ -61,7 +61,9 @@ import org.springframework.util.StringUtils;
* @see CommandLinePropertySource
* @see joptsimple.OptionParser
* @see joptsimple.OptionSet
* @deprecated since 6.1 with no plans for a replacement
*/
@Deprecated(since = "6.1")
public class JOptCommandLinePropertySource extends CommandLinePropertySource<OptionSet> {
/**

4
spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2023 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.
@@ -83,7 +83,9 @@ import org.springframework.util.StringUtils;
* @since 3.1
* @see CommandLinePropertySource
* @see JOptCommandLinePropertySource
* @deprecated since 6.1 with no plans for a replacement
*/
@Deprecated(since = "6.1")
public class SimpleCommandLinePropertySource extends CommandLinePropertySource<CommandLineArgs> {
/**

3
spring-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java vendored
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2023 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.
@@ -31,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Sam Brannen
* @since 3.1
*/
@SuppressWarnings("deprecation")
class JOptCommandLinePropertySourceTests {
@Test

1
spring-core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java vendored
View File

@@ -29,6 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Sam Brannen
* @since 3.1
*/
@SuppressWarnings("deprecation")
class SimpleCommandLinePropertySourceTests {
@Test