Author: bpoussin Date: 2012-08-07 16:01:14 +0200 (Tue, 07 Aug 2012) New Revision: 1494 Url: http://nuiton.org/repositories/revision/wikitty/1494 Log: Evolution #2232: BusinessEntity with Wikitty Field must be capable to use preload for this field Evolution #2233: Wikitty and BusinessEntity interface must have same methods name for same behaviour Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorisation.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyClient.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -350,7 +350,7 @@ // on met les objets restore dans available pour la prochaine fois for (Wikitty wikitty : restored) { if (wikitty != null) { - available.put(wikitty.getId(), wikitty); + available.put(wikitty.getWikittyId(), wikitty); } } result.addAll(restored); @@ -377,7 +377,7 @@ // par recursion (nextPattern) String nextPattern = StringUtils.substringAfter(preloadPattern, ","); - String wid = w.getId(); + String wid = w.getWikittyId(); for (String fqField : w.fieldNames()) { // si le couple wid + fqField n'a pas encore ete traite on le fait if (!loaded.contains(wid + "+" + fqField)) { @@ -439,7 +439,7 @@ Map<String, Wikitty> available = new HashMap<String, Wikitty>(); for (Wikitty w : wikitties) { if (w != null) { - available.put(w.getId(), w); + available.put(w.getWikittyId(), w); if (StringUtils.isNotBlank(patterns)) { // lorsqu'on apelle la methode pour le store, le preloadPattern // est vide mais il ne faut pas perdre ce qu'il y avait avant @@ -1545,7 +1545,7 @@ } //manually set version - result.setVersion(entity.getWikittyVersion()); + result.setWikittyVersion(entity.getWikittyVersion()); } timeLog.log(start, "getWikitty"); @@ -1574,7 +1574,7 @@ if (group != null && user != null) { result = WikittySecurityUtil.isMember(wikittyService, securityToken, - user.getWikittyId(), group.getId()); + user.getWikittyId(), group.getWikittyId()); } timeLog.log(start, "isMember"); @@ -1685,7 +1685,7 @@ for(int i=0; i<entities.length; i++) { if (wikitties[i] != null) { // le wikitty peut etre null, par exemple a cause de la security - wikitties[i].setVersion(entities[i].getWikittyVersion()); + wikitties[i].setWikittyVersion(entities[i].getWikittyVersion()); } } } catch (Exception eee) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -1463,7 +1463,7 @@ if (group != null && user != null) { result = WikittySecurityUtil.isMember(wikittyService, securityToken, - user.getWikittyId(), group.getId()); + user.getWikittyId(), group.getWikittyId()); } timeLog.log(start, "isMember"); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -594,7 +594,7 @@ if (value instanceof String) { result = (String) value; } else if (value instanceof WikittyImpl) { - result = ((Wikitty) value).getId(); + result = ((Wikitty) value).getWikittyId(); } else if (value instanceof BusinessEntity) { result = ((BusinessEntity) value).getWikittyId(); } else if (value instanceof Date) { @@ -656,7 +656,7 @@ if (value instanceof String) { result = (String) value; } else if (value instanceof Wikitty) { - result = ((Wikitty) value).getId(); + result = ((Wikitty) value).getWikittyId(); } else if (value instanceof BusinessEntity) { result = ((BusinessEntity) value).getWikittyId(); } else { @@ -1052,7 +1052,7 @@ } if (upgradeData) { - String wikittyId = wikitty.getId(); + String wikittyId = wikitty.getWikittyId(); result = WikittyServiceEnhanced.restore( wikittyService, securityToken, wikittyId); } @@ -1231,7 +1231,7 @@ @SuppressWarnings({"unchecked"}) public static <E> E getFieldValueFromFQFieldName(String fqField, BusinessEntity entity) { - return (E) entity.getField(WikittyUtil.getExtensionNameFromFQFieldName(fqField), + return (E) entity.getFieldAsObject(WikittyUtil.getExtensionNameFromFQFieldName(fqField), WikittyUtil.getFieldNameFromFQFieldName(fqField)); } @@ -1371,7 +1371,7 @@ } //manually set version - result.setVersion(entity.getWikittyVersion()); + result.setWikittyVersion(entity.getWikittyVersion()); } return result; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -283,7 +283,7 @@ correctQueries = false; } else { - resultValue += separator + wikitty.getId(); + resultValue += separator + wikitty.getWikittyId(); separator = ","; } } @@ -339,7 +339,7 @@ String[] wikittyField = new String[extensionHeader.size()]; // first, add technical id - wikittyField[extensionHeader.indexOf(FIELD_WIKITTY_ID)] = w.getId(); + wikittyField[extensionHeader.indexOf(FIELD_WIKITTY_ID)] = w.getWikittyId(); // second, add technical ext list Collection<String> extNamesCollection = w.getExtensionNames(); String extNames = StringUtils.join(extNamesCollection, ','); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportXML.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -116,7 +116,7 @@ client.storeExtension(Collections.singleton(ext)); ext = null; } else if ("object".equals(name)) { - w.setVersion(objectVersion); + w.setWikittyVersion(objectVersion); client.getWikittyService().store(client.getSecurityToken(), Collections.singleton(w), true); w = null; @@ -179,7 +179,7 @@ // delete first ',' extensionList = extensionList.substring(1); } - result.write(" <object id='" + w.getId() + "' version='" + w.getVersion() + "' extensions='" + extensionList + "'>\n"); + result.write(" <object id='" + w.getWikittyId() + "' version='" + w.getWikittyVersion() + "' extensions='" + extensionList + "'>\n"); for (String fieldName : w.fieldNames()) { FieldType type = w.getFieldType(fieldName); if (type.isCollection()) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntity.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -81,11 +81,22 @@ /** * Return field value for the specific extension and field. - * + * * @param ext extension * @param fieldName field name * @return field value */ + public Object getFieldAsObject(String ext, String fieldName); + + /** + * Return field value for the specific extension and field. + * + * @param ext extension + * @param fieldName field name + * @return field value + * @deprecated use getFieldAsObject + */ + @Deprecated public Object getField(String ext, String fieldName); /** Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/BusinessEntityImpl.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -78,19 +78,19 @@ @Override public String getWikittyId() { - String result = getWikitty().getId(); + String result = getWikitty().getWikittyId(); return result; } @Override public String getWikittyVersion() { - String result = getWikitty().getVersion(); + String result = getWikitty().getWikittyVersion(); return result; } @Override public void setWikittyVersion(String version) { - getWikitty().setVersion(version); + getWikitty().setWikittyVersion(version); } public void setWikitty(Wikitty wikitty) { @@ -140,12 +140,17 @@ } @Override - public Object getField(String ext, String fieldName) { + public Object getFieldAsObject(String ext, String fieldName) { Object result = getWikitty().getFieldAsObject(ext, fieldName); return result; } @Override + public Object getField(String ext, String fieldName) { + return getFieldAsObject(ext, fieldName); + } + + @Override public void setField(String ext, String fieldName, Object value) { getWikitty().setField(ext, fieldName, value); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -29,12 +29,9 @@ import java.math.BigDecimal; import java.util.Collection; import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.nuiton.wikitty.generator.WikittyTagValue; /** * Wikitty object, containing data as map. @@ -139,12 +136,24 @@ /** * Get wikkity id. - * + * * @return wikytty id + * @deprecated use getWikittyIdNNN */ + @Deprecated String getId(); + /** + * Get wikkity id. + * + * @return wikytty id + * @since 3.8 + */ + String getWikittyId(); + + + /** * Return {@code true} is wikitty is deleted. * * @return {@code true} is wikitty is deleted @@ -243,6 +252,14 @@ Collection<WikittyExtension> getExtensions(); /** + * Retourne tous les noms de champs pour un nom d'extension donne. + * @param ext le nom de l'extension + * @return la liste des noms de champs + * @since 3.8 + */ + Collection<String> getExtensionFields(String ext); + + /** * Recherche toutes les extensions de ce wikitty qui dependent d'une * extension particuliere * @@ -410,15 +427,37 @@ */ Object getFqField(String fqFieldName); + /** + * + * @deprecated use getWikittyVersionNNN + */ + @Deprecated String getVersion(); /** + * Return wikitty version (x.y). + * + * @return wikitty version + * @since 3.8 + */ + String getWikittyVersion(); + + /** * Server only used * @param version + * @deprecated use setWikittyVersionNNN */ + @Deprecated void setVersion(String version); /** + * Server only used + * @param version + * @since 3.8 + */ + void setWikittyVersion(String version); + + /** * get the field modified after wikitty was restored * @return a set of fully qualified field names * @since 2.2.0 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -96,7 +96,7 @@ @Override public void addPreloaded(Wikitty w) { if (w != null) { - if (!getPreloaded().containsKey(w.getId())) { + if (!getPreloaded().containsKey(w.getWikittyId())) { substituteTargetWithCopy(); target.addPreloaded(w); } @@ -209,9 +209,13 @@ @Override public String getId() { - return target.getId(); + return target.getWikittyId(); } + public String getWikittyId() { + return target.getWikittyId(); + } + @Override public boolean isDeleted() { return target.isDeleted(); @@ -272,6 +276,12 @@ } @Override + public Collection<String> getExtensionFields(String ext) { + Collection<String> result = target.getExtension(ext).getFieldNames(); + return result; + } + + @Override public Collection<WikittyExtension> getExtensions() { return target.getExtensions(); } @@ -448,15 +458,26 @@ @Override public String getVersion() { - return target.getVersion(); + return target.getWikittyVersion(); } @Override public void setVersion(String version) { substituteTargetWithCopy(); - target.setVersion(version); + target.setWikittyVersion(version); } + @Override + public String getWikittyVersion() { + return target.getWikittyVersion(); + } + + @Override + public void setWikittyVersion(String version) { + substituteTargetWithCopy(); + target.setWikittyVersion(version); + } + /** * @see org.nuiton.wikitty.Wikitty#getDirty() */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -6,7 +6,7 @@ * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% + * %%gete * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as * published by the Free Software Foundation, either version 3 of the @@ -184,7 +184,7 @@ if (preloaded == null) { preloaded = new HashMap<String, Wikitty>(); } - this.preloaded.put(w.getId(), w); + this.preloaded.put(w.getWikittyId(), w); } } @@ -219,8 +219,7 @@ // all time search for WikittyImpl to do copy (prevent error) if (w instanceof WikittyCopyOnWrite) { replaceWith(((WikittyCopyOnWrite)w).getTarget(), force); - } - if (force || this.getId().equals(w.getId())) { + } else if (force || this.getWikittyId().equals(w.getWikittyId())) { // poussin 20120305 quid des listeners ? ne faudrait-il pas les copier aussi ? // mais si on les copie, comment l'utilisateur sera-t-il qu'il faut les supprimer // ne risque t-il pas d'y avoir des listeners recevant trop de notification. @@ -260,7 +259,7 @@ if (!force) { // we must change version after field value copy, because // copy increment version because it use setField method - this.version = w.getVersion(); + this.version = w.getWikittyVersion(); this.deleteDate = w.getDeleteDate(); } @@ -322,13 +321,18 @@ } /* - * @see org.nuiton.wikitty.Wikitty#getId() + * @see org.nuiton.wikitty.Wikitty#getWikittyId() */ @Override public String getId() { return id; } + @Override + public String getWikittyId() { + return id; + } + /* * @see org.nuiton.wikitty.Wikitty#isDeleted() */ @@ -498,6 +502,12 @@ return result; } + @Override + public Collection<String> getExtensionFields(String ext) { + Collection<String> result = getExtension(ext).getFieldNames(); + return result; + } + /* * @see org.nuiton.wikitty.Wikitty#getExtensions() */ @@ -1029,7 +1039,7 @@ boolean result = false; if (obj instanceof Wikitty) { Wikitty other = (Wikitty) obj; - result = id.equals(other.getId()); + result = id.equals(other.getWikittyId()); } return result; } @@ -1075,7 +1085,7 @@ public Object getFqField(String fqFieldName) { Object result; if (Element.ID.getValue().equalsIgnoreCase(fqFieldName)) { - result = getId(); + result = getWikittyId(); } else if (Element.ID.getValue().equalsIgnoreCase(fqFieldName)) { result = getExtensionNames(); } else { @@ -1085,7 +1095,7 @@ } /* - * @see org.nuiton.wikitty.Wikitty#getVersion() + * @see org.nuiton.wikitty.Wikitty#getWikittyVersion() */ @Override public String getVersion() { @@ -1093,13 +1103,23 @@ } /* - * @see org.nuiton.wikitty.Wikitty#setVersion(java.lang.String) + * @see org.nuiton.wikitty.Wikitty#setWikittyVersion(java.lang.String) */ @Override public void setVersion(String version) { this.version = version; } + @Override + public String getWikittyVersion() { + return version; + } + + @Override + public void setWikittyVersion(String version) { + this.version = version; + } + /** * @see Wikitty#getDirty() */ @@ -1171,7 +1191,7 @@ @Override public String toStringAllField() { boolean cr = true; - String str = "[" + getId() + ":" + getVersion() + "] {"; + String str = "[" + getWikittyId() + ":" + getWikittyVersion() + "] {"; for ( String extName : getExtensionNames() ) { WikittyExtension ext = getExtension(extName); str += (cr ? "\n" : "") + "\t* " + extName + "\n"; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheJCS.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -147,9 +147,9 @@ if (Collections.disjoint(priorityExtensions,e.getExtensionNames())) { // le wikitty ne contient pas d'extension prioritaire // on le met dans le cache commun - wikittyCache.put(e.getId(), e); + wikittyCache.put(e.getWikittyId(), e); } else { - priorityCache.put(e.getId(), e); + priorityCache.put(e.getWikittyId(), e); } } catch (CacheException eee) { log.error(String.format("Can't put wikitty %s in cache", e), eee); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyCacheSimple.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -137,9 +137,9 @@ if (Collections.disjoint(priorityExtensions, e.getExtensionNames())) { // le wikitty ne contient pas d'extension prioritaire // on le met dans le cache commun - wikittyCache.put(e.getId(), e); + wikittyCache.put(e.getWikittyId(), e); } else { - priorityCache.put(e.getId(), e); + priorityCache.put(e.getWikittyId(), e); } } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyEvent.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -184,7 +184,7 @@ wikitties = new LinkedHashMap<String, Wikitty>(); addType(WikittyEventType.PUT_WIKITTY); } - this.wikitties.put(wikitty.getId(), wikitty); + this.wikitties.put(wikitty.getWikittyId(), wikitty); } public Map<String, Date> getRemoveDate() { @@ -270,7 +270,7 @@ public Wikitty update(Wikitty e) { if (e != null) { // update version - String id = e.getId(); + String id = e.getWikittyId(); if (type.contains(WikittyEventType.CLEAR_WIKITTY)) { e = null; } else { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyExtensionMigrationRename.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -84,11 +84,11 @@ public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { - String wikittyId = wikitty.getId(); - String wikittyVersion = wikitty.getVersion(); + String wikittyId = wikitty.getWikittyId(); + String wikittyVersion = wikitty.getWikittyVersion(); Wikitty result = new WikittyImpl(wikittyId); - result.setVersion(wikittyVersion); + result.setWikittyVersion(wikittyVersion); // Add all extension and replaceWith old by the new for (WikittyExtension extension : wikitty.getExtensions()) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittySecurityHelper.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -72,7 +72,7 @@ Wikitty user = proxy.findByCriteria(Search.query().eq( WikittyUser.FQ_FIELD_WIKITTYUSER_LOGIN, login).criteria()); if (user != null) { - userWikittyId = user.getId(); + userWikittyId = user.getWikittyId(); } return userWikittyId; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAccessStat.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -179,7 +179,7 @@ Collection<String> exts = null; if (o instanceof Wikitty) { Wikitty w = ((Wikitty)o); - id = w.getId(); + id = w.getWikittyId(); exts = w.getExtensionNames(); } else if (o instanceof BusinessEntity) { BusinessEntity e = ((BusinessEntity) o); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthenticationAbstract.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -101,7 +101,7 @@ // on recherche si l'utilisateur n'est pas deja authentifier. // s'il l'est on lui retourne le meme token. WikittyQuery query = new WikittyQueryMaker() - .eq(WikittyToken.ELEMENT_FIELD_WIKITTYTOKEN_USER, user.getId()) + .eq(WikittyToken.ELEMENT_FIELD_WIKITTYTOKEN_USER, user.getWikittyId()) .end() .setLimit(1); @@ -122,7 +122,7 @@ Wikitty wikittyToken = new WikittyImpl(tokenId); // force add extension to wikitty WikittyTokenHelper.addExtension(wikittyToken); - WikittyTokenHelper.setUser(wikittyToken, user.getId()); + WikittyTokenHelper.setUser(wikittyToken, user.getWikittyId()); WikittyTokenHelper.setDate(wikittyToken, new Date()); getDelegate().store(null, Arrays.asList(wikittyToken), false); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorisation.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorisation.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceAuthorisation.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -207,7 +207,7 @@ } // usual case, a user want to store a wikitty Wikitty oldVersion = WikittyServiceEnhanced.restore( - getDelegate(), securityToken, wikitty.getId()); + getDelegate(), securityToken, wikitty.getWikittyId()); Collection<String> newExtensions = new ArrayList<String>( wikitty.getExtensionNames()); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceCached.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -207,20 +207,20 @@ w = ((WikittyCopyOnWrite) w).getTarget(); } - Wikitty old = cache.getWikitty(w.getId()); + Wikitty old = cache.getWikitty(w.getWikittyId()); if (old == null - || WikittyUtil.versionGreaterThan(w.getVersion(), old.getVersion())) { + || WikittyUtil.versionGreaterThan(w.getWikittyVersion(), old.getWikittyVersion())) { cache.putWikitty(w); if (log.isTraceEnabled()) { - log.trace("Replace cached wikitty : new version " + w.getVersion() - + " > old version " + (old == null ? null : old.getVersion())); + log.trace("Replace cached wikitty : new version " + w.getWikittyVersion() + + " > old version " + (old == null ? null : old.getWikittyVersion())); } } else { if (log.isTraceEnabled()) { log.trace(String.format( "Ignoring putWikittyEvent : new version %s < old version %s", - w.getVersion(), old.getVersion())); + w.getWikittyVersion(), old.getWikittyVersion())); } } } @@ -385,7 +385,7 @@ // wrap new new retrieved wikitties w = wrapWikitty(w); - fromCache.put(w.getId(), w); + fromCache.put(w.getWikittyId(), w); } } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -179,7 +179,7 @@ Wikitty wikittyToken = new WikittyImpl(tokenId); // force add extension to wikitty WikittyTokenHelper.addExtension(wikittyToken); - WikittyTokenHelper.setUser(wikittyToken, user.getId()); + WikittyTokenHelper.setUser(wikittyToken, user.getWikittyId()); WikittyTokenHelper.setDate(wikittyToken, new Date()); getDelegate().store(null, Arrays.asList(wikittyToken), false); if (log.isDebugEnabled()) { @@ -304,7 +304,7 @@ } // usual case, a user want to store a wikitty Wikitty oldVersion = WikittyServiceEnhanced.restore( - getDelegate(), securityToken, wikitty.getId()); + getDelegate(), securityToken, wikitty.getWikittyId()); Collection<String> newExtensions = new ArrayList<String>( wikitty.getExtensionNames()); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -1340,7 +1340,7 @@ } if (e.getType().contains(WikittyEvent.WikittyEventType.PUT_WIKITTY)) { for (Wikitty w : e.getWikitties().values()) { - toAddWikitty.put(w.getId(), w); + toAddWikitty.put(w.getWikittyId(), w); } } if (e.getType().contains(WikittyEvent.WikittyEventType.REMOVE_WIKITTY)) { Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -339,7 +339,7 @@ int totalResult = 0; for (Wikitty w : wikitties) { - String id = w.getId(); + String id = w.getWikittyId(); Condition c = query.getCondition(); if (!w.isDeleted()) { if (checkRestriction(this, transaction, c, w)) { @@ -714,7 +714,7 @@ org.nuiton.wikitty.entities.Element e, Map<String, Collection> values) { if (e instanceof ElementId) { - values.put(e.getValue(), Collections.singleton(w.getId())); + values.put(e.getValue(), Collections.singleton(w.getWikittyId())); } else if (e instanceof ElementExtension) { values.put(e.getValue(), w.getExtensionNames()); } else { @@ -1358,10 +1358,10 @@ switch (restriction.getName()) { case NOT_EQUALS: - checked = !w.getId().equals(binOp.getValue()); + checked = !w.getWikittyId().equals(binOp.getValue()); break; case EQUALS: - checked = w.getId().equals(binOp.getValue()); + checked = w.getWikittyId().equals(binOp.getValue()); break; } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -62,12 +62,12 @@ } String actualVersion = null; Date deletionDate = null; - Wikitty inMemoryWikitty = this.wikitties.get(wikitty.getId()); + Wikitty inMemoryWikitty = this.wikitties.get(wikitty.getWikittyId()); if (inMemoryWikitty != null) { - actualVersion = inMemoryWikitty.getVersion(); + actualVersion = inMemoryWikitty.getWikittyVersion(); deletionDate = inMemoryWikitty.getDeleteDate(); } - String requestedVersion = wikitty.getVersion(); + String requestedVersion = wikitty.getWikittyVersion(); String newVersion = null; if (force) { // requestedVersion is never null @@ -86,15 +86,15 @@ // no modification, continue continue; } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { - throw new WikittyObsoleteException(String.format("Your wikitty '%s' is obsolete", wikitty.getId())); + throw new WikittyObsoleteException(String.format("Your wikitty '%s' is obsolete", wikitty.getWikittyId())); } else { newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } } - wikitty.setVersion(newVersion); + wikitty.setWikittyVersion(newVersion); wikitty.clearDirty(); try { - this.wikitties.put(wikitty.getId(), wikitty.clone()); + this.wikitties.put(wikitty.getWikittyId(), wikitty.clone()); } catch (CloneNotSupportedException eee) { throw new WikittyException("Can't clone ?", eee); } @@ -152,7 +152,7 @@ public void scanWikitties(WikittyTransaction transaction, Scanner scanner) { Collection<Wikitty> all = wikitties.values(); for (Wikitty wikitty : all) { - scanner.scan(wikitty.getId()); + scanner.scan(wikitty.getWikittyId()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientAbstractTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -281,10 +281,10 @@ moviesNode.setParent(mediaNode.getWikittyId()); CatalogNode actionNode = new CatalogNodeImpl("Action"); actionNode.setParent(moviesNode.getWikittyId()); - actionNode.addAttachment(dieHardMovie.getId(), dnrMovie.getId()); + actionNode.addAttachment(dieHardMovie.getWikittyId(), dnrMovie.getWikittyId()); CatalogNode biopicNode = new CatalogNodeImpl("Biopic"); biopicNode.setParent(moviesNode.getWikittyId()); - biopicNode.addAttachment(edgarMovie.getId()); + biopicNode.addAttachment(edgarMovie.getWikittyId()); CatalogNode otherNode = new CatalogNodeImpl("Everything else"); otherNode.setParent(catalogNode.getWikittyId()); client.store(catalogNode, mediaNode, bookNode, bdNode, newsNode, Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -101,7 +101,7 @@ w.addExtension(MEDIA_EXTENSION); w.addExtension(MOVIE_EXTENSION); - String id = w.getId(); + String id = w.getWikittyId(); wikittyClient.store(w); w = wikittyClient.restore(id); Assert.assertTrue(w.hasExtension(MOVIE_EXTENSION_NAME)); @@ -204,9 +204,9 @@ wikittyClient.store(gf1Movie, gf2Movie, gf3Movie); List<String> ids = new ArrayList<String>(); - ids.add(gf1Movie.getId()); - ids.add(gf2Movie.getId()); - ids.add(gf3Movie.getId()); + ids.add(gf1Movie.getWikittyId()); + ids.add(gf2Movie.getWikittyId()); + ids.add(gf3Movie.getWikittyId()); List<Wikitty> wikitties = wikittyClient.restore(ids); @@ -218,10 +218,10 @@ @Test public void testStorageRestoreSingle() throws Exception { Wikitty w = new WikittyImpl(); - String id = w.getId(); + String id = w.getWikittyId(); wikittyClient.store(w); w = wikittyClient.restore(id); - Assert.assertEquals(id, w.getId()); + Assert.assertEquals(id, w.getWikittyId()); } @Test @@ -269,12 +269,12 @@ w.addToField("TestConstraint", "ext", "titi"); // titi ne doit pas s'ajouter w = wikittyClient.store(w); - Wikitty w2 = wikittyClient.restore(w.getId()); + Wikitty w2 = wikittyClient.restore(w.getWikittyId()); w2.addToField("TestConstraint", "ext", "tata"); // tata ne doit pas s'ajouter w2.addToField("TestConstraint", "ext", "toto"); wikittyClient.store(w2); - Wikitty w3 = wikittyClient.restore(w.getId()); + Wikitty w3 = wikittyClient.restore(w.getWikittyId()); Set<String> set = new HashSet<String>(Arrays.asList("tata", "titi", "toto")); Assert.assertEquals(set, w3.getFieldAsSet("TestConstraint", "ext", String.class)); @@ -379,10 +379,10 @@ gf1Movie.setField(MOVIE_EXTENSION_NAME, "name", "The godfather"); gf1Movie.addToField(MOVIE_EXTENSION_NAME, "authors", "Coppola"); gf1Movie.setField(MOVIE_EXTENSION_NAME, "date", WikittyUtil.formatDate(df.parse("March 15, 1972"))); - String oldVersion = gf1Movie.getVersion(); + String oldVersion = gf1Movie.getWikittyVersion(); Wikitty newWik = wikittyClient.store(gf1Movie); - Assert.assertTrue(WikittyUtil.versionGreaterThan(newWik.getVersion(), oldVersion)); + Assert.assertTrue(WikittyUtil.versionGreaterThan(newWik.getWikittyVersion(), oldVersion)); // search test Wikitty w = new WikittyImpl(); @@ -395,7 +395,7 @@ Assert.assertEquals(w.getFieldAsString(MOVIE_EXTENSION_NAME, "name"), resultFind.getFieldAsString(MOVIE_EXTENSION_NAME, "name")); - Assert.assertEquals(gf1Movie.getId(), resultFind.getId()); + Assert.assertEquals(gf1Movie.getWikittyId(), resultFind.getWikittyId()); // test equals implantation method Assert.assertEquals(gf1Movie, resultFind); @@ -408,12 +408,12 @@ // test to find deleted wikitty // test if solr index is coherent with database - WikittyQuery query1 = new WikittyQueryMaker().ideq(gf1Movie.getId()).end(); + WikittyQuery query1 = new WikittyQueryMaker().ideq(gf1Movie.getWikittyId()).end(); Wikitty searchedWikitty1 = wikittyClient.findByQuery(Wikitty.class, query1); Assert.assertNotNull(searchedWikitty1); - wikittyClient.delete(gf1Movie.getId()); - Wikitty deletedObject = wikittyClient.restore(gf1Movie.getId()); + wikittyClient.delete(gf1Movie.getWikittyId()); + Wikitty deletedObject = wikittyClient.restore(gf1Movie.getWikittyId()); Assert.assertNull(deletedObject); // test to find deleted wikitty @@ -432,21 +432,21 @@ // labelisation test Wikitty w1 = wikitties.get(0); - WikittyLabelUtil.addLabel(wikittyClient, w1.getId(), "titi"+ts); - WikittyLabelUtil.addLabel(wikittyClient, w1.getId(), "toto"+ts); + WikittyLabelUtil.addLabel(wikittyClient, w1.getWikittyId(), "titi"+ts); + WikittyLabelUtil.addLabel(wikittyClient, w1.getWikittyId(), "toto"+ts); Wikitty w2 = wikitties.get(1); - WikittyLabelUtil.addLabel(wikittyClient, w2.getId(), "tata"+ts); - WikittyLabelUtil.addLabel(wikittyClient, w2.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(wikittyClient, w2.getWikittyId(), "tata"+ts); + WikittyLabelUtil.addLabel(wikittyClient, w2.getWikittyId(), "titi"+ts); Wikitty w3 = wikitties.get(2); - WikittyLabelUtil.addLabel(wikittyClient, w3.getId(), "tutu"+ts); - WikittyLabelUtil.addLabel(wikittyClient, w3.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(wikittyClient, w3.getWikittyId(), "tutu"+ts); + WikittyLabelUtil.addLabel(wikittyClient, w3.getWikittyId(), "titi"+ts); Wikitty wt = WikittyLabelUtil.findByLabel(wikittyClient, "toto"+ts ); Assert.assertEquals(w1, wt); - Set<String> labels = WikittyLabelUtil.findAllAppliedLabels(wikittyClient, w2.getId()); + Set<String> labels = WikittyLabelUtil.findAllAppliedLabels(wikittyClient, w2.getWikittyId()); Assert.assertEquals(new HashSet<String>(Arrays.asList("tata"+ts, "titi"+ts)), labels); } @@ -467,14 +467,14 @@ wikittyNodes.add( leaf.getWikitty() ); leaf.setName( "cat-"+i ); leaf.setParent( root.getWikittyId() ); - // root.addChild( leaf.getWikittyId() ); + // root.addChild( leaf.getWikittyIdNNN() ); for ( int j = 0; j < 5; j++ ) { WikittyTreeNodeImpl subLeaf = new WikittyTreeNodeImpl(); subLeaf.setName( "subcat-"+i+"-"+j ); subLeaf.setParent( leaf.getWikittyId() ); wikittyNodes.add( subLeaf.getWikitty() ); - // leaf.addChild( subLeaf.getWikittyId() ); + // leaf.addChild( subLeaf.getWikittyIdNNN() ); } } wikittyClient.storeWikitty(wikittyNodes); // store treeNodes. @@ -489,7 +489,7 @@ WikittyQueryResultTreeNode<WikittyTreeNode> t = wikittyClient.findTreeNode( WikittyTreeNode.class, - root.getWikitty().getId(), 0, false, null); + root.getWikitty().getWikittyId(), 0, false, null); Assert.assertEquals("MyCategoryRoot", t.getObject().getName()); } @@ -519,7 +519,7 @@ } Assert.fail( "Unable to find node " + nodeName + " inside " + currentNode.getName() ); } - currentNode.addAttachment(wikitty.getId()); + currentNode.addAttachment(wikitty.getWikittyId()); wikittyClient.store(currentNode.getWikitty()); } @@ -557,19 +557,19 @@ myWikitty.addExtension(WikittyTreeNodeImpl.extensions); WikittyTreeNodeHelper.setName(myWikitty, "name"); myWikitty = wikittyClient.store(myWikitty); - Assert.assertEquals("1.0", myWikitty.getVersion()); + Assert.assertEquals("1.0", myWikitty.getWikittyVersion()); // store 2 : no modification myWikitty = wikittyClient.store(myWikitty); - Assert.assertEquals("1.0", myWikitty.getVersion()); + Assert.assertEquals("1.0", myWikitty.getWikittyVersion()); // store 3 : modification WikittyTreeNodeHelper.setName(myWikitty, "new name"); myWikitty = wikittyClient.store(myWikitty); - Assert.assertEquals("2.0", myWikitty.getVersion()); + Assert.assertEquals("2.0", myWikitty.getWikittyVersion()); // store 4 : new wikitty with same wikitty id (obsolete) - Wikitty myNewWikitty = new WikittyImpl(myWikitty.getId()); + Wikitty myNewWikitty = new WikittyImpl(myWikitty.getWikittyId()); myNewWikitty.addExtension(WikittyTreeNodeImpl.extensions); WikittyTreeNodeHelper.setName(myNewWikitty, "new wikitty"); try { @@ -586,14 +586,14 @@ WikittyEvent event = wikittyClient.getWikittyService().store( null, Collections.singletonList(myWikitty), true); event.update(myWikitty); - Assert.assertEquals("3.0", myWikitty.getVersion()); + Assert.assertEquals("3.0", myWikitty.getWikittyVersion()); // store 5 : fix version (not increased by force) - myNewWikitty.setVersion("11.0"); + myNewWikitty.setWikittyVersion("11.0"); event = wikittyClient.getWikittyService().store( null, Collections.singletonList(myNewWikitty), true); event.update(myNewWikitty); - Assert.assertEquals("11.0", myNewWikitty.getVersion()); + Assert.assertEquals("11.0", myNewWikitty.getWikittyVersion()); } /** @@ -609,13 +609,13 @@ myWikitty = wikittyClient.store(myWikitty); // delete - wikittyClient.delete(myWikitty.getId()); - Wikitty restoredWikitty = wikittyClient.restore(myWikitty.getId()); + wikittyClient.delete(myWikitty.getWikittyId()); + Wikitty restoredWikitty = wikittyClient.restore(myWikitty.getWikittyId()); Assert.assertNull(restoredWikitty); // store again myWikitty = wikittyClient.store(myWikitty); - restoredWikitty = wikittyClient.restore(myWikitty.getId()); + restoredWikitty = wikittyClient.restore(myWikitty.getWikittyId()); Assert.assertNotNull(restoredWikitty); } @@ -636,7 +636,7 @@ w = wikittyClient.store(w); - Wikitty restoredWikitty = wikittyClient.restore(w.getId()); + Wikitty restoredWikitty = wikittyClient.restore(w.getWikittyId()); Assert.assertNotNull(restoredWikitty); Assert.assertEquals("LeBin", restoredWikitty.getFieldAsString(extName, "name")); Assert.assertTrue(Arrays.equals(bytes, restoredWikitty.getFieldAsBytes(extName, "content"))); @@ -935,7 +935,7 @@ WikittyExtension ext = ExtensionFactory.create("test", "1") .addField("toto", WikittyTypes.NUMERIC).extension(); Wikitty w = new WikittyImpl(); - String id = w.getId(); + String id = w.getWikittyId(); w.addExtension(ext); w.setField(ext.getName(), "toto", 42); wikittyClient.store(w); @@ -2150,8 +2150,8 @@ Wikitty treeNode = new WikittyImpl(); WikittyTreeNode treeNodeImpl = new WikittyTreeNodeImpl(treeNode); treeNodeImpl.setName("root"); - treeNodeImpl.addAttachment(attach1.getId()); - treeNodeImpl.addAttachment(attach2.getId()); + treeNodeImpl.addAttachment(attach1.getWikittyId()); + treeNodeImpl.addAttachment(attach2.getWikittyId()); wikittyClient.store(treeNode); // set resync @@ -2187,8 +2187,8 @@ // store attachement Wikitty attach1 = new WikittyImpl("att1"); Wikitty attach2 = new WikittyImpl("att2"); - treeNodeImpl.addAttachment(attach1.getId()); - treeNodeImpl.addAttachment(attach2.getId()); + treeNodeImpl.addAttachment(attach1.getWikittyId()); + treeNodeImpl.addAttachment(attach2.getWikittyId()); List<Wikitty> toStore = new ArrayList<Wikitty>(); toStore.add(attach1); toStore.add(attach2); @@ -2225,7 +2225,7 @@ Assert.assertEquals(1, wikittyClient.findAllByQuery(query).getTotalResult()); // delete it - wikittyClient.delete(Collections.singleton(toDeleteWikitty.getId())); + wikittyClient.delete(Collections.singleton(toDeleteWikitty.getWikittyId())); // try to look for it after deletion Assert.assertEquals(0, wikittyClient.findAllByQuery(query).getTotalResult()); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyUtilTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -582,7 +582,7 @@ Wikitty labelWikitty = WikittyUtil.getWikitty(null,null,label); - Assert.assertEquals(wikittyId, labelWikitty.getId()); + Assert.assertEquals(wikittyId, labelWikitty.getWikittyId()); Assert.assertEquals(Collections.singleton("Test"),labelWikitty.getFieldAsObject(WikittyLabel.EXT_WIKITTYLABEL,WikittyLabel.FIELD_WIKITTYLABEL_LABELS)); ApplicationConfig config = WikittyConfig.getConfig(); @@ -656,8 +656,8 @@ WikittyLabelImpl labelCloned = new WikittyLabelImpl(cloned); - Assert.assertTrue(labelWikitty.getId().equals(cloned.getId())); - Assert.assertEquals(labelWikitty.getVersion(), cloned.getVersion()); + Assert.assertTrue(labelWikitty.getWikittyId().equals(cloned.getWikittyId())); + Assert.assertEquals(labelWikitty.getWikittyVersion(), cloned.getWikittyVersion()); Assert.assertTrue(source.getWikittyId().equals(labelCloned.getWikittyId())); Assert.assertEquals(source.getWikittyVersion(), labelCloned.getWikittyVersion()); Assert.assertEquals(source.getLabels(), labelCloned.getLabels()); @@ -673,8 +673,8 @@ WikittyLabelImpl labelCloned = new WikittyLabelImpl(cloned); - Assert.assertFalse(labelWikitty.getId().equals(cloned.getId())); - Assert.assertNotSame(labelWikitty.getVersion(), cloned.getVersion()); + Assert.assertFalse(labelWikitty.getWikittyId().equals(cloned.getWikittyId())); + Assert.assertNotSame(labelWikitty.getWikittyVersion(), cloned.getWikittyVersion()); Assert.assertFalse(source.getWikittyId().equals(labelCloned.getWikittyId())); Assert.assertNotSame(source.getWikittyVersion(), labelCloned.getWikittyVersion()); Assert.assertEquals(source.getLabels(), labelCloned.getLabels()); @@ -797,6 +797,11 @@ } @Override + public Object getFieldAsObject(String ext, String fieldName) { + throw new UnsupportedOperationException("Not supported yet."); + } + + @Override public void setField(String ext, String fieldName, Object value) { throw new UnsupportedOperationException("Not supported yet."); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/entities/WikittyTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -102,9 +102,9 @@ public void testWikittyId() { Wikitty w = new WikittyImpl(); // as soon as a wikitty object is created, it got an ID. - Assert.assertNotNull("Wikitty should got an ID", w.getId() ); + Assert.assertNotNull("Wikitty should got an ID", w.getWikittyId() ); - Wikitty w2 = new WikittyImpl( w.getId() ); + Wikitty w2 = new WikittyImpl( w.getWikittyId() ); // two wikitty with a similar id are equals. Assert.assertEquals("Wikitty with same ID must be equals", w, w2); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyCacheJCSTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -54,7 +54,7 @@ Wikitty w = new WikittyImpl(); cache.putWikitty(w); - Wikitty w2 = cache.getWikitty(w.getId()); + Wikitty w2 = cache.getWikitty(w.getWikittyId()); Assert.assertEquals(w, w2); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyExtensionMigrationTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -90,7 +90,7 @@ client.storeExtension(ext2); - Wikitty w2 = client.restore(w1.getId()); + Wikitty w2 = client.restore(w1.getWikittyId()); Assert.assertEquals("hello", w2.getFieldAsString(extensionName, "string")); } @@ -98,7 +98,7 @@ public Wikitty migrate(WikittyService service, Wikitty wikitty, WikittyExtension oldExt, WikittyExtension newExt) { System.out.println(String.format("migrate %s(%s) oldExt %s newExt %s", - wikitty.getId(), wikitty.getExtension(extensionName).getId(), + wikitty.getWikittyId(), wikitty.getExtension(extensionName).getId(), oldExt.getId(), newExt.getId())); Wikitty result = super.migrate(service, wikitty, oldExt, newExt); @@ -106,7 +106,7 @@ result.setField(extensionName, "date", new Date()); System.out.println(String.format("done %s(%s)", - result.getId(), result.getExtension(extensionName).getId())); + result.getWikittyId(), result.getExtension(extensionName).getId())); return result; } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/services/WikittyServiceCajoTest.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -99,7 +99,7 @@ Wikitty w = new WikittyImpl(); proxy.store(w); - List<Wikitty> list = server.restore(null, Collections.singletonList(w.getId())); + List<Wikitty> list = server.restore(null, Collections.singletonList(w.getWikittyId())); Assert.assertEquals(1, list.size()); stopServer(server); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyDTOGenerator.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -716,6 +716,16 @@ throw new UnsupportedOperationException("Not supported yet."); }*/); + //adding getField method + ObjectModelOperation getFieldAsObject = addOperation(dtoClass, "getFieldAsObject", "Object"); + addAnnotation(dtoClass, getFieldAsObject, "Override"); + addParameter(getFieldAsObject, "String", "ext"); + addParameter(getFieldAsObject, "String", "fieldName"); + setOperationBody(getFieldAsObject, "" +/*{ + throw new UnsupportedOperationException("Not supported yet."); +}*/); + //adding setField method ObjectModelOperation setField = addOperation(dtoClass, "setField", "void"); addAnnotation(dtoClass, setField, "Override"); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -248,11 +248,20 @@ ObjectModelModifier.STATIC); addParameter(getterObject, "Wikitty", "wikitty"); addParameter(getterObject, "boolean", "exceptionIfNotLoaded"); - String getterObjectBody = "" + String getterObjectBody = ""; + if ("wikitty".equalsIgnoreCase(attributeObjectType)) { + getterObjectBody = "" /*{ + <%=attributeObjectTypeCollectionStrict%> result = wikitty.getFieldAsWikitty<%=collectionType%>(<%=extensionVariableName%>, <%=fieldVariableName%>, exceptionIfNotLoaded); + return result; +}*/; + } else { + getterObjectBody = "" +/*{ <%=attributeObjectTypeCollectionStrict%> result = WikittyUtil.newInstance(<%=attributeObjectType%>.class, wikitty.getFieldAsWikitty<%=collectionType%>(<%=extensionVariableName%>, <%=fieldVariableName%>, exceptionIfNotLoaded)); return result; }*/; + } setOperationBody(getterObject, getterObjectBody); // @@ -358,15 +367,25 @@ // GETTER // String getterObjectName = "get" + StringUtils.capitalize(attributeName); - ObjectModelOperation getterObject = addOperation(helper, - getterObjectName, attributeObjectType, ObjectModelModifier.STATIC); - addParameter(getterObject, "Wikitty", "wikitty"); - addParameter(getterObject, "boolean", "exceptionIfNotLoaded"); - setOperationBody(getterObject, "" + ObjectModelOperation getterObject = addOperation(helper, + getterObjectName, attributeObjectType, ObjectModelModifier.STATIC); + addParameter(getterObject, "Wikitty", "wikitty"); + addParameter(getterObject, "boolean", "exceptionIfNotLoaded"); + String getterObjectBody = ""; + if ("wikitty".equalsIgnoreCase(attributeObjectType)) { + getterObjectBody = "" /*{ + <%=attributeObjectType%> value = wikitty.getFieldAsWikitty(<%=extensionVariableName%>, <%=fieldVariableName%>, exceptionIfNotLoaded); + return value; +}*/; + } else { + getterObjectBody = "" +/*{ <%=attributeObjectType%> value = WikittyUtil.newInstance(<%=attributeObjectType%>.class, wikitty.getFieldAsWikitty(<%=extensionVariableName%>, <%=fieldVariableName%>, exceptionIfNotLoaded)); return value; -}*/); +}*/; + } + setOperationBody(getterObject, getterObjectBody); // // SETTER @@ -668,14 +687,26 @@ addParameter(getterObject, "String", "extensionName"); addParameter(getterObject, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); addParameter(getterObject, "boolean", "exceptionIfNotLoaded"); - String getterObjectBody = "" + String getterObjectBody = ""; + if ("wikitty".equalsIgnoreCase(attributeObjectType)) { + getterObjectBody = "" /*{ String fqfieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); String extName = WikittyExtension.extractExtensionName(fqfieldName); String fieldName = WikittyExtension.extractFieldName(fqfieldName); + <%=attributeObjectTypeCollectionStrict%> result = wikitty.getFieldAsWikitty<%=collectionType%>(extName, fieldName, exceptionIfNotLoaded); + return result; +}*/; + } else { + getterObjectBody = "" +/*{ + String fqfieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); + String extName = WikittyExtension.extractExtensionName(fqfieldName); + String fieldName = WikittyExtension.extractFieldName(fqfieldName); <%=attributeObjectTypeCollectionStrict%> result = WikittyUtil.newInstance(<%=attributeObjectType%>.class, wikitty.getFieldAsWikitty<%=collectionType%>(extName, fieldName, exceptionIfNotLoaded)); return result; }*/; + } setOperationBody(getterObject, getterObjectBody); String setterNameObject = "set" + capitalizedAttributeName + "Entity"; @@ -778,14 +809,27 @@ addParameter(getterObject, "String", "extensionName"); addParameter(getterObject, WikittyTransformerUtil.WIKITTY_CLASS_FQN, "wikitty"); addParameter(getterObject, "boolean", "exceptionIfNotLoaded"); - setOperationBody(getterObject, "" + String getterObjectBody = ""; + if ("wikitty".equalsIgnoreCase(attributeObjectType)) { + getterObjectBody = "" /*{ String fqfieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); String extName = WikittyExtension.extractExtensionName(fqfieldName); String fieldName = WikittyExtension.extractFieldName(fqfieldName); + <%=attributeObjectType%> value = wikitty.getFieldAsWikitty(extName, fieldName, exceptionIfNotLoaded); + return value; +}*/; + } else { + getterObjectBody = "" +/*{ + String fqfieldName = getMetaFieldName(extensionName, "<%=attributeName%>"); + String extName = WikittyExtension.extractExtensionName(fqfieldName); + String fieldName = WikittyExtension.extractFieldName(fqfieldName); <%=attributeObjectType%> value = WikittyUtil.newInstance(<%=attributeObjectType%>.class, wikitty.getFieldAsWikitty(extName, fieldName, exceptionIfNotLoaded)); return value; -}*/); +}*/; + } + setOperationBody(getterObject, getterObjectBody); String setterNameObject = "set" + StringUtils.capitalize(attributeName); ObjectModelOperation setterObject = addOperation( Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -176,7 +176,7 @@ protected static String generateResultObjectType(ObjectModelAttribute attribute, boolean considerMultiplicity) { String result = FQNtoSimpleName(attribute.getType()); - if (commonTypes.contains(result) || "Wikitty".equalsIgnoreCase(result)) { + if (commonTypes.contains(result)) { // FIXME poussin 20120807 test pour voir si on peut traiter le type Wikitty comme un business || "Wikitty".equalsIgnoreCase(result)) { // On ne retourne quelque chose que si c'est un business entity type result = null; } Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -219,14 +219,14 @@ String query = String.format(jdbcQuery.getProperty(QUERY_SELECT_TWO_WHERE), COL_VERSION, COL_DELETION_DATE, TABLE_WIKITTY_ADMIN, COL_ID); PreparedStatement statement = connection.prepareStatement(query); - statement.setString(1, wikitty.getId()); + statement.setString(1, wikitty.getWikittyId()); ResultSet versionResultSet = statement.executeQuery(); String extensionList = ""; boolean wikittyAlreadyExists = versionResultSet.next(); String actualVersion = null; Date deletionDate = null; - String requestedVersion = wikitty.getVersion(); + String requestedVersion = wikitty.getWikittyVersion(); if (wikittyAlreadyExists) { actualVersion = versionResultSet.getString(COL_VERSION); @@ -252,7 +252,7 @@ continue; } else if (WikittyUtil.versionGreaterThan(actualVersion, requestedVersion)) { throw new WikittyObsoleteException(String.format( - "Your wikitty '%s' is obsolete", wikitty.getId())); + "Your wikitty '%s' is obsolete", wikitty.getWikittyId())); } else { newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } @@ -261,12 +261,12 @@ if (wikittyAlreadyExists) { WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty(QUERY_DELETE_WIKITTY_DATA), - wikitty.getId()); + wikitty.getWikittyId()); } else { WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty(QUERY_INSERT_WIKITTY_ADMIN), - wikitty.getId(), newVersion, ""); + wikitty.getWikittyId(), newVersion, ""); } @@ -284,7 +284,7 @@ String q = String.format(jdbcQuery.getProperty( QUERY_INSERT_WIKITTY_DATA), colName); WikittyJDBCUtil.doQuery(connection, q, - wikitty.getId(), + wikitty.getWikittyId(), ext.getName() + "." + fieldName + "[" + i + "/" + list.size() + "]", value); } @@ -311,7 +311,7 @@ String q = String.format(jdbcQuery.getProperty( QUERY_INSERT_WIKITTY_DATA), colName); WikittyJDBCUtil.doQuery(connection, q, - wikitty.getId(), + wikitty.getWikittyId(), ext.getName() + "." + fieldName, value); } else { @@ -334,11 +334,11 @@ // force all time deletion date to null String q = jdbcQuery.getProperty(QUERY_UPDATE_WIKITTY_ADMIN); WikittyJDBCUtil.doQuery(connection, q, newVersion, extensionList, - null, wikitty.getId()); + null, wikitty.getWikittyId()); // make a clone to prevent side effect Wikitty newWikitty = wikitty.clone(); - newWikitty.setVersion(newVersion); + newWikitty.setWikittyVersion(newVersion); newWikitty.clearDirty(); result.addWikitty(newWikitty); } @@ -498,7 +498,7 @@ ResultSet resultSet, String... fqFieldName) throws SQLException { Set<String> acceptedField = new HashSet<String>(Arrays.asList(fqFieldName)); Wikitty result = new WikittyImpl(id); - result.setVersion(version); + result.setWikittyVersion(version); if (extensionList != null && !"".equals(extensionList)) { for (String ext : extensionList.split(",")) { String extName = WikittyExtension.computeName(ext); Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -225,7 +225,7 @@ * @param doc TreeNode document representation */ public void add(Wikitty w) { - String id = w.getId(); + String id = w.getWikittyId(); Set<String> att = WikittyTreeNodeHelper.getAttachment(w); add(id, att); } Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-08-03 09:02:38 UTC (rev 1493) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-08-07 14:01:14 UTC (rev 1494) @@ -198,19 +198,19 @@ // remplissage des collections for(Wikitty w : wikitties) { - allWikitties.put(w.getId(), w); + allWikitties.put(w.getWikittyId(), w); if (force || !w.getDirty().isEmpty() || - WikittyUtil.versionGreaterThan("1", w.getVersion())) { + WikittyUtil.versionGreaterThan("1", w.getWikittyVersion())) { // s'il y a au moins un champs a reindexer ou que l'objet // n'a jamais ete sauve (1 > version) - dirtyObject.add(w.getId()); + dirtyObject.add(w.getWikittyId()); if (WikittyTreeNodeHelper.hasExtension(w) && (force ||w.getDirty().contains(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT) || null == WikittyTreeNodeHelper.getParent(w))) { // si le pere a change // ou qu'il est null (creation d'un nouvel arbre) // il faut indexer le noeud - dirtyParent.add(w.getId()); + dirtyParent.add(w.getWikittyId()); String parent = WikittyTreeNodeHelper.getParent(w); if (parent != null) { dirtyParentParentId.add(parent); @@ -988,7 +988,7 @@ boolean mustIndex = true; if (SOLR_ID.equals(fqfieldName)) { // extra field #id - fieldValue = w.getId(); + fieldValue = w.getWikittyId(); } else if (SOLR_EXTENSIONS.equals(fqfieldName)) { // extra field #extensions fieldValue= w.getExtensionNames(); @@ -1022,7 +1022,7 @@ */ protected SolrInputDocument createIndexDocument(Wikitty w) { if (log.isTraceEnabled()) { - log.trace(String.format("create index wikitty for '%s'", w.getId())); + log.trace(String.format("create index wikitty for '%s'", w.getWikittyId())); } SolrInputDocument doc = new SolrInputDocument();