Download as
Browse Code »

Commit 250e1dcbd30c26734f2996c31c7ac9833707ee98

Authored by mp-96409975520
1 parent ffeae115
Exists in master

Organize Imports.

Showing 1 changed file with 19 additions and 14 deletions   Show diff stats
src/main/java/br/com/ases/business/impl/AvaliacaoBusinessImpl.java
  Diff comments   View file @250e1dc
... ... @@ -2,6 +2,8 @@ package br.com.ases.business.impl;
2 2  
3 3 import java.io.BufferedReader;
4 4 import java.io.IOException;
  5 +import java.net.URL;
  6 +import java.net.URLEncoder;
5 7 import java.util.ArrayList;
6 8 import java.util.Date;
7 9 import java.util.HashMap;
... ... @@ -16,11 +18,8 @@ import java.util.regex.Pattern;
16 18  
17 19 import javax.servlet.ServletContext;
18 20  
19   -import org.apache.catalina.util.StringParser;
20   -
21 21 import net.htmlparser.jericho.Element;
22 22 import net.htmlparser.jericho.Source;
23   -import net.htmlparser.jericho.Tag;
24 23 import br.com.ases.business.AvaliacaoBusiness;
25 24 import br.com.ases.controller.EseloController;
26 25 import br.com.ases.controller.EseloController.Nota;
... ... @@ -37,7 +36,6 @@ import br.com.checker.emag.SummarizedOccurrence;
37 36  
38 37 import com.google.gson.Gson;
39 38 import com.google.gson.GsonBuilder;
40   -import com.sun.corba.se.impl.orbutil.closure.Constant;
41 39  
42 40  
43 41 @Component
... ... @@ -51,7 +49,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
51 49 // "http://www.css-validator.org/validator?uri=#{url}&warning=0&output=soap12";
52 50 private static String CSS_VALIDATOR_URL = "http://jigsaw.w3.org/css-validator/validator?uri=#{url}&warning=0&output=soap12";
53 51 // private static String HTML_VALIDATOR_URL =
54   - // "https://validator.w3.org/nu/?doc=#{url}&out=json";
  52 + // "https://validator.w3.org/nu/?doc=#{url}&out=json";
55 53 private static String HTML_VALIDATOR_URL = "https://validator.w3.org/check?uri=#{url}&output=json";
56 54  
57 55 private static String PROPERTIES_PATH = "/WEB-INF/deparaAsesComEselo.properties";
... ... @@ -98,7 +96,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
98 96 {
99 97 for (Element element : documento.getAllElements()) {
100 98 for (String atributoBuscar : atributosBuscar) {
101   - System.out.println(element.getAttributeValue(atributoBuscar));
  99 +
102 100 qtdItens = qtdItens + (element.getAttributeValue(atributoBuscar)!= null? 1 : 0);
103 101  
104 102 }
... ... @@ -135,7 +133,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
135 133 String linha = "";
136 134 String[] chaveValor;
137 135 String recomendacaoProperties = "";
138   - String recomendacaoAntiga = ""; // Serve identificar a mudança de recomendação
  136 + String recomendacaoAntiga = ""; // Serve identificar a mudan�a de recomenda��o
139 137 String recomendacao = "";
140 138 String criterioProperties = "";
141 139 String criterio = "";
... ... @@ -173,10 +171,10 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
173 171 //chave do arquivo testeEselo.properties sendo (x.y.z)
174 172 recomendacaoCriterio = chaveValor[0].split("\\.");
175 173  
176   - //Separa a recomendação do critério sendo (x.y) de (x.y.z)
  174 + //Separa a recomenda��o do crit�rio sendo (x.y) de (x.y.z)
177 175 recomendacaoProperties = recomendacaoCriterio[0].toString() + "." + recomendacaoCriterio[1].toString();
178 176  
179   - //Semara a critério da recomendação sendo (z) de (x.y.z)
  177 + //Semara a crit�rio da recomenda��o sendo (z) de (x.y.z)
180 178 criterioProperties = recomendacaoCriterio[2];
181 179  
182 180  
... ... @@ -209,7 +207,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
209 207  
210 208 }
211 209  
212   - // Fim adiciona a recomendação da lista do properties
  210 + // Fim adiciona a recomenda��o da lista do properties
213 211  
214 212  
215 213 //Cria lista a ser pesquisada e retorna a quantidade de itens
... ... @@ -375,7 +373,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
375 373  
376 374  
377 375 /*
378   - * for(Integer rn : rns){ //Recomendação Avaliada //
  376 + * for(Integer rn : rns){ //Recomenda��o Avaliada //
379 377 * postParams.addParam
380 378 * ("relatorioAvaliacao.recomendacoes["+countReq+"].idRecomendacao",
381 379 * Integer.toString((rn)));
... ... @@ -456,7 +454,7 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
456 454 */
457 455 }
458 456  
459   - // Passa a recomendação do Ases como chave e retorna a recomendação do Eselo
  457 + // Passa a recomenda��o do Ases como chave e retorna a recomenda��o do Eselo
460 458 // contida no deparaAsesComEselo.properties
461 459 private String retornaRecomendacaoEselo(String recomendacaoAses) {
462 460 String recomendacaoEselo;
... ... @@ -563,10 +561,16 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
563 561 public int[] getErrorCount(boolean isCss, String url) {
564 562 int errors = 0;
565 563 int warnings = 0;
  564 +
  565 + URL UrlConvertida;
  566 +
566 567  
567 568 try {
  569 + UrlConvertida = new URL(url);
  570 +
  571 +
568 572 if (isCss) {
569   - String content = WebChecker.from(CSS_VALIDATOR_URL.replace("#{url}", url)).withGetRequest().execute().getContent();
  573 + String content = WebChecker.from(CSS_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent();
570 574  
571 575 Matcher m = Pattern.compile("<m:errorcount>(\\d)*</m:errorcount>",Pattern.MULTILINE).matcher(content);
572 576  
... ... @@ -596,7 +600,8 @@ public class AvaliacaoBusinessImpl implements AvaliacaoBusiness {
596 600  
597 601 } else {
598 602  
599   - String content = WebChecker.from(HTML_VALIDATOR_URL.replace("#{url}", url)).withGetRequest().execute().getContent();
  603 +
  604 + String content = WebChecker.from(HTML_VALIDATOR_URL.replace("#{url}", URLEncoder.encode(UrlConvertida.toExternalForm(), "UTF-8"))).withGetRequest().execute().getContent();
600 605 Gson g = new GsonBuilder().create();
601 606 HtmlValidation a = g.fromJson(content, HtmlValidation.class);
602 607 int[] errorsWarnings = a.getQtdWarningsErros();
... ...