From f523a341d474eddbc6c941ddbb1d843c743603ca Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 30 Aug 2018 08:39:11 +0200
Subject: [PATCH] WW-4954 Moves XWorkList out of util package

---
 .../xwork2/conversion/impl/CollectionConverter.java            | 1 -
 .../xwork2/{util => conversion/impl}/XWorkList.java            | 3 +--
 .../xwork2/{util => conversion/impl}/XWorkListTest.java        | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
 rename core/src/main/java/com/opensymphony/xwork2/{util => conversion/impl}/XWorkList.java (98%)
 rename core/src/test/java/com/opensymphony/xwork2/{util => conversion/impl}/XWorkListTest.java (98%)

diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
index 730e4af8b..b7f707f40 100644
--- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
+++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/CollectionConverter.java
@@ -21,7 +21,6 @@ package com.opensymphony.xwork2.conversion.impl;
 import com.opensymphony.xwork2.conversion.ObjectTypeDeterminer;
 import com.opensymphony.xwork2.conversion.TypeConverter;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.XWorkList;
 
 import java.lang.reflect.Member;
 import java.util.Collection;
diff --git a/core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
similarity index 98%
rename from core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
rename to core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
index 666ff5f1e..38da102be 100644
--- a/core/src/main/java/com/opensymphony/xwork2/util/XWorkList.java
+++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkList.java
@@ -16,13 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.util;
+package com.opensymphony.xwork2.conversion.impl;
 
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.ObjectFactory;
 import com.opensymphony.xwork2.XWorkException;
 import com.opensymphony.xwork2.conversion.TypeConverter;
-import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
diff --git a/core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
similarity index 98%
rename from core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
rename to core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
index 21c8f03a9..a94d63caa 100644
--- a/core/src/test/java/com/opensymphony/xwork2/util/XWorkListTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkListTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.util;
+package com.opensymphony.xwork2.conversion.impl;
 
 import com.opensymphony.xwork2.XWorkTestCase;