Correção do método de conexão e encoder das Url's

mp-96409975520
1 parent b89db02e
Showing 2 changed files with 24 additions and 14 deletions Show diff stats
src/main/java/br/com/checker/emag/core/ContentEvaluation.java
src/main/java/br/com/checker/emag/core/MarkEvaluation.java
@@ -509,10 +509,10 @@ public class ContentEvaluation extends Evaluation {
 			 * "Jakarta Commons-HttpClient/3.1");
 			 * metodoRequisicaoGET.setFollowRedirects(true);
 			 */
-
-			codResponse = verificarConexao(href, "user-agent","NewUseAgent/1.0");
+			
+			codResponse = verificarConexao(href, "http.agent", "Jakarta Commons-HttpClient/3.1");
 			if (codResponse != 200) {
-				codResponse = verificarConexao(href, "http.agent", "Jakarta Commons-HttpClient/3.1");
+				codResponse = verificarConexao(href, "user-agent","NewUseAgent/1.0");
 				if (codResponse == -1) {
 					return "aviso";
 				}
@@ -557,6 +557,8 @@ public class ContentEvaluation extends Evaluation {
 		HttpMethod metodoRequisicaoGET = null;
 		HttpClient clienteHTTPJakartaCommons;
 		URL UrlConvertida;
+		int codResponse = -1;
+		
 		try {
 			String[] test = href.split("\\../");
@@ -580,9 +582,9 @@ public class ContentEvaluation extends Evaluation {
 																				// "UTF-8"));
 			metodoRequisicaoGET.setRequestHeader(usuario, agente);
-			metodoRequisicaoGET.setFollowRedirects(true);
+			//metodoRequisicaoGET.setFollowRedirects(true);
-			return clienteHTTPJakartaCommons.executeMethod(metodoRequisicaoGET);
+			codResponse = clienteHTTPJakartaCommons.executeMethod(metodoRequisicaoGET);
 		} catch (MalformedURLException e) {
 			e.printStackTrace();
@@ -603,6 +605,7 @@ public class ContentEvaluation extends Evaluation {
 			}
 		}
+		return codResponse;
 	}
 package br.com.checker.emag.core;
+import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -14,10 +16,6 @@ import net.htmlparser.jericho.Element;
 import net.htmlparser.jericho.Source;
 import org.apache.commons.lang3.StringUtils;
-import org.w3c.dom.Document;
-
-
-
 import br.com.checker.emag.Occurrence;
 import br.com.checker.emag.OccurrenceClassification;
@@ -39,6 +37,7 @@ public class MarkEvaluation extends Evaluation {
 	}
 	private MarkEvaluation(Source document, String url) {
+				
 		super(document, url);
 	}
@@ -164,15 +163,15 @@ public class MarkEvaluation extends Evaluation {
 		String url = getUrl();
 		if (url != null) {
-
+			
 			int[] errosWarningsCss = getErrorCount(true, url);
 			int[] errosWarningsHtml = getErrorCount(false, url);
 			int avisoHtml = 0;
 			int errosHtml = 0;
 			int avisoCss = 0;
 			int errosCss = 0;
-			
-			
+					
+						
 			avisoHtml = errosWarningsHtml[1];
 			if (avisoHtml > 0)	
@@ -1057,13 +1056,21 @@ public class MarkEvaluation extends Evaluation {
 				OccurrenceClassification.MARK, criterio);
 	}
+	
+	
 	public int[] getErrorCount(boolean isCss, String url) {
 		int errors = 0;
 		int warnings = 0;
+		URL UrlConvertida;
+		
 		try {
+			UrlConvertida = new URL(url);			
+			
+			
 			if (isCss) {
-				String content = WebAgent.from(CSS_VALIDATOR_URL.replace("#{url}", url)).withGetRequest().execute().getContent();
+				
+				String content = WebAgent.from(CSS_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent();
 				Matcher m = Pattern.compile("<m:errorcount>(\\d)*</m:errorcount>",Pattern.MULTILINE).matcher(content);
 				if (m.find())
@@ -1076,7 +1083,7 @@ public class MarkEvaluation extends Evaluation {
 			} else {
-				String content = WebAgent.from(HTML_VALIDATOR_URL.replace("#{url}", url)).withGetRequest().execute().getContent();
+				String content = WebAgent.from(HTML_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent();
 				Gson g = new GsonBuilder().create();
 				HtmlValidation a = g.fromJson(content, HtmlValidation.class);
 				int[] errorsWarnings = a.getQtdWarningsErros();