r184 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-generators/src/main/java/org/nuiton/wikitty/generator
Author: echatellier Date: 2010-07-12 18:04:42 +0200 (Mon, 12 Jul 2010) New Revision: 184 Url: http://nuiton.org/repositories/revision/wikitty/184 Log: #603 : Remove WikittyBean generator Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityBean.java 2010-07-12 16:04:42 UTC (rev 184) @@ -1,143 +0,0 @@ -/* *##% - * Copyright (c) 2009 poussin. All rights reserved. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - *##%*/ - -package org.nuiton.wikitty; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; - -/** - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -// FIXME poussin 20100528 verifie que cette classe n'est reellement plus utilisee, seul BusinessEntity(Wikitty) devrait l'etre -@Deprecated -public class BusinessEntityBean implements BusinessEntity { - - /** serialVersionUID. */ - private static final long serialVersionUID = 5245199905431320116L; - - /** - * Property change support. - * - * Warning, this transient field is null after deserialization. - */ - protected transient PropertyChangeSupport propertyChangeSupport; - - protected String id; - protected String version; - - /** - * Map is LinkedHashMap to maintains order like user want - * key: extension name - * value: extension definition - */ - protected Map<String, WikittyExtension> extensions = - new LinkedHashMap<String, WikittyExtension>(); - /** - * key: field name prefixed by extension name (dot separator) - * value: value of field - */ - protected Map<String, Object> fieldValue = new HashMap<String, Object>(); - - public String getWikittyId() { - return id; - } - - public String getWikittyVersion() { - return version; - } - - public void setWikittyVersion(String version) { - this.version = version; - } - - protected PropertyChangeSupport getPropertyChangeSupport() { - if (propertyChangeSupport == null) { - propertyChangeSupport = new PropertyChangeSupport(this); - } - return propertyChangeSupport; - } - - public Collection<String> getExtensionNames() { - Collection<String> result = extensions.keySet(); - return result; - } - - public Collection<String> getExtensionFields(String ext) { - WikittyExtension extension = extensions.get(ext); - Collection<String> result = extension.getFieldNames(); - return result; - } - - public Object getField(String ext, String fieldName) { - String key = ext + "$" + fieldName; - Object result = fieldValue.get(key); - return result; - } - - public void setField(String ext, String fieldName, Object value) { - String key = ext + "$" + fieldName; - fieldValue.put(key, value); - } - - public FieldType getFieldType(String ext, String fieldName) { - throw new UnsupportedOperationException("Not supported yet."); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.beans.PropertyChangeListener) - */ - @Override - public void addPropertyChangeListener(PropertyChangeListener listener) { - getPropertyChangeSupport().addPropertyChangeListener(listener); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.beans.PropertyChangeListener) - */ - @Override - public void removePropertyChangeListener(PropertyChangeListener listener) { - getPropertyChangeSupport().removePropertyChangeListener(listener); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#addPropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) - */ - @Override - public void addPropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - getPropertyChangeSupport().addPropertyChangeListener(propertyName, listener); - } - - /* - * @see org.nuiton.wikitty.BusinessEntity#removePropertyChangeListener(java.lang.String, java.beans.PropertyChangeListener) - */ - @Override - public void removePropertyChangeListener(String propertyName, - PropertyChangeListener listener) { - getPropertyChangeSupport().removePropertyChangeListener(propertyName, listener); - } -} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-07-12 16:04:42 UTC (rev 184) @@ -36,22 +36,9 @@ } public void update(BusinessEntity e) { - if (e instanceof BusinessEntityWikitty) { - update((BusinessEntityWikitty) e); - } else if (e instanceof BusinessEntityBean) { - update((BusinessEntityBean) e); - } + update((BusinessEntityWikitty) e); } - public void update(BusinessEntityBean e) { - // update version - String id = e.getWikittyId(); - String version = idVersionMap.get(id); - if (version != null) { - e.setWikittyVersion(version); - } - } - public void update(BusinessEntityWikitty e) { update(e.getWikitty()); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-07-12 16:04:42 UTC (rev 184) @@ -73,7 +73,7 @@ } public <E extends BusinessEntity> E store(E e) { - Wikitty w = WikittyUtil.beanToWikitty(e); + Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); UpdateResponse resp = wikittyService.store(securityToken, w); resp.update(e); return e; @@ -90,7 +90,7 @@ // prepare data to send to service List<Wikitty> wikitties = new ArrayList<Wikitty>(objets.size()); for (E e : objets) { - Wikitty w = WikittyUtil.beanToWikitty(e); + Wikitty w = ((BusinessEntityWikitty)e).getWikitty(); wikitties.add(w); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-07-12 16:04:42 UTC (rev 184) @@ -759,7 +759,7 @@ wikittyId, TreeNode.EXT_TREENODE )); } Tree tree = new Tree(); - TreeNode node = WikittyServiceImpl.toBean(new TreeNodeImpl(w)); + TreeNode node = new TreeNodeImpl(w); tree.setNode(node); TreeNodeImpl exempleNode = new TreeNodeImpl(); @@ -811,7 +811,7 @@ wikittyId, TreeNode.EXT_TREENODE )); } - TreeNode node = WikittyServiceImpl.toBean(new TreeNodeImpl(w)); + TreeNode node = new TreeNodeImpl(w); Integer count = getSearchEngin().findNodeCount(transaction, w, filter); HashMap.SimpleEntry<TreeNode, Integer> result = @@ -854,7 +854,7 @@ String id = child.getKey(); Wikitty wikitty = restore(securityToken, transaction, id); - TreeNode node = WikittyServiceImpl.toBean(new TreeNodeImpl(wikitty)); + TreeNode node = new TreeNodeImpl(wikitty); result.put(node, count); } @@ -944,7 +944,7 @@ * @return * * @deprecated since bean removal - */ + * @Deprecated protected static void fillBeanAttributes(TreeNode fromBean, TreeNodeBean toBean) { String beanId = fromBean.getWikittyId(); @@ -960,7 +960,7 @@ if(treeNodeChildren != null) { toBean.TreeNode$children = new HashSet<String>(treeNodeChildren); } - } + }*/ /** * Method copied from eugengo-0.7 generators @@ -969,12 +969,12 @@ * @return * * @deprecated since bean removal - */ + * @Deprecated public static TreeNode toBean(TreeNodeImpl impl) { if (impl == null) return null; TreeNodeBean bean = new TreeNodeBean(); WikittyServiceImpl.fillBeanAttributes(impl, bean); return bean; - } + }*/ } 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:03:28 UTC (rev 183) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-07-12 16:04:42 UTC (rev 184) @@ -762,7 +762,7 @@ return result; } - public static Wikitty beanToWikitty(BusinessEntity bean) { + /*public static Wikitty beanToWikitty(BusinessEntity bean) { Wikitty result; if (bean instanceof BusinessEntityWikitty) { BusinessEntityWikitty b = (BusinessEntityWikitty) bean; @@ -776,9 +776,9 @@ bean.getClass().getName())); } return result; - } + }*/ - public static Wikitty beanToWikitty(BusinessEntityBean bean) { + /*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 @@ -810,13 +810,13 @@ } catch (Exception eee) { throw new WikittyException(eee); } - } + }*/ - public static <E extends BusinessEntityBean, F extends BusinessEntityWikitty> E wikittyToBean( + /*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 @@ -826,7 +826,7 @@ * @param w source object * @return */ - public static <E extends BusinessEntityBean> E wikittyToBean( + /*public static <E extends BusinessEntityBean> E wikittyToBean( Class<E> clazz, Wikitty w) { try { E result = clazz.newInstance(); @@ -897,7 +897,7 @@ } catch (Exception eee) { throw new WikittyException(eee); } - } + }*/ /** * SecurityToken is used like wikitty id and must begin with UUID_ Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-07-12 16:04:42 UTC (rev 184) @@ -29,14 +29,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.nuiton.wikitty.WikittyServiceImpl; import org.nuiton.wikitty.FieldType; +import org.nuiton.wikitty.LabelImpl; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.LabelBean; -import org.nuiton.wikitty.TreeNodeImpl; -import org.nuiton.wikitty.Label; -import org.nuiton.wikitty.TreeNode; /** * @@ -404,7 +400,7 @@ } // use in testNewInstance - static class MonLabel extends LabelBean { + static class MonLabel extends LabelImpl { } /** @@ -423,15 +419,4 @@ assertNull(label); } */ - - @Test - public void testConvert() throws Exception { - TreeNodeImpl impl = new TreeNodeImpl(); - impl.setName("toto"); - impl.setParent("idparent"); - - TreeNode bean = WikittyServiceImpl.toBean(impl); // WikittyUtil.wikittyToBean(TreeNodeBean.class, impl); - assertEquals(impl.getName(), bean.getName()); - assertEquals(impl.getParent(), bean.getParent()); - } } Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityBeanGenerator.java 2010-07-12 16:04:42 UTC (rev 184) @@ -1,316 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; -import java.io.File; -import java.io.IOException; -import java.io.Serializable; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/** - * Generate pure Bean Object (no wikitty object internaly stored) - * - * @author poussin - * - * @deprecated since 2.0 will be removed soon - */ -@Deprecated -public class BusinessEntityBeanGenerator extends WikengoCommonGenerator { - - private static final Log log = LogFactory.getLog(BusinessEntityBeanGenerator.class); - - protected String EXT_NAME; - - /** - * A flag to generate on setter a propertyChangeEvent. - */ - protected Boolean generatePropertyChangeListener; - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - String fqn = clazz.getQualifiedName(); - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); - return fqn.replace('.', File.separatorChar) + "Bean.java"; - } - - public void generateFromClass(Writer output, ObjectModelClass clazz) - throws IOException { - if (!EugengoUtils.isBusinessEntity(clazz)) { - log.info( clazz.getName() + " is not a business entity"); - return; - } - - log.info("Generate Bean Business entity " + clazz.getName() + "... "); - String genPCS = EugengoUtils.findTagValue("generatePropertyChangeListener",clazz,model); - generatePropertyChangeListener = genPCS != null && "true".equals(genPCS.trim()); - - generateCopyright(output); - - String packageName = clazz.getPackageName(); - String name = clazz.getName() + "Bean"; -/*{package <%=packageName%>; - -}*/ - ObjectModelClass superClass = findSuperClass(clazz); - - clearImports(); - addImport(clazz); - addImport(superClass); - addImport("org.nuiton.wikitty.BusinessEntityBean"); - String parentBean = null; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - addImport(parent); - parentBean = parent.getQualifiedName() + "Bean"; - addImport( parentBean ); - } - } - if (generatePropertyChangeListener) { - addImport(PropertyChangeSupport.class.getName()); - addImport(PropertyChangeListener.class.getName()); - } - lookForAttributeImports(clazz); - generateImports(output, packageName); - - generateClazzDocumentation(output, clazz); - String extendsString = " extends " + ( parentBean != null ? parentBean : getType("org.nuiton.wikitty.BusinessEntityBean") ); - String abstractString = ""; - - // Temp fix, if operation, set it as abstract - if (clazz.isAbstract() || !clazz.getOperations().isEmpty()) { - abstractString += "abstract "; - } - - String implementsString = "implements " + getType(clazz.getQualifiedName()); - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - implementsString += ", " + getType(parent.getQualifiedName()); - } - } - -/*{/* - * @deprecated since wikitty 2.0 will be removed soon - *) -@Deprecated -public <%=abstractString%>class <%=name%><%=extendsString%> <%=implementsString%> { - -}*/ - - String svUID = GeneratorUtil.computeSerialVersionUID(clazz); -/*{ private static final long serialVersionUID = <%=svUID%>; - - public <%=name%>() { - super(); - } - -}*/ - if (generatePropertyChangeListener) { - -/*{ protected transient PropertyChangeSupport propertyChange = new PropertyChangeSupport(this); - - public void addPropertyChangeListener(PropertyChangeListener listener) { - propertyChange.addPropertyChangeListener(listener); - } - - public void removePropertyChangeListener(PropertyChangeListener listener) { - propertyChange.removePropertyChangeListener(listener); - } - - public void addPropertyChangeListener(String propertyName,PropertyChangeListener listener) { - propertyChange.addPropertyChangeListener(propertyName, listener); - } - - public void removePropertyChangeListener(String propertyName,PropertyChangeListener listener) { - propertyChange.removePropertyChangeListener(propertyName, listener); - } - -}*/ - } - generateFieldAndMethod(output, clazz); - -/*{ -} //<%=name%> -}*/ - - } - - - - // Utilitarian methods - - private void generateFieldAndMethod(Writer output, - ObjectModelClass clazz) throws IOException { - generateWikittyField(output, clazz); - generateAttributeAccessMethod(output, clazz); - - // we must generate method for parent of parent - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateFieldAndMethod(output, parent); - } - } - - } - - - private void generateWikittyField(Writer output, - ObjectModelClass clazz) throws IOException { - - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - generateAttribute(output, attr); - } - } - } - - private void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() - && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { - //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, attr); - } else { - generateWikittyAttributeAccessors(output, attr); - } - } - } - } - - private void generateAttribute(Writer output, ObjectModelAttribute attr) - throws IOException { - EXT_NAME = attr.getDeclaringElement().getName(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - String attrName = EXT_NAME + "$" + attr.getName(); -/*{ public <%=attrType%> <%=attrName%>; - -}*/ - } - - private void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { - - EXT_NAME = attr.getDeclaringElement().getName(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - String simpleAttrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(simpleAttrName); - String attrName = EXT_NAME + "$" + simpleAttrName; - String genPCS = ""; - if(!generatePropertyChangeListener) { - genPCS = "//"; - } - -/*{ - public void set<%=attrNameCapitalized%>(<%=attrType%> value) { - <%=genPCS%>Object oldValue = <%=attrName%>; - this.<%=attrName%> = value; - <%=genPCS%>propertyChange.firePropertyChange("<%=simpleAttrName%>", oldValue, value); - } - - public <%=attrType%> get<%=attrNameCapitalized%>() { - return <%=attrName%>; - } - -}*/ - } - - private void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { - - EXT_NAME = attr.getDeclaringElement().getName(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // get collection element type for add and remove method arguement type - String elementType = getType(attr.getType(), true); - - String simpleAttrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(simpleAttrName ); - String attrName = EXT_NAME + "$" + simpleAttrName; - String genPCS = ""; - if(!generatePropertyChangeListener) { - genPCS = "//"; - } - -/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { - return <%=attrName%>; - } - - public void add<%=attrNameCapitalized%>(<%=elementType%> element) { - <%=attrName%>.add(element); - <%=genPCS%>propertyChange.firePropertyChange("<%=simpleAttrName%>", null, <%=attrName%>); - } - - public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { - <%=attrName%>.remove(element); - <%=genPCS%>propertyChange.firePropertyChange("<%=simpleAttrName%>", null, <%=attrName%>); - } - - public void clear<%=attrNameCapitalized%>() { - <%=attrName%>.clear(); - <%=genPCS%>propertyChange.firePropertyChange("<%=simpleAttrName%>", null, <%=attrName%>); - } - -}*/ - } - - private static Set<String> commonTypes; - static { - commonTypes = new HashSet<String>(); - commonTypes.add("byte"); - commonTypes.add("Byte"); - commonTypes.add("short"); - commonTypes.add("Short"); - commonTypes.add("int"); - commonTypes.add("Integer"); - commonTypes.add("long"); - commonTypes.add("Long"); - commonTypes.add("float"); - commonTypes.add("Float"); - commonTypes.add("double"); - commonTypes.add("Double"); - - commonTypes.add("char"); - commonTypes.add("Char"); - - commonTypes.add("boolean"); - commonTypes.add("Boolean"); - - commonTypes.add("Date"); - commonTypes.add("String"); - } - -} Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-07-12 16:03:28 UTC (rev 183) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-07-12 16:04:42 UTC (rev 184) @@ -33,8 +33,7 @@ BusinessEntityInterfaceGenerator.class, BusinessEntityAbstractGenerator.class, BusinessEntityImplGenerator.class, - WikittyHelperGenerator.class, - BusinessEntityBeanGenerator.class + WikittyHelperGenerator.class ));
participants (1)
-
echatellier＠users.nuiton.org