From d9a31fdd184b8e39fd7608729a5d2e5e699764d3 Mon Sep 17 00:00:00 2001
From: Henri Biestro <hbiestro@cloudera.com>
Date: Fri, 17 Nov 2023 22:27:14 -0800
Subject: [PATCH] JEXL-414: fixing wrong import order;

---
 src/main/java/org/apache/commons/jexl3/JexlCache.java           | 1 +
 .../java/org/apache/commons/jexl3/internal/ConcurrentCache.java | 2 +-
 src/main/java/org/apache/commons/jexl3/internal/Engine.java     | 2 +-
 src/main/java/org/apache/commons/jexl3/internal/SoftCache.java  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/commons/jexl3/JexlCache.java b/src/main/java/org/apache/commons/jexl3/JexlCache.java
index bd976fa44..c7776e027 100644
--- a/src/main/java/org/apache/commons/jexl3/JexlCache.java
+++ b/src/main/java/org/apache/commons/jexl3/JexlCache.java
@@ -55,6 +55,7 @@ public interface JexlCache<K, V> {
    *
    * @param key    the cache entry key
    * @param script the cache entry value
+   * @return the previously associated value if any
    */
   V put(K key, V script);
 
diff --git a/src/main/java/org/apache/commons/jexl3/internal/ConcurrentCache.java b/src/main/java/org/apache/commons/jexl3/internal/ConcurrentCache.java
index d04bfbb8a..03c5648e4 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/ConcurrentCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/ConcurrentCache.java
@@ -16,10 +16,10 @@
  */
 package org.apache.commons.jexl3.internal;
 
+import java.lang.ref.SoftReference;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
-import java.lang.ref.SoftReference;
 
 import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap;
 
diff --git a/src/main/java/org/apache/commons/jexl3/internal/Engine.java b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
index bb355b429..7153f827c 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/Engine.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/Engine.java
@@ -34,9 +34,9 @@
 import java.util.function.IntFunction;
 import java.util.function.Predicate;
 
-import org.apache.commons.jexl3.JexlCache;
 import org.apache.commons.jexl3.JexlArithmetic;
 import org.apache.commons.jexl3.JexlBuilder;
+import org.apache.commons.jexl3.JexlCache;
 import org.apache.commons.jexl3.JexlContext;
 import org.apache.commons.jexl3.JexlEngine;
 import org.apache.commons.jexl3.JexlException;
diff --git a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
index d5632da84..24db61ac1 100644
--- a/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
+++ b/src/main/java/org/apache/commons/jexl3/internal/SoftCache.java
@@ -16,13 +16,13 @@
  */
 package org.apache.commons.jexl3.internal;
 
+import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.lang.ref.SoftReference;
 
 import org.apache.commons.jexl3.JexlCache;