mindol1004/nexacro-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

메서드 명칭 수정

Browse Source
This commit is contained in:
ParkSeongMin
2015-11-05 00:55:36 +00:00
parent a4a0f11497
commit b3d38b0981
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nexacro/spring/data/metadata/support/BeanMetaData.java
View File

@@ -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;
}

6
src/main/java/com/nexacro/spring/data/support/AbstractDataSetConverter.java
View File

@@ -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

4
src/main/java/com/nexacro/spring/data/support/DataSetToListConverter.java
View File

@@ -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);

2
src/main/java/com/nexacro/spring/data/support/DataSetToObjectConverter.java
View File

@@ -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;
}

14
src/main/java/com/nexacro/spring/data/support/NexacroBeanWrapper.java
View File

@@ -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();
}

6
src/test/java/com/nexacro/spring/data/support/NexacroBeanWrapperTest.java
View File

@@ -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());
}

2
src/test/java/com/nexacro/spring/data/support/NexacroTestUtil.java
View File

@@ -125,7 +125,7 @@ public abstract class NexacroTestUtil {
for (int i=0; i<dsPropertyNames.length; i++) {
wrapper.setPropertyValue(dsPropertyNames[i], value[i]);
}
Object bean = wrapper.getInsatance();
Object bean = wrapper.getInstance();
beanList.add((DefaultBean) bean);
}