Skip to content

Commit 84a4bac

Browse files
jlerbscjlerbsc
committed
fix: Eliminates the use of instanceof in favour of using the API
1 parent 6d50915 commit 84a4bac

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎javaparser-core/src/main/java/com/github/javaparser/printer/DefaultPrettyPrinterVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1073,7 +1073,7 @@ public void visit(final Parameter n, final Void arg) {
10731073
printAnnotations(n.getVarArgsAnnotations(), false, arg);
10741074
printer.print("...");
10751075
}
1076-
if (!(n.getType() instanceof UnknownType)) {
1076+
if (!(n.getType().isUnknownType())) {
10771077
printer.print(" ");
10781078
}
10791079
n.getName().accept(this, arg);

‎javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ public void visit(final Parameter n, final Void arg) {
10751075
printAnnotations(n.getVarArgsAnnotations(), false, arg);
10761076
printer.print("...");
10771077
}
1078-
if (!(n.getType() instanceof UnknownType)) {
1078+
if (!(n.getType().isUnknownType())) {
10791079
printer.print(" ");
10801080
}
10811081
n.getName().accept(this, arg);

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/TypeExtractor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public ResolvedType visit(VariableDeclarator node, Boolean solveLambdas) {
9292

9393
@Override
9494
public ResolvedType visit(Parameter node, Boolean solveLambdas) {
95-
if (node.getType() instanceof UnknownType) {
95+
if (node.getType().isUnknownType()) {
9696
throw new IllegalStateException("Parameter has unknown type: " + node);
9797
}
9898
return facade.convertToUsage(node.getType());

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/javaparsermodel/declarations/JavaParserParameterDeclaration.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public boolean isVariadic() {
6060

6161
@Override
6262
public ResolvedType getType() {
63-
if (wrappedNode.getType() instanceof UnknownType && JavaParserFactory.getContext(wrappedNode, typeSolver) instanceof LambdaExprContext) {
63+
if (wrappedNode.getType().isUnknownType() && JavaParserFactory.getContext(wrappedNode, typeSolver) instanceof LambdaExprContext) {
6464
Optional<Value> value = JavaParserFactory.getContext(wrappedNode, typeSolver).solveSymbolAsValue(wrappedNode.getNameAsString());
6565
if (value.isPresent()) {
6666
return value.get().getType();

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/typeinference/ExpressionHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
public class ExpressionHelper {
3838

3939
public static boolean isExplicitlyTyped(LambdaExpr lambdaExpr) {
40-
return lambdaExpr.getParameters().stream().allMatch(p -> !(p.getType() instanceof UnknownType));
40+
return lambdaExpr.getParameters().stream().allMatch(p -> !(p.getType().isUnknownType()));
4141
}
4242

4343
public static List<Expression> getResultExpressions(BlockStmt blockStmt) {

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/typeinference/TypeInference.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ private List<ResolvedType> formalParameterTypes(ResolvedMethodDeclaration method
583583
}
584584

585585
private boolean isImplicitlyTyped(LambdaExpr lambdaExpr) {
586-
return lambdaExpr.getParameters().stream().anyMatch(p -> p.getType() instanceof UnknownType);
586+
return lambdaExpr.getParameters().stream().anyMatch(p -> p.getType().isUnknownType());
587587
}
588588

589589
private boolean isInexact(MethodReferenceExpr methodReferenceExpr) {
@@ -596,7 +596,7 @@ private boolean isPertinentToApplicability(Expression argument) {
596596
//
597597
// - An implicitly typed lambda expression (§15.27.1).
598598

599-
if (argument instanceof LambdaExpr) {
599+
if (argument.isLambdaExpr()) {
600600
LambdaExpr lambdaExpr = (LambdaExpr)argument;
601601
if (isImplicitlyTyped(lambdaExpr)) {
602602
return false;
@@ -605,7 +605,7 @@ private boolean isPertinentToApplicability(Expression argument) {
605605

606606
// - An inexact method reference expression (§15.13.1).
607607

608-
if (argument instanceof MethodReferenceExpr) {
608+
if (argument.isMethodReferenceExpr()) {
609609
MethodReferenceExpr methodReferenceExpr = (MethodReferenceExpr)argument;
610610
if (isInexact(methodReferenceExpr)) {
611611
return false;
@@ -616,37 +616,37 @@ private boolean isPertinentToApplicability(Expression argument) {
616616
// explicitly typed lambda expression or an exact method reference expression for which the
617617
// corresponding target type (as derived from the signature of m) is a type parameter of m.
618618

619-
if (argument instanceof LambdaExpr) {
619+
if (argument.isLambdaExpr()) {
620620
throw new UnsupportedOperationException();
621621
}
622622

623-
if (argument instanceof MethodReferenceExpr) {
623+
if (argument.isMethodReferenceExpr()) {
624624
throw new UnsupportedOperationException();
625625
}
626626

627627
// - An explicitly typed lambda expression whose body is an expression that is not pertinent to applicability.
628628

629-
if (argument instanceof LambdaExpr) {
629+
if (argument.isLambdaExpr()) {
630630
throw new UnsupportedOperationException();
631631
}
632632

633633
// - An explicitly typed lambda expression whose body is a block, where at least one result expression is not
634634
// pertinent to applicability.
635635

636-
if (argument instanceof LambdaExpr) {
636+
if (argument.isLambdaExpr()) {
637637
throw new UnsupportedOperationException();
638638
}
639639

640640
// - A parenthesized expression (§15.8.5) whose contained expression is not pertinent to applicability.
641641

642-
if (argument instanceof EnclosedExpr) {
642+
if (argument.isEnclosedExpr()) {
643643
EnclosedExpr enclosedExpr = (EnclosedExpr)argument;
644644
return isPertinentToApplicability(enclosedExpr.getInner());
645645
}
646646

647647
// - A conditional expression (§15.25) whose second or third operand is not pertinent to applicability.
648648

649-
if (argument instanceof ConditionalExpr) {
649+
if (argument.isConditionalExpr()) {
650650
ConditionalExpr conditionalExpr = (ConditionalExpr)argument;
651651
return isPertinentToApplicability(conditionalExpr.getThenExpr()) &&
652652
isPertinentToApplicability(conditionalExpr.getElseExpr());

‎javaparser-symbol-solver-core/src/main/java/com/github/javaparser/symbolsolver/resolution/typeinference/constraintformulas/ExpressionCompatibleWithType.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public ReductionResult reduce(BoundSet currentBoundSet) {
188188
// - If the lambda parameters have explicitly declared types F1, ..., Fn and the function type
189189
// has parameter types G1, ..., Gn, then i) for all i (1 ≤ i ≤ n), ‹Fi = Gi›, and ii) ‹T' <: T›.
190190

191-
boolean hasExplicitlyDeclaredTypes = lambdaExpr.getParameters().stream().anyMatch(p -> !(p.getType() instanceof UnknownType));
191+
boolean hasExplicitlyDeclaredTypes = lambdaExpr.getParameters().stream().anyMatch(p -> !(p.getType().isUnknownType()));
192192
if (hasExplicitlyDeclaredTypes) {
193193
throw new UnsupportedOperationException();
194194
}

0 commit comments

Comments
 (0)