- Wikitty-commits - mailman.cloud.codelutin.com

r356 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 14:45:38 +0200 (Tue, 28 Sep 2010) New Revision: 356 Url: http://nuiton.org/repositories/revision/wikitty/356 Log: Rename disableAutoVersionIncrement parameter to force. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-09-28 12:45:38 UTC (rev 356) @@ -178,12 +178,12 @@ * * @param securityToken security token * @param wikitties list of wikitty to be persisted - * @param disableAutoVersionIncrement boolean to disable version increment - * on saved wikitty + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) * @return update response */ public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, - boolean disableAutoVersionIncrement); + boolean force); /** @@ -193,12 +193,12 @@ * @param securityToken security token * @param transaction transaction used to do the action (must not be null) * @param wikitties list of wikitty to be persisted - * @param disableAutoVersionIncrement boolean to disable version increment - * on saved wikitty + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) * @return update response */ public UpdateResponse store(String securityToken, WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement); + Collection<Wikitty> wikitties, boolean force); /** * Return all extension id (ex: "extName[version])"). Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-09-28 12:45:38 UTC (rev 356) @@ -576,13 +576,14 @@ * Overriden to put wikitty in cache * * @param wikitties - * @param disableAutoVersionIncrement + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) * @return */ @Override public UpdateResponse store(String securityToken, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { - UpdateResponse result = ws.store(securityToken, wikitties, disableAutoVersionIncrement); + Collection<Wikitty> wikitties, boolean force) { + UpdateResponse result = ws.store(securityToken, wikitties, force); for (Wikitty w : wikitties) { result.update(w); @@ -596,14 +597,15 @@ * Overriden to put wikitty in cache * * @param wikitties - * @param disableAutoVersionIncrement + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) * @return */ @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + Collection<Wikitty> wikitties, boolean force) { UpdateResponse result = ws.store(securityToken, transaction, - wikitties, disableAutoVersionIncrement); + wikitties, force); for (Wikitty w : wikitties) { result.update(w); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-09-28 12:45:38 UTC (rev 356) @@ -107,17 +107,15 @@ @Override public UpdateResponse store(String securityToken, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { - return delegate.store(securityToken, wikitties, - disableAutoVersionIncrement); + Collection<Wikitty> wikitties, boolean force) { + return delegate.store(securityToken, wikitties, force); } @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, - boolean disableAutoVersionIncrement) { - return delegate.store(securityToken, transaction, wikitties, - disableAutoVersionIncrement); + boolean force) { + return delegate.store(securityToken, transaction, wikitties, force); } @Override Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-28 12:45:38 UTC (rev 356) @@ -148,7 +148,7 @@ @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + Collection<Wikitty> wikitties, boolean force) { checkConstraint(wikitties); // update/store extension if necessary @@ -160,7 +160,7 @@ // try to commit command UpdateResponse extUpdate = getExtensionStorage().store(transaction, allExtensions); - UpdateResponse wikUpdate = getWikittyStorage().store(transaction, wikitties, disableAutoVersionIncrement); + UpdateResponse wikUpdate = getWikittyStorage().store(transaction, wikitties, force); UpdateResponse indexUpdate = getSearchEngin().store(transaction, wikitties); UpdateResponse result = new UpdateResponse(); @@ -189,6 +189,9 @@ transaction.commit(); return result; + } catch (WikittyObsoleteException ex) { + transaction.rollback(); + throw ex; } catch (Exception eee) { transaction.rollback(); throw new WikittyException(eee); @@ -214,6 +217,9 @@ transaction.commit(); return result; + } catch (WikittyObsoleteException ex) { + transaction.rollback(); + throw ex; } catch (Exception eee) { transaction.rollback(); throw new WikittyException(eee); @@ -224,19 +230,24 @@ * Store and index wikitties object. * * @param wikitties + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) */ @Override public UpdateResponse store(String securityToken, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + Collection<Wikitty> wikitties, boolean force) { WikittyTransaction transaction = new WikittyTransaction(); try { transaction.begin(); UpdateResponse result = store(securityToken, - transaction, wikitties, disableAutoVersionIncrement); + transaction, wikitties, force); transaction.commit(); return result; + } catch (WikittyObsoleteException ex) { + transaction.rollback(); + throw ex; } catch (Exception eee) { transaction.rollback(); throw new WikittyException(eee); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-09-28 12:45:38 UTC (rev 356) @@ -221,9 +221,9 @@ @Override public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, - boolean disableAutoVersionIncrement) { + boolean force) { UpdateResponse updateResponse = ws.store( - securityToken, wikitties, disableAutoVersionIncrement); + securityToken, wikitties, force); // update wikitty for (Wikitty wikitty : wikitties) { updateResponse.update(wikitty); @@ -235,9 +235,9 @@ @Override public UpdateResponse store(String securityToken, WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + Collection<Wikitty> wikitties, boolean force) { UpdateResponse updateResponse = ws.store(securityToken, transaction, - wikitties, disableAutoVersionIncrement); + wikitties, force); // update wikitty for (Wikitty wikitty : wikitties) { updateResponse.update(wikitty); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-09-28 12:45:38 UTC (rev 356) @@ -316,9 +316,9 @@ } @Override - public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties, boolean force) { Collection<Wikitty> wikittiesToStore = removeUnauthorizedModifications(securityToken, wikitties); - UpdateResponse result = ws.store(securityToken, wikittiesToStore, disableAutoVersionIncrement); + UpdateResponse result = ws.store(securityToken, wikittiesToStore, force); return result; } @@ -365,9 +365,9 @@ } @Override - public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + public UpdateResponse store(String securityToken, WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { Collection<Wikitty> wikittiesToStore = removeUnauthorizedModifications(securityToken, wikitties); - UpdateResponse result = ws.store(securityToken, transaction, wikittiesToStore, disableAutoVersionIncrement); + UpdateResponse result = ws.store(securityToken, transaction, wikittiesToStore, force); return result; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java 2010-09-28 12:45:38 UTC (rev 356) @@ -35,11 +35,12 @@ * * @param transaction transaction * @param wikitties wikitty collection - * @param disableAutoVersionIncrement + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) * * @return information usefull for client side update data */ - public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement); + public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force); /** * Return true if id exists in storage. Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java =================================================================== --- trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-09-28 12:45:38 UTC (rev 356) @@ -86,8 +86,7 @@ @Override public UpdateResponse store(WikittyTransaction transaction, - Collection<Wikitty> wikitties, - boolean disableAutoVersionIncrement) throws WikittyException { + Collection<Wikitty> wikitties, boolean force) throws WikittyException { try { UpdateResponse result = new UpdateResponse(); List<Put> puts = new ArrayList<Put>(); @@ -105,7 +104,7 @@ // compute new version, but not change wikitty during prepare String newVersion = null; - if (disableAutoVersionIncrement) { + if (force) { if (actualVersion == null) { //no version in place if (requestedVersion == null) { //no version requested newVersion = WikittyUtil.DEFAULT_VERSION; Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-28 12:45:38 UTC (rev 356) @@ -160,8 +160,7 @@ @Override public UpdateResponse store(WikittyTransaction transaction, - Collection<Wikitty> wikitties, - boolean disableAutoVersionIncrement) throws WikittyException { + Collection<Wikitty> wikitties, boolean force) throws WikittyException { Connection connection = getConnection(conf); try { UpdateResponse result = new UpdateResponse(); @@ -183,7 +182,7 @@ // compute new version, but not change wikitty String newVersion = null; - if (disableAutoVersionIncrement) { + if (force) { if (actualVersion == null) { //no version in place if (requestedVersion == null) { //no version requested newVersion = WikittyUtil.DEFAULT_VERSION; @@ -208,7 +207,7 @@ // wikitty is not modified, do nothing continue; } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { - throw new WikittyException(String.format( + throw new WikittyObsoleteException(String.format( "Your wikitty '%s' is obsolete", wikitty.getId())); } else { newVersion = WikittyUtil.incrementMajorRevision(actualVersion); Modified: trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java =================================================================== --- trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyJMSUtil.java 2010-09-28 12:45:38 UTC (rev 356) @@ -60,8 +60,8 @@ /** parameter wikitties in message with List<Wikitty>*/ static final public String PARAM_WIKITTIES = "wikitties"; - /** parameter disableAutoVersionIncrement in message with boolean */ - static final public String PARAM_DISABLE_AUTO_VERSION_INCREMENT = "disableAutoVersionIncrement"; + /** parameter forceVersion in message with boolean */ + static final public String PARAM_FORCE_VERSION = "forceVersion"; /** parameter ids in message with List<String> */ static final public String PARAM_IDS = "ids"; /** parameter action in message specifying action to perform */ Modified: trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java =================================================================== --- trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageJMS.java 2010-09-28 12:45:38 UTC (rev 356) @@ -21,7 +21,7 @@ import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_DELETE; import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_STORE; import static org.nuiton.wikitty.jms.WikittyJMSUtil.JNDI_PROVIDER_URL; -import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_DISABLE_AUTO_VERSION_INCREMENT; +import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_FORCE_VERSION; import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_IDS; import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_WIKITTIES; import static org.nuiton.wikitty.jms.WikittyJMSUtil.TOPIC_WIKITTY_STORAGE; @@ -109,15 +109,17 @@ * </ul> * * @param transaction - * @param extensions + * @param wikitties wikitties to store + * @param force boolean force non version version increment on saved wikitty + * or force version on wikitty creation (version 0.0) */ @Override - public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { try { WikittyJMSUtil.addXAResource(transaction, topicSession); WikittyActionMessage message = new WikittyActionMessage(); message.setAction(ACTION_STORE); - message.addParameter(PARAM_DISABLE_AUTO_VERSION_INCREMENT, disableAutoVersionIncrement); + message.addParameter(PARAM_FORCE_VERSION, force); message.addParameter(PARAM_WIKITTIES, new ArrayList<Wikitty>(wikitties)); ObjectMessage sendMessage = WikittyActionMessage.createSendMessage(message); Modified: trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java =================================================================== --- trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jms-impl/src/main/java/org/nuiton/wikitty/jms/WikittyStorageSubscriberJMS.java 2010-09-28 12:45:38 UTC (rev 356) @@ -21,7 +21,7 @@ import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_DELETE; import static org.nuiton.wikitty.jms.WikittyJMSUtil.ACTION_STORE; import static org.nuiton.wikitty.jms.WikittyJMSUtil.JNDI_PROVIDER_URL; -import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_DISABLE_AUTO_VERSION_INCREMENT; +import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_FORCE_VERSION; import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_IDS; import static org.nuiton.wikitty.jms.WikittyJMSUtil.PARAM_WIKITTIES; import static org.nuiton.wikitty.jms.WikittyJMSUtil.TOPIC_WIKITTY_STORAGE; @@ -220,7 +220,7 @@ (ArrayList<Wikitty>) message.getParameter(PARAM_WIKITTIES); Boolean disableAutoVersionIncrement = - (Boolean) message.getParameter(PARAM_DISABLE_AUTO_VERSION_INCREMENT); + (Boolean) message.getParameter(PARAM_FORCE_VERSION); delegateStorage.store(transaction, wikitties, disableAutoVersionIncrement); } Modified: trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java =================================================================== --- trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/TopicSendReceiveTestSupport.java 2010-09-28 12:45:38 UTC (rev 356) @@ -225,7 +225,7 @@ WikittyStorage delegateStorage = new WikittyStorageAdapter() { @Override public UpdateResponse store(WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + Collection<Wikitty> wikitties, boolean force) { test_wikitties = wikitties; return null; } Modified: trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java =================================================================== --- trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jms-impl/src/test/java/org/nuiton/wikitty/jms/test/WikittyStorageAdapter.java 2010-09-28 12:45:38 UTC (rev 356) @@ -22,7 +22,7 @@ */ @Override public UpdateResponse store(WikittyTransaction transaction, - Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + Collection<Wikitty> wikitties, boolean force) { return null; } Modified: trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java =================================================================== --- trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-09-28 12:45:38 UTC (rev 356) @@ -66,8 +66,7 @@ @Override public UpdateResponse store(WikittyTransaction transaction, - Collection<Wikitty> wikitties, - boolean disableAutoVersionIncrement) throws WikittyException { + Collection<Wikitty> wikitties, boolean force) throws WikittyException { EntityManager entityManager = WikittyJPAUtil.getEntityManager(entityManagerFactory, transaction); UpdateResponse result = new UpdateResponse(); @@ -85,7 +84,7 @@ // compute new version, but not change wikitty during prepare String newVersion = null; - if (disableAutoVersionIncrement) { + if (force) { if (actualVersion == null) { //no version in place if (requestedVersion == null) { //no version requested newVersion = WikittyUtil.DEFAULT_VERSION; Modified: trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java =================================================================== --- trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java 2010-09-28 11:52:09 UTC (rev 355) +++ trunk/wikitty-multistorage-impl/src/main/java/org/nuiton/wikitty/multistorage/WikittyMultiStorage.java 2010-09-28 12:45:38 UTC (rev 356) @@ -50,15 +50,15 @@ } @Override - public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { + public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { List<WikittyStorage> wikittyStorageMasters = configuration.getWikittyStorageMasters(); for (WikittyStorage wikittyStorage : wikittyStorageMasters) { - wikittyStorage.store(transaction, wikitties, disableAutoVersionIncrement); + wikittyStorage.store(transaction, wikitties, force); } List<WikittyStorage> wikittyStorageReplications = configuration.getWikittyStorageReplications(); for (WikittyStorage wikittyStorage : wikittyStorageReplications) { - wikittyStorage.store(transaction, wikitties, disableAutoVersionIncrement); + wikittyStorage.store(transaction, wikitties, force); } // nothing to put in result

1 0

r355 - trunk/wikitty-api/src/test/resources
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 13:52:09 +0200 (Tue, 28 Sep 2010) New Revision: 355 Url: http://nuiton.org/repositories/revision/wikitty/355 Log: Fix test loglevel Modified: trunk/wikitty-api/src/test/resources/log4j.properties Modified: trunk/wikitty-api/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-api/src/test/resources/log4j.properties 2010-09-28 11:06:57 UTC (rev 354) +++ trunk/wikitty-api/src/test/resources/log4j.properties 2010-09-28 11:52:09 UTC (rev 355) @@ -1,3 +1,6 @@ +# Configuration by components +log4j.rootLogger=WARN, logConsole + # Appender and Layout log4j.appender.logConsole=org.apache.log4j.ConsoleAppender log4j.appender.logConsole.layout=org.apache.log4j.PatternLayout @@ -2,5 +5 @@ log4j.appender.logConsole.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n - -# Configuration by components -log4j.rootLogger=ERROR, logConsole -log4j.category.org.nuiton.wikitty=DEBUG

1 0

r354 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 13:06:57 +0200 (Tue, 28 Sep 2010) New Revision: 354 Url: http://nuiton.org/repositories/revision/wikitty/354 Log: Replace assertFalse(true) by assert.fail() Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-28 10:14:34 UTC (rev 353) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-28 11:06:57 UTC (rev 354) @@ -1,7 +1,6 @@ package org.nuiton.wikitty.conform; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; @@ -171,7 +170,7 @@ try { ws.store(null, w); - assertFalse("not null contraint don't work on String", true); + Assert.fail("not null contraint don't work on String"); } catch (WikittyException eee) { eee.printStackTrace(); // ok id must not be null @@ -180,7 +179,7 @@ w.setField("TestConstraint", "id", "toto"); try { ws.store(null, w); - assertFalse("not null contraint don't work in Collection", true); + Assert.fail("not null contraint don't work in Collection"); } catch (WikittyException eee) { eee.printStackTrace(); // ok id must not be null

1 0

r353 - in trunk/wikitty-jdbc-impl/src/main: java/org/nuiton/wikitty/jdbc resources
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 12:14:34 +0200 (Tue, 28 Sep 2010) New Revision: 353 Url: http://nuiton.org/repositories/revision/wikitty/353 Log: Format code Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-09-28 10:14:26 UTC (rev 352) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2010-09-28 10:14:34 UTC (rev 353) @@ -357,8 +357,9 @@ } /** - * Execute query - * @param con connexion to use + * Execute query. + * + * @param connection connection to use * @param query sql query to do * @param args arguments for the query */ Modified: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-09-28 10:14:26 UTC (rev 352) +++ trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-09-28 10:14:34 UTC (rev 353) @@ -62,7 +62,7 @@ (id, version, extension_list) VALUES (?, ?, ?); #wikitty update in the admin table query jdbc.queries.update.wikitty.admin=UPDATE wikitty_admin \ -SET version = ?, extension_list = ?, deletionDate = ? WHERE id = ?; +SET version = ?, extension_list = ?, deletionDate = ? WHERE id = ?; #wikitty insertion in the data table query jdbc.queries.insert.wikitty.data=INSERT INTO wikitty_data\ (id, fieldName, %s) VALUES (?, ?, ?);

1 0

r352 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 12:14:26 +0200 (Tue, 28 Sep 2010) New Revision: 352 Url: http://nuiton.org/repositories/revision/wikitty/352 Log: Connect after configuration Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifier.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifier.java 2010-09-28 10:05:55 UTC (rev 351) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifier.java 2010-09-28 10:14:26 UTC (rev 352) @@ -105,12 +105,13 @@ try { // use default udp.xml in classpath channel = new JChannel(); - channel.connect(channelName); channel.setReceiver(this); // don't receive messages sent by myself channel.setOpt(Channel.LOCAL, false); + channel.connect(channelName); + if (log.isInfoEnabled()) { log.info("JGroup communication channel initialized to " + channel.getAddressAsString() + " ("

1 0

r351 - in trunk: . src/site/rst wikitty-api wikitty-generators wikitty-generators/src/main/java/org/nuiton/wikitty/generator wikitty-hbase-impl wikitty-hessian-client wikitty-hessian-server wikitty-jdbc-impl wikitty-jms-impl wikitty-jpa-impl wikitty-multistorage-impl wikitty-solr-impl wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test wikitty-solr-impl/src/test/resources wikitty-ui-zk
by bleny＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: bleny Date: 2010-09-28 12:05:55 +0200 (Tue, 28 Sep 2010) New Revision: 351 Url: http://nuiton.org/repositories/revision/wikitty/351 Log: merge branch migration to transformers (r350), updating version to 2.2.0-SNAPSHOT Added: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java trunk/wikitty-solr-impl/src/test/resources/solrconfig.xml Removed: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EnumGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoConstants.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoUtils.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/InterfaceGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java trunk/wikitty-solr-impl/src/test/resources/META-INF/ Modified: trunk/pom.xml trunk/src/site/rst/Spec.rst trunk/wikitty-api/pom.xml trunk/wikitty-generators/ trunk/wikitty-generators/pom.xml trunk/wikitty-hbase-impl/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc-impl/pom.xml trunk/wikitty-jms-impl/pom.xml trunk/wikitty-jpa-impl/pom.xml trunk/wikitty-multistorage-impl/pom.xml trunk/wikitty-solr-impl/ trunk/wikitty-solr-impl/pom.xml trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java trunk/wikitty-solr-impl/src/test/resources/log4j.properties trunk/wikitty-ui-zk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> <modules> <module>wikitty-generators</module> @@ -332,7 +332,7 @@ <projectId>wikitty</projectId>  - <eugene.version>2.1.1</eugene.version> + <eugene.version>2.2-SNAPSHOT</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <jetty.version>6.1.22</jetty.version> Modified: trunk/src/site/rst/Spec.rst =================================================================== --- trunk/src/site/rst/Spec.rst 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/src/site/rst/Spec.rst 2010-09-28 10:05:55 UTC (rev 351) @@ -5,10 +5,17 @@ Les identifiants sont de la forme UUID[_<specifique extension>]. Donc tous les identifiants commence par un UUID et peut être séparé d'une extension -spécifique pour certain besoin par un '_' (underscore) +spécifique pour certain besoin par un '_' (underscore). -Un wikitty a toujours un identifiant. +C'est le mécanisme de base de génération des wikitty-id. Il y a toutefois +des exceptions : +* Pour les méta-extensions : chacun des wikitties aura pour +identifiant par exemple « WikittySecurity:MonExtension ». +Cela permet de court-cuircuiter la recherche solR, et un passage par +le réseau à chaque store/restore. +Un wikitty en base a toujours un identifiant, dès instanciation. + Gestion des droits ================== @@ -108,20 +115,24 @@ Ces droits sont stockés sous le forme d'un Wikitty. Pour chaque extension connue, il y aura donc un wikitty dont la seule extension sera WikittySecurity. -À VALIDER : Chacun de ces wikitty aura pour identifiant « WikittySecurity'ExtensionName' ». +Chacun de ces wikitty aura pour identifiant « WikittySecurity:ExtensionName ». +permet de court-cuircuiter la recherche solR, et un passage par le réseau à +chaque store/restore. Localisation ============ -On rajoute une pseudo extension WikittyI18n aux extensions du wikitty. +Il s'agit de traduire les noms de champs et pas les valeurs.On rajoute une méta-extension WikittyI18n aux extensions du wikitty. -Cette pseudo-extension a deux champs : langue et translation +Cette pseudo-extension a deux champs : +* language String +* translation String -personne:wikittyI18n.langue=fr,en,es +personne:wikittyI18n.language=fr,en,es personne:wikittyI18n.translation=[fr:name=prénom,surname=nom],[en:name=name,surname=surname] personne.name=value -ton extension : security dezs champs de sécurité +ton extension : security des champs de sécurité ton extension : i18n des champs i18n ton extension.champs=valeur dans la langue @@ -140,11 +151,15 @@ dans les restore il faut ajouter (extensions, id, + préchargement d'extensions) - - attention au moment de la migration au moment du chargement + + + +On ajoute WikittyService#allowTranslation(token, extension, boolean) + + Pseudo extension ================ Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-api/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  @@ -110,6 +110,19 @@ <build> + <resources> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/models</directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> + <pluginManagement> <plugins>  Property changes on: trunk/wikitty-generators ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.0-eugene2/wikitty-generators:164-179 /branches/wikitty-eugene-migration/wikitty-generators:239-347 Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -1,12 +1,13 @@ <?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"> +<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>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  @@ -21,6 +22,10 @@ <artifactId>eugene</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> </dependencies>  @@ -60,6 +65,19 @@ </filters> </configuration> </plugin> + +  + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <executions> + <execution> + <goals> + <goal>generate-metadata</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityAbstractGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,476 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/** - * Possible enhancement: - * - generateParentMethod can generate attribut method access that call - * the same method on parent instance class. For that we must have one attribut - * instance by parent. This attribut we must be created in setWikitty method - * and used same wikitty object. - * - * @author poussin - */ -public class BusinessEntityAbstractGenerator extends WikengoCommonGenerator { - - private static final Log log = LogFactory.getLog(BusinessEntityAbstractGenerator.class); - - static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); - - protected String EXT_NAME; - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - String fqn = clazz.getQualifiedName(); - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); - return fqn.replace('.', File.separatorChar) + "Abstract.java"; - } - - public void generateFromClass(Writer output, ObjectModelClass clazz) - throws IOException { - if (!EugengoUtils.isBusinessEntity(clazz)) { - log.info( clazz.getName() + " is not a business entity"); - return; - } - - log.info("Generate Business entity abstract" + clazz.getName() + "... "); - generateCopyright(output); - - EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); - - String packageName = clazz.getPackageName(); - String name = clazz.getName() + "Abstract"; -/*{package <%=packageName%>; - -}*/ - ObjectModelClass superClass = findSuperClass(clazz); - - clearImports(); - addImport(clazz); - addImport(superClass); - addImport("org.nuiton.wikitty.WikittyUtil"); - addImport("org.nuiton.wikitty.Wikitty"); - addImport("org.nuiton.wikitty.BusinessEntityWikitty"); - addImport("org.nuiton.wikitty.WikittyExtension"); - addImport(Collection.class); - addImport(Collections.class); - addImport(List.class); - addImport(ArrayList.class); - String parentImpl = null; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - addImport(parent); - parentImpl = parent.getQualifiedName() + "Impl"; - addImport(parentImpl); - addImport(parent.getQualifiedName() + "Abstract"); - } - } - lookForAttributeImports(clazz); - generateImports(output, packageName); - - generateClazzDocumentation(output, clazz); - String extendsString = " extends " + getType( parentImpl != null ? parentImpl : "org.nuiton.wikitty.BusinessEntityWikitty" ); - - String implementsString = "implements " + getType(clazz.getQualifiedName()); - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - implementsString += ", " + getType(parent.getQualifiedName()); - } - } - -/*{public abstract class <%=name%><%=extendsString%> <%=implementsString%> { - -}*/ - - String svUID = GeneratorUtil.computeSerialVersionUID(clazz); -/*{ private static final long serialVersionUID = <%=svUID%>; - -}*/ - - generateWikittyExtension(output, clazz); - - generateStaticAttributes(output, clazz); - -/*{ - public <%=name%>() { - super(); - } - - public <%=name%>(BusinessEntityWikitty wi) { - super(wi.getWikitty()); - } - - public <%=name%>(Wikitty wi) { - super(wi); - } - -}*/ - - generateAttributeAccessMethod(output, clazz); - - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateParentMethod(output, parent); - } - } - -/*{ @Override - public Collection<WikittyExtension> getStaticExtensions() { - return extensions; - } - - /** - * Check equality on all field of this extension, and only those. - *) - static public boolean equals(Wikitty w1, Wikitty w2) { - boolean result = true; -}*/ - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{ if (result) { - Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - result = f1 == f2 || (f1 != null && f1.equals(f2)); - } -}*/ - } - } -/*{ - return result; - } - -} //<%=name%> -}*/ - - } - - - - // Utilitarian methods - - public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() - && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { - //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, clazz, attr); - } else { - generateWikittyAttributeAccessors(output, clazz, attr); - } - } - } - } - - private void generateWikittyExtension(Writer output, - ObjectModelClass clazz) throws IOException { - String version = clazz.getTagValue("version"); - - // Since wikitty 1.3, version need to be dotted - if ( version == null ) { - version = "1.0"; - } - - // get requires from parent - String requires = null; - String separator = ""; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - String parentExtName = "EXT_" + parent.getName().toUpperCase(); - - if (requires == null) { - requires = ""; - } - - requires += separator + parent.getName() + "." + parentExtName; - // dans le cas où on aurait un heritage multiple :) - // FIXME EC-20100420 gerer les extensions multiples - separator = " + \",\" /* FIXME Multiples extentions are not yet supported */ + "; - } - } - -/*{ static final public List<WikittyExtension> extensions; - static final public WikittyExtension extension<%=clazz.getName()%> = - new WikittyExtension(<%=EXT_NAME%>, "<%=version%>", <%=requires%>, - WikittyUtil.buildFieldMapExtension(}*/ - - separator = ""; - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{<%=separator%> - }*/ - generateAttribute(output, attr); - separator = ","; - } - } -/*{)); - static { - List<WikittyExtension> exts = new ArrayList<WikittyExtension>(); -}*/ - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { -/*{ - exts.addAll(<%=parent.getName()%>Abstract.extensions); -}*/ - } - } - - // EC-20100420 add current extension after parent ones - // if current is loaded before required extension - // load failed because required extension is missing -/*{ // current after requires ones - exts.add(extension<%=clazz.getName()%>); - - extensions = Collections.unmodifiableList(exts); - } -}*/ - } - - private void generateAttribute(Writer output, ObjectModelAttribute attr) - throws IOException { - String attrType = computeType(attr); - // temp fix, si le type est Wikitty, il doit rester Wikitty dans - // la définition de l'extension - if ("org.nuiton.wikitty.Wikitty".equals(attr.getType()) || "Wikitty".equals(attr.getType())) { - attrType = "Wikitty"; - } else if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType); - } else { - return; - } - - String attrName = attr.getName(); - String card = ""; - - //TODO ymartel 20090812: a better way to manage those DataTypes in the model? - if (attrType.contains("Collection") || attrType.contains("List") || attrType.contains("Set")) { - card = "[0-*]"; - // List<String> - Matcher match = extractTypeOnCollection.matcher(attrType); - if (match.matches()) { - attrType = match.group(1); - } - } - - if (!commonTypes.contains(attrType)) { - attrType = "Wikitty"; - } else if(commonNumerics.contains(attrType)) { - attrType = "Numeric"; - } else if(commonStrings.contains(attrType)) { - attrType = "String"; - } - - - int maxMultiplicity = attr.getMaxMultiplicity(); - if ((maxMultiplicity != 0 && maxMultiplicity != 1)){ - card = "[" + attr.getMinMultiplicity() + "-"; - if (maxMultiplicity == -1) { - card += "*]"; - } else { - card += maxMultiplicity + "]"; - } - } - - // FIXME EC-20100420 attr.isUnique() always return true for - // attributes (maybe use tagValue instead) - String unique = ""; - boolean isCollection = (attr.getMaxMultiplicity() != 0 - && attr.getMaxMultiplicity() != 1); - if (isCollection && attr.isUnique()) { - unique = " unique=true"; - } - - String tagValues = ""; - for (String tag : attr.getTagValues().keySet()) { - String value = attr.getTagValue(tag); - value = value.replaceAll("\n", "\\n"); - value = value.replaceAll("\"", "\\\""); - - tagValues += " " + tag + "=\\\"" + value + "\\\""; - } - -/*{"<%=attrType%> <%=attrName%><%=card%><%=unique%><%=tagValues%>"}*/ - } - - private void generateParentMethod(Writer output, - ObjectModelClass clazz) throws IOException { - - // we must generate method for parent of parent - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateParentMethod(output, parent); - } - } - - // generate method acces for parent attribut - generateAttributeAccessMethod(output, clazz); - } - - protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { - - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // FIXME EC-20100421 cette methode peut retourner List<String> - // et generer la methode getWikitty().getFieldAsList<String>() - // qui ne peut pas compiler - String methodAccessName = getFieldAccessMethodName(attr); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); - -/*{ - public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - Object oldValue = getField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - getWikitty().setField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=attrName%>); - getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, oldValue, <%=attrName%>); - } - - public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - return result; - } - -}*/ - } - - /** - * Give the string to put after getFieldAs???, only some type is accepted - * and we must convert BusinessEntity to Wikitty string - * @param type - * @return - */ - protected String getFieldAccessMethodName(ObjectModelAttribute attr) { - String result = computeType(attr); - result = getType(result, true); - - boolean isCollection = (attr.getMaxMultiplicity() != 0 - && attr.getMaxMultiplicity() != 1); - if (isCollection) { - if (attr.isUnique()) { - result = "Set"; - } else { - result = "List"; - } - } else { - // test for Date - if ("java.util.Date".equals(result) || "Date".equals(result)) { - result = "Date"; - } else if (getModel().hasClass(result)) { // test for Wikitty object - ObjectModelClass fieldClass = getModel().getClass(result); - if (EugengoUtils.isBusinessEntity(fieldClass)) { - // for wikittyDto we use String for Id - result = "Wikitty"; - } - } else if (null != getModel().getEnumeration(result)) { - result = "String"; - } - } - result = EugengoUtils.toUpperCaseFirstLetter(result); - - return result; - } - - protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { - - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // get collection element type for add and remove method arguement type - String elementType = getType(attr.getType(), true); - - String methodAccessName = getFieldAccessMethodName(attr); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); -/*{ public <%=attrType%> get<%=attrNameCapitalized%>() { - <%=attrType%> result = getWikitty().getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=getClassAndGeneric(attrType)[1]%>.class); - return result; - } - - public void add<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().addToField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); - getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); - } - - public void remove<%=attrNameCapitalized%>(<%=elementType%> element) { - getWikitty().removeFromField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); - getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); - } - - public void clear<%=attrNameCapitalized%>() { - getWikitty().clearField(<%=EXT_NAME%>, FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - getPropertyChangeSupport().firePropertyChange(FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, null, get<%=attrNameCapitalized%>()); - } - -}*/ - } - - private static Set<String> commonNumerics; - static { - commonNumerics = new HashSet<String>(); - commonNumerics.add("byte"); - commonNumerics.add("Byte"); - commonNumerics.add("short"); - commonNumerics.add("Short"); - commonNumerics.add("int"); - commonNumerics.add("Integer"); - commonNumerics.add("long"); - commonNumerics.add("Long"); - commonNumerics.add("float"); - commonNumerics.add("Float"); - commonNumerics.add("double"); - commonNumerics.add("Double"); - } - - private static Set<String> commonStrings; - static { - commonStrings = new HashSet<String>(); - commonStrings.add("char"); - commonStrings.add("Char"); - commonStrings.add("String"); - } - - private static Set<String> commonTypes; - static { - commonTypes = new HashSet<String>(); - commonTypes.addAll(commonNumerics); - commonTypes.addAll(commonStrings); - commonTypes.add("boolean"); - commonTypes.add("Boolean"); - commonTypes.add("Date"); - } - -} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityImplGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,147 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/** - * Possible enhancement: - * - generateParentMethod can generate attribut method access that call - * the same method on parent instance class. For that we must have one attribut - * instance by parent. This attribut we must be created in setWikitty method - * and used same wikitty object. - * - * @author poussin - */ -public class BusinessEntityImplGenerator extends WikengoCommonGenerator { - - private static final Log log = LogFactory.getLog(BusinessEntityImplGenerator.class); - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - String fqn = clazz.getQualifiedName(); - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); - return fqn.replace('.', File.separatorChar) + "Impl.java"; - } - - public void generateFromClass(Writer output, ObjectModelClass clazz) - throws IOException { - if (!EugengoUtils.isBusinessEntity(clazz)) { - log.info( clazz.getName() + " is not a business entity"); - return; - } - - // On ne génère pas le impl si l'entité a des opérations - if (clazz.getOperations().size() > 0) { - return; - } - - log.info("Generate Business entity impl" + clazz.getName() + "... "); - generateCopyright(output); - - String packageName = clazz.getPackageName(); - String className = clazz.getName(); - String name = className + "Impl"; -/*{package <%=packageName%>; - -}*/ - ObjectModelClass superClass = findSuperClass(clazz); - - clearImports(); - addImport(clazz); - addImport(superClass); - addImport("org.nuiton.wikitty.WikittyUtil"); - addImport("org.nuiton.wikitty.Wikitty"); - addImport("org.nuiton.wikitty.BusinessEntityWikitty"); - addImport("org.nuiton.wikitty.WikittyExtension"); - addImport(Collection.class); - addImport(Collections.class); - addImport(List.class); - addImport(ArrayList.class); - String parentImpl = null; - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - addImport(parent); - parentImpl = parent.getQualifiedName() + "Impl"; - addImport( parentImpl ); - } - } - lookForAttributeImports(clazz); - generateImports(output, packageName); - - generateClazzDocumentation(output, clazz); - String abstractString = ""; - if (clazz.isAbstract()) { - abstractString += "abstract "; - } - -/*{public <%=abstractString%>class <%=className%>Impl extends <%=className%>Abstract { - -}*/ - - String svUID = GeneratorUtil.computeSerialVersionUID(clazz); -/*{ private static final long serialVersionUID = <%=svUID%>; - - public <%=name%>() { - super(); - } - - public <%=name%>(BusinessEntityWikitty wi) { - super(wi.getWikitty()); - } - - public <%=name%>(Wikitty wi) { - super(wi); - } - -} //<%=name%> -}*/ - } - - private static Set<String> commonNumerics; - static { - commonNumerics = new HashSet<String>(); - commonNumerics.add("byte"); - commonNumerics.add("Byte"); - commonNumerics.add("short"); - commonNumerics.add("Short"); - commonNumerics.add("int"); - commonNumerics.add("Integer"); - commonNumerics.add("long"); - commonNumerics.add("Long"); - commonNumerics.add("float"); - commonNumerics.add("Float"); - commonNumerics.add("double"); - commonNumerics.add("Double"); - } - - private static Set<String> commonStrings; - static { - commonStrings = new HashSet<String>(); - commonStrings.add("char"); - commonStrings.add("Char"); - commonStrings.add("String"); - } - - private static Set<String> commonTypes; - static { - commonTypes = new HashSet<String>(); - commonTypes.addAll(commonNumerics); - commonTypes.addAll(commonStrings); - commonTypes.add("boolean"); - commonTypes.add("Boolean"); - commonTypes.add("Date"); - } - -} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/BusinessEntityInterfaceGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,202 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.Collection; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; - -/** - * Interface for BusinessEntity, interfaces are needed for multiple inheritance - * - * @author poussin - */ -public class BusinessEntityInterfaceGenerator extends WikengoCommonGenerator { - - private static final Log log = LogFactory.getLog(BusinessEntityInterfaceGenerator.class); - - protected String EXT_NAME; - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - String fqn = clazz.getQualifiedName(); - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); - return fqn.replace('.', File.separatorChar) + ".java"; - } - - public void generateFromClass(Writer output, ObjectModelClass clazz) - throws IOException { - if (!EugengoUtils.isBusinessEntity(clazz)) { - log.info( clazz.getName() + " is not a business entity"); - return; - } - - log.info("Generate Business entity " + clazz.getName() + "... "); - generateCopyright(output); - - EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); - String packageName = clazz.getPackageName(); - String name = clazz.getName(); -/*{package <%=packageName%>; - -}*/ - ObjectModelClass superClass = findSuperClass(clazz); - - clearImports(); - addImport(superClass); - addImport("org.nuiton.wikitty.BusinessEntity"); - - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - addImport(parent); - } - } - lookForAttributeImports(clazz); - generateImports(output, packageName); - - generateClazzDocumentation(output, clazz); - - String extendsString = "extends " + getType("org.nuiton.wikitty.BusinessEntity"); - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - extendsString += ", " + getType(parent.getName()); - } - } - -/*{public interface <%=name%> <%=extendsString%> { - - static final public String <%=EXT_NAME%> = "<%=clazz.getName()%>"; - -}*/ - generateFieldNameConstant(output, clazz); - - generateStaticAttributes(output, clazz); - - generateAttributeAccessMethod(output, clazz); - - generateInterfaceOperations(output, clazz); - -/*{ -} //<%=name%> -}*/ - - } - - // Utilitarian methods - private void generateFieldNameConstant(Writer output, - ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{ static final public String FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%> = "<%=attr.getName()%>"; - static final public String FQ_FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%> = <%=EXT_NAME%> + ".<%=attr.getName()%>"; -}*/ - } - } - } - - public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() - && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { - //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, attr); - } else { - generateWikittyAttributeAccessors(output, attr); - } - } - } - } - - protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); - -/*{ - public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>); - public <%=attrType%> get<%=attrNameCapitalized%>(); - -}*/ - } - - protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelAttribute attr) throws IOException { - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // get collection element type for add and remove method arguement type - String elementType = getType(attr.getType(), true); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); -/*{ public <%=attrType%> get<%=attrNameCapitalized%>(); - public void add<%=attrNameCapitalized%>(<%=elementType%> element); - public void remove<%=attrNameCapitalized%>(<%=elementType%> element); - public void clear<%=attrNameCapitalized%>(); - -}*/ - } - - private void generateInterfaceOperations(Writer output, ObjectModelClassifier classifier) throws IOException { - for (ObjectModelOperation op : classifier.getOperations()) { - String opName = op.getName(); -/*{ /** -}*/ - if (EugengoUtils.hasDocumentation(op)) { - String opDocumentation = op.getDocumentation(); -/*{ * <%=opName%> : <%=opDocumentation%> -}*/ - } - Collection<ObjectModelParameter> params = op.getParameters(); - for (ObjectModelParameter param : params) { - String paramName = param.getName(); - String paramDocumentation = param.getDocumentation(); -/*{ * @param <%=paramName%> <%=paramDocumentation%> - }*/ - } - String opVisibility = op.getVisibility(); - String opType = op.getReturnType(); -/*{ *) - <%=opVisibility%> <%=opType%> <%=opName%>(}*/ - String comma = ""; - for (ObjectModelParameter param : params) { - String paramName = param.getName(); - String paramType = param.getType(); -/*{<%=comma%><%=paramType%> <%=paramName%>}*/ - comma = ", "; - } -/*{)}*/ - Set<String> exceptions = op.getExceptions(); - comma = " throws "; - for (String exception : exceptions) { -/*{<%=comma%><%=exception%>}*/ - comma = ", "; - } -/*{; - -}*/ - } - } - -} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EnumGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EnumGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EnumGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,53 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; - -import org.nuiton.eugene.models.object.ObjectModelEnumeration; - -public class EnumGenerator extends WikengoCommonGenerator { - - @Override - public String getFilenameForEnumeration(ObjectModelEnumeration enumeration) { - String fqn = enumeration.getQualifiedName(); - return fqn.replace('.', File.separatorChar) + ".java"; - } - - @Override - public void generateFromEnumeration(Writer output, - ObjectModelEnumeration enumeration) throws IOException { - - generateCopyright(output); - - String packageName = enumeration.getPackageName(); - String enumName = enumeration.getName(); - -/*{package <%=packageName%>; - -}*/ - generateDocumentation(output, enumeration, ""); -/*{public enum <%=enumName%> { - -}*/ - - boolean isFirst = true; - for (String literal: enumeration.getLiterals()) { - if (isFirst) { -/*{ }*/ - } else { -/*{, }*/ - } - isFirst = false; -/*{<%=literal%>}*/ - } - -/*{ - -}*/ - -/*{} //<%=enumName%> -}*/ - } - -} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoConstants.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoConstants.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoConstants.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,21 +0,0 @@ -package org.nuiton.wikitty.generator; - -public class EugengoConstants { - - public final static String STEREOTYPE_SERVICE = "Service"; - public final static String STEREOTYPE_CRUD_SERVICE = "CrudService"; - public final static String STEREOTYPE_DTO = "Dto"; - public final static String STEREOTYPE_BUSINESS_ENTITY = "BusinessEntity"; - public final static String STEREOTYPE_DAO = "Dao"; - public final static String STEREOTYPE_ENTITY = "Entity"; - public final static String STEREOTYPE_EXCEPTION = "Exception"; - public final static String STEREOTYPE_BUSINESS_EXCEPTION = "BusinessException"; - public final static String STEREOTYPE_REMOTE = "Remote"; - - public final static String TAG_COPYRIGHT = "copyright"; - public final static String TAG_LENGTH = "length"; - public static final String TAG_LAZY = "lazy"; - - public final static String PREFIX_DATATYPE = "dataType-"; - -} // EugengoConstants Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoUtils.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoUtils.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/EugengoUtils.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,157 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.util.HashSet; -import java.util.Set; - -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.Model; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -public class EugengoUtils extends GeneratorUtil { - - /** - * Cherches et renvoie le copyright a utiliser sur le model. - * - * @param model le modele utilise - * @return le texte du copyright ou null - */ - public static String getCopyright(Model model) { - return GeneratorUtil.findTagValue(EugengoConstants.TAG_COPYRIGHT, null, model); - } - - public static boolean isService(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_SERVICE) || isCrudService(classifier); - } - - public static boolean isCrudService(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_CRUD_SERVICE); - } - - public static boolean isWebService(ObjectModelClassifier classifier) { - // any crud service is remote - if (isCrudService(classifier)) { - return true; - } - // cannot be a webservice if class is not a service - if (!isService(classifier)) { - return false; - } - // Look for an operation that has the stereotype remote - for (ObjectModelOperation op : classifier.getOperations()) { - if (isRemote(op)) { - return true; - } - } - return false; - } - - public static boolean isDto(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_DTO); - } - - public static boolean isBusinessEntity(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_BUSINESS_ENTITY); - } - - public static boolean isDao(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_DAO); - } - - public static boolean isEntity(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_ENTITY); - } - - public static boolean isException(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_EXCEPTION) || isBusinessException(classifier); - } - - public static boolean isBusinessException(ObjectModelClassifier classifier) { - return hasStereotype(classifier, EugengoConstants.STEREOTYPE_BUSINESS_EXCEPTION); - } - - public static boolean isRemote(ObjectModelOperation op) { - return hasStereotype(op, EugengoConstants.STEREOTYPE_REMOTE); - } - - private static Set<String> simpleTypes; - static { - simpleTypes = new HashSet<String>(); - simpleTypes.add("void"); - simpleTypes.add("boolean"); - simpleTypes.add("byte"); - simpleTypes.add("short"); - simpleTypes.add("int"); - simpleTypes.add("long"); - simpleTypes.add("float"); - simpleTypes.add("double"); - } - - - private static Set<String> primitiveTypes; - static { - primitiveTypes = new HashSet<String>(); - primitiveTypes.add("byte"); - primitiveTypes.add("Byte"); - primitiveTypes.add("short"); - primitiveTypes.add("Short"); - primitiveTypes.add("int"); - primitiveTypes.add("Integer"); - primitiveTypes.add("long"); - primitiveTypes.add("Long"); - primitiveTypes.add("float"); - primitiveTypes.add("Float"); - primitiveTypes.add("double"); - primitiveTypes.add("Double"); - - primitiveTypes.add("char"); - primitiveTypes.add("Char"); - - primitiveTypes.add("boolean"); - primitiveTypes.add("Boolean"); - } - - public static String extractModelName(Model model) { - String result = model.getName(); - if (result.contains("::")) { - result = result.replaceAll("::", "."); - } - if (result.endsWith(".")) { - result = result.substring(0, result.length() - 1); - } - return result; - } - - public static String normalizeCapitalName(String name) { - String result = ""; - for (int idx = 0; idx < name.length(); idx++) { - char c = name.charAt(idx); - if (Character.isUpperCase(c)) { - result += "_"; - } - result += Character.toUpperCase(c); - } - if (result.startsWith("_")) { - result = result.substring(1); - } - return result; - } - - public static String getTagValue(ObjectModelAttribute attr, String tagName, String defaultValue) { - String value = attr.getTagValue(tagName); - if (value == null) { - value = defaultValue; - } - return value; - } - - public static boolean isPrimitiveType(ObjectModelAttribute attr) { - String type = attr.getType(); - if (type.startsWith("java.lang.")) { - type = type.substring(11); - } - return primitiveTypes.contains(type); - } - -} //EugengoUtils Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/InterfaceGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/InterfaceGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/InterfaceGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,52 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; - -import org.nuiton.eugene.models.object.ObjectModelInterface; -import org.nuiton.eugene.models.object.ObjectModelOperation; - -public class InterfaceGenerator extends WikengoCommonGenerator { - - @Override - public String getFilenameForInterface(ObjectModelInterface interfacez) { - String fqn = interfacez.getQualifiedName(); - return fqn.replace('.', File.separatorChar) + ".java"; - } - - @Override - public void generateFromInterface(Writer output, - ObjectModelInterface interfacez) throws IOException { - // Generate only is not stereotype is specified - if (!interfacez.getStereotypes().isEmpty()) { - return; - } - - generateCopyright(output); - - String packageName = interfacez.getPackageName(); - String name = interfacez.getName(); -/*{package <%=packageName%>; - -}*/ - - clearImports(); - lookForOperationImports(interfacez); - generateImports(output, packageName); - - generateClazzDocumentation(output, interfacez); -/*{public interface <%=name%> { - -}*/ - - for (ObjectModelOperation op : interfacez.getOperations()) { - generateOperationHeader(output, op, true); - } - -/*{} //<%=name%> -}*/ - - } - -} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,727 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.IOException; -import java.io.Writer; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.java.ImportsManager; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelClassifier; -import org.nuiton.eugene.models.object.ObjectModelDependency; -import org.nuiton.eugene.models.object.ObjectModelElement; -import org.nuiton.eugene.models.object.ObjectModelGenerator; -import org.nuiton.eugene.models.object.ObjectModelOperation; -import org.nuiton.eugene.models.object.ObjectModelParameter; - -public class WikengoCommonGenerator extends ObjectModelGenerator { - - private static final Log log = LogFactory.getLog(WikengoCommonGenerator.class); - - protected ImportsManager imports; - - protected void clearImports() { - if (imports == null) { - imports = new ImportsManager(); - } else { - imports.clearImports(); - } - } - - @Override - protected boolean canGenerateElement(Object element) { - - boolean canGenerate = true; - - if (element instanceof ObjectModel) { - // fail with no model name - canGenerate = false; - } - else { - canGenerate = super.canGenerateElement(element); - } - return canGenerate; - } - - protected void addImport(String fqn) { - if (containsClassAndGeneric(fqn)) { - String[] type = getClassAndGeneric(fqn); - imports.addImport(checkForDatatype(type[0])); - addImport(checkForDatatype(type[1])); - } else if (isArray(fqn)) { - imports.addImport(checkForDatatype(fqn.substring(0, fqn.length() - 2))); - } else if (containsComma(fqn)) { - String[] fqnCommaSeparated = splitByComma(fqn); - for (String str : fqnCommaSeparated) { - if (str != null && !str.isEmpty()) { - addImport(str.trim()); - } - } - } else { - fqn = checkForDatatype(fqn); - imports.addImport(fqn); - } - } - - private String[] splitByComma(String fqn) { - return fqn.split(","); - } - - private boolean containsComma(String fqn) { - return fqn != null && fqn.indexOf(",") != -1; - } - - protected void addImport(Class<?> clazz) { - imports.addImport(clazz); - } - - protected void addImport(ObjectModelClass clazz) { - if (clazz != null) { - addImport(clazz.getQualifiedName()); - } - } - - /** - * Return the minimum syntax for the type. The result depend of import added - * by addImport. - * - * @param fqn the fully qualified name of type - * @return minimum needed type - */ - protected String getType(String fqn) { - String result = getType(fqn, false); - return result; - } - - /** - * Return the minimum syntax for the type. The result depend of import added - * by addImport. - * - * @param fqn the fully qualified name of type - * @param convert if true try to convert some type to other - * (ex: enum to string, dto to string) - * @return minimum needed type - */ - protected String getType(String fqn, boolean convert) { - // if type is Wikitty then we used String - if ("org.nuiton.wikitty.Wikitty".equals(fqn) - || "Wikitty".equals(fqn)) { - fqn = "String"; - } else if (convert && null != getModel().getEnumeration(fqn)) { - // if type is Wikitty then we used String - fqn = "String"; - } else if (convert && getModel().hasClass(fqn) - && EugengoUtils.isBusinessEntity(getModel().getClass(fqn))) { - // for wikittyDto we use String for Id - fqn = "String"; - } - - if (containsClassAndGeneric(fqn)) { - String[] type = getClassAndGeneric(fqn); - return imports.getType(checkForDatatype(type[0])) + "<" + getType(type[1], convert) + ">"; - } else if (containsComma(fqn)) { - String result = ""; - for (String str : splitByComma(fqn)) { - if (str != null && !str.isEmpty()) { - if (!result.isEmpty()) { - result += ", "; - } - result += str.trim(); - } - } - return result; - } else { - return imports.getType(checkForDatatype(fqn)); - } - } - - protected boolean isArray(String fqn) { - return fqn != null && fqn.trim().endsWith("[]"); - } - - protected boolean containsClassAndGeneric(String fqn) { - return fqn != null && fqn.indexOf("<") != -1; - } - - protected String[] getClassAndGeneric(String fqn) { - int idx = fqn.indexOf("<"); - String[] result = new String[2]; - result[0] = fqn.substring(0, idx); - result[1] = fqn.substring(idx+1, fqn.length() - 1); - return result; - } - - protected void generateImports(Writer output, String currentPackage) throws IOException { - List<String> imports = this.imports.getImports(currentPackage); - if (!imports.isEmpty()) { - for (String importLine : imports) { -/*{import <%=importLine%>; -}*/ - } -/*{ -}*/ - } - } - - protected void generateCopyright(Writer output) throws IOException { - String copyright = EugengoUtils.getCopyright(model); - if (GeneratorUtil.notEmpty(copyright)) { -/*{<%=copyright%> -}*/ - } - } - - protected void generateClazzDocumentation(Writer output, ObjectModelClassifier classifier, String ... defaultDoc) - throws IOException { - generateDocumentation(output, classifier, "", defaultDoc); - } - - protected void generateDocumentation(Writer output, ObjectModelElement element, String prefix, String ... defaultDoc) - throws IOException { - String doc = null; - if (GeneratorUtil.hasDocumentation(element)) { - doc = element.getDocumentation(); - } /*else { - TODO Manage defaultDoc - }*/ - - if (doc != null) { - // Manage RC in the doc - Pattern p = Pattern.compile("(\n)"); - Matcher m = p.matcher(doc); - String docOk = m.replaceAll("\n"+prefix+" * "); - -/*{<%=prefix%>/** -<%=prefix%> * <%=docOk%> -<%=prefix%> *) -}*/ - } - } - - /** - * Generates a header for the given operation. - * @param output The stream to write inside - * @param op the operation which header is to generate - * @param hasBody need to generate a body ? - * <li>true (for classes) : generates ' {' at the end</li> - * <li>false (for interfaces) : generates ';' at the end</li> - * @param hasBody - * @throws IOException - */ - protected void generateOperationHeader(Writer output, ObjectModelOperation op, - boolean generateForInterface, String ... additionalExceptions) throws IOException { - String opVisibility = op.getVisibility(); - //If generate for interface, only public methods are allowed - if (generateForInterface && !"".equals(opVisibility) && !"public".equals(opVisibility)) { - return; - } - String opName = op.getName(); -/*{ // Operation "<%=opName%>" -}*/ - generateDocumentation(output, op, " "); - if (generateForInterface || "package".equals(opVisibility)) { - opVisibility = ""; - } else { - opVisibility += " "; - } - String opType = computeType(op.getReturnParameter()); - opType = getType(opType); - String opAbstract = ""; - if (!generateForInterface && op.isAbstract()) { - opAbstract = "abstract "; - } -/*{ <%=opVisibility%><%=opAbstract%><%=opType%> <%=opName%>(}*/ - boolean isFirst = true; - for (ObjectModelParameter opParam : op.getParameters()) { - String paramName = opParam.getName(); - String paramType = computeType(opParam); - paramType = getType(paramType); - if (!isFirst) { -/*{, }*/ - } - isFirst = false; -/*{<%=paramType%> <%=paramName%>}*/ - } -/*{)}*/ - if ((op.getExceptions() != null && !op.getExceptions().isEmpty()) || (additionalExceptions != null && additionalExceptions.length > 0)) { -/*{ throws}*/ - isFirst = true; - Set<String> exceptions = new LinkedHashSet<String>(); - - if (additionalExceptions != null) { - for (String exception : additionalExceptions) { - exceptions.add(exception); - } - } - if (op.getExceptions() != null) { - for (String exception : op.getExceptions()) { - exceptions.add(exception); - } - } - for (String exception : exceptions) { - exception = getType(exception); - if (!isFirst) { -/*{,}*/ - } - isFirst = false; -/*{ <%=exception%>}*/ - } - } - if (generateForInterface || op.isAbstract()) { -/*{; - -}*/ - } else { -/*{ { -}*/ - } - } - - /** - * Generates a ioc name and injection. Will generate the class attribute - * and getter/setter. - * The name used is the name specified in the dependency class name. - * @param output The stream to write inside - * @param dep the dependency to generate. - * @throws IOException - */ - protected void generateIocDependency(Writer output, ObjectModelDependency dep) - throws IOException { - ObjectModelClassifier supplier = dep.getSupplier(); - if (supplier == null || EugengoUtils.isDao(supplier)) { - return; - } - String supplierType = getType(supplier.getQualifiedName()); - String supplierVarName = EugengoUtils.toLowerCaseFirstLetter(supplier.getName()); - String supplierMethodSuffix = EugengoUtils.toUpperCaseFirstLetter(supplier.getName()); -/*{ // Dependency injection for "<%=supplierVarName%>" - private <%=supplierType%> <%=supplierVarName%>; - - public <%=supplierType%> get<%=supplierMethodSuffix%>() { - return <%=supplierVarName%>; - } - - public void set<%=supplierMethodSuffix%>(<%=supplierType%> <%=supplierVarName%>) { - this.<%=supplierVarName%> = <%=supplierVarName%>; - } - -}*/ - } - - protected void generateAttributesDeclaration(Writer output, - ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - generateAttributeDeclaration(output, attr); - } - } - } - - protected void generateAttributeDeclaration(Writer output, ObjectModelAttribute attr) - throws IOException { - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType); - } else { - return; - } - String attrVisibility = attr.getVisibility(); - String attrName = attr.getName(); -/*{ // Declaration of attribute "<%=attrName%>" -}*/ - generateDocumentation(output, attr, " "); - String value = computeDefaultValue(attr); -/*{ <%=attrVisibility%> <%=attrType%> <%=attrName%><%=value%>; - -}*/ - } - - /** - * Compute correct type of param. If param is - * <li> null : void - * <li> cardinality > 1 : Collection of type - * <li> cardinality > 1 and ordered: List of type - * <li> cardinality > 1 and unique: Set of type - * <li> other : the type - * @param param - * @return - */ - protected String computeType(ObjectModelParameter param) { - if (param == null) { - return "void"; - } - String result = param.getType(); - - // if type is Wikitty then we used String - if ("org.nuiton.wikitty.Wikitty".equals(result) - || "Wikitty".equals(result)) { - result = "String"; - } - - boolean isCollection = (param.getMaxMultiplicity() != 0 - && param.getMaxMultiplicity() != 1); - if (isCollection) { - Class<?> type = Collection.class; - if (param.isOrdered()) { - type = List.class; - } - if (param.isUnique()) { - type = Set.class; - } - result = type.getName() + "<" + result + ">"; - } - return result; - } - - protected void generateAttributesAccessors(Writer output, - ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - generateAttributeAccessors(output, attr); - } - } - } - - protected void generateAttributeAccessors(Writer output, ObjectModelAttribute attr) - throws IOException { - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType); - } else { - return; - } - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); -/*{ // Accessors for attribute "<%=attrName%>" - public void set<%=attrNameCapitalized%>(<%=attrType%> <%=attrName%>) { - this.<%=attrName%> = <%=attrName%>; - } - - public <%=attrType%> get<%=attrNameCapitalized%>() { - return this.<%=attrName%>; - } - -}*/ - } - - protected void generateStaticAttributes(Writer output, ObjectModelClass clazz) - throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isStatic() && "public".equals(attr.getVisibility())) { - String type = computeType(attr); - type = getType(type); - String name = attr.getName(); - String value = computeDefaultValue(attr); -/*{ // static attribute "<%=name%>" - public static <%=type%> <%=name%><%=value%>; - -}*/ - } - } - } - - protected String computeDefaultValue(ObjectModelAttribute attr) { - String result = ""; - String value = attr.getDefaultValue(); - if (value != null) { - String type = computeType(attr); - type = getType(type); - if ("String".equals(type)) { - result = "\"" + value + "\""; - } else if ("boolean".equalsIgnoreCase(type)) { - result = "Boolean." + ("true".equalsIgnoreCase(value) + "").toUpperCase(); - } else if ("byte".equalsIgnoreCase(type) || "short".equalsIgnoreCase(type) || "int".equalsIgnoreCase(type) || "integer".equalsIgnoreCase(type)) { - result = value; - } else if ("long".equalsIgnoreCase(type)) { - result = value + "L"; - } else if ("float".equalsIgnoreCase(type)) { - result = value + "F"; - } else if ("double".equalsIgnoreCase(type)) { - result = value + "D"; - } else if ("Date".equals(type)) { - try { - Date d = new SimpleDateFormat().parse(value); - result = "new Date(" + d.getTime() + "l)"; - } catch (ParseException pe) { - log.warn("Unable to parse date", pe); - // Nothing else to do - } - } else { - result = value; - } - result = " = " + result; - } - return result; - } - - protected void generateDefaultConstructor(Writer output, String name) - throws IOException { -/*{ /** - * Default constructor - *) - public <%=name%>() { - super(); - } - -}*/ - } - - protected void generateExceptionConstructors(Writer output, ObjectModelClass clazz) - throws IOException { - String name = clazz.getName(); - generateDefaultConstructor(output, name); - -/*{ public <%=name%>(Throwable cause) { - super(); - initCause(cause); - } - -}*/ - } - - protected void generateFullConstructor(Writer output, - String name, Collection<ObjectModelAttribute> attrs) throws IOException { - int nb = 0; - int total = 0; - if (hasNavigableAndNonStaticAttributes(attrs)) { -/*{ /** - * Constructor with all parameters initialized - * -}*/ - for (ObjectModelAttribute attr : attrs) { - if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - total ++; - String attName = attr.getName(); -/*{ * @param <%=attName%> -}*/ - } - } - -/*{ *) - public <%=name%>(}*/ - for (ObjectModelAttribute attr : attrs) { - if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - String attrName = attr.getName(); - String attrType = getType(computeType(attr)); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType); - } else { - return; - } -/*{<%=attrType%> <%=attrName%>}*/ - nb ++; - if (nb < total){ -/*{, }*/ - } - } - } -/*{) { - super(); -}*/ - for (ObjectModelAttribute attr : attrs) { - if (attr.isNavigable() && !attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - String attrName = attr.getName(); -/*{ this.<%=attrName%> = <%=attrName%>; -}*/ - } - } - -/*{ } - -}*/ - } - } - - protected boolean hasNavigableAndNonStaticAttributes(ObjectModelClass clazz) { - return hasNavigableAndNonStaticAttributes(clazz.getAttributes()); - } - - protected boolean hasNavigableAndNonStaticAttributes(Collection<ObjectModelAttribute> attrs) { - if (attrs != null && !attrs.isEmpty()) { - for (ObjectModelAttribute attr : attrs) { - if (attr.isNavigable() && !attr.isStatic()) { - return true; - } - } - } - return false; - } - - /** - * Run throw the given ObjectModelClass and declare as an import each found - * attribute type - * @param clazz the class to run throw - */ - protected void lookForAttributeImports(ObjectModelClass clazz) { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - String type = computeType(attr); - addImport(type); - } - } - } - - /** - * Run throw the given ObjectModelClass and declare as an import each found - * static attribute type - * @param clazz the class to run throw - */ - protected void lookForStaticAttributeImports(ObjectModelClass clazz) { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && attr.isStatic() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - String type = computeType(attr); - addImport(type); - } - } - } - - /** - * Run throw the given ObjectModelClassifier and declare each type found on - * the operation declaration (return type, parameters type, exception - * thrown) - * @param classifier the classifier to run throw - */ - protected void lookForOperationImports(ObjectModelClassifier classifier) { - for (ObjectModelOperation op : classifier.getOperations()) { - String returnType = computeType(op.getReturnParameter()); - addImport(returnType); - for (ObjectModelParameter param : op.getParameters()) { - String paramType = computeType(param); - addImport(paramType); - } - for (String exceptionType : op.getExceptions()) { - addImport(exceptionType); - } - } - } - - /** - * Run throw the given ObjectModelClassifier and declare as an import each - * dependency's type found. The import is added only if the dependency's - * supplier is a service or a dao - * @param classifier the classifier to run throw - */ - protected void lookForIocImports(ObjectModelClassifier classifier) { - for (ObjectModelDependency dep : classifier.getDependencies()) { - ObjectModelClassifier supplier = dep.getSupplier(); - if (supplier != null && EugengoUtils.isService(supplier)) { - addImport(supplier.getQualifiedName()); - } - } - } - - /** - * Look on the model for a tag value that indicates an implementation for - * a specific datatype - * @param type the type to look for a declared implementation - * @return the found type or the original type - */ - protected String checkForDatatype(String type) { - if (type != null) { - // Look for simple dataType - String tag = model.getTagValue(EugengoConstants.PREFIX_DATATYPE + type); - if (tag != null) { - return tag; - } - // Look for generic dataType - int idx = type.indexOf("<"); - if (idx != -1) { - tag = model.getTagValue(EugengoConstants.PREFIX_DATATYPE + type.substring(0, idx)); - } - if (tag != null) { - return tag; - } - } - // No dataType found, return type - return type; - } - - /** - * Run throw the superclasses to get the first one. - * - * @param clazz the class to run throw - * @return the first found superClass or null - */ - protected ObjectModelClass findSuperClass(ObjectModelClass clazz) { - if (clazz.getSuperclasses() != null && !clazz.getSuperclasses().isEmpty()) { - return clazz.getSuperclasses().iterator().next(); - } - return null; - } - - protected Collection<ObjectModelClass> findSubClasses(ObjectModelClass clazz) { - Collection<ObjectModelClass> result = new ArrayList<ObjectModelClass>(); - for (ObjectModelClass potentialSubClass : model.getClasses()) { - if (clazz.equals(findSuperClass(potentialSubClass))) { - result.add(potentialSubClass); - } - } - return result; - } - - protected void generateHashCode(Writer output, ObjectModelClass clazz) throws IOException { -/*{ public int hashCode() { - int result = 0; -}*/ - String prefix = ""; - if (EugengoUtils.isEntity(clazz)) { -/*{ if (id != null) { - result = id.hashCode(); - } else { -}*/ - prefix = " "; - } - generateHashCodeFromAttributes(output, clazz, prefix); - if (EugengoUtils.isEntity(clazz)) { -/*{ } -}*/ - } -/*{ return result; - } - -}*/ - } - - private void generateHashCodeFromAttributes(Writer output, ObjectModelClass clazz, String prefix) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - String attrName = attr.getName(); - String attrType = getType(attr.getType()); - if (EugengoUtils.isPrimitiveType(attr)) { - // If the leading character is an uppercased letter... - if (attrType.charAt(0) == attrType.toUpperCase().charAt(0)) { -/*{<%=prefix%> if (<%=attrName%> != null) { -<%=prefix%> result = 29 * result + <%=attrName%>.hashCode(); -<%=prefix%> } -}*/ - } else { - attrType = EugengoUtils.toUpperCaseFirstLetter(attrType); - if ("Int".equals(attrType)) { - attrType = "Integer"; - } -/*{<%=prefix%> result = 29 * result + new <%=attrType%>(<%=attrName%>).hashCode(); -}*/ - } - } else { -/*{<%=prefix%> if (<%=attrName%> != null) { -<%=prefix%> result = 29 * result + <%=attrName%>.hashCode(); -<%=prefix%> } -}*/ - } - } - } - } -} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,497 @@ +package org.nuiton.wikitty.generator; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.Transformer; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/*{generator option: writeString = }*/ +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +/** + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.wikitty.generator.WikittyAbstractGenerator" + */ +public class WikittyAbstractGenerator extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(WikittyAbstractGenerator.class); + + /** map busines entity from source model to generated abstract class */ + protected Map<ObjectModelClass, ObjectModelClass> processedClasses = + new HashMap<ObjectModelClass, ObjectModelClass>(); + + /** pattern to parse toString tagValue + * for the string "abc{foo|bar}defrzeg{uvw|xyz}oeira" + * will match {foo|bar} and {uvw|xyz} with groups for foo, bar, uvw and xyz + */ + protected Pattern p = Pattern.compile("\\{(([^|}])*)(?:\\|([^}]*))?\\}"); + + /** map "Client.name" to "getName()" or any getter to read this attribute */ + protected Map<String, String> attributeToGetterName = new HashMap<String, String>(); + + @Override + protected Transformer<ObjectModel, ObjectModel> initPreviousTransformer() { + return new WikittyPurifierTransformer(); + } + + @Override + public void transformFromModel(ObjectModel model) { + + List<ObjectModelClass> modelBusinessEntities = new ArrayList<ObjectModelClass>(); + + // fill modelBusinessEntities with entities found in model + for (ObjectModelClass clazz : model.getClasses()) { + if (WikittyTransformerUtil.isBusinessEntity(clazz)) { + modelBusinessEntities.add(clazz); + } + } + + for (ObjectModelClass businessEntity : modelBusinessEntities) { + ObjectModelClass abstractClass = createAbstractClass(WikittyTransformerUtil.businessEntityToAbstractName(businessEntity), + businessEntity.getPackageName()); + processedClasses.put(businessEntity, abstractClass); + setSuperClass(abstractClass, "BusinessEntityWikitty"); + addInterface(abstractClass, businessEntity.getQualifiedName()); + } + + for (ObjectModelClass businessEntity : modelBusinessEntities) { + addOperations(businessEntity, processedClasses.get(businessEntity)); + } + + // at this time, all operations in generated abstracts are just the operations + // like get/set etc. we will copy all operations of a given class to all children + // that's why constructors and others operations are not yet added + for (ObjectModelClass businessEntity : modelBusinessEntities) { + addInheritedOperations(businessEntity, processedClasses.get(businessEntity)); + } + + for (ObjectModelClass businessEntity : modelBusinessEntities) { + ObjectModelClass abstractClassForThisEntity = processedClasses.get(businessEntity); + addImports(abstractClassForThisEntity); + addConstructors(abstractClassForThisEntity); + addConstants(businessEntity, abstractClassForThisEntity); + addToString(businessEntity, abstractClassForThisEntity); + } + + // for all classes of model, check if steroptyped with "meta" + for (ObjectModelClass clazz : model.getClasses()) { + if (WikittyTransformerUtil.isMetaExtension(clazz)) { + // if so, add operations + addMetaExtensionOperations(clazz, processedClasses.get(clazz)); + } + } + + processedClasses.clear(); + } + + protected void addImports(ObjectModelClass clazz) { + // TODO 20100811 bleny remove unused imports + addImport(clazz, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN); + addImport(clazz, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN); + addImport(clazz, WikittyTransformerUtil.WIKITTY_CLASS_FQN); + addImport(clazz, "org.nuiton.wikitty.WikittyExtension"); + addImport(clazz, "org.nuiton.wikitty.WikittyUtil"); + addImport(clazz, "org.nuiton.wikitty.WikittyUser"); + addImport(clazz, "org.nuiton.wikitty.WikittyUserAbstract"); + addImport(clazz, "org.nuiton.wikitty.WikittyUserImpl"); + addImport(clazz, "org.nuiton.wikitty.TreeNode"); + addImport(clazz, "org.nuiton.wikitty.TreeNodeAbstract"); + addImport(clazz, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(clazz, java.util.List.class); + addImport(clazz, java.util.ArrayList.class); + addImport(clazz, java.util.Collection.class); + addImport(clazz, java.util.Collections.class); + addImport(clazz, java.util.Set.class); + addImport(clazz, java.util.Date.class); + addImport(clazz, java.util.LinkedHashSet.class); + } + + protected void addSerialVersionUID(ObjectModelClass clazz) { + // adding a generated serialVersionUID + Random random = new Random(); + Long serialVersionUIDs = random.nextLong(); + addConstant(clazz, + "serialVersionUID", + "long", + serialVersionUIDs.toString() + "L", + ObjectModelModifier.PRIVATE); + } + + protected void addConstructors(ObjectModelClass clazz) { + + ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); + setOperationBody(constructor, "" +/*{ + super(); +}*/); + + constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); + addParameter(constructor, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setOperationBody(constructor, "" +/*{ + super(wikitty); +}*/); + + constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); + addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityWikitty"); + setOperationBody(constructor, "" +/*{ + super(businessEntityWikitty.getWikitty()); +}*/); + + } + + protected void addConstants(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { + // adding some constants about extension to abstract + addConstant(abstractClass, "extensions", "List<WikittyExtension>", null, ObjectModelModifier.PUBLIC); + addConstant(abstractClass, "extension" + businessEntity.getName(), "WikittyExtension", null, ObjectModelModifier.PUBLIC); + + // ... and a getter + ObjectModelOperation getStaticExtensions = addOperation(abstractClass, "getStaticExtensions", "Collection<WikittyExtension>", ObjectModelModifier.PUBLIC); + addAnnotation(abstractClass, getStaticExtensions, "Override"); + setOperationBody(getStaticExtensions, "" +/*{ + return extensions; +}*/); + + //// preparing a static block to initialize those constants + ObjectModelOperation staticInitialization = addBlock(abstractClass, ObjectModelModifier.STATIC); + + // generating constructor call for extensionClient + // we will build a string to write a call + List<String> buildFieldMapExtensionParameters = new ArrayList<String>(); + + + + // now process attributes + for(ObjectModelAttribute attribute : businessEntity.getAttributes()) { + if (attribute.isNavigable()) { + // now add the attribute to the piece of code that build the extension + String wikittyType = WikittyTransformerUtil.typeToWikittyColumn(attribute.getType()); + String multiplicity = ""; + if (attribute.getMinMultiplicity() != 1 || + attribute.getMaxMultiplicity() != 1) { + // generate a string like [1-10] or [0-*] etc. + multiplicity = "[" + + attribute.getMinMultiplicity() + + "-" + + (attribute.getMaxMultiplicity() == -1 ? "*" : attribute.getMaxMultiplicity()) + + "]"; + } + + // generate a string line like " unique=true" or "" + String unique = attribute.isUnique() ? " unique=true" : ""; + // generate a string line like " deprecated=true" or "" + String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; + // generate a string line like ' documentation="my documentation"' or "" + String attributeDocumentation = attribute.hasTagValue("documentation") ? " documentation=\\\"" + attribute.getTagValue("documentation") + "\\\"": ""; + // generate a string like " notNull=true" or "" + String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; + buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""' +/*{ "<%=wikittyType%> <%=attribute.getName()%><%=multiplicity%><%=unique%><%=deprecated%><%=notNull%><%=attributeDocumentation%>"}*/); + } + } + + // finishing static block + String extensionVersion = businessEntity.getTagValue("version"); + if (extensionVersion == null || "".equals(extensionVersion)) { + extensionVersion = "1.0"; + log.warn("no version specified in model for " + businessEntity.getQualifiedName() + " using " + extensionVersion); + } + + // a piece of code used in the static block + String requires = null; + for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { + // using "for" but there will be 0 or 1 iteration + requires = WikittyTransformerUtil.classToExtensionVariableName(superClass, true); + } + + String buildFieldMapExtensionParametersInLine = StringUtils.join(buildFieldMapExtensionParameters, ", \n"); + String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false); + String staticInitializationBody = "" +/*{ + extension<%=businessEntity.getName()%> = + new WikittyExtension(<%=extensionVariableName%>, + "<%=extensionVersion%>", // version + <%= requires %>, + WikittyUtil.buildFieldMapExtension( // building field map +<%=buildFieldMapExtensionParametersInLine%>)); + + // init extensions + List<WikittyExtension> exts = new ArrayList<WikittyExtension>(); +}*/; + + for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { + // using "for" but there will be 0 or 1 iteration + staticInitializationBody += "" +/*{ + exts.addAll(<%=superClass.getName()%>Abstract.extensions); + // current after requires ones +}*/; + } + + staticInitializationBody += "" +/*{ + exts.add(extension<%=businessEntity.getName()%>); + extensions = Collections.unmodifiableList(exts); +}*/; + setOperationBody(staticInitialization, staticInitializationBody); + + } + + protected void addOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { + String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, true); + String helperClassName = WikittyTransformerUtil.businessEntityToHelperName(businessEntity); + + boolean isMetaExtension = WikittyTransformerUtil.isMetaExtension(businessEntity); + + + // generating operations with bodies to realize contract + for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { + if (attribute.isNavigable()) { + // needed below, in templates + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); + + String attributeName = attribute.getName(); + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + // there is a conflict, purifier transformer give as the right name to use + attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + } + + String getterName = null; + + if (WikittyTransformerUtil.isAttributeCollection(attribute)) { + // attributed is a collection, we will generate operations get, add, remove and clear + + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // now, for this attribute, we will generate add, remove and clear methods + // adding operations to contract + getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(abstractClass, getterName, attributeTypeSimpleNameInSet); + addAnnotation(abstractClass, getter, "Override"); + String getterBody; + if (isMetaExtension) { + getterBody = "" +/*{ + <%=attributeTypeSimpleNameInSet%> result; + if (extensionForMetaExtension == null) { + result = <%=helperClassName%>.<%=getterName%>(getWikitty()); + } else { + result = <%=helperClassName%>.<%=getterName%>(extensionForMetaExtension, getWikitty()); + } + return result; +}*/; + } else { + getterBody = "" +/*{ + <%=attributeTypeSimpleNameInSet%> result = <%=helperClassName%>.<%=getterName%>(getWikitty()); + return result; +}*/; + } + setOperationBody(getter, getterBody); + + String addName = "add" + StringUtils.capitalize(attributeName); + ObjectModelOperation adder = addOperation(abstractClass, addName, "void"); + addAnnotation(abstractClass, adder, "Override"); + addParameter(adder, "String", "element"); + String adderBody; + if (isMetaExtension) { + adderBody = "" +/*{ + if (extensionForMetaExtension == null) { + <%=helperClassName%>.<%=addName%>(getWikitty(), element); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>()); + } else { + <%=helperClassName%>.<%=addName%>(extensionForMetaExtension, getWikitty(), element); + String fieldName = <%=helperClassName%>.getMetaFieldName(extensionForMetaExtension, "<%=attributeName%>"); + getPropertyChangeSupport().firePropertyChange(fieldName, null, <%= getter.getName() %>()); + } +}*/; + } else { + adderBody = "" +/*{ + <%=helperClassName%>.<%=addName%>(getWikitty(), element); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%= getter.getName() %>()); +}*/; + } + setOperationBody(adder, adderBody); + + String removeName = "remove" + StringUtils.capitalize(attributeName); + ObjectModelOperation remover = addOperation(abstractClass, removeName, "void"); + addAnnotation(abstractClass, remover, "Override"); + addParameter(remover, "String", "element"); + String removerBody = "" +/*{ + <%=helperClassName%>.<%=removeName%>(getWikitty(), element); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); +}*/; + setOperationBody(remover, removerBody); + + String clearName = "clear" + StringUtils.capitalize(attributeName); + ObjectModelOperation clear = addOperation(abstractClass, clearName, "void"); + addAnnotation(abstractClass, clear, "Override"); + String clearBody = "" +/*{ + <%=helperClassName%>.<%=clearName%>(getWikitty()); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, null, <%=getter.getName()%>()); +}*/; + setOperationBody(clear, clearBody); + + + } else { + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // adding getter and setter to contract + getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(abstractClass, getterName, attributeType); + addAnnotation(abstractClass, getter, "Override"); + setOperationBody(getter, "" +/*{ + <%=attributeType%> value = <%=helperClassName%>.<%=getterName%>(getWikitty()); + return value; +}*/); + + String setterName = "set" + StringUtils.capitalize(attributeName); + ObjectModelOperation setter = addOperation(abstractClass, setterName, attributeType); + addAnnotation(abstractClass, setter, "Override"); + addParameter(setter, attributeType, attributeName); + setOperationBody(setter, "" +/*{ + <%=attributeType%> oldValue = <%=helperClassName%>.<%=setterName%>(getWikitty(), <%=attributeName%>); + getPropertyChangeSupport().firePropertyChange(<%=fieldVariableName%>, oldValue, <%=getter.getName()%>()); + return oldValue; +}*/); + } + + // save the getter name for this attribute + attributeToGetterName.put(businessEntity.getName() + "." + attributeName, getterName); + } + } + } + + protected void addInheritedOperations(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { + // now, add to this abstract all operation due to inheritence from + // other business entities + + for (ObjectModelClass superClass : businessEntity.getSuperclasses()) { + + // if super class is not in the same package, import it Helper + if (! businessEntity.getPackageName().equals(superClass.getPackageName())) { + addImport(abstractClass, superClass.getPackageName() + "." + + WikittyTransformerUtil.businessEntityToHelperName(superClass)); + } + + if (WikittyTransformerUtil.isBusinessEntity(superClass)) { + addInterface(abstractClass, WikittyTransformerUtil.businessEntityToContractName(superClass)); // extends + // getting the signatures and bodies of those operations + for (ObjectModelOperation operation : processedClasses.get(superClass).getOperations()) { + + ObjectModelOperation operationClone = cloneOperationSignature(operation, abstractClass, true); + setOperationBody(operationClone, operation.getBodyCode()); + + // XXX 20100816 bleny should be a call to cloneOperation(operation, abstractClass, true); + } + } else { + addInterface(abstractClass, superClass.getQualifiedName()); // extends + } + } + } + + /** add a toString method + * if a toString is tagValue is attached to businessEntity, it will be used + * to generate a toString as this : + * + * given "hello {Person.name|unknow}" + * + * will try to replace first {...} by name field value for extension Person. + * if this information is not available, will do unknow. + */ + protected void addToString(ObjectModelClass businessEntity, ObjectModelClass abstractClass) { + + String toStringOperationBody = null; + + if (businessEntity.hasTagValue(WikittyTransformerUtil.TAG_TO_STRING)) { + String toStringPattern = businessEntity.getTagValue(WikittyTransformerUtil.TAG_TO_STRING); + + // toStringPattern is something like + // "hello {Person.name|unknow} employe of {Company.name|unknow}" + // + + Matcher matcher = p.matcher(toStringPattern); + + while (matcher.find()) { + String wholeMatch = matcher.group(0); // "{foo|bar}" + String variableName = matcher.group(1); // "foo" + String defaultValue = matcher.group(3); // "bar", may be null + + if (defaultValue == null) { + defaultValue = ""; + } + + if (attributeToGetterName.containsKey(variableName)) { + String getterName = attributeToGetterName.get(variableName); + toStringPattern = toStringPattern.replace(wholeMatch, "" +/*{" + + <%=getterName%>().toString() + + "}*/); + } else { + log.warn("no field " + variableName + " in " + businessEntity.getQualifiedName()); + toStringPattern = toStringPattern.replace(wholeMatch, defaultValue); + } + } + + toStringOperationBody = "" +/*{ + return "<%=toStringPattern%>"; +}*/; + } else { + // no toString tagValue provided, generating a default toString + toStringOperationBody = "" +/*{ + return getWikitty().toString(); +}*/; + } + + ObjectModelOperation toString = addOperation(abstractClass, "toString", "String"); + addAnnotation(abstractClass, toString, "Override"); + setOperationBody(toString, toStringOperationBody); + } + + protected void addMetaExtensionOperations(ObjectModelClass metaExtension, + ObjectModelClass abstractClassForThisMetaExtension) { + + ObjectModelAttribute extension = addAttribute(abstractClassForThisMetaExtension, "extensionForMetaExtension", WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN); + setDocumentation(extension, "the metaExtension operations target this extension, may be null"); + + ObjectModelOperation addMetaExtension = addOperation(abstractClassForThisMetaExtension, "addMetaExtension", "void"); + addAnnotation(abstractClassForThisMetaExtension, addMetaExtension, "Override"); + addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + setDocumentation(addMetaExtension, String.format( + "add %s meta-extension on given extension to this entity", + metaExtension.getName())); + String helperName = WikittyTransformerUtil.businessEntityToHelperName(metaExtension); + setOperationBody(addMetaExtension, "" +/*{ + extensionForMetaExtension = extension; + <%=helperName%>.addMetaExtension(extension, getWikitty()); +}*/); + } +} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,252 @@ +package org.nuiton.wikitty.generator; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.Transformer; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelInterface; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/*{generator option: writeString = }*/ +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +/** + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.wikitty.generator.WikittyContractGenerator" + */ +public class WikittyContractGenerator extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(WikittyContractGenerator.class); + + @Override + protected Transformer<ObjectModel, ObjectModel> initPreviousTransformer() { + return new WikittyPurifierTransformer(); + } + + /** will permet to get the result of a processed class + * it is useful for dealing with inheritence : when an extension depend + * of another. In this case the child can find the processed class of the parent + * and then look into it to find methods and data to copy + */ + protected Map<ObjectModelClass, ObjectModelInterface> processedClasses = + new HashMap<ObjectModelClass, ObjectModelInterface>(); + + protected Set<ObjectModelClass> processedEntities = new HashSet<ObjectModelClass>(); + + @Override + public void transformFromModel(ObjectModel model) { + + log.info(model.getClasses().size() + " classes to process"); + + for (ObjectModelClass clazz : model.getClasses()) { + if (WikittyTransformerUtil.isBusinessEntity(clazz)) { + processEntity(clazz); + } + } + + for (ObjectModelClass clazz : model.getClasses()) { + if (WikittyTransformerUtil.isMetaExtension(clazz)) { + processMetaExtension(clazz); + } + } + + processedClasses.clear(); + processedEntities.clear(); + } + + /** contains code commons to entities and meta-extensions */ + protected ObjectModelInterface prepareOutputClass(ObjectModelClass businessEntity) { + + ObjectModelInterface contract = processedClasses.get(businessEntity); + + if (contract == null) { + + log.debug("preparing " + businessEntity.getPackageName() + + "." + businessEntity.getName()); + + contract = createInterface(WikittyTransformerUtil.businessEntityToContractName(businessEntity), + businessEntity.getPackageName()); + addInterface(contract, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN); + + // TODO 20100811 bleny remove unused imports + addImport(contract, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN); + addImport(contract, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN); + addImport(contract, WikittyTransformerUtil.WIKITTY_CLASS_FQN); + addImport(contract, "org.nuiton.wikitty.WikittyExtension"); + addImport(contract, "org.nuiton.wikitty.WikittyUtil"); + addImport(contract, "org.nuiton.wikitty.WikittyUser"); + addImport(contract, "org.nuiton.wikitty.WikittyUserAbstract"); + addImport(contract, "org.nuiton.wikitty.WikittyUserImpl"); + addImport(contract, "org.nuiton.wikitty.TreeNode"); + addImport(contract, "org.nuiton.wikitty.TreeNodeAbstract"); + addImport(contract, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(contract, java.util.List.class); + addImport(contract, java.util.ArrayList.class); + addImport(contract, java.util.Collection.class); + addImport(contract, java.util.Collections.class); + addImport(contract, java.util.Set.class); + addImport(contract, java.util.Date.class); + addImport(contract, java.util.LinkedHashSet.class); + + String documentation = businessEntity.getDocumentation(); + if (businessEntity.hasTagValue(WikittyTransformerUtil.TAG_DOCUMENTATION)) { + documentation += "\n\n"; + documentation += businessEntity.getTagValue(WikittyTransformerUtil.TAG_DOCUMENTATION); + } + + setDocumentation(contract, documentation); + + processedClasses.put(businessEntity, contract); + + } else { + log.debug("already prepared : " + businessEntity.getPackageName() + + "." + businessEntity.getName()); + } + + return contract; + } + + protected void processEntity(ObjectModelClass businessEntity) { + + if ( processedEntities.contains(businessEntity) ) { + log.debug("entity already processed : " + businessEntity.getPackageName() + + "." + businessEntity.getName()); + // already processed + return ; + } + + log.debug("processing entity : " + businessEntity.getPackageName() + + "." + businessEntity.getName()); + + ObjectModelInterface contract = prepareOutputClass(businessEntity); + + + // adding public static final String EXT_CLIENT = "Client"; + addConstant(contract, + "EXT_" + businessEntity.getName().toUpperCase(), + "String", + "\"" + businessEntity.getName() + "\"", + ObjectModelModifier.PUBLIC); + + String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false); + + for(ObjectModelAttribute attribute : businessEntity.getAttributes()) { + if (attribute.isNavigable()) { + // two variables needed below + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, false); + + // adding constants to contract + addConstant(contract, + fieldVariableName, + "String", + "\"" + attribute.getName() + "\"", + ObjectModelModifier.PUBLIC); + // adding public static final String FQ_FIELD_CLIENT_NAME = EXT_CLIENT + ".name"; + addConstant(contract, + "FQ_" + fieldVariableName, + "String", + extensionVariableName + " + \"." + attribute.getName() + "\"", + ObjectModelModifier.PUBLIC); + } + } + + for (ObjectModelAttribute attribute : businessEntity.getAttributes()) { + if (attribute.isNavigable()) { + // needed below, in templates + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); + + String attributeName = attribute.getName(); + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + // there is a conflict, purifier transformer give as the right name to use + attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + } + + ObjectModelOperation getter; + + if (attribute.getMaxMultiplicity() > 1 || attribute.getMaxMultiplicity() == -1) { + // attributed is a collection, we will generate operations get, add, remove and clear + + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); + + // now, for this attribute, we will generate add, remove and clear methods + // adding operations to contract + String getterName = "get" + StringUtils.capitalize(attributeName); + getter = addOperation(contract, getterName, attributeTypeSimpleNameInSet); + + String addName = "add" + StringUtils.capitalize(attributeName); + ObjectModelOperation adder = addOperation(contract, addName, "void"); + addParameter(adder, "String", "element"); + + String removeName = "remove" + StringUtils.capitalize(attributeName); + ObjectModelOperation remover = addOperation(contract, removeName, "void"); + addParameter(remover, "String", "element"); + + String clearName = "clear" + StringUtils.capitalize(attributeName); + addOperation(contract, clearName, "void"); + + } else { + // attribute is not a collection, we generate a getter and a setter + String getterName = "get" + StringUtils.capitalize(attributeName); + getter = addOperation(contract, getterName, attributeType); + + String setterName = "set" + StringUtils.capitalize(attributeName); + ObjectModelOperation setter = addOperation(contract, setterName, attributeType); + addParameter(setter, attributeType, attributeName); + } + + setDocumentation(getter, attribute.getDocumentation()); + } + } + + // now, add to this contract all operation due to inheritence from + // other business entities + Collection<ObjectModelClass> superClasses = businessEntity.getSuperclasses(); + for (ObjectModelClass superClass : superClasses) { + addInterface(contract, superClass.getQualifiedName()); // extends ? + if (WikittyTransformerUtil.isBusinessEntity(superClass)) { + // superclass must have been processed first to have its operations set + if ( ! processedEntities.contains(superClass)) { + log.debug(businessEntity.getName() + " require to process " + + superClass.getName() + " first"); + processEntity(superClass); + } + + // getting the signatures of those operations + for (ObjectModelOperation operation : processedClasses.get(superClass).getOperations()) { + cloneOperationSignature(operation, contract, true); + } + } + } + + processedEntities.add(businessEntity); + } + + /** add stuff if input model element is stereotyped as "meta" */ + protected void processMetaExtension(ObjectModelClass metaExtension) { + log.debug("processing meta-extension : " + metaExtension.getPackageName() + + "." + metaExtension.getName()); + + ObjectModelInterface contract = prepareOutputClass(metaExtension); + + ObjectModelOperation addMetaExtension = addOperation(contract, "addMetaExtension", "void"); + addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + setDocumentation(addMetaExtension, String.format( + "add %s meta-extension on given extension to this entity", + metaExtension.getName())); + + } +} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,328 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; - -/** - * Possible enhancement: - * - generateParentMethod can generate attribut method access that call - * the same method on parent instance class. For that we must have one attribut - * instance by parent. This attribut we must be created in setWikitty method - * and used same wikitty object. - * - * @author poussin - */ -public class WikittyHelperGenerator extends WikengoCommonGenerator { - - private static final Log log = LogFactory.getLog(WikittyHelperGenerator.class); - - static protected Pattern extractTypeOnCollection = Pattern.compile("\\w*<(\\w+)>"); - - protected String EXT_NAME; - - @Override - public String getFilenameForClass(ObjectModelClass clazz) { - String fqn = clazz.getQualifiedName(); - log.info( "Filename for " + clazz.getName() + " is " + fqn.replace('.', File.separatorChar) + ".java"); - return fqn.replace('.', File.separatorChar) + "Helper.java"; - } - - public void generateFromClass(Writer output, ObjectModelClass clazz) - throws IOException { - if (!EugengoUtils.isBusinessEntity(clazz)) { - log.info( clazz.getName() + " is not a business entity"); - return; - } - - log.info("Generate Business entity abstract" + clazz.getName() + "... "); - generateCopyright(output); - - EXT_NAME = "EXT_" + clazz.getName().toUpperCase(); - - String packageName = clazz.getPackageName(); - String name = clazz.getName() + "Helper"; - String nameImpl = clazz.getName() + "Impl"; -/*{package <%=packageName%>; - -}*/ - ObjectModelClass superClass = findSuperClass(clazz); - - clearImports(); - addImport(clazz); - addImport(superClass); - addImport("org.nuiton.wikitty.WikittyUtil"); - addImport("org.nuiton.wikitty.Wikitty"); - addImport("org.nuiton.wikitty.BusinessEntityWikitty"); - addImport("org.nuiton.wikitty.WikittyExtension"); - addImport(Collection.class); - addImport(Collections.class); - addImport(List.class); - addImport(ArrayList.class); - - lookForAttributeImports(clazz); - generateImports(output, packageName); - - generateClazzDocumentation(output, clazz); - - // l'heritage sur le Impl n'est la que pour profiter des constantes deja definies -/*{public class <%=name%> extends <%=nameImpl%> { - -}*/ - - String svUID = GeneratorUtil.computeSerialVersionUID(clazz); -/*{ private static final long serialVersionUID = <%=svUID%>; - -}*/ - -/*{ - /** - * This class is not instanciable, it's just helper - *) - private <%=name%>() { - } - -}*/ - - generateAttributeAccessMethod(output, clazz); - - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateParentMethod(output, parent); - } - } - -/*{ - /** - * Check if wikitty has current extension - *) - static public boolean isExtension(Wikitty w) { - boolean result = w.hasExtension(<%=EXT_NAME%>); - return result; - } - - /** - * ajout les extensions static de cette classe au wikitty en argument - *) - static public void addExtension(Wikitty w) { - for (WikittyExtension ext : extensions) { - w.addExtension(ext); - } - } - - /** - * Check equality on all field of this extension, and only those. - *) - static public boolean equals(Wikitty w1, Wikitty w2) { - boolean result = true; -}*/ - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() && - (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { -/*{ if (result) { - Object f1 = w1.getFieldAsObject(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - Object f2 = w2.getFieldAsObject(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - result = f1 == f2 || (f1 != null && f1.equals(f2)); - } -}*/ - } - } -/*{ - return result; - } - -} //<%=name%> -}*/ - - } - - - - // Utilitarian methods - - public void generateAttributeAccessMethod(Writer output, ObjectModelClass clazz) throws IOException { - for (ObjectModelAttribute attr : clazz.getAttributes()) { - if (attr.isNavigable() && !attr.isStatic() - && (attr.getStereotypes() == null || attr.getStereotypes().isEmpty())) { - if ((attr.getMaxMultiplicity() != 0 && attr.getMaxMultiplicity() != 1)) { - //TODO ymartel 20090812: when dataType "List", "Set" or "Collection" in model, must be here! - generateCollectionAttributeAccessors(output, clazz, attr); - } else { - generateWikittyAttributeAccessors(output, clazz, attr); - } - } - } - } - - private void generateParentMethod(Writer output, - ObjectModelClass clazz) throws IOException { - - // we must generate method for parent of parent - for (ObjectModelClass parent : clazz.getSuperclasses()) { - if (EugengoUtils.isBusinessEntity(parent)) { - generateParentMethod(output, parent); - } - } - - // generate method acces for parent attribut - generateAttributeAccessMethod(output, clazz); - } - - protected void generateWikittyAttributeAccessors(Writer output, - ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { - - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // FIXME EC-20100421 cette methode peut retourner List<String> - // et generer la methode getWikitty().getFieldAsList<String>() - // qui ne peut pas compiler - String methodAccessName = getFieldAccessMethodName(attr); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); - -/*{ - static public void set<%=attrNameCapitalized%>(Wikitty w, <%=attrType%> <%=attrName%>) { - w.setField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=attrName%>); - } - - static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { - <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - return result; - } - -}*/ - } - - /** - * Give the string to put after getFieldAs???, only some type is accepted - * and we must convert BusinessEntity to Wikitty string - * @param type - * @return - */ - protected String getFieldAccessMethodName(ObjectModelAttribute attr) { - String result = computeType(attr); - result = getType(result, true); - - boolean isCollection = (attr.getMaxMultiplicity() != 0 - && attr.getMaxMultiplicity() != 1); - if (isCollection) { - if (attr.isUnique()) { - result = "Set"; - } else { - result = "List"; - } - } else { - // test for Date - if ("java.util.Date".equals(result) || "Date".equals(result)) { - result = "Date"; - } else if (getModel().hasClass(result)) { // test for Wikitty object - ObjectModelClass fieldClass = getModel().getClass(result); - if (EugengoUtils.isBusinessEntity(fieldClass)) { - // for wikittyDto we use String for Id - result = "Wikitty"; - } - } else if (null != getModel().getEnumeration(result)) { - result = "String"; - } - } - result = EugengoUtils.toUpperCaseFirstLetter(result); - - return result; - } - - protected void generateCollectionAttributeAccessors(Writer output, - ObjectModelClass clazz, ObjectModelAttribute attr) throws IOException { - - EXT_NAME = "EXT_" + attr.getDeclaringElement().getName().toUpperCase(); - - String attrType = computeType(attr); - if (EugengoUtils.notEmpty(attrType)) { - attrType = getType(attrType, true); - } else { - return; - } - - // get collection element type for add and remove method arguement type - String elementType = getType(attr.getType(), true); - - String methodAccessName = getFieldAccessMethodName(attr); - - String attrName = attr.getName(); - String attrNameCapitalized = EugengoUtils.toUpperCaseFirstLetter(attrName); -/*{ static public <%=attrType%> get<%=attrNameCapitalized%>(Wikitty w) { - <%=attrType%> result = w.getFieldAs<%=methodAccessName%>(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, <%=getClassAndGeneric(attrType)[1]%>.class); - return result; - } - - static public void add<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { - w.addToField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); - } - - static public void remove<%=attrNameCapitalized%>(Wikitty w, <%=elementType%> element) { - w.removeFromField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>, element); - } - - static public void clear<%=attrNameCapitalized%>(Wikitty w) { - w.clearField(<%=EXT_NAME%>, <%=clazz.getName()%>.FIELD_<%=clazz.getName().toUpperCase()%>_<%=attr.getName().toUpperCase()%>); - } - -}*/ - } - - private static Set<String> commonNumerics; - static { - commonNumerics = new HashSet<String>(); - commonNumerics.add("byte"); - commonNumerics.add("Byte"); - commonNumerics.add("short"); - commonNumerics.add("Short"); - commonNumerics.add("int"); - commonNumerics.add("Integer"); - commonNumerics.add("long"); - commonNumerics.add("Long"); - commonNumerics.add("float"); - commonNumerics.add("Float"); - commonNumerics.add("double"); - commonNumerics.add("Double"); - } - - private static Set<String> commonStrings; - static { - commonStrings = new HashSet<String>(); - commonStrings.add("char"); - commonStrings.add("Char"); - commonStrings.add("String"); - } - - private static Set<String> commonTypes; - static { - commonTypes = new HashSet<String>(); - commonTypes.addAll(commonNumerics); - commonTypes.addAll(commonStrings); - commonTypes.add("boolean"); - commonTypes.add("Boolean"); - commonTypes.add("Date"); - } - -} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,268 @@ +package org.nuiton.wikitty.generator; + +import org.apache.commons.lang.StringUtils; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/*{generator option: writeString = }*/ +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +/** + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.wikitty.generator.WikittyHelperGenerator" + */ +public class WikittyHelperGenerator extends ObjectModelTransformerToJava { + + protected static final String META_EXTENSION_SEPARATOR = ":"; + + @Override + public void transformFromClass(ObjectModelClass clazz) { + + ObjectModelClass helper = createClass(WikittyTransformerUtil.businessEntityToHelperName(clazz), + clazz.getPackageName()); + + // TODO 20100811 bleny remove unused imports + addImport(helper, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN); + addImport(helper, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN); + addImport(helper, WikittyTransformerUtil.WIKITTY_CLASS_FQN); + addImport(helper, "org.nuiton.wikitty.WikittyExtension"); + addImport(helper, "org.nuiton.wikitty.WikittyUtil"); + addImport(helper, "org.nuiton.wikitty.WikittyUser"); + addImport(helper, "org.nuiton.wikitty.WikittyUserAbstract"); + addImport(helper, "org.nuiton.wikitty.WikittyUserImpl"); + addImport(helper, "org.nuiton.wikitty.TreeNode"); + addImport(helper, "org.nuiton.wikitty.TreeNodeAbstract"); + addImport(helper, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(helper, java.util.List.class); + addImport(helper, java.util.ArrayList.class); + addImport(helper, java.util.Collection.class); + addImport(helper, java.util.Collections.class); + addImport(helper, java.util.Set.class); + addImport(helper, java.util.Date.class); + addImport(helper, java.util.LinkedHashSet.class); + + // making constructor for helper class (empty and private) + ObjectModelOperation constructor = addConstructor(helper, ObjectModelModifier.PRIVATE); + setDocumentation(constructor, "utility class all provided methods are accessible the static way"); + setOperationBody(constructor, "// empty\n"); // empty implementation + + if ( WikittyTransformerUtil.isBusinessEntity(clazz) ) { + createOperationsForBusinessEntity(clazz, helper); + } + + if ( WikittyTransformerUtil.isMetaExtension(clazz)) { + createOperationForMetaExtension(clazz, helper); + } + } + + /** add operation if input model element has stereotype "entity" */ + protected void createOperationsForBusinessEntity(ObjectModelClass entity, + ObjectModelClass helper) { + + String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(entity, true); + + // generating operations with bodies + for (ObjectModelAttribute attribute : entity.getAttributes()) { + if (attribute.isNavigable()) { + // needed below, in templates + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + String attributeType = WikittyTransformerUtil.generateResultType(attribute, false); + + String attributeName = attribute.getName(); + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + // there is a conflict, purifier transformer give as the right name to use + attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + } + + if (WikittyTransformerUtil.isAttributeCollection(attribute)) { + // attributed is a collection, we will generate operations get, add, remove and clear + + String attributeTypeSimpleNameInSet = WikittyTransformerUtil.generateResultType(attribute, true); + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // now, for this attribute, we will generate add, remove and clear methods + // adding operations to contract + String getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(helper, getterName, attributeTypeSimpleNameInSet, ObjectModelModifier.STATIC); + addParameter(getter, "Wikitty", "wikitty"); + String getterBody = "" +/*{ + <%=attributeTypeSimpleNameInSet%> result = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeType%>.class); + return result; +}*/; + setOperationBody(getter, getterBody); + + String addName = "add" + StringUtils.capitalize(attributeName); + ObjectModelOperation adder = addOperation(helper, addName, "void", ObjectModelModifier.STATIC); + addParameter(adder, "Wikitty", "wikitty"); + addParameter(adder, attributeType, "element"); + String adderBody = "" +/*{ + wikitty.addToField(<%=extensionVariableName%>, <%=fieldVariableName%>, element); +}*/; + setOperationBody(adder, adderBody); + + String removeName = "remove" + StringUtils.capitalize(attributeName); + ObjectModelOperation remover = addOperation(helper, removeName, "void", ObjectModelModifier.STATIC); + addParameter(remover, "Wikitty", "wikitty"); + addParameter(remover, attributeType, "element"); + String removerBody = "" +/*{ + wikitty.removeFromField(<%=extensionVariableName%>, <%=fieldVariableName%>, element); +}*/; + setOperationBody(remover, removerBody); + + String clearName = "clear" + StringUtils.capitalize(attributeName); + ObjectModelOperation clear = addOperation(helper, clearName, "void", ObjectModelModifier.STATIC); + addParameter(clear, "Wikitty", "wikitty"); + String clearBody = "" +/*{ + wikitty.clearField(<%=extensionVariableName%>, <%=fieldVariableName%>); +}*/; + setOperationBody(clear, clearBody); + + + } else { + String getFieldMethodName = WikittyTransformerUtil.generateGetFieldAsCall(attribute); + + // adding getter and setter to contract + String getterName = "get" + StringUtils.capitalize(attributeName); + ObjectModelOperation getter = addOperation(helper, getterName, attributeType, ObjectModelModifier.STATIC); + addParameter(getter, "Wikitty", "wikitty"); + setOperationBody(getter, "" +/*{ + <%=attributeType%> value = wikitty.<%=getFieldMethodName%>(<%=extensionVariableName%>, <%=fieldVariableName%>); + return value; +}*/); + + String setterName = "set" + StringUtils.capitalize(attributeName); + ObjectModelOperation setter = addOperation(helper, setterName, attributeType, ObjectModelModifier.STATIC); + addParameter(setter, "Wikitty", "wikitty"); + addParameter(setter, attributeType, attributeName); + setOperationBody(setter, "" +/*{ + <%=attributeType%> oldValue = <%=getter.getName()%>(wikitty); + wikitty.setField(<%=extensionVariableName%>, <%=fieldVariableName%>, <%=attributeName%>); + return oldValue; +}*/); + } + } + } + + + + // now, adding the equals(w1, w2) + + ObjectModelOperation equals = addOperation(helper, "equals", "boolean", ObjectModelModifier.STATIC); + addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w1"); + addParameter(equals, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "w2"); + + // the body of the equals method, will be assembled while reading attributes + String equalsBody = "" +/*{ + boolean result = true; +}*/; + + for(ObjectModelAttribute attribute : entity.getAttributes()) { + if (attribute.isNavigable()) { + // two variables needed below + String fieldVariableName = WikittyTransformerUtil.attributeToFielVariableName(attribute, true); + + // considering field in equals body + equalsBody += "" +/*{ + if (result) { + Object f1 = w1.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>); + Object f2 = w2.getFieldAsObject(<%= extensionVariableName %>, <%= fieldVariableName %>); + result = f1 == f2 || (f1 != null && f1.equals(f2)); + }; +}*/; + } + } + + // finishing equals body + equalsBody += "" +/*{ + return result; +}*/; + setOperationBody(equals, equalsBody); + + + + + + // finally, adding isExtention and addExtension + + ObjectModelOperation isExtension = addOperation(helper, "isExtension", "boolean", ObjectModelModifier.STATIC); + addParameter(isExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(isExtension, "Check if wikitty has current extension"); + setOperationBody(isExtension, "" +/*{ + return wikitty.hasExtension(<%=extensionVariableName%>); +}*/); + + ObjectModelOperation addExtension = addOperation(helper, "addExtension", "void", ObjectModelModifier.STATIC); + addParameter(addExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(addExtension, "ajout les extensions static de cette classe au wikitty en argument"); + String contractName = WikittyTransformerUtil.businessEntityToAbstractName(entity); + setOperationBody(addExtension, "" +/*{ + for (WikittyExtension ext : <%=contractName%>.extensions) { + wikitty.addExtension(ext); + } +}*/); + } + + /** add needed operations if input model element has stereotype "meta" */ + protected void createOperationForMetaExtension(ObjectModelClass metaExtension, + ObjectModelClass helper) { + + ObjectModelOperation addMetaExtension = addOperation(helper, "addMetaExtension", "void", ObjectModelModifier.STATIC); + addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(addMetaExtension, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setDocumentation(addMetaExtension, String.format( + "add %s meta-extension on given extension to the given wikitty", + metaExtension.getName())); + String abstractName = WikittyTransformerUtil.businessEntityToAbstractName(metaExtension); + String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); + setOperationBody(addMetaExtension, "" +/*{ + wikitty.addMetaExtension(<%=abstractName%>.extension<%=contractName%>, extension); +}*/); + + + + // now adding getMetaFielName, both implementations + + ObjectModelOperation getMetaFieldNameFromExtension = addOperation(helper, "getMetaFieldName", "String", ObjectModelModifier.STATIC); + addParameter(getMetaFieldNameFromExtension, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(getMetaFieldNameFromExtension, "String", "fieldName"); + setDocumentation(getMetaFieldNameFromExtension, String.format( + "for extension 'Ext' and field 'f', return 'Ext:%s.f'", + metaExtension.getName())); + setOperationBody(getMetaFieldNameFromExtension, "" +/*{ + String metaFieldName = getMetaFieldName(extension.getName(), fieldName); + return metaFieldName; +}*/); + + ObjectModelOperation getMetaFieldNameFromExtensionName = addOperation(helper, "getMetaFieldName", "String", ObjectModelModifier.STATIC); + addParameter(getMetaFieldNameFromExtensionName, "String", "extensionName"); + addParameter(getMetaFieldNameFromExtensionName, "String", "fieldName"); + setDocumentation(getMetaFieldNameFromExtensionName, String.format( + "for extension 'Ext' and field 'f', return 'Ext:%s.f'", + metaExtension.getName())); + setOperationBody(getMetaFieldNameFromExtensionName, "" +/*{ + String metaFieldName = String.format("%s<%=META_EXTENSION_SEPARATOR%><%=metaExtension.getName()%>.%s", extensionName, fieldName); + return metaFieldName; +}*/); + + + + // now, adding all + } +} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,125 @@ +package org.nuiton.wikitty.generator; + +import java.util.HashMap; +import java.util.Map; +import java.util.Random; + +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + +/*{generator option: writeString = }*/ +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +/** + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.wikitty.generator.WikittyImplementationGenerator" + */ +public class WikittyImplementationGenerator extends ObjectModelTransformerToJava { + + protected Map<ObjectModelClass, ObjectModelClass> processedClasses = + new HashMap<ObjectModelClass, ObjectModelClass>(); + + @Override + public void transformFromClass(ObjectModelClass clazz) { + + if ( WikittyTransformerUtil.isBusinessEntity(clazz) ) { + ObjectModelClass implementation = prepareImplementation(clazz); + processBusinessEntity(clazz, implementation); + } + + if ( WikittyTransformerUtil.isBusinessEntity(clazz) ) { + ObjectModelClass implementation = prepareImplementation(clazz); + processMetaExtension(clazz, implementation); + } + } + + protected ObjectModelClass prepareImplementation(ObjectModelClass clazz) { + ObjectModelClass implementation; + + if (processedClasses.containsKey(clazz)) { + // class has been already processed, return the implementation + implementation = processedClasses.get(clazz); + } else { + implementation = createClass( + WikittyTransformerUtil.businessEntityToImplementationName(clazz), + clazz.getPackageName()); + + // TODO 20100811 bleny remove unused imports + addImport(implementation, WikittyTransformerUtil.BUSINESS_ENTITY_CLASS_FQN); + addImport(implementation, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN); + addImport(implementation, WikittyTransformerUtil.WIKITTY_CLASS_FQN); + addImport(implementation, "org.nuiton.wikitty.WikittyExtension"); + addImport(implementation, "org.nuiton.wikitty.WikittyUtil"); + addImport(implementation, "org.nuiton.wikitty.WikittyUser"); + addImport(implementation, "org.nuiton.wikitty.WikittyUserAbstract"); + addImport(implementation, "org.nuiton.wikitty.WikittyUserImpl"); + addImport(implementation, "org.nuiton.wikitty.TreeNode"); + addImport(implementation, "org.nuiton.wikitty.TreeNodeAbstract"); + addImport(implementation, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(implementation, java.util.List.class); + addImport(implementation, java.util.ArrayList.class); + addImport(implementation, java.util.Collection.class); + addImport(implementation, java.util.Collections.class); + addImport(implementation, java.util.Set.class); + addImport(implementation, java.util.Date.class); + addImport(implementation, java.util.LinkedHashSet.class); + + setSuperClass(implementation, WikittyTransformerUtil.businessEntityToAbstractName(clazz)); + + // adding a generated serialVersionUID + Random random = new Random(); + Long serialVersionUIDs = random.nextLong(); + addConstant(implementation, + "serialVersionUID", + "long", + serialVersionUIDs.toString() + "L", + ObjectModelModifier.PRIVATE); + + } + + return implementation; + } + + protected void processBusinessEntity(ObjectModelClass clazz, + ObjectModelClass implementation) { + + // adding constructor + ObjectModelOperation constructor = addConstructor(implementation, ObjectModelModifier.PUBLIC); + setOperationBody(constructor, "" +/*{ + super(); +}*/); + + constructor = addConstructor(implementation, ObjectModelModifier.PUBLIC); + addParameter(constructor, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + setOperationBody(constructor, "" +/*{ + super(wikitty); +}*/); + + constructor = addConstructor(implementation, ObjectModelModifier.PUBLIC); + addParameter(constructor, WikittyTransformerUtil.BUSINESS_ENTITY_WIKITTY_CLASS_FQN, "businessEntityWikitty"); + setOperationBody(constructor, "" +/*{ + super(businessEntityWikitty.getWikitty()); +}*/); + + } + + protected void processMetaExtension(ObjectModelClass metaExtension, + ObjectModelClass implementation) { + + + ObjectModelOperation constructor = addConstructor(implementation, ObjectModelModifier.PUBLIC); + addParameter(constructor, WikittyTransformerUtil.WIKITTY_EXTENSION_CLASS_FQN, "extension"); + addParameter(constructor, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); + String contractName = WikittyTransformerUtil.businessEntityToContractName(metaExtension); + setOperationBody(constructor, "" +/*{ + this.wikitty = wikitty; + addMetaExtension(extension<%=contractName%>, extension); +}*/); + } +} Deleted: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,136 +0,0 @@ -package org.nuiton.wikitty.generator; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.List; -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelGenerator; -import org.nuiton.util.Resource; - -public class WikittyMetaGenerator extends ObjectModelGenerator { - - protected static Log log = LogFactory.getLog(WikittyMetaGenerator.class); - - /** - * la liste des generateurs par defaut a utiliser - */ - protected static final List<Class<? extends WikengoCommonGenerator>> DEFAULT_GENERATORS = - Collections.unmodifiableList(Arrays.asList( - - // Enum - InterfaceGenerator.class, - EnumGenerator.class, - - // Wikitty (Interface, impl...) - BusinessEntityInterfaceGenerator.class, - BusinessEntityAbstractGenerator.class, - BusinessEntityImplGenerator.class, - WikittyHelperGenerator.class - - )); - - protected List<Class<? extends WikengoCommonGenerator>> getGenerators() { - List<Class<? extends WikengoCommonGenerator>> result = DEFAULT_GENERATORS; - Properties props = null; - try { - Properties tmpProperties = Resource.getConfigProperties("WikittyMetaGenerator.properties"); - - props = new Properties(); - - // Mise Ã plat du fichier (sans parent) - for (Enumeration<?> e = tmpProperties.propertyNames(); e.hasMoreElements();) { - String key = e.nextElement() + ""; - String value = tmpProperties.getProperty(key); - props.setProperty(key, value); - } - - } catch (IOException ioe) { - log.error("Unable to load file WikengoMetaGenerator.properties : " + ioe.getMessage()); - } - - if (props != null) { - List<Class<? extends WikengoCommonGenerator>> propsGenerators = new ArrayList<Class<? extends WikengoCommonGenerator>>(); - String basePackage = props.getProperty("basePackage"); - String suffix = props.getProperty("suffix"); - if (basePackage != null && !basePackage.endsWith(".")) { - basePackage += "."; - } - for (Object key : props.keySet()) { - String className = (String)key; - if ( suffix != null ) className += suffix; - - // Try with "className" - Class<? extends WikengoCommonGenerator> clazz = getClass(className); - - // Try with "baseName.className" - if (clazz == null && basePackage != null) { - clazz = getClass(basePackage + className); - } - - if (clazz != null) { - propsGenerators.add(clazz); - } else { - log.warn("No generator found for property '" + className + "'"); - } - } - if (!propsGenerators.isEmpty()) { - result = propsGenerators; - } - } - - log.warn("Enabled generators: " + result); - return result; - } - - protected Class<? extends WikengoCommonGenerator> getClass(String className) { - Class<? extends WikengoCommonGenerator> result = null; - try { - Class<?> clazz = Class.forName(className); - if (WikengoCommonGenerator.class.isAssignableFrom(clazz)) { - result = (Class<? extends WikengoCommonGenerator>)clazz; - } - } catch (ClassNotFoundException e) { - // Nothing to do - } - return result; - } - - @Override - public void applyTemplate(ObjectModel model, File destDir) throws IOException { - for (Class<? extends ObjectModelGenerator> generatorClass : getGenerators()) { - ObjectModelGenerator generator; - if (excludeTemplates != null && excludeTemplates.contains(generatorClass.getName())) { - // exclude generator - log.info("exclude generator " + generatorClass); - continue; - } - try { - - generator = generatorClass.newInstance(); - generator.setParent(this); - - } catch (Exception e) { - // should never happens - if (log.isErrorEnabled()) { - log.error("An error occurs when generating persistence", e); - } - throw new RuntimeException(e); - } - - // log - if (log.isDebugEnabled()) { - log.debug("call template : " + generatorClass.getSimpleName()); - } - generator.applyTemplate(model, destDir); - } - } - -} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,76 @@ +package org.nuiton.wikitty.generator; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.AbstractMetaTransformer; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelClass; + +/** + * + * Wikitty generation steps : + * <ol> + * <li>transform user model to wikitty intermediate model</li> + * <li>generate from wikitty intermediate model : + * <ul> + * <li>a contract;</li> + * <li>an abstract class;</li> + * <li>an implementation;</li> + * <li>a helper</li> + * </ul> + * </li> + * </ol> + * + * @author bleny + * + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.wikitty.generator.WikittyMetaGenerator" + */ + +// TODO 20100610 use filter with /*[]*/ +/*{generator option: writeString = }*/ +/*{generator option: parentheses = false}*/ +/*{generator option: writeString = +}*/ + +public class WikittyMetaTransformer extends AbstractMetaTransformer<ObjectModel> { + + private static final Log log = LogFactory.getLog(WikittyMetaTransformer.class); + + public WikittyMetaTransformer() { + + super(WikittyContractGenerator.class, + WikittyAbstractGenerator.class, + WikittyImplementationGenerator.class, + WikittyHelperGenerator.class + ); + + } + + /** */ + @Override + protected boolean validateModel(ObjectModel model) { + + if (model.getClasses().isEmpty()) { + log.warn("model doesn't contains any class"); + } + + for (ObjectModelClass clazz : model.getClasses()) { + + // warn user if deprecated stereotype is used + if (clazz.getStereotypes().contains(WikittyTransformerUtil.BUSINESS_ENTITY_STEREOTYPE_OLD_NAME)) { + log.warn(clazz.getQualifiedName() + " uses deprecated \"" + + WikittyTransformerUtil.BUSINESS_ENTITY_STEREOTYPE_OLD_NAME + + "\" stereotype. use \"" + + WikittyTransformerUtil.BUSINESS_ENTITY_STEREOTYPE_NAME + + "\" instead"); + } + + if (!clazz.hasTagValue(WikittyTransformerUtil.TAG_VERSION)) { + log.warn(clazz.getQualifiedName() + " misses a \"" + + WikittyTransformerUtil.TAG_VERSION + "\" tagValue"); + } + } + + return true; + } + +} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,130 @@ +package org.nuiton.wikitty.generator; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; + +/** + * this transformer read the original user model and generate the intermediate + * model needed by generators. + * + * + * + */ +public class WikittyPurifierTransformer extends ObjectModelTransformerToJava { + + private static final Log log = LogFactory.getLog(WikittyPurifierTransformer.class); + + /** for a given class, store all the names used by this class and subClasses */ + Map<ObjectModelClass, List<String>> namesUsedByClass = new HashMap<ObjectModelClass, List<String>>(); + + /** class of the original model that are already processed */ + List<ObjectModelClass> processedClasses = new ArrayList<ObjectModelClass>(); + + /** + * for a given, class read all attributes name and try to find conflicts + * with parent classes attributes names. + * + * If a conflict is found, we try to solve the conflict by adding an + * tagValue to the conflicting attribute for others transformers + * to consider it as a new name. To choose a new name, we look for + * an alternative name provided by the user through a tagValue on this + * attribute. If no alternative provided, we try to generate an alternative + * name by adding "From<className>" to the attribute name. + */ + protected void processClass(ObjectModelClass clazz) { + if (processedClasses.contains(clazz)) { + // clazz has already been processed, do nothing + } else { + // all attributes names that will be used by clazz + List<String> allUsedNames = new ArrayList<String>(); + + + // first, we have to get all names used by the super classes and + // its superclasses. So they must have been processed before + // current class. Thus, we recursively call processClass on + // superClass. + + // process superclass first + for (ObjectModelClass superClasses : clazz.getSuperclasses()) { + if (WikittyTransformerUtil.isBusinessEntity(superClasses)) { + if (!processedClasses.contains(superClasses)) { + processClass(superClasses); + allUsedNames.addAll(namesUsedByClass.get(superClasses)); + } + } + } + + // now, allUsedNames contains all names used by superClass, we + // have to check current class attributes names for conflict. + // allUsedNames contains name that we + // can't use without generating a conflict + for (ObjectModelAttribute attribute : clazz.getAttributes()) { + + // will be null as long as a non-conflicting name is found + String attributeName = null; + + if (attribute.hasTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME)) { + attributeName = attribute.getTagValue(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + if (allUsedNames.contains(attributeName)) { + // using alternative name lead to a conflict + attribute.getTagValues().remove(WikittyTransformerUtil.TAG_ALTERNATIVE_NAME); + attributeName = null; + } + } + + if (attributeName == null) { + attributeName = attribute.getName(); + if (allUsedNames.contains(attributeName)) { + // using alternative name lead to a conflict + attributeName = null; + } + } + + if (attributeName == null) { + attributeName = attribute.getName() + "From" + clazz.getName(); + if (allUsedNames.contains(attributeName)) { + // using alternative name lead to a conflict + attributeName = null; + } else { + addTagValue(attribute, WikittyTransformerUtil.TAG_ALTERNATIVE_NAME, attributeName); + } + } + + // finally + if (attributeName == null) { + // still no alternative :-( + log.error("no way to resolve conflict with attribute" + + attribute.getName() + " from class " + clazz + + ". You should add or change a tagValue \"" + + WikittyTransformerUtil.TAG_ALTERNATIVE_NAME + + "\" on this attribute"); + } else { + allUsedNames.add(attributeName); + } + } + + // saving all names we used in current class will permit to sub classes + // to know what names it must not use + namesUsedByClass.put(clazz, allUsedNames); + } + } + + @Override + public void transformFromModel(ObjectModel model) { + for (ObjectModelClass clazz : model.getClasses()) { + ObjectModelClass clone = cloneClass(clazz, true); + if (WikittyTransformerUtil.isBusinessEntity(clazz)) { + processClass(clone); + } + } + } +} Copied: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java (from rev 347, branches/wikitty-eugene-migration/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java) =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java (rev 0) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,200 @@ +package org.nuiton.wikitty.generator; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; + + +public class WikittyTransformerUtil { + + /** utility class should not be instanciated */ + private WikittyTransformerUtil() {} + + protected static final String BUSINESS_ENTITY_CLASS_FQN = "org.nuiton.wikitty.BusinessEntity"; + protected static final String BUSINESS_ENTITY_WIKITTY_CLASS_FQN = "org.nuiton.wikitty.BusinessEntityWikitty"; + protected static final String WIKITTY_CLASS_FQN = "org.nuiton.wikitty.Wikitty"; + protected static final String WIKITTY_EXTENSION_CLASS_FQN = "org.nuiton.wikitty.WikittyExtension"; + + protected static final String TAG_VERSION = "version"; + protected static final String TAG_ALTERNATIVE_NAME = "alternativeName"; + protected static final String TAG_TO_STRING = "toString"; + protected static final String TAG_DOCUMENTATION = "documentation"; + + /** @deprecated name change : see ticket #798. use BUSINESS_ENTITY_STEREOTYPE_NAME */ + @Deprecated + protected static final String BUSINESS_ENTITY_STEREOTYPE_OLD_NAME = "BusinessEntity"; + + /** user will use this stereotype in his model */ + protected static final String BUSINESS_ENTITY_STEREOTYPE_NAME = "entity"; + + /** user will use this stereotype to make an extension a meta-extension */ + protected static final String META_EXTENSION_STEREOTYPE_NAME = "meta"; + + /** given a class called Client will return "EXT_CLIENT" + * should be used as a variable name to store the extension name + * @param withClassNamePrefix add class name as prefix (will return "Client.EXT_CLIENT") + */ + protected static String classToExtensionVariableName(ObjectModelClass clazz, + boolean withClassNamePrefix) { + String extensionVariableName = ""; + if (withClassNamePrefix) { + extensionVariableName += clazz.getName() + "."; + } + extensionVariableName += "EXT_" + clazz.getName().toUpperCase(); + return extensionVariableName; + } + + /** given the field name of the class Client, will return "FIELD_CLIENT_NAME" + * @param withClassNamePrefix add class name as prefix (ie "Client.FIELD_CLIENT_NAME") + */ + protected static String attributeToFielVariableName(ObjectModelAttribute attribute, + boolean withClassNamePrefix) { + String fieldVariableName = ""; + if (withClassNamePrefix) { + fieldVariableName += attribute.getDeclaringElement().getName() + "."; + } + fieldVariableName += "FIELD_" + attribute.getDeclaringElement().getName().toUpperCase() + "_" + attribute.getName().toUpperCase(); + return fieldVariableName; + } + + /** given "my.java.package.MyClass" or "MyClass" return "MyClass" */ + protected static String FQNtoSimpleName(String fqn) { + // XXX should use GeneratorUtil#getSimpleName(String) + int lastDotIndex = fqn.lastIndexOf("."); + String simpleName = fqn; + if (lastDotIndex != -1) { + simpleName = fqn.substring(lastDotIndex + 1); + } + return simpleName; + } + + protected static boolean isBusinessEntity(ObjectModelClass clazz) { + boolean result = clazz.hasStereotype(BUSINESS_ENTITY_STEREOTYPE_NAME) + || clazz.hasStereotype(BUSINESS_ENTITY_STEREOTYPE_OLD_NAME); + return result; + } + + public static boolean isMetaExtension(ObjectModelClass clazz) { + boolean result = clazz.hasStereotype(META_EXTENSION_STEREOTYPE_NAME); + return result; + } + + /** + * wikitty interface provide getFieldAsString, getFieldAsDate etc. methods + * this method returns the good name of the method to call depending the + * type given as parameter + * @param typeName a name of a business entity or "String", "Integer" etc. + * @return the name of a method "getFieldAsInt" for example + */ + protected static String generateGetFieldAsCall(ObjectModelAttribute attribute) { + String asWhat = null; + if (isAttributeCollection(attribute)) { + asWhat = getCollectionTypeName(attribute); + } else { + String simpleTypeName = FQNtoSimpleName(attribute.getType()); + if (commonTypes.contains(simpleTypeName)) { + asWhat = StringUtils.capitalize(simpleTypeName); + } else { + asWhat = "Wikitty"; + } + } + return "getFieldAs" + asWhat; + } + + /** for a given type of attribute, the getter returned type must be... */ + protected static String generateResultType(ObjectModelAttribute attribute, + boolean considerMultiplicity) { + String simpleTypeName = FQNtoSimpleName(attribute.getType()); + if (! commonTypes.contains(simpleTypeName)) { + simpleTypeName = "String"; // return a wikitty Id + } + + if (considerMultiplicity && isAttributeCollection(attribute)) { + simpleTypeName = getCollectionTypeName(attribute) + "<" + simpleTypeName + ">"; + } + + return simpleTypeName; + } + + protected static String getCollectionTypeName(ObjectModelAttribute attribute) { + String result = null; + if (attribute.isUnique()) { + result = "Set"; + } else { + result = "List"; + } + return result; + } + + public static boolean isAttributeCollection(ObjectModelAttribute attribute) { + return attribute.getMaxMultiplicity() == -1 // -1 is infinity + || attribute.getMaxMultiplicity() > 1; + } + + protected static String typeToWikittyColumn(String type) { + String simpleType = FQNtoSimpleName(type); + String result = simpleType; + if (!commonTypes.contains(simpleType)) { + result = "Wikitty"; + } else if(commonNumerics.contains(simpleType)) { + result = "Numeric"; + } else if(commonStrings.contains(simpleType)) { + result = "String"; + } + return result; + } + + private static Set<String> commonNumerics; + static { + commonNumerics = new HashSet<String>(); + commonNumerics.add("byte"); + commonNumerics.add("Byte"); + commonNumerics.add("short"); + commonNumerics.add("Short"); + commonNumerics.add("int"); + commonNumerics.add("Integer"); + commonNumerics.add("long"); + commonNumerics.add("Long"); + commonNumerics.add("float"); + commonNumerics.add("Float"); + commonNumerics.add("double"); + commonNumerics.add("Double"); + } + + private static Set<String> commonStrings; + static { + commonStrings = new HashSet<String>(); + commonStrings.add("char"); + commonStrings.add("Char"); + commonStrings.add("String"); + } + + private static Set<String> commonTypes; + static { + commonTypes = new HashSet<String>(); + commonTypes.addAll(commonNumerics); + commonTypes.addAll(commonStrings); + commonTypes.add("boolean"); + commonTypes.add("Boolean"); + commonTypes.add("Date"); + } + + public static String businessEntityToContractName(ObjectModelClass clazz) { + return clazz.getName(); + } + + public static String businessEntityToAbstractName(ObjectModelClass clazz) { + return clazz.getName() + "Abstract"; + } + + public static String businessEntityToImplementationName(ObjectModelClass clazz) { + return clazz.getName() + "Impl"; + } + + public static String businessEntityToHelperName(ObjectModelClass clazz) { + return clazz.getName() + "Helper"; + } +} Modified: trunk/wikitty-hbase-impl/pom.xml =================================================================== --- trunk/wikitty-hbase-impl/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-hbase-impl/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -8,7 +8,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-hessian-client/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-hessian-server/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc-impl/pom.xml =================================================================== --- trunk/wikitty-jdbc-impl/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-jdbc-impl/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jms-impl/pom.xml =================================================================== --- trunk/wikitty-jms-impl/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-jms-impl/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-jpa-impl/pom.xml =================================================================== --- trunk/wikitty-jpa-impl/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-jpa-impl/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -8,7 +8,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-multistorage-impl/pom.xml =================================================================== --- trunk/wikitty-multistorage-impl/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-multistorage-impl/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Property changes on: trunk/wikitty-solr-impl ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.0-eugene2/wikitty-solr-impl:164-179 /branches/wikitty-eugene-migration/wikitty-solr-impl:239-347 Modified: trunk/wikitty-solr-impl/pom.xml =================================================================== --- trunk/wikitty-solr-impl/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>  @@ -60,21 +60,6 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <scope>test</scope> - </dependency> </dependencies> Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-28 10:05:55 UTC (rev 351) @@ -133,7 +133,7 @@ if (searchField.length >= 3) { String fieldNameType = searchField[2]; - TYPE type = FieldType.TYPE.valueOf(fieldNameType); + TYPE type = FieldType.TYPE.valueOf(fieldNameType); result = WikittySearchEnginSolr.getSolrFieldName(fqfieldname, type); return result; } @@ -168,13 +168,18 @@ /** * Helper to get information nodes and elements for reindexation. */ - protected class ReindexChildTreeNode { + static protected class ReindexChildTreeNode { + protected SolrResource solrResource; + protected SolrServer solrServer; + protected Map<String, Collection<String>> includedNodeIds; protected Map<String, Collection<String>> excludedNodeIds; protected Map<String, String> parents; - public ReindexChildTreeNode() { + public ReindexChildTreeNode(SolrServer solrServer, SolrResource solrResource) { + this.solrServer = solrServer; + this.solrResource = solrResource; includedNodeIds = new HashMap<String, Collection<String>>(); excludedNodeIds = new HashMap<String, Collection<String>>(); parents = new HashMap<String, String>(); @@ -238,7 +243,7 @@ // If not found in map, search in index if(parentId == null) { - SolrDocument doc = WikittySearchEnginSolr.this.findById(nodeId); + SolrDocument doc = findById(solrServer, nodeId); if(doc == null) { // is root return null; @@ -283,22 +288,21 @@ doc = new SolrInputDocument(); // Copy old field value - SolrDocument found = findById(id); + SolrDocument found = findById(solrServer, id); if (found != null) { - Collection<String> fieldNames = found.getFieldNames(); - for (String fieldName : fieldNames) { - Collection<Object> fieldValues = found.getFieldValues(fieldName); - - if(!fieldName.startsWith(TREENODE_PREFIX)) { - for (Object fieldValue : fieldValues) { - doc.addField(fieldName, fieldValue); - } - } - } - - solrResource.addDoc(id, doc); - } - else { + Collection<String> fieldNames = found.getFieldNames(); + for (String fieldName : fieldNames) { + Collection<Object> fieldValues = found.getFieldValues(fieldName); + + if(!fieldName.startsWith(TREENODE_PREFIX)) { + for (Object fieldValue : fieldValues) { + doc.addField(fieldName, fieldValue); + } + } + } + + solrResource.addDoc(id, doc); + } else { if (log.isWarnEnabled()) { log.warn("Can't find wikitty id '" + id + "' in index. Skip this wikitty."); } @@ -358,12 +362,14 @@ /** * Use to plug solr indexation in JTA transaction. */ - protected class SolrResource implements OnePhaseResource { + static protected class SolrResource implements OnePhaseResource { + protected SolrServer solrServer; protected ThreadLocal<Map<String, SolrInputDocument>> addedDocs; protected ThreadLocal<List<String>> deletedDocs; - public SolrResource() { + public SolrResource(SolrServer solrServer) { + this.solrServer = solrServer; addedDocs = new ThreadLocal<Map<String, SolrInputDocument>>(); deletedDocs = new ThreadLocal<List<String>>(); @@ -494,7 +500,7 @@ solrServer = new EmbeddedSolrServer(coreContainer, ""); fieldModifier = new TypeFieldModifer(extensionStorage); - solrResource = new SolrResource(); + solrResource = new SolrResource(solrServer); } catch (Exception eee) { throw new WikittyException(eee); @@ -515,7 +521,8 @@ public UpdateResponse store(WikittyTransaction transaction, Collection<Wikitty> wikitties) { try { solrResource.init(); - ReindexChildTreeNode reindexChildTreeNode = new ReindexChildTreeNode(); + ReindexChildTreeNode reindexChildTreeNode = + new ReindexChildTreeNode(solrServer, solrResource); for (Wikitty w : wikitties) { String id = w.getId(); @@ -525,7 +532,7 @@ reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children - SolrDocument treeNodeDoc = findById(id); + SolrDocument treeNodeDoc = findById(solrServer, id); if (treeNodeDoc != null) { Collection oldAttachments = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT); if (oldAttachments != null) { @@ -569,7 +576,8 @@ public UpdateResponse delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { try { solrResource.init(); - ReindexChildTreeNode reindexChildTreeNode = new ReindexChildTreeNode(); + ReindexChildTreeNode reindexChildTreeNode = + new ReindexChildTreeNode(solrServer, solrResource); for (String id : ids) { // Find child in node id @@ -877,7 +885,7 @@ /** * Find solr document by id */ - protected SolrDocument findById(String id) { + protected static SolrDocument findById(SolrServer solrServer, String id) { SolrQuery query = new SolrQuery(SOLR_ID + ":" + id); QueryResponse response; try { Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-09-28 10:05:55 UTC (rev 351) @@ -1,31 +1,12 @@ package org.nuiton.wikitty.solr.test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - import org.junit.Before; -import org.nuiton.wikitty.WikittySearchEngin; import org.nuiton.wikitty.WikittyService; -import org.springframework.beans.factory.annotation.Autowired; -(a)RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:META-INF/spring/wikitty-test.xml") public abstract class AbstractTestSolr { - @Autowired - protected WikittyService ws; + protected WikittyService ws = new WikittyServiceSolr(); - public void setWikittyService(WikittyService service) { - ws = service; - } - - public WikittyService getWikittyService() { - return ws; - } - - WikittySearchEngin engine; - @Before public void deleteAll() throws Exception { WikittyServiceSolr hbaseService = ((WikittyServiceSolr) ws); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-09-28 10:05:55 UTC (rev 351) @@ -28,7 +28,7 @@ public class SolrSearchTest extends AbstractTestSolr { - static private Log log = LogFactory.getLog(SolrSearchTest.class); + private static final Log log = LogFactory.getLog(SolrSearchTest.class); protected WikittyExtension extCategory; protected WikittyExtension extProduct; @@ -471,5 +471,4 @@ list = result.getAll(); assertEquals(2, list.size()); } - } Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-09-28 10:05:55 UTC (rev 351) @@ -34,7 +34,6 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.test.annotation.ExpectedException; /** * Test behaviour SolrServer embedded. @@ -45,12 +44,12 @@ * Last update: $Date$ * by : $Author$ */ -public class SolrServerTest extends AbstractTestSolr { +public class SolrServerTest { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SolrServerTest.class); + private static final Log log = LogFactory.getLog(SolrServerTest.class); - public SolrServer getSolrServer() throws Exception { + public SolrServer newSolrServer() throws Exception { CoreContainer.Initializer initializer = new CoreContainer.Initializer(); CoreContainer coreContainer = initializer.initialize(); SolrServer solrServer = new EmbeddedSolrServer(coreContainer, ""); @@ -112,16 +111,15 @@ @Before public void clearIndex() throws Exception { - SolrServer solrServer = getSolrServer(); + SolrServer solrServer = newSolrServer(); solrServer.deleteByQuery("*:*"); solrServer.commit(); } - @Test - @ExpectedException(value=SolrServerException.class) + @Test(expected=SolrServerException.class) public void testLockObtainFailed() throws Exception { - SolrServer solrServer1 = getSolrServer(); - SolrServer solrServer2 = getSolrServer(); + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); addDocument(solrServer1, "1", "1"); addDocument(solrServer2, "2", "2"); @@ -136,9 +134,10 @@ * De plus ce test est la seule cause des erreurs de build de ces derniers temps. * Et il y a un commentaire laissant planer le doute un peu plus bas. */ - //@Test + @Ignore + @Test public void test2Threads1SolrServer() throws Exception { - SolrServer solrServer = getSolrServer(); + SolrServer solrServer = newSolrServer(); ThreadAddDocument thread1 = new ThreadAddDocument(solrServer, "1", true); ThreadAddDocument thread2 = new ThreadAddDocument(solrServer, "2", false); @@ -158,8 +157,8 @@ @Test public void test2Threads1Writer2SolrServers() throws Exception { - SolrServer solrServer1 = getSolrServer(); - SolrServer solrServer2 = getSolrServer(); + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", false); @@ -175,7 +174,7 @@ result = findById(solrServer2, "2"); assertNull(result); - SolrServer solrServer3 = getSolrServer(); + SolrServer solrServer3 = newSolrServer(); result = findById(solrServer3, "1"); assertNotNull(result); result = findById(solrServer3, "2"); @@ -186,8 +185,8 @@ @Ignore @Test public void test2Threads2Writers2SolrServers() throws Exception { - SolrServer solrServer1 = getSolrServer(); - SolrServer solrServer2 = getSolrServer(); + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", true); @@ -205,7 +204,7 @@ result = findById(solrServer2, "2"); assertNotNull(result); - SolrServer solrServer3 = getSolrServer(); + SolrServer solrServer3 = newSolrServer(); result = findById(solrServer3, "1"); assertNotNull(result); result = findById(solrServer3, "2"); @@ -215,8 +214,8 @@ @Ignore // FIXME 20100806 bleny randomly fail @Test public void testReader() throws Exception { - SolrServer solrServer1 = getSolrServer(); - SolrServer solrServer2 = getSolrServer(); + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); addDocument(solrServer1, "1", "1"); solrServer1.commit(); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-09-28 10:05:55 UTC (rev 351) @@ -35,6 +35,7 @@ import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.Tree; import org.nuiton.wikitty.TreeNode; +import org.nuiton.wikitty.TreeNodeHelper; import org.nuiton.wikitty.TreeNodeImpl; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; @@ -79,11 +80,12 @@ // Create tree as following : // root // |_ node 1 - // | |_ node 11 + // | |_ node 11 (2) + // | | |_ node 111 (1) // | |_ node 12 - // | | |_ node 121 + // | | |_ node 121 (2) // | |_ node 13 - // |_ node 2 + // |_ node 2 (1) createBranch("root/node1/node11/node111"); createBranch("root/node1/node12/node121"); @@ -172,9 +174,29 @@ String nodeId = node.getId(); Map<TreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); + /* for (Integer count : children.values()) { sum += count; } + */ + + for (Map.Entry<TreeNode, Integer> e : children.entrySet()) { + log.debug("*treeNode = " + e.getKey().getName() + " " + e.getValue() + + " -> " + e.getKey().getAttachment()); + } + + for (TreeNode treeNode : children.keySet()) { + Set<String> treeNodeChildren = treeNode.getAttachment(); + log.debug("+treeNode = " + treeNode.getName() + " " + (treeNodeChildren==null?0:treeNodeChildren.size()) + + " -> " + treeNodeChildren); +// if (treeNodeChildren == null) { +// sum += 0; +// } else { +// sum += treeNodeChildren.size(); +// } + sum += sum(((TreeNodeImpl)treeNode).getWikitty()); + } + return sum; } @@ -341,18 +363,52 @@ Wikitty root = findNode("root"); int childInit = sum(root); - // Remove a value on node2 + // Remove a value on node11 Wikitty node = findNode("node11"); + List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leafs.get(0)); + + leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + log.info("leafs after remove = " + leafs); + ws.store(null, node); + + node = ws.restore(null, node.getId()); + leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + log.info("leafs after restore = " + leafs); // now, there is one more value for the root node int newSum = sum(root); assertEquals(childInit - 1, newSum); } + /** regression test, for unknown reason the child may not be removed in the index */ @Test + public void testSimpleDeleteChild() throws Exception { + + TreeNodeImpl parent = new TreeNodeImpl(); + ws.store(null, parent.getWikitty()); + + TreeNodeImpl child = new TreeNodeImpl(); + child.setParent(parent.getWikittyId()); + ws.store(null, child.getWikitty()); + + Map<TreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null); + + assertEquals(1, children.size()); + assertEquals(0, children.get(child).intValue()); + + child.setParent(null); + + ws.store(null, child.getWikitty()); + + children = ws.restoreChildren(null, parent.getWikittyId(), null); + + assertEquals(0, children.size()); + } + + @Test public void testDeleteValue() throws Exception { // Get the initial number of values for Root node Wikitty root = findNode("root"); Modified: trunk/wikitty-solr-impl/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-solr-impl/src/test/resources/log4j.properties 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-solr-impl/src/test/resources/log4j.properties 2010-09-28 10:05:55 UTC (rev 351) @@ -4,6 +4,6 @@ log4j.appender.logConsole.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n # Configuration by components -log4j.rootLogger=DEBUG, logConsole -log4j.category.org.nuiton.wikitty=DEBUG +log4j.rootLogger=WARN, logConsole +log4j.category.org.nuiton.wikitty=WARN #log4j.category.org.apache.solr=DEBUG Copied: trunk/wikitty-solr-impl/src/test/resources/solrconfig.xml (from rev 347, branches/wikitty-eugene-migration/wikitty-solr-impl/src/test/resources/solrconfig.xml) =================================================================== --- trunk/wikitty-solr-impl/src/test/resources/solrconfig.xml (rev 0) +++ trunk/wikitty-solr-impl/src/test/resources/solrconfig.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -0,0 +1,700 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + +<config> +  + <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError> + +  + <dataDir>${solr.data.dir:./target/tests-temp-dir/solr/data}</dataDir> + + + <indexDefaults> +  + <useCompoundFile>false</useCompoundFile> + + <mergeFactor>10</mergeFactor> +  +  +  + <ramBufferSizeMB>32</ramBufferSizeMB> + <maxMergeDocs>2147483647</maxMergeDocs> + <maxFieldLength>10000</maxFieldLength> + <writeLockTimeout>1000</writeLockTimeout> + <commitLockTimeout>10000</commitLockTimeout> + +  +  +  +  + +  +  + +  + <lockType>simple</lockType> + </indexDefaults> + + <mainIndex> +  + <useCompoundFile>false</useCompoundFile> + <ramBufferSizeMB>32</ramBufferSizeMB> + <mergeFactor>10</mergeFactor> +  +  + <maxMergeDocs>2147483647</maxMergeDocs> + <maxFieldLength>10000</maxFieldLength> + +  + <unlockOnStartup>true</unlockOnStartup> + </mainIndex> + +  + <jmx /> + +  + <updateHandler class="solr.DirectUpdateHandler2"> + +  + +  + +  +  +  + + </updateHandler> + + + <query> +  + <maxBooleanClauses>1024</maxBooleanClauses> + + +  + <filterCache + class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="128"/> + +  + <queryResultCache + class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="32"/> + +  + <documentCache + class="solr.LRUCache" + size="512" + initialSize="512" + autowarmCount="0"/> + +  + <enableLazyFieldLoading>true</enableLazyFieldLoading> + +  +  + +  + +  + <queryResultWindowSize>50</queryResultWindowSize> + +  + <queryResultMaxDocsCached>200</queryResultMaxDocsCached> + +  + <HashDocSet maxSize="3000" loadFactor="0.75"/> + +  +  + <listener event="newSearcher" class="solr.QuerySenderListener"> + <arr name="queries"> + <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst> + <lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst> + <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst> + </arr> + </listener> + +  + <listener event="firstSearcher" class="solr.QuerySenderListener"> + <arr name="queries"> + <lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str> </lst> + <lst><str name="q">static firstSearcher warming query from solrconfig.xml</str></lst> + </arr> + </listener> + +  + <useColdSearcher>false</useColdSearcher> + +  + <maxWarmingSearchers>2</maxWarmingSearchers> + + </query> + +  + <requestDispatcher handleSelect="true" > +  + <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" /> + +  +  + <httpCaching lastModifiedFrom="openTime" + etagSeed="Solr"> +  +  +  + </httpCaching> + </requestDispatcher> + + +  + <requestHandler name="standard" class="solr.SearchHandler" default="true"> +  + <lst name="defaults"> + <str name="echoParams">explicit</str> +  + </lst> + </requestHandler> + + +  + <requestHandler name="dismax" class="solr.SearchHandler" > + <lst name="defaults"> + <str name="defType">dismax</str> + <str name="echoParams">explicit</str> + <float name="tie">0.01</float> + <str name="qf"> + text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 + </str> + <str name="pf"> + text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9 + </str> + <str name="bf"> + ord(popularity)^0.5 recip(rord(price),1,1000,1000)^0.3 + </str> + <str name="fl"> + id,name,price,score + </str> + <str name="mm"> + 2<-1 5<-2 6<90% + </str> + <int name="ps">100</int> + <str name="q.alt">*:*</str> +  + <str name="hl.fl">text features name</str> +  + <str name="f.name.hl.fragsize">0</str> +  + <str name="f.name.hl.alternateField">name</str> + <str name="f.text.hl.fragmenter">regex</str>  + </lst> + </requestHandler> + +  + <requestHandler name="partitioned" class="solr.SearchHandler" > + <lst name="defaults"> + <str name="defType">dismax</str> + <str name="echoParams">explicit</str> + <str name="qf">text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0</str> + <str name="mm">2<-1 5<-2 6<90%</str> +  + <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str> + </lst> +  + <lst name="appends"> + <str name="fq">inStock:true</str> + </lst> +  + <lst name="invariants"> + <str name="facet.field">cat</str> + <str name="facet.field">manu_exact</str> + <str name="facet.query">price:[* TO 500]</str> + <str name="facet.query">price:[500 TO *]</str> + </lst> + </requestHandler> + + +  + +  + <searchComponent name="spellcheck" class="solr.SpellCheckComponent"> + + <str name="queryAnalyzerFieldType">textSpell</str> + + <lst name="spellchecker"> + <str name="name">default</str> + <str name="field">spell</str> + <str name="spellcheckIndexDir">./spellchecker1</str> + + </lst> + <lst name="spellchecker"> + <str name="name">jarowinkler</str> + <str name="field">spell</str> +  + <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str> + <str name="spellcheckIndexDir">./spellchecker2</str> + + </lst> + + <lst name="spellchecker"> + <str name="classname">solr.FileBasedSpellChecker</str> + <str name="name">file</str> + <str name="sourceLocation">spellings.txt</str> + <str name="characterEncoding">UTF-8</str> + <str name="spellcheckIndexDir">./spellcheckerFile</str> + </lst> + </searchComponent> + +  + <requestHandler name="/spellCheckCompRH" class="solr.SearchHandler"> + <lst name="defaults"> +  + <str name="spellcheck.onlyMorePopular">false</str> +  + <str name="spellcheck.extendedResults">false</str> +  + <str name="spellcheck.count">1</str> + </lst> + <arr name="last-components"> + <str>spellcheck</str> + </arr> + </requestHandler> + +  + + +  + + +  + <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" /> + +  + <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" /> + + +  + <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" /> + + +  + <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" /> + +  + <requestHandler name="/admin/ping" class="PingRequestHandler"> + <lst name="defaults"> + <str name="qt">standard</str> + <str name="q">solrpingquery</str> + <str name="echoParams">all</str> + </lst> + </requestHandler> + +  + <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > + <lst name="defaults"> + <str name="echoParams">explicit</str>  + <str name="echoHandler">true</str> + </lst> + </requestHandler> + + <highlighting> +  +  + <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true"> + <lst name="defaults"> + <int name="hl.fragsize">100</int> + </lst> + </fragmenter> + +  + <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter"> + <lst name="defaults"> +  + <int name="hl.fragsize">70</int> +  + <float name="hl.regex.slop">0.5</float> +  + <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str> + </lst> + </fragmenter> + +  + <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true"> + <lst name="defaults"> + <str name="hl.simple.pre"><![CDATA[<em>]]></str> + <str name="hl.simple.post"><![CDATA[</em>]]></str> + </lst> + </formatter> + </highlighting> + + +  + +  + <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter"> + <int name="xsltCacheLifetimeSeconds">5</int> + </queryResponseWriter> + + + <queryParser name="wikitty" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> + +  + +  + +  + <admin> + <defaultQuery>solr</defaultQuery> + +  + </admin> + +</config> Modified: trunk/wikitty-ui-zk/pom.xml =================================================================== --- trunk/wikitty-ui-zk/pom.xml 2010-09-28 09:51:33 UTC (rev 350) +++ trunk/wikitty-ui-zk/pom.xml 2010-09-28 10:05:55 UTC (rev 351) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.2.0-SNAPSHOT</version> </parent>

1 0

r350 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 11:51:33 +0200 (Tue, 28 Sep 2010) New Revision: 350 Url: http://nuiton.org/repositories/revision/wikitty/350 Log: Fix javadoc Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-09-28 09:50:50 UTC (rev 349) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-09-28 09:51:33 UTC (rev 350) @@ -27,7 +27,7 @@ } /** - * visibilie 'default' car est uilise par WikittyServiceCached qui est dans + * Visibilite 'default' car est uilise par WikittyServiceCached qui est dans * le meme package et a priori seulement lui en a besoin * * @return

1 0

r349 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 28 Sep '10

28 Sep '10

Author: echatellier Date: 2010-09-28 11:50:50 +0200 (Tue, 28 Sep 2010) New Revision: 349 Url: http://nuiton.org/repositories/revision/wikitty/349 Log: Rename children to attachment Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-09-27 14:39:06 UTC (rev 348) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-09-28 09:50:50 UTC (rev 349) @@ -218,7 +218,7 @@ /** * Create map from string representation. * - * ex: "String name", "Wikitty children[0-*]" + * ex: "String name", "Wikitty attachment[0-*]" * * @param definitions extension definition * @return extensions map

1 0

r348 - in trunk/wikitty-jdbc-impl/src/main: java/org/nuiton/wikitty/jdbc resources
by echatellier＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: echatellier Date: 2010-09-27 16:39:06 +0200 (Mon, 27 Sep 2010) New Revision: 348 Url: http://nuiton.org/repositories/revision/wikitty/348 Log: Clear deletionDate column during store Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-27 08:59:55 UTC (rev 347) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-09-27 14:39:06 UTC (rev 348) @@ -274,7 +274,7 @@ // update extensions in wikitty object String q = conf.getProperty(QUERY_UPDATE_WIKITTY_ADMIN); - doQuery(connection, q, newVersion, extensionList, wikitty.getId()); + doQuery(connection, q, newVersion, extensionList, null, wikitty.getId()); wikitty.setVersion(newVersion); wikitty.clearDirty(); Modified: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-09-27 08:59:55 UTC (rev 347) +++ trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2010-09-27 14:39:06 UTC (rev 348) @@ -62,7 +62,7 @@ (id, version, extension_list) VALUES (?, ?, ?); #wikitty update in the admin table query jdbc.queries.update.wikitty.admin=UPDATE wikitty_admin \ -SET version = ?, extension_list = ? WHERE id = ?; +SET version = ?, extension_list = ?, deletionDate = ? WHERE id = ?; #wikitty insertion in the data table query jdbc.queries.insert.wikitty.data=INSERT INTO wikitty_data\ (id, fieldName, %s) VALUES (?, ?, ?);

1 0

r347 - in trunk: src/site src/site/rst wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/xmi wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-api/src/test/java/org/nuiton/wikitty/importexport wikitty-api/src/test/resources/csv wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test
by echatellier＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: echatellier Date: 2010-09-27 10:59:55 +0200 (Mon, 27 Sep 2010) New Revision: 347 Url: http://nuiton.org/repositories/revision/wikitty/347 Log: Rename TreeNode#children to "attachment" Added: trunk/src/site/rst/changes.rst Removed: trunk/src/site/rst/gwt.rst Modified: trunk/src/site/site.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/xmi/wikitty.zargo trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/resources/csv/importtree.csv trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Added: trunk/src/site/rst/changes.rst =================================================================== --- trunk/src/site/rst/changes.rst (rev 0) +++ trunk/src/site/rst/changes.rst 2010-09-27 08:59:55 UTC (rev 347) @@ -0,0 +1,14 @@ +Changes +======= + +TreeNode +-------- + +Since 2.2, attribute "children" in tree node has been renamed to "attachment" +du to confusion between attached wikitty and sub node children. + +TreeNode extension version has been increased to ``2.0``. + +You will need to migrate_ your wikitties. + +.. _migrate: migration.html \ No newline at end of file Deleted: trunk/src/site/rst/gwt.rst =================================================================== --- trunk/src/site/rst/gwt.rst 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/src/site/rst/gwt.rst 2010-09-27 08:59:55 UTC (rev 347) @@ -1,12 +0,0 @@ -Probleme -======== - -GWT ne support pas: -- BigDecimal - le plus gros probleme -- PropertyChangeSupport - normalement il est possible de l'utiliser en ajouter des choses a GWT (voir avec Nicolas C.) -- Pattern - a ete deplace dans des methodes util -- String.format - peut-etre remplace par une methode util dans wikitty car seulement utilise pour les messages d'erreur avec des arguments (donc toString sur les arguments si non null) Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/src/site/site.xml 2010-09-27 08:59:55 UTC (rev 347) @@ -11,9 +11,9 @@ <body> <menu name="Overview"> <item name="Accueil" href="index.html"/> + <item name="Changes" href="changes.html"/> <item name="Migration" href="migration.html"/> <item name="Hessian" href="hessian.html"/> - <item name="GWT problem" href="gwt.html"/> <item name="TODO" href="todo.html"/> </menu> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-09-27 08:59:55 UTC (rev 347) @@ -535,14 +535,14 @@ } // Store node with have deleted child - criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_CHILDREN, id).criteria(); + criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT, id).criteria(); wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { if(!ids.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); - TreeNodeHelper.removeChildren(treeNode, id); + TreeNodeHelper.removeAttachment(treeNode, id); storedWikitties.add(treeNode); } } Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ) Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -425,6 +425,6 @@ WikittyExtension wikittyExtension = TreeNodeAbstract.extensionTreeNode; Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_PARENT).getType()); Assert.assertEquals(TYPE.STRING, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_NAME).getType()); - Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_CHILDREN).getType()); + Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_ATTACHMENT).getType()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -467,7 +467,7 @@ } fail( "Unable to find node " + nodeName + " inside " + currentNode.getName() ); } - currentNode.addChildren( wikitty.getId() ); + currentNode.addAttachment(wikitty.getId()); ws.store(null, currentNode.getWikitty()); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -182,7 +182,7 @@ PagedResult<TreeNode> pagedResult3 = proxy.findAllByCriteria(TreeNode.class, criteria3); Assert.assertEquals(1, pagedResult3.getNumFound()); TreeNode myTreeNode = pagedResult3.getFirst(); - Assert.assertEquals(1, myTreeNode.getChildren().size()); + Assert.assertEquals(1, myTreeNode.getAttachment().size()); // test des requetes imbriquées Criteria criteria4 = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, myTreeNode.getWikittyId()).criteria(); Modified: trunk/wikitty-api/src/test/resources/csv/importtree.csv =================================================================== --- trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-09-27 08:59:55 UTC (rev 347) @@ -1,3 +1,3 @@ -"Wikitty.Id","Wikitty.Ext","TreeNode.name","TreeNode.parent","TreeNode.children" +"Wikitty.Id","Wikitty.Ext","TreeNode.name","TreeNode.parent","TreeNode.attachment" "4f6fc798-41f8-48d7-9398-119ef6ab02b6",,"MyRootNode",, "1142aa4c-af5a-4264-9918-9f72d9ef9d59","Tag","MyTreeNode","4f6fc798-41f8-48d7-9398-119ef6ab02b6","(fbcc8aed-7f67-4e3c-a9aa-221373765f8d),(677ee1e7-239f-416c-a353-6e56bc0451e2)" Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-09-27 08:59:55 UTC (rev 347) @@ -180,51 +180,51 @@ parents = new HashMap<String, String>(); } - public void putIncludedChildren(String nodeId, Collection<String> childIds) { - putChildren(includedNodeIds, nodeId, childIds); + public void putIncludedAttachments(String nodeId, Collection<String> attchmentIds) { + putAttachements(includedNodeIds, nodeId, attchmentIds); } - public void putExcludedChildren(String nodeId, Collection<String> childIds) { - putChildren(excludedNodeIds, nodeId, childIds); + public void putExcludedAttachments(String nodeId, Collection<String> attachmentIds) { + putAttachements(excludedNodeIds, nodeId, attachmentIds); } - public void putIncludedChild(String nodeId, String childId) { - putChild(includedNodeIds, nodeId, childId); + public void putIncludedAttachment(String nodeId, String attachmentId) { + putAttachment(includedNodeIds, nodeId, attachmentId); } - public void putExcludedChild(String nodeId, String childId) { - putChild(excludedNodeIds, nodeId, childId); + public void putExcludedAttachment(String nodeId, String attachmentId) { + putAttachment(excludedNodeIds, nodeId, attachmentId); } - public Collection<String> getExcludedNodeIds(String childId) { - Collection<String> result = excludedNodeIds.get(childId); - if(result == null) { + public Collection<String> getExcludedNodeIds(String attachmentId) { + Collection<String> result = excludedNodeIds.get(attachmentId); + if (result == null) { result = new HashSet<String>(); } return result; } - public Collection<String> getIncludedNodeIds(String childId) { - Collection<String> result = includedNodeIds.get(childId); - if(result == null) { + public Collection<String> getIncludedNodeIds(String attachmentId) { + Collection<String> result = includedNodeIds.get(attachmentId); + if (result == null) { result = new HashSet<String>(); } return result; } - protected void putChildren(Map<String, Collection<String>> map, String nodeId, Collection<String> childIds) { - if(childIds != null) { - for (String childId : childIds) { - putChild(map, nodeId, childId); + protected void putAttachements(Map<String, Collection<String>> map, String nodeId, Collection<String> attachmentIds) { + if (attachmentIds != null) { + for (String attachmentId : attachmentIds) { + putAttachment(map, nodeId, attachmentId); } } } - protected void putChild(Map<String, Collection<String>> map, String nodeId, String childId) { - Collection<String> values = map.get(childId); + protected void putAttachment(Map<String, Collection<String>> map, String nodeId, String attachmentId) { + Collection<String> values = map.get(attachmentId); if(values == null) { values = new HashSet<String>(); - map.put(childId, values); + map.put(attachmentId, values); } values.add(nodeId); } @@ -310,7 +310,7 @@ Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_CHILDREN + ":" + id); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_ATTACHMENT + ":" + id); QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -519,24 +519,24 @@ for (Wikitty w : wikitties) { String id = w.getId(); - if(w.hasExtension(TreeNode.EXT_TREENODE)) { + if (w.hasExtension(TreeNode.EXT_TREENODE)) { - Set<String> children = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); - reindexChildTreeNode.putIncludedChildren(id, children); + Set<String> attachments = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children SolrDocument treeNodeDoc = findById(id); - if(treeNodeDoc != null) { - Collection oldChildren = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_CHILDREN); - if(oldChildren != null) { + if (treeNodeDoc != null) { + Collection oldAttachments = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT); + if (oldAttachments != null) { // if no more children, remove all old children - if(children == null) { - reindexChildTreeNode.putExcludedChildren(id, oldChildren); + if(attachments == null) { + reindexChildTreeNode.putExcludedAttachments(id, oldAttachments); } else { // exclude only the removed children - for (Object oldChild : oldChildren) { - if(!children.contains(oldChild)) { - reindexChildTreeNode.putExcludedChild(id,(String) oldChild); + for (Object oldAttachment : oldAttachments) { + if(!attachments.contains(oldAttachment)) { + reindexChildTreeNode.putExcludedAttachment(id,(String) oldAttachment); } } } @@ -580,7 +580,7 @@ for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { SolrDocument solrDocument = iterator.next(); String childId = (String) solrDocument.getFieldValue(SOLR_ID); - reindexChildTreeNode.putExcludedChild(id, childId); + reindexChildTreeNode.putExcludedAttachment(id, childId); } solrResource.deleteDoc(id); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-09-27 08:53:29 UTC (rev 346) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-09-27 08:59:55 UTC (rev 347) @@ -133,7 +133,7 @@ Wikitty node = findNode(nodeName); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); } @@ -163,7 +163,7 @@ // Sum value in node Set<String> values = node.getFieldAsSet(TreeNode.EXT_TREENODE, - TreeNode.FIELD_TREENODE_CHILDREN, String.class); + TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); if(values != null) { sum = values.size(); } @@ -292,7 +292,7 @@ // Add it in the node2 (now: two values in it) Wikitty node = findNode("node2"); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leaf.getId()); + node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); // now, there is one more value for the root node @@ -343,8 +343,8 @@ // Remove a value on node2 Wikitty node = findNode("node11"); - List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, String.class); - node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, leafs.get(0)); + List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leafs.get(0)); ws.store(null, node); // now, there is one more value for the root node @@ -405,11 +405,11 @@ String valueId = value.getId(); Wikitty node31 = findNode("node31"); - node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); + node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); ws.store(null, node31); Wikitty node32 = findNode("node32"); - node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_CHILDREN, valueId); + node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); ws.store(null, node32); Wikitty node3 = findNode("node3");

1 0