From bf267ade1115e062b61a52add737556bc32a4a21 Mon Sep 17 00:00:00 2001 From: santosr09 Date: Sat, 11 Apr 2020 14:01:29 -0500 Subject: [PATCH] Moves TypeConversionException into org.apache.struts2.conversion --- .../com/opensymphony/xwork2/conversion/impl/DateConverter.java | 2 +- .../opensymphony/xwork2/conversion/impl/NumberConverter.java | 2 +- .../xwork2/conversion/impl/XWorkBasicConverter.java | 2 +- .../apache/struts2}/conversion/TypeConversionException.java | 2 +- .../opensymphony/xwork2/conversion/impl/DateConverterTest.java | 2 +- .../xwork2/conversion/impl/NumberConverterTest.java | 2 +- .../xwork2/conversion/impl/XWorkBasicConverterTest.java | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) rename core/src/main/java/{com/opensymphony/xwork2 => org/apache/struts2}/conversion/TypeConversionException.java (97%) diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java index b1583ee20..749b08bb6 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java @@ -18,7 +18,7 @@ */ package com.opensymphony.xwork2.conversion.impl; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import org.apache.struts2.conversion.TypeConversionException; import java.lang.reflect.Constructor; import java.lang.reflect.Member; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java index d4514e1ec..3f4756629 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/NumberConverter.java @@ -18,7 +18,7 @@ */ package com.opensymphony.xwork2.conversion.impl; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import org.apache.struts2.conversion.TypeConversionException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java index 5d4de6c2f..d415a8d1a 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java +++ b/core/src/main/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverter.java @@ -18,7 +18,7 @@ */ package com.opensymphony.xwork2.conversion.impl; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import org.apache.struts2.conversion.TypeConversionException; import com.opensymphony.xwork2.conversion.TypeConverter; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.inject.Inject; diff --git a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java b/core/src/main/java/org/apache/struts2/conversion/TypeConversionException.java similarity index 97% rename from core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java rename to core/src/main/java/org/apache/struts2/conversion/TypeConversionException.java index 73db26498..0d324bcad 100644 --- a/core/src/main/java/com/opensymphony/xwork2/conversion/TypeConversionException.java +++ b/core/src/main/java/org/apache/struts2/conversion/TypeConversionException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package com.opensymphony.xwork2.conversion; +package org.apache.struts2.conversion; import org.apache.struts2.StrutsException; diff --git a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/DateConverterTest.java b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/DateConverterTest.java index 676d29c17..157e6d815 100644 --- a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/DateConverterTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/DateConverterTest.java @@ -19,7 +19,7 @@ package com.opensymphony.xwork2.conversion.impl; import com.opensymphony.xwork2.ActionContext; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import org.apache.struts2.conversion.TypeConversionException; import org.apache.struts2.StrutsInternalTestCase; import java.sql.Time; diff --git a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java index 8b995dc09..049e740e4 100644 --- a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/NumberConverterTest.java @@ -21,7 +21,7 @@ package com.opensymphony.xwork2.conversion.impl; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.SimpleFooAction; import com.opensymphony.xwork2.XWorkTestCase; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import org.apache.struts2.conversion.TypeConversionException; import org.apache.commons.lang3.StringUtils; import java.math.BigDecimal; diff --git a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java index 8a6d9cfe2..33fea8377 100644 --- a/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java +++ b/core/src/test/java/com/opensymphony/xwork2/conversion/impl/XWorkBasicConverterTest.java @@ -20,11 +20,10 @@ package com.opensymphony.xwork2.conversion.impl; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.XWorkTestCase; -import com.opensymphony.xwork2.conversion.TypeConversionException; +import org.apache.struts2.conversion.TypeConversionException; import com.opensymphony.xwork2.inject.Container; import com.opensymphony.xwork2.test.annotations.Person; import org.apache.struts2.StrutsException; -import org.mockito.Mock; import org.mockito.Mockito; import java.math.BigDecimal;