From e92fc93412fd93bf5f817b345da10ceecff14816 Mon Sep 17 00:00:00 2001
From: alenon <lenon.abr@gmail.com>
Date: Wed, 28 Mar 2018 15:06:26 +0300
Subject: [PATCH] fixed bug: if there is only one regular char after special
 wildcard char than it has been missed from the final regex string

---
 jwildcard/build.gradle                             |  2 +-
 .../main/java/com/yevdo/jwildcard/JWildcard.java   |  2 +-
 jwildcard/src/test/groovy/JWildcardSpec.groovy     | 14 +++++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/jwildcard/build.gradle b/jwildcard/build.gradle
index 7717d96..0702770 100644
--- a/jwildcard/build.gradle
+++ b/jwildcard/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id "com.jfrog.bintray" version "1.7"
 }
 
-version '1.1'
+version '1.2'
 group 'com.yevdo'
 
 repositories {
diff --git a/jwildcard/src/main/java/com/yevdo/jwildcard/JWildcard.java b/jwildcard/src/main/java/com/yevdo/jwildcard/JWildcard.java
index dd7aba1..7442330 100644
--- a/jwildcard/src/main/java/com/yevdo/jwildcard/JWildcard.java
+++ b/jwildcard/src/main/java/com/yevdo/jwildcard/JWildcard.java
@@ -104,7 +104,7 @@ private static String getRegexString(String wildcard, List<JWildcardPairWithInde
             cursor = index + jWildcardPairWithIndex.getRule().getKey().length();
         }
 
-        if (cursor < wildcard.length() - 1) {
+        if (cursor <= wildcard.length() - 1) {
             regex.append(Pattern.quote(wildcard.substring(cursor, wildcard.length())));
         }
         return regex.toString();
diff --git a/jwildcard/src/test/groovy/JWildcardSpec.groovy b/jwildcard/src/test/groovy/JWildcardSpec.groovy
index 2ef90f0..e824433 100644
--- a/jwildcard/src/test/groovy/JWildcardSpec.groovy
+++ b/jwildcard/src/test/groovy/JWildcardSpec.groovy
@@ -11,7 +11,13 @@ class JWildcardSpec extends Specification {
 
     def "convert wildcard to regex"() {
         when:
-        String regex = JWildcard.wildcardToRegex("mywil?card*")
+        String regex = JWildcard.wildcardToRegex("mywil?c")
+
+        then:
+        regex == "^\\Qmywil\\E.\\Qc\\E\$"
+
+        when:
+        regex = JWildcard.wildcardToRegex("mywil?card*")
 
         then:
         regex == "^\\Qmywil\\E.\\Qcard\\E.*\$"
@@ -105,5 +111,11 @@ class JWildcardSpec extends Specification {
 
         then:
         matches
+
+        when:
+        matches = JWildcard.matches("Lond?n", "London")
+
+        then:
+        matches
     }
 }
\ No newline at end of file