Skip to content

Commit ad8e557

Browse files
authored
Fix ignore group processing (APPS-1640) (#186)
1 parent f72ba1a commit ad8e557

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

core/src/main/java/io/snabble/sdk/codes/templates/CodeTemplate.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,9 +312,6 @@ public ScannedCode buildCode() {
312312
int start = 0;
313313
for (int i = 0; i < groups.size(); i++) {
314314
Group group = groups.get(i);
315-
if (i == groups.size() - 1 && group instanceof IgnoreGroup) {
316-
break;
317-
}
318315

319316
if (group instanceof WildcardGroup) {
320317
((WildcardGroup) group).setLength(matchedCode.length() - start);
@@ -415,4 +412,4 @@ public int length() {
415412
public String getPattern() {
416413
return pattern;
417414
}
418-
}
415+
}

core/src/test/java/io/snabble/sdk/CodeTemplateTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ public void testTemplateMatcher() {
106106
Assert.assertNotNull(newCodeTemplate("{code:ean14}").match("28000017120605").buildCode());
107107
Assert.assertNotNull(newCodeTemplate("96{code:ean13}{embed:6}{price:5}{_}").match("960000000000000111111222223").buildCode());
108108
Assert.assertNotNull(newCodeTemplate("123{_:5}").match("12345678").buildCode());
109+
Assert.assertNotNull(newCodeTemplate("9{_:14}").match("912345123451234").buildCode());
109110

110111
Assert.assertEquals("999", newCodeTemplate("123{_:5}{code:3}").match("12345678999").buildCode().getLookupCode());
111112
Assert.assertEquals("21", newCodeTemplate("{code=21}{_:10}{ec}").match("2134743747736").buildCode().getLookupCode());
@@ -117,6 +118,7 @@ public void testTemplateMatcher() {
117118
Assert.assertNull(newCodeTemplate("{code:ean8}").match("87654320").buildCode());
118119
Assert.assertNull(newCodeTemplate("96{code:ean13}{embed:6}{price:5}{_}").match("970000000000000111111222223").buildCode());
119120
Assert.assertNull(newCodeTemplate("123{_:5}").match("55545678").buildCode());
121+
Assert.assertNull(newCodeTemplate("9{_:14}").match("9123451234512").buildCode());
120122
}
121123

122124
@Test
@@ -230,4 +232,4 @@ private CodeTemplate newCodeTemplate(String pattern, boolean expect) {
230232

231233
return null;
232234
}
233-
}
235+
}

0 commit comments

Comments
 (0)