WW-4996 Renames and moves class to proper package to better expose it…

…s meaning
liucy1898 · Jan 3, 2019 · 6adfbed · 6adfbed
1 parent 243a8c8
commit 6adfbed
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java b/core/src/main/java/com/opensymphony/xwork2/config/impl/DefaultConfiguration.java
@@ -42,6 +42,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.StrutsConstants;
+import org.apache.struts2.conversion.StrutsTypeConverterHolder;
 import org.apache.struts2.conversion.StrutsTypeConverterCreator;
 
 import java.util.*;
@@ -259,7 +260,7 @@ protected Container createBootstrapContainer(List<ContainerProvider> providers)
         builder.factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON);
         builder.factory(ConversionAnnotationProcessor.class, DefaultConversionAnnotationProcessor.class, Scope.SINGLETON);
         builder.factory(TypeConverterCreator.class, StrutsTypeConverterCreator.class, Scope.SINGLETON);
-        builder.factory(TypeConverterHolder.class, DefaultTypeConverterHolder.class, Scope.SINGLETON);
+        builder.factory(TypeConverterHolder.class, StrutsTypeConverterHolder.class, Scope.SINGLETON);
 
         builder.factory(XWorkBasicConverter.class, Scope.SINGLETON);
         builder.factory(TypeConverter.class, StrutsConstants.STRUTS_CONVERTER_COLLECTION,  CollectionConverter.class, Scope.SINGLETON);

diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XWorkConfigurationProvider.java
@@ -57,7 +57,7 @@
 import com.opensymphony.xwork2.conversion.impl.DefaultConversionPropertiesProcessor;
 import com.opensymphony.xwork2.conversion.impl.DefaultObjectTypeDeterminer;
 import org.apache.struts2.conversion.StrutsTypeConverterCreator;
-import com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder;
+import org.apache.struts2.conversion.StrutsTypeConverterHolder;
 import com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler;
 import com.opensymphony.xwork2.conversion.impl.NumberConverter;
 import com.opensymphony.xwork2.conversion.impl.StringConverter;
@@ -159,7 +159,7 @@ public void register(ContainerBuilder builder, LocatableProperties props)
                 .factory(ConversionFileProcessor.class, DefaultConversionFileProcessor.class, Scope.SINGLETON)
                 .factory(ConversionAnnotationProcessor.class, DefaultConversionAnnotationProcessor.class, Scope.SINGLETON)
                 .factory(TypeConverterCreator.class, StrutsTypeConverterCreator.class, Scope.SINGLETON)
-                .factory(TypeConverterHolder.class, DefaultTypeConverterHolder.class, Scope.SINGLETON)
+                .factory(TypeConverterHolder.class, StrutsTypeConverterHolder.class, Scope.SINGLETON)
 
                 .factory(FileManager.class, "system", DefaultFileManager.class, Scope.SINGLETON)
                 .factory(FileManagerFactory.class, DefaultFileManagerFactory.class, Scope.SINGLETON)

diff --git a/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java b/core/src/main/java/com/opensymphony/xwork2/factory/DefaultConverterFactory.java
@@ -42,7 +42,7 @@ public void setContainer(Container container) {
 
     public TypeConverter buildConverter(Class<? extends TypeConverter> converterClass, Map<String, Object> extraContext) throws Exception {
         LOG.debug("Creating converter of type [{}]", converterClass.getCanonicalName());
-        return container.getInstance(converterClass);
+        return container.inject(converterClass);
     }
 
 }
diff --git a/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java b/core/src/main/java/org/apache/struts2/conversion/StrutsTypeConverterCreator.java
@@ -22,7 +22,6 @@
 import com.opensymphony.xwork2.conversion.TypeConverter;
 import com.opensymphony.xwork2.conversion.TypeConverterCreator;
 import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.ognl.XWorkTypeConverterWrapper;
 
 /**
  * Default implementation of {@link TypeConverterCreator}
@@ -39,7 +38,7 @@ public void setObjectFactory(ObjectFactory objectFactory) {
     public TypeConverter createTypeConverter(String className) throws Exception {
         Class<?> classInstance = objectFactory.getClassInstance(className);
 
-        if (classInstance.isAssignableFrom(TypeConverter.class)) {
+        if (TypeConverter.class.isAssignableFrom(classInstance)) {
             Class<? extends TypeConverter> converterClass = (Class<? extends TypeConverter>) classInstance;
             return objectFactory.buildConverter(converterClass, null);
         } else {
@@ -48,7 +47,7 @@ public TypeConverter createTypeConverter(String className) throws Exception {
     }
 
     public TypeConverter createTypeConverter(Class<?> clazz) throws Exception {
-        if (clazz.isAssignableFrom(TypeConverter.class)) {
+        if (TypeConverter.class.isAssignableFrom(clazz)) {
             Class<? extends TypeConverter> converterClass = (Class<? extends TypeConverter>) clazz;
             return objectFactory.buildConverter(converterClass, null);
         } else {

diff --git a/...sion/impl/DefaultTypeConverterHolder.java → ...conversion/StrutsTypeConverterHolder.java b/...sion/impl/DefaultTypeConverterHolder.java → ...conversion/StrutsTypeConverterHolder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.opensymphony.xwork2.conversion.impl;
+package org.apache.struts2.conversion;
 
 import com.opensymphony.xwork2.conversion.TypeConverter;
 import com.opensymphony.xwork2.conversion.TypeConverterHolder;
@@ -28,7 +28,7 @@
 /**
  * Default implementation of {@link TypeConverterHolder}
  */
-public class DefaultTypeConverterHolder implements TypeConverterHolder {
+public class StrutsTypeConverterHolder implements TypeConverterHolder {
 
     /**
      * Record class and its type converter mapping.

diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml
@@ -115,7 +115,7 @@
     <bean type="com.opensymphony.xwork2.conversion.ConversionFileProcessor" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultConversionFileProcessor" />
     <bean type="com.opensymphony.xwork2.conversion.ConversionAnnotationProcessor" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultConversionAnnotationProcessor" />
     <bean type="com.opensymphony.xwork2.conversion.TypeConverterCreator" name="struts" class="org.apache.struts2.conversion.StrutsTypeConverterCreator" />
-    <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder" name="struts" class="com.opensymphony.xwork2.conversion.impl.DefaultTypeConverterHolder" />
+    <bean type="com.opensymphony.xwork2.conversion.TypeConverterHolder" name="struts" class="org.apache.struts2.conversion.StrutsTypeConverterHolder" />
 
     <bean class="com.opensymphony.xwork2.conversion.impl.XWorkBasicConverter" />