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
The following commit(s) were added to refs/heads/master by this push:
new c7835102a CgenConfiguration methods renamed for better code readability
c7835102a is described below
commit c7835102a9e2905c529f5efc7aff7e6178df47e2
Author: Nikita Timofeev <[email protected]>
AuthorDate: Thu Dec 8 10:22:16 2022 +0300
CgenConfiguration methods renamed for better code readability
---
.../org/apache/cayenne/gen/CgenConfiguration.java | 70 ++++++++++++++--------
.../apache/cayenne/gen/xml/CgenConfigHandler.java | 8 +--
.../editor/cgen/CodeGeneratorController.java | 2 +-
.../editor/cgen/domain/CgenTabController.java | 5 +-
4 files changed, 51 insertions(+), 34 deletions(-)
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 111f030dd..557d9ae97 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
@@ -60,9 +60,9 @@ public class CgenConfiguration implements Serializable,
XMLSerializable {
private Collection<Artifact> artifacts;
private Set<String> entityArtifacts;
- private Collection<String> excludeEntityArtifacts;
+ private Collection<String> excludedEntityArtifacts;
private Set<String> embeddableArtifacts;
- private Collection<String> excludeEmbeddableArtifacts;
+ private Collection<String> excludedEmbeddableArtifacts;
private String name;
private String superPkg;
@@ -114,9 +114,9 @@ public class CgenConfiguration implements Serializable,
XMLSerializable {
this.artifacts = new ArrayList<>();
this.entityArtifacts = new HashSet<>();
- this.excludeEntityArtifacts = new ArrayList<>();
+ this.excludedEntityArtifacts = new ArrayList<>();
this.embeddableArtifacts = new HashSet<>();
- this.excludeEmbeddableArtifacts = new ArrayList<>();
+ this.excludedEmbeddableArtifacts = new ArrayList<>();
this.template = TemplateType.ENTITY_SUBCLASS.defaultTemplate();
this.superTemplate = TemplateType.ENTITY_SUPERCLASS.defaultTemplate();
@@ -405,54 +405,72 @@ public class CgenConfiguration implements Serializable,
XMLSerializable {
embeddableArtifacts.add(embeddable.getClassName());
}
- public void loadEntities(String entities) {
- excludeEntityArtifacts.addAll(Arrays.asList(entities.split(",")));
+ /**
+ * @param entities comma separated list of entities to exclude
+ * @since 5.0 renamed from {@code loadEntities()}
+ */
+ public void parseExcludedEntities(String entities) {
+ excludedEntityArtifacts.addAll(Arrays.asList(entities.split(",")));
}
- private String getExcludeEntites() {
- Collection<String> excludeEntities = dataMap.getObjEntities()
+ private String getExcludedEntities() {
+ return dataMap.getObjEntities()
.stream()
.map(ObjEntity::getName)
.filter(name -> !entityArtifacts.contains(name))
- .collect(Collectors.toList());
- return String.join(",", excludeEntities);
+ .collect(Collectors.joining(","));
}
- public void loadEmbeddables(String embeddables) {
-
excludeEmbeddableArtifacts.addAll(Arrays.asList(embeddables.split(",")));
+ /**
+ * @param embeddables comma separated list of embeddables to exclude
+ * @since 5.0 renamed from {@code loadEmbeddables()}
+ */
+ public void parseExcludedEmbeddables(String embeddables) {
+
excludedEmbeddableArtifacts.addAll(Arrays.asList(embeddables.split(",")));
}
- private String getExcludeEmbeddables() {
- Collection<String> excludeEmbeddable = dataMap.getEmbeddables()
+ private String getExcludedEmbeddables() {
+ return dataMap.getEmbeddables()
.stream()
.map(Embeddable::getClassName)
.filter(className -> !embeddableArtifacts.contains(className))
- .collect(Collectors.toList());
- return String.join(",", excludeEmbeddable);
+ .collect(Collectors.joining(","));
}
- public void resolveExcludeEntities() {
+ /**
+ * @since 5.0 renamed from {@code resolveExcludeEntities()}
+ */
+ public void resolveExcludedEntities() {
entityArtifacts = dataMap.getObjEntities()
.stream()
.map(ObjEntity::getName)
- .filter(name -> !excludeEntityArtifacts.contains(name))
+ .filter(name -> !excludedEntityArtifacts.contains(name))
.collect(Collectors.toSet());
}
- public void resolveExcludeEmbeddables() {
+ /**
+ * @since 5.0 renamed from {@code resolveExcludeEmbeddables()}
+ */
+ public void resolveExcludedEmbeddables() {
embeddableArtifacts = dataMap.getEmbeddables()
.stream()
.map(Embeddable::getClassName)
- .filter(className ->
!excludeEmbeddableArtifacts.contains(className))
+ .filter(className ->
!excludedEmbeddableArtifacts.contains(className))
.collect(Collectors.toSet());
}
- public Collection<String> getExcludeEntityArtifacts() {
- return excludeEntityArtifacts;
+ /**
+ * @since 5.0 renamed from {@code getExcludeEntityArtifacts()}
+ */
+ public Collection<String> getExcludedEntityArtifacts() {
+ return excludedEntityArtifacts;
}
- public Collection<String> getExcludeEmbeddableArtifacts() {
- return excludeEmbeddableArtifacts;
+ /**
+ * @since 5.0 renamed from {@code getExcludeEmbeddableArtifacts()}
+ */
+ public Collection<String> getExcludedEmbeddableArtifacts() {
+ return excludedEmbeddableArtifacts;
}
@Override
@@ -460,8 +478,8 @@ public class CgenConfiguration implements Serializable,
XMLSerializable {
encoder.start("cgen")
.attribute("xmlns", CgenExtension.NAMESPACE)
.simpleTag("name", this.name)
- .simpleTag("excludeEntities", getExcludeEntites())
- .simpleTag("excludeEmbeddables", getExcludeEmbeddables())
+ .simpleTag("excludeEntities", getExcludedEntities())
+ .simpleTag("excludeEmbeddables", getExcludedEmbeddables())
.simpleTag("destDir",
separatorsToUnix(getNormalizedOutputPath()))
.simpleTag("mode", this.artifactsGenerationMode.getLabel())
.start("template").cdata(this.template.getData(),
!this.template.isFile()).end()
diff --git
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenConfigHandler.java
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenConfigHandler.java
index 3e6aca53e..05a91ac43 100644
---
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenConfigHandler.java
+++
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenConfigHandler.java
@@ -165,14 +165,14 @@ public class CgenConfigHandler extends
NamespaceAwareNestedTagHandler {
if (entities.trim().length() == 0) {
return;
}
- configuration.loadEntities(entities);
+ configuration.parseExcludedEntities(entities);
}
private void createExcludeEmbeddables(String embeddables) {
if (embeddables.trim().length() == 0) {
return;
}
- configuration.loadEmbeddables(embeddables);
+ configuration.parseExcludedEmbeddables(embeddables);
}
private void createSubclassTemplate(String template) {
@@ -295,8 +295,8 @@ public class CgenConfigHandler extends
NamespaceAwareNestedTagHandler {
loaderContext.addDataMapListener(dataMap -> {
configuration.setDataMap(dataMap);
configuration.setRootPath(buildRootPath(dataMap));
- configuration.resolveExcludeEntities();
- configuration.resolveExcludeEmbeddables();
+ configuration.resolveExcludedEntities();
+ configuration.resolveExcludedEmbeddables();
CgenConfigList configurations =
CgenConfigHandler.this.metaData.get(dataMap, CgenConfigList.class);
if (configurations == null) {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
index 904d8585d..9eab1bfe1 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/CodeGeneratorController.java
@@ -499,7 +499,7 @@ public class CodeGeneratorController extends
CayenneController implements ObjEnt
if (e.getSource() instanceof DbImportController) {
if (cgenConfiguration != null) {
for (ObjEntity objEntity : e.getDataMap().getObjEntities()) {
- if
(!cgenConfiguration.getExcludeEntityArtifacts().contains(objEntity.getName())) {
+ if
(!cgenConfiguration.getExcludedEntityArtifacts().contains(objEntity.getName()))
{
addEntity(cgenConfiguration.getDataMap(), objEntity);
}
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
index 762cdc758..d7fcc6b5f 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.modeler.editor.cgen.domain;
-import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Set;
import java.util.prefs.Preferences;
@@ -95,8 +94,8 @@ public class CgenTabController extends
GeneratorsTabController<CgenConfiguration
cgenConfiguration.setEncoding(preferences.get(GeneralPreferences.ENCODING_PREFERENCE,
null));
}
- cgenConfiguration.resolveExcludeEntities();
- cgenConfiguration.resolveExcludeEmbeddables();
+ cgenConfiguration.resolveExcludedEntities();
+ cgenConfiguration.resolveExcludedEmbeddables();
return cgenConfiguration;
}
