/**
 * The MIT License
 *
 * Copyright for portions of unirest-java are held by Kong Inc (c) 2013.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
 * "Software"), to deal in the Software without restriction, including
 * without limitation the rights to use, copy, modify, merge, publish,
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:
 *
 * The above copyright notice and this permission notice shall be
 * included in all copies or substantial portions of the Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */

package kong.unirest;

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Collection;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

class Path {
    private String url;

    Path(String url) {
        this.url = url;
    }

    public void param(String name, String value) {
        Matcher matcher = Pattern.compile("\\{" + name + "\\}").matcher(url);
        int count = 0;
        while (matcher.find()) {
            count++;
        }
        if (count == 0) {
            throw new UnirestException("Can't find route parameter name \"" + name + "\"");
        }
        this.url = url.replaceAll("\\{" + name + "\\}", Util.encode(value));
    }

    public void queryString(String name, Collection<?> value){
        for (Object cur : value) {
            queryString(name, cur);
        }
    }

    public void queryString(String name, Object value) {
        StringBuilder queryString = new StringBuilder();
        if (url.contains("?")) {
            queryString.append("&");
        } else {
            queryString.append("?");
        }
        try {
            queryString.append(URLEncoder.encode(name));
            if(value != null) {
                queryString.append("=").append(URLEncoder.encode(value.toString(), "UTF-8"));
            }
        } catch (UnsupportedEncodingException e) {
            throw new UnirestException(e);
        }
        url += queryString.toString();
    }

    public void queryString(Map<String, Object> parameters) {
        if (parameters != null) {
            for (Map.Entry<String, Object> param : parameters.entrySet()) {
                if (param.getValue() instanceof String || param.getValue() instanceof Number || param.getValue() instanceof Boolean || param.getValue() == null) {
                    queryString(param.getKey(), param.getValue());
                } else {
                    throw new UnirestException("Parameter \"" + param.getKey() +
                            "\" can't be sent with a GET request because of type: "
                            + param.getValue().getClass().getName());
                }
            }
        }
    }

    @Override
    public String toString() {
        return url;
    }
}

@@ -2373,20 +2373,29 @@
 ode(name
+, %22UTF-8%22
 ));%0A
-
         
@@ -2487,23 +2487,28 @@
 ode(
-value.toString(
+String.valueOf(value
 ), %22
@@ -2873,499 +2873,54 @@
     
-if (param.getValue() instanceof String %7C%7C param.getValue() instanceof Number %7C%7C param.getValue() instanceof Boolean %7C%7C param.getValue() == null) %7B%0A                    queryString(param.getKey(), param.getValue());%0A                %7D else %7B%0A                    throw new UnirestException(%22Parameter %5C%22%22 + param.getKey() +%0A                            %22%5C%22 can't be sent with a GET request because of type: %22%0A                            + param.getValue().getClass().getName());%0A                %7D
+queryString(param.getKey(), param.getValue());
 %0A   

simplify headers