From 8e6477900e335e80cad34ab655820f0f40088ccc Mon Sep 17 00:00:00 2001
From: tenax66 <hiyoshir+tenax66@gmail.com>
Date: Mon, 13 Nov 2023 21:14:46 +0900
Subject: [PATCH] refactor: Apply `@Nullable` annotation to
 `spoon.support.util`

---
 src/main/java/spoon/support/util/RtHelper.java           | 3 ++-
 .../java/spoon/support/util/internal/ElementNameMap.java | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/spoon/support/util/RtHelper.java b/src/main/java/spoon/support/util/RtHelper.java
index 3831331f022..714cf43d8aa 100644
--- a/src/main/java/spoon/support/util/RtHelper.java
+++ b/src/main/java/spoon/support/util/RtHelper.java
@@ -7,6 +7,7 @@
  */
 package spoon.support.util;
 
+import org.jspecify.annotations.Nullable;
 import spoon.reflect.code.CtExpression;
 import spoon.reflect.code.CtInvocation;
 import spoon.reflect.code.CtLiteral;
@@ -179,7 +180,7 @@ public static Collection<CtExecutableReference<?>> getAllExecutables(Class<?> cl
 	 * @param numParams
 	 * @return the found method or null
 	 */
-	public static Method getMethod(Class<?> clazz, String methodName, int numParams) {
+	public static @Nullable Method getMethod(Class<?> clazz, String methodName, int numParams) {
 		Method[] methods = clazz.getMethods();
 		for (Method method : methods) {
 			if (!method.isSynthetic() && method.getName().equals(methodName)) {
diff --git a/src/main/java/spoon/support/util/internal/ElementNameMap.java b/src/main/java/spoon/support/util/internal/ElementNameMap.java
index 50601d3bd60..64d8a3010a9 100644
--- a/src/main/java/spoon/support/util/internal/ElementNameMap.java
+++ b/src/main/java/spoon/support/util/internal/ElementNameMap.java
@@ -23,6 +23,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import spoon.reflect.declaration.CtElement;
 import spoon.reflect.path.CtRole;
 import spoon.support.modelobs.FineModelChangeListener;
@@ -91,7 +92,7 @@ protected ElementNameMap() {
 	 *     if the element is actually replaced.
 	 */
 	@Override
-	public T put(String key, T e) {
+	public @Nullable T put(String key, T e) {
 		if (e == null) {
 			return null;
 		}
@@ -107,12 +108,12 @@ public T put(String key, T e) {
 		return valueOrNull(map.put(key, wrapper));
 	}
 
-	private T valueOrNull(InsertOrderWrapper<T> wrapper) {
+	private @Nullable T valueOrNull(InsertOrderWrapper<T> wrapper) {
 		return wrapper != null ? wrapper.value : null;
 	}
 
 	@Override
-	public T remove(Object key) {
+	public @Nullable T remove(Object key) {
 		T removed = valueOrNull(map.remove(key));
 
 		if (removed == null) {
@@ -165,7 +166,7 @@ public boolean containsKey(Object key) {
 	}
 
 	@Override
-	public T get(Object key) {
+	public @Nullable T get(Object key) {
 		InsertOrderWrapper<T> wrapper = map.get(key);
 		if (wrapper == null) {
 			return null;