메서드 명칭 수정
This commit is contained in:
@@ -21,7 +21,7 @@ public class BeanMetaData extends NexacroMetaData {
|
|||||||
|
|
||||||
public BeanMetaData(Class<?> genericType) {
|
public BeanMetaData(Class<?> genericType) {
|
||||||
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(genericType);
|
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(genericType);
|
||||||
Object insatance = beanWrapper.getInsatance();
|
Object insatance = beanWrapper.getInstance();
|
||||||
setMetaData(insatance);
|
setMetaData(insatance);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,7 +29,7 @@ public class BeanMetaData extends NexacroMetaData {
|
|||||||
public void setMetaData(Object obj) {
|
public void setMetaData(Object obj) {
|
||||||
if(!(obj instanceof NexacroBeanWrapper)) {
|
if(!(obj instanceof NexacroBeanWrapper)) {
|
||||||
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(obj);
|
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(obj);
|
||||||
this.metaDataObject = beanWrapper.getInsatance();
|
this.metaDataObject = beanWrapper.getInstance();
|
||||||
} else {
|
} else {
|
||||||
this.metaDataObject = obj;
|
this.metaDataObject = obj;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ public class AbstractDataSetConverter extends AbstractListenerHandler {
|
|||||||
|
|
||||||
// set saved data
|
// set saved data
|
||||||
if(ds.hasSavedRow(rowIndex)) {
|
if(ds.hasSavedRow(rowIndex)) {
|
||||||
Object bean = beanWrapper.getInsatance();
|
Object bean = beanWrapper.getInstance();
|
||||||
Class<?> beanType = bean.getClass();
|
Class<?> beanType = bean.getClass();
|
||||||
if(ReflectionUtil.isImplemented(beanType, DataSetSavedDataAccessor.class)) {
|
if(ReflectionUtil.isImplemented(beanType, DataSetSavedDataAccessor.class)) {
|
||||||
isSavedData = true;
|
isSavedData = true;
|
||||||
@@ -266,7 +266,7 @@ public class AbstractDataSetConverter extends AbstractListenerHandler {
|
|||||||
addRowIntoBean(savedBeanWrapper, ds, rowIndex, isSavedData, isRemovedData);
|
addRowIntoBean(savedBeanWrapper, ds, rowIndex, isSavedData, isRemovedData);
|
||||||
|
|
||||||
DataSetSavedDataAccessor accessor = (DataSetSavedDataAccessor) bean;
|
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();
|
Class beanType = bean.getClass();
|
||||||
|
|
||||||
// row type
|
// row type
|
||||||
|
|||||||
@@ -189,7 +189,7 @@ public class DataSetToListConverter extends AbstractDataSetConverter implements
|
|||||||
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(beanType);
|
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(beanType);
|
||||||
addRowAndOrgRowIntoBean(beanWrapper, ds, rowIndex);
|
addRowAndOrgRowIntoBean(beanWrapper, ds, rowIndex);
|
||||||
|
|
||||||
Object bean = beanWrapper.getInsatance();
|
Object bean = beanWrapper.getInstance();
|
||||||
dataList.add(bean);
|
dataList.add(bean);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,7 +198,7 @@ public class DataSetToListConverter extends AbstractDataSetConverter implements
|
|||||||
|
|
||||||
// Object bean = ReflectionUtil.instantiateClass(beanType);
|
// Object bean = ReflectionUtil.instantiateClass(beanType);
|
||||||
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(beanType);
|
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(beanType);
|
||||||
Object bean = beanWrapper.getInsatance();
|
Object bean = beanWrapper.getInstance();
|
||||||
boolean isSavedData = false;
|
boolean isSavedData = false;
|
||||||
boolean isRemovedData = true;
|
boolean isRemovedData = true;
|
||||||
addRowIntoBean(beanWrapper, ds, removedIndex, isSavedData, isRemovedData);
|
addRowIntoBean(beanWrapper, ds, removedIndex, isSavedData, isRemovedData);
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public class DataSetToObjectConverter extends AbstractDataSetConverter implement
|
|||||||
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(genericType);
|
NexacroBeanWrapper beanWrapper = NexacroBeanWrapper.createBeanWrapper(genericType);
|
||||||
addRowAndOrgRowIntoBean(beanWrapper, ds, 0);
|
addRowAndOrgRowIntoBean(beanWrapper, ds, 0);
|
||||||
|
|
||||||
Object bean = beanWrapper.getInsatance();
|
Object bean = beanWrapper.getInstance();
|
||||||
|
|
||||||
return bean;
|
return bean;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -79,13 +79,13 @@ public class NexacroBeanWrapper {
|
|||||||
Method writeMethod = property.getWriteMethod();
|
Method writeMethod = property.getWriteMethod();
|
||||||
try {
|
try {
|
||||||
ReflectionUtil.makeAccessible(writeMethod);
|
ReflectionUtil.makeAccessible(writeMethod);
|
||||||
writeMethod.invoke(getInsatance(), value);
|
writeMethod.invoke(getInstance(), value);
|
||||||
} catch (IllegalArgumentException e) {
|
} 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) {
|
} 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) {
|
} 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) {
|
// if(property.getOriginalPropertyName() != null) {
|
||||||
@@ -104,7 +104,7 @@ public class NexacroBeanWrapper {
|
|||||||
public void setPropertyValue(String propertyName, Object value) {
|
public void setPropertyValue(String propertyName, Object value) {
|
||||||
NexacroBeanProperty property = getCachedBeanMappings().getProperty(propertyName);
|
NexacroBeanProperty property = getCachedBeanMappings().getProperty(propertyName);
|
||||||
if(property == null ) {
|
if(property == null ) {
|
||||||
throw new NotWritablePropertyException(getInsatance().getClass(), propertyName);
|
throw new NotWritablePropertyException(getInstance().getClass(), propertyName);
|
||||||
}
|
}
|
||||||
setPropertyValue(property, value);
|
setPropertyValue(property, value);
|
||||||
}
|
}
|
||||||
@@ -132,7 +132,7 @@ public class NexacroBeanWrapper {
|
|||||||
public Object getPropertyValue(String propertyName) {
|
public Object getPropertyValue(String propertyName) {
|
||||||
NexacroBeanProperty property = getCachedBeanMappings().getProperty(propertyName);
|
NexacroBeanProperty property = getCachedBeanMappings().getProperty(propertyName);
|
||||||
if(property == null) {
|
if(property == null) {
|
||||||
throw new NotWritablePropertyException(getInsatance().getClass(), propertyName);
|
throw new NotWritablePropertyException(getInstance().getClass(), propertyName);
|
||||||
}
|
}
|
||||||
return getPropertyValue(property);
|
return getPropertyValue(property);
|
||||||
}
|
}
|
||||||
@@ -141,7 +141,7 @@ public class NexacroBeanWrapper {
|
|||||||
* 현재 설정 된 class의 object instance를 반환한다.
|
* 현재 설정 된 class의 object instance를 반환한다.
|
||||||
* @return object instance
|
* @return object instance
|
||||||
*/
|
*/
|
||||||
public Object getInsatance() {
|
public Object getInstance() {
|
||||||
return beanWrapper.getWrappedInstance();
|
return beanWrapper.getWrappedInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ public class NexacroBeanWrapperTest {
|
|||||||
public void testInstantiateClass() {
|
public void testInstantiateClass() {
|
||||||
|
|
||||||
NexacroBeanWrapper accessor = createAccessor(DefaultBean.class);
|
NexacroBeanWrapper accessor = createAccessor(DefaultBean.class);
|
||||||
Object insatance = accessor.getInsatance();
|
Object insatance = accessor.getInstance();
|
||||||
assertNotNull(insatance);
|
assertNotNull(insatance);
|
||||||
|
|
||||||
if(!(insatance instanceof DefaultBean)) {
|
if(!(insatance instanceof DefaultBean)) {
|
||||||
@@ -39,7 +39,7 @@ public class NexacroBeanWrapperTest {
|
|||||||
|
|
||||||
NexacroBeanWrapper accessor = createAccessor(DefaultBean.class);
|
NexacroBeanWrapper accessor = createAccessor(DefaultBean.class);
|
||||||
accessor.setPropertyValue("firstName", "tom");
|
accessor.setPropertyValue("firstName", "tom");
|
||||||
DefaultBean target = (DefaultBean) accessor.getInsatance();
|
DefaultBean target = (DefaultBean) accessor.getInstance();
|
||||||
assertTrue("Set name to tom", target.getFirstName().equals("tom"));
|
assertTrue("Set name to tom", target.getFirstName().equals("tom"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ public class NexacroBeanWrapperTest {
|
|||||||
|
|
||||||
NexacroBeanWrapper accessor = createAccessor(DefaultBean.class);
|
NexacroBeanWrapper accessor = createAccessor(DefaultBean.class);
|
||||||
accessor.setPropertyValue("invalid", "tom");
|
accessor.setPropertyValue("invalid", "tom");
|
||||||
DefaultBean target = (DefaultBean) accessor.getInsatance();
|
DefaultBean target = (DefaultBean) accessor.getInstance();
|
||||||
Assert.assertEquals("Set name to tom", "tom", target.getFirstName());
|
Assert.assertEquals("Set name to tom", "tom", target.getFirstName());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ public abstract class NexacroTestUtil {
|
|||||||
for (int i=0; i<dsPropertyNames.length; i++) {
|
for (int i=0; i<dsPropertyNames.length; i++) {
|
||||||
wrapper.setPropertyValue(dsPropertyNames[i], value[i]);
|
wrapper.setPropertyValue(dsPropertyNames[i], value[i]);
|
||||||
}
|
}
|
||||||
Object bean = wrapper.getInsatance();
|
Object bean = wrapper.getInstance();
|
||||||
beanList.add((DefaultBean) bean);
|
beanList.add((DefaultBean) bean);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user