This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from c8df80cf5 NameBuilder cleanup
new ee36584ac cleanup
new 0ef59bb2f ObjectNameGenerator cleanup
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../tools/utils/CustomObjectNameGenerator.java | 10 --
.../dbsync/merge/context/MergerContext.java | 5 +-
...Generator.java => BaseObjectNameGenerator.java} | 62 +++++-------
.../cayenne/dbsync/naming/DbEntityNameStemmer.java | 29 ------
.../dbsync/naming/DefaultObjectNameGenerator.java | 104 +--------------------
.../cayenne/dbsync/naming/NoStemStemmer.java | 39 --------
.../cayenne/dbsync/naming/ObjectNameGenerator.java | 3 -
.../dbsync/naming/PatternObjectNameGenerator.java | 26 +++---
.../cayenne/dbsync/naming/PatternStemmer.java | 46 ---------
.../reverse/dbimport/DbImportConfiguration.java | 21 ++---
.../cayenne/dbsync/merge/EntityMergeSupportIT.java | 11 +--
.../org/apache/cayenne/dbsync/merge/MergeCase.java | 5 +-
.../naming/DefaultObjectNameGeneratorTest.java | 12 ++-
.../naming/PatternObjectNameGeneratorTest.java | 56 +++++++++++
.../cayenne/dbsync/naming/PatternStemmerTest.java | 61 ------------
.../dbimport/DefaultDbImportActionTest.java | 15 +--
.../dbimport/ManyToManyCandidateEntityTest.java | 3 +-
.../cayenne/dbsync/reverse/dbload/DbLoaderIT.java | 7 +-
.../reverse/dbload/RelationshipsLoaderIT.java | 7 +-
.../cayenne/stubs/CustomObjectNameGenerator.java | 24 +----
.../modeler/ui/action/CreateObjEntityAction.java | 9 +-
.../modeler/ui/action/DbEntitySyncAction.java | 10 +-
.../modeler/ui/action/ObjEntitySyncAction.java | 7 +-
.../modeler/ui/dbmerge/MergerOptionsDialog.java | 26 ++----
.../modeler/ui/entitysync/EntitySyncDialog.java | 17 +---
25 files changed, 155 insertions(+), 460 deletions(-)
copy
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/{DefaultObjectNameGenerator.java
=> BaseObjectNameGenerator.java} (67%)
delete mode 100644
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/DbEntityNameStemmer.java
delete mode 100644
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/NoStemStemmer.java
copy cayenne/src/main/java/org/apache/cayenne/dba/NoQuoteQuotingStrategy.java
=>
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/PatternObjectNameGenerator.java
(62%)
delete mode 100644
cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/naming/PatternStemmer.java
create mode 100644
cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/naming/PatternObjectNameGeneratorTest.java
delete mode 100644
cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/naming/PatternStemmerTest.java