Author: echatellier Date: 2013-07-05 15:52:24 +0200 (Fri, 05 Jul 2013) New Revision: 2737 Url: http://nuiton.org/projects/topia/repository/revisions/2737 Log: fixes #2734 : Rename TopiaEntity property constants with PROPERTY_ prefix Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -1490,7 +1490,7 @@ TopiaContext transaction, Class<E> entityClass) throws TopiaException, ClassCastException { return executeToEntityMap(transaction, entityClass, - TopiaEntity.TOPIA_ID, String.class); + TopiaEntity.PROPERTY_TOPIA_ID, String.class); } /** @@ -1764,15 +1764,15 @@ } public String getPropertyId(String alias) { - return getProperty(alias, TopiaEntity.TOPIA_ID); + return getProperty(alias, TopiaEntity.PROPERTY_TOPIA_ID); } public String getPropertyCreateDate(String alias) { - return getProperty(alias, TopiaEntity.TOPIA_CREATE_DATE); + return getProperty(alias, TopiaEntity.PROPERTY_TOPIA_CREATE_DATE); } public String getPropertyVersion(String alias) { - return getProperty(alias, TopiaEntity.TOPIA_VERSION); + return getProperty(alias, TopiaEntity.PROPERTY_TOPIA_VERSION); } @Override Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -180,7 +180,7 @@ setOperationBody(topiaCreateDate, "" /*{ - return $property(TopiaEntity.TOPIA_CREATE_DATE); + return $property(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE); }*/ ); @@ -190,7 +190,7 @@ setOperationBody(topiaId, "" /*{ - return $property(TopiaEntity.TOPIA_ID); + return $property(TopiaEntity.PROPERTY_TOPIA_ID); }*/ ); @@ -200,7 +200,7 @@ setOperationBody(topiaVersion, "" /*{ - return $property(TopiaEntity.TOPIA_VERSION); + return $property(TopiaEntity.PROPERTY_TOPIA_VERSION); }*/ ); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -399,7 +399,7 @@ // Nothing to do if id is null, the result will still be null. E result = null; if (id != null) { - TopiaQuery query = createQuery().addEquals(TopiaEntity.TOPIA_ID, id); + TopiaQuery query = createQuery().addEquals(TopiaEntity.PROPERTY_TOPIA_ID, id); result = findByQuery(query); } return result; @@ -445,7 +445,7 @@ @Override public List<String> findAllIds() throws TopiaException { - TopiaQuery query = createQuery().setSelect(TopiaEntity.TOPIA_ID); + TopiaQuery query = createQuery().setSelect(TopiaEntity.PROPERTY_TOPIA_ID); List<String> results = getContext().findByQuery(query); return results; } @@ -528,7 +528,7 @@ @Override public boolean existByTopiaId(String id) throws TopiaException { - boolean result = existByProperties(TopiaEntity.TOPIA_ID, id); + boolean result = existByProperties(TopiaEntity.PROPERTY_TOPIA_ID, id); return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntity.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -67,16 +67,12 @@ @SearchFields public interface TopiaEntity extends Serializable { - String TOPIA_ID = "topiaId"; + String PROPERTY_TOPIA_ID = "topiaId"; - String TOPIA_CREATE_DATE = "topiaCreateDate"; + String PROPERTY_TOPIA_CREATE_DATE = "topiaCreateDate"; - String TOPIA_VERSION = "topiaVersion"; + String PROPERTY_TOPIA_VERSION = "topiaVersion"; - String COMPOSITE = "composite"; - - String AGGREGATE = "aggregate"; - /** * Unique technical Id of the entity. This id contains the full qualified * name of the entity interface. This id has also an index and his used to Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -249,6 +249,6 @@ protected EntityCsvModel(char separator, TableMeta<T> tableMeta, String idHeader) { this(separator, tableMeta); - newColumnForImportExport(idHeader, TopiaEntity.TOPIA_ID); + newColumnForImportExport(idHeader, TopiaEntity.PROPERTY_TOPIA_ID); } } \ No newline at end of file Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -48,8 +48,8 @@ // topiaId <-> topiaId model.newMandatoryColumn( - TopiaEntity.TOPIA_ID, - TopiaCsvCommons.<Map<String, Object>, String>newMapProperty(TopiaEntity.TOPIA_ID) + TopiaEntity.PROPERTY_TOPIA_ID, + TopiaCsvCommons.<Map<String, Object>, String>newMapProperty(TopiaEntity.PROPERTY_TOPIA_ID) ); // add association -> target Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -400,7 +400,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { @@ -453,7 +453,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { @@ -507,7 +507,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { @@ -560,7 +560,7 @@ } int compt = 0; for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); String[] associations = (String[]) row.get("target"); for (String association : associations) { if (StringUtils.isNotEmpty(association)) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -48,7 +48,7 @@ meta); // topiaId <-> topiaId - model.newColumnForExport(TopiaEntity.TOPIA_ID); + model.newColumnForExport(TopiaEntity.PROPERTY_TOPIA_ID); model.newColumnForExport( meta.getName(), Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -179,7 +179,7 @@ String topiaId) { Map<String, Object> result = getOperator().getNaturalIsdAndNotNulls(bean); if (topiaId != null) { - result.put(TopiaEntity.TOPIA_ID, topiaId); + result.put(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); } return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -71,7 +71,7 @@ /** Le pattern d'une reference sur une association */ public static final String ASSOCIATION_PATTERN = - "%1$s[@" + TopiaEntity.TOPIA_ID + "=\"%2$s\"]"; + "%1$s[@" + TopiaEntity.PROPERTY_TOPIA_ID + "=\"%2$s\"]"; /** * Bind les valeurs techniques depuis une entitée vers une autre. Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaQueryTest.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -131,7 +131,7 @@ // Test 4 : add a subquery with its own parameters query = new TopiaQuery(QueriedEntity.class, "Q1"). - addEquals(QueriedEntity.TOPIA_ID, "ID1"); + addEquals(QueriedEntity.PROPERTY_TOPIA_ID, "ID1"); subquery = new TopiaQuery(QueriedEntity.class, "Q2"). addEquals(QueriedEntity.PROPERTY_TEST_ADD, "value"); @@ -167,7 +167,7 @@ log.debug("Query : " + query); Assert.assertEquals("FROM " + QueriedEntity.class.getName() + - " ORDER BY " + TopiaEntity.TOPIA_CREATE_DATE + " DESC", + " ORDER BY " + TopiaEntity.PROPERTY_TOPIA_CREATE_DATE + " DESC", query.fullQuery()); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2013-07-05 13:11:43 UTC (rev 2736) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2013-07-05 13:52:24 UTC (rev 2737) @@ -95,7 +95,7 @@ BinderModelBuilder<Company, CompanyDTO> builder = BinderModelBuilder.newEmptyBuilder(Company.class, CompanyDTO.class); builder.addSimpleProperties(Company.PROPERTY_NAME, Company.PROPERTY_SIRET); - builder.addProperties(TopiaEntity.TOPIA_ID, "id"); + builder.addProperties(TopiaEntity.PROPERTY_TOPIA_ID, "id"); BinderFactory.registerBinderModel(builder); Binder<Company, CompanyDTO> binder =