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:35 UTC
[cayenne] branch master updated (fec3d6d -> 39256b9)
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from fec3d6d Merge pull request #422 from stariy95/CAY-2338-cgen-comments
add ebc80df Support for setting system properties in pom.xml for maven plugin cgen goal
new 5e03fb6 Enable cgen task/mojo to specify path to an external velocity tool configuration file via CgenConfiguration parameter (externalToolConfig). Removed older method relying on system property manipulation.
new 75407e6 Changed gradle plugin to utilize new ClassGenerationAction constructor
new aa42c76 Removed extraneous logger message
new 6a4f0fa Updated comment to match new feature
new 39256b9 Merge branch 'pull/421' into asf-master
The 5 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:
.../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(-)
[cayenne] 04/05: Updated comment to match new feature
Posted by nt...@apache.org.
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 6a4f0fa2f25f5c32e4671b53f0d63a90cdefc0d0
Author: Faizel Dakri <fa...@me.com>
AuthorDate: Mon May 11 13:47:35 2020 -0500
Updated comment to match new feature
---
.../main/java/org/apache/cayenne/gen/ClassGenerationAction.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index 2e80289..1ba7095 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -79,9 +79,10 @@ public class ClassGenerationAction {
/**
Optionally allows user-defined tools besides {@link ImportUtils} for working with velocity templates.<br/>
- To use this feature, set the java system property {@code -Dorg.apache.velocity.tools=tools.properties}
- And create the file "tools.properties" in the working directory or in the
- root of the classpath with content like this:
+ To use this feature, either set the java system property {@code -Dorg.apache.velocity.tools=tools.properties}
+ or set the {@code externalToolConfig} property to "tools.properties" in {@code CgenConfiguration}. Then
+ create the file "tools.properties" in the working directory or in the root of the classpath with content
+ like this:
<pre>
tools.toolbox = application
tools.application.myTool = com.mycompany.MyTool</pre>
[cayenne] 02/05: Changed gradle plugin to utilize new
ClassGenerationAction constructor
Posted by nt...@apache.org.
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 75407e69e586964b8392dd295924d0fc503df709
Author: Faizel Dakri <fa...@me.com>
AuthorDate: Mon May 11 13:38:00 2020 -0500
Changed gradle plugin to utilize new ClassGenerationAction constructor
---
.../main/java/org/apache/cayenne/tools/CgenTask.java | 18 +++++++++++++++++-
.../java/org/apache/cayenne/tools/CgenTaskTest.java | 3 +--
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
index a0842b3..d3eee61 100644
--- a/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
+++ b/cayenne-gradle-plugin/src/main/java/org/apache/cayenne/tools/CgenTask.java
@@ -142,6 +142,14 @@ public class CgenTask extends BaseCayenneTask {
@Optional
private Boolean createPKProperties;
+ /**
+ * Optional path (classpath or filesystem) to external velocity tool configuration file
+ * @since 4.2
+ */
+ @Input
+ @Optional
+ private String externalToolConfig;
+
private String destDirName;
private DataChannelMetaData metaData;
@@ -253,6 +261,7 @@ public class CgenTask extends BaseCayenneTask {
cgenConfiguration.setQueryTemplate(queryTemplate != null ? queryTemplate : cgenConfiguration.getQueryTemplate());
cgenConfiguration.setQuerySuperTemplate(querySuperTemplate != null ? querySuperTemplate : cgenConfiguration.getQuerySuperTemplate());
cgenConfiguration.setCreatePKProperties(createPKProperties != null ? createPKProperties : cgenConfiguration.isCreatePKProperties());
+ cgenConfiguration.setExternalToolConfig(externalToolConfig != null ? externalToolConfig : cgenConfiguration.getExternalToolConfig());
if(!cgenConfiguration.isMakePairs()) {
if(template == null) {
cgenConfiguration.setTemplate(cgenConfiguration.isClient() ? ClientClassGenerationAction.SINGLE_CLASS_TEMPLATE : ClassGenerationAction.SINGLE_CLASS_TEMPLATE);
@@ -279,7 +288,7 @@ public class CgenTask extends BaseCayenneTask {
makePairs != null || mode != null || outputPattern != null || overwrite != null || superPkg != null ||
superTemplate != null || template != null || embeddableTemplate != null || embeddableSuperTemplate != null ||
usePkgPath != null || createPropertyNames != null || force || queryTemplate != null ||
- querySuperTemplate != null || createPKProperties != null;
+ querySuperTemplate != null || createPKProperties != null || externalToolConfig != null;
}
@OutputDirectory
@@ -581,5 +590,12 @@ public class CgenTask extends BaseCayenneTask {
public void createPKProperties(boolean createPKProperties) {
setCreatePKProperties(createPKProperties);
}
+
+ public void setExternalToolConfig(String externalToolConfig) {
+ this.externalToolConfig = externalToolConfig;
+ }
+ public void externalToolConfig(String externalToolConfig) {
+ setExternalToolConfig(externalToolConfig);
+ }
}
\ No newline at end of file
diff --git a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
index 00b1484..9269a65 100644
--- a/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
+++ b/cayenne-gradle-plugin/src/test/java/org/apache/cayenne/tools/CgenTaskTest.java
@@ -88,8 +88,7 @@ public class CgenTaskTest {
task.setUsePkgPath(true);
CgenConfiguration configuration = task.buildConfiguration(dataMap);
- ClassGenerationAction createdAction = new ClassGenerationAction();
- createdAction.setCgenConfiguration(configuration);
+ ClassGenerationAction createdAction = new ClassGenerationAction(configuration);
CgenConfiguration cgenConfiguration = createdAction.getCgenConfiguration();
assertEquals(cgenConfiguration.getEmbeddableSuperTemplate(), "superTemplate");
[cayenne] 03/05: Removed extraneous logger message
Posted by nt...@apache.org.
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 aa42c769b12f05bb411381e0a4888e301059abba
Author: Faizel Dakri <fa...@me.com>
AuthorDate: Mon May 11 13:38:17 2020 -0500
Removed extraneous logger message
---
.../src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index 00a86ec..2e80289 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -94,7 +94,6 @@ public class ClassGenerationAction {
if (System.getProperty("org.apache.velocity.tools") != null || toolConfigFile != null) {
ToolManager manager = new ToolManager(true, true);
if (toolConfigFile != null) {
- logger.info("Adding external tool configuration.");
FactoryConfiguration config = ConfigurationUtils.find(toolConfigFile);
manager.getToolboxFactory().configure(config);
}
[cayenne] 01/05: Enable cgen task/mojo to specify path to an
external velocity tool configuration file via CgenConfiguration parameter
(externalToolConfig). Removed older method relying on system property
manipulation.
Posted by nt...@apache.org.
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 5e03fb6f8f04ab7bcff23b7a19fddaded721e6b6
Author: Faizel Dakri <fa...@me.com>
AuthorDate: Mon May 11 10:42:13 2020 -0500
Enable cgen task/mojo to specify path to an external velocity tool configuration file via CgenConfiguration parameter (externalToolConfig). Removed older method relying on system property manipulation.
---
.../apache/cayenne/tools/CayenneGeneratorTask.java | 16 ++++++++++++++-
.../org/apache/cayenne/gen/CgenConfiguration.java | 14 +++++++++++++
.../apache/cayenne/gen/ClassGenerationAction.java | 15 +++++++++++---
.../cayenne/gen/ClientClassGenerationAction.java | 4 ++--
.../gen/DefaultClassGenerationActionFactory.java | 5 ++---
.../gen/mock/TestClassGenerationAction.java | 3 +--
.../apache/cayenne/tools/CayenneGeneratorMojo.java | 23 +++++++++-------------
7 files changed, 55 insertions(+), 25 deletions(-)
diff --git a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
index d6411b0..121b287 100644
--- a/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
+++ b/cayenne-ant/src/main/java/org/apache/cayenne/tools/CayenneGeneratorTask.java
@@ -88,6 +88,12 @@ public class CayenneGeneratorTask extends CayenneTask {
*/
protected Boolean createpkproperties;
+ /**
+ * Optional path (classpath or filesystem) to external velocity tool configuration file
+ * @since 4.2
+ */
+ protected String externaltoolconfig;
+
public CayenneGeneratorTask() {
}
@@ -158,7 +164,7 @@ public class CayenneGeneratorTask extends CayenneTask {
makepairs != null || mode != null || outputPattern != null || overwrite != null || superpkg != null ||
supertemplate != null || template != null || embeddabletemplate != null || embeddablesupertemplate != null ||
usepkgpath != null || createpropertynames != null || querytemplate != null ||
- querysupertemplate != null || createpkproperties != null || force;
+ querysupertemplate != null || createpkproperties != null || force || externaltoolconfig != null;
}
private CgenConfiguration buildConfiguration(DataMap dataMap) {
@@ -200,6 +206,7 @@ public class CayenneGeneratorTask extends CayenneTask {
cgenConfiguration.setQueryTemplate(querytemplate != null ? querytemplate : cgenConfiguration.getQueryTemplate());
cgenConfiguration.setQuerySuperTemplate(querysupertemplate != null ? querysupertemplate : cgenConfiguration.getQuerySuperTemplate());
cgenConfiguration.setCreatePKProperties(createpkproperties != null ? createpkproperties : cgenConfiguration.isCreatePKProperties());
+ cgenConfiguration.setExternalToolConfig(externaltoolconfig != null ? externaltoolconfig : cgenConfiguration.getExternalToolConfig());
if(!cgenConfiguration.isMakePairs()) {
if(template == null) {
cgenConfiguration.setTemplate(cgenConfiguration.isClient() ? ClientClassGenerationAction.SINGLE_CLASS_TEMPLATE : ClassGenerationAction.SINGLE_CLASS_TEMPLATE);
@@ -394,6 +401,13 @@ public class CayenneGeneratorTask extends CayenneTask {
}
/**
+ * @since 4.2
+ */
+ public void setExternaltoolconfig(String externaltoolconfig) {
+ this.externaltoolconfig = externaltoolconfig;
+ }
+
+ /**
* Provides a <code>VPPConfig</code> object to configure. (Written with createConfig()
* instead of addConfig() to avoid run-time dependency on VPP).
*/
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
index 2f6e2e4..cfa7480 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
@@ -81,6 +81,11 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
private boolean client;
+ /**
+ * @since 4.2
+ */
+ private String externalToolConfig;
+
public CgenConfiguration(boolean client) {
this.outputPattern = "*.java";
this.timestamp = 0L;
@@ -318,6 +323,14 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
this.client = client;
}
+ public String getExternalToolConfig() {
+ return externalToolConfig;
+ }
+
+ public void setExternalToolConfig(String config) {
+ this.externalToolConfig = config;
+ }
+
void addArtifact(Artifact artifact) {
artifacts.add(artifact);
}
@@ -404,6 +417,7 @@ public class CgenConfiguration implements Serializable, XMLSerializable {
.simpleTag("superPkg", this.superPkg)
.simpleTag("createPKProperties", Boolean.toString(this.createPKProperties))
.simpleTag("client", Boolean.toString(client))
+ .simpleTag("externalToolConfig", this.externalToolConfig)
.end();
}
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
index 85cade1..00a86ec 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClassGenerationAction.java
@@ -34,7 +34,6 @@ import java.util.Properties;
import java.util.stream.Collectors;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.gen.ImportUtils;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.QueryDescriptor;
@@ -43,6 +42,8 @@ import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.context.Context;
import org.apache.velocity.tools.ToolManager;
+import org.apache.velocity.tools.config.ConfigurationUtils;
+import org.apache.velocity.tools.config.FactoryConfiguration;
import org.slf4j.Logger;
public class ClassGenerationAction {
@@ -86,9 +87,17 @@ public class ClassGenerationAction {
tools.application.myTool = com.mycompany.MyTool</pre>
Then the methods in the MyTool class will be available for use in the template like ${myTool.myMethod(arg)}
*/
- public ClassGenerationAction() {
- if (System.getProperty("org.apache.velocity.tools") != null) {
+ public ClassGenerationAction(CgenConfiguration cgenConfig) {
+ this.cgenConfiguration = cgenConfig;
+ String toolConfigFile = cgenConfig.getExternalToolConfig();
+
+ if (System.getProperty("org.apache.velocity.tools") != null || toolConfigFile != null) {
ToolManager manager = new ToolManager(true, true);
+ if (toolConfigFile != null) {
+ logger.info("Adding external tool configuration.");
+ FactoryConfiguration config = ConfigurationUtils.find(toolConfigFile);
+ manager.getToolboxFactory().configure(config);
+ }
this.context = manager.createContext();
} else {
this.context = new VelocityContext();
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
index 9e3927b..886383d 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/ClientClassGenerationAction.java
@@ -41,8 +41,8 @@ public class ClientClassGenerationAction extends ClassGenerationAction {
public static final String CLIENT_SUPERCLASS_PREFIX = "_Client";
- public ClientClassGenerationAction() {
- super();
+ public ClientClassGenerationAction(CgenConfiguration config) {
+ super(config);
}
@Override
diff --git a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java
index b561547..d01a98b 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/DefaultClassGenerationActionFactory.java
@@ -32,9 +32,8 @@ public class DefaultClassGenerationActionFactory implements ClassGenerationActio
@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);
return classGenerationAction;
}
diff --git a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
index c16aabc..b58b518 100644
--- a/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
+++ b/cayenne-cgen/src/test/java/org/apache/cayenne/gen/mock/TestClassGenerationAction.java
@@ -33,8 +33,7 @@ public class TestClassGenerationAction extends ClassGenerationAction {
private Collection<StringWriter> writers;
public TestClassGenerationAction(ClassGenerationAction classGenerationAction, Collection<StringWriter> writers){
- super();
- setCgenConfiguration(classGenerationAction.getCgenConfiguration());
+ super(classGenerationAction.getCgenConfiguration());
setUtilsFactory(classGenerationAction.getUtilsFactory());
this.writers = writers;
}
diff --git a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
index 6ad823c..9ac9329 100644
--- a/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
+++ b/maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java
@@ -20,7 +20,6 @@
package org.apache.cayenne.tools;
import java.io.File;
-import java.util.Map;
import org.apache.cayenne.configuration.xml.DataChannelMetaData;
import org.apache.cayenne.dbsync.filter.NamePatternMatcher;
@@ -58,12 +57,6 @@ public class CayenneGeneratorMojo extends AbstractMojo {
@Parameter
private File additionalMaps;
- /**
- * Additional system properties that can be added before execution.
- */
- @Parameter
- private Map<String,String> systemProperties;
-
/**
* Whether we are generating classes for the client tier in a Remote Object
* Persistence application. Default is <code>false</code>.
@@ -231,6 +224,13 @@ public class CayenneGeneratorMojo extends AbstractMojo {
@Parameter
private Boolean createPKProperties;
+ /**
+ * Optional path (classpath or filesystem) to external velocity tool configuration file
+ * @since 4.2
+ */
+ @Parameter
+ private String externalToolConfig;
+
private transient Injector injector;
private static final Logger logger = LoggerFactory.getLogger(CayenneGeneratorMojo.class);
@@ -246,12 +246,6 @@ public class CayenneGeneratorMojo extends AbstractMojo {
.addModule(new ToolsModule(LoggerFactory.getLogger(CayenneGeneratorMojo.class)))
.create();
- // load additional system properties early for downstream access
- if (systemProperties != null) {
- logger.info("Setting system properties from pom.xml");
- systemProperties.forEach((key,value) -> System.setProperty(key, value));
- }
-
Logger logger = new MavenLogger(this);
CayenneGeneratorMapLoaderAction loaderAction = new CayenneGeneratorMapLoaderAction(injector);
loaderAction.setMainDataMapFile(map);
@@ -310,7 +304,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
makePairs != null || mode != null || outputPattern != null || overwrite != null || superPkg != null ||
superTemplate != null || template != null || embeddableTemplate != null || embeddableSuperTemplate != null ||
usePkgPath != null || createPropertyNames != null || force || queryTemplate != null ||
- querySuperTemplate != null || createPKProperties != null;
+ querySuperTemplate != null || createPKProperties != null || externalToolConfig != null;
}
/**
@@ -362,6 +356,7 @@ public class CayenneGeneratorMojo extends AbstractMojo {
cgenConfiguration.setQueryTemplate(queryTemplate != null ? queryTemplate : cgenConfiguration.getQueryTemplate());
cgenConfiguration.setQuerySuperTemplate(querySuperTemplate != null ? querySuperTemplate : cgenConfiguration.getQuerySuperTemplate());
cgenConfiguration.setCreatePKProperties(createPKProperties != null ? createPKProperties : cgenConfiguration.isCreatePKProperties());
+ cgenConfiguration.setExternalToolConfig(externalToolConfig != null ? externalToolConfig : cgenConfiguration.getExternalToolConfig());
if(!cgenConfiguration.isMakePairs()) {
if(template == null) {
cgenConfiguration.setTemplate(cgenConfiguration.isClient() ? ClientClassGenerationAction.SINGLE_CLASS_TEMPLATE : ClassGenerationAction.SINGLE_CLASS_TEMPLATE);
[cayenne] 05/05: Merge branch 'pull/421' into asf-master
Posted by nt...@apache.org.
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;
}