This is an automated email from the git hooks/post-receive script. New commit to branch feature/7739 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit df3e90931dae509f5b2639a175f0a1cac27973d2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 4 12:14:47 2016 +0200 Meilleur nommage dans le méta-modèle + correction de l'algorithme de remplacement --- .../synchro/InsertSqlStatementGenerator.java | 57 ++++----- .../synchro/ReplaceSqlStatementGenerator.java | 76 ++++++----- .../synchro/UpdateSqlStatementGenerator.java | 142 ++++++++++----------- 3 files changed, 130 insertions(+), 145 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java index 65fcac6..312def0 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/InsertSqlStatementGenerator.java @@ -36,13 +36,13 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { private final String tableName; private final Binder<R, R> binder; private final String[] simplePropertyNames; - private final String[] compositionPropertyNames; - private final Set<NmAssociation> nmAssociations; + private final String[] manyToOneAssociationNames; + private final Set<ManyToManyAssociationStruct> manyToManyAssociations; /** * Pour décrire une association nm. */ - private static class NmAssociation { + private static class ManyToManyAssociationStruct { /** * Le nom de la propriété dans l'objet. @@ -57,23 +57,12 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { */ private final String tableName; - private NmAssociation(String propertyName, String dbColumnName, String tableName) { + private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName) { this.propertyName = propertyName; this.dbColumnName = dbColumnName; this.tableName = tableName; } - public String getPropertyName() { - return propertyName; - } - - public String getDbColumnName() { - return dbColumnName; - } - - public String getTableName() { - return tableName; - } } public InsertSqlStatementGenerator(TopiaMetadataEntity metadataEntity, Class<R> dtoType) { @@ -81,19 +70,19 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { this.tableName = metadataEntity.getDbTableName(); Set<String> propertyNamesSet = metadataEntity.getProperties().keySet(); this.simplePropertyNames = propertyNamesSet.toArray(new String[propertyNamesSet.size()]); - Set<String> compositionPropertyNamesSet = metadataEntity.getRequired().keySet(); - this.compositionPropertyNames = propertyNamesSet.toArray(new String[compositionPropertyNamesSet.size()]); + Set<String> manyToOneAssociationNamesSet = metadataEntity.getManyToOneAssociations().keySet(); + this.manyToOneAssociationNames = propertyNamesSet.toArray(new String[manyToOneAssociationNamesSet.size()]); - Map<String, String> nmAssociationsMap = metadataEntity.getNmAssociations(); - this.nmAssociations = new LinkedHashSet<>(); - for (Map.Entry<String, String> entry : nmAssociationsMap.entrySet()) { + Map<String, String> manyToManyAssociationsMap = metadataEntity.getManyToManyAssociations(); + this.manyToManyAssociations = new LinkedHashSet<>(); + for (Map.Entry<String, String> entry : manyToManyAssociationsMap.entrySet()) { String propertyName = entry.getKey(); String dbColumnName = metadataEntity.getDbColumnName(propertyName); - String tableName = metadataEntity.getBdNmAssociationName(propertyName); - NmAssociation nmAssociation = new NmAssociation(propertyName, dbColumnName, tableName); - nmAssociations.add(nmAssociation); + String tableName = metadataEntity.getBdManyToManyAssociationTableName(propertyName); + ManyToManyAssociationStruct manyToManyAssociation = new ManyToManyAssociationStruct(propertyName, dbColumnName, tableName); + manyToManyAssociations.add(manyToManyAssociation); } - this.columnNames = computeColumnNames(metadataEntity, simplePropertyNames, compositionPropertyNames); + this.columnNames = computeColumnNames(metadataEntity, simplePropertyNames, manyToOneAssociationNames); this.binder = BinderFactory.newBinder(dtoType); } @@ -103,7 +92,7 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { addStringParameter(referentialDto.getId(), parameters); addOtherTypeParameter(referentialDto.getVersion(), parameters); - addOtherTypeParameter(referentialDto.getCreateDate(), parameters); + addDateParameter(referentialDto.getCreateDate(), parameters); Map<String, Object> simpleParameters = binder.obtainProperties(referentialDto, true, simplePropertyNames); for (Object parameterValue : simpleParameters.values()) { @@ -128,7 +117,7 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { } - Map<String, Object> compositionParameters = binder.obtainProperties(referentialDto, true, compositionPropertyNames); + Map<String, Object> compositionParameters = binder.obtainProperties(referentialDto, true, manyToOneAssociationNames); for (Object parameterValue : compositionParameters.values()) { if (parameterValue == null) { @@ -154,8 +143,8 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { if (log.isDebugEnabled()) { log.debug("sql: " + result); } - for (NmAssociation nmAssociation : nmAssociations) { - String nmAssociationSql = generateNmAssociationSql(referentialDto, nmAssociation); + for (ManyToManyAssociationStruct manyToManyAssociation : manyToManyAssociations) { + String nmAssociationSql = generateNmAssociationSql(referentialDto, manyToManyAssociation); result += nmAssociationSql; } @@ -163,18 +152,18 @@ public class InsertSqlStatementGenerator<R extends ReferentialDto> { } - private String generateNmAssociationSql(R referentialDto, NmAssociation nmAssociation) { + private String generateNmAssociationSql(R referentialDto, ManyToManyAssociationStruct manyToManyAssociationStruct) { StringBuilder builder = new StringBuilder(); - Collection<ReferentialReference<?>> nmAssociationValues = binder.obtainSourceProperty(referentialDto, nmAssociation.getPropertyName()); - if (CollectionUtils.isNotEmpty(nmAssociationValues)) { + Collection<ReferentialReference<?>> manyToManyAssociationValues = binder.obtainSourceProperty(referentialDto, manyToManyAssociationStruct.propertyName); + if (CollectionUtils.isNotEmpty(manyToManyAssociationValues)) { - String nmAssociationTableName = nmAssociation.getTableName(); - String nmAssociationDbColumnName = nmAssociation.getDbColumnName(); + String nmAssociationTableName = manyToManyAssociationStruct.tableName; + String nmAssociationDbColumnName = manyToManyAssociationStruct.dbColumnName; String referentialDtoId = referentialDto.getId(); - for (ReferentialReference<?> nmAssociationValue : nmAssociationValues) { + for (ReferentialReference<?> nmAssociationValue : manyToManyAssociationValues) { String sql = String.format(NM_ASSOCIATION_INSERT_STATEMENT, schemaName, diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java index 68e44ff..e0d6e9d 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/ReplaceSqlStatementGenerator.java @@ -21,11 +21,17 @@ public class ReplaceSqlStatementGenerator { /** Logger. */ private static final Log log = LogFactory.getLog(ReplaceSqlStatementGenerator.class); - private static final String REQUIRED_UPDATE_STATEMENT = "UPDATE %s.%s SET %s = '%s', SET topiaVersion = topiaVersion + 1 WHERE topiaId ='%s';\n"; - private static final String NMASSOCIATION_UPDATE_STATEMENT = "UPDATE %s.%s SET %s = '%s' WHERE topiaId ='%s';\n"; - - private final Set<ReplacementStruct> requiredReplacements; - private final Set<ReplacementStruct> nmAssociationReplacements; + private static final String MANY_TO_ONE_ASSOCIATION_UPDATE_STATEMENT = "UPDATE %s.%s SET %s = '%s', SET topiaVersion = topiaVersion + 1 WHERE topiaId = '%s';\n"; + private static final String MANY_TO_MANY_ASSOCIATION_UPDATE_STATEMENT = "UPDATE %s.%s SET %s = '%s' WHERE %s = '%s';\n"; + + /** + * Informations pour remplacer dans une relation many-to-one. + */ + private final Set<ReplacementStruct> manyToOneAssociationReplacements; + /** + * Informations pour remplacer dans une relation many-to-many. + */ + private final Set<ReplacementStruct> manyToManyAssociationReplacements; private static class ReplacementStruct { @@ -42,24 +48,41 @@ public class ReplaceSqlStatementGenerator { } public ReplaceSqlStatementGenerator(TopiaMetadataModel topiaMetadataModel, String referentialName) { - this.requiredReplacements = computeRequiredReplacements(referentialName, topiaMetadataModel); - this.nmAssociationReplacements = computeNmAssociationReplacements(referentialName, topiaMetadataModel); + this.manyToOneAssociationReplacements = computeManyToOneAssociationReplacements(referentialName, topiaMetadataModel); + this.manyToManyAssociationReplacements = computeManyToManyAssociationReplacements(referentialName, topiaMetadataModel); } public String generateSql(String sourceId, String replacementId) { StringBuilder builder = new StringBuilder(); - for (ReplacementStruct replacementStruct : requiredReplacements) { - - String sql = generateSqlStatement(REQUIRED_UPDATE_STATEMENT, replacementStruct, sourceId, replacementId); + for (ReplacementStruct replacementStruct : manyToOneAssociationReplacements) { + + String sql = String.format(MANY_TO_ONE_ASSOCIATION_UPDATE_STATEMENT, + replacementStruct.schemaName, + replacementStruct.tableName, + replacementStruct.columnName, + replacementId, + sourceId); + if (log.isDebugEnabled()) { + log.debug("sql: " + sql); + } builder.append(sql); } - for (ReplacementStruct replacementStruct : nmAssociationReplacements) { - - String sql = generateSqlStatement(NMASSOCIATION_UPDATE_STATEMENT, replacementStruct, sourceId, replacementId); + for (ReplacementStruct replacementStruct : manyToManyAssociationReplacements) { + + String sql = String.format(MANY_TO_MANY_ASSOCIATION_UPDATE_STATEMENT, + replacementStruct.schemaName, + replacementStruct.tableName, + replacementStruct.columnName, + replacementId, + replacementStruct.columnName, + sourceId); + if (log.isDebugEnabled()) { + log.debug("sql: " + sql); + } builder.append(sql); } @@ -68,13 +91,13 @@ public class ReplaceSqlStatementGenerator { } - private Set<ReplacementStruct> computeRequiredReplacements(String referentialName, TopiaMetadataModel topiaMetadataModel) { + private Set<ReplacementStruct> computeManyToOneAssociationReplacements(String referentialName, TopiaMetadataModel topiaMetadataModel) { Set<ReplacementStruct> result = new LinkedHashSet<>(); for (TopiaMetadataEntity metadataEntity : topiaMetadataModel) { - result.addAll(metadataEntity.getRequired().entrySet().stream() + result.addAll(metadataEntity.getManyToOneAssociations().entrySet().stream() .filter(entry -> entry.getValue().equals(referentialName)) .map(entry -> new ReplacementStruct(metadataEntity.getDbSchemaName(), metadataEntity.getDbTableName(), @@ -87,16 +110,16 @@ public class ReplaceSqlStatementGenerator { } - private Set<ReplacementStruct> computeNmAssociationReplacements(String referentialName, TopiaMetadataModel topiaMetadataModel) { + private Set<ReplacementStruct> computeManyToManyAssociationReplacements(String referentialName, TopiaMetadataModel topiaMetadataModel) { Set<ReplacementStruct> result = new LinkedHashSet<>(); for (TopiaMetadataEntity metadataEntity : topiaMetadataModel) { - result.addAll(metadataEntity.getNmAssociations().entrySet().stream() + result.addAll(metadataEntity.getManyToManyAssociations().entrySet().stream() .filter(entry -> entry.getValue().equals(referentialName)) .map(entry -> new ReplacementStruct(metadataEntity.getDbSchemaName(), - metadataEntity.getBdNmAssociationName(entry.getValue()), + metadataEntity.getBdManyToManyAssociationTableName(entry.getValue()), metadataEntity.getDbColumnName(entry.getValue()))) .collect(Collectors.toList())); @@ -106,21 +129,4 @@ public class ReplaceSqlStatementGenerator { } - private String generateSqlStatement(String replacementPattern, ReplacementStruct replacementStruct, String sourceId, String replacementId) { - - String sql = String.format(replacementPattern, - replacementStruct.schemaName, - replacementStruct.tableName, - replacementStruct.columnName, - replacementId, - sourceId); - - if (log.isDebugEnabled()) { - log.debug("sql: " + sql); - } - - return sql; - - } - } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java index d238410..365e0f4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/synchro/UpdateSqlStatementGenerator.java @@ -30,21 +30,21 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { private static final Log log = LogFactory.getLog(UpdateSqlStatementGenerator.class); private static final String UPDATE_STATEMENT = "UPDATE %s.%s %s WHERE topiaId ='%s';\n"; - private static final String NM_ASSOCIATION_DELETE_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; - private static final String NM_ASSOCIATION_INSERT_STATEMENT = "INSERT INTO %s.%s(%s, %s) VALUES ('%s', '%s');\n"; + private static final String MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; + private static final String MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT = "INSERT INTO %s.%s(%s, %s) VALUES ('%s', '%s');\n"; private final Map<String, String> columnNames; private final String schemaName; private final String tableName; private final Binder<R, R> binder; private final String[] simplePropertyNames; - private final String[] compositionPropertyNames; - private final Set<NmAssociation> nmAssociations; + private final String[] manyToOneAssociationNames; + private final Set<ManyToManyAssociationStruct> manyToManyAssociations; /** * Pour décrire une association nm. */ - private static class NmAssociation { + private static class ManyToManyAssociationStruct { /** * Le nom de la propriété dans l'objet. @@ -59,43 +59,32 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { */ private final String tableName; - private NmAssociation(String propertyName, String dbColumnName, String tableName) { + private ManyToManyAssociationStruct(String propertyName, String dbColumnName, String tableName) { this.propertyName = propertyName; this.dbColumnName = dbColumnName; this.tableName = tableName; } - public String getPropertyName() { - return propertyName; - } - - public String getDbColumnName() { - return dbColumnName; - } - - public String getTableName() { - return tableName; - } } public UpdateSqlStatementGenerator(TopiaMetadataEntity metadataEntity, Class<R> dtoType) { this.schemaName = metadataEntity.getDbSchemaName(); this.tableName = metadataEntity.getDbTableName(); - Set<String> propertyNamesSet = metadataEntity.getProperties().keySet(); - this.simplePropertyNames = propertyNamesSet.toArray(new String[propertyNamesSet.size()]); - Set<String> compositionPropertyNamesSet = metadataEntity.getRequired().keySet(); - this.compositionPropertyNames = propertyNamesSet.toArray(new String[compositionPropertyNamesSet.size()]); - - Map<String, String> nmAssociationsMap = metadataEntity.getNmAssociations(); - this.nmAssociations = new LinkedHashSet<>(); - for (Map.Entry<String, String> entry : nmAssociationsMap.entrySet()) { + Set<String> simplePropertyNamesSet = metadataEntity.getProperties().keySet(); + this.simplePropertyNames = simplePropertyNamesSet.toArray(new String[simplePropertyNamesSet.size()]); + Set<String> manyToOneAssociationNamesSet = metadataEntity.getManyToOneAssociations().keySet(); + this.manyToOneAssociationNames = simplePropertyNamesSet.toArray(new String[manyToOneAssociationNamesSet.size()]); + + Map<String, String> manyToManyAssociationsMap = metadataEntity.getManyToManyAssociations(); + this.manyToManyAssociations = new LinkedHashSet<>(); + for (Map.Entry<String, String> entry : manyToManyAssociationsMap.entrySet()) { String propertyName = entry.getKey(); String dbColumnName = metadataEntity.getDbColumnName(propertyName); - String tableName = metadataEntity.getBdNmAssociationName(propertyName); - NmAssociation nmAssociation = new NmAssociation(propertyName, dbColumnName, tableName); - nmAssociations.add(nmAssociation); + String tableName = metadataEntity.getBdManyToManyAssociationTableName(propertyName); + ManyToManyAssociationStruct manyToManyAssociation = new ManyToManyAssociationStruct(propertyName, dbColumnName, tableName); + manyToManyAssociations.add(manyToManyAssociation); } - this.columnNames = computeColumnNames(metadataEntity, simplePropertyNames, compositionPropertyNames); + this.columnNames = computeColumnNames(metadataEntity, simplePropertyNames, manyToOneAssociationNames); this.binder = BinderFactory.newBinder(dtoType); } @@ -105,87 +94,88 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { addStringParameter(TopiaEntity.PROPERTY_TOPIA_ID, referentialDto.getId(), parameters); addOtherTypeParameter(TopiaEntity.PROPERTY_TOPIA_VERSION, referentialDto.getVersion(), parameters); - addOtherTypeParameter(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, referentialDto.getCreateDate(), parameters); + addDateParameter(TopiaEntity.PROPERTY_TOPIA_CREATE_DATE, referentialDto.getCreateDate(), parameters); - Map<String, Object> simpleParameters = binder.obtainProperties(referentialDto, true, simplePropertyNames); - for (Map.Entry<String, Object> entry : simpleParameters.entrySet()) { + Map<String, Object> simpleProperties = binder.obtainProperties(referentialDto, true, simplePropertyNames); + for (Map.Entry<String, Object> entry : simpleProperties.entrySet()) { - String parameterName = entry.getKey(); - String columnName = columnNames.get(parameterName); - Object parameterValue = entry.getValue(); + String simplePropertyName = entry.getKey(); + String columnName = columnNames.get(simplePropertyName); + Object simplePropertyValue = entry.getValue(); - if (parameterValue == null) { + if (simplePropertyValue == null) { addNullParameter(columnName, parameters); continue; } - if (parameterValue instanceof String) { - addStringParameter(columnName, (String) parameterValue, parameters); + if (simplePropertyValue instanceof String) { + addStringParameter(columnName, (String) simplePropertyValue, parameters); continue; } - if (parameterValue instanceof Date) { - addDateParameter(columnName, (Date) parameterValue, parameters); + if (simplePropertyValue instanceof Date) { + addDateParameter(columnName, (Date) simplePropertyValue, parameters); continue; } - if (parameterValue instanceof Enum) { - addEnumParameter(columnName, (Enum) parameterValue, parameters); + if (simplePropertyValue instanceof Enum) { + addEnumParameter(columnName, (Enum) simplePropertyValue, parameters); continue; } - addOtherTypeParameter(columnName, parameterValue, parameters); + addOtherTypeParameter(columnName, simplePropertyValue, parameters); } + Map<String, Object> manyToOneAssociations = binder.obtainProperties(referentialDto, true, manyToOneAssociationNames); + for (Map.Entry<String, Object> entry : manyToOneAssociations.entrySet()) { - Map<String, Object> compositionParameters = binder.obtainProperties(referentialDto, true, compositionPropertyNames); - for (Map.Entry<String, Object> entry : compositionParameters.entrySet()) { - - String parameterName = entry.getKey(); - String columnName = columnNames.get(parameterName); - Object parameterValue = entry.getValue(); + String manyToOneAssociationName = entry.getKey(); + String columnName = columnNames.get(manyToOneAssociationName); + Object manyToOneAssociationValue = entry.getValue(); - if (parameterValue == null) { + if (manyToOneAssociationValue == null) { addNullParameter(columnName, parameters); continue; } - if (parameterValue instanceof ReferentialDto) { - addReferentialDtoParameter(columnName, (ReferentialDto) parameterValue, parameters); + if (manyToOneAssociationValue instanceof ReferentialDto) { + addReferentialDtoParameter(columnName, (ReferentialDto) manyToOneAssociationValue, parameters); continue; } - if (parameterValue instanceof ReferentialReference) { - addReferentialReferenceParameter(columnName, (ReferentialReference) parameterValue, parameters); + if (manyToOneAssociationValue instanceof ReferentialReference) { + addReferentialReferenceParameter(columnName, (ReferentialReference) manyToOneAssociationValue, parameters); } } - String result = String.format(UPDATE_STATEMENT, - schemaName, - tableName, - parameters.substring(2), - referentialDto.getId()); + StringBuilder result = new StringBuilder(); + String sql = String.format(UPDATE_STATEMENT, + schemaName, + tableName, + parameters.substring(2), + referentialDto.getId()); + result.append(sql); if (log.isDebugEnabled()) { - log.debug("sql: " + result); + log.debug("sql: " + sql); } - for (NmAssociation nmAssociation : nmAssociations) { - String nmAssociationSql = generateNmAssociationSql(referentialDto, nmAssociation); - result += nmAssociationSql; + for (ManyToManyAssociationStruct manyToManyAssociation : manyToManyAssociations) { + String manyToManyAssociationSql = generateManyToManyAssociationSql(referentialDto, manyToManyAssociation); + result.append(manyToManyAssociationSql); } - return result; + return result.toString(); } - private String generateNmAssociationSql(R referentialDto, NmAssociation nmAssociation) { + private String generateManyToManyAssociationSql(R referentialDto, ManyToManyAssociationStruct manyToManyAssociation) { StringBuilder builder = new StringBuilder(); String referentialDtoId = referentialDto.getId(); - String nmAssociationTableName = nmAssociation.getTableName(); + String manyToManyAssociationTableName = manyToManyAssociation.tableName; // On commence toujours par supprimer toutes les anciennes associations, elles seront ré-ajoutées juste après - String deleteSql = String.format(NM_ASSOCIATION_DELETE_STATEMENT, + String deleteSql = String.format(MANY_TO_MANY_ASSOCIATION_DELETE_STATEMENT, schemaName, - nmAssociationTableName, + manyToManyAssociationTableName, tableName, referentialDtoId); builder.append(deleteSql); @@ -193,22 +183,22 @@ public class UpdateSqlStatementGenerator<R extends ReferentialDto> { log.debug("sql: " + deleteSql); } - Collection<ReferentialReference<?>> nmAssociationValues = binder.obtainSourceProperty(referentialDto, nmAssociation.getPropertyName()); - if (CollectionUtils.isNotEmpty(nmAssociationValues)) { + Collection<ReferentialReference<?>> manyToManyAssociationValues = binder.obtainSourceProperty(referentialDto, manyToManyAssociation.propertyName); + if (CollectionUtils.isNotEmpty(manyToManyAssociationValues)) { - String nmAssociationDbColumnName = nmAssociation.getDbColumnName(); + String manyToManyAssociationDbColumnName = manyToManyAssociation.dbColumnName; - for (ReferentialReference<?> nmAssociationValue : nmAssociationValues) { + for (ReferentialReference<?> manyToManyAssociationValue : manyToManyAssociationValues) { - String sql = String.format(NM_ASSOCIATION_INSERT_STATEMENT, + String sql = String.format(MANY_TO_MANY_ASSOCIATION_INSERT_STATEMENT, schemaName, - nmAssociationTableName, + manyToManyAssociationTableName, tableName, - nmAssociationDbColumnName, + manyToManyAssociationDbColumnName, referentialDtoId, - nmAssociationValue.getId()); + manyToManyAssociationValue.getId()); if (log.isDebugEnabled()) { log.debug("sql: " + sql); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.