From 82e45235a2382e68dfa77d416e881db333070b31 Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Mon, 2 Sep 2024 09:30:55 +0800
Subject: [PATCH] Expand acronym `FQN` and `FQCN`

---
 .../beans/factory/support/ConstructorResolver.java          | 2 +-
 .../org/springframework/beans/factory/xml/spring-beans.dtd  | 4 ++--
 .../org/springframework/beans/factory/xml/spring-beans.xsd  | 4 ++--
 .../org/springframework/aot/hint/RuntimeHintsRegistrar.java | 2 +-
 .../interceptor/MethodMapTransactionAttributeSource.java    | 6 +++---
 .../interceptor/TransactionAttributeSourceEditor.java       | 2 +-
 .../interceptor/RuleBasedTransactionAttributeTests.java     | 2 +-
 .../interceptor/TransactionAttributeSourceEditorTests.java  | 2 +-
 .../web/servlet/handler/SimpleMappingExceptionResolver.java | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
index 96773ccfee5c..1bcf3b43656d 100644
--- a/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
+++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/ConstructorResolver.java
@@ -1242,7 +1242,7 @@ private Predicate<ResolvableType> valueOrCollection(ResolvableType valueType,
 	 * Return a {@link Predicate} for a parameter type that checks if its target
 	 * value is a {@link Class} and the value type is a {@link String}. This is
 	 * a regular use cases where a {@link Class} is defined in the bean
-	 * definition as an FQN.
+	 * definition as fully-qualified class name.
 	 * @param valueType the type of the value
 	 * @return a predicate to indicate a fallback match for a String to Class
 	 * parameter
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
index 42f487cfeb3f..1981730071bf 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.dtd
@@ -451,8 +451,8 @@
 
 <!--
 	Specification of the type of an overloaded method argument as a String.
-	For convenience, this may be a substring of the FQN. E.g. all the
-	following would match "java.lang.String":
+	For convenience, this may be a substring of the fully-qualified class name.
+	E.g. all the following would match "java.lang.String":
 	- java.lang.String
 	- String
 	- Str
diff --git a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd
index 8532e96ff68a..625587f3696c 100644
--- a/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd
+++ b/spring-beans/src/main/resources/org/springframework/beans/factory/xml/spring-beans.xsd
@@ -765,8 +765,8 @@
 				<xsd:annotation>
 					<xsd:documentation><![CDATA[
 	Specification of the type of an overloaded method argument as a String.
-	For convenience, this may be a substring of the FQN. E.g. all the
-	following would match "java.lang.String":
+	For convenience, this may be a substring of the fully-qualified class name.
+	E.g. all the following would match "java.lang.String":
 	- java.lang.String
 	- String
 	- Str
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsRegistrar.java b/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsRegistrar.java
index c08aa06186a9..45b5407e3143 100644
--- a/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsRegistrar.java
+++ b/spring-core/src/main/java/org/springframework/aot/hint/RuntimeHintsRegistrar.java
@@ -25,7 +25,7 @@
  *
  * <p>Implementations of this interface can be registered dynamically by using
  * {@link org.springframework.context.annotation.ImportRuntimeHints @ImportRuntimeHints}
- * or statically in {@code META-INF/spring/aot.factories} by using the FQN of this
+ * or statically in {@code META-INF/spring/aot.factories} by using the fully-qualified class name of this
  * interface as the key. A standard no-arg constructor is required for implementations.
  *
  * @author Brian Clozel
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
index 4e102106b36b..db6ef04754cc 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/MethodMapTransactionAttributeSource.java
@@ -73,8 +73,8 @@ public class MethodMapTransactionAttributeSource
 
 
 	/**
-	 * Set a name/attribute map, consisting of "FQCN.method" method names
-	 * (e.g. "com.mycompany.mycode.MyClass.myMethod") and
+	 * Set a name/attribute map, consisting of "{@code <fully-qualified class name>.<method-name>}"
+	 * method names (e.g. "com.mycompany.mycode.MyClass.myMethod") and
 	 * {@link TransactionAttribute} instances (or Strings to be converted
 	 * to {@code TransactionAttribute} instances).
 	 * <p>Intended for configuration via setter injection, typically within
@@ -134,7 +134,7 @@ public void addTransactionalMethod(String name, TransactionAttribute attr) {
 		Assert.notNull(name, "Name must not be null");
 		int lastDotIndex = name.lastIndexOf('.');
 		if (lastDotIndex == -1) {
-			throw new IllegalArgumentException("'" + name + "' is not a valid method name: format is FQN.methodName");
+			throw new IllegalArgumentException("'" + name + "' is not a valid method name: format is <fully-qualified class name>.<method-name>");
 		}
 		String className = name.substring(0, lastDotIndex);
 		String methodName = name.substring(lastDotIndex + 1);
diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
index f1d8c1d33324..d028e0e2979f 100644
--- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
+++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java
@@ -29,7 +29,7 @@
  * {@link TransactionAttributeEditor} in this package.
  *
  * <p>Strings are in property syntax, with the form:<br>
- * {@code FQCN.methodName=<transaction attribute string>}
+ * {@code <fully-qualified class name>.<method-name>=<transaction attribute string>}
  *
  * <p>For example:<br>
  * {@code com.mycompany.mycode.MyClass.myMethod=PROPAGATION_MANDATORY,ISOLATION_DEFAULT}
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java
index 3f4cffe2b824..dda13b049c58 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/RuleBasedTransactionAttributeTests.java
@@ -108,7 +108,7 @@ private void doTestRuleForSelectiveRollbackOnChecked(RuleBasedTransactionAttribu
 	void ruleForCommitOnSubclassOfChecked() {
 		List<RollbackRuleAttribute> list = new ArrayList<>();
 		// Note that it's important to ensure that we have this as
-		// a FQN: otherwise it will match everything!
+		// fully-qualified class name: otherwise it will match everything!
 		list.add(new RollbackRuleAttribute("java.lang.Exception"));
 		list.add(new NoRollbackRuleAttribute("IOException"));
 		RuleBasedTransactionAttribute rta = new RuleBasedTransactionAttribute(TransactionDefinition.PROPAGATION_REQUIRED, list);
diff --git a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
index 808adfa35ad4..263b95681378 100644
--- a/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
+++ b/spring-tx/src/test/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditorTests.java
@@ -28,7 +28,7 @@
 /**
  * Tests for {@link TransactionAttributeSourceEditor}.
  *
- * <p>Format is: {@code FQN.Method=tx attribute representation}
+ * <p>Format is: {@code <fully-qualified class name>.<method-name>=tx attribute representation}
  *
  * @author Rod Johnson
  * @author Sam Brannen
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
index c6f90e8c64fa..9256bf10c8ae 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolver.java
@@ -77,7 +77,7 @@ public class SimpleMappingExceptionResolver extends AbstractHandlerExceptionReso
 	 * For example, "Exception" will match nearly anything, and will probably hide other rules.
 	 * "java.lang.Exception" would be correct if "Exception" was meant to define a rule for all
 	 * checked exceptions. With more unusual exception names such as "BaseBusinessException"
-	 * there's no need to use a FQN.
+	 * there's no need to use fully-qualified class name.
 	 * @param mappings exception patterns (can also be fully qualified class names) as keys,
 	 * and error view names as values
 	 */