From b3d38b098108256a8d7bb62bc32b62e31790f539 Mon Sep 17 00:00:00 2001 From: ParkSeongMin Date: Thu, 5 Nov 2015 00:55:36 +0000 Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=84=9C=EB=93=9C=20=EB=AA=85?= =?UTF-8?q?=EC=B9=AD=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spring/data/metadata/support/BeanMetaData.java | 4 ++-- .../data/support/AbstractDataSetConverter.java | 6 +++--- .../data/support/DataSetToListConverter.java | 4 ++-- .../data/support/DataSetToObjectConverter.java | 2 +- .../spring/data/support/NexacroBeanWrapper.java | 14 +++++++------- .../data/support/NexacroBeanWrapperTest.java | 6 +++--- .../spring/data/support/NexacroTestUtil.java | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/nexacro/spring/data/metadata/support/BeanMetaData.java b/src/main/java/com/nexacro/spring/data/metadata/support/BeanMetaData.java index 9627c16..83fcf07 100644 --- a/src/main/java/com/nexacro/spring/data/metadata/support/BeanMetaData.java +++ b/src/main/java/com/nexacro/spring/data/metadata/support/BeanMetaData.java @@ -21,7 +21,7 @@ public class BeanMetaData extends NexacroMetaData { public BeanMetaData(Class genericType) { NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(genericType); - Object insatance = beanWrapper.getInsatance(); + Object insatance = beanWrapper.getInstance(); setMetaData(insatance); } @@ -29,7 +29,7 @@ public class BeanMetaData extends NexacroMetaData { public void setMetaData(Object obj) { if(!(obj instanceof NexacroBeanWrapper)) { NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(obj); - this.metaDataObject = beanWrapper.getInsatance(); + this.metaDataObject = beanWrapper.getInstance(); } else { this.metaDataObject = obj; } diff --git a/src/main/java/com/nexacro/spring/data/support/AbstractDataSetConverter.java b/src/main/java/com/nexacro/spring/data/support/AbstractDataSetConverter.java index 0bd9daf..6d41616 100644 --- a/src/main/java/com/nexacro/spring/data/support/AbstractDataSetConverter.java +++ b/src/main/java/com/nexacro/spring/data/support/AbstractDataSetConverter.java @@ -258,7 +258,7 @@ public class AbstractDataSetConverter extends AbstractListenerHandler { // set saved data if(ds.hasSavedRow(rowIndex)) { - Object bean = beanWrapper.getInsatance(); + Object bean = beanWrapper.getInstance(); Class beanType = bean.getClass(); if(ReflectionUtil.isImplemented(beanType, DataSetSavedDataAccessor.class)) { isSavedData = true; @@ -266,7 +266,7 @@ public class AbstractDataSetConverter extends AbstractListenerHandler { addRowIntoBean(savedBeanWrapper, ds, rowIndex, isSavedData, isRemovedData); DataSetSavedDataAccessor accessor = (DataSetSavedDataAccessor) bean; - accessor.setData(savedBeanWrapper.getInsatance()); + accessor.setData(savedBeanWrapper.getInstance()); } } @@ -313,7 +313,7 @@ public class AbstractDataSetConverter extends AbstractListenerHandler { } } - Object bean = beanWrapper.getInsatance(); + Object bean = beanWrapper.getInstance(); Class beanType = bean.getClass(); // row type diff --git a/src/main/java/com/nexacro/spring/data/support/DataSetToListConverter.java b/src/main/java/com/nexacro/spring/data/support/DataSetToListConverter.java index b2072da..03ccba8 100644 --- a/src/main/java/com/nexacro/spring/data/support/DataSetToListConverter.java +++ b/src/main/java/com/nexacro/spring/data/support/DataSetToListConverter.java @@ -189,7 +189,7 @@ public class DataSetToListConverter extends AbstractDataSetConverter implements NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(beanType); addRowAndOrgRowIntoBean(beanWrapper, ds, rowIndex); - Object bean = beanWrapper.getInsatance(); + Object bean = beanWrapper.getInstance(); dataList.add(bean); } @@ -198,7 +198,7 @@ public class DataSetToListConverter extends AbstractDataSetConverter implements // Object bean = ReflectionUtil.instantiateClass(beanType); NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(beanType); - Object bean = beanWrapper.getInsatance(); + Object bean = beanWrapper.getInstance(); boolean isSavedData = false; boolean isRemovedData = true; addRowIntoBean(beanWrapper, ds, removedIndex, isSavedData, isRemovedData); diff --git a/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java b/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java index 198fa5e..6e7b0ad 100644 --- a/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java +++ b/src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java @@ -73,7 +73,7 @@ public class DataSetToObjectConverter extends AbstractDataSetConverter implement NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(genericType); addRowAndOrgRowIntoBean(beanWrapper, ds, 0); - Object bean = beanWrapper.getInsatance(); + Object bean = beanWrapper.getInstance(); return bean; } diff --git a/src/main/java/com/nexacro/spring/data/support/NexacroBeanWrapper.java b/src/main/java/com/nexacro/spring/data/support/NexacroBeanWrapper.java index 289bb76..8a2b2b6 100644 --- a/src/main/java/com/nexacro/spring/data/support/NexacroBeanWrapper.java +++ b/src/main/java/com/nexacro/spring/data/support/NexacroBeanWrapper.java @@ -79,13 +79,13 @@ public class NexacroBeanWrapper { Method writeMethod = property.getWriteMethod(); try { ReflectionUtil.makeAccessible(writeMethod); - writeMethod.invoke(getInsatance(), value); + writeMethod.invoke(getInstance(), value); } catch (IllegalArgumentException e) { - throw new NotWritablePropertyException(getInsatance().getClass(), property.getPropertyName(), "Could not set object property", e); + throw new NotWritablePropertyException(getInstance().getClass(), property.getPropertyName(), "Could not set object property", e); } catch (IllegalAccessException e) { - throw new NotWritablePropertyException(getInsatance().getClass(), property.getPropertyName(), "Could not set object property", e); + throw new NotWritablePropertyException(getInstance().getClass(), property.getPropertyName(), "Could not set object property", e); } catch (InvocationTargetException e) { - throw new NotWritablePropertyException(getInsatance().getClass(), property.getPropertyName(), "Could not set object property", e.getTargetException()); + throw new NotWritablePropertyException(getInstance().getClass(), property.getPropertyName(), "Could not set object property", e.getTargetException()); } // if(property.getOriginalPropertyName() != null) { @@ -104,7 +104,7 @@ public class NexacroBeanWrapper { public void setPropertyValue(String propertyName, Object value) { NexacroBeanProperty property = getCachedBeanMappings().getProperty(propertyName); if(property == null ) { - throw new NotWritablePropertyException(getInsatance().getClass(), propertyName); + throw new NotWritablePropertyException(getInstance().getClass(), propertyName); } setPropertyValue(property, value); } @@ -132,7 +132,7 @@ public class NexacroBeanWrapper { public Object getPropertyValue(String propertyName) { NexacroBeanProperty property = getCachedBeanMappings().getProperty(propertyName); if(property == null) { - throw new NotWritablePropertyException(getInsatance().getClass(), propertyName); + throw new NotWritablePropertyException(getInstance().getClass(), propertyName); } return getPropertyValue(property); } @@ -141,7 +141,7 @@ public class NexacroBeanWrapper { * 현재 설정 된 class의 object instance를 반환한다. * @return object instance */ - public Object getInsatance() { + public Object getInstance() { return beanWrapper.getWrappedInstance(); } diff --git a/src/test/java/com/nexacro/spring/data/support/NexacroBeanWrapperTest.java b/src/test/java/com/nexacro/spring/data/support/NexacroBeanWrapperTest.java index 9952bcb..e5dad49 100644 --- a/src/test/java/com/nexacro/spring/data/support/NexacroBeanWrapperTest.java +++ b/src/test/java/com/nexacro/spring/data/support/NexacroBeanWrapperTest.java @@ -26,7 +26,7 @@ public class NexacroBeanWrapperTest { public void testInstantiateClass() { NexacroBeanWrapper accessor = createAccessor(DefaultBean.class); - Object insatance = accessor.getInsatance(); + Object insatance = accessor.getInstance(); assertNotNull(insatance); if(!(insatance instanceof DefaultBean)) { @@ -39,7 +39,7 @@ public class NexacroBeanWrapperTest { NexacroBeanWrapper accessor = createAccessor(DefaultBean.class); accessor.setPropertyValue("firstName", "tom"); - DefaultBean target = (DefaultBean) accessor.getInsatance(); + DefaultBean target = (DefaultBean) accessor.getInstance(); assertTrue("Set name to tom", target.getFirstName().equals("tom")); } @@ -54,7 +54,7 @@ public class NexacroBeanWrapperTest { NexacroBeanWrapper accessor = createAccessor(DefaultBean.class); accessor.setPropertyValue("invalid", "tom"); - DefaultBean target = (DefaultBean) accessor.getInsatance(); + DefaultBean target = (DefaultBean) accessor.getInstance(); Assert.assertEquals("Set name to tom", "tom", target.getFirstName()); } diff --git a/src/test/java/com/nexacro/spring/data/support/NexacroTestUtil.java b/src/test/java/com/nexacro/spring/data/support/NexacroTestUtil.java index c48eaa2..33c1148 100644 --- a/src/test/java/com/nexacro/spring/data/support/NexacroTestUtil.java +++ b/src/test/java/com/nexacro/spring/data/support/NexacroTestUtil.java @@ -125,7 +125,7 @@ public abstract class NexacroTestUtil { for (int i=0; i