Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PAYARA-3258 Disabled Path Based Annotations For Interfaces #3512

Merged
merged 3 commits into from Dec 11, 2018
Merged

PAYARA-3258 Disabled Path Based Annotations For Interfaces #3512

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e0ec47
Revert "Revert "PAYARA-3258 Disabled Path Based Annotations For Inter…
Pandrex247 Dec 11, 2018
5167208
Update OpenApiWalker.java
arjantijms Dec 11, 2018
068f1db
Removed javassist import.
MattGill98 Dec 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 30 additions & 13 deletions ...le/openapi/src/main/java/fish/payara/microprofile/openapi/impl/visitor/OpenApiWalker.java
View file
Open in desktop
Expand Up @@ -46,6 +46,7 @@
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
Expand Down Expand Up @@ -130,8 +131,8 @@ public OpenApiWalker(OpenAPI api, Set<Class<?>> allowedClasses, Map<String, Set<
@Override
public void accept(ApiVisitor visitor) {
// OpenAPI necessary annotations
processAnnotations(OpenAPIDefinition.class, visitor::visitOpenAPI);
processAnnotations(Schema.class, visitor::visitSchema);
processAnnotations(OpenAPIDefinition.class, visitor::visitOpenAPI, true);
processAnnotations(Schema.class, visitor::visitSchema, true);

// JAX-RS methods
processAnnotations(GET.class, visitor::visitGET);
Expand All @@ -150,20 +151,20 @@ public void accept(ApiVisitor visitor) {
processAnnotations(FormParam.class, visitor::visitFormParam);

// All other OpenAPI annotations
processAnnotations(Schema.class, visitor::visitSchema);
processAnnotations(Server.class, visitor::visitServer, Servers.class, visitor::visitServers);
processAnnotations(Extension.class, visitor::visitExtension);
processAnnotations(Schema.class, visitor::visitSchema, true);
processAnnotations(Server.class, visitor::visitServer, Servers.class, visitor::visitServers, true);
processAnnotations(Extension.class, visitor::visitExtension, true);
processAnnotations(Operation.class, visitor::visitOperation);
processAnnotations(Callback.class, visitor::visitCallback, Callbacks.class, visitor::visitCallbacks);
processAnnotations(APIResponse.class, visitor::visitAPIResponse, APIResponses.class,
visitor::visitAPIResponses);
processAnnotations(Parameter.class, visitor::visitParameter);
processAnnotations(ExternalDocumentation.class, visitor::visitExternalDocumentation);
processAnnotations(Tag.class, visitor::visitTag, Tags.class, visitor::visitTags);
visitor::visitAPIResponses, true);
processAnnotations(Parameter.class, visitor::visitParameter, true);
processAnnotations(ExternalDocumentation.class, visitor::visitExternalDocumentation, true);
processAnnotations(Tag.class, visitor::visitTag, Tags.class, visitor::visitTags, true);
processAnnotations(SecurityScheme.class, visitor::visitSecurityScheme, SecuritySchemes.class,
visitor::visitSecuritySchemes);
visitor::visitSecuritySchemes, true);
processAnnotations(SecurityRequirement.class, visitor::visitSecurityRequirement, SecurityRequirements.class,
visitor::visitSecurityRequirements);
visitor::visitSecurityRequirements, true);

// JAX-RS response types
processAnnotations(Produces.class, visitor::visitProduces);
Expand All @@ -173,9 +174,14 @@ public void accept(ApiVisitor visitor) {

private <A extends Annotation, A2 extends Annotation, E extends AnnotatedElement> void processAnnotations(
Class<A> annotationClass, VisitorFunction<A, E> annotationFunction, Class<A2> altClass,
VisitorFunction<A2, E> altFunction) {
VisitorFunction<A2, E> altFunction, boolean allowInterfaces) {
for (Class<?> clazz : classes) {

// Don't read interfaces if the annotation should only be read from concrete classes
if (!allowInterfaces && (Modifier.isAbstract(clazz.getModifiers()) || clazz.isInterface())) {
continue;
}

processAnnotation(clazz, annotationClass, annotationFunction, altClass, altFunction,
new OpenApiContext(api, getResourcePath(clazz, resourceMapping)));

Expand All @@ -199,7 +205,18 @@ private <A extends Annotation, A2 extends Annotation, E extends AnnotatedElement

private <A extends Annotation, E extends AnnotatedElement> void processAnnotations(Class<A> annotationClass,
VisitorFunction<A, E> function) {
processAnnotations(annotationClass, function, null, null);
processAnnotations(annotationClass, function, false);
}

private <A extends Annotation, E extends AnnotatedElement> void processAnnotations(Class<A> annotationClass,
VisitorFunction<A, E> function, boolean allowInterfaces) {
processAnnotations(annotationClass, function, null, null, allowInterfaces);
}

private <A extends Annotation, A2 extends Annotation, E extends AnnotatedElement> void processAnnotations(
Class<A> annotationClass, VisitorFunction<A, E> annotationFunction, Class<A2> altClass,
VisitorFunction<A2, E> altFunction) {
processAnnotations(annotationClass, annotationFunction, altClass, altFunction, false);
}

@SuppressWarnings("unchecked")
Expand Down