|
|
|
@ -205,23 +205,27 @@ public class UriResolverManager {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String baseURI = serviceAccessPoint.getServiceUrl();
|
|
|
|
|
//Encoding only the query string
|
|
|
|
|
|
|
|
|
|
//TO ENCODE THE WHOLE URL
|
|
|
|
|
// String queryString = UrlEncoderUtil.toQueryString(parameters);
|
|
|
|
|
// link = baseURI+"?"+queryString;
|
|
|
|
|
// logger.info("Created HTTP URI request (link): "+link);
|
|
|
|
|
// link = UrlEncoderUtil.encodeString(link);
|
|
|
|
|
// logger.info("Encoded it, like: "+link);
|
|
|
|
|
|
|
|
|
|
//Enconding only the query string
|
|
|
|
|
String queryString = UrlEncoderUtil.toQueryString(parameters);
|
|
|
|
|
String linkDecoded = String.format("%s?%s", baseURI,queryString);
|
|
|
|
|
String queryStringEncoded = UrlEncoderUtil.encodeString(queryString);
|
|
|
|
|
link = String.format("%s?%s", baseURI,queryStringEncoded);
|
|
|
|
|
String linkDecoded = null;
|
|
|
|
|
String queryString = null;
|
|
|
|
|
if(!shortLink) {
|
|
|
|
|
//not shortening so returning the link with the query string with only the parameters encoded
|
|
|
|
|
queryString = UrlEncoderUtil.encodeQuery(parameters);
|
|
|
|
|
String toReturn = String.format("%s?%s", baseURI,queryString);
|
|
|
|
|
logger.info("returning link with encoded parameters in the query string: "+toReturn);
|
|
|
|
|
return toReturn;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
queryString = UrlEncoderUtil.toQueryString(parameters);
|
|
|
|
|
linkDecoded = String.format("%s?%s", baseURI,queryString);
|
|
|
|
|
link = linkDecoded;
|
|
|
|
|
logger.info("Created HTTP URI request (link): "+link);
|
|
|
|
|
|
|
|
|
|
if(shortLink){
|
|
|
|
|
try{
|
|
|
|
|
String queryStringEncoded = UrlEncoderUtil.encodeString(queryString);
|
|
|
|
|
link = String.format("%s?%s", baseURI,queryStringEncoded);
|
|
|
|
|
logger.info("Encoded link is: "+link);
|
|
|
|
|
logger.info("Shortner start..");
|
|
|
|
|
UrlShortener shortener = new UrlShortener();
|
|
|
|
|
String shortedLink = shortener.shorten(link);
|
|
|
|
|