public abstract class UriUtils {

    // ...

    public static String encodeUri(String uri, String encoding) throws UnsupportedEncodingException {
        String query = UriComponentsBuilder.fromUriString(uri).build().getQuery();
        String encodedQuery = UriUtils.encodeQuery(query, encoding);

        UriComponents uriComponents = UriComponentsBuilder.fromUriString(uri).build();
        UriComponents encoded = uriComponents.encode(encoding);
        UriComponents updated = UriComponentsBuilder.fromUriString(encoded.toString()).replaceQuery(encodedQuery).build();

        return updated.toUriString();
    }

    // ...

}