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 e9f3501da40ea1f41187c823b3aa3643c77bc65a Merge: 473e943e9 0d96b4a96 Author: Nikita Timofeev <stari...@gmail.com> AuthorDate: Thu Nov 17 13:53:58 2022 +0300 Merge remote-tracking branch 'parent/pr/529' into asf-master # Conflicts: # maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/pref/CreateTemplateFromDefaultController.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/FileTemplateSaver.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateEditorController.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/templateeditor/TemplateLoader.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/PreviewGenerationAction.java # modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/VelocityTokenMaker.java .../apache/cayenne/tools/CayenneGeneratorTask.java | 21 +- .../cayenne/tools/CayenneGeneratorTaskTest.java | 76 ++- .../org/apache/cayenne/gen/CgenConfiguration.java | 95 ++-- .../java/org/apache/cayenne/gen/CgenTemplate.java | 55 ++ .../apache/cayenne/gen/ClassGenerationAction.java | 165 +++--- .../java/org/apache/cayenne/gen/TemplateType.java | 48 +- .../apache/cayenne/gen/xml/CgenConfigHandler.java | 111 ++-- .../apache/cayenne/gen/xml/CgenSaverDelegate.java | 9 - .../apache/cayenne/gen/TemplateLocationTest.java | 6 +- .../java/org/apache/cayenne/tools/CgenTask.java | 54 +- .../org/apache/cayenne/tools/CgenTaskTest.java | 14 +- .../upgrade/handlers/UpgradeHandler_V11.java | 118 +++- .../upgrade/handlers/UpgradeHandler_V11Test.java | 31 +- .../project/upgrade/handlers/test-map-v10.map.xml | 8 +- .../project/upgrade/handlers/velocityTemplate.txt | 1 + .../apache/cayenne/tools/CayenneGeneratorMojo.java | 612 +++++++++++---------- .../cayenne/tools/CayenneGeneratorMojoTest.java | 52 ++ .../project-to-test/pomTransferPluginToCgen.xml | 64 +++ .../resources/cgen/project-to-test/testTemplate.vm | 18 + modeler/cayenne-modeler/pom.xml | 6 + .../org/apache/cayenne/modeler/Application.java | 6 - .../cayenne/modeler/CodeTemplateManager.java | 153 ------ .../modeler/dialog/cgen/TemplateDialog.java | 88 --- .../modeler/dialog/cgen/TemplateDialogView.java | 136 ----- .../pref/CreateTemplateFromDefaultController.java | 241 -------- .../modeler/dialog/pref/PreferenceDialog.java | 11 +- .../modeler/dialog/pref/TemplateCreator.java | 166 ------ .../modeler/dialog/pref/TemplateCreatorView.java | 90 --- .../modeler/dialog/pref/TemplatePreferences.java | 186 ------- .../dialog/pref/TemplatePreferencesView.java | 91 --- .../dialog/templateeditor/FileTemplateSaver.java | 60 -- .../templateeditor/TemplateEditorController.java | 194 ------- .../dialog/templateeditor/TemplateLoader.java | 58 -- .../modeler/editor/cgen/ClassesTabController.java | 3 + .../editor/cgen/CodeGeneratorController.java | 12 + .../editor/cgen/StandardModeController.java | 276 ++++------ .../modeler/editor/cgen/StandardModePanel.java | 199 +++---- .../templateeditor/ArtefactsConfigurator.java} | 43 +- .../DataMapArtefactsConfigurator.java | 56 ++ .../cgen/templateeditor/EditorTemplateLoader.java | 89 +++ .../cgen/templateeditor/EditorTemplateSaver.java | 104 ++++ .../EmbeddableArtefactsConfigurator.java | 56 ++ .../EntityArtefactsConfigurator.java | 56 ++ .../templateeditor/FindAndReplaceController.java | 16 +- .../cgen}/templateeditor/FindAndReplaceView.java | 2 +- .../cgen}/templateeditor/FindController.java | 18 +- .../cgen}/templateeditor/FindView.java | 2 +- .../templateeditor/PreviewActionConfigurator.java | 112 ++++ .../PreviewClassGenerationFactory.java | 4 +- .../templateeditor/PreviewGenerationAction.java | 14 +- .../templateeditor/TemplateEditorController.java | 275 +++++++++ .../cgen}/templateeditor/TemplateEditorView.java | 35 +- .../cgen}/templateeditor/VelocityTokenMaker.java | 7 +- .../templateeditor/ArtifactsConfiguratorTest.java | 112 ++++ .../templateeditor/EditorTemplateLoaderTest.java | 86 +++ .../templateeditor/EditorTemplateSaverTest.java | 67 +++ .../PreviewActionConfiguratorTest.java | 109 ++++ 57 files changed, 2422 insertions(+), 2375 deletions(-) diff --cc cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java index 13e804baa,645879ca8..be991e9e5 --- a/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java +++ b/cayenne-cgen/src/main/java/org/apache/cayenne/gen/CgenConfiguration.java @@@ -63,18 -63,18 +63,18 @@@ public class CgenConfiguration implemen private boolean overwrite; private boolean usePkgPath; - private String template; - private String superTemplate; - private String embeddableTemplate; - private String embeddableSuperTemplate; + private CgenTemplate template; + private CgenTemplate superTemplate; + private CgenTemplate embeddableTemplate; + private CgenTemplate embeddableSuperTemplate; /** - * @since 4.3 renamed from queryTemplate + * @since 5.0 renamed from queryTemplate */ - private String dataMapTemplate; + private CgenTemplate dataMapTemplate; /** - * @since 4.3 renamed from querySuperTemplate + * @since 5.0 renamed from querySuperTemplate */ - private String dataMapSuperTemplate; + private CgenTemplate dataMapSuperTemplate; private long timestamp; private String outputPattern; private String encoding; diff --cc cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java index 4c89a12a4,b152da7c7..1f9d1a2e1 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java @@@ -28,14 -26,27 +26,27 @@@ import org.w3c.dom.Element import org.w3c.dom.Node; import org.w3c.dom.NodeList; + import javax.xml.xpath.XPath; + import javax.xml.xpath.XPathConstants; + import javax.xml.xpath.XPathFactory; + import java.io.File; + import java.io.IOException; + import java.io.InputStream; + import java.nio.charset.StandardCharsets; + import java.nio.file.Files; + import java.nio.file.NoSuchFileException; + import java.nio.file.Paths; + import java.util.Arrays; + import java.util.List; + /** - * Upgrade handler for the project version "11" introduced by 4.3.M1 release. + * Upgrade handler for the project version "11" introduced by 5.0.M1 release. * Changes highlight: - * - schemas version update - * - ROP removal - * - cgen schema changes + * - schemas version update + * - ROP removal + * - cgen schema changes * - * @since 4.3 + * @since 5.0 */ public class UpgradeHandler_V11 implements UpgradeHandler { diff --cc maven-plugins/cayenne-maven-plugin/src/main/java/org/apache/cayenne/tools/CayenneGeneratorMojo.java index e9fd7013d,83f6045c4..60d817b9b --- 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 @@@ -195,35 -196,35 +196,35 @@@ public class CayenneGeneratorMojo exten @Parameter private Boolean createPropertyNames; - /** - * If set to <code>true</code>, will skip file modification time validation and regenerate all. - * Default is <code>false</code>. - * - * @since 4.1 - */ - @Parameter(defaultValue = "false", property = "force") - private boolean force; - - /** - * Location of Velocity template file for DataMap class generation. - * DataMap class provides utilities for usage of the Cayenne queries stored in the DataMap. - * If omitted, default template is used. - * - * @since 5.0 renamed from queryTemplate - */ - @Parameter - private String dataMapTemplate; - - /** - * Location of Velocity template file for DataMap superclass generation. - * DataMap class provides utilities for usage of the Cayenne queries stored in the DataMap. - * If omitted, default template is used. - * Ignored unless <code>makepairs</code> set to <code>true</code>. - * - * @since 5.0 renamed from querySuperTemplate - */ - @Parameter - private String dataMapSuperTemplate; + /** + * If set to <code>true</code>, will skip file modification time validation and regenerate all. + * Default is <code>false</code>. + * + * @since 4.1 + */ + @Parameter(defaultValue = "false", property = "force") + private boolean force; + + /** + * Location of Velocity template file for DataMap class generation. + * DataMap class provides utilities for usage of the Cayenne queries stored in the DataMap. + * If omitted, default template is used. + * - * @since 4.3 renamed from queryTemplate ++ * @since 5.0 renamed from queryTemplate + */ + @Parameter + private String dataMapTemplate; + + /** + * Location of Velocity template file for DataMap superclass generation. + * DataMap class provides utilities for usage of the Cayenne queries stored in the DataMap. + * If omitted, default template is used. + * Ignored unless <code>makepairs</code> set to <code>true</code>. + * - * @since 4.3 renamed from querySuperTemplate ++ * @since 5.0 renamed from querySuperTemplate + */ + @Parameter + private String dataMapSuperTemplate; /** * If set to <code>true</code>, will generate Properties for PK attributes. diff --cc modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/PreviewGenerationAction.java index 9d8e64807,7b3c38572..dbde62cf2 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/PreviewGenerationAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/PreviewGenerationAction.java @@@ -26,12 -26,10 +26,10 @@@ import org.apache.cayenne.gen.TemplateT import java.io.StringWriter; import java.io.Writer; - import java.util.Properties; /** + * Used for generating class preview in template editor - * @since 4.3 + * @since 5.0 */ public class PreviewGenerationAction extends ClassGenerationAction { diff --cc modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/VelocityTokenMaker.java index db6dadf6e,bdf279250..51fc0f1b9 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/VelocityTokenMaker.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/templateeditor/VelocityTokenMaker.java @@@ -30,7 -30,11 +30,12 @@@ import org.fife.ui.rsyntaxtextarea.Toke /** + * Service class for syntax highlighting. + * Generated by a TokenMakerMaker tool + * (<a href="https://github.com/bobbylight/RSyntaxTextArea/wiki/Adding-Syntax-Highlighting-for-a-new-Language">...</a> ) - * since 4.3 ++ * + * @since 5.0 + * */ public class VelocityTokenMaker extends AbstractJFlexCTokenMaker {