From 6bdd875ac4374f170be0a6a76b7eaed11a57344d Mon Sep 17 00:00:00 2001
From: Kleyson de Sousa Rios <kleyson.rios@saude.go.gov.br>
Date: Tue, 6 Oct 2015 08:31:15 -0300
Subject: [PATCH] - URL decoder utilizando apache commons.

---
 .../pentaho/integrator/ws/IntegratorREST.java | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/br/gov/go/saude/pentaho/integrator/ws/IntegratorREST.java b/src/br/gov/go/saude/pentaho/integrator/ws/IntegratorREST.java
index b1890e4..a87ee7f 100644
--- a/src/br/gov/go/saude/pentaho/integrator/ws/IntegratorREST.java
+++ b/src/br/gov/go/saude/pentaho/integrator/ws/IntegratorREST.java
@@ -3,7 +3,7 @@
 /**
  * 
  * @author Kleyson Rios<br>
- *         Secretaria de Saúde do Estado de Goiás<br>
+ *         Secretaria de Saude do Estado de Goias<br>
  *         www.saude.go.gov.br
  *         
  * @contribution Marcello Pontes<br>
@@ -11,11 +11,8 @@
  *
  */
 
-import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -60,19 +57,7 @@ public Response redirectLink(@Context UriInfo info) throws URISyntaxException
 
 			String myUrl = new String( Base64.decodeBase64(myUrlEncoded.getBytes()) );
 
-			URI pentahoBaseUrl = null;
-			
-			try 
-			{
-				// Workaround for java.net.URISyntaxException: Illegal character
-				pentahoBaseUrl = info.getBaseUri().resolve("../../" + URLEncoder.encode(URLDecoder.decode(myUrl, "UTF-8"), "UTF-8").replaceAll("\\%2[fF]", "/").replaceAll("\\+", "%20") );
-			} 
-			catch (UnsupportedEncodingException e) 
-			{
-				e.printStackTrace();
-				return Response.status(500).type("text/plain").entity("Integrator Error: ERROR.").build();
-							
-			}
+			URI pentahoBaseUrl = info.getBaseUri().resolve("../../" + myUrl);
 			
 			return Response.temporaryRedirect(pentahoBaseUrl).build();
 		}