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

r681 - nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates
by bleny＠users.nuiton.org June 27, 2013

June 27, 2013

Author: bleny Date: 2013-06-27 16:24:38 +0200 (Thu, 27 Jun 2013) New Revision: 681 Url: http://nuiton.org/projects/sandbox/repository/revisions/681 Log: do not generate on prepersit if it is already manually set 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-27 09:34:46 UTC (rev 680) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-27 14:24:38 UTC (rev 681) @@ -191,17 +191,19 @@ // use an idGenerator - // add prepersist method + // add prePersist method ObjectModelOperation operation = addOperation( output, - "prepersist", + "prePersist", void.class, ObjectModelJavaModifier.PUBLIC); addAnnotation(output, operation, PrePersist.class); addImport(output, JpaEntityIdFactoryResolver.class); setOperationBody(operation, "" /*{ - this.id = new JpaEntityIdFactoryResolver().newId(this); + if (this.id == null) { + this.id = new JpaEntityIdFactoryResolver().newId(this); + } }*/ ); }

1 0

r680 - nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit
by bleny＠users.nuiton.org June 27, 2013

June 27, 2013

Author: bleny Date: 2013-06-27 11:34:46 +0200 (Thu, 27 Jun 2013) New Revision: 680 Url: http://nuiton.org/projects/sandbox/repository/revisions/680 Log: allow use of multiple entity managers in the junit rule Modified: nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java Modified: nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java =================================================================== --- nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java 2013-06-26 07:17:58 UTC (rev 679) +++ nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java 2013-06-27 09:34:46 UTC (rev 680) @@ -34,6 +34,8 @@ import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import java.util.Date; +import java.util.LinkedList; +import java.util.List; import java.util.Map; public class JpaEntityManagerRule implements TestRule { @@ -44,12 +46,14 @@ protected static String timestamp = String.valueOf(new Date().getTime()); - protected EntityManager entityManager; - protected boolean open = false; protected Map<String, String> jpaParameters; + protected EntityManagerFactory entityManagerFactory; + + protected List<EntityManager> openedEntityManagers = new LinkedList<EntityManager>(); + public JpaEntityManagerRule(String persistenceUnitName, Map<String, String> jpaParameters) { this.persistenceUnitName = persistenceUnitName; this.jpaParameters = jpaParameters; @@ -70,7 +74,7 @@ return new Statement() { @Override public void evaluate() throws Throwable { - createEntityManager(testClassName, testMethodName); + createEntityManagerFactory(testClassName, testMethodName); try { base.evaluate(); } finally { @@ -80,32 +84,49 @@ }; } - protected void createEntityManager(String testClassName, String testMethodName) { + protected void createEntityManagerFactory(String testClassName, String testMethodName) { String context = testClassName + '_' + testMethodName + '_' + timestamp; - EntityManagerFactory entityManagerFactory = - HibernateUtil.createTempEntityManagerFactory( + entityManagerFactory = HibernateUtil.createTempEntityManagerFactory( persistenceUnitName, context, jpaParameters); - entityManager = entityManagerFactory.createEntityManager(); - if (log.isDebugEnabled()) { - log.debug("created entityManager " + entityManager); + log.debug("created entityManagerFactory " + entityManagerFactory); } open = true; } + /** + * @deprecated use {@link #newEntityManager()} and save a reference to it + */ public EntityManager getEntityManager() { - if (!open) { + if (openedEntityManagers.isEmpty()) { + + openedEntityManagers.add(newEntityManager()); + + } + + return openedEntityManagers.get(0); + + } + + public EntityManager newEntityManager() { + + if ( ! open) { throw new IllegalStateException("entity manager is not yet opened"); } + EntityManager entityManager = + entityManagerFactory.createEntityManager(); + + openedEntityManagers.add(entityManager); + return entityManager; } @@ -113,14 +134,18 @@ /** Override to tear down your specific external resource. */ protected void closeEntityManager() { - if (log.isDebugEnabled()) { - log.debug("close entityManager " + entityManager); - } - open = false; - entityManager.close(); + for (EntityManager openedEntityManager : openedEntityManagers) { + if (log.isDebugEnabled()) { + log.debug("close entityManager " + openedEntityManager); + } + + openedEntityManager.close(); + + } + } }

1 0

r679 - in nuiton-jpa/nuiton-jpa-hibernate: . src/license src/main/java/org/nuiton/jpa/hibernate src/test/java/org/nuiton/jpa/hibernate
by tchemit＠users.nuiton.org June 26, 2013

June 26, 2013

Author: tchemit Date: 2013-06-26 09:17:58 +0200 (Wed, 26 Jun 2013) New Revision: 679 Url: http://nuiton.org/projects/sandbox/repository/revisions/679 Log: add svn properties + missing license headers Modified: nuiton-jpa/nuiton-jpa-hibernate/LICENSE.txt nuiton-jpa/nuiton-jpa-hibernate/README.txt nuiton-jpa/nuiton-jpa-hibernate/changelog.txt nuiton-jpa/nuiton-jpa-hibernate/pom.xml nuiton-jpa/nuiton-jpa-hibernate/src/license/THIRD-PARTY.properties nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java Property changes on: nuiton-jpa/nuiton-jpa-hibernate/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: nuiton-jpa/nuiton-jpa-hibernate/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: nuiton-jpa/nuiton-jpa-hibernate/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: nuiton-jpa/nuiton-jpa-hibernate/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: nuiton-jpa/nuiton-jpa-hibernate/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-25 13:23:08 UTC (rev 678) +++ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-26 07:17:58 UTC (rev 679) @@ -1,5 +1,29 @@ package org.nuiton.jpa.hibernate; +/* + * #%L + * Nuiton Jpa :: Hibernate + * $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.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.BiMap; Property changes on: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java 2013-06-25 13:23:08 UTC (rev 678) +++ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java 2013-06-26 07:17:58 UTC (rev 679) @@ -1,5 +1,29 @@ package org.nuiton.jpa.hibernate; +/* + * #%L + * Nuiton Jpa :: Hibernate + * $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; import org.apache.commons.lang3.StringUtils; import org.hibernate.HibernateException; Property changes on: nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r678 - in nuiton-jpa/nuiton-jpa-hibernate/src: main/java/org/nuiton/jpa/hibernate test/java/org/nuiton/jpa/hibernate
by bleny＠users.nuiton.org June 25, 2013

June 25, 2013

Author: bleny Date: 2013-06-25 15:23:08 +0200 (Tue, 25 Jun 2013) New Revision: 678 Url: http://nuiton.org/projects/sandbox/repository/revisions/678 Log: improve OracleCompliantImprovedNamingStrategy by preventing conflicts Modified: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java Modified: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-24 21:16:58 UTC (rev 677) +++ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-25 13:23:08 UTC (rev 678) @@ -2,15 +2,16 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import org.apache.commons.lang3.StringUtils; +import org.hibernate.HibernateException; import org.hibernate.cfg.ImprovedNamingStrategy; import org.hibernate.cfg.NamingStrategy; import java.util.List; -import java.util.Map; /** * Oracle doesn't support table names and columns names longer than 30 characters. @@ -34,7 +35,7 @@ */ protected static final int MAXIMUM_IDENTIFIER_LENGTH = 30; - protected Map<String, String> cache = Maps.newConcurrentMap(); + protected BiMap<String, String> identifierToShortenedIdentifier = HashBiMap.create(); /** * Given an identifier, return a similar identifier but no longer @@ -52,15 +53,27 @@ protected String getShortenedIdentifier(String value) { String reducedValue = value; if (value.length() > MAXIMUM_IDENTIFIER_LENGTH) { - reducedValue = cache.get(value); + reducedValue = identifierToShortenedIdentifier.get(value); if (reducedValue == null) { reducedValue = shortenIdentifier(value); - cache.put(value, reducedValue); + checkConflict(value, reducedValue); + identifierToShortenedIdentifier.put(value, reducedValue); } } return reducedValue; } + protected void checkConflict(String value, String reducedValue) { + boolean conflictInShortenedIdentifier = identifierToShortenedIdentifier.inverse().containsKey(reducedValue); + if (conflictInShortenedIdentifier) { + String otherIdentifier = identifierToShortenedIdentifier.inverse().get(reducedValue); + throw new HibernateException( + "error while using this naming strategy, a conflict occurred when short identifier for '" + + value + "' was computed. Generated short identifier (" + reducedValue + + ") is already used for identifier " + otherIdentifier); + } + } + protected String shortenIdentifier(String identifier) { Iterable <String> split = Splitter.on('_').split(identifier); int numberOfElements = Iterables.size(split); Modified: nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java 2013-06-24 21:16:58 UTC (rev 677) +++ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java 2013-06-25 13:23:08 UTC (rev 678) @@ -1,6 +1,8 @@ package org.nuiton.jpa.hibernate; +import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; +import org.hibernate.HibernateException; import org.junit.Assert; import org.junit.Test; @@ -79,4 +81,30 @@ return StringUtils.rightPad(value, 50, "LONG"); } + @Test + public void testConflictsRaiseException() { + + String longClassName1 = getLongValue("LONG_CLASS_NAME_") + "1"; + String longClassName2 = getLongValue("LONG_CLASS_NAME_") + "2"; + + // to lead to a conflict, we must check that both long class names + // will have the same reduced identifier + String shortenedIdentifier = oracleCompliantImprovedNamingStrategy.shortenIdentifier(longClassName1); + Preconditions.checkState( + shortenedIdentifier.equals(oracleCompliantImprovedNamingStrategy.shortenIdentifier(longClassName2)) + ); + + // now check that an exception is raised and exception message is explicit + oracleCompliantImprovedNamingStrategy.classToTableName(longClassName1); + + try { + oracleCompliantImprovedNamingStrategy.classToTableName(longClassName2); + Assert.fail("an exception should have been raised"); + } catch (HibernateException e) { + Assert.assertTrue(StringUtils.containsIgnoreCase(e.getMessage(), longClassName1)); + Assert.assertTrue(StringUtils.containsIgnoreCase(e.getMessage(), longClassName2)); + Assert.assertTrue(StringUtils.containsIgnoreCase(e.getMessage(), shortenedIdentifier)); + } + + } }

1 0

r677 - testEugeneUML-YAML/pollen/demo-pollen-user_friendly
by agiraudet＠users.nuiton.org June 24, 2013

June 24, 2013

Author: agiraudet Date: 2013-06-24 23:16:58 +0200 (Mon, 24 Jun 2013) New Revision: 677 Url: http://nuiton.org/projects/sandbox/repository/revisions/677 Log: mise a jour des modeles yaml Modified: testEugeneUML-YAML/pollen/demo-pollen-user_friendly/pollen.yamlobjectmodel Modified: testEugeneUML-YAML/pollen/demo-pollen-user_friendly/pollen.yamlobjectmodel =================================================================== --- testEugeneUML-YAML/pollen/demo-pollen-user_friendly/pollen.yamlobjectmodel 2013-06-20 15:38:34 UTC (rev 676) +++ testEugeneUML-YAML/pollen/demo-pollen-user_friendly/pollen.yamlobjectmodel 2013-06-24 21:16:58 UTC (rev 677) @@ -31,7 +31,7 @@ String name: double weight: PollAccount ordered [1..*] "PersonToList": - Vote unordered [0..1]: + Vote unordered [0..1]: unordered [0..1] class Vote <<entity>>: double weight: @@ -48,7 +48,7 @@ boolean administrator: String language: String email: - getDisplayName(): String + String getDisplayName(): PersonList favoriteList ordered [*] "UserAccount--PersonList": PollAccount ordered [*] "PollAccount--UserAccount": @@ -75,25 +75,25 @@ boolean continuousResults: Date endChoiceDate: int voteCountingType: - getVoteByPollAccount(PollAccount account): Vote - getAdminId(): String - getVoteId(PollAccount account): String - isStarted(Date currentDate): boolean - isRunning(Date currentDate): boolean - isFinished(Date currentDate): boolean - isAddChoiceStarted(Date currentDate): boolean - isAddChoiceRunning(Date currentDate): boolean - isAddChoiceFinished(Date currentDate): boolean - getPollAccounts(boolean withNoVote): List<PollAccount> - getPersonToListByVote(Vote vote): PersonToList - getPreventRuleByScope(String scope): PreventRule - isAnonymous(): boolean - isPollFree(): boolean - isPollGroup(): boolean - isPollRestricted(): boolean + Vote getVoteByPollAccount(PollAccount account): + String getAdminId(): + String getVoteId(PollAccount account): + boolean isStarted(Date currentDate): + boolean isRunning(Date currentDate): + boolean isFinished(Date currentDate): + boolean isAddChoiceStarted(Date currentDate): + boolean isAddChoiceRunning(Date currentDate): + boolean isAddChoiceFinished(Date currentDate): + List<PollAccount> getPollAccounts(boolean withNoVote): + PersonToList getPersonToListByVote(Vote vote): + PreventRule getPreventRuleByScope(String scope): + boolean isAnonymous(): + boolean isPollFree(): + boolean isPollGroup(): + boolean isPollRestricted(): Vote ordered [*]: Choice ordered [*]: - PollAccount creator unordered [0..1]: + PollAccount creator unordered [0..1]: ordered [*] Comment ordered [*]: PreventRule ordered [*]: VotingList ordered [*]: @@ -111,7 +111,7 @@ String text: Date postDate: String author: - PollAccount unordered: + PollAccount unordered: ordered [*] associationclass PersonToList <<entity>>: participant:

1 0

r676 - in nuiton-jpa/nuiton-jpa-hibernate/src: . license
by bleny＠users.nuiton.org June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:38:34 +0200 (Thu, 20 Jun 2013) New Revision: 676 Url: http://nuiton.org/projects/sandbox/repository/revisions/676 Log: add THIRD-PARTY.properties for nuiton-jpa-hibernate Added: nuiton-jpa/nuiton-jpa-hibernate/src/license/ nuiton-jpa/nuiton-jpa-hibernate/src/license/THIRD-PARTY.properties Added: nuiton-jpa/nuiton-jpa-hibernate/src/license/THIRD-PARTY.properties =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/license/THIRD-PARTY.properties (rev 0) +++ nuiton-jpa/nuiton-jpa-hibernate/src/license/THIRD-PARTY.properties 2013-06-20 15:38:34 UTC (rev 676) @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - GNU Lesser General Public License, version 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sat May 25 00:05:21 CEST 2013 +dom4j--dom4j--1.6.1=BSD License

1 0

r675 - nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate
by bleny＠users.nuiton.org June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:06:11 +0200 (Thu, 20 Jun 2013) New Revision: 675 Url: http://nuiton.org/projects/sandbox/repository/revisions/675 Log: add a piece of documentation about how to enable OracleCompliantImprovedNamingStrategy Modified: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java Modified: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-20 15:03:28 UTC (rev 674) +++ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-20 15:06:11 UTC (rev 675) @@ -19,6 +19,11 @@ * the name can lead to collisions according to your classes and their attributes names * </strong> * + * To use it, add the following configuration in Hibernate: + * + * <pre> + * hibernate.ejb.naming_strategy=org.nuiton.jpa.hibernate.OracleCompliantImprovedNamingStrategy + * </pre> */ public class OracleCompliantImprovedNamingStrategy extends ImprovedNamingStrategy implements NamingStrategy {

1 0

r674 - nuiton-jpa
by bleny＠users.nuiton.org June 20, 2013

June 20, 2013

Author: bleny Date: 2013-06-20 17:03:28 +0200 (Thu, 20 Jun 2013) New Revision: 674 Url: http://nuiton.org/projects/sandbox/repository/revisions/674 Log: remove usage of markdown doxia module Modified: nuiton-jpa/pom.xml Modified: nuiton-jpa/pom.xml =================================================================== --- nuiton-jpa/pom.xml 2013-06-20 15:01:45 UTC (rev 673) +++ nuiton-jpa/pom.xml 2013-06-20 15:03:28 UTC (rev 674) @@ -162,9 +162,9 @@ <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-markdown</artifactId> - <version>1.3</version> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin>

1 0

June 20, 2013

Author: bleny Date: 2013-06-20 17:01:45 +0200 (Thu, 20 Jun 2013) New Revision: 673 Url: http://nuiton.org/projects/sandbox/repository/revisions/673 Log: introduce nuiton-jpa-hibernate module, moving HibernateUtil inside it, introduce OracleCompliantImprovedNamingStrategy Added: nuiton-jpa/nuiton-jpa-api/src/test/ nuiton-jpa/nuiton-jpa-api/src/test/java/ nuiton-jpa/nuiton-jpa-hibernate/ nuiton-jpa/nuiton-jpa-hibernate/LICENSE.txt nuiton-jpa/nuiton-jpa-hibernate/README.txt nuiton-jpa/nuiton-jpa-hibernate/changelog.txt nuiton-jpa/nuiton-jpa-hibernate/pom.xml nuiton-jpa/nuiton-jpa-hibernate/src/ nuiton-jpa/nuiton-jpa-hibernate/src/main/ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java nuiton-jpa/nuiton-jpa-hibernate/src/test/ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java Removed: nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/hibernate/ Modified: nuiton-jpa/nuiton-jpa-api/pom.xml nuiton-jpa/nuiton-jpa-junit/pom.xml nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java nuiton-jpa/pom.xml Modified: nuiton-jpa/nuiton-jpa-api/pom.xml =================================================================== --- nuiton-jpa/nuiton-jpa-api/pom.xml 2013-06-19 07:57:46 UTC (rev 672) +++ nuiton-jpa/nuiton-jpa-api/pom.xml 2013-06-20 15:01:45 UTC (rev 673) @@ -22,16 +22,6 @@ </dependency> <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - </dependency> - - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Property changes on: nuiton-jpa/nuiton-jpa-hibernate ___________________________________________________________________ Added: svn:ignore + target *.iml Added: nuiton-jpa/nuiton-jpa-hibernate/LICENSE.txt =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/LICENSE.txt (rev 0) +++ nuiton-jpa/nuiton-jpa-hibernate/LICENSE.txt 2013-06-20 15:01:45 UTC (rev 673) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: nuiton-jpa/nuiton-jpa-hibernate/README.txt =================================================================== Added: nuiton-jpa/nuiton-jpa-hibernate/changelog.txt =================================================================== Added: nuiton-jpa/nuiton-jpa-hibernate/pom.xml =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/pom.xml (rev 0) +++ nuiton-jpa/nuiton-jpa-hibernate/pom.xml 2013-06-20 15:01:45 UTC (rev 673) @@ -0,0 +1,61 @@ +<?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> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-jpa</artifactId> + <version>0.1-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jpa</groupId> + <artifactId>nuiton-jpa-hibernate</artifactId> + + <name>Nuiton Jpa :: Hibernate</name> + + <dependencies> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + + </dependencies> + + <build> + + + </build> + +</project> Copied: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java (from rev 672, nuiton-jpa/nuiton-jpa-api/src/main/java/org/nuiton/jpa/api/hibernate/HibernateUtil.java) =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java (rev 0) +++ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java 2013-06-20 15:01:45 UTC (rev 673) @@ -0,0 +1,159 @@ +package org.nuiton.jpa.hibernate; + +/* + * #%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 org.apache.commons.lang3.SystemUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Configuration; +import org.hibernate.cfg.Environment; +import org.hibernate.ejb.AvailableSettings; +import org.hibernate.ejb.EntityManagerFactoryImpl; +import org.hibernate.service.ServiceRegistry; +import org.hibernate.service.internal.SessionFactoryServiceRegistryImpl; +import org.hibernate.tool.hbm2ddl.SchemaExport; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import java.io.File; +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +public class HibernateUtil { + + private static final Log log = LogFactory.getLog(HibernateUtil.class); + + protected static final Map<String, String> HIBERNATE_H2_CONFIG; + + public static final String HBM2DDL_AUTO_VALIDATE = "validate"; + + public static final String HBM2DDL_AUTO_CREATE_DROP = "create-drop"; + + public static final String HBM2DDL_AUTO_CREATE = "create"; + + public static final String HBM2DDL_AUTO_UPDATE = "update"; + + static { + + Map<String, String> hibernateH2Config = new HashMap<String, String>(); + + hibernateH2Config.put(AvailableSettings.JDBC_DRIVER, org.h2.Driver.class.getName()); + hibernateH2Config.put(AvailableSettings.JDBC_USER, "sa"); + hibernateH2Config.put(AvailableSettings.JDBC_PASSWORD, ""); + hibernateH2Config.put(Environment.DIALECT, org.hibernate.dialect.H2Dialect.class.getName()); + hibernateH2Config.put(Environment.HBM2DDL_AUTO, HBM2DDL_AUTO_UPDATE); + + HIBERNATE_H2_CONFIG = Collections.unmodifiableMap(hibernateH2Config); + + } + + private HibernateUtil() { + } + + public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context) { + + EntityManagerFactory tempEntityManagerFactory = + createTempEntityManagerFactory( + persistenceUnitName, + context, Collections.<String, String>emptyMap()); + + return tempEntityManagerFactory; + + } + + public static EntityManagerFactory createTempEntityManagerFactory(String persistenceUnitName, String context, Map<String, String> jpaParameters) { + + Map<String, String> allJpaParameters = new HashMap<String, String>(); + + allJpaParameters.putAll(jpaParameters); + + allJpaParameters.putAll(HIBERNATE_H2_CONFIG); + + File tempDirFile = SystemUtils.getJavaIoTmpDir(); + + File databaseFile = new File(tempDirFile, context); + + String h2dataPath = databaseFile.getAbsolutePath() + File.separator + "h2data"; + + String jdbcUrl = "jdbc:h2:file:" + h2dataPath; + + allJpaParameters.put(AvailableSettings.JDBC_URL, jdbcUrl); + + if (log.isTraceEnabled()) { + log.trace("will store H2 data in " + h2dataPath); + log.trace("allJpaParameters = " + allJpaParameters); + } + + if (log.isDebugEnabled()) { + log.debug("jdbc url is\n" + jdbcUrl); + } + + EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory(persistenceUnitName, allJpaParameters); + + return entityManagerFactory; + + } + + public static void cleanDatabase(EntityManager entityManager) { + + if (log.isInfoEnabled()) { + log.info("will clean database"); + } + + ServiceRegistry serviceRegistry = + ((EntityManagerFactoryImpl) entityManager.getEntityManagerFactory()) + .getSessionFactory().getServiceRegistry(); + + Configuration configuration = null; + try { + Field configurationField = SessionFactoryServiceRegistryImpl.class.getDeclaredField("configuration"); + configurationField.setAccessible(true); + configuration = (Configuration) configurationField.get(serviceRegistry); + } catch (IllegalAccessException e) { + if (log.isErrorEnabled()) { + log.error("should not occur", e); + } + } catch (NoSuchFieldException e) { + if (log.isErrorEnabled()) { + log.error("should not occur", e); + } + } + + SchemaExport schemaExport = new SchemaExport(serviceRegistry, configuration); + + schemaExport.setHaltOnError(true); + + // drop + schemaExport.execute(true, true, true, false); + + // create + schemaExport.execute(true, true, false, true); + + } + +} \ No newline at end of file Property changes on: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/HibernateUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java (rev 0) +++ nuiton-jpa/nuiton-jpa-hibernate/src/main/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategy.java 2013-06-20 15:01:45 UTC (rev 673) @@ -0,0 +1,122 @@ +package org.nuiton.jpa.hibernate; + +import com.google.common.base.Joiner; +import com.google.common.base.Splitter; +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import org.apache.commons.lang3.StringUtils; +import org.hibernate.cfg.ImprovedNamingStrategy; +import org.hibernate.cfg.NamingStrategy; + +import java.util.List; +import java.util.Map; + +/** + * Oracle doesn't support table names and columns names longer than 30 characters. + * + * This naming strategy solve the issue. <strong>This is not safe, since reducing + * the name can lead to collisions according to your classes and their attributes names + * </strong> + * + */ +public class OracleCompliantImprovedNamingStrategy extends ImprovedNamingStrategy implements NamingStrategy { + + /** + * Arbitrary value fixed by Oracle. + * + * @link http://stackoverflow.com/questions/8701479/table-name-with-more-than-30-cha… + */ + protected static final int MAXIMUM_IDENTIFIER_LENGTH = 30; + + protected Map<String, String> cache = Maps.newConcurrentMap(); + + /** + * Given an identifier, return a similar identifier but no longer + * than MAXIMUM_IDENTIFIER_LENGTH. Some characters are removed + * at the end of each part of the identifier. + * + * Any given identifier shorter than MAXIMUM_IDENTIFIER_LENGTH + * will be returned as it. + * + * @param value a string that may contain some underscores + * @return a string that looks like given value but without + * removed characters in order to make the total + * length lower than MAXIMUM_IDENTIFIER_LENGTH + */ + protected String getShortenedIdentifier(String value) { + String reducedValue = value; + if (value.length() > MAXIMUM_IDENTIFIER_LENGTH) { + reducedValue = cache.get(value); + if (reducedValue == null) { + reducedValue = shortenIdentifier(value); + cache.put(value, reducedValue); + } + } + return reducedValue; + } + + protected String shortenIdentifier(String identifier) { + Iterable <String> split = Splitter.on('_').split(identifier); + int numberOfElements = Iterables.size(split); + int numberOfUnderscores = numberOfElements - 1; + int acceptedLengthForAnElement = (MAXIMUM_IDENTIFIER_LENGTH - numberOfUnderscores) / numberOfElements; + List<String> reducedElements = Lists.newLinkedList(); + for (String element : split) { + reducedElements.add(StringUtils.left(element, acceptedLengthForAnElement)); + } + String reducedIdentifier = Joiner.on('_').join(reducedElements); + return reducedIdentifier; + } + + @Override + public String classToTableName(String className) { + return getShortenedIdentifier(super.classToTableName(className)); + } + + @Override + public String propertyToColumnName(String propertyName) { + return getShortenedIdentifier(super.propertyToColumnName(propertyName)); + } + + @Override + public String tableName(String tableName) { + return getShortenedIdentifier(super.tableName(tableName)); + } + + @Override + public String columnName(String columnName) { + return getShortenedIdentifier(super.columnName(columnName)); + } + + @Override + public String collectionTableName(String ownerEntity, String ownerEntityTable, String associatedEntity, String associatedEntityTable, String propertyName) { + return getShortenedIdentifier(super.collectionTableName(ownerEntity, ownerEntityTable, associatedEntity, associatedEntityTable, propertyName)); + } + + @Override + public String joinKeyColumnName(String joinedColumn, String joinedTable) { + return getShortenedIdentifier(super.joinKeyColumnName(joinedColumn, joinedTable)); + } + + @Override + public String foreignKeyColumnName(String propertyName, String propertyEntityName, String propertyTableName, String referencedColumnName) { + return getShortenedIdentifier(super.foreignKeyColumnName(propertyName, propertyEntityName, propertyTableName, referencedColumnName)); + } + + @Override + public String logicalColumnName(String columnName, String propertyName) { + return getShortenedIdentifier(super.logicalColumnName(columnName, propertyName)); + } + + @Override + public String logicalCollectionTableName(String tableName, String ownerEntityTable, String associatedEntityTable, String propertyName) { + return getShortenedIdentifier(super.logicalCollectionTableName(tableName, ownerEntityTable, associatedEntityTable, propertyName)); + } + + @Override + public String logicalCollectionColumnName(String columnName, String propertyName, String referencedColumn) { + return getShortenedIdentifier(super.logicalCollectionColumnName(columnName, propertyName, referencedColumn)); + } + +} Added: nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java =================================================================== --- nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java (rev 0) +++ nuiton-jpa/nuiton-jpa-hibernate/src/test/java/org/nuiton/jpa/hibernate/OracleCompliantImprovedNamingStrategyTest.java 2013-06-20 15:01:45 UTC (rev 673) @@ -0,0 +1,82 @@ +package org.nuiton.jpa.hibernate; + +import org.apache.commons.lang3.StringUtils; +import org.junit.Assert; +import org.junit.Test; + +public class OracleCompliantImprovedNamingStrategyTest { + + protected OracleCompliantImprovedNamingStrategy oracleCompliantImprovedNamingStrategy = new OracleCompliantImprovedNamingStrategy(); + + @Test + public void testNamingStrategy() { + + String className = getLongValue("LONG_CLASS_NAME_"); + + String ownerEntity = getLongValue("LONG_OWNER_ENTITY_"); + + String ownerEntityTable = getLongValue("LONG_OWNER_ENTITY_TABLE_"); + + String associatedEntity = getLongValue("LONG_ASSOCIATED_ENTITY_"); + + String associatedEntityTable = getLongValue("LONG_ASSOCIATED_ENTITY_TABLE_"); + + String propertyName = getLongValue("LONG_PROPERTY_NAME_"); + + String tableName = getLongValue("LONG_TABLE_NAME_"); + + String columnName = getLongValue("LONG_COLUMN_NAME_"); + + String propertyEntityName = getLongValue("LONG_PROPERTY_ENTITY_NAME"); + + String propertyTableName = getLongValue("LONG_PROPERTY_TABLE_NAME"); + + String referencedColumnName = getLongValue("LONG_REFERENCED_COLUMN_NAME"); + + String referencedColumn = getLongValue("LONG_REFERENCED_COLUMN"); + + String joinedColumn = getLongValue("LONG_JOINED_COLUMN"); + + String joinedTable = getLongValue("LONG_JOINED_TABLE"); + + check(oracleCompliantImprovedNamingStrategy.classToTableName(className)); + + check(oracleCompliantImprovedNamingStrategy.classToTableName("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")); + + check(oracleCompliantImprovedNamingStrategy.collectionTableName(ownerEntity, ownerEntityTable, associatedEntity, associatedEntityTable, propertyName)); + + check(oracleCompliantImprovedNamingStrategy.logicalCollectionTableName(tableName, ownerEntityTable, associatedEntityTable, propertyName)); + + check(oracleCompliantImprovedNamingStrategy.columnName(columnName)); + + check(oracleCompliantImprovedNamingStrategy.tableName(tableName)); + + check(oracleCompliantImprovedNamingStrategy.foreignKeyColumnName(propertyName, propertyEntityName, propertyTableName, referencedColumnName)); + + check(oracleCompliantImprovedNamingStrategy.propertyToColumnName(propertyName)); + + check(oracleCompliantImprovedNamingStrategy.logicalCollectionColumnName(columnName, propertyName, referencedColumn)); + + check(oracleCompliantImprovedNamingStrategy.logicalColumnName(columnName, propertyName)); + + check(oracleCompliantImprovedNamingStrategy.joinKeyColumnName(joinedColumn, joinedTable)); + + } + + protected void check(String reducedValue) { + + Assert.assertFalse( + "'" + reducedValue + "' length (" + reducedValue.length() + ") is too long", + reducedValue.length() > oracleCompliantImprovedNamingStrategy.MAXIMUM_IDENTIFIER_LENGTH); + + Assert.assertFalse(reducedValue.startsWith("_")); + + Assert.assertFalse(reducedValue.endsWith("_")); + + } + + protected String getLongValue(String value) { + return StringUtils.rightPad(value, 50, "LONG"); + } + +} Modified: nuiton-jpa/nuiton-jpa-junit/pom.xml =================================================================== --- nuiton-jpa/nuiton-jpa-junit/pom.xml 2013-06-19 07:57:46 UTC (rev 672) +++ nuiton-jpa/nuiton-jpa-junit/pom.xml 2013-06-20 15:01:45 UTC (rev 673) @@ -16,9 +16,10 @@ <dependencies> +  <dependency> <groupId>${project.groupId}</groupId> - <artifactId>nuiton-jpa-api</artifactId> + <artifactId>nuiton-jpa-hibernate</artifactId> <version>${project.version}</version> </dependency> Modified: nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java =================================================================== --- nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java 2013-06-19 07:57:46 UTC (rev 672) +++ nuiton-jpa/nuiton-jpa-junit/src/main/java/org/nuiton/jpa/junit/JpaEntityManagerRule.java 2013-06-20 15:01:45 UTC (rev 673) @@ -29,7 +29,7 @@ import org.junit.rules.TestRule; import org.junit.runner.Description; import org.junit.runners.model.Statement; -import org.nuiton.jpa.api.hibernate.HibernateUtil; +import org.nuiton.jpa.hibernate.HibernateUtil; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; Modified: nuiton-jpa/pom.xml =================================================================== --- nuiton-jpa/pom.xml 2013-06-19 07:57:46 UTC (rev 672) +++ nuiton-jpa/pom.xml 2013-06-20 15:01:45 UTC (rev 673) @@ -47,6 +47,7 @@ <modules> <module>nuiton-jpa-api</module> + <module>nuiton-jpa-hibernate</module> <module>nuiton-jpa-junit</module> <module>nuiton-jpa-templates</module> </modules> @@ -161,9 +162,9 @@ <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-markdown</artifactId> + <version>1.3</version> </dependency> </dependencies> </plugin>

1 0

r672 - in nuiton-jpa/nuiton-jpa-templates/src: it/magalie-with-generated-value/src/main/xmi main/java/org/nuiton/jpa/templates
by tchemit＠users.nuiton.org June 19, 2013

June 19, 2013

Author: tchemit Date: 2013-06-19 09:57:46 +0200 (Wed, 19 Jun 2013) New Revision: 672 Url: http://nuiton.org/projects/sandbox/repository/revisions/672 Log: add generate extra technical fields tag value Modified: nuiton-jpa/nuiton-jpa-templates/src/it/magalie-with-generated-value/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/JpaTemplatesGeneratorUtil.java nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java 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-15 14:27:31 UTC (rev 671) +++ nuiton-jpa/nuiton-jpa-templates/src/it/magalie-with-generated-value/src/main/xmi/magalie.properties 2013-06-19 07:57:46 UTC (rev 672) @@ -24,6 +24,7 @@ model.tagValue.idFactory=true model.tagValue.generatePropertyChangeListeners=true model.tagValue.generateVisitors=true +model.tagValue.generateExtraTechnicalFields=true 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-15 14:27:31 UTC (rev 671) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaEntityTransformer.java 2013-06-19 07:57:46 UTC (rev 672) @@ -57,9 +57,11 @@ import javax.persistence.OneToOne; import javax.persistence.OrderColumn; import javax.persistence.PrePersist; +import javax.persistence.Version; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Set; @@ -84,6 +86,10 @@ private static final Log log = LogFactory.getLog(JpaEntityTransformer.class); + public static final String PROPERTY_VERSION = "version"; + + public static final String PROPERTY_CREATE_DATE = "createDate"; + @Override public void transformFromClass(ObjectModelClass input) { @@ -238,11 +244,36 @@ idAttr.setType(String.class.getName()); properties.add(0, idAttr); + boolean generateTechnicalFields = + JpaTemplatesGeneratorUtil.useGenerateExtraTechnicalFields(getModel(), input); + + if (generateTechnicalFields) { + + // add version field + ObjectModelAttributeImpl versionAttr = new ObjectModelAttributeImpl(); + versionAttr.setDeclaringElement(input); + versionAttr.setName(PROPERTY_VERSION); + versionAttr.setType(int.class.getName()); + properties.add(1, versionAttr); + + // add createDate field + ObjectModelAttributeImpl createDateAttr = new ObjectModelAttributeImpl(); + createDateAttr.setDeclaringElement(input); + createDateAttr.setName(PROPERTY_CREATE_DATE); + createDateAttr.setType(Date.class.getName()); + createDateAttr.setDefaultValue("new Date()"); + properties.add(2, createDateAttr); + } + + //TODO Si ORDERED ou et UNIQUE choisir le bon type de collection (O+U = LHS (laisser ça comme definition), (U = HS + S), (O = ArrayList +L), ( = ArrayList + C) //TODO Si enumeration @Enumeration(value = EnumType.STRING) (Voir pour mettre une tag-value pour mettre en ordinal) + voir comment ça marche pour les collections Multimap<ObjectModelAttribute, String> annotationsForAttributes = - generateAnnotationsForProperties(input, output, properties); + generateAnnotationsForProperties(input, + output, + properties, + generateTechnicalFields); // Add properties constant for (ObjectModelAttribute attr : properties) { @@ -308,7 +339,8 @@ protected Multimap<ObjectModelAttribute, String> generateAnnotationsForProperties(ObjectModelClass input, ObjectModelClass output, - List<ObjectModelAttribute> properties) { + List<ObjectModelAttribute> properties, + boolean generateTechnicalFields) { ArrayListMultimap<ObjectModelAttribute, String> result = ArrayListMultimap.create(); @@ -324,6 +356,12 @@ continue; } + if (PROPERTY_VERSION.equals(propertyName) && generateTechnicalFields) { + + addAnnotation(result, property, output, Version.class); + continue; + } + ObjectModelAttribute reverseAttribute = property.getReverseAttribute(); @@ -566,7 +604,7 @@ ObjectModelAttribute attribute = addAttribute(output, attrName, attrType, - "", + attr.getDefaultValue(), ObjectModelJavaModifier.PROTECTED ); 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-15 14:27:31 UTC (rev 671) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesGeneratorUtil.java 2013-06-19 07:57:46 UTC (rev 672) @@ -325,6 +325,26 @@ } /** + * Obtain the value of the {@link JpaTemplatesTagValues#TAG_GENERATE_EXTRA_TECHNICAL_FIELDS} + * tag value on the given model. + * + * @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_GENERATE_EXTRA_TECHNICAL_FIELDS + * @since 0.1 + */ + public static String getGenerateExtraTechnicalFieldsTagValue(ObjectModel model, ObjectModelClassifier classifier) { + String value = findTagValue(JpaTemplatesTagValues.TAG_GENERATE_EXTRA_TECHNICAL_FIELDS, null, model); + return value; + } + + public static boolean useGenerateExtraTechnicalFields(ObjectModel model,ObjectModelClassifier classifier) { + String value = getGenerateExtraTechnicalFieldsTagValue(model, classifier); + return ObjectUtils.equals("true", value); + } + + /** * Obtain the value of the {@link JpaTemplatesTagValues#TAG_ENTITY_SUPER_CLASS} * tag value on the given model or classifier. * <p/> 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-15 14:27:31 UTC (rev 671) +++ nuiton-jpa/nuiton-jpa-templates/src/main/java/org/nuiton/jpa/templates/JpaTemplatesTagValues.java 2013-06-19 07:57:46 UTC (rev 672) @@ -113,7 +113,7 @@ /** * Tag value to generate visitors on entities if setted to {@code true}. * - * @see JpaTemplatesGeneratorUtil#getGeneratePropertyChangeListenersTagValue(ObjectModel) + * @see JpaTemplatesGeneratorUtil#getGenerateVisitorsTagValue(ObjectModel) * @since 0.1 */ @ModelPropertiesUtil.TagValueDefinition( @@ -121,4 +121,17 @@ documentation = "Tag value to generate visitors on entities.") String TAG_GENERATE_VISITORS = "generateVisitors"; + /** + * Tag value to generate extra technical fields (version, createDate) for + * a specific entity or for all entities of a model. + * + * @see JpaTemplatesGeneratorUtil#getGenerateExtraTechnicalFieldsTagValue(ObjectModel, ObjectModelClassifier) + * @since 0.1 + */ + @ModelPropertiesUtil.TagValueDefinition( + target = {ObjectModel.class, ObjectModelClassifier.class}, + documentation = "Tag value to generate extra technical fields (version, createDate) for \n" + + "a specific entity or for all entities of a model.") + String TAG_GENERATE_EXTRA_TECHNICAL_FIELDS = "generateExtraTechnicalFields"; + }

1 0