You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/05/12 10:48:40 UTC
[cayenne] 05/05: Merge branch 'pull/421' into asf-master
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 39256b9de2aa177cd28850eaeaa3f9a2fe6237a6
Merge: fec3d6d 6a4f0fa
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Tue May 12 11:12:29 2020 +0300
Merge branch 'pull/421' into asf-master
.../apache/cayenne/tools/CayenneGeneratorTask.java | 16 +++++++++++++++-
.../org/apache/cayenne/gen/CgenConfiguration.java | 14 ++++++++++++++
.../apache/cayenne/gen/ClassGenerationAction.java | 21 +++++++++++++++------
.../cayenne/gen/ClientClassGenerationAction.java | 4 ++--
.../gen/DefaultClassGenerationActionFactory.java | 5 ++---
.../cayenne/gen/mock/TestClassGenerationAction.java | 3 +--
.../java/org/apache/cayenne/tools/CgenTask.java | 18 +++++++++++++++++-
.../java/org/apache/cayenne/tools/CgenTaskTest.java | 3 +--
.../apache/cayenne/tools/CayenneGeneratorMojo.java | 10 +++++++++-
9 files changed, 76 insertions(+), 18 deletions(-)
diff --cc cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java
index 3a7754c,d01a98b..aa0be09
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java
@@@ -35,11 -32,9 +35,10 @@@ public class DefaultClassGenerationActi
@Override
public ClassGenerationAction createAction(CgenConfiguration cgenConfiguration) {
ClassGenerationAction classGenerationAction = cgenConfiguration.isClient() ?
- new ClientClassGenerationAction() :
- new ClassGenerationAction();
- classGenerationAction.setCgenConfiguration(cgenConfiguration);
+ new ClientClassGenerationAction(cgenConfiguration) :
+ new ClassGenerationAction(cgenConfiguration);
classGenerationAction.setUtilsFactory(utilsFactory);
+ classGenerationAction.setMetadataUtils(metadataUtils);
return classGenerationAction;
}