June 2013 - Sandbox-commits - mailman.cloud.codelutin.com

r651 - in nuiton-jpa: nuiton-jpa-api/src/main/java/org/nuiton/jpa/api nuiton-jpa-templates/src/it/magalie/src/main/xmi nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by bleny＠users.nuiton.org June 5, 2013

June 5, 2013

Author: bleny Date: 2013-06-05 16:23:54 +0200 (Wed, 05 Jun 2013) New Revision: 651 Url: http://nuiton.org/projects/sandbox/repository/revisions/651 Log: some refactorings renaming 'generator' to 'factory', confusing with eugene generators, reimplement default factory, introduce r.java Added: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java Removed: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdGenerator.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGenerator.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGeneratorFactory.java Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java nuiton-jpa/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaDao.java 2013-06-05 14:23:54 UTC (rev 651) @@ -215,16 +215,13 @@ E onlyElement = null; if ( ! all.isEmpty()) { if (all.size() > 1) { - throw new IllegalStateException("multiple results " + all); + throw new IllegalStateException( + "multiple results for query = " + query + + " results = " + all); } onlyElement = all.get(0); } return onlyElement; } - protected long count(TypedQuery<E> query) { - // XXX brendan 24/05/13 worst way to do, use hql - return findAll(query).size(); - } - } Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/AbstractJpaPersistenceContext.java 2013-06-05 14:23:54 UTC (rev 651) @@ -44,10 +44,10 @@ this(null, entityManager); } - public AbstractJpaPersistenceContext(JpaEntityIdGenerator idGenerator, + public AbstractJpaPersistenceContext(JpaEntityIdFactory jpaEntityIdFactory, EntityManager entityManager) { - if (idGenerator != null) { - JpaEntityIdGeneratorFactory.setGenerator(idGenerator); + if (jpaEntityIdFactory != null) { + JpaEntityIdFactoryResolver.setFactory(jpaEntityIdFactory); } this.entityManager = entityManager; entityTransaction = entityManager.getTransaction(); Copied: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java (from rev 648, nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdGenerator.java) =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java (rev 0) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java 2013-06-05 14:23:54 UTC (rev 651) @@ -0,0 +1,42 @@ +package org.nuiton.jpa.api; + +/* + * #%L + * Nuiton Jpa :: API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import java.util.UUID; + +/** + * Default implementation of {@link JpaEntityIdFactory}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class DefaultJpaEntityIdFactory implements JpaEntityIdFactory { + + @Override + public String newId(JpaEntity entity) { + return entity.getClass().getName() + '_' + UUID.randomUUID().toString(); + } + +} Property changes on: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdGenerator.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdGenerator.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/DefaultJpaEntityIdGenerator.java 2013-06-05 14:23:54 UTC (rev 651) @@ -1,44 +0,0 @@ -package org.nuiton.jpa.api; - -/* - * #%L - * Nuiton Jpa :: API - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -/** - * Default implementation of {@link JpaEntityIdGenerator}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 - */ -public class DefaultJpaEntityIdGenerator implements JpaEntityIdGenerator { - - @Override - public String generate(JpaEntity entity) { - double random = Math.random(); - while (Double.toString(random).contains("E-")) { - random = Math.random(); - } - return entity.getClass().getName() + '#' + System.currentTimeMillis() + '#' - + random; - } -} Copied: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java (from rev 648, nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGenerator.java) =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java (rev 0) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java 2013-06-05 14:23:54 UTC (rev 651) @@ -0,0 +1,37 @@ +package org.nuiton.jpa.api; + +/* + * #%L + * Nuiton Jpa :: API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +/** + * To generate entity id. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public interface JpaEntityIdFactory { + + String newId(JpaEntity entity); + +} Property changes on: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java (from rev 648, nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGeneratorFactory.java) =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java (rev 0) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java 2013-06-05 14:23:54 UTC (rev 651) @@ -0,0 +1,49 @@ +package org.nuiton.jpa.api; + +/* + * #%L + * Nuiton Jpa :: API + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; + +/** + * {@link JpaEntityIdFactory} used in generated code in entities. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class JpaEntityIdFactoryResolver implements JpaEntityIdFactory { + + protected static JpaEntityIdFactory factory; + + public static void setFactory(JpaEntityIdFactory factory) { + JpaEntityIdFactoryResolver.factory = factory; + } + + @Override + public String newId(JpaEntity entity) { + Preconditions.checkNotNull(factory, "No factory assigned"); + return factory.newId(entity); + } + +} Property changes on: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdFactoryResolver.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGenerator.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGenerator.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGenerator.java 2013-06-05 14:23:54 UTC (rev 651) @@ -1,36 +0,0 @@ -package org.nuiton.jpa.api; - -/* - * #%L - * Nuiton Jpa :: API - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -/** - * To generate entity id. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 - */ -public interface JpaEntityIdGenerator { - - String generate(JpaEntity entity); -} Deleted: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGeneratorFactory.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGeneratorFactory.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntityIdGeneratorFactory.java 2013-06-05 14:23:54 UTC (rev 651) @@ -1,48 +0,0 @@ -package org.nuiton.jpa.api; - -/* - * #%L - * Nuiton Jpa :: API - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; - -/** - * {@link JpaEntityIdGenerator} used in generated code in entities. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 - */ -public class JpaEntityIdGeneratorFactory implements JpaEntityIdGenerator { - - protected static JpaEntityIdGenerator generator; - - public static void setGenerator(JpaEntityIdGenerator generator) { - JpaEntityIdGeneratorFactory.generator = generator; - } - - @Override - public String generate(JpaEntity entity) { - Preconditions.checkNotNull(generator, "No generator assigned."); - return generator.generate(entity); - } -} Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaPersistenceContext.java 2013-06-05 14:23:54 UTC (rev 651) @@ -43,5 +43,4 @@ void rollback(); - } Added: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java (rev 0) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/SequenceJpaEntityIdFactory.java 2013-06-05 14:23:54 UTC (rev 651) @@ -0,0 +1,19 @@ +package org.nuiton.jpa.api; + +/** + * An implementation of {@link JpaEntityIdFactory} that generate a sequence + * as long as the lifecycle of this factory. + * + * @since 0.1 + */ +public class SequenceJpaEntityIdFactory implements JpaEntityIdFactory { + + protected int sequence = 0; + + @Override + public String newId(JpaEntity entity) { + sequence += 1; + return entity.getClass().getSimpleName() + sequence; + } + +} Modified: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties 2013-06-05 14:23:54 UTC (rev 651) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagValue.idGenerator=org.nuiton.jpa.api.DefaultJpaEntityIdGenerator +model.tagValue.idFactory=org.nuiton.jpa.api.DefaultJpaEntityIdFactory com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique Modified: nuiton-jpa/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties 2013-06-05 14:23:54 UTC (rev 651) @@ -21,7 +21,7 @@ # <http://www.gnu.org/licenses/lgpl-3.0.html>. # #L% ### -model.tagValue.idGenerator=org.nuiton.jpa.api.DefaultJpaEntityIdGenerator +model.tagValue.idFactory=org.nuiton.jpa.api.DefaultJpaEntityIdFactory com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-05 14:23:54 UTC (rev 651) @@ -39,7 +39,7 @@ import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.jpa.api.AbstractJpaEntity; import org.nuiton.jpa.api.JpaEntities; -import org.nuiton.jpa.api.JpaEntityIdGeneratorFactory; +import org.nuiton.jpa.api.JpaEntityIdFactoryResolver; import javax.persistence.CascadeType; import javax.persistence.Entity; @@ -180,10 +180,10 @@ void.class, ObjectModelJavaModifier.PUBLIC); addAnnotation(output, operation, PrePersist.class); - addImport(output, JpaEntityIdGeneratorFactory.class); + addImport(output, JpaEntityIdFactoryResolver.class); setOperationBody(operation, "" /*{ - this.id = new JpaEntityIdGeneratorFactory().generate(this); + this.id = new JpaEntityIdFactoryResolver().newId(this); }*/ ); } Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaModelValidator.java 2013-06-05 14:23:54 UTC (rev 651) @@ -60,7 +60,7 @@ // can't have any stuff around GeneraturValue if(JpaTemplatesGeneratorUtil.hasNotGeneratedValueStereotype(clazz)) { - addError(clazz,"Can't use a NotGenerated tag value when using an id generator"); + addError(clazz,"Can't use a NotGenerated tag value when using an id factory"); } } } Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-06-05 14:23:54 UTC (rev 651) @@ -30,7 +30,7 @@ import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.jpa.api.AbstractJpaPersistenceContext; -import org.nuiton.jpa.api.JpaEntityIdGenerator; +import org.nuiton.jpa.api.JpaEntityIdFactory; import javax.persistence.EntityManager; import java.util.List; @@ -180,12 +180,12 @@ output, ObjectModelJavaModifier.PUBLIC); - addParameter(constructor, JpaEntityIdGenerator.class, "idGenerator"); + addParameter(constructor, JpaEntityIdFactory.class, "jpaEntityIdFactory"); addParameter(constructor, EntityManager.class, "entityManager"); setOperationBody(constructor, "" /*{ - super(idGenerator, entityManager); + super(jpaEntityIdFactory, entityManager); }*/ ); } Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java 2013-06-05 14:23:54 UTC (rev 651) @@ -234,7 +234,7 @@ } /** - * Obtain the value of the {@link JpaTemplatesTagValues#TAG_ID_GENERATOR} + * Obtain the value of the {@link JpaTemplatesTagValues#TAG_ID_FACTORY} * tag value on the given model or classifier. * <p/> * It will first look on the model, and then in the given classifier. @@ -242,11 +242,11 @@ * @param model model to seek * @return the none empty value of the found tag value or {@code null} * if not found nor empty. - * @see JpaTemplatesTagValues#TAG_ID_GENERATOR + * @see JpaTemplatesTagValues#TAG_ID_FACTORY * @since 2.3 */ public static String getIdGeneratorTagValue(ObjectModel model) { - String value = findTagValue(JpaTemplatesTagValues.TAG_ID_GENERATOR, null, model); + String value = findTagValue(JpaTemplatesTagValues.TAG_ID_FACTORY, null, model); return value; } Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java 2013-06-04 13:50:10 UTC (rev 650) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java 2013-06-05 14:23:54 UTC (rev 651) @@ -88,13 +88,13 @@ String TAG_INVERSE = "inverse"; /** - * Tag value to get user defined id generator. + * Tag value to get user defined id factory. * * @see JpaTemplatesGeneratorUtil#getIdGeneratorTagValue(ObjectModel) * @since 0.1 */ @ModelPropertiesUtil.TagValueDefinition( target = {ObjectModel.class}, - documentation = "To specify a user defined id generator to use for all entities of the model") - String TAG_ID_GENERATOR = "idGenerator"; + documentation = "To specify a user defined id factory to use for all entities of the model") + String TAG_ID_FACTORY = "idFactory"; }

1 0

r650 - in nuiton-jpa: . nuiton-jpa-api nuiton-jpa-junit nuiton-jpa-templates
by tchemit＠users.nuiton.org June 4, 2013

June 4, 2013

Author: tchemit Date: 2013-06-04 15:50:10 +0200 (Tue, 04 Jun 2013) New Revision: 650 Url: http://nuiton.org/projects/sandbox/repository/revisions/650 Log: tidy poms Modified: nuiton-jpa/nuiton-jpa-api/pom.xml nuiton-jpa/nuiton-jpa-junit/pom.xml nuiton-jpa/nuiton-jpa-templates/pom.xml nuiton-jpa/pom.xml Modified: nuiton-jpa/nuiton-jpa-api/pom.xml =================================================================== --- nuiton-jpa/nuiton-jpa-api/pom.xml 2013-06-04 11:11:44 UTC (rev 649) +++ nuiton-jpa/nuiton-jpa-api/pom.xml 2013-06-04 13:50:10 UTC (rev 650) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,6 +11,7 @@ <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-api</artifactId> + <name>Nuiton Jpa :: API</name> <dependencies> Modified: nuiton-jpa/nuiton-jpa-junit/pom.xml =================================================================== --- nuiton-jpa/nuiton-jpa-junit/pom.xml 2013-06-04 11:11:44 UTC (rev 649) +++ nuiton-jpa/nuiton-jpa-junit/pom.xml 2013-06-04 13:50:10 UTC (rev 650) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,6 +11,7 @@ <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-junit</artifactId> + <name>Nuiton Jpa :: Junit</name> <dependencies> Modified: nuiton-jpa/nuiton-jpa-templates/pom.xml =================================================================== --- nuiton-jpa/nuiton-jpa-templates/pom.xml 2013-06-04 11:11:44 UTC (rev 649) +++ nuiton-jpa/nuiton-jpa-templates/pom.xml 2013-06-04 13:50:10 UTC (rev 650) @@ -3,7 +3,6 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -14,6 +13,7 @@ <groupId>org.nuiton.jpa</groupId> <artifactId>nuiton-jpa-templates</artifactId> + <name>Nuiton Jpa :: Temlates</name> <dependencies> @@ -68,7 +68,6 @@ </dependencies> <build> - <plugins> <plugin> <groupId>org.nuiton.processor</groupId> @@ -88,7 +87,6 @@ </executions> </plugin> </plugins> - </build> <profiles> @@ -158,5 +156,4 @@ </profile> </profiles> - </project> Modified: nuiton-jpa/pom.xml =================================================================== --- nuiton-jpa/pom.xml 2013-06-04 11:11:44 UTC (rev 649) +++ nuiton-jpa/pom.xml 2013-06-04 13:50:10 UTC (rev 650) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> <parent> @@ -12,18 +11,58 @@ <artifactId>nuiton-jpa</artifactId> <version>0.1-SNAPSHOT</version> + <packaging>pom</packaging> + <name>Nuiton Jpa</name> + <url>http://maven-site.nuiton.org/nuiton-jpa</url> + <inceptionYear>2013</inceptionYear> + + <developers> + + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny at codelutin dot com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://codelutin.com</organizationUrl> + <timezone>Europe/Paris</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + + </developers> + <modules> <module>nuiton-jpa-api</module> <module>nuiton-jpa-junit</module> <module>nuiton-jpa-templates</module> </modules> - <name>Nuiton Jpa</name> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/nuiton-jpa</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/nuiton-jpa</developerConnection> + <url>http://nuiton.org/projects/sandbox/repository/show/nuiton-jpa</url> + </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/sandbox/${projectId}</url> + </site> + </distributionManagement> - <inceptionYear>2013</inceptionYear> - <url>http://maven-site.nuiton.org/nuiton-jpa</url> - <properties>  <projectId>nuiton-jpa</projectId> @@ -38,20 +77,6 @@ </properties> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/sandbox/nuiton-jpa</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/sandbox/nuiton-jpa</developerConnection> - <url>http://nuiton.org/projects/sandbox/repository/show/nuiton-jpa</url> - </scm> - - <distributionManagement> - <site> - <id>${platform}</id> - <url>${our.site.repository}/sandbox/${projectId}</url> - </site> - </distributionManagement> - - <dependencyManagement> <dependencies> @@ -97,38 +122,7 @@ </dependencyManagement> - <developers> - - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - <developer> - <name>Brendan Le Ny</name> - <id>bleny</id> - <email>bleny at codelutin dot com</email> - <organization>CodeLutin</organization> - <organizationUrl>http://codelutin.com</organizationUrl> - <timezone>Europe/Paris</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - - </developers> - - <packaging>pom</packaging> - <build> - <pluginManagement> <plugins> @@ -176,7 +170,6 @@ </plugins> </pluginManagement> - </build> <reporting>

1 0

r649 - in nuiton-jpa: nuiton-jpa-api/src/main/java/org/nuiton/jpa/api nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by tchemit＠users.nuiton.org June 4, 2013

June 4, 2013

Author: tchemit Date: 2013-06-04 13:11:44 +0200 (Tue, 04 Jun 2013) New Revision: 649 Url: http://nuiton.org/projects/sandbox/repository/revisions/649 Log: add new byId method on entities + predicates for it Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java 2013-06-04 06:59:45 UTC (rev 648) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java 2013-06-04 11:11:44 UTC (rev 649) @@ -28,6 +28,7 @@ import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import org.apache.commons.lang3.ObjectUtils; @@ -45,8 +46,13 @@ public class JpaEntities { public static <E extends JpaEntity> E findById(Iterable<E> entities, String id) { - Optional<E> eOptional = Iterables.tryFind(entities, entityHasId(id)); - E result = eOptional.orNull(); + E result; + if (entities == null) { + result = null; + } else { + Optional<E> eOptional = Iterables.tryFind(entities, entityHasId(id)); + result = eOptional.orNull(); + } return result; } @@ -73,10 +79,33 @@ return new GetIdFunction(); } + public static boolean isEntityHasId(JpaEntity entity, String id) { + boolean result = entityHasId(id).apply(entity); + return result; + } + + public static boolean isEntityHasId(JpaEntity entity) { + boolean result = entityHasId().apply(entity); + return result; + } + + public static boolean isEntityHasNoId(JpaEntity entity) { + boolean result = entityHasNoId().apply(entity); + return result; + } + public static Predicate<JpaEntity> entityHasId(String id) { return Predicates.compose(Predicates.equalTo(id), getIdFunction()); } + public static Predicate<JpaEntity> entityHasId() { + return Predicates.compose(Predicates.notNull(), getIdFunction()); + } + + public static Predicate<JpaEntity> entityHasNoId() { + return Predicates.compose(Predicates.equalTo(null), getIdFunction()); + } + public static <E extends JpaEntity> Comparator<E> arbitraryComparator() { return new ArbitraryComparator<E>(); } Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-04 06:59:45 UTC (rev 648) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-04 11:11:44 UTC (rev 649) @@ -38,6 +38,7 @@ import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.xml.ObjectModelAttributeImpl; import org.nuiton.jpa.api.AbstractJpaEntity; +import org.nuiton.jpa.api.JpaEntities; import org.nuiton.jpa.api.JpaEntityIdGeneratorFactory; import javax.persistence.CascadeType; @@ -226,6 +227,8 @@ // add getChild methods createGetChildMethod(output); + + addImport(output, JpaEntities.class); } if (isVerbose()) { @@ -407,58 +410,60 @@ createGetChildMethod(output, attrName, attrType, - simpleType - ); + simpleType ); + createGetChildByIdMethod(output, + attrName, + attrType, + simpleType); + createIsEmptyMethod(output, - attrName - ); + attrName ); createSizeMethod(output, - attrName - ); + attrName ); createAddChildMethod(output, attrName, attrType, constantName, - usePCS - ); + usePCS ); createAddAllChildrenMethod(output, attrName, attrType, constantName, - usePCS - ); + usePCS ); createRemoveChildMethod(output, attrName, attrType, constantName, - usePCS - ); + usePCS ); createRemoveAllChildrenMethod(output, attrName, attrType, constantName, - usePCS - ); + usePCS ); createContainsChildMethod(output, attrName, attrType, constantName, - usePCS - ); + usePCS ); + createContainsChildByIdMethod(output, + attrName, + attrType, + constantName, + usePCS); + createContainsAllChildrenMethod(output, attrName, attrType, constantName, - usePCS - ); + usePCS ); // Change type for Multiple attribute Class<?> collectionType = JpaTemplatesGeneratorUtil.getCollectionType(attr); @@ -552,6 +557,25 @@ ); } + protected void createGetChildByIdMethod(ObjectModelClass output, + String attrName, + String attrType, + String simpleType) { + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("get", attrName + "ById"), + attrType, + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "String", "id"); + setOperationBody(operation, "" + /*{ + <%=simpleType%> o = JpaEntities.findById(<%=attrName%>, id); + return o; + }*/ + ); + } + protected void createIsEmptyMethod(ObjectModelClass output, String attrName) { ObjectModelOperation operation = addOperation( @@ -733,6 +757,30 @@ setOperationBody(operation, buffer.toString()); } + protected void createContainsChildByIdMethod(ObjectModelClass output, + String attrName, + String attrType, + String constantName, + boolean usePCS) { + + ObjectModelOperation operation = addOperation( + output, + getJavaBeanMethodName("contains", attrName+"ById"), + "boolean", + ObjectModelJavaModifier.PUBLIC + ); + addParameter(operation, "String", "id"); + StringBuilder buffer = new StringBuilder(); + String methodName = getJavaBeanMethodName("get", attrName + "ById"); + buffer.append("" + /*{ + boolean contains = <%=methodName%>(id) != null; + return contains; + }*/ + ); + setOperationBody(operation, buffer.toString()); + } + protected void createContainsAllChildrenMethod(ObjectModelClass output, String attrName, String attrType,

1 0

r648 - in nuiton-jpa: nuiton-jpa-api/src/main/java/org/nuiton/jpa/api nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by tchemit＠users.nuiton.org June 4, 2013

June 4, 2013

Author: tchemit Date: 2013-06-04 08:59:45 +0200 (Tue, 04 Jun 2013) New Revision: 648 Url: http://nuiton.org/projects/sandbox/repository/revisions/648 Log: [nuiton-jpa] - add findById useful method [nuiton-jpa] - add new contructor with idGenerator for PersistenceContext template Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java Modified: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java =================================================================== --- nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java 2013-06-03 06:38:58 UTC (rev 647) +++ nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/JpaEntities.java 2013-06-04 06:59:45 UTC (rev 648) @@ -25,11 +25,14 @@ */ import com.google.common.base.Function; +import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; +import com.google.common.collect.Iterables; import org.apache.commons.lang3.ObjectUtils; import java.io.Serializable; +import java.util.Collection; import java.util.Comparator; /** @@ -41,6 +44,12 @@ */ public class JpaEntities { + public static <E extends JpaEntity> E findById(Iterable<E> entities, String id) { + Optional<E> eOptional = Iterables.tryFind(entities, entityHasId(id)); + E result = eOptional.orNull(); + return result; + } + public static class GetIdFunction implements Function<JpaEntity, String> { @Override Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-06-03 06:38:58 UTC (rev 647) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-06-04 06:59:45 UTC (rev 648) @@ -30,6 +30,7 @@ import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.jpa.api.AbstractJpaPersistenceContext; +import org.nuiton.jpa.api.JpaEntityIdGenerator; import javax.persistence.EntityManager; import java.util.List; @@ -120,6 +121,9 @@ super(new <%=idGenerator%>(), entityManager); }*/ ); + + addConstructorWithIdGeneratorAndEntityManager(output); + } else { // not using an idGenerator @@ -158,7 +162,31 @@ setSuperClass(output, entityAbstractName); + String idGenerator = + JpaTemplatesGeneratorUtil.getIdGeneratorTagValue(getModel()); + + if (StringUtils.isNotEmpty(idGenerator)) { + + addConstructorWithIdGeneratorAndEntityManager(output); + } addConstructorWithEntityManager(output); + return output; } + + protected void addConstructorWithIdGeneratorAndEntityManager(ObjectModelClass output) { + + ObjectModelOperation constructor = addConstructor( + output, + ObjectModelJavaModifier.PUBLIC); + + addParameter(constructor, JpaEntityIdGenerator.class, "idGenerator"); + addParameter(constructor, EntityManager.class, "entityManager"); + + setOperationBody(constructor, "" + /*{ + super(idGenerator, entityManager); + }*/ + ); + } }

1 0

r647 - nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by tchemit＠users.nuiton.org June 3, 2013

June 3, 2013

Author: tchemit Date: 2013-06-03 08:38:58 +0200 (Mon, 03 Jun 2013) New Revision: 647 Url: http://nuiton.org/projects/sandbox/repository/revisions/647 Log: can add a user contract on persistence context Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-06-03 06:38:34 UTC (rev 646) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaPersistenceContextTransformer.java 2013-06-03 06:38:58 UTC (rev 647) @@ -30,7 +30,6 @@ import org.nuiton.eugene.models.object.ObjectModelJavaModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.jpa.api.AbstractJpaPersistenceContext; -import org.nuiton.jpa.api.JpaEntityIdGenerator; import javax.persistence.EntityManager; import java.util.List; @@ -95,6 +94,15 @@ setSuperClass(output, superClass); + // detect if there is a contract to set on abstract + String contractName = packageName + "." + model.getName() + "PersistenceContext"; + + boolean addPersistenceContextContract = isInClassPath(contractName); + + if (addPersistenceContextContract) { + addInterface(output, contractName); + } + String idGenerator = JpaTemplatesGeneratorUtil.getIdGeneratorTagValue(getModel());

1 0

r646 - nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by tchemit＠users.nuiton.org June 3, 2013

June 3, 2013

Author: tchemit Date: 2013-06-03 08:38:34 +0200 (Mon, 03 Jun 2013) New Revision: 646 Url: http://nuiton.org/projects/sandbox/repository/revisions/646 Log: fix prepersist method Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-02 17:39:37 UTC (rev 645) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-03 06:38:34 UTC (rev 646) @@ -176,13 +176,13 @@ ObjectModelOperation operation = addOperation( output, "prepersist", - String.class, + void.class, ObjectModelJavaModifier.PUBLIC); addAnnotation(output, operation, PrePersist.class); addImport(output, JpaEntityIdGeneratorFactory.class); setOperationBody(operation, "" /*{ - return new JpaEntityIdGeneratorFactory().generate(this); + this.id = new JpaEntityIdGeneratorFactory().generate(this); }*/ ); }

1 0

r645 - nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by tchemit＠users.nuiton.org June 2, 2013

June 2, 2013

Author: tchemit Date: 2013-06-02 19:39:37 +0200 (Sun, 02 Jun 2013) New Revision: 645 Url: http://nuiton.org/projects/sandbox/repository/revisions/645 Log: fix entity template (bidirection) Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java Modified: nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-02 08:32:45 UTC (rev 644) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-02 17:39:37 UTC (rev 645) @@ -321,7 +321,7 @@ if (bidirection && !isInverse) { // add the mappedBy parameter - annotationParams.add("mappedBy = " + reverseAttribute.getName()); + annotationParams.add("mappedBy = \"" + reverseAttribute.getName()+"\""); } if (nMultiplicity) {

1 0

r644 - nuiton-jpa
by tchemit＠users.nuiton.org June 2, 2013

June 2, 2013

Author: tchemit Date: 2013-06-02 10:32:45 +0200 (Sun, 02 Jun 2013) New Revision: 644 Url: http://nuiton.org/projects/sandbox/repository/revisions/644 Log: pb with it when eugene in snapshot Modified: nuiton-jpa/pom.xml Modified: nuiton-jpa/pom.xml =================================================================== --- nuiton-jpa/pom.xml 2013-06-02 08:29:09 UTC (rev 643) +++ nuiton-jpa/pom.xml 2013-06-02 08:32:45 UTC (rev 644) @@ -31,7 +31,7 @@ <redmine.skipGenerateChanges>true</redmine.skipGenerateChanges>  - <eugeneVersion>2.6.4-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.6.3</eugeneVersion> <processorPluginVersion>1.3</processorPluginVersion> <h2Version>1.3.170</h2Version> <hibernateVersion>4.1.11.Final</hibernateVersion>

1 0

r643 - in nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main: . xmi
by tchemit＠users.nuiton.org June 2, 2013

June 2, 2013

Author: tchemit Date: 2013-06-02 10:29:09 +0200 (Sun, 02 Jun 2013) New Revision: 643 Url: http://nuiton.org/projects/sandbox/repository/revisions/643 Log: remove svn external Added: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/ nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.zargo Added: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties =================================================================== --- nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties (rev 0) +++ nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties 2013-06-02 08:29:09 UTC (rev 643) @@ -0,0 +1,37 @@ +### +# #%L +# Nuiton Jpa :: Temlates +# $Id$ +# $HeadURL: http://svn.nuiton.org/svn/sandbox/nuiton-jpa/nuiton-jpa-templates/src/it/ma… $ +# %% +# Copyright (C) 2013 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### +model.tagValue.idGenerator=org.nuiton.jpa.api.DefaultJpaEntityIdGenerator + +com.franciaflex.magalie.persistence.entity.Article.attribute.fixedLocations.stereotype=unique + +com.franciaflex.magalie.persistence.entity.Article.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Building.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Location.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.MagalieUser.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.PreparedArticleReception.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.RequestedArticle.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.RequestedList.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.StoredArticle.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Supplier.class.stereotype=notGeneratedValue +com.franciaflex.magalie.persistence.entity.Warehouse.class.stereotype=notGeneratedValue Property changes on: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.zargo =================================================================== (Binary files differ) Property changes on: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/xmi/magalie.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r642 - nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main
by tchemit＠users.nuiton.org June 2, 2013

June 2, 2013

Author: tchemit Date: 2013-06-02 10:27:23 +0200 (Sun, 02 Jun 2013) New Revision: 642 Url: http://nuiton.org/projects/sandbox/repository/revisions/642 Log: remove svn external Modified: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main/ Property changes on: nuiton-jpa/nuiton-jpa-templates/src/it/magalie/src/main ___________________________________________________________________ Deleted: svn:externals - http://svn.forge.codelutin.com/svn/franciaflex-magalie/branches/magalie-eug… xmi

1 0