Deprecate CommandLinePropertySource and associated implementations

Closes gh-31207
spring-projects · Sep 13, 2023 · c598f05 · c598f05
1 parent e7cf54d
commit c598f05
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt b/spring-context/src/test/kotlin/org/springframework/context/support/BeanDefinitionDslTests.kt
@@ -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()
 		}

diff --git a/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/CommandLinePropertySource.java
@@ -204,7 +204,9 @@
  * @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}. */

diff --git a/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/JOptCommandLinePropertySource.java
@@ -61,7 +61,9 @@
  * @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> {
 
 	/**

diff --git a/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java b/spring-core/src/main/java/org/springframework/core/env/SimpleCommandLinePropertySource.java
@@ -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 @@
  * @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> {
 
 	/**

diff --git a/...g-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java b/...g-core/src/test/java/org/springframework/core/env/JOptCommandLinePropertySourceTests.java
@@ -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 @@
  * @author Sam Brannen
  * @since 3.1
  */
+@SuppressWarnings("deprecation")
 class JOptCommandLinePropertySourceTests {
 
 	@Test

diff --git a/...core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java b/...core/src/test/java/org/springframework/core/env/SimpleCommandLinePropertySourceTests.java
@@ -29,6 +29,7 @@
  * @author Sam Brannen
  * @since 3.1
  */
+@SuppressWarnings("deprecation")
 class SimpleCommandLinePropertySourceTests {
 
 	@Test