Skip to content

Commit caf93a5

Browse files
authored
Fix regex pattern (#9)
* 💡 Fix regex pattern and add test XML file for CII
1 parent f4f4f19 commit caf93a5

File tree

6 files changed

+354
-11
lines changed

6 files changed

+354
-11
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
currentVersion=0.1.5
1+
currentVersion=0.1.6
22
mainClassName=io.github.easybill.xrviz.App

src/main/java/io/github/easybill/xrviz/XslTransformer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class XslTransformer {
3333
public static final String CII_VALIDATION_STRING = "CrossIndustryInvoice";
3434
public static final String UBL_I_VALIDATION_STRING = "Invoice";
3535
public static final String UBL_C_VALIDATION_STRING = "CreditNote";
36-
public static final Pattern REGEX = Pattern.compile("[<:](CrossedustryInvoice|Invoice|CreditNote)");
36+
public static final Pattern REGEX = Pattern.compile("[<:](CrossIndustryInvoice|Invoice|CreditNote)");
3737

3838
enum DocumentType {
3939
CII("cii-xr.xsl"),

src/main/java/io/github/easybill/xrviz/handler/XmlRequestExtractor.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,15 @@
33
import com.sun.net.httpserver.HttpExchange;
44

55
import java.io.IOException;
6+
import java.net.HttpURLConnection;
67
import java.nio.charset.StandardCharsets;
78
import java.util.Optional;
8-
9-
import java.net.HttpURLConnection;
109
import java.util.logging.Logger;
1110
import java.util.regex.Pattern;
1211

13-
import static io.github.easybill.xrviz.XslTransformer.*;
14-
1512
public abstract class XmlRequestExtractor {
1613
static final Logger logger = Logger.getGlobal();
17-
static final Pattern REGEX = Pattern.compile("[<:](CrossedustryInvoice|Invoice|CreditNote)");
14+
static final Pattern REGEX = Pattern.compile("[<:](CrossIndustryInvoice|Invoice|CreditNote)");
1815

1916
Optional<String> validate(HttpExchange exchange) throws IOException {
2017
if (!exchange.getRequestMethod().equalsIgnoreCase("POST")) {

src/test/http/api-test.http

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@
33
### GET request for status
44
GET {{baseUrl}}/health
55

6-
### Generate a HTML file from a XML file
6+
### Generate a HTML file from a CrossIndustryInvoice file
77
POST {{baseUrl}}/convert.html
88
Content-Type: application/xml
99
Accept-Language: de
1010

1111
< ./EN16931_Einfach.xml
1212

13+
### Generate a HTML file from another CrossIndustryInvoice file
14+
POST {{baseUrl}}/convert.html
15+
Content-Type: application/xml
16+
Accept-Language: de
17+
18+
< ./cii-xrechnung.xml
19+
1320
### Generate a HTML file from a UBL Invoice file
1421
POST {{baseUrl}}/convert.html
1522
Content-Type: application/xml

src/test/http/cii-xrechnung.xml

Lines changed: 339 additions & 0 deletions
Large diffs are not rendered by default.

version-badge.svg

Lines changed: 3 additions & 3 deletions
Loading

0 commit comments

Comments
 (0)