You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ko...@apache.org on 2015/04/24 00:12:47 UTC
[02/17] cayenne git commit: CAY-1942 Refactoring of
NamedObjectFactory and NamingStrategy
CAY-1942 Refactoring of NamedObjectFactory and NamingStrategy
* Change enums first letter to lower case
* Rename SmartNameGenerator to DefaultNameGenerator; BasicNameGenerator to LegacyNamegenerator,
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/90de78de
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/90de78de
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/90de78de
Branch: refs/heads/master
Commit: 90de78de01b25c2d62bfe7e431e10aa12cb07d15
Parents: bd22051
Author: alexkolonitsky <Al...@gmail.com>
Authored: Mon Aug 18 14:18:54 2014 +0300
Committer: alexkolonitsky <Al...@gmail.com>
Committed: Mon Aug 18 14:18:54 2014 +0300
----------------------------------------------------------------------
.../org/apache/cayenne/access/DbLoader.java | 4 +-
.../access/ManyToManyCandidateEntity.java | 2 +-
.../cayenne/map/naming/BasicNameGenerator.java | 51 -----------
.../map/naming/DefaultUniqueNameGenerator.java | 4 +-
.../cayenne/map/naming/LegacyNameGenerator.java | 51 +++++++++++
.../apache/cayenne/map/naming/NameCheckers.java | 38 ++++----
.../apache/cayenne/util/EntityMergeSupport.java | 8 +-
.../access/ManyToManyCandidateEntityTest.java | 4 +-
.../map/naming/BasicNameGeneratorTest.java | 50 ----------
.../map/naming/LegacyNameGeneratorTest.java | 50 ++++++++++
.../cayenne/map/naming/NameCheckersTest.java | 66 +++++++-------
.../map/naming/DefaultNameGenerator.java | 96 ++++++++++++++++++++
.../cayenne/map/naming/SmartNameGenerator.java | 96 --------------------
.../apache/cayenne/tools/DbImporterTask.java | 4 +-
.../map/naming/DefaultNameGeneratorTest.java | 55 +++++++++++
.../map/naming/SmartNameGeneratorTest.java | 55 -----------
.../modeler/action/CreateAttributeAction.java | 6 +-
.../action/CreateCallbackMethodAction.java | 2 +-
.../modeler/action/CreateDataMapAction.java | 2 +-
.../modeler/action/CreateDbEntityAction.java | 2 +-
.../modeler/action/CreateEmbeddableAction.java | 2 +-
.../modeler/action/CreateNodeAction.java | 2 +-
.../modeler/action/CreateObjEntityAction.java | 4 +-
.../modeler/action/CreateProcedureAction.java | 2 +-
.../action/CreateProcedureParameterAction.java | 2 +-
.../action/CreateRelationshipAction.java | 4 +-
.../modeler/action/ImportDataMapAction.java | 4 +-
.../modeler/action/ImportEOModelAction.java | 2 +-
.../modeler/action/NewProjectAction.java | 2 +-
.../cayenne/modeler/action/PasteAction.java | 38 ++++----
.../dialog/ResolveDbRelationshipDialog.java | 4 +-
.../modeler/dialog/db/DbLoaderHelper.java | 4 +-
.../cayenne/modeler/dialog/query/QueryType.java | 2 +-
.../modeler/util/NameGeneratorPreferences.java | 10 +-
.../cayenne/wocompat/EOModelProcessor.java | 2 +-
35 files changed, 365 insertions(+), 365 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
index b45ce19..8ce8ece 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/DbLoader.java
@@ -47,7 +47,7 @@ import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-import org.apache.cayenne.map.naming.BasicNameGenerator;
+import org.apache.cayenne.map.naming.LegacyNameGenerator;
import org.apache.cayenne.map.naming.ExportedKey;
import org.apache.cayenne.map.naming.ObjectNameGenerator;
import org.apache.cayenne.util.EntityMergeSupport;
@@ -112,7 +112,7 @@ public class DbLoader {
* Creates new DbLoader.
*/
public DbLoader(Connection connection, DbAdapter adapter, DbLoaderDelegate delegate) {
- this(connection, adapter, delegate, new BasicNameGenerator());
+ this(connection, adapter, delegate, new LegacyNameGenerator());
}
/**
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/access/ManyToManyCandidateEntity.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/ManyToManyCandidateEntity.java b/cayenne-server/src/main/java/org/apache/cayenne/access/ManyToManyCandidateEntity.java
index 9ef4782..4f68344 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/ManyToManyCandidateEntity.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/ManyToManyCandidateEntity.java
@@ -97,7 +97,7 @@ class ManyToManyCandidateEntity {
null);
ObjRelationship newRelationship = new ObjRelationship();
- newRelationship.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjRelationship, srcEntity,
+ newRelationship.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objRelationship, srcEntity,
nameGenerator.createDbRelationshipName(key, true)));
newRelationship.setSourceEntity(srcEntity);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/map/naming/BasicNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/BasicNameGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/BasicNameGenerator.java
deleted file mode 100644
index b70045d..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/BasicNameGenerator.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.map.naming;
-
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbRelationship;
-
-/**
- * BasicNamingStrategy is an naming strategy that creates names in Cayenne's
- * old-fashioned manner, i.e. the same way Cayenne did before 3.0
- *
- * @since 3.0
- */
-public class BasicNameGenerator implements ObjectNameGenerator {
- public String createDbRelationshipName(
- ExportedKey key,
- boolean toMany) {
-
- String uglyName = (toMany) ? key.getFKTableName() + "_ARRAY" : "to_" + key.getPKTableName();
- return NameConverter.underscoredToJava(uglyName, false);
- }
-
- public String createObjEntityName(DbEntity dbEntity) {
- return NameConverter.underscoredToJava(dbEntity.getName(), true);
- }
-
- public String createObjAttributeName(DbAttribute attr) {
- return NameConverter.underscoredToJava(attr.getName(), false);
- }
-
- public String createObjRelationshipName(DbRelationship dbRel) {
- return NameConverter.underscoredToJava(dbRel.getName(), false);
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
index 63e7266..c9989d4 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/DefaultUniqueNameGenerator.java
@@ -45,8 +45,8 @@ public class DefaultUniqueNameGenerator implements UniqueNameGenerator {
public static String generate(NameChecker checker, String pattern, Object context, String baseName) {
DefaultUniqueNameGenerator generator;
- if (checker == NameCheckers.Embeddable) {
- generator = new DefaultUniqueNameGenerator(NameCheckers.Embeddable, pattern) {
+ if (checker == NameCheckers.embeddable) {
+ generator = new DefaultUniqueNameGenerator(NameCheckers.embeddable, pattern) {
@Override
public String generate(Object namingContext, String nameBase) {
String name = super.generate(namingContext, nameBase);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/map/naming/LegacyNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/LegacyNameGenerator.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/LegacyNameGenerator.java
new file mode 100644
index 0000000..1648377
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/LegacyNameGenerator.java
@@ -0,0 +1,51 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.map.naming;
+
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+
+/**
+ * BasicNamingStrategy is an naming strategy that creates names in Cayenne's
+ * old-fashioned manner, i.e. the same way Cayenne did before 3.0
+ *
+ * @since 3.0
+ */
+public class LegacyNameGenerator implements ObjectNameGenerator {
+ public String createDbRelationshipName(
+ ExportedKey key,
+ boolean toMany) {
+
+ String uglyName = (toMany) ? key.getFKTableName() + "_ARRAY" : "to_" + key.getPKTableName();
+ return NameConverter.underscoredToJava(uglyName, false);
+ }
+
+ public String createObjEntityName(DbEntity dbEntity) {
+ return NameConverter.underscoredToJava(dbEntity.getName(), true);
+ }
+
+ public String createObjAttributeName(DbAttribute attr) {
+ return NameConverter.underscoredToJava(attr.getName(), false);
+ }
+
+ public String createObjRelationshipName(DbRelationship dbRel) {
+ return NameConverter.underscoredToJava(dbRel.getName(), false);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
index df026c9..ea8f393 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/map/naming/NameCheckers.java
@@ -34,14 +34,14 @@ import org.apache.commons.lang.StringUtils;
*/
public enum NameCheckers implements NameChecker {
- DataChannelDescriptor("project") {
+ dataChannelDescriptor("project") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
return false;
}
},
- DataMap("datamap") {
+ dataMap("datamap") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
// null context is a situation when DataMap is a
@@ -63,7 +63,7 @@ public enum NameCheckers implements NameChecker {
}
},
- ObjEntity("ObjEntity") {
+ objEntity("ObjEntity") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataMap map = (DataMap) namingContext;
@@ -71,7 +71,7 @@ public enum NameCheckers implements NameChecker {
}
},
- Embeddable("Embeddable") {
+ embeddable("Embeddable") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataMap map = (DataMap) namingContext;
@@ -83,7 +83,7 @@ public enum NameCheckers implements NameChecker {
}
},
- EmbeddableAttribute("untitledAttr") {
+ embeddableAttribute("untitledAttr") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
Embeddable emb = (Embeddable) namingContext;
@@ -91,7 +91,7 @@ public enum NameCheckers implements NameChecker {
}
},
- DbEntity("db_entity") {
+ dbEntity("db_entity") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataMap map = (DataMap) namingContext;
@@ -99,7 +99,7 @@ public enum NameCheckers implements NameChecker {
}
},
- ProcedureParameter("UntitledProcedureParameter") {
+ procedureParameter("UntitledProcedureParameter") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
@@ -118,7 +118,7 @@ public enum NameCheckers implements NameChecker {
}
},
- Procedure("procedure") {
+ procedure("procedure") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataMap map = (DataMap) namingContext;
@@ -126,7 +126,7 @@ public enum NameCheckers implements NameChecker {
}
},
- Query("query") {
+ query("query") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataMap map = (DataMap) namingContext;
@@ -134,14 +134,14 @@ public enum NameCheckers implements NameChecker {
}
},
- ObjAttribute("untitledAttr") {
+ objAttribute("untitledAttr") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
- return ObjRelationship.isNameInUse(namingContext, name);
+ return objRelationship.isNameInUse(namingContext, name);
}
},
- DbAttribute("untitledAttr") {
+ dbAttribute("untitledAttr") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
Entity ent = (Entity) namingContext;
@@ -150,7 +150,7 @@ public enum NameCheckers implements NameChecker {
}
},
- DataNodeDescriptor("datanode") {
+ dataNodeDescriptor("datanode") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
DataChannelDescriptor domain = (DataChannelDescriptor) namingContext;
@@ -164,30 +164,30 @@ public enum NameCheckers implements NameChecker {
}
},
- ObjRelationship("untitledRel") {
+ objRelationship("untitledRel") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
ObjEntity ent = (ObjEntity) namingContext;
- return DbAttribute.isNameInUse(namingContext, name)
+ return dbAttribute.isNameInUse(namingContext, name)
|| ent.getCallbackMethods().contains(
"get" + StringUtils.capitalize(name));
}
},
- DbRelationship("untitledRel") {
+ dbRelationship("untitledRel") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
- return DbAttribute.isNameInUse(namingContext, name);
+ return dbAttribute.isNameInUse(namingContext, name);
}
},
- ObjCallbackMethod("ObjCallbackMethod") {
+ objCallbackMethod("ObjCallbackMethod") {
@Override
public boolean isNameInUse(Object namingContext, String name) {
ObjEntity ent = (ObjEntity) namingContext;
return name.startsWith("get")
- && DbAttribute.isNameInUse(namingContext,
+ && dbAttribute.isNameInUse(namingContext,
StringUtils.uncapitalize(name.substring(3)))
|| ent.getCallbackMethods().contains(name);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java b/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
index 2cc0002..1b1fa90 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/util/EntityMergeSupport.java
@@ -36,7 +36,7 @@ import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.naming.BasicNameGenerator;
+import org.apache.cayenne.map.naming.LegacyNameGenerator;
import org.apache.cayenne.map.naming.DefaultUniqueNameGenerator;
import org.apache.cayenne.map.naming.NameCheckers;
import org.apache.cayenne.map.naming.ObjectNameGenerator;
@@ -75,7 +75,7 @@ public class EntityMergeSupport {
protected List<EntityMergeListener> listeners;
public EntityMergeSupport(DataMap map) {
- this(map, new BasicNameGenerator(), true);
+ this(map, new LegacyNameGenerator(), true);
}
/**
@@ -172,7 +172,7 @@ public class EntityMergeSupport {
String attrName = nameGenerator.createObjAttributeName(da);
// avoid duplicate names
- attrName = DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, entity, attrName);
+ attrName = DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, entity, attrName);
String type = TypesMapping.getJavaBySqlType(da.getType());
@@ -198,7 +198,7 @@ public class EntityMergeSupport {
// avoid duplicate names
String relationshipName = nameGenerator.createObjRelationshipName(dr);
- relationshipName = DefaultUniqueNameGenerator.generate(NameCheckers.ObjRelationship, entity, relationshipName);
+ relationshipName = DefaultUniqueNameGenerator.generate(NameCheckers.objRelationship, entity, relationshipName);
ObjRelationship or = new ObjRelationship(relationshipName);
or.addDbRelationship(dr);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java b/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
index eb9b6fe..7be3c3d 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/access/ManyToManyCandidateEntityTest.java
@@ -38,7 +38,7 @@ import org.apache.cayenne.di.spi.DefaultClassLoaderManager;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.map.naming.BasicNameGenerator;
+import org.apache.cayenne.map.naming.LegacyNameGenerator;
import org.apache.cayenne.resource.URLResource;
import java.net.URL;
@@ -89,7 +89,7 @@ public class ManyToManyCandidateEntityTest extends TestCase {
public void testOptimisationForManyToManyEntity() {
ObjEntity manyToManyEntity = map.getObjEntity("Table1Table2");
- ManyToManyCandidateEntity.build(manyToManyEntity).optimizeRelationships(new BasicNameGenerator());
+ ManyToManyCandidateEntity.build(manyToManyEntity).optimizeRelationships(new LegacyNameGenerator());
ObjEntity table1Entity = map.getObjEntity("Table1");
ObjEntity table2Entity = map.getObjEntity("Table2");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/test/java/org/apache/cayenne/map/naming/BasicNameGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/BasicNameGeneratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/BasicNameGeneratorTest.java
deleted file mode 100644
index e0bd5c0..0000000
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/BasicNameGeneratorTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.map.naming;
-
-import junit.framework.TestCase;
-
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbRelationship;
-
-public class BasicNameGeneratorTest extends TestCase {
- public void testStrategy() throws Exception {
- BasicNameGenerator strategy = new BasicNameGenerator();
-
- ExportedKey key = new ExportedKey("ARTIST", "ARTIST_ID", null,
- "PAINTING", "ARTIST_ID", null);
- assertEquals(strategy.createDbRelationshipName(key, false), "toArtist");
- assertEquals(strategy.createDbRelationshipName(key, true), "paintingArray");
-
- key = new ExportedKey("PERSON", "PERSON_ID", null,
- "PERSON", "MOTHER_ID", null);
- assertEquals(strategy.createDbRelationshipName(key, false), "toPerson");
- assertEquals(strategy.createDbRelationshipName(key, true), "personArray");
-
- assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST")), "Artist");
- assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST_WORK")), "ArtistWork");
-
- assertEquals(strategy.createObjAttributeName(new DbAttribute("NAME")), "name");
- assertEquals(strategy.createObjAttributeName(new DbAttribute("ARTIST_NAME")), "artistName");
-
- assertEquals(strategy.createObjRelationshipName(new DbRelationship("toArtist")), "toArtist");
- assertEquals(strategy.createObjRelationshipName(new DbRelationship("paintingArray")), "paintingArray");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
new file mode 100644
index 0000000..423989c
--- /dev/null
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/LegacyNameGeneratorTest.java
@@ -0,0 +1,50 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.map.naming;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+
+public class LegacyNameGeneratorTest extends TestCase {
+ public void testStrategy() throws Exception {
+ LegacyNameGenerator strategy = new LegacyNameGenerator();
+
+ ExportedKey key = new ExportedKey("ARTIST", "ARTIST_ID", null,
+ "PAINTING", "ARTIST_ID", null);
+ assertEquals(strategy.createDbRelationshipName(key, false), "toArtist");
+ assertEquals(strategy.createDbRelationshipName(key, true), "paintingArray");
+
+ key = new ExportedKey("PERSON", "PERSON_ID", null,
+ "PERSON", "MOTHER_ID", null);
+ assertEquals(strategy.createDbRelationshipName(key, false), "toPerson");
+ assertEquals(strategy.createDbRelationshipName(key, true), "personArray");
+
+ assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST")), "Artist");
+ assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST_WORK")), "ArtistWork");
+
+ assertEquals(strategy.createObjAttributeName(new DbAttribute("NAME")), "name");
+ assertEquals(strategy.createObjAttributeName(new DbAttribute("ARTIST_NAME")), "artistName");
+
+ assertEquals(strategy.createObjRelationshipName(new DbRelationship("toArtist")), "toArtist");
+ assertEquals(strategy.createObjRelationshipName(new DbRelationship("paintingArray")), "paintingArray");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
index 9e08554..de21fdb 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/map/naming/NameCheckersTest.java
@@ -43,7 +43,7 @@ public class NameCheckersTest {
@Test
public void testObjEntityAttributes() throws Exception {
- NameCheckers maker = NameCheckers.ObjAttribute;
+ NameCheckers maker = NameCheckers.objAttribute;
ObjEntity namingContainer = new ObjEntity();
String baseName = maker.baseName();
@@ -63,7 +63,7 @@ public class NameCheckersTest {
assertEquals(baseName + "3", name);
namingContainer.addAttribute(new ObjAttribute(name));
- maker = NameCheckers.ObjRelationship;
+ maker = NameCheckers.objRelationship;
baseName = maker.baseName();
name = DefaultUniqueNameGenerator.generate(maker, namingContainer);
assertEquals(baseName, name);
@@ -73,7 +73,7 @@ public class NameCheckersTest {
assertEquals(baseName + "1", name);
namingContainer.addRelationship(new ObjRelationship(name));
- maker = NameCheckers.ObjCallbackMethod;
+ maker = NameCheckers.objCallbackMethod;
baseName = maker.baseName();
name = DefaultUniqueNameGenerator.generate(maker, namingContainer);
assertEquals(baseName, name);
@@ -85,23 +85,23 @@ public class NameCheckersTest {
DataMap map = new DataMap();
map.addDbEntity(new DbEntity("name"));
- checkNameAndOther(map, NameCheckers.DbEntity, "name");
+ checkNameAndOther(map, NameCheckers.dbEntity, "name");
map.addObjEntity(new ObjEntity("name"));
- checkNameAndOther(map, NameCheckers.ObjEntity, "name");
+ checkNameAndOther(map, NameCheckers.objEntity, "name");
map.addProcedure(new Procedure("name"));
- checkNameAndOther(map, NameCheckers.Procedure, "name");
+ checkNameAndOther(map, NameCheckers.procedure, "name");
SelectQuery query = new SelectQuery("name");
query.setName("name");
map.addQuery(query);
- checkNameAndOther(map, NameCheckers.Query, "name");
+ checkNameAndOther(map, NameCheckers.query, "name");
}
@Test
public void testProject() throws Exception {
- assertFalse(NameCheckers.DataChannelDescriptor.isNameInUse(null, null));
+ assertFalse(NameCheckers.dataChannelDescriptor.isNameInUse(null, null));
}
@Test
@@ -109,7 +109,7 @@ public class NameCheckersTest {
DbEntity dbEntity = new DbEntity();
dbEntity.addRelationship(new DbRelationship("name"));
- checkNameAndOther(dbEntity, NameCheckers.DbRelationship, "name");
+ checkNameAndOther(dbEntity, NameCheckers.dbRelationship, "name");
}
@Test
@@ -117,7 +117,7 @@ public class NameCheckersTest {
Procedure procedure = new Procedure();
procedure.addCallParameter(new ProcedureParameter("name"));
- checkNameAndOther(procedure, NameCheckers.ProcedureParameter, "name");
+ checkNameAndOther(procedure, NameCheckers.procedureParameter, "name");
}
@Test
@@ -125,7 +125,7 @@ public class NameCheckersTest {
Embeddable embeddable = new Embeddable();
embeddable.addAttribute(new EmbeddableAttribute("name"));
- checkNameAndOther(embeddable, NameCheckers.EmbeddableAttribute, "name");
+ checkNameAndOther(embeddable, NameCheckers.embeddableAttribute, "name");
}
@Test
@@ -133,10 +133,10 @@ public class NameCheckersTest {
DataChannelDescriptor descriptor = new DataChannelDescriptor();
descriptor.getDataMaps().add(new DataMap("name"));
- checkNameAndOther(descriptor, NameCheckers.DataMap, "name");
+ checkNameAndOther(descriptor, NameCheckers.dataMap, "name");
descriptor.getNodeDescriptors().add(new DataNodeDescriptor("name"));
- checkNameAndOther(descriptor, NameCheckers.DataNodeDescriptor, "name");
+ checkNameAndOther(descriptor, NameCheckers.dataNodeDescriptor, "name");
}
@Test
@@ -144,10 +144,10 @@ public class NameCheckersTest {
DataDomain dataDomain = new DataDomain("name");
dataDomain.addDataMap(new DataMap("name"));
- checkNameAndOther(dataDomain, NameCheckers.DataMap, "name");
+ checkNameAndOther(dataDomain, NameCheckers.dataMap, "name");
- assertFalse(NameCheckers.DataMap.isNameInUse(null, "name"));
- assertFalse(NameCheckers.DataMap.isNameInUse(1, "name"));
+ assertFalse(NameCheckers.dataMap.isNameInUse(null, "name"));
+ assertFalse(NameCheckers.dataMap.isNameInUse(1, "name"));
}
private void checkNameAndOther(Object namingContainer, NameCheckers maker, String newName) {
@@ -161,13 +161,13 @@ public class NameCheckersTest {
ObjEntity namingContainer = new ObjEntity();
namingContainer.addAttribute(new ObjAttribute("myName"));
- Assert.assertEquals("getMyName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjCallbackMethod, namingContainer, "getMyName"));
+ Assert.assertEquals("getMyName1", DefaultUniqueNameGenerator.generate(NameCheckers.objCallbackMethod, namingContainer, "getMyName"));
namingContainer.getCallbackMap().getPostAdd().addCallbackMethod("getSecondName");
- Assert.assertEquals("SecondName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, namingContainer, "SecondName"));
- Assert.assertEquals("secondName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, namingContainer, "secondName"));
- Assert.assertEquals("SecondName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjRelationship, namingContainer, "SecondName"));
- Assert.assertEquals("secondName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjRelationship, namingContainer, "secondName"));
+ Assert.assertEquals("SecondName1", DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, namingContainer, "SecondName"));
+ Assert.assertEquals("secondName1", DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, namingContainer, "secondName"));
+ Assert.assertEquals("SecondName1", DefaultUniqueNameGenerator.generate(NameCheckers.objRelationship, namingContainer, "SecondName"));
+ Assert.assertEquals("secondName1", DefaultUniqueNameGenerator.generate(NameCheckers.objRelationship, namingContainer, "secondName"));
}
@Test
@@ -175,12 +175,12 @@ public class NameCheckersTest {
ObjEntity namingContainer = new ObjEntity();
namingContainer.addAttribute(new ObjAttribute("myName"));
- Assert.assertTrue(NameCheckers.ObjAttribute.isNameInUse(namingContainer, "myName"));
- Assert.assertFalse(NameCheckers.ObjAttribute.isNameInUse(namingContainer, "MyName"));
+ Assert.assertTrue(NameCheckers.objAttribute.isNameInUse(namingContainer, "myName"));
+ Assert.assertFalse(NameCheckers.objAttribute.isNameInUse(namingContainer, "MyName"));
namingContainer.getCallbackMap().getPostAdd().addCallbackMethod("getSecondName");
- Assert.assertEquals("SecondName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, namingContainer, "SecondName"));
- Assert.assertEquals("secondName1", DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, namingContainer, "secondName"));
+ Assert.assertEquals("SecondName1", DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, namingContainer, "SecondName"));
+ Assert.assertEquals("secondName1", DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, namingContainer, "secondName"));
}
@Test
@@ -188,17 +188,17 @@ public class NameCheckersTest {
DataMap map = new DataMap();
map.addEmbeddable(new Embeddable("name"));
- Assert.assertTrue(NameCheckers.Embeddable.isNameInUse(map, "name"));
- Assert.assertEquals("name1", DefaultUniqueNameGenerator.generate(NameCheckers.Embeddable, map, "name"));
- Assert.assertFalse(NameCheckers.Embeddable.isNameInUse(map, "other-name"));
+ Assert.assertTrue(NameCheckers.embeddable.isNameInUse(map, "name"));
+ Assert.assertEquals("name1", DefaultUniqueNameGenerator.generate(NameCheckers.embeddable, map, "name"));
+ Assert.assertFalse(NameCheckers.embeddable.isNameInUse(map, "other-name"));
map.setDefaultPackage("package");
- Assert.assertFalse(NameCheckers.Embeddable.isNameInUse(map, "name"));
- Assert.assertEquals("package.name", DefaultUniqueNameGenerator.generate(NameCheckers.Embeddable, map, "name"));
+ Assert.assertFalse(NameCheckers.embeddable.isNameInUse(map, "name"));
+ Assert.assertEquals("package.name", DefaultUniqueNameGenerator.generate(NameCheckers.embeddable, map, "name"));
map.addEmbeddable(new Embeddable("package.name"));
- Assert.assertTrue(NameCheckers.Embeddable.isNameInUse(map, "name"));
- Assert.assertEquals("package.name1", DefaultUniqueNameGenerator.generate(NameCheckers.Embeddable, map, "name"));
- Assert.assertFalse(NameCheckers.Embeddable.isNameInUse(map, "other-name"));
+ Assert.assertTrue(NameCheckers.embeddable.isNameInUse(map, "name"));
+ Assert.assertEquals("package.name1", DefaultUniqueNameGenerator.generate(NameCheckers.embeddable, map, "name"));
+ Assert.assertFalse(NameCheckers.embeddable.isNameInUse(map, "other-name"));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java b/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
new file mode 100644
index 0000000..7ee7ca7
--- /dev/null
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/DefaultNameGenerator.java
@@ -0,0 +1,96 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.map.naming;
+
+import java.util.Locale;
+
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+import org.jvnet.inflector.Noun;
+
+/**
+ * SmartNameGenerator is a strategy for generating names of entities, attributes
+ * etc.
+ *
+ * @since 3.2
+ */
+public class DefaultNameGenerator implements ObjectNameGenerator {
+
+ @Override
+ public String createDbRelationshipName(ExportedKey key, boolean toMany) {
+
+ String name;
+
+ if (toMany) {
+ try {
+ /**
+ * by default we use english language rules here. uppercase is
+ * required for NameConverter to work properly
+ */
+ name = Noun.pluralOf(key.getFKTableName().toLowerCase(),
+ Locale.ENGLISH).toUpperCase();
+ } catch (Exception inflectorError) {
+ /**
+ * seems that Inflector cannot be trusted. For instance, it
+ * throws an exception when invoked for word "ADDRESS" (although
+ * lower case works fine). To feel safe, we use superclass'
+ * behavior if something's gone wrong
+ */
+ return key.getFKTableName().toLowerCase();
+ }
+ } else {
+ String fkColName = key.getFKColumnName();
+
+ // trim "ID" in the end
+ if (fkColName == null) {
+ name = key.getPKTableName();
+ } else if (fkColName.toUpperCase().endsWith("_ID")
+ && fkColName.length() > 3) {
+ name = fkColName.substring(0, fkColName.length() - 3);
+ } else if (fkColName.toUpperCase().endsWith("ID")
+ && fkColName.length() > 2) {
+ name = fkColName.substring(0, fkColName.length() - 2);
+ } else {
+ /**
+ * We don't want relationship to conflict with attribute, so
+ * we'd better return superior value with 'to'
+ */
+ name = key.getPKTableName();
+ }
+ }
+
+ return NameConverter.underscoredToJava(name, false);
+ }
+
+ @Override
+ public String createObjEntityName(DbEntity dbEntity) {
+ return NameConverter.underscoredToJava(dbEntity.getName(), true);
+ }
+
+ @Override
+ public String createObjAttributeName(DbAttribute attr) {
+ return NameConverter.underscoredToJava(attr.getName(), false);
+ }
+
+ @Override
+ public String createObjRelationshipName(DbRelationship dbRel) {
+ return NameConverter.underscoredToJava(dbRel.getName(), false);
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNameGenerator.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNameGenerator.java b/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNameGenerator.java
deleted file mode 100644
index a674de8..0000000
--- a/cayenne-tools/src/main/java/org/apache/cayenne/map/naming/SmartNameGenerator.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.map.naming;
-
-import java.util.Locale;
-
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbRelationship;
-import org.jvnet.inflector.Noun;
-
-/**
- * SmartNameGenerator is a strategy for generating names of entities, attributes
- * etc.
- *
- * @since 3.2
- */
-public class SmartNameGenerator implements ObjectNameGenerator {
-
- @Override
- public String createDbRelationshipName(ExportedKey key, boolean toMany) {
-
- String name;
-
- if (toMany) {
- try {
- /**
- * by default we use english language rules here. uppercase is
- * required for NameConverter to work properly
- */
- name = Noun.pluralOf(key.getFKTableName().toLowerCase(),
- Locale.ENGLISH).toUpperCase();
- } catch (Exception inflectorError) {
- /**
- * seems that Inflector cannot be trusted. For instance, it
- * throws an exception when invoked for word "ADDRESS" (although
- * lower case works fine). To feel safe, we use superclass'
- * behavior if something's gone wrong
- */
- return key.getFKTableName().toLowerCase();
- }
- } else {
- String fkColName = key.getFKColumnName();
-
- // trim "ID" in the end
- if (fkColName == null) {
- name = key.getPKTableName();
- } else if (fkColName.toUpperCase().endsWith("_ID")
- && fkColName.length() > 3) {
- name = fkColName.substring(0, fkColName.length() - 3);
- } else if (fkColName.toUpperCase().endsWith("ID")
- && fkColName.length() > 2) {
- name = fkColName.substring(0, fkColName.length() - 2);
- } else {
- /**
- * We don't want relationship to conflict with attribute, so
- * we'd better return superior value with 'to'
- */
- name = key.getPKTableName();
- }
- }
-
- return NameConverter.underscoredToJava(name, false);
- }
-
- @Override
- public String createObjEntityName(DbEntity dbEntity) {
- return NameConverter.underscoredToJava(dbEntity.getName(), true);
- }
-
- @Override
- public String createObjAttributeName(DbAttribute attr) {
- return NameConverter.underscoredToJava(attr.getName(), false);
- }
-
- @Override
- public String createObjRelationshipName(DbRelationship dbRel) {
- return NameConverter.underscoredToJava(dbRel.getName(), false);
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
index c93f6b4..632b0a8 100644
--- a/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
+++ b/cayenne-tools/src/main/java/org/apache/cayenne/tools/DbImporterTask.java
@@ -23,7 +23,7 @@ import java.io.File;
import org.apache.cayenne.di.DIBootstrap;
import org.apache.cayenne.di.Injector;
-import org.apache.cayenne.map.naming.SmartNameGenerator;
+import org.apache.cayenne.map.naming.DefaultNameGenerator;
import org.apache.cayenne.tools.configuration.ToolsModule;
import org.apache.cayenne.tools.dbimport.DbImportAction;
import org.apache.cayenne.tools.dbimport.DbImportModule;
@@ -53,7 +53,7 @@ public class DbImporterTask extends Task {
parameters.setOverwrite(true);
parameters.setImportProcedures(false);
parameters.setUsePrimitives(true);
- parameters.setNamingStrategy(SmartNameGenerator.class.getName());
+ parameters.setNamingStrategy(DefaultNameGenerator.class.getName());
}
@Override
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/DefaultNameGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/DefaultNameGeneratorTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/DefaultNameGeneratorTest.java
new file mode 100644
index 0000000..5664d02
--- /dev/null
+++ b/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/DefaultNameGeneratorTest.java
@@ -0,0 +1,55 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+package org.apache.cayenne.map.naming;
+
+import junit.framework.TestCase;
+
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+
+public class DefaultNameGeneratorTest extends TestCase {
+ public void testStrategy() throws Exception {
+ DefaultNameGenerator strategy = new DefaultNameGenerator();
+
+ ExportedKey key = new ExportedKey("ARTIST", "ARTIST_ID", null,
+ "PAINTING", "ARTIST_ID", null);
+ assertEquals(strategy.createDbRelationshipName(key, false), "artist");
+ assertEquals(strategy.createDbRelationshipName(key, true), "paintings");
+
+ key = new ExportedKey("PERSON", "PERSON_ID", null,
+ "PERSON", "MOTHER_ID", null);
+ assertEquals(strategy.createDbRelationshipName(key, false), "mother");
+ assertEquals(strategy.createDbRelationshipName(key, true), "people");
+
+ key = new ExportedKey("PERSON", "PERSON_ID", null,
+ "ADDRESS", "SHIPPING_ADDRESS_ID", null);
+ assertEquals(strategy.createDbRelationshipName(key, false), "shippingAddress");
+ assertEquals(strategy.createDbRelationshipName(key, true), "addresses");
+
+ assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST")), "Artist");
+ assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST_WORK")), "ArtistWork");
+
+ assertEquals(strategy.createObjAttributeName(new DbAttribute("NAME")), "name");
+ assertEquals(strategy.createObjAttributeName(new DbAttribute("ARTIST_NAME")), "artistName");
+
+ assertEquals(strategy.createObjRelationshipName(new DbRelationship("mother")), "mother");
+ assertEquals(strategy.createObjRelationshipName(new DbRelationship("persons")), "persons");
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNameGeneratorTest.java
----------------------------------------------------------------------
diff --git a/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNameGeneratorTest.java b/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNameGeneratorTest.java
deleted file mode 100644
index 053ac8c..0000000
--- a/cayenne-tools/src/test/java/org/apache/cayenne/map/naming/SmartNameGeneratorTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-package org.apache.cayenne.map.naming;
-
-import junit.framework.TestCase;
-
-import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.DbRelationship;
-
-public class SmartNameGeneratorTest extends TestCase {
- public void testStrategy() throws Exception {
- SmartNameGenerator strategy = new SmartNameGenerator();
-
- ExportedKey key = new ExportedKey("ARTIST", "ARTIST_ID", null,
- "PAINTING", "ARTIST_ID", null);
- assertEquals(strategy.createDbRelationshipName(key, false), "artist");
- assertEquals(strategy.createDbRelationshipName(key, true), "paintings");
-
- key = new ExportedKey("PERSON", "PERSON_ID", null,
- "PERSON", "MOTHER_ID", null);
- assertEquals(strategy.createDbRelationshipName(key, false), "mother");
- assertEquals(strategy.createDbRelationshipName(key, true), "people");
-
- key = new ExportedKey("PERSON", "PERSON_ID", null,
- "ADDRESS", "SHIPPING_ADDRESS_ID", null);
- assertEquals(strategy.createDbRelationshipName(key, false), "shippingAddress");
- assertEquals(strategy.createDbRelationshipName(key, true), "addresses");
-
- assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST")), "Artist");
- assertEquals(strategy.createObjEntityName(new DbEntity("ARTIST_WORK")), "ArtistWork");
-
- assertEquals(strategy.createObjAttributeName(new DbAttribute("NAME")), "name");
- assertEquals(strategy.createObjAttributeName(new DbAttribute("ARTIST_NAME")), "artistName");
-
- assertEquals(strategy.createObjRelationshipName(new DbRelationship("mother")), "mother");
- assertEquals(strategy.createObjRelationshipName(new DbRelationship("persons")), "persons");
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateAttributeAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateAttributeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateAttributeAction.java
index 1b8b939..371a84b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateAttributeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateAttributeAction.java
@@ -77,7 +77,7 @@ public class CreateAttributeAction extends CayenneAction {
Embeddable embeddable = mediator.getCurrentEmbeddable();
EmbeddableAttribute attr = new EmbeddableAttribute();
- attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.EmbeddableAttribute, embeddable));
+ attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.embeddableAttribute, embeddable));
createEmbAttribute(embeddable, attr);
@@ -89,7 +89,7 @@ public class CreateAttributeAction extends CayenneAction {
ObjEntity objEntity = mediator.getCurrentObjEntity();
- ObjAttribute attr = new ObjAttribute(DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, objEntity), null, objEntity);
+ ObjAttribute attr = new ObjAttribute(DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, objEntity), null, objEntity);
createObjAttribute(mediator.getCurrentDataMap(), objEntity, attr);
@@ -99,7 +99,7 @@ public class CreateAttributeAction extends CayenneAction {
} else if (getProjectController().getCurrentDbEntity() != null) {
DbEntity dbEntity = getProjectController().getCurrentDbEntity();
- DbAttribute attr = new DbAttribute(DefaultUniqueNameGenerator.generate(NameCheckers.DbAttribute, dbEntity),
+ DbAttribute attr = new DbAttribute(DefaultUniqueNameGenerator.generate(NameCheckers.dbAttribute, dbEntity),
TypesMapping.NOT_DEFINED, dbEntity);
createDbAttribute(mediator.getCurrentDataMap(), dbEntity, attr);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
index 7244bd8..150241c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
@@ -78,7 +78,7 @@ public class CreateCallbackMethodAction extends CayenneAction {
// generate methodName
String methodNamePrefix = toMethodName(callbackType.getType());
- String methodName = DefaultUniqueNameGenerator.generate(NameCheckers.ObjCallbackMethod, getProjectController().getCurrentObjEntity(), methodNamePrefix);
+ String methodName = DefaultUniqueNameGenerator.generate(NameCheckers.objCallbackMethod, getProjectController().getCurrentObjEntity(), methodNamePrefix);
createCallbackMethod(callbackType, methodName);
application.getUndoManager().addEdit(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java
index 362a1e8..cd10138 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDataMapAction.java
@@ -64,7 +64,7 @@ public class CreateDataMapAction extends CayenneAction {
.getProject()
.getRootNode();
- DataMap map = new DataMap(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap, currentDomain));
+ DataMap map = new DataMap(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap, currentDomain));
// set configuration source for new dataMap
Resource baseResource = currentDomain.getConfigurationSource();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDbEntityAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDbEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDbEntityAction.java
index 9c11a26..f9d6301 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDbEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateDbEntityAction.java
@@ -65,7 +65,7 @@ public class CreateDbEntityAction extends CayenneAction {
ProjectController mediator = getProjectController();
DataMap map = mediator.getCurrentDataMap();
- DbEntity entity = new DbEntity(DefaultUniqueNameGenerator.generate(NameCheckers.DbEntity, map));
+ DbEntity entity = new DbEntity(DefaultUniqueNameGenerator.generate(NameCheckers.dbEntity, map));
createEntity(map, entity);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
index 49bf001..6466f57 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateEmbeddableAction.java
@@ -56,7 +56,7 @@ public class CreateEmbeddableAction extends CayenneAction {
DataMap dataMap = mediator.getCurrentDataMap();
- Embeddable embeddable = new Embeddable(DefaultUniqueNameGenerator.generate(NameCheckers.Embeddable, mediator.getCurrentDataMap()));
+ Embeddable embeddable = new Embeddable(DefaultUniqueNameGenerator.generate(NameCheckers.embeddable, mediator.getCurrentDataMap()));
createEmbeddable(dataMap, embeddable);
application.getUndoManager().addEdit(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
index 75d79ea..8632b18 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
@@ -112,7 +112,7 @@ public class CreateNodeAction extends CayenneAction {
* A factory method that makes a new DataNode.
*/
DataNodeDescriptor buildDataNode(DataChannelDescriptor domain) {
- DataNodeDescriptor node = new DataNodeDescriptor(DefaultUniqueNameGenerator.generate(NameCheckers.DataNodeDescriptor, domain));
+ DataNodeDescriptor node = new DataNodeDescriptor(DefaultUniqueNameGenerator.generate(NameCheckers.dataNodeDescriptor, domain));
node.setDataChannelDescriptor(domain);
return node;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
index 8df37d8..7ba624d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
@@ -71,7 +71,7 @@ public class CreateObjEntityAction extends CayenneAction {
ProjectController mediator = getProjectController();
DataMap dataMap = mediator.getCurrentDataMap();
- ObjEntity entity = new ObjEntity(DefaultUniqueNameGenerator.generate(NameCheckers.ObjEntity, dataMap));
+ ObjEntity entity = new ObjEntity(DefaultUniqueNameGenerator.generate(NameCheckers.objEntity, dataMap));
// init defaults
entity.setSuperClassName(dataMap.getDefaultSuperclass());
@@ -81,7 +81,7 @@ public class CreateObjEntityAction extends CayenneAction {
if (dbEntity != null) {
entity.setDbEntity(dbEntity);
String baseName = NameConverter.underscoredToJava(dbEntity.getName(), true);
- entity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjEntity, dbEntity.getDataMap(), baseName));
+ entity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objEntity, dbEntity.getDataMap(), baseName));
}
String pkg = dataMap.getDefaultPackage();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
index 2d0e652..94e7f63 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureAction.java
@@ -53,7 +53,7 @@ public class CreateProcedureAction extends CayenneAction {
ProjectController mediator = getProjectController();
DataMap map = mediator.getCurrentDataMap();
- Procedure procedure = new Procedure(DefaultUniqueNameGenerator.generate(NameCheckers.Procedure, map));
+ Procedure procedure = new Procedure(DefaultUniqueNameGenerator.generate(NameCheckers.procedure, map));
createProcedure(map, procedure);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
index c414921..c4d4991 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
@@ -66,7 +66,7 @@ public class CreateProcedureParameterAction extends CayenneAction {
public void createProcedureParameter() {
Procedure procedure = getProjectController().getCurrentProcedure();
- ProcedureParameter parameter = new ProcedureParameter(DefaultUniqueNameGenerator.generate(NameCheckers.ProcedureParameter, procedure));
+ ProcedureParameter parameter = new ProcedureParameter(DefaultUniqueNameGenerator.generate(NameCheckers.procedureParameter, procedure));
procedure.addCallParameter(parameter);
ProjectController mediator = getProjectController();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
index 0127a01..57431b7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
@@ -68,7 +68,7 @@ public class CreateRelationshipAction extends CayenneAction {
ObjEntity objEnt = getProjectController().getCurrentObjEntity();
if (objEnt != null) {
- ObjRelationship rel = new ObjRelationship(DefaultUniqueNameGenerator.generate(NameCheckers.ObjRelationship, objEnt));
+ ObjRelationship rel = new ObjRelationship(DefaultUniqueNameGenerator.generate(NameCheckers.objRelationship, objEnt));
createObjRelationship(objEnt, rel);
application.getUndoManager().addEdit(
@@ -77,7 +77,7 @@ public class CreateRelationshipAction extends CayenneAction {
DbEntity dbEnt = getProjectController().getCurrentDbEntity();
if (dbEnt != null) {
- DbRelationship rel = new DbRelationship(DefaultUniqueNameGenerator.generate(NameCheckers.DbRelationship, dbEnt));
+ DbRelationship rel = new DbRelationship(DefaultUniqueNameGenerator.generate(NameCheckers.dbRelationship, dbEnt));
createDbRelationship(dbEnt, rel);
application.getUndoManager().addEdit(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
index 27d9f6d..4b5e2fe 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
@@ -96,10 +96,10 @@ public class ImportDataMapAction extends CayenneAction {
.getRootNode();
if (newMap.getName() != null) {
- newMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap, domain, newMap.getName()));
+ newMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap, domain, newMap.getName()));
}
else {
- newMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap, domain));
+ newMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap, domain));
}
Resource baseResource = domain.getConfigurationSource();
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index 27ad76e..d7879fc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -302,7 +302,7 @@ public class ImportEOModelAction extends CayenneAction {
else {
// fix DataMap name, as there maybe a map with the same name already
DataChannelDescriptor domain = (DataChannelDescriptor) mediator.getProject().getRootNode();
- map.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap, domain, map.getName()));
+ map.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap, domain, map.getName()));
// side effect of this operation is that if a node was created, this DataMap
// will be linked with it...
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
index 6df35cf..d897350 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
@@ -68,7 +68,7 @@ public class NewProjectAction extends ProjectAction {
DataChannelDescriptor domain = new DataChannelDescriptor();
- domain.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DataChannelDescriptor, domain));
+ domain.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dataChannelDescriptor, domain));
Project project = new Project(
new ConfigurationTree<DataChannelDescriptor>(domain));
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
index 0bb6bea..99770ab 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/PasteAction.java
@@ -173,7 +173,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
// paste DataMap to DataDomain or DataNode
DataMap dataMap = ((DataMap) content);
- dataMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap, COPY_PATTERN, domain, dataMap.getName()));
+ dataMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap, COPY_PATTERN, domain, dataMap.getName()));
/**
* Update all names in the new DataMap, so that they would not conflict with
@@ -189,7 +189,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
for (DbEntity dbEntity : dataMap.getDbEntities()) {
String oldName = dbEntity.getName();
- dbEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DbEntity, COPY_PATTERN, domain, dbEntity.getName()));
+ dbEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dbEntity, COPY_PATTERN, domain, dbEntity.getName()));
if (!oldName.equals(dbEntity.getName())) {
renamedDbEntities.put(oldName, dbEntity.getName());
@@ -197,7 +197,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
}
for (ObjEntity objEntity : dataMap.getObjEntities()) {
String oldName = objEntity.getName();
- objEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjEntity, COPY_PATTERN, domain, objEntity.getName()));
+ objEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objEntity, COPY_PATTERN, domain, objEntity.getName()));
if (!oldName.equals(objEntity.getName())) {
renamedObjEntities.put(oldName, objEntity.getName());
@@ -206,7 +206,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
for (Embeddable embeddable : dataMap.getEmbeddables()) {
String oldName = embeddable.getClassName();
- embeddable.setClassName(DefaultUniqueNameGenerator.generate(NameCheckers.Embeddable, COPY_PATTERN, domain, embeddable.getClassName()));
+ embeddable.setClassName(DefaultUniqueNameGenerator.generate(NameCheckers.embeddable, COPY_PATTERN, domain, embeddable.getClassName()));
if (!oldName.equals(embeddable.getClassName())) {
renamedEmbeddables.put(oldName, embeddable.getClassName());
@@ -214,10 +214,10 @@ public class PasteAction extends CayenneAction implements FlavorListener {
}
for (Procedure procedure : dataMap.getProcedures()) {
- procedure.setName(DefaultUniqueNameGenerator.generate(NameCheckers.Procedure, COPY_PATTERN, domain, procedure.getName()));
+ procedure.setName(DefaultUniqueNameGenerator.generate(NameCheckers.procedure, COPY_PATTERN, domain, procedure.getName()));
}
for (Query query : dataMap.getQueries()) {
- ((AbstractQuery) query).setName(DefaultUniqueNameGenerator.generate(NameCheckers.Query, COPY_PATTERN, domain, query.getName()));
+ ((AbstractQuery) query).setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, domain, query.getName()));
}
// if an entity was renamed, we rename all links to it too
@@ -259,7 +259,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
if (content instanceof DbEntity) {
DbEntity dbEntity = (DbEntity) content;
- dbEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DbEntity, COPY_PATTERN, domain, dbEntity.getName()));
+ dbEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dbEntity, COPY_PATTERN, domain, dbEntity.getName()));
dataMap.addDbEntity(dbEntity);
CreateDbEntityAction.fireDbEntityEvent(this, mediator, dbEntity);
@@ -267,7 +267,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
else if (content instanceof ObjEntity) {
// paste ObjEntity to DataMap
ObjEntity objEntity = (ObjEntity) content;
- objEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjEntity, COPY_PATTERN, domain, objEntity.getName()));
+ objEntity.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objEntity, COPY_PATTERN, domain, objEntity.getName()));
dataMap.addObjEntity(objEntity);
CreateObjEntityAction.fireObjEntityEvent(
@@ -279,7 +279,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
else if (content instanceof Embeddable) {
// paste Embeddable to DataMap
Embeddable embeddable = (Embeddable) content;
- embeddable.setClassName(DefaultUniqueNameGenerator.generate(NameCheckers.Embeddable, COPY_PATTERN, domain, embeddable.getClassName()));
+ embeddable.setClassName(DefaultUniqueNameGenerator.generate(NameCheckers.embeddable, COPY_PATTERN, domain, embeddable.getClassName()));
dataMap.addEmbeddable(embeddable);
CreateEmbeddableAction.fireEmbeddableEvent(
@@ -291,7 +291,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
else if (content instanceof EJBQLQuery) {
EJBQLQuery query = (EJBQLQuery) content;
- query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.Query, COPY_PATTERN, domain, query.getName()));
+ query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, domain, query.getName()));
query.setDataMap(dataMap);
dataMap.addQuery(query);
@@ -301,7 +301,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
// paste Query to DataMap
AbstractQuery query = (AbstractQuery) content;
- query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.Query, COPY_PATTERN, domain, query.getName()));
+ query.setName(DefaultUniqueNameGenerator.generate(NameCheckers.query, COPY_PATTERN, domain, query.getName()));
query.setDataMap(dataMap);
dataMap.addQuery(query);
@@ -310,7 +310,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
else if (content instanceof Procedure) {
// paste Procedure to DataMap
Procedure procedure = (Procedure) content;
- procedure.setName(DefaultUniqueNameGenerator.generate(NameCheckers.Procedure, COPY_PATTERN, domain, procedure.getName()));
+ procedure.setName(DefaultUniqueNameGenerator.generate(NameCheckers.procedure, COPY_PATTERN, domain, procedure.getName()));
dataMap.addProcedure(procedure);
CreateProcedureAction.fireProcedureEvent(
@@ -325,7 +325,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
if (content instanceof DbAttribute) {
DbAttribute attr = (DbAttribute) content;
- attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DbAttribute, COPY_PATTERN, dbEntity, attr.getName()));
+ attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dbAttribute, COPY_PATTERN, dbEntity, attr.getName()));
dbEntity.addAttribute(attr);
CreateAttributeAction.fireDbAttributeEvent(this, mediator, mediator
@@ -333,7 +333,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
}
else if (content instanceof DbRelationship) {
DbRelationship rel = (DbRelationship) content;
- rel.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DbRelationship, COPY_PATTERN, dbEntity, rel.getName()));
+ rel.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dbRelationship, COPY_PATTERN, dbEntity, rel.getName()));
dbEntity.addRelationship(rel);
CreateRelationshipAction.fireDbRelationshipEvent(
@@ -349,7 +349,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
if (content instanceof ObjAttribute) {
ObjAttribute attr = (ObjAttribute) content;
- attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjAttribute, COPY_PATTERN, objEntity, attr.getName()));
+ attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objAttribute, COPY_PATTERN, objEntity, attr.getName()));
objEntity.addAttribute(attr);
CreateAttributeAction.fireObjAttributeEvent(this, mediator, mediator
@@ -357,7 +357,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
}
else if (content instanceof ObjRelationship) {
ObjRelationship rel = (ObjRelationship) content;
- rel.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjRelationship, COPY_PATTERN, objEntity, rel.getName()));
+ rel.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objRelationship, COPY_PATTERN, objEntity, rel.getName()));
objEntity.addRelationship(rel);
CreateRelationshipAction.fireObjRelationshipEvent(
@@ -369,7 +369,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
else if(content instanceof ObjCallbackMethod) {
ObjCallbackMethod method = (ObjCallbackMethod) content;
- method.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ObjCallbackMethod, COPY_PATTERN, objEntity, method.getName()));
+ method.setName(DefaultUniqueNameGenerator.generate(NameCheckers.objCallbackMethod, COPY_PATTERN, objEntity, method.getName()));
objEntity.getCallbackMap().getCallbackDescriptor(mediator.getCurrentCallbackType().getType()).addCallbackMethod(method.getName());
@@ -388,7 +388,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
if (content instanceof EmbeddableAttribute) {
EmbeddableAttribute attr = (EmbeddableAttribute) content;
- attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.EmbeddableAttribute, COPY_PATTERN, embeddable, attr.getName()));
+ attr.setName(DefaultUniqueNameGenerator.generate(NameCheckers.embeddableAttribute, COPY_PATTERN, embeddable, attr.getName()));
embeddable.addAttribute(attr);
CreateAttributeAction.fireEmbeddableAttributeEvent(
@@ -407,7 +407,7 @@ public class PasteAction extends CayenneAction implements FlavorListener {
if (content instanceof ProcedureParameter) {
ProcedureParameter param = (ProcedureParameter) content;
- param.setName(DefaultUniqueNameGenerator.generate(NameCheckers.ProcedureParameter, COPY_PATTERN, procedure, param.getName()));
+ param.setName(DefaultUniqueNameGenerator.generate(NameCheckers.procedureParameter, COPY_PATTERN, procedure, param.getName()));
procedure.addCallParameter(param);
CreateProcedureParameterAction.fireProcedureParameterEvent(
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
index 3180e3c..19a51da 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/ResolveDbRelationshipDialog.java
@@ -292,7 +292,7 @@ public class ResolveDbRelationshipDialog extends CayenneDialog {
}
if (sourceEntityName == null) {
- sourceEntityName = DefaultUniqueNameGenerator.generate(NameCheckers.DbRelationship, relationship.getSourceEntity());
+ sourceEntityName = DefaultUniqueNameGenerator.generate(NameCheckers.dbRelationship, relationship.getSourceEntity());
}
if (!validateName(relationship.getSourceEntity(), relationship, sourceEntityName)) {
@@ -305,7 +305,7 @@ public class ResolveDbRelationshipDialog extends CayenneDialog {
}
if (targetEntityName == null) {
- targetEntityName = DefaultUniqueNameGenerator.generate(NameCheckers.DbRelationship, relationship.getTargetEntity());
+ targetEntityName = DefaultUniqueNameGenerator.generate(NameCheckers.dbRelationship, relationship.getTargetEntity());
}
// check if reverse name is valid
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
index e4aa68d..9b604e1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/DbLoaderHelper.java
@@ -345,8 +345,8 @@ public class DbLoaderHelper {
DbLoaderHelper.this.existingMap = dataMap != null;
if (!existingMap) {
- dataMap = new DataMap(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap));
- dataMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.DataMap, mediator.getProject().getRootNode()));
+ dataMap = new DataMap(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap));
+ dataMap.setName(DefaultUniqueNameGenerator.generate(NameCheckers.dataMap, mediator.getProject().getRootNode()));
dataMap.setDefaultSchema(schemaName);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
index 557331a..c00325a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/query/QueryType.java
@@ -141,7 +141,7 @@ public class QueryType extends CayenneController{
}
// update query...
- String queryName = DefaultUniqueNameGenerator.generate(NameCheckers.Query, dataMap);
+ String queryName = DefaultUniqueNameGenerator.generate(NameCheckers.query, dataMap);
if (query instanceof EJBQLQuery) {
((EJBQLQuery) query).setName(queryName);
((EJBQLQuery) query).setDataMap(dataMap);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/90de78de/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
index 3af4859..eef86f2 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/util/NameGeneratorPreferences.java
@@ -22,8 +22,8 @@ import java.util.Arrays;
import java.util.Vector;
import java.util.prefs.Preferences;
-import org.apache.cayenne.map.naming.BasicNameGenerator;
-import org.apache.cayenne.map.naming.SmartNameGenerator;
+import org.apache.cayenne.map.naming.LegacyNameGenerator;
+import org.apache.cayenne.map.naming.DefaultNameGenerator;
import org.apache.cayenne.modeler.Application;
/**
@@ -31,15 +31,15 @@ import org.apache.cayenne.modeler.Application;
*/
public class NameGeneratorPreferences {
- private static final String STRATEGIES_PREFERENCE = "recent.name.generators";
+ private static final String STRATEGIES_PREFERENCE = "name.generators.recent";
/**
* Naming strategies to appear in combobox by default
*/
private static final Vector<String> PREDEFINED_STRATEGIES = new Vector<String>();
static {
- PREDEFINED_STRATEGIES.add(BasicNameGenerator.class.getCanonicalName());
- PREDEFINED_STRATEGIES.add(SmartNameGenerator.class.getCanonicalName());
+ PREDEFINED_STRATEGIES.add(DefaultNameGenerator.class.getCanonicalName());
+ PREDEFINED_STRATEGIES.add(LegacyNameGenerator.class.getCanonicalName());
}
static final NameGeneratorPreferences instance = new NameGeneratorPreferences();