Fix #14: Decoding fails when two encoded characters appear one after another

pom.xml

@@ -86,12 +86,12 @@
     <dependency>
       <groupId>joda-time</groupId>
       <artifactId>joda-time</artifactId>
-      <version>2.10.10</version>
+      <version>2.10.12</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.12.2</version>
+      <version>2.13.0</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

src/main/java/com/github/jscookie/javacookie/Cookies.java

@@ -1,23 +1,21 @@
 package com.github.jscookie.javacookie;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.CharArrayWriter;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.ResourceBundle;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 public final class Cookies implements CookiesDefinition {
 	private static String UTF_8 = "UTF-8";
@@ -325,28 +323,12 @@ private String encode( String decoded, Set<Integer> exceptions ) {
 	}
 
 	private String decode(String encoded) {
-		// Decode characters with 3 bytes first, then with 1 byte to fix https://github.com/js-cookie/java-cookie/issues/14
-		return decode( decode( encoded, 3 ), 1 );
-	}
-
-	private String decode( String encoded, Integer bytesPerCharacter ) {
+		// Use URLDecoder to fix https://github.com/js-cookie/java-cookie/issues/14
 		String decoded = encoded;
-		Pattern pattern = Pattern.compile( "(%[0-9A-Z]{2}){" + bytesPerCharacter + "}" );
-		Matcher matcher = pattern.matcher( encoded );
-		while ( matcher.find() ) {
-			String encodedChar = matcher.group();
-			String[] encodedBytes = encodedChar.split( "%" );
-			byte[] bytes = new byte[ encodedBytes.length - 1 ];
-			for ( int i = 1; i < encodedBytes.length; i++ ) {
-				String encodedByte = encodedBytes[ i ];
-				bytes[ i - 1 ] = ( byte )Integer.parseInt( encodedByte, 16 );
-			}
-			try {
-				String decodedChar = new String( bytes, UTF_8 );
-				decoded = decoded.replace( encodedChar, decodedChar );
-			} catch ( UnsupportedEncodingException e ) {
+		try {
+		  decoded = URLDecoder.decode(encoded, UTF_8);
+		} catch ( UnsupportedEncodingException e) {
 				e.printStackTrace();
-			}
 		}
 		return decoded;
 	}