[cayenne] branch master updated: code cleanup

[ntimofeev]

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 63bd7acb7 code cleanup
63bd7acb7 is described below

commit 63bd7acb793b743aecc5fa622176898d498c0770
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Wed Dec 7 18:33:22 2022 +0300

    code cleanup
---
 .../java/org/apache/cayenne/gen/CgenTemplate.java  |  3 ++
 .../java/org/apache/cayenne/gen/TemplateType.java  | 37 ++++++++++++----------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java
index 18e037968..4b22494af 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenTemplate.java
@@ -22,6 +22,9 @@ package org.apache.cayenne.gen;
 import java.util.Objects;
 
 /**
+ * Template source for the class generation.
+ * Could be either some resource (file or classpath resource) or just text.
+ *
  * @since 5.0
  */
 public class CgenTemplate {
diff --git 
a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/TemplateType.java 
b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/TemplateType.java
index 4b80982b5..44e101194 100644
--- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/TemplateType.java
+++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/TemplateType.java
@@ -18,41 +18,39 @@
  ****************************************************************/
 package org.apache.cayenne.gen;
 
-import java.util.Arrays;
-
 /**
  * Defines class generation template types.
- * 
+ *
  * @since 3.0
  */
 public enum TemplateType {
 
-    ENTITY_SINGLE_CLASS(false,"Single Entity 
Class","templates/v4_1/singleclass.vm"),
+    ENTITY_SINGLE_CLASS(false, "Single Entity Class", 
"templates/v4_1/singleclass.vm"),
 
-    ENTITY_SUPERCLASS(true,"Entity Superclass","templates/v4_1/superclass.vm"),
+    ENTITY_SUPERCLASS(true, "Entity Superclass", 
"templates/v4_1/superclass.vm"),
 
-    ENTITY_SUBCLASS(false,"Entity Subclass","templates/v4_1/subclass.vm"),
+    ENTITY_SUBCLASS(false, "Entity Subclass", "templates/v4_1/subclass.vm"),
 
-    EMBEDDABLE_SINGLE_CLASS(false,"Single Embeddable 
Class","templates/v4_1/embeddable-singleclass.vm"),
+    EMBEDDABLE_SINGLE_CLASS(false, "Single Embeddable Class", 
"templates/v4_1/embeddable-singleclass.vm"),
 
-    EMBEDDABLE_SUPERCLASS(true,"Embeddable 
Superclass","templates/v4_1/embeddable-superclass.vm"),
+    EMBEDDABLE_SUPERCLASS(true, "Embeddable Superclass", 
"templates/v4_1/embeddable-superclass.vm"),
 
-    EMBEDDABLE_SUBCLASS(false,"Embeddable Subclass", 
"templates/v4_1/embeddable-subclass.vm"),
+    EMBEDDABLE_SUBCLASS(false, "Embeddable Subclass", 
"templates/v4_1/embeddable-subclass.vm"),
 
-    DATAMAP_SINGLE_CLASS(false,"Single DataMap 
Class","templates/v4_1/datamap-singleclass.vm"),
+    DATAMAP_SINGLE_CLASS(false, "Single DataMap Class", 
"templates/v4_1/datamap-singleclass.vm"),
 
-    DATAMAP_SUPERCLASS(true,"DataMap Superclass", 
"templates/v4_1/datamap-superclass.vm"),
+    DATAMAP_SUPERCLASS(true, "DataMap Superclass", 
"templates/v4_1/datamap-superclass.vm"),
 
-    DATAMAP_SUBCLASS(false,"DataMap Subclass",   
"templates/v4_1/datamap-subclass.vm");
+    DATAMAP_SUBCLASS(false, "DataMap Subclass", 
"templates/v4_1/datamap-subclass.vm");
 
     private final boolean superclass;
     private final String readableName;
     private final CgenTemplate defaultTemplate;
 
-    TemplateType(boolean superclass, String readableName,  String 
defaultTemplate) {
+    TemplateType(boolean superclass, String readableName, String 
defaultTemplate) {
         this.superclass = superclass;
         this.readableName = readableName;
-        this.defaultTemplate = new CgenTemplate(defaultTemplate,true,this);
+        this.defaultTemplate = new CgenTemplate(defaultTemplate, true, this);
     }
 
     public boolean isSuperclass() {
@@ -63,13 +61,20 @@ public enum TemplateType {
         return readableName;
     }
 
-    public String pathFromSourceRoot() {return defaultTemplate.getData();}
+    public String pathFromSourceRoot() {
+        return defaultTemplate.getData();
+    }
 
     public CgenTemplate defaultTemplate() {
         return defaultTemplate;
     }
 
     public static boolean isDefault(String templateText) {
-        return Arrays.stream(values()).anyMatch(t -> 
t.pathFromSourceRoot().equals(templateText));
+        for (TemplateType type : values()) {
+            if (type.pathFromSourceRoot().equals(templateText)) {
+                return true;
+            }
+        }
+        return false;
     }
 }