From 7e93fedc62b53616109d8f25f8f26f6c99831297 Mon Sep 17 00:00:00 2001 From: tangkc <1016771049@qq.com> Date: Mon, 11 Jul 2022 22:34:24 +0800 Subject: [PATCH] =?UTF-8?q?enhancement=20#I5GBXI=20=E6=94=AF=E6=8C=81EL?= =?UTF-8?q?=E4=B8=AD=E4=BB=BB=E6=84=8F=E5=9C=B0=E6=96=B9=E7=9A=84=E6=B3=A8?= =?UTF-8?q?=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yomahub/liteflow/parser/helper/ParserHelper.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java index d3eafaaee..603361808 100644 --- a/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java +++ b/liteflow-core/src/main/java/com/yomahub/liteflow/parser/helper/ParserHelper.java @@ -386,22 +386,23 @@ public class ParserHelper { //构建chainBuilder String chainName = e.attributeValue(NAME); String text = e.getText(); - String el = Util.replaceNotesAndTrim(text); + String el = RegexUtil.removeComments(text); LiteFlowChainELBuilder chainELBuilder = LiteFlowChainELBuilder.createChain().setChainName(chainName); chainELBuilder.setEL(el).build(); } - private static class Util{ + private static class RegexUtil{ // java 注释的正则表达式 - private static String REGEX_NOTE = "/\\*((?!\\*/).|[\\r\\n])*?\\*/|[ \\t]*//.*"; + private static final String REGEX_NOTE = "/\\*((?!\\*/).|[\\r\\n])*?\\*/|[ \\t]*//.*"; /** - * 移除 el 表达式中的注释,支持 java 的注释,包括单行注释、多行注释 + * 移除 el 表达式中的注释,支持 java 的注释,包括单行注释、多行注释, + * 会压缩字符串,移除空格和换行符 * * @param elStr el 表达式 * @return 移除注释后的 el 表达式 */ - private static String replaceNotesAndTrim(String elStr) { + private static String removeComments(String elStr) { if (StrUtil.isBlank(elStr)) { return elStr; }