This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch docs/struts-7-5-configuration-grammar in repository https://gitbox.apache.org/repos/asf/struts-intellij-plugin.git
commit 677dd7d136a8ca960d2abb520b67a5d0eccb836b Author: Lukasz Lenart <[email protected]> AuthorDate: Wed Nov 11 10:18:52 2026 +0100 feat: select the Struts 6.5 and 7.5 struts.xml templates Use the detected struts2-core version so 6.5 and 7.5 modules get the matching DOCTYPE. Co-authored-by: Cursor <[email protected]> --- .../StrutsFileTemplateGroupDescriptorFactory.java | 8 ++++ .../struts2/StrutsFileTemplateProvider.java | 46 ++++++++++++++-------- .../resources/fileTemplates/j2ee/struts_6_5.xml.ft | 8 ++++ .../fileTemplates/j2ee/struts_6_5.xml.html | 7 ++++ .../resources/fileTemplates/j2ee/struts_7_5.xml.ft | 8 ++++ .../fileTemplates/j2ee/struts_7_5.xml.html | 7 ++++ .../struts2/StrutsFileTemplateProviderTest.java | 46 ++++++++++++++++++++++ 7 files changed, 114 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/intellij/struts2/StrutsFileTemplateGroupDescriptorFactory.java b/src/main/java/com/intellij/struts2/StrutsFileTemplateGroupDescriptorFactory.java index a7a4f6a..bad5fcf 100644 --- a/src/main/java/com/intellij/struts2/StrutsFileTemplateGroupDescriptorFactory.java +++ b/src/main/java/com/intellij/struts2/StrutsFileTemplateGroupDescriptorFactory.java @@ -60,6 +60,10 @@ public class StrutsFileTemplateGroupDescriptorFactory implements FileTemplateGro */ public static final String STRUTS_6_0_XML = "struts_6_0.xml"; + public static final String STRUTS_6_5_XML = "struts_6_5.xml"; + + public static final String STRUTS_7_5_XML = "struts_7_5.xml"; + /** * Template for {@code validation.xml}. TODO cannot name "validation.xml" due to SA using this template name. */ @@ -81,6 +85,10 @@ public class StrutsFileTemplateGroupDescriptorFactory implements FileTemplateGro StrutsIcons.STRUTS_CONFIG_FILE)); group.addTemplate(new FileTemplateDescriptor(STRUTS_6_0_XML, StrutsIcons.STRUTS_CONFIG_FILE)); + group.addTemplate(new FileTemplateDescriptor(STRUTS_6_5_XML, + StrutsIcons.STRUTS_CONFIG_FILE)); + group.addTemplate(new FileTemplateDescriptor(STRUTS_7_5_XML, + StrutsIcons.STRUTS_CONFIG_FILE)); group.addTemplate(new FileTemplateDescriptor(VALIDATION_XML, StrutsIcons.VALIDATION_CONFIG_FILE)); diff --git a/src/main/java/com/intellij/struts2/StrutsFileTemplateProvider.java b/src/main/java/com/intellij/struts2/StrutsFileTemplateProvider.java index 60e0d1b..223299f 100644 --- a/src/main/java/com/intellij/struts2/StrutsFileTemplateProvider.java +++ b/src/main/java/com/intellij/struts2/StrutsFileTemplateProvider.java @@ -21,6 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.struts2.facet.ui.StrutsVersionDetector; import com.intellij.util.text.VersionComparatorUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; /** * @author Yann Cébron @@ -39,24 +40,37 @@ public class StrutsFileTemplateProvider { @NotNull public FileTemplate determineFileTemplate(Project project) { - String template; - if (isNewerThan("6.0")) { - template = StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_0_XML; - } else if (isNewerThan("2.5")) { - template = StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_5_XML; - } else if (isNewerThan("2.3")) { - template = StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_3_XML; - } else if (my21orNewer) { - template = isNewerThan("2.1.7") ? - StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_1_7_XML : - StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_1_XML; + final FileTemplateManager fileTemplateManager = FileTemplateManager.getInstance(project); + return fileTemplateManager.getJ2eeTemplate(templateNameFor(myVersionName)); + } + + @NotNull + static String templateNameFor(@Nullable String version) { + if (version == null) { + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_0_XML; } - else { - template = StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_0_XML; + if (VersionComparatorUtil.compare(version, "7.5") >= 0) { + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_7_5_XML; } - - final FileTemplateManager fileTemplateManager = FileTemplateManager.getInstance(project); - return fileTemplateManager.getJ2eeTemplate(template); + if (VersionComparatorUtil.compare(version, "6.5") >= 0 + && VersionComparatorUtil.compare(version, "7.0") < 0) { + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_5_XML; + } + if (VersionComparatorUtil.compare(version, "6.0") > 0) { + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_0_XML; + } + if (VersionComparatorUtil.compare(version, "2.5") > 0) { + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_5_XML; + } + if (VersionComparatorUtil.compare(version, "2.3") > 0) { + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_3_XML; + } + if (VersionComparatorUtil.compare(version, "2.1") > 0) { + return VersionComparatorUtil.compare(version, "2.1.7") > 0 + ? StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_1_7_XML + : StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_1_XML; + } + return StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_0_XML; } public boolean is21orNewer() { diff --git a/src/main/resources/fileTemplates/j2ee/struts_6_5.xml.ft b/src/main/resources/fileTemplates/j2ee/struts_6_5.xml.ft new file mode 100644 index 0000000..828e99f --- /dev/null +++ b/src/main/resources/fileTemplates/j2ee/struts_6_5.xml.ft @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 6.5//EN" + "https://struts.apache.org/dtds/struts-6.5.dtd"> + +<struts> +</struts> diff --git a/src/main/resources/fileTemplates/j2ee/struts_6_5.xml.html b/src/main/resources/fileTemplates/j2ee/struts_6_5.xml.html new file mode 100644 index 0000000..64f4c82 --- /dev/null +++ b/src/main/resources/fileTemplates/j2ee/struts_6_5.xml.html @@ -0,0 +1,7 @@ +<html> +<body style="padding: 2px;"> +<span style="font-family: verdana,sans-serif; font-size: smaller;"> +This is a built-in template used each time you create a new struts.xml for Struts 6.5.x +</span> +</body> +</html> diff --git a/src/main/resources/fileTemplates/j2ee/struts_7_5.xml.ft b/src/main/resources/fileTemplates/j2ee/struts_7_5.xml.ft new file mode 100644 index 0000000..27e64cb --- /dev/null +++ b/src/main/resources/fileTemplates/j2ee/struts_7_5.xml.ft @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 7.5//EN" + "https://struts.apache.org/dtds/struts-7.5.dtd"> + +<struts> +</struts> diff --git a/src/main/resources/fileTemplates/j2ee/struts_7_5.xml.html b/src/main/resources/fileTemplates/j2ee/struts_7_5.xml.html new file mode 100644 index 0000000..246b634 --- /dev/null +++ b/src/main/resources/fileTemplates/j2ee/struts_7_5.xml.html @@ -0,0 +1,7 @@ +<html> +<body style="padding: 2px;"> +<span style="font-family: verdana,sans-serif; font-size: smaller;"> +This is a built-in template used each time you create a new struts.xml for Struts 7.5 and newer +</span> +</body> +</html> diff --git a/src/test/java/com/intellij/struts2/StrutsFileTemplateProviderTest.java b/src/test/java/com/intellij/struts2/StrutsFileTemplateProviderTest.java new file mode 100644 index 0000000..565077d --- /dev/null +++ b/src/test/java/com/intellij/struts2/StrutsFileTemplateProviderTest.java @@ -0,0 +1,46 @@ +package com.intellij.struts2; + +import junit.framework.TestCase; + +import java.io.InputStream; +import java.nio.charset.StandardCharsets; + +public class StrutsFileTemplateProviderTest extends TestCase { + + public void testVersionMapping() { + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_0_XML, + StrutsFileTemplateProvider.templateNameFor("6.4.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_0_XML, + StrutsFileTemplateProvider.templateNameFor("7.4.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_5_XML, + StrutsFileTemplateProvider.templateNameFor("6.5.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_6_5_XML, + StrutsFileTemplateProvider.templateNameFor("6.6.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_7_5_XML, + StrutsFileTemplateProvider.templateNameFor("7.5.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_7_5_XML, + StrutsFileTemplateProvider.templateNameFor("7.6.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_7_5_XML, + StrutsFileTemplateProvider.templateNameFor("8.0.0")); + assertEquals(StrutsFileTemplateGroupDescriptorFactory.STRUTS_2_0_XML, + StrutsFileTemplateProvider.templateNameFor(null)); + } + + public void testTemplateDoctypes() throws Exception { + String struts65 = readTemplate("struts_6_5.xml.ft"); + assertTrue(struts65.contains("-//Apache Software Foundation//DTD Struts Configuration 6.5//EN")); + assertTrue(struts65.contains("https://struts.apache.org/dtds/struts-6.5.dtd")); + + String struts75 = readTemplate("struts_7_5.xml.ft"); + assertTrue(struts75.contains("-//Apache Software Foundation//DTD Struts Configuration 7.5//EN")); + assertTrue(struts75.contains("https://struts.apache.org/dtds/struts-7.5.dtd")); + } + + private static String readTemplate(String fileName) throws Exception { + try (InputStream in = StrutsFileTemplateProvider.class.getClassLoader() + .getResourceAsStream("fileTemplates/j2ee/" + fileName)) { + assertNotNull(fileName, in); + return new String(in.readAllBytes(), StandardCharsets.UTF_8); + } + } +}
