Author: echatellier Date: 2010-07-12 18:05:27 +0200 (Mon, 12 Jul 2010) New Revision: 185 Url: http://nuiton.org/repositories/revision/wikitty/185 Log: #603 : Remove WikittyBean generator Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-07-12 16:04:42 UTC (rev 184) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-07-12 16:05:27 UTC (rev 185) @@ -18,7 +18,6 @@ package org.nuiton.wikitty; import java.lang.reflect.Constructor; -import java.lang.reflect.Field; import java.math.BigDecimal; import java.text.DateFormat; import java.text.ParseException; @@ -32,7 +31,6 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.TimeZone; import java.util.UUID; import java.util.regex.Matcher; @@ -762,144 +760,7 @@ return result; } - /*public static Wikitty beanToWikitty(BusinessEntity bean) { - Wikitty result; - if (bean instanceof BusinessEntityWikitty) { - BusinessEntityWikitty b = (BusinessEntityWikitty) bean; - result = b.getWikitty(); - } else if (bean instanceof BusinessEntityBean) { - BusinessEntityBean b = (BusinessEntityBean) bean; - result = WikittyUtil.beanToWikitty(b); - } else { - throw new IllegalArgumentException(String.format( - "This BusinessEntity implementation is not supported: %s", - bean.getClass().getName())); - } - return result; - }*/ - - /*public static Wikitty beanToWikitty(BusinessEntityBean bean) { - try { - // TODO poussin 20090910 for now, we force version change, but it's - // better if we modify version in bean we field is set - Wikitty result = new Wikitty(bean.getWikittyId()); - // prevent BusinessEntity with null id (during store call for - // creation) - bean.id = result.id; - result.version = bean.getWikittyVersion(); - - // add execution defined extension in wikitty - for (String extName : bean.getExtensionNames()) { - for (String fieldName : bean.getExtensionFields(extName)) { - Object value = bean.getField(extName, fieldName); - result.setField(extName, fieldName, value); - } - } - - // add development time defined extension in wikitty - Field[] fields = bean.getClass().getFields(); - for (Field field : fields) { - Object value = field.get(bean); - String fqfieldName = field.getName(); - // fieldName use $ as separator between extension name and field - // name - fqfieldName = fqfieldName.replace('$', '.'); - result.setFqField(fqfieldName, value); - } - return result; - } catch (Exception eee) { - throw new WikittyException(eee); - } - }*/ - - /*public static <E extends BusinessEntityBean, F extends BusinessEntityWikitty> E wikittyToBean( - Class<E> clazz, F dto) { - E result = wikittyToBean(clazz, dto.getWikitty()); - return result; - }*/ - /** - * Convert WikittyDto (dto that encapsulate Wikitty) to BeanDto (dto without - * internaly wikitty) - * - * @param clazz target object clazz - * @param w source object - * @return - */ - /*public static <E extends BusinessEntityBean> E wikittyToBean( - Class<E> clazz, Wikitty w) { - try { - E result = clazz.newInstance(); - result.id = w.id; - result.version = w.version; - result.extensions = new LinkedHashMap<String, WikittyExtension>( - w.extensions); - - Field[] fields = clazz.getFields(); - Map<String, Field> allFields = new HashMap<String, Field>(); - for (Field field : fields) { - allFields.put(field.getName(), field); - } - - for (String extName : result.extensions.keySet()) { - WikittyExtension ext = result.extensions.get(extName); - for (String fieldName : ext.getFieldNames()) { - String key = extName + "$" + fieldName; - Field field = allFields.get(key); - if (field != null) { - Class type = field.getType(); - if (Integer.TYPE.isAssignableFrom(type)) { - int value = w.getFieldAsInt(extName, fieldName); - field.setInt(result, value); - } else if (Boolean.TYPE.isAssignableFrom(type)) { - boolean value = w.getFieldAsBoolean(extName, - fieldName); - field.setBoolean(result, value); - } else if (Date.class.isAssignableFrom(type)) { - Date value = w.getFieldAsDate(extName, fieldName); - field.set(result, value); - } else if (Double.TYPE.isAssignableFrom(type)) { - double value = w.getFieldAsDouble(extName, - fieldName); - field.setDouble(result, value); - } else if (Float.TYPE.isAssignableFrom(type)) { - float value = w.getFieldAsFloat(extName, fieldName); - field.setFloat(result, value); - } else if (List.class.isAssignableFrom(type)) { - List value = w.getFieldAsList(extName, fieldName, - clazz); - field.set(result, value); - } else if (Long.TYPE.isAssignableFrom(type)) { - long value = w.getFieldAsLong(extName, fieldName); - field.setLong(result, value); - } else if (Set.class.isAssignableFrom(type)) { - Set value = w.getFieldAsSet(extName, fieldName, - clazz); - field.set(result, value); - } else if (String.class.isAssignableFrom(type)) { - String value = w.getFieldAsString(extName, - fieldName); - field.set(result, value); - } else { - throw new WikittyException(String.format( - "Can't convert field for '%s' because" - + " unkonw field type '%s'", clazz, - field)); - } - } else { - Object value = w.getFieldAsObject(extName, fieldName); - result.setField(extName, fieldName, value); - } - } - } - - return result; - } catch (Exception eee) { - throw new WikittyException(eee); - } - }*/ - - /** * SecurityToken is used like wikitty id and must begin with UUID_ * * @return SecurityToken that can be used like wikitty id