diff options
author | Danny van Bruggen <hexagonaal@gmail.com> | 2017-01-26 22:27:56 +0100 |
---|---|---|
committer | Danny van Bruggen <hexagonaal@gmail.com> | 2017-01-26 23:09:17 +0100 |
commit | a2152a8282754017f1c2d1eb5b45cfde7e89950b (patch) | |
tree | b4348f4f7c09962fdabd7362e356665f4c45070c /javaparser-core/src/main | |
parent | 2b62b1e3626674efd7655d2269d381dca3f546f3 (diff) | |
download | javaparser-a2152a8282754017f1c2d1eb5b45cfde7e89950b.tar.gz |
Feedback from @arturbosch
Diffstat (limited to 'javaparser-core/src/main')
12 files changed, 19 insertions, 89 deletions
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java index 963ce7892..5b8d7ef6a 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/AnnotationMemberDeclaration.java @@ -180,12 +180,4 @@ public final class AnnotationMemberDeclaration extends BodyDeclaration<Annotatio setAsParentNodeOf(type); return this; } - - @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java index eef910c62..9a922399d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ClassOrInterfaceDeclaration.java @@ -174,15 +174,11 @@ public final class ClassOrInterfaceDeclaration extends TypeDeclaration<ClassOrIn * @return the methods found (multiple in case of polymorphism) */ public Optional<ConstructorDeclaration> getDefaultConstructor() { - for (BodyDeclaration<?> bd : getMembers()) { - if (bd instanceof ConstructorDeclaration) { - ConstructorDeclaration cd = (ConstructorDeclaration) bd; - if (cd.getParameters().isEmpty()) { - return Optional.of(cd); - } - } - } - return Optional.empty(); + return getMembers().stream() + .filter(bd -> bd instanceof ConstructorDeclaration) + .map(bd -> (ConstructorDeclaration) bd) + .filter(cd -> cd.getParameters().isEmpty()) + .findFirst(); } @Override diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java index 6dc3d60f6..e6f8efa14 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java @@ -254,14 +254,6 @@ public final class ConstructorDeclaration extends BodyDeclaration<ConstructorDec } @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } - - @Override public BlockStmt getBody() { return body; } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java index d2409d4ba..b742fd6f9 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EmptyMemberDeclaration.java @@ -55,12 +55,4 @@ public final class EmptyMemberDeclaration extends BodyDeclaration<EmptyMemberDec public <A> void accept(VoidVisitor<A> v, A arg) { v.visit(this, arg); } - - @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java index 4ab50343f..2b141c3bd 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/EnumConstantDeclaration.java @@ -130,14 +130,6 @@ public final class EnumConstantDeclaration extends BodyDeclaration<EnumConstantD } @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } - - @Override public List<NodeList<?>> getNodeLists() { List<NodeList<?>> res = new LinkedList<>(super.getNodeLists()); res.add(arguments); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java index 15aed196c..92ddf5375 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/FieldDeclaration.java @@ -152,14 +152,6 @@ public final class FieldDeclaration extends BodyDeclaration<FieldDeclaration> im return this; } - @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } - /** * Create a getter for this field, <b>will only work if this field declares only 1 identifier and if this field is * already added to a ClassOrInterfaceDeclaration</b> diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java index 190eceac8..26a029b3f 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/InitializerDeclaration.java @@ -31,6 +31,8 @@ import com.github.javaparser.ast.stmt.BlockStmt; import com.github.javaparser.ast.visitor.GenericVisitor; import com.github.javaparser.ast.visitor.VoidVisitor; +import java.util.Optional; + import static com.github.javaparser.utils.Utils.assertNotNull; /** @@ -90,12 +92,4 @@ public final class InitializerDeclaration extends BodyDeclaration<InitializerDec this.isStatic = isStatic; return this; } - - @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java index 269628109..ee184e856 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java @@ -362,14 +362,6 @@ public final class MethodDeclaration extends BodyDeclaration<MethodDeclaration> } @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } - - @Override public List<NodeList<?>> getNodeLists() { List<NodeList<?>> res = new LinkedList<>(super.getNodeLists()); res.add(typeParameters); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java index 710a56ea8..3d6982141 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/body/TypeDeclaration.java @@ -151,14 +151,6 @@ public abstract class TypeDeclaration<T extends Node> extends BodyDeclaration<T> } @Override - public JavadocComment getJavadocComment() { - if (getComment().isPresent() && getComment().get() instanceof JavadocComment) { - return (JavadocComment) getComment().get(); - } - return null; - } - - @Override public List<NodeList<?>> getNodeLists() { List<NodeList<?>> res = new LinkedList<>(super.getNodeLists()); res.add(members); diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java index ff2baa0eb..d5f679849 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithJavadoc.java @@ -23,20 +23,26 @@ package com.github.javaparser.ast.nodeTypes; import com.github.javaparser.JavaParser; import com.github.javaparser.ast.Node; +import com.github.javaparser.ast.comments.Comment; import com.github.javaparser.ast.comments.JavadocComment; import com.github.javaparser.javadoc.Javadoc; +import java.util.Optional; + /** * A node that can be documented with a Javadoc comment. */ public interface NodeWithJavadoc<N extends Node> { - + Optional<Comment> getComment(); + /** * Gets the JavadocComment for this node. You can set the JavadocComment by calling setJavadocComment passing a JavadocComment. * * @return The JavadocComment for this node if it exists, null if it doesn't. */ - JavadocComment getJavadocComment(); + default JavadocComment getJavadocComment() { + return getComment().flatMap(c -> Optional.of((JavadocComment)c)).orElse(null); + } /** * Gets the Javadoc for this node. You can set the Javadoc by calling setJavadocComment passing a Javadoc. diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java index e29503a0f..eec3db52d 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java +++ b/javaparser-core/src/main/java/com/github/javaparser/ast/visitor/GenericVisitorAdapter.java @@ -1657,11 +1657,8 @@ public abstract class GenericVisitorAdapter<R, A> implements GenericVisitor<R, A } private void visitComment(Node n, A arg) { - n.getComment().ifPresent(c -> { - Comment result = (Comment) c.accept(this, arg); - if (result != null) { - n.setComment(result); - } - }); + n.getComment() + .map(comment -> (Comment) comment.accept(this, arg)) + .ifPresent(n::setComment); } } diff --git a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java index ff3648481..bc88701da 100644 --- a/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java +++ b/javaparser-core/src/main/java/com/github/javaparser/utils/PositionUtils.java @@ -53,10 +53,6 @@ public final class PositionUtils { } public static <T extends Node> void sortByBeginPosition(List<T> nodes, final boolean ignoringAnnotations) { - Collections.sort(nodes, (o1, o2) -> PositionUtils.compare(o1, o2, ignoringAnnotations)); - } - - public static <T extends Node> void sortByBeginPosition(NodeList<T> nodes, final boolean ignoringAnnotations) { nodes.sort((o1, o2) -> PositionUtils.compare(o1, o2, ignoringAnnotations)); } @@ -70,7 +66,7 @@ public final class PositionUtils { private static int compare(Node a, Node b, boolean ignoringAnnotations) { if (!a.getRange().isPresent() || !b.getRange().isPresent()) { - return -1; + return 0; } if (ignoringAnnotations) { int signLine = signum(beginLineWithoutConsideringAnnotation(a) - beginLineWithoutConsideringAnnotation(b)); @@ -129,9 +125,6 @@ public final class PositionUtils { public static boolean nodeContains(Node container, Node contained, boolean ignoringAnnotations) { final Range containedRange = contained.getRange().get(); final Range containerRange = container.getRange().get(); - if (containerRange == null || containedRange == null) { - return false; - } if (!ignoringAnnotations || PositionUtils.getLastAnnotation(container) == null) { return container.containsWithin(contained); } |