Repository: cayenne Updated Branches: refs/heads/CAY-1946 66ea11873 -> 29899e48d
CAY-1946 * removing references to SmartNameGenerator Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/29899e48 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/29899e48 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/29899e48 Branch: refs/heads/CAY-1946 Commit: 29899e48d36b88c6a5f9ea35ef3aa4359413ff65 Parents: 66ea118 Author: aadamchik <[email protected]> Authored: Sun Nov 16 12:51:40 2014 +0300 Committer: aadamchik <[email protected]> Committed: Sun Nov 16 12:51:40 2014 +0300 ---------------------------------------------------------------------- .../apache/cayenne/map/naming/DefaultNameGenerator.java | 12 ++++-------- .../java/org/apache/cayenne/tools/DbImporterMojo.java | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/29899e48/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 index 5d5a26d..af76188 100644 --- 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 @@ -26,8 +26,7 @@ import org.apache.cayenne.map.DbRelationship; import org.jvnet.inflector.Noun; /** - * SmartNameGenerator is a strategy for generating names of entities, attributes - * etc. + * A strategy for generating names of entities, attributes etc. * * @since 4.0 */ @@ -44,8 +43,7 @@ public class DefaultNameGenerator implements ObjectNameGenerator { * 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(); + name = Noun.pluralOf(key.getFKTableName().toLowerCase(), Locale.ENGLISH).toUpperCase(); } catch (Exception inflectorError) { /** * seems that Inflector cannot be trusted. For instance, it @@ -61,11 +59,9 @@ public class DefaultNameGenerator implements ObjectNameGenerator { // trim "ID" in the end if (fkColName == null) { name = key.getPKTableName(); - } else if (fkColName.toUpperCase().endsWith("_ID") - && fkColName.length() > 3) { + } 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) { + } else if (fkColName.toUpperCase().endsWith("ID") && fkColName.length() > 2) { name = fkColName.substring(0, fkColName.length() - 2); } else { /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/29899e48/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java ---------------------------------------------------------------------- diff --git a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java index 1e07ca1..e429478 100644 --- a/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java +++ b/plugins/maven-cayenne-plugin/src/main/java/org/apache/cayenne/tools/DbImporterMojo.java @@ -95,7 +95,7 @@ public class DbImporterMojo extends AbstractMojo { * The default is a basic naming strategy. * * @parameter expression="${cdbimport.namingStrategy}" - * default-value="org.apache.cayenne.map.naming.SmartNameGenerator" + * default-value="org.apache.cayenne.map.naming.DefaultNameGenerator" */ private String namingStrategy;
