Skip to content

Commit 0ecfc98

Browse files
GodinGodin
committed
Prevent usage of default charset
1 parent 2e1daf1 commit 0ecfc98

35 files changed

+94
-43
lines changed

‎python-squid/src/main/java/org/sonar/python/PythonAstScanner.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package org.sonar.python;
2121

22+
import com.google.common.base.Charsets;
2223
import com.sonar.sslr.api.AstNode;
2324
import com.sonar.sslr.api.AstNodeType;
2425
import com.sonar.sslr.api.CommentAnalyser;
@@ -50,7 +51,7 @@ public static SourceFile scanSingleFile(File file, SquidAstVisitor<PythonGrammar
5051
if (!file.isFile()) {
5152
throw new IllegalArgumentException("File '" + file + "' not found.");
5253
}
53-
AstScanner<PythonGrammar> scanner = create(new PythonConfiguration(), visitors);
54+
AstScanner<PythonGrammar> scanner = create(new PythonConfiguration(Charsets.UTF_8), visitors);
5455
scanner.scanFile(file);
5556
Collection<SourceCode> sources = scanner.getIndex().search(new QueryByType(SourceFile.class));
5657
if (sources.size() != 1) {

‎python-squid/src/main/java/org/sonar/python/PythonConfiguration.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ public class PythonConfiguration extends SquidConfiguration {
2727

2828
private boolean ignoreHeaderComments;
2929

30-
public PythonConfiguration() {
31-
}
32-
3330
public PythonConfiguration(Charset charset) {
3431
super(charset);
3532
}

‎python-squid/src/main/java/org/sonar/python/lexer/PythonLexer.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ public final class PythonLexer {
3939
private PythonLexer() {
4040
}
4141

42-
public static Lexer create() {
43-
return create(new PythonConfiguration());
44-
}
45-
4642
private static final String EXP = "([Ee][+-]?+[0-9_]++)";
4743
private static final String BYTES_PREFIX = "(br|bR|b|Br|BR|B)";
4844
private static final String IMAGINARY_SUFFIX = "(j|J)";

‎python-squid/src/main/java/org/sonar/python/parser/PythonParser.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ public final class PythonParser {
3030
private PythonParser() {
3131
}
3232

33-
public static Parser<PythonGrammar> create(ParsingEventListener... parsingEventListeners) {
34-
return create(new PythonConfiguration(), parsingEventListeners);
35-
}
36-
3733
public static Parser<PythonGrammar> create(PythonConfiguration conf, ParsingEventListener... parsingEventListeners) {
3834
return Parser.builder((PythonGrammar) new PythonGrammarImpl())
3935
.withLexer(PythonLexer.create(conf))

‎python-squid/src/test/java/org/sonar/python/PythonAstScannerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
*/
2020
package org.sonar.python;
2121

22+
import com.google.common.base.Charsets;
2223
import com.google.common.collect.ImmutableList;
2324
import com.sonar.sslr.squid.AstScanner;
2425
import org.junit.Test;
@@ -36,7 +37,7 @@ public class PythonAstScannerTest {
3637

3738
@Test
3839
public void files() {
39-
AstScanner<PythonGrammar> scanner = PythonAstScanner.create(new PythonConfiguration());
40+
AstScanner<PythonGrammar> scanner = PythonAstScanner.create(new PythonConfiguration(Charsets.UTF_8));
4041
scanner.scanFiles(ImmutableList.of(new File("src/test/resources/metrics/lines.py"), new File("src/test/resources/metrics/comments.py")));
4142
SourceProject project = (SourceProject) scanner.getIndex().search(new QueryByType(SourceProject.class)).iterator().next();
4243
assertThat(project.getInt(PythonMetric.FILES)).isEqualTo(2);

‎python-squid/src/test/java/org/sonar/python/lexer/PythonLexerTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@
1919
*/
2020
package org.sonar.python.lexer;
2121

22+
import com.google.common.base.Charsets;
2223
import com.sonar.sslr.api.GenericTokenType;
2324
import com.sonar.sslr.impl.Lexer;
2425
import org.junit.BeforeClass;
2526
import org.junit.Test;
27+
import org.sonar.python.PythonConfiguration;
2628
import org.sonar.python.api.PythonKeyword;
2729
import org.sonar.python.api.PythonPunctuator;
2830
import org.sonar.python.api.PythonTokenType;
@@ -40,7 +42,7 @@ public class PythonLexerTest {
4042

4143
@BeforeClass
4244
public static void init() {
43-
lexer = PythonLexer.create();
45+
lexer = PythonLexer.create(new PythonConfiguration(Charsets.UTF_8));
4446
}
4547

4648
/**

‎python-squid/src/test/java/org/sonar/python/parser/PythonParserTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,19 @@
1919
*/
2020
package org.sonar.python.parser;
2121

22+
import com.google.common.base.Charsets;
2223
import com.sonar.sslr.impl.Parser;
2324
import org.apache.commons.io.FileUtils;
2425
import org.junit.Test;
26+
import org.sonar.python.PythonConfiguration;
2527
import org.sonar.python.api.PythonGrammar;
2628

2729
import java.io.File;
2830
import java.util.Collection;
2931

3032
public class PythonParserTest {
3133

32-
private final Parser<PythonGrammar> parser = PythonParser.create();
34+
private final Parser<PythonGrammar> parser = PythonParser.create(new PythonConfiguration(Charsets.UTF_8));
3335

3436
@Test
3537
public void test() {

‎python-squid/src/test/java/org/sonar/python/parser/compound_statements/ClassDefTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
*/
2020
package org.sonar.python.parser.compound_statements;
2121

22+
import com.google.common.base.Charsets;
2223
import com.sonar.sslr.impl.Parser;
2324
import org.junit.Before;
2425
import org.junit.Test;
26+
import org.sonar.python.PythonConfiguration;
2527
import org.sonar.python.api.PythonGrammar;
2628
import org.sonar.python.parser.PythonParser;
2729
import org.sonar.python.parser.PythonTestUtils;
@@ -31,7 +33,7 @@
3133

3234
public class ClassDefTest {
3335

34-
Parser<PythonGrammar> p = PythonParser.create();
36+
Parser<PythonGrammar> p = PythonParser.create(new PythonConfiguration(Charsets.UTF_8));
3537
PythonGrammar g = p.getGrammar();
3638

3739
@Before

‎python-squid/src/test/java/org/sonar/python/parser/compound_statements/DecoratorTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
*/
2020
package org.sonar.python.parser.compound_statements;
2121

22+
import com.google.common.base.Charsets;
2223
import com.sonar.sslr.impl.Parser;
2324
import org.junit.Before;
2425
import org.junit.Test;
26+
import org.sonar.python.PythonConfiguration;
2527
import org.sonar.python.api.PythonGrammar;
2628
import org.sonar.python.parser.PythonParser;
2729
import org.sonar.python.parser.PythonTestUtils;
@@ -31,7 +33,7 @@
3133

3234
public class DecoratorTest {
3335

34-
Parser<PythonGrammar> p = PythonParser.create();
36+
Parser<PythonGrammar> p = PythonParser.create(new PythonConfiguration(Charsets.UTF_8));
3537
PythonGrammar g = p.getGrammar();
3638

3739
@Before

‎python-squid/src/test/java/org/sonar/python/parser/compound_statements/ExceptClauseTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
*/
2020
package org.sonar.python.parser.compound_statements;
2121

22+
import com.google.common.base.Charsets;
2223
import com.sonar.sslr.impl.Parser;
2324
import org.junit.Before;
2425
import org.junit.Test;
26+
import org.sonar.python.PythonConfiguration;
2527
import org.sonar.python.api.PythonGrammar;
2628
import org.sonar.python.parser.PythonParser;
2729

@@ -30,7 +32,7 @@
3032

3133
public class ExceptClauseTest {
3234

33-
Parser<PythonGrammar> p = PythonParser.create();
35+
Parser<PythonGrammar> p = PythonParser.create(new PythonConfiguration(Charsets.UTF_8));
3436
PythonGrammar g = p.getGrammar();
3537

3638
@Before

0 commit comments

Comments
 (0)