Skip to content

Commit da85d66

Browse files
author
Nicholas Smith
committed
Uplift deprecated method usages and language usage suggestions.
1 parent 1c5c7ce commit da85d66

11 files changed

+25
-18
lines changed

src/main/java/org/javaparser/examples/chapter2/CommentReporterComplete.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.github.javaparser.ast.CompilationUnit;
55

66
import java.io.File;
7+
import java.nio.file.Files;
8+
import java.nio.file.Paths;
79
import java.util.List;
810
import java.util.stream.Collectors;
911

@@ -13,7 +15,7 @@ public class CommentReporterComplete {
1315

1416
public static void main(String[] args) throws Exception {
1517

16-
CompilationUnit cu = StaticJavaParser.parse(new File(FILE_PATH));
18+
CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(FILE_PATH)));
1719

1820
List<CommentReportEntry> comments = cu.getAllContainedComments()
1921
.stream()

src/main/java/org/javaparser/examples/chapter2/CommentReporterStarter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
import com.github.javaparser.ast.comments.Comment;
66

77
import java.io.FileInputStream;
8+
import java.nio.file.Files;
9+
import java.nio.file.Paths;
810
import java.util.List;
911

1012
public class CommentReporterStarter {
@@ -13,7 +15,7 @@ public class CommentReporterStarter {
1315

1416
public static void main(String[] args) throws Exception {
1517

16-
CompilationUnit cu = StaticJavaParser.parse(new FileInputStream(FILE_PATH));
18+
CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(FILE_PATH)));
1719

1820
List<Comment> comments = cu.getAllContainedComments();
1921
}

src/main/java/org/javaparser/examples/chapter2/ModifyingVisitorComplete.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import com.github.javaparser.ast.visitor.ModifierVisitor;
77

88
import java.io.FileInputStream;
9+
import java.nio.file.Files;
10+
import java.nio.file.Paths;
911
import java.util.regex.Pattern;
1012

1113
public class ModifyingVisitorComplete {
@@ -16,7 +18,7 @@ public class ModifyingVisitorComplete {
1618

1719
public static void main(String[] args) throws Exception {
1820

19-
CompilationUnit cu = StaticJavaParser.parse(new FileInputStream(FILE_PATH));
21+
CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(FILE_PATH)));
2022

2123
ModifierVisitor<?> numericLiteralVisitor = new IntegerLiteralModifier();
2224
numericLiteralVisitor.visit(cu, null);

src/main/java/org/javaparser/examples/chapter2/ModifyingVisitorStarter.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.github.javaparser.ast.CompilationUnit;
55

66
import java.io.FileInputStream;
7+
import java.nio.file.Files;
8+
import java.nio.file.Paths;
79

810
public class ModifyingVisitorStarter {
911

@@ -12,7 +14,7 @@ public class ModifyingVisitorStarter {
1214

1315
public static void main(String[] args) throws Exception {
1416

15-
CompilationUnit cu = StaticJavaParser.parse(new FileInputStream(FILE_PATH));
17+
CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(FILE_PATH)));
1618
}
1719

1820
}

src/main/java/org/javaparser/examples/chapter2/VoidVisitorComplete.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import com.github.javaparser.ast.visitor.VoidVisitor;
77
import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
88

9-
import java.io.FileInputStream;
9+
import java.nio.file.Files;
10+
import java.nio.file.Paths;
1011
import java.util.ArrayList;
1112
import java.util.List;
1213

@@ -16,7 +17,7 @@ public class VoidVisitorComplete {
1617

1718
public static void main(String[] args) throws Exception {
1819

19-
CompilationUnit cu = StaticJavaParser.parse(new FileInputStream(FILE_PATH));
20+
CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(FILE_PATH)));
2021

2122
VoidVisitor<Void> methodNameVisitor = new MethodNamePrinter();
2223
methodNameVisitor.visit(cu, null);

src/main/java/org/javaparser/examples/chapter2/VoidVisitorStarter.java

+3-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
33
import com.github.javaparser.StaticJavaParser;
44
import com.github.javaparser.ast.CompilationUnit;
55

6-
import java.io.FileInputStream;
6+
import java.nio.file.Files;
7+
import java.nio.file.Paths;
78

89
public class VoidVisitorStarter {
9-
1010
private static final String FILE_PATH = "src/main/java/org/javaparser/samples/ReversePolishNotation.java";
11-
1211
public static void main(String[] args) throws Exception {
1312

14-
CompilationUnit cu = StaticJavaParser.parse(new FileInputStream(FILE_PATH));
15-
13+
CompilationUnit cu = StaticJavaParser.parse(Files.newInputStream(Paths.get(FILE_PATH)));
1614
}
17-
1815
}

src/main/java/org/javaparser/examples/chapter5/GetTypeOfReference.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ public static void main(String[] args) throws FileNotFoundException {
2020

2121
JavaSymbolSolver symbolSolver = new JavaSymbolSolver(typeSolver);
2222
StaticJavaParser
23-
.getConfiguration()
23+
.getParserConfiguration()
2424
.setSymbolResolver(symbolSolver);
2525

2626
CompilationUnit cu = StaticJavaParser.parse(new File(FILE_PATH));
2727

2828
cu.findAll(AssignExpr.class).forEach(ae -> {
2929
ResolvedType resolvedType = ae.calculateResolvedType();
30-
System.out.println(ae.toString() + " is a: " + resolvedType);
30+
System.out.println(ae + " is a: " + resolvedType);
3131
});
3232
}
3333
}

src/main/java/org/javaparser/examples/chapter5/MemoryTypeSolverComplete.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.github.javaparser.resolution.model.SymbolReference;
99
import com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext;
1010
import com.github.javaparser.symbolsolver.resolution.typesolvers.MemoryTypeSolver;
11+
import com.google.common.collect.Lists;
1112
import org.easymock.EasyMock;
1213
import org.junit.Test;
1314

@@ -37,7 +38,7 @@ public void solveTypeInSamePackage() throws Exception {
3738

3839
EasyMock.replay(otherClass);
3940

40-
SymbolReference<ResolvedTypeDeclaration> ref = context.solveType("Bar");
41+
SymbolReference<ResolvedTypeDeclaration> ref = context.solveType("Bar", null);
4142
assertTrue(ref.isSolved());
4243
assertEquals("org.javaparser.examples.chapter5.Bar", ref.getCorrespondingDeclaration().getQualifiedName());
4344
}

src/main/java/org/javaparser/examples/chapter5/ResolveMethodCalls.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static void main(String[] args) throws Exception {
1818

1919
JavaSymbolSolver symbolSolver = new JavaSymbolSolver(typeSolver);
2020
StaticJavaParser
21-
.getConfiguration()
21+
.getParserConfiguration()
2222
.setSymbolResolver(symbolSolver);
2323

2424
CompilationUnit cu = StaticJavaParser.parse(new File(FILE_PATH));

src/main/java/org/javaparser/samples/CommentGenerator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static void main(String[] args) throws Exception {
2828
.filter(md -> !md.getJavadoc().isPresent())
2929
.forEach(md -> md.setJavadocComment(generateJavaDoc(md)));
3030

31-
System.out.println(cu.toString());
31+
System.out.println(cu);
3232
}
3333

3434
private static class UnDocumentedMethodCollector extends VoidVisitorAdapter<List<MethodDeclaration>> {

src/main/java/org/javaparser/samples/CommentRemover.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public static void main(String[] args) throws Exception {
2323
.collect(Collectors.toList());
2424
unwantedComments.forEach(Node::remove);
2525

26-
System.out.println(cu.toString());
26+
System.out.println(cu);
2727

2828
}
2929

0 commit comments

Comments
 (0)