Skip to content

Commit

Permalink
CAY-2677 Custom Class Generation Templates for Embeddables and DataMaps
Browse files Browse the repository at this point in the history 
applying patch from Stefan S, see JIRA issue
  • Loading branch information
@stariy95
stariy95 committed Feb 24, 2021
1 parent a22851b commit 3ad81a8
Show file tree
Hide file tree
Showing 5 changed files with 274 additions and 35 deletions.
6 changes: 6 additions & 0 deletions cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,12 @@ public void encodeAsXML(XMLEncoder encoder, ConfigurationNodeVisitor delegate) {
.simpleTag("mode", this.artifactsGenerationMode.getLabel())
.simpleTag("template", this.template)
.simpleTag("superTemplate", this.superTemplate)
.simpleTag("template", this.template)
.simpleTag("superTemplate", this.superTemplate)
.simpleTag("embeddableTemplate", this.embeddableTemplate)
.simpleTag("embeddableSuperTemplate", this.embeddableSuperTemplate)
.simpleTag("queryTemplate", this.queryTemplate)
.simpleTag("querySuperTemplate", this.querySuperTemplate)
.simpleTag("outputPattern", this.outputPattern)
.simpleTag("makePairs", Boolean.toString(this.makePairs))
.simpleTag("usePkgPath", Boolean.toString(this.usePkgPath))
Expand Down
43 changes: 43 additions & 0 deletions cayenne-cgen/src/main/java/org/apache/cayenne/gen/xml/CgenConfigHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public class CgenConfigHandler extends NamespaceAwareNestedTagHandler{
private static final String GENERATION_MODE_TAG = "mode";
private static final String SUBCLASS_TEMPLATE_TAG = "template";
private static final String SUPERCLASS_TEMPLATE_TAG = "superTemplate";
private static final String EMBEDDABLE_TEMPLATE_TAG = "embeddableTemplate";
private static final String EMBEDDABLE_SUPER_TEMPLATE_TAG = "embeddableSuperTemplate";
private static final String QUERY_TEMPLATE_TAG = "queryTemplate";
private static final String QUERY_SUPER_TEMPLATE_TAG = "querySuperTemplate";
private static final String OUTPUT_PATTERN_TAG = "outputPattern";
private static final String MAKE_PAIRS_TAG = "makePairs";
private static final String USE_PKG_PATH_TAG = "usePkgPath";
Expand Down Expand Up @@ -97,6 +101,17 @@ protected void processCharData(String localName, String data) {
case SUPERCLASS_TEMPLATE_TAG:
createSuperclassTemplate(data);
break;
case EMBEDDABLE_TEMPLATE_TAG:
createEmbeddableTemplate(data);
break;
case EMBEDDABLE_SUPER_TEMPLATE_TAG:
createEmbeddableSuperTemplate(data);
case QUERY_TEMPLATE_TAG:
createQueryTemplate(data);
break;
case QUERY_SUPER_TEMPLATE_TAG:
createQuerySuperTemplate(data);
break;
case OUTPUT_PATTERN_TAG:
createOutputPattern(data);
break;
Expand Down Expand Up @@ -165,6 +180,34 @@ private void createSuperclassTemplate(String template) {
}
configuration.setSuperTemplate(template);
}

private void createEmbeddableTemplate(String template) {
if(template.trim().length() == 0) {
return;
}
configuration.setEmbeddableTemplate(template);
}

private void createEmbeddableSuperTemplate(String template) {
if(template.trim().length() == 0) {
return;
}
configuration.setEmbeddableSuperTemplate(template);
}

private void createQueryTemplate(String template) {
if(template.trim().length() == 0) {
return;
}
configuration.setQueryTemplate(template);
}

private void createQuerySuperTemplate(String template) {
if(template.trim().length() == 0) {
return;
}
configuration.setQuerySuperTemplate(template);
}

private void createOutputPattern(String pattern) {
if(pattern.trim().length() == 0) {
Expand Down
92 changes: 59 additions & 33 deletions modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CodeTemplateManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,19 @@ public class CodeTemplateManager {

public static final String STANDARD_SERVER_SUPERCLASS = "Standard Server Superclass";
public static final String STANDARD_SERVER_SUBCLASS = "Standard Server Subclass";
public static final String SINGLE_SERVER_CLASS = "Single Server class";
public static final String SINGLE_SERVER_CLASS = "Single Server Class";
static final String STANDARD_CLIENT_SUPERCLASS = "Standard Client Superclass";
static final String STANDARD_CLIENT_SUBCLASS = "Standard Client Subclass";

private static final String STANDART_EMBEDDABLE_SUPERCLASS = "Standart Embeddable Superclass";
private static final String STANDART_EMBEDDABLE_SUBCLASS = "Standart Embeddable Subclass";
private static final String SINGLE_EMBEDDABLE_CLASS = "Single Embeddable class";
private static final String STANDARD_EMBEDDABLE_SUPERCLASS = "Standard Embeddable Superclass";
private static final String STANDARD_EMBEDDABLE_SUBCLASS = "Standard Embeddable Subclass";
private static final String SINGLE_EMBEDDABLE_CLASS = "Single Embeddable Class";

private static final String STANDART_DATAMAP_SUPERCLASS = "Standart DataMap Superclass";
private static final String STANDART_DATAMAP_SUBCLASS = "Standart DataMap Subclass";
private static final String SINGLE_DATAMAP_CLASS = "Single DataMap class";
private static final String STANDARD_SERVER_DATAMAP_SUPERCLASS = "Standard Server DataMap Superclass";
private static final String STANDARD_SERVER_DATAMAP_SUBCLASS = "Standard Server DataMap Subclass";
private static final String STANDARD_CLIENT_DATAMAP_SUPERCLASS = "Standard Client DataMap Superclass";
private static final String STANDARD_CLIENT_DATAMAP_SUBCLASS = "Standard Client DataMap Subclass";
private static final String SINGLE_DATAMAP_CLASS = "Single DataMap Class";

public static final String NODE_NAME = "codeTemplateManager";

Expand All @@ -65,11 +67,13 @@ public class CodeTemplateManager {
private Map<String, String> reverseCustomTemplate;
private Map<String, String> standardTemplates;

private List<String> standartEmbeddableTemplates;
private List<String> standartEmbeddableSuperclassTemplates;
private List<String> standardEmbeddableTemplates;
private List<String> standardEmbeddableSuperclassTemplates;

private List<String> standartDataMapTemplates;
private List<String> standartDataMapSuperclassTemplates;
private List<String> standardServerDataMapTemplates;
private List<String> standardServerDataMapSuperclassTemplates;
private List<String> standardClientDataMapTemplates;
private List<String> standardClientDataMapSuperclassTemplates;

private Map<String, String> reverseStandartTemplates;

Expand All @@ -93,19 +97,25 @@ public CodeTemplateManager(Application application) {
standardClientSubclassTemplates = new ArrayList<>();
standardClientSubclassTemplates.add(STANDARD_CLIENT_SUBCLASS);

standartEmbeddableTemplates = new ArrayList<>();
standartEmbeddableTemplates.add(SINGLE_EMBEDDABLE_CLASS);
standartEmbeddableTemplates.add(STANDART_EMBEDDABLE_SUBCLASS);
standardEmbeddableTemplates = new ArrayList<>();
standardEmbeddableTemplates.add(STANDARD_EMBEDDABLE_SUBCLASS);
standardEmbeddableTemplates.add(SINGLE_EMBEDDABLE_CLASS);

standartEmbeddableSuperclassTemplates = new ArrayList<>();
standartEmbeddableSuperclassTemplates.add(STANDART_EMBEDDABLE_SUPERCLASS);
standardEmbeddableSuperclassTemplates = new ArrayList<>();
standardEmbeddableSuperclassTemplates.add(STANDARD_EMBEDDABLE_SUPERCLASS);

standartDataMapTemplates = new ArrayList<>();
standartDataMapTemplates.add(STANDART_DATAMAP_SUBCLASS);
standartDataMapTemplates.add(SINGLE_DATAMAP_CLASS);
standardServerDataMapTemplates = new ArrayList<>();
standardServerDataMapTemplates.add(STANDARD_SERVER_DATAMAP_SUBCLASS);
standardServerDataMapTemplates.add(SINGLE_DATAMAP_CLASS);

standartDataMapSuperclassTemplates = new ArrayList<>();
standartDataMapSuperclassTemplates.add(STANDART_DATAMAP_SUPERCLASS);
standardServerDataMapSuperclassTemplates = new ArrayList<>();
standardServerDataMapSuperclassTemplates.add(STANDARD_SERVER_DATAMAP_SUPERCLASS);

standardClientDataMapTemplates = new ArrayList<>();
standardClientDataMapTemplates.add(STANDARD_CLIENT_DATAMAP_SUBCLASS);

standardClientDataMapSuperclassTemplates = new ArrayList<>();
standardClientDataMapSuperclassTemplates.add(STANDARD_CLIENT_DATAMAP_SUPERCLASS);

updateCustomTemplates(getTemplatePreferences(application));
reverseCustomTemplate = new HashMap<>();
Expand All @@ -120,13 +130,15 @@ public CodeTemplateManager(Application application) {
standardTemplates.put(STANDARD_CLIENT_SUBCLASS, ClientClassGenerationAction.SUBCLASS_TEMPLATE);
standardTemplates.put(SINGLE_SERVER_CLASS, ClassGenerationAction.SINGLE_CLASS_TEMPLATE);

standardTemplates.put(STANDART_EMBEDDABLE_SUPERCLASS, ClassGenerationAction.EMBEDDABLE_SUPERCLASS_TEMPLATE);
standardTemplates.put(STANDART_EMBEDDABLE_SUBCLASS, ClassGenerationAction.EMBEDDABLE_SUBCLASS_TEMPLATE);
standardTemplates.put(STANDARD_EMBEDDABLE_SUPERCLASS, ClassGenerationAction.EMBEDDABLE_SUPERCLASS_TEMPLATE);
standardTemplates.put(STANDARD_EMBEDDABLE_SUBCLASS, ClassGenerationAction.EMBEDDABLE_SUBCLASS_TEMPLATE);
standardTemplates.put(SINGLE_EMBEDDABLE_CLASS, ClassGenerationAction.EMBEDDABLE_SINGLE_CLASS_TEMPLATE);

standardTemplates.put(STANDART_DATAMAP_SUBCLASS, ClassGenerationAction.DATAMAP_SUBCLASS_TEMPLATE);
standardTemplates.put(STANDARD_SERVER_DATAMAP_SUBCLASS, ClassGenerationAction.DATAMAP_SUBCLASS_TEMPLATE);
standardTemplates.put(STANDARD_CLIENT_DATAMAP_SUBCLASS, ClientClassGenerationAction.DMAP_SUBCLASS_TEMPLATE);
standardTemplates.put(SINGLE_DATAMAP_CLASS, ClassGenerationAction.DATAMAP_SINGLE_CLASS_TEMPLATE);
standardTemplates.put(STANDART_DATAMAP_SUPERCLASS, ClassGenerationAction.DATAMAP_SUPERCLASS_TEMPLATE);
standardTemplates.put(STANDARD_SERVER_DATAMAP_SUPERCLASS, ClassGenerationAction.DATAMAP_SUPERCLASS_TEMPLATE);
standardTemplates.put(STANDARD_CLIENT_DATAMAP_SUPERCLASS, ClientClassGenerationAction.DMAP_SUPERCLASS_TEMPLATE);

reverseStandartTemplates = new HashMap<>();
reverseStandartTemplates.put(ClassGenerationAction.SUBCLASS_TEMPLATE, STANDARD_SERVER_SUBCLASS);
Expand All @@ -135,13 +147,15 @@ public CodeTemplateManager(Application application) {
reverseStandartTemplates.put(ClientClassGenerationAction.SUPERCLASS_TEMPLATE, STANDARD_CLIENT_SUPERCLASS);
reverseStandartTemplates.put(ClassGenerationAction.SUPERCLASS_TEMPLATE, STANDARD_SERVER_SUPERCLASS);

reverseStandartTemplates.put(ClassGenerationAction.EMBEDDABLE_SUPERCLASS_TEMPLATE, STANDART_EMBEDDABLE_SUPERCLASS);
reverseStandartTemplates.put(ClassGenerationAction.EMBEDDABLE_SUBCLASS_TEMPLATE, STANDART_EMBEDDABLE_SUBCLASS);
reverseStandartTemplates.put(ClassGenerationAction.EMBEDDABLE_SUPERCLASS_TEMPLATE, STANDARD_EMBEDDABLE_SUPERCLASS);
reverseStandartTemplates.put(ClassGenerationAction.EMBEDDABLE_SUBCLASS_TEMPLATE, STANDARD_EMBEDDABLE_SUBCLASS);
reverseStandartTemplates.put(ClassGenerationAction.EMBEDDABLE_SINGLE_CLASS_TEMPLATE, SINGLE_EMBEDDABLE_CLASS);

reverseStandartTemplates.put(ClassGenerationAction.DATAMAP_SUBCLASS_TEMPLATE, STANDART_DATAMAP_SUBCLASS);
reverseStandartTemplates.put(ClassGenerationAction.DATAMAP_SUBCLASS_TEMPLATE, STANDARD_SERVER_DATAMAP_SUBCLASS);
reverseStandartTemplates.put(ClientClassGenerationAction.DMAP_SUBCLASS_TEMPLATE, STANDARD_CLIENT_DATAMAP_SUBCLASS);
reverseStandartTemplates.put(ClassGenerationAction.DATAMAP_SINGLE_CLASS_TEMPLATE, SINGLE_DATAMAP_CLASS);
reverseStandartTemplates.put(ClassGenerationAction.DATAMAP_SUPERCLASS_TEMPLATE, STANDART_DATAMAP_SUPERCLASS);
reverseStandartTemplates.put(ClassGenerationAction.DATAMAP_SUPERCLASS_TEMPLATE, STANDARD_SERVER_DATAMAP_SUPERCLASS);
reverseStandartTemplates.put(ClientClassGenerationAction.DMAP_SUPERCLASS_TEMPLATE, STANDARD_CLIENT_DATAMAP_SUPERCLASS);
}

/**
Expand Down Expand Up @@ -212,14 +226,26 @@ public List<String> getStandardClientSuperclassTemplates() {
}

public List<String> getStandartEmbeddableTemplates() {
return standartEmbeddableTemplates;
return standardEmbeddableTemplates;
}

public List<String> getStandartEmbeddableSuperclassTemplates() {
return standartEmbeddableSuperclassTemplates;
return standardEmbeddableSuperclassTemplates;
}

public List<String> getStandartDataMapTemplates() { return standartDataMapTemplates; }
public List<String> getStandartDataMapTemplates() {
return standardServerDataMapTemplates;
}

public List<String> getStandartDataMapSuperclassTemplates() { return standartDataMapSuperclassTemplates; }
public List<String> getStandartDataMapSuperclassTemplates() {
return standardServerDataMapSuperclassTemplates;
}

public List<String> getStandardClientDataMapTemplates() {
return standardClientDataMapTemplates;
}

public List<String> getStandardClientDataMapSuperclassTemplates() {
return standardClientDataMapSuperclassTemplates;
}
}

0 comments on commit 3ad81a8

Please sign in to comment.