Merge branch 'javadocfix' of https://github.com/hindsholm/jaxrs-analyzer

into hindsholm-javadocfix
sdaschner · Mar 27, 2018 · 4ea38b2 · 4ea38b2
2 parents e40af63 + a65bc9e
commit 4ea38b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ain/java/com/sebastian_daschner/jaxrs_analyzer/analysis/javadoc/JavaDocParserVisitor.java b/...ain/java/com/sebastian_daschner/jaxrs_analyzer/analysis/javadoc/JavaDocParserVisitor.java
@@ -8,6 +8,7 @@
 import com.github.javaparser.ast.body.Parameter;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.expr.AnnotationExpr;
+import com.github.javaparser.ast.expr.Expression;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import com.github.javaparser.javadoc.Javadoc;
 import com.github.javaparser.javadoc.JavadocBlockTag;
@@ -128,7 +129,9 @@ private MemberParameterTag createMethodParameterTag(JavadocBlockTag tag, MethodD
     }
 
     private MemberParameterTag createMemberParamTag(JavadocDescription javadocDescription, Stream<AnnotationExpr> annotationStream) {
-        Map<String, String> annotations = annotationStream.collect(Collectors.toMap(a -> a.getName().getIdentifier(),
+        Map<String, String> annotations = annotationStream
+                .filter(Expression::isSingleMemberAnnotationExpr)
+                .collect(Collectors.toMap(a -> a.getName().getIdentifier(),
                 a -> a.asSingleMemberAnnotationExpr().getMemberValue().asStringLiteralExpr().asString()));
         return new MemberParameterTag(javadocDescription.toText(), annotations);
     }

diff --git a/src/test/jaxrs-test/com/sebastian_daschner/jaxrs_test/TestResources.java b/src/test/jaxrs-test/com/sebastian_daschner/jaxrs_test/TestResources.java
@@ -26,6 +26,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
+import javax.validation.constraints.Pattern;
 
 /**
  * These sources are solely used for test purposes and not meant for deployment.
@@ -90,7 +91,7 @@ public Response put(final Model model) {
      */
     @DELETE
     @Path("{foobar}")
-    public void deleteTest(@PathParam("foobar") final String foobar) {
+    public void deleteTest(@PathParam("foobar") @Pattern(regexp = "^\\S.*") final String foobar) {
         Logger.getLogger("").info("deleted " + foobar);
     }