Check that all filter parts have been used when running out of input string

logbook-core/src/main/java/org/zalando/logbook/DefaultPathFilter.java

@@ -63,18 +63,27 @@ public String filter(final String path) {
                     return path;
                 }
                 previousIndex += filter[filterIndex].length();
+
+                filterIndex++;
             } else {
+                // skip to next filter part
+                filterIndex++;
+
                 // locate next slash
                 final int nextIndex = path.indexOf('/', previousIndex);
                 if (nextIndex != -1) {
                     previousIndex = nextIndex;
                 } else {
+                    // out of string, did we match against all the filter elements already?
+                    if(filterIndex < filter.length) {
+                        return path;
+                    }
+
                     previousIndex = path.length();
 
                     break;
                 }
             }
-            filterIndex++;
         } while (filterIndex < filter.length);
 
         if (previousIndex == path.length()) {

logbook-core/src/test/java/org/zalando/logbook/DefaultPathFilterTest.java

@@ -128,4 +128,15 @@ public void testIgnoresIncorrectExpression2() {
         assertThat(path).isSameAs(result);
     }
 
+    @Test
+    public void testPathEndsAtSubstitute() {
+        final String path = "/profile/123456789";
+        final String expr = "/profile/{id}/info";
+
+        final PathFilter regexpPathUriFilter = new DefaultPathFilter("XXX", expr);
+
+        final String result = regexpPathUriFilter.filter(path);
+        assertThat(result).isEqualTo(path);
+    }
+
 }