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 223dc6e4766bddf823a0666fcb49f35b21fe4baa Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Jul 4 12:12:50 2016 +0200 Meilleur nommage dans le méta-modèle --- .../persistence/metadata/TopiaMetadataEntity.java | 68 +++++++++++----------- .../metadata/TopiaMetadataModelVisitor.java | 30 +++++----- .../sql/batch/tables/TopiaSqlTablesFactory.java | 6 +- .../templates/TopiaMetadataModelGenerator.java | 14 ++--- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java b/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java index 6f4b8ba..22b89e9 100644 --- a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java +++ b/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataEntity.java @@ -59,7 +59,7 @@ public class TopiaMetadataEntity { /** * Le dictionnaire des associations simples (multiplicitié 1→n) (la clef est le nom de la propriété, la valeur son type). */ - protected final Map<String, String> associations = new LinkedHashMap<>(); + protected final Map<String, String> oneToManyAssociations = new LinkedHashMap<>(); /** * Le dictionnaire des associations inversées (la clef est le nom de la propriété, la valeur son type). */ @@ -67,11 +67,11 @@ public class TopiaMetadataEntity { /** * Le dictionnaire des associations nm (multiplicitié n→m) (la clef est le nom de la propriété, la valeur son type). */ - protected final Map<String, String> nmAssociations = new LinkedHashMap<>(); + protected final Map<String, String> manyToManyAssociations = new LinkedHashMap<>(); /** * Le dictionnaire des compositions simples vers des entitées (la clef est le nom de la propriété, la valeur son type). */ - protected final Map<String, String> required = new LinkedHashMap<>(); + protected final Map<String, String> manyToOneAssociations = new LinkedHashMap<>(); /** * Le dictionnaire des propriétés qui ne sont pas des entités (la clef est le nom de la propriété, la valeur son type). */ @@ -86,7 +86,7 @@ public class TopiaMetadataEntity { /** * Le nom des tables utilisées pour les associations nm. */ - protected final Map<String, String> dbNmAssociationsName = new LinkedHashMap<>(); + protected final Map<String, String> dbManyToManyAssociationsTableName = new LinkedHashMap<>(); public TopiaMetadataEntity(String parent, String type, String dbSchemaName, String dbTableName) { @@ -141,16 +141,16 @@ public class TopiaMetadataEntity { return reversedAssociations; } - public Map<String, String> getNmAssociations() { - return nmAssociations; + public Map<String, String> getManyToManyAssociations() { + return manyToManyAssociations; } - public Map<String, String> getAssociations() { - return associations; + public Map<String, String> getOneToManyAssociations() { + return oneToManyAssociations; } - public Map<String, String> getRequired() { - return required; + public Map<String, String> getManyToOneAssociations() { + return manyToOneAssociations; } public Map<String, String> getProperties() { @@ -169,17 +169,17 @@ public class TopiaMetadataEntity { return dbColumnName; } - public Map<String, String> getDbNmAssociationsName() { - return dbNmAssociationsName; + public Map<String, String> getDbManyToManyAssociationsTableName() { + return dbManyToManyAssociationsTableName; } - public String getBdNmAssociationName(String propertyName) { - return dbNmAssociationsName.get(propertyName); + public String getBdManyToManyAssociationTableName(String propertyName) { + return dbManyToManyAssociationsTableName.get(propertyName); } - public void addAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { + public void addOneToManyAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); - associations.put(name, associationClazz.getType()); + oneToManyAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); } @@ -189,16 +189,16 @@ public class TopiaMetadataEntity { addDbColumnName(name, dbColumnName); } - public void addNmAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName, String dbNmAssociationName) { - log.info(getType() + "/" + name + "(" + dbNmAssociationName + ") →" + associationClazz.getType()); - nmAssociations.put(name, associationClazz.getType()); + public void addManyToManyAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName, String dbManyToManyAssociationTableName) { + log.info(getType() + "/" + name + "(" + dbManyToManyAssociationTableName + ") →" + associationClazz.getType()); + manyToManyAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); - dbNmAssociationsName.put(name, dbNmAssociationName); + dbManyToManyAssociationsTableName.put(name, dbManyToManyAssociationTableName); } - public void addRequired(TopiaMetadataEntity attributeClazz, String name, String dbColumnName) { - log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + attributeClazz.getType()); - required.put(name, attributeClazz.getType()); + public void addManyToOneAssociation(TopiaMetadataEntity associationClazz, String name, String dbColumnName) { + log.info(getType() + "/" + name + "(" + dbColumnName + ") →" + associationClazz.getType()); + manyToOneAssociations.put(name, associationClazz.getType()); addDbColumnName(name, dbColumnName); } @@ -210,13 +210,13 @@ public class TopiaMetadataEntity { public TopiaMetadataEntity copy() { TopiaMetadataEntity copy = new TopiaMetadataEntity(parent, type, dbSchemaName, dbTableName); - copy.associations.putAll(associations); + copy.oneToManyAssociations.putAll(oneToManyAssociations); copy.reversedAssociations.putAll(reversedAssociations); - copy.nmAssociations.putAll(nmAssociations); - copy.required.putAll(required); + copy.manyToManyAssociations.putAll(manyToManyAssociations); + copy.manyToOneAssociations.putAll(manyToOneAssociations); copy.properties.putAll(properties); copy.dbColumnsName.putAll(dbColumnsName); - copy.dbNmAssociationsName.putAll(dbNmAssociationsName); + copy.dbManyToManyAssociationsTableName.putAll(dbManyToManyAssociationsTableName); return copy; } @@ -227,20 +227,20 @@ public class TopiaMetadataEntity { String propertyType = entry.getValue(); visitor.visitReversedAssociation(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); } - for (Map.Entry<String, String> entry : associations.entrySet()) { + for (Map.Entry<String, String> entry : oneToManyAssociations.entrySet()) { String propertyName = entry.getKey(); String propertyType = entry.getValue(); - visitor.visitAssociation(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); + visitor.visitOneToManyAssociation(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); } - for (Map.Entry<String, String> entry : nmAssociations.entrySet()) { + for (Map.Entry<String, String> entry : manyToManyAssociations.entrySet()) { String propertyName = entry.getKey(); String propertyType = entry.getValue(); - visitor.visitNmAssociation(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); + visitor.visitManyToManyAssociation(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); } - for (Map.Entry<String, String> entry : required.entrySet()) { + for (Map.Entry<String, String> entry : manyToOneAssociations.entrySet()) { String propertyName = entry.getKey(); String propertyType = entry.getValue(); - visitor.visitRequired(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); + visitor.visitManyToOneAssociation(metadataModel, this, propertyName, metadataModel.getEntity(propertyType)); } for (Map.Entry<String, String> entry : properties.entrySet()) { String propertyName = entry.getKey(); @@ -251,7 +251,7 @@ public class TopiaMetadataEntity { } public boolean withShell() { - return !(reversedAssociations.isEmpty() && associations.isEmpty() && nmAssociations.isEmpty()); + return !(reversedAssociations.isEmpty() && oneToManyAssociations.isEmpty() && manyToManyAssociations.isEmpty()); } private void addDbColumnName(String name, String dbColumnName) { diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java b/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java index 3573c3a..a41b311 100644 --- a/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java +++ b/observe-topia-extension/src/main/java/org/nuiton/topia/persistence/metadata/TopiaMetadataModelVisitor.java @@ -46,11 +46,11 @@ public interface TopiaMetadataModelVisitor { void visitReversedAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); - void visitAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); + void visitOneToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); - void visitNmAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); + void visitManyToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); - void visitRequired(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); + void visitManyToOneAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType); void visitProperty(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, String propertyType); @@ -82,17 +82,17 @@ public interface TopiaMetadataModelVisitor { } @Override - public void visitAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitOneToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { } @Override - public void visitNmAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitManyToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { } @Override - public void visitRequired(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitManyToOneAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { } @@ -141,24 +141,24 @@ public interface TopiaMetadataModelVisitor { } @Override - public void visitAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { - appendProperty("Association: ", metadataEntity, propertyName, propertyType.getType()); + public void visitOneToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + appendProperty("OneToManyAssociation: ", metadataEntity, propertyName, propertyType.getType()); if (visited.add(propertyType.getType())) { propertyType.accept(this, metadataModel); } } @Override - public void visitNmAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { - appendProperty("NmAssociation: ", metadataEntity, propertyName, propertyType.getType()); + public void visitManyToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + appendProperty("ManyToManyAssociation: ", metadataEntity, propertyName, propertyType.getType()); if (visited.add(propertyType.getType())) { propertyType.accept(this, metadataModel); } } @Override - public void visitRequired(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { - appendProperty("Required: ", metadataEntity, propertyName, propertyType.getType()); + public void visitManyToOneAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + appendProperty("ManyToOneAssociation: ", metadataEntity, propertyName, propertyType.getType()); if (visited.add(propertyType.getType())) { propertyType.accept(this, metadataModel); } @@ -217,21 +217,21 @@ public interface TopiaMetadataModelVisitor { } @Override - public void visitAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitOneToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { if (!deepVisit) { appendProperty("Association: ", metadataEntity, propertyName, propertyType.getType()); } } @Override - public void visitNmAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitManyToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { if (!deepVisit) { appendProperty("NmAssociation: ", metadataEntity, propertyName, propertyType.getType()); } } @Override - public void visitRequired(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitManyToOneAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { if (!deepVisit) { appendProperty("Required: ", metadataEntity, propertyName, propertyType.getType()); } diff --git a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java b/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java index 2da7191..b60d321 100644 --- a/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java +++ b/observe-topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/tables/TopiaSqlTablesFactory.java @@ -151,7 +151,7 @@ public class TopiaSqlTablesFactory { } @Override - public void visitAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitOneToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { if (predicate.acceptAssociation(metadataEntity, propertyName, propertyType)) { @@ -170,7 +170,7 @@ public class TopiaSqlTablesFactory { } @Override - public void visitNmAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitManyToManyAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { if (predicate.acceptNmAssociation(metadataEntity, propertyName, propertyType)) { @@ -182,7 +182,7 @@ public class TopiaSqlTablesFactory { } @Override - public void visitRequired(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { + public void visitManyToOneAssociation(TopiaMetadataModel metadataModel, TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { } @Override diff --git a/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java b/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java index 950ae90..b667aab 100644 --- a/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java +++ b/observe-topia-templates-extension/src/main/java/org/nuiton/topia/templates/TopiaMetadataModelGenerator.java @@ -216,13 +216,13 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { if (optionalEntity.isPresent()) { TopiaMetadataEntity parentMetadataEntity = optionalEntity.get(); - metadataEntity.getAssociations().putAll(parentMetadataEntity.getAssociations()); + metadataEntity.getOneToManyAssociations().putAll(parentMetadataEntity.getOneToManyAssociations()); metadataEntity.getReversedAssociations().putAll(parentMetadataEntity.getReversedAssociations()); - metadataEntity.getNmAssociations().putAll(parentMetadataEntity.getNmAssociations()); - metadataEntity.getRequired().putAll(parentMetadataEntity.getRequired()); + metadataEntity.getManyToManyAssociations().putAll(parentMetadataEntity.getManyToManyAssociations()); + metadataEntity.getManyToOneAssociations().putAll(parentMetadataEntity.getManyToOneAssociations()); metadataEntity.getProperties().putAll(parentMetadataEntity.getProperties()); metadataEntity.getDbColumnsName().putAll(parentMetadataEntity.getDbColumnsName()); - metadataEntity.getDbColumnsName().putAll(parentMetadataEntity.getDbNmAssociationsName()); + metadataEntity.getDbColumnsName().putAll(parentMetadataEntity.getDbManyToManyAssociationsTableName()); applyInheritance(metadataEntity, superClass, metadataModel); @@ -323,18 +323,18 @@ public class TopiaMetadataModelGenerator extends ObjectModelGenerator { // many to many String tableName = templateHelper.getManyToManyTableName(attr); - metadataEntity.addNmAssociation(attributeClazz, name, attrColumn, tableName); + metadataEntity.addManyToManyAssociation(attributeClazz, name, attrColumn, tableName); } else { // one to many - metadataEntity.addAssociation(attributeClazz, name, attrColumn); + metadataEntity.addOneToManyAssociation(attributeClazz, name, attrColumn); } } else { if (GeneratorUtil.isNMultiplicity(attr.getReverseMaxMultiplicity()) && !attr.hasAssociationClass()) { // many to one - metadataEntity.addRequired(attributeClazz, name, attrColumn); + metadataEntity.addManyToOneAssociation(attributeClazz, name, attrColumn); } else { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.