update a sonar issue

CondationCMS · Sep 17, 2024 · 8b796b8 · 8b796b8
1 parent e8ee3c6
commit 8b796b8
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/cms-content/src/main/java/com/condation/cms/content/markdown/rules/block/CodeBlockRule.java b/cms-content/src/main/java/com/condation/cms/content/markdown/rules/block/CodeBlockRule.java
@@ -37,7 +37,7 @@
 public class CodeBlockRule implements BlockElementRule {
 
 	protected static final Pattern PATTERN = Pattern.compile(
-			"^(`{3})(?<lang>[a-zA-Z0-9]*)?$\n(?<code>[\\s\\S]*?)\n^(`{3})$",
+			"^(`{3})(?<lang>[a-zA-Z0-9]+)?$\n(?<code>[\\s\\S]*?)\n^(`{3})$",
 			Pattern.MULTILINE | Pattern.DOTALL | Pattern.UNIX_LINES);
 
 	@Override

diff --git a/...src/main/java/com/condation/cms/content/markdown/rules/block/DefinitionListBlockRule.java b/...src/main/java/com/condation/cms/content/markdown/rules/block/DefinitionListBlockRule.java
@@ -37,9 +37,10 @@
 public class DefinitionListBlockRule implements BlockElementRule {
 
 	private static final Pattern PATTERN = Pattern.compile(
-			"(?<content>((^.+)\n(: .+(\\n|\\Z))+)+)",
+			"(?<content>(^.+?\n(: .+?(\n|\\Z))+)+)", 
 			Pattern.MULTILINE);
 
+
 	@Override
 	public Block next(String md) {
 		Matcher matcher = PATTERN.matcher(md);

diff --git a/...src/main/java/com/condation/cms/content/markdown/rules/block/HorizontalRuleBlockRule.java b/...src/main/java/com/condation/cms/content/markdown/rules/block/HorizontalRuleBlockRule.java
@@ -35,9 +35,8 @@
 public class HorizontalRuleBlockRule implements BlockElementRule {
 
 	private static final Pattern PATTERN = Pattern.compile(
-			"^(\\*|\\-|_){3,}(\\n|\\Z)",
-			Pattern.MULTILINE | Pattern.DOTALL);
-
+			"^([\\*\\-_]){3,}(\\n|\\Z)", Pattern.MULTILINE | Pattern.DOTALL);
+
 
 	@Override
 	public Block next(String md) {

diff --git a/cms-content/src/main/java/com/condation/cms/content/markdown/rules/block/ListBlockRule.java b/cms-content/src/main/java/com/condation/cms/content/markdown/rules/block/ListBlockRule.java
@@ -38,11 +38,11 @@
 public class ListBlockRule implements BlockElementRule {
 
 	private static final Pattern PATTERN_ORDERED_LIST = Pattern.compile(
-			"^[0-9]+\\. (.+?)(^\n|\\Z)",
+			"^[0-9]+\\. (.+?)((^\n)|\\Z)",
 			Pattern.MULTILINE | Pattern.DOTALL);
 
 	private static final Pattern PATTERN_UNORDERED_LIST = Pattern.compile(
-			"^[-\\*\\+]{1} (.+?)(^\n|\\Z)",
+			"^[-\\*\\+]{1} (.+?)((^\n)|\\Z)",
 			Pattern.MULTILINE | Pattern.DOTALL);
 
 	@Override

diff --git a/...tent/src/main/java/com/condation/cms/content/markdown/rules/block/ParagraphBlockRule.java b/...tent/src/main/java/com/condation/cms/content/markdown/rules/block/ParagraphBlockRule.java
@@ -35,7 +35,7 @@
 public class ParagraphBlockRule implements BlockElementRule {
 
 	private static final Pattern PATTERN = Pattern.compile(
-			"(\\A|^\\n|\\Z)(?<content>.+?)(^\\n|\\Z)",
+			"(\\A|(^\n)|\\Z)(?<content>.+?)((^\n)|\\Z)",
 			Pattern.MULTILINE | Pattern.DOTALL);
 
 

diff --git a/cms-content/src/main/java/com/condation/cms/content/markdown/rules/block/TableBlockRule.java b/cms-content/src/main/java/com/condation/cms/content/markdown/rules/block/TableBlockRule.java
@@ -41,7 +41,7 @@
 public class TableBlockRule implements BlockElementRule {
 
 	private static final Pattern PATTERN = Pattern.compile(
-			"(^[\\|]{1}(.+?))(^\n|\\Z)",
+			"(^[\\|]{1}(.+?))((^\n)|\\Z)",
 			Pattern.MULTILINE | Pattern.DOTALL);
 
 	private static final Pattern HEADER_DELIMITER = Pattern.compile("-{3,}");

diff --git a/...ntent/src/main/java/com/condation/cms/content/markdown/rules/block/TaskListBlockRule.java b/...ntent/src/main/java/com/condation/cms/content/markdown/rules/block/TaskListBlockRule.java
@@ -37,7 +37,7 @@
 public class TaskListBlockRule implements BlockElementRule {
 
 	private static final Pattern PATTERN = Pattern.compile(
-			"(^- \\[([ x]?)\\] (.+?)\n)+(^\\n|\\Z)",
+			"(^- \\[([ x]?)\\] (.+?)\n)+((^\n)|\\Z)",
 			Pattern.MULTILINE);
 
 	private static final Pattern CHECKED_PATTERN = Pattern.compile(

diff --git a/...arkdown/rules/ParagraphBlockRuleTest.java → ...n/rules/block/ParagraphBlockRuleTest.java b/...arkdown/rules/ParagraphBlockRuleTest.java → ...n/rules/block/ParagraphBlockRuleTest.java
@@ -1,4 +1,4 @@
-package com.condation.cms.content.markdown.rules;
+package com.condation.cms.content.markdown.rules.block;
 
 /*-
  * #%L