This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit c8df80cf533507404f960e77a937b5cdd55ff1e6 Author: Andrus Adamchik <[email protected]> AuthorDate: Sun Jul 19 18:30:32 2026 +0200 NameBuilder cleanup "preferredName" "build" --- .../dbsync/merge/context/EntityMergeSupport.java | 6 +- .../merge/token/model/AddRelationshipToModel.java | 4 +- .../merge/token/model/CreateTableToModel.java | 4 +- .../apache/cayenne/dbsync/naming/NameBuilder.java | 12 +-- .../dbimport/ManyToManyCandidateEntity.java | 4 +- .../dbsync/reverse/dbload/RelationshipLoader.java | 4 +- .../cayenne/dbsync/naming/NameBuilderTest.java | 88 +++++++++++----------- .../modeler/ui/action/CreateAttributeAction.java | 6 +- .../ui/action/CreateCallbackMethodAction.java | 4 +- .../modeler/ui/action/CreateDataMapAction.java | 2 +- .../modeler/ui/action/CreateDbEntityAction.java | 2 +- .../modeler/ui/action/CreateEmbeddableAction.java | 2 +- .../modeler/ui/action/CreateNodeAction.java | 2 +- .../modeler/ui/action/CreateObjEntityAction.java | 6 +- .../modeler/ui/action/CreateProcedureAction.java | 2 +- .../ui/action/CreateProcedureParameterAction.java | 2 +- .../modeler/ui/action/ImportDataMapAction.java | 4 +- .../modeler/ui/action/ImportEOModelAction.java | 4 +- .../modeler/ui/action/NewProjectAction.java | 2 +- .../cayenne/modeler/ui/action/PasteAction.java | 72 +++++++++--------- .../autorelationship/InferRelationshipsDialog.java | 4 +- .../ui/dbrelationship/DbRelationshipDialog.java | 10 +-- .../relinfo/ObjRelationshipInfoDialog.java | 2 +- .../ui/project/querytype/QueryTypeDialog.java | 2 +- .../apache/cayenne/wocompat/EOModelProcessor.java | 4 +- 25 files changed, 127 insertions(+), 127 deletions(-) diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java index 2b4162dfe..39d17d048 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/context/EntityMergeSupport.java @@ -202,8 +202,8 @@ public class EntityMergeSupport { private boolean createObjRelationship(ObjEntity entity, DbRelationship dr, String targetEntityName) { ObjRelationship or = new ObjRelationship(); or.setName(NameBuilder.of(or, entity) - .baseName(nameGenerator.objRelationshipName(dr)) - .name()); + .preferredName(nameGenerator.objRelationshipName(dr)) + .build()); or.addDbRelationship(dr); Map<String, ObjEntity> objEntities = entity.getDataMap().getSubclassesForObjEntity(entity); @@ -268,7 +268,7 @@ public class EntityMergeSupport { private void addMissingAttribute(ObjEntity entity, DbAttribute da) { ObjAttribute oa = new ObjAttribute(); - oa.setName(NameBuilder.of(oa, entity).baseName(nameGenerator.objAttributeName(da)).name()); + oa.setName(NameBuilder.of(oa, entity).preferredName(nameGenerator.objAttributeName(da)).build()); oa.setEntity(entity); oa.setType(getTypeForObjAttribute(da)); oa.setDbAttributePath(da.getName()); diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/AddRelationshipToModel.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/AddRelationshipToModel.java index 92abdc831..4256850f6 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/AddRelationshipToModel.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/AddRelationshipToModel.java @@ -69,8 +69,8 @@ public class AddRelationshipToModel extends AbstractToModelToken.Entity { // Set name to relationship if it was created without it, e.g. in createReverse() action if (relationship.getName() == null) { relationship.setName(NameBuilder.of(relationship, getEntity()) - .baseName(context.getNameGenerator().dbRelationshipName(relationship.getJoins(), relationship.isToMany())) - .name()); + .preferredName(context.getNameGenerator().dbRelationshipName(relationship.getJoins(), relationship.isToMany())) + .build()); } getEntity().addRelationship(relationship); diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/CreateTableToModel.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/CreateTableToModel.java index c9d925522..73fd6f1df 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/CreateTableToModel.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/merge/token/model/CreateTableToModel.java @@ -66,8 +66,8 @@ public class CreateTableToModel extends AbstractToModelToken.Entity { objEntity.setName(NameBuilder .of(objEntity, dbEntity.getDataMap()) - .baseName(context.getNameGenerator().objEntityName(dbEntity)) - .name()); + .preferredName(context.getNameGenerator().objEntityName(dbEntity)) + .build()); objEntity.setDbEntity(getEntity()); // try to find a class name for the ObjEntity diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/NameBuilder.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/NameBuilder.java index be98020db..58c939ec5 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/NameBuilder.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/NameBuilder.java @@ -57,7 +57,7 @@ public class NameBuilder { private final ConfigurationNode nodeToName; private final ConfigurationNode parent; private String dupesPattern; - private String baseName; + private String preferredName; private NameBuilder(ConfigurationNode nodeToName, ConfigurationNode parent) { this.nodeToName = Objects.requireNonNull(nodeToName); @@ -70,14 +70,14 @@ public class NameBuilder { return this; } - public NameBuilder baseName(String baseName) { - this.baseName = baseName; + public NameBuilder preferredName(String preferredName) { + this.preferredName = preferredName; return this; } - public String name() { - String baseName = this.baseName != null && !this.baseName.isEmpty() - ? this.baseName + public String build() { + String baseName = this.preferredName != null && !this.preferredName.isEmpty() + ? this.preferredName : defaultBaseName(nodeToName); String normalizedBaseName = normalize(nodeToName, baseName); diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java index 2e6a0e91b..a0f8afc74 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbimport/ManyToManyCandidateEntity.java @@ -101,8 +101,8 @@ class ManyToManyCandidateEntity { ObjRelationship newRelationship = new ObjRelationship(); newRelationship.setName(NameBuilder .of(newRelationship, srcEntity) - .baseName(nameGenerator.objRelationshipName(rel1, rel2)) - .name()); + .preferredName(nameGenerator.objRelationshipName(rel1, rel2)) + .build()); newRelationship.setSourceEntity(srcEntity); newRelationship.setTargetEntityName(dstEntity); diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java index aa7a90680..80eed2a24 100644 --- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java +++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java @@ -105,8 +105,8 @@ public class RelationshipLoader extends AbstractLoader { private void setRelationshipName(DbEntity entity, DbRelationship relationship) { relationship.setName(NameBuilder .of(relationship, entity) - .baseName(nameGenerator.dbRelationshipName(relationship.getJoins(), relationship.isToMany())) - .name()); + .preferredName(nameGenerator.dbRelationshipName(relationship.getJoins(), relationship.isToMany())) + .build()); } private void checkAndAddRelationship(DbEntity entity, DbRelationship relationship){ diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/naming/NameBuilderTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/naming/NameBuilderTest.java index 434b9ab36..f4fad8c60 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/naming/NameBuilderTest.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/naming/NameBuilderTest.java @@ -39,233 +39,233 @@ import static org.junit.jupiter.api.Assertions.assertEquals; public class NameBuilderTest { @Test - public void name_Root() { - assertEquals("project", NameBuilder.of(new DataChannelDescriptor(), null).name()); + public void build_Root() { + assertEquals("project", NameBuilder.of(new DataChannelDescriptor(), null).build()); } @Test - public void name_DataChannelDescriptorContext() throws Exception { + public void build_DataChannelDescriptorContext() throws Exception { DataChannelDescriptor descriptor = new DataChannelDescriptor(); DataMap m0 = new DataMap(); - m0.setName(NameBuilder.of(m0, descriptor).name()); + m0.setName(NameBuilder.of(m0, descriptor).build()); assertEquals("datamap", m0.getName()); descriptor.getDataMaps().add(m0); DataMap m1 = new DataMap(); - m1.setName(NameBuilder.of(m1, descriptor).name()); + m1.setName(NameBuilder.of(m1, descriptor).build()); assertEquals("datamap1", m1.getName()); descriptor.getDataMaps().add(m1); DataNodeDescriptor nd0 = new DataNodeDescriptor(); - nd0.setName(NameBuilder.of(nd0, descriptor).name()); + nd0.setName(NameBuilder.of(nd0, descriptor).build()); assertEquals("datanode", nd0.getName()); descriptor.getNodeDescriptors().add(nd0); DataNodeDescriptor nd1 = new DataNodeDescriptor(); - nd1.setName(NameBuilder.of(nd1, descriptor).name()); + nd1.setName(NameBuilder.of(nd1, descriptor).build()); assertEquals("datanode1", nd1.getName()); descriptor.getNodeDescriptors().add(nd1); } @Test - public void name_DataMapContext() { + public void build_DataMapContext() { DataMap map = new DataMap(); map.setDefaultPackage("com.foo"); DbEntity de0 = new DbEntity(); - de0.setName(NameBuilder.of(de0, map).name()); + de0.setName(NameBuilder.of(de0, map).build()); assertEquals("db_entity", de0.getName()); map.addDbEntity(de0); DbEntity de1 = new DbEntity(); - de1.setName(NameBuilder.of(de1, map).name()); + de1.setName(NameBuilder.of(de1, map).build()); assertEquals("db_entity1", de1.getName()); map.addDbEntity(de1); ObjEntity oe0 = new ObjEntity(); - oe0.setName(NameBuilder.of(oe0, map).name()); + oe0.setName(NameBuilder.of(oe0, map).build()); assertEquals("ObjEntity", oe0.getName()); map.addObjEntity(oe0); ObjEntity oe1 = new ObjEntity(); - oe1.setName(NameBuilder.of(oe1, map).name()); + oe1.setName(NameBuilder.of(oe1, map).build()); assertEquals("ObjEntity1", oe1.getName()); map.addObjEntity(oe1); ObjEntity oe2 = new ObjEntity(); - oe2.setName(NameBuilder.of(oe0, map).baseName("db_entity").name()); + oe2.setName(NameBuilder.of(oe0, map).preferredName("db_entity").build()); assertEquals("Db_entity", oe2.getName(), "Should not conflict with similarly named DbEntity"); map.addObjEntity(oe2); Procedure p0 = new Procedure(); - p0.setName(NameBuilder.of(p0, map).name()); + p0.setName(NameBuilder.of(p0, map).build()); assertEquals("procedure", p0.getName()); map.addProcedure(p0); Procedure p1 = new Procedure(); - p1.setName(NameBuilder.of(p1, map).name()); + p1.setName(NameBuilder.of(p1, map).build()); assertEquals("procedure1", p1.getName()); map.addProcedure(p1); Procedure p2 = new Procedure(); - p2.setName(NameBuilder.of(p1, map).baseName("db_enity").name()); + p2.setName(NameBuilder.of(p1, map).preferredName("db_enity").build()); assertEquals("db_enity", p2.getName(), "Should not conflict with similarly named DbEntity"); map.addProcedure(p2); QueryDescriptor q0 = QueryDescriptor.selectQueryDescriptor(); - q0.setName(NameBuilder.of(q0, map).name()); + q0.setName(NameBuilder.of(q0, map).build()); assertEquals("query", q0.getName()); map.addQueryDescriptor(q0); QueryDescriptor q1 = QueryDescriptor.ejbqlQueryDescriptor(); - q1.setName(NameBuilder.of(q1, map).name()); + q1.setName(NameBuilder.of(q1, map).build()); assertEquals("query1", q1.getName()); map.addQueryDescriptor(q1); Embeddable e0 = new Embeddable(); - e0.setClassName("com.foo." + NameBuilder.of(e0, map).name()); + e0.setClassName("com.foo." + NameBuilder.of(e0, map).build()); assertEquals("com.foo.Embeddable", e0.getClassName()); map.addEmbeddable(e0); Embeddable e1 = new Embeddable(); - e1.setClassName("com.foo." + NameBuilder.of(e1, map).name()); + e1.setClassName("com.foo." + NameBuilder.of(e1, map).build()); assertEquals("com.foo.Embeddable1", e1.getClassName()); map.addEmbeddable(e1); } @Test - public void name_ObjEntityContext() { + public void build_ObjEntityContext() { ObjEntity entity = new ObjEntity(); entity.getCallbackMap().getPostAdd().addCallbackMethod("getMe"); ObjAttribute a0 = new ObjAttribute(); - String na0 = NameBuilder.of(a0, entity).name(); + String na0 = NameBuilder.of(a0, entity).build(); assertEquals("untitledAttr", na0); a0.setName(na0); entity.addAttribute(a0); ObjAttribute a1 = new ObjAttribute(); - String na1 = NameBuilder.of(a1, entity).name(); + String na1 = NameBuilder.of(a1, entity).build(); assertEquals("untitledAttr1", na1); a1.setName(na1); entity.addAttribute(a1); ObjAttribute a2 = new ObjAttribute(); - String na2 = NameBuilder.of(a2, entity).baseName("me").name(); + String na2 = NameBuilder.of(a2, entity).preferredName("me").build(); assertEquals("me1", na2, "Conflict with callback method was not detected"); a2.setName(na2); entity.addAttribute(a2); ObjRelationship r0 = new ObjRelationship(); - String nr0 = NameBuilder.of(r0, entity).name(); + String nr0 = NameBuilder.of(r0, entity).build(); assertEquals("untitledRel", nr0); r0.setName(nr0); entity.addRelationship(r0); ObjRelationship r1 = new ObjRelationship(); - String nr1 = NameBuilder.of(r1, entity).name(); + String nr1 = NameBuilder.of(r1, entity).build(); assertEquals("untitledRel1", nr1); r1.setName(nr1); entity.addRelationship(r1); } @Test - public void name_DbEntityContext() { + public void build_DbEntityContext() { DbEntity entity = new DbEntity(); DbAttribute a0 = new DbAttribute(); - String na0 = NameBuilder.of(a0, entity).name(); + String na0 = NameBuilder.of(a0, entity).build(); assertEquals("untitledAttr", na0); a0.setName(na0); entity.addAttribute(a0); DbAttribute a1 = new DbAttribute(); - String na1 = NameBuilder.of(a1, entity).name(); + String na1 = NameBuilder.of(a1, entity).build(); assertEquals("untitledAttr1", na1); a1.setName(na1); entity.addAttribute(a1); DbRelationship r0 = new DbRelationship(); - String nr0 = NameBuilder.of(r0, entity).name(); + String nr0 = NameBuilder.of(r0, entity).build(); assertEquals("untitledRel", nr0); r0.setName(nr0); entity.addRelationship(r0); DbRelationship r1 = new DbRelationship(); - String nr1 = NameBuilder.of(r1, entity).name(); + String nr1 = NameBuilder.of(r1, entity).build(); assertEquals("untitledRel1", nr1); r1.setName(nr1); entity.addRelationship(r1); } @Test - public void name_ProcedureContext() { + public void build_ProcedureContext() { Procedure procedure = new Procedure(); ProcedureParameter p0 = new ProcedureParameter(); - p0.setName(NameBuilder.of(p0, procedure).name()); + p0.setName(NameBuilder.of(p0, procedure).build()); assertEquals("UntitledProcedureParameter", p0.getName()); procedure.addCallParameter(p0); ProcedureParameter p1 = new ProcedureParameter(); - p1.setName(NameBuilder.of(p1, procedure).name()); + p1.setName(NameBuilder.of(p1, procedure).build()); assertEquals("UntitledProcedureParameter1", p1.getName()); procedure.addCallParameter(p1); } @Test - public void name_EmbeddableContext() { + public void build_EmbeddableContext() { Embeddable embeddable = new Embeddable(); EmbeddableAttribute ea0 = new EmbeddableAttribute(); - ea0.setName(NameBuilder.of(ea0, embeddable).name()); + ea0.setName(NameBuilder.of(ea0, embeddable).build()); assertEquals("untitledAttr", ea0.getName()); embeddable.addAttribute(ea0); EmbeddableAttribute ea1 = new EmbeddableAttribute(); - ea1.setName(NameBuilder.of(ea1, embeddable).name()); + ea1.setName(NameBuilder.of(ea1, embeddable).build()); assertEquals("untitledAttr1", ea1.getName()); embeddable.addAttribute(ea1); } @Test - public void name_UncapitalizeAttributeNames() throws Exception { + public void build_UncapitalizeAttributeNames() throws Exception { ObjEntity entity = new ObjEntity(); ObjAttribute a0 = new ObjAttribute(); - String na0 = NameBuilder.of(a0, entity).baseName("myName").name(); + String na0 = NameBuilder.of(a0, entity).preferredName("myName").build(); assertEquals("myName", na0); a0.setName(na0); entity.addAttribute(a0); ObjAttribute a1 = new ObjAttribute(); - String na1 = NameBuilder.of(a1, entity).baseName("MyName").name(); + String na1 = NameBuilder.of(a1, entity).preferredName("MyName").build(); assertEquals("myName1", na1); a1.setName(na1); entity.addAttribute(a1); } @Test - public void name_Callbacks_ObjEntityContext() { + public void build_Callbacks_ObjEntityContext() { ObjEntity entity = new ObjEntity(); - String c0 = NameBuilder.of(new CallbackNode(), entity).name(); + String c0 = NameBuilder.of(new CallbackNode(), entity).build(); assertEquals("onEvent", c0); entity.getCallbackMap().getPostAdd().addCallbackMethod(c0); - String c1 = NameBuilder.of(new CallbackNode(), entity).name(); + String c1 = NameBuilder.of(new CallbackNode(), entity).build(); assertEquals("onEvent1", c1); entity.getCallbackMap().getPostAdd().addCallbackMethod(c1); entity.addAttribute(new ObjAttribute("untitledAttr")); - String c3 = NameBuilder.of(new CallbackNode(), entity).baseName("getUntitledAttr").name(); + String c3 = NameBuilder.of(new CallbackNode(), entity).preferredName("getUntitledAttr").build(); assertEquals("getUntitledAttr1", c3); entity.getCallbackMap().getPostAdd().addCallbackMethod(c3); } diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java index fbf5f8185..2608dbad7 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java @@ -111,7 +111,7 @@ public class CreateAttributeAction extends AppAction { EmbeddableAttribute attr = new EmbeddableAttribute(); attr.setName(NameBuilder .of(attr, embeddable) - .name()); + .build()); createEmbAttribute(embeddable, attr); @@ -124,7 +124,7 @@ public class CreateAttributeAction extends AppAction { ObjEntity objEntity = session.getSelectedObjEntity(); ObjAttribute attr = new ObjAttribute(); - attr.setName(NameBuilder.of(attr, objEntity).name()); + attr.setName(NameBuilder.of(attr, objEntity).build()); createObjAttribute(session.getSelectedDataMap(), objEntity, attr); @@ -135,7 +135,7 @@ public class CreateAttributeAction extends AppAction { DbEntity dbEntity = getProjectSession().getSelectedDbEntity(); DbAttribute attr = new DbAttribute(); - attr.setName(NameBuilder.of(attr, dbEntity).name()); + attr.setName(NameBuilder.of(attr, dbEntity).build()); attr.setType(TypesMapping.NOT_DEFINED); attr.setEntity(dbEntity); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java index 469e7d2e6..8ab4879b9 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateCallbackMethodAction.java @@ -58,8 +58,8 @@ public class CreateCallbackMethodAction extends AppAction { String methodName = NameBuilder .of(new CallbackNode(), getProjectSession().getSelectedObjEntity()) - .baseName(toMethodName(callbackType.getType())) - .name(); + .preferredName(toMethodName(callbackType.getType())) + .build(); createCallbackMethod(callbackType, methodName); app.getUndoManager().addEdit( diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java index 8d384946f..374d60f70 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java @@ -73,7 +73,7 @@ public class CreateDataMapAction extends AppAction { .getRootNode(); DataMap map = new DataMap(); - map.setName(NameBuilder.of(map, dataChannelDescriptor).name()); + map.setName(NameBuilder.of(map, dataChannelDescriptor).build()); onMapCreated(this, getProjectSession(), map); app.getUndoManager().addEdit(new CreateDataMapUndoableEdit(getProjectSession(), dataChannelDescriptor, map)); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java index d9ffabdce..6fb7c310a 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java @@ -63,7 +63,7 @@ public class CreateDbEntityAction extends AppAction { public void performAction(ActionEvent e) { DataMap map = getProjectSession().getSelectedDataMap(); DbEntity entity = new DbEntity(); - entity.setName(NameBuilder.of(entity, map).name()); + entity.setName(NameBuilder.of(entity, map).build()); createEntity(map, entity); app.getUndoManager().addEdit(new CreateDbEntityUndoableEdit(getProjectSession(), map, entity)); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java index cb4c4cb18..0e4792576 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java @@ -68,7 +68,7 @@ public class CreateEmbeddableAction extends AppAction { DataMap dataMap = getProjectSession().getSelectedDataMap(); Embeddable embeddable = new Embeddable(); - String baseName = NameBuilder.of(embeddable, dataMap).name(); + String baseName = NameBuilder.of(embeddable, dataMap).build(); String nameWithPackage = dataMap.getNameWithDefaultPackage(baseName); embeddable.setClassName(nameWithPackage); createEmbeddable(dataMap, embeddable); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateNodeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateNodeAction.java index dd7bb5f06..c5caf437c 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateNodeAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateNodeAction.java @@ -91,7 +91,7 @@ public class CreateNodeAction extends AppAction { */ DataNodeDescriptor buildDataNode(DataChannelDescriptor dataChannelDescriptor) { DataNodeDescriptor node = new DataNodeDescriptor(); - node.setName(NameBuilder.of(node, dataChannelDescriptor).name()); + node.setName(NameBuilder.of(node, dataChannelDescriptor).build()); node.setDataChannelDescriptor(dataChannelDescriptor); return node; diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java index 56062ade1..8c61b0b8b 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java @@ -76,7 +76,7 @@ public class CreateObjEntityAction extends AppAction { DataMap dataMap = session.getSelectedDataMap(); ObjEntity entity = new ObjEntity(); - entity.setName(NameBuilder.of(entity, dataMap).name()); + entity.setName(NameBuilder.of(entity, dataMap).build()); // init defaults entity.setSuperClassName(dataMap.getDefaultSuperclass()); @@ -90,8 +90,8 @@ public class CreateObjEntityAction extends AppAction { String baseName = new DefaultObjectNameGenerator(NoStemStemmer.getInstance()).objEntityName(dbEntity); entity.setName(NameBuilder .of(entity, dbEntity.getDataMap()) - .baseName(baseName) - .name()); + .preferredName(baseName) + .build()); } entity.setClassName(dataMap.getNameWithDefaultPackage(entity.getName())); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java index a82edfa1b..7d3b40d4e 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java @@ -61,7 +61,7 @@ public class CreateProcedureAction extends AppAction { DataMap map = getProjectSession().getSelectedDataMap(); Procedure procedure = new Procedure(); - procedure.setName(NameBuilder.of(procedure, map).name()); + procedure.setName(NameBuilder.of(procedure, map).build()); createProcedure(map, procedure); app.getUndoManager().addEdit(new CreateProcedureUndoableEdit(getProjectSession(), map, procedure)); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java index 6b134bf56..2c3ad3d76 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java @@ -71,7 +71,7 @@ public class CreateProcedureParameterAction extends AppAction { if (getProjectSession().getSelectedProcedure() != null) { Procedure procedure = getProjectSession().getSelectedProcedure(); ProcedureParameter parameter = new ProcedureParameter(); - parameter.setName(NameBuilder.of(parameter, procedure).name()); + parameter.setName(NameBuilder.of(parameter, procedure).build()); createProcedureParameter(procedure, parameter); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java index 66a34c342..6efd9665f 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportDataMapAction.java @@ -79,8 +79,8 @@ public class ImportDataMapAction extends AppAction { ConfigurationNode root = getProjectSession().project().getRootNode(); newMap.setName(NameBuilder .of(newMap, root) - .baseName(newMap.getName()) - .name()); + .preferredName(newMap.getName()) + .build()); Resource baseResource = ((DataChannelDescriptor) root).getConfigurationSource(); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java index f9e4e4041..2f3c367ff 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java @@ -286,8 +286,8 @@ public class ImportEOModelAction extends AppAction { ConfigurationNode root = session.project().getRootNode(); map.setName(NameBuilder .of(map, root) - .baseName(map.getName()) - .name()); + .preferredName(map.getName()) + .build()); // side effect of this operation is that if a node was created, this DataMap // will be linked with it... diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java index 46e5acf4e..d02339647 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/NewProjectAction.java @@ -62,7 +62,7 @@ public class NewProjectAction extends AppAction { dataChannelDescriptor.setName(NameBuilder .of(dataChannelDescriptor, null) - .name()); + .build()); Project project = new Project(new ConfigurationTree<>(dataChannelDescriptor)); diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java index 540b8a9ef..7079960e1 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/PasteAction.java @@ -160,9 +160,9 @@ public class PasteAction extends AppAction implements FlavorListener { dataMap.setName(NameBuilder .of(dataMap, dataChannelDescriptor) - .baseName(dataMap.getName()) + .preferredName(dataMap.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); // Update all names in the new DataMap, so that they would not conflict with // names from other datamaps of this domain. @@ -175,9 +175,9 @@ public class PasteAction extends AppAction implements FlavorListener { String oldName = dbEntity.getName(); dbEntity.setName(NameBuilder .of(dbEntity, dataMap) - .baseName(dbEntity.getName()) + .preferredName(dbEntity.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); if (!oldName.equals(dbEntity.getName())) { renamedDbEntities.put(oldName, dbEntity.getName()); @@ -188,9 +188,9 @@ public class PasteAction extends AppAction implements FlavorListener { String oldName = objEntity.getName(); objEntity.setName(NameBuilder .of(objEntity, dataMap) - .baseName(objEntity.getName()) + .preferredName(objEntity.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); if (!oldName.equals(objEntity.getName())) { renamedObjEntities.put(oldName, objEntity.getName()); @@ -200,24 +200,24 @@ public class PasteAction extends AppAction implements FlavorListener { for (Embeddable embeddable : dataMap.getEmbeddables()) { embeddable.setClassName(NameBuilder .of(embeddable, dataMap) - .baseName(embeddable.getClassName()) + .preferredName(embeddable.getClassName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); } for (Procedure procedure : dataMap.getProcedures()) { procedure.setName(NameBuilder .of(procedure, dataMap) - .baseName(procedure.getName()) + .preferredName(procedure.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); } for (QueryDescriptor query : dataMap.getQueryDescriptors()) { query.setName(NameBuilder.of(query, dataMap) - .baseName(query.getName()) + .preferredName(query.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); } // if an entity was renamed, we rename all links to it too @@ -258,18 +258,18 @@ public class PasteAction extends AppAction implements FlavorListener { if (content instanceof DbEntity dbEntity) { dbEntity.setName(NameBuilder .of(dbEntity, dataMap) - .baseName(dbEntity.getName()) + .preferredName(dbEntity.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); dataMap.addDbEntity(dbEntity); CreateDbEntityAction.onDbEntityCreated(this, session, dbEntity); } else if (content instanceof ObjEntity objEntity) { // paste ObjEntity to DataMap objEntity.setName(NameBuilder.of(objEntity, dataMap) - .baseName(objEntity.getName()) + .preferredName(objEntity.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); dataMap.addObjEntity(objEntity); CreateObjEntityAction.onObjEntityCreated( @@ -281,9 +281,9 @@ public class PasteAction extends AppAction implements FlavorListener { // paste Embeddable to DataMap embeddable.setClassName(NameBuilder .of(embeddable, dataMap) - .baseName(embeddable.getClassName()) + .preferredName(embeddable.getClassName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); dataMap.addEmbeddable(embeddable); CreateEmbeddableAction.fireEmbeddableEvent( @@ -296,8 +296,8 @@ public class PasteAction extends AppAction implements FlavorListener { query.setName(NameBuilder .of(query, dataMap) .dupesPattern(COPY_PATTERN) - .baseName(query.getName()) - .name()); + .preferredName(query.getName()) + .build()); query.setDataMap(dataMap); dataMap.addQueryDescriptor(query); @@ -307,8 +307,8 @@ public class PasteAction extends AppAction implements FlavorListener { procedure.setName(NameBuilder .of(procedure, dataMap) .dupesPattern(COPY_PATTERN) - .baseName(procedure.getName()) - .name()); + .preferredName(procedure.getName()) + .build()); dataMap.addProcedure(procedure); CreateProcedureAction.fireProcedureEvent( @@ -323,8 +323,8 @@ public class PasteAction extends AppAction implements FlavorListener { attr.setName(NameBuilder .of(attr, dbEntity) .dupesPattern(COPY_PATTERN) - .baseName(attr.getName()) - .name()); + .preferredName(attr.getName()) + .build()); dbEntity.addAttribute(attr); CreateAttributeAction.fireDbAttributeEvent(this, session, session @@ -332,9 +332,9 @@ public class PasteAction extends AppAction implements FlavorListener { } else if (content instanceof DbRelationship rel) { rel.setName(NameBuilder .of(rel, dbEntity) - .baseName(rel.getName()) + .preferredName(rel.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); dbEntity.addRelationship(rel); CreateRelationshipAction.fireDbRelationshipEvent( @@ -348,9 +348,9 @@ public class PasteAction extends AppAction implements FlavorListener { if (content instanceof ObjAttribute attr) { attr.setName(NameBuilder .of(attr, objEntity) - .baseName(attr.getName()) + .preferredName(attr.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); objEntity.addAttribute(attr); CreateAttributeAction.fireObjAttributeEvent(this, session, session @@ -358,9 +358,9 @@ public class PasteAction extends AppAction implements FlavorListener { } else if (content instanceof ObjRelationship rel) { rel.setName(NameBuilder .of(rel, objEntity) - .baseName(rel.getName()) + .preferredName(rel.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); objEntity.addRelationship(rel); CreateRelationshipAction.fireObjRelationshipEvent( @@ -372,9 +372,9 @@ public class PasteAction extends AppAction implements FlavorListener { method.setName(NameBuilder .of(new CallbackNode(), objEntity) - .baseName(method.getName()) + .preferredName(method.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); objEntity.getCallbackMap() .getCallbackDescriptor(method.getCallbackType().getType()) @@ -389,9 +389,9 @@ public class PasteAction extends AppAction implements FlavorListener { if (content instanceof EmbeddableAttribute attr) { attr.setName(NameBuilder .of(attr, embeddable) - .baseName(attr.getName()) + .preferredName(attr.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); embeddable.addAttribute(attr); CreateAttributeAction.fireEmbeddableAttributeEvent( @@ -408,9 +408,9 @@ public class PasteAction extends AppAction implements FlavorListener { param.setName(NameBuilder .of(param, procedure) - .baseName(param.getName()) + .preferredName(param.getName()) .dupesPattern(COPY_PATTERN) - .name()); + .build()); procedure.addCallParameter(param); CreateProcedureParameterAction.fireProcedureParameterEvent( diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java index 11acb7dbf..5ba252289 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/autorelationship/InferRelationshipsDialog.java @@ -312,8 +312,8 @@ public class InferRelationshipsDialog extends ProjectDialog { } myir.setName(NameBuilder.of(localRelationship, localRelationship.getSourceEntity()) - .baseName(strategy.dbRelationshipName(localRelationship.getJoins(), localRelationship.isToMany())) - .name()); + .preferredName(strategy.dbRelationshipName(localRelationship.getJoins(), localRelationship.isToMany())) + .build()); } } diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java index 3cf676afd..2940df9a4 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialog.java @@ -93,7 +93,7 @@ public class DbRelationshipDialog extends ProjectDialog { public static Optional<DbRelationship> openForCreate(ProjectSession session, Window owner, DbEntity sourceEntity) { DbRelationship relationship = new DbRelationship(); - relationship.setName(NameBuilder.of(relationship, sourceEntity).name()); + relationship.setName(NameBuilder.of(relationship, sourceEntity).build()); relationship.setSourceEntity(sourceEntity); DbRelationshipDialog dialog = new DbRelationshipDialog(session, owner, relationship, true); @@ -348,8 +348,8 @@ public class DbRelationshipDialog extends ProjectDialog { reverse = new DbRelationship(); reverse.setName(NameBuilder .of(reverse, relationship.getTargetEntity()) - .baseName(reverseName.getText().trim()) - .name()); + .preferredName(reverseName.getText().trim()) + .build()); reverse.setSourceEntity(relationship.getTargetEntity()); reverse.setTargetEntityName(relationship.getSourceEntity()); @@ -456,8 +456,8 @@ public class DbRelationshipDialog extends ProjectDialog { String newName = NameBuilder .of(rel, rel.getSourceEntity()) - .baseName(userInputName) - .name(); + .preferredName(userInputName) + .build(); if (Objects.equals(newName, rel.getName())) { return; diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java index 9dc5a5624..a6d2f2a88 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoDialog.java @@ -139,7 +139,7 @@ public class ObjRelationshipInfoDialog extends ProjectDialog implements TreeSele public ObjRelationshipInfoDialog createRelationship(ObjEntity objEntity) { ObjRelationship rel = new ObjRelationship(); - rel.setName(NameBuilder.of(rel, objEntity).name()); + rel.setName(NameBuilder.of(rel, objEntity).build()); rel.setSourceEntity(objEntity); DeleteRuleUpdater.updateObjRelationship(rel); isCreate = true; diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java index 4447fa14b..bca8b4ad7 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeDialog.java @@ -115,7 +115,7 @@ public class QueryTypeDialog extends ProjectDialog { private void createQuery() { QueryDescriptor query = QueryDescriptor.descriptor(selectedQueryType()); - query.setName(NameBuilder.of(query, dataMap).name()); + query.setName(NameBuilder.of(query, dataMap).build()); query.setDataMap(dataMap); dataMap.addQueryDescriptor(query); diff --git a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java index 5dda1e7dc..eb1eb79e1 100644 --- a/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java +++ b/modeler/cayenne-wocompat/src/main/java/org/apache/cayenne/wocompat/EOModelProcessor.java @@ -686,8 +686,8 @@ public class EOModelProcessor { DbRelationship reverse = relationship.createReverseRelationship(); reverse.setName(NameBuilder.of(reverse, reverse.getSourceEntity()) // TODO: we can do better with ObjectNameGenerator - .baseName(relationship.getName() + "Reverse") - .name()); + .preferredName(relationship.getName() + "Reverse") + .build()); relationship.getTargetEntity().addRelationship(reverse); } }
