#0000 Generator: Correction of expensive/hungry RegExp

Author: seanox

CHANGES

@@ -5,6 +5,7 @@
       In some cases the request is aborted with status 400 when the network connector is busy,
       because the worker assumed that no data is being sent.
       Statuses 408 and 413 may have been overwritten with status 400.
+  BF: Generator: Correction of expensive/hungry RegExp    
   BF: Manual: Correction for chrome-based browsers
   CR: Manual: Improvement of the navigation
   CR: Project: Automatic update of the version in README.md

README.md

@@ -152,6 +152,7 @@ Go to the program directory and start the program directly or by script.
 BF: HTTP(S) AccessLog: Correction in the file name of the log file (use http_host instead of remote_host)  
 BF: HTTP(S) Content Types: Correction of xml/xsl/xslt to use application/xslt+xml  
 BF: HTTP(S) Request: Correction of the request validation  
+BF: Generator: Correction of expensive/hungry RegExp  
 BF: Manual: Correction for chrome-based browsers  
 CR: Manual: Improvement of the navigation  
 CR: Project: Automatic update of the version in README.md  

sources/com/seanox/devwex/Generator.java

@@ -128,12 +128,12 @@
  * {@link #extract()} entsprechen, sich dabei aber nur auf ein Segment
  * konzentrieren.<br>
  * <br>
- * Generator 5.2.0 20190422<br>
- * Copyright (C) 2019 Seanox Software Solutions<br>
+ * Generator 5.2.1 20200712<br>
+ * Copyright (C) 2020 Seanox Software Solutions<br>
  * Alle Rechte vorbehalten.
  *
  * @author  Seanox Software Solutions
- * @version 5.2.0 20190422
+ * @version 5.2.1 20200712
  */
 public class Generator {
 
@@ -300,7 +300,7 @@ private byte[] scan(byte[] model) {
 
             byte[] patch = new byte[0];
             String fetch = new String(model, cursor, offset);
-            if (fetch.matches("^(?si)#\\[[a-z]([\\w\\-]*\\w)*\\[\\[.*\\]\\]\\]$")) {
+            if (fetch.matches("^(?si)#\\[[a-z]([\\w\\-]*\\w){0,1}\\[\\[.*\\]\\]\\]$")) {
 
                 //der Scope wird ermittelt aus: #[scope[[segment]]]
                 String scope = fetch.substring(2);
@@ -318,7 +318,7 @@ private byte[] scan(byte[] model) {
 
                 //als neuer Platzhalter wird nur der Scope verwendet
                 patch = ("#[").concat(scope).concat("]").getBytes();
-            } else if (fetch.matches("^(?i)#\\[[a-z]([\\w-]*\\w)*\\]$")) {
+            } else if (fetch.matches("^(?i)#\\[[a-z]([\\w-]*\\w){0,1}\\]$")) {
                 patch = fetch.toLowerCase().getBytes();
             } else if (fetch.matches("^(?i)#\\[0x([0-9a-f]{2})+\\]$")) {
                 cursor += fetch.length() +1;
@@ -401,7 +401,7 @@ private byte[] assemble(String scope, Map values, boolean clean) {
 
             patch = new byte[0];
             fetch = new String(this.model, cursor, offset);
-            if (fetch.matches("^(?i)#\\[[a-z]([\\w-]*\\w)*\\]$")) {
+            if (fetch.matches("^(?i)#\\[[a-z]([\\w-]*\\w){0,1}\\]$")) {
                 fetch = fetch.substring(2, fetch.length() -1);
 
                 //die Platzhalter nicht uebermittelter Schluessel werden