Skip to content

[CXF-6503] Looking for parent classes / interfaces Javadocs, if needed #95

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.

Sign up for GitHub

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

Closed
ilgrosso wants to merge 1 commit into from
Closed

[CXF-6503] Looking for parent classes / interfaces Javadocs, if needed #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/JavaDocProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private static double getVersion() {

public String getClassDoc(ClassResourceInfo cri) {
try {
ClassDocs doc = getClassDocInternal(cri);
ClassDocs doc = getClassDocInternal(cri.getServiceClass());
if (doc == null) {
return null;
}
Expand Down Expand Up @@ -123,7 +123,7 @@ public String getMethodParameterDoc(OperationResourceInfo ori, int paramIndex) {
return null;
}
} catch (Exception ex) {
// ignore
// ignore
}
return null;
}
Expand All @@ -132,7 +132,7 @@ private Class<?> getPathAnnotatedClass(Class<?> cls) {
if (cls.getAnnotation(Path.class) != null) {
return cls;
}
if (cls.getSuperclass().getAnnotation(Path.class) != null) {
if (cls.getSuperclass() != null && cls.getSuperclass().getAnnotation(Path.class) != null) {
return cls.getSuperclass();
}
for (Class<?> i : cls.getInterfaces()) {
Expand All @@ -143,8 +143,8 @@ private Class<?> getPathAnnotatedClass(Class<?> cls) {
return cls;
}

private ClassDocs getClassDocInternal(ClassResourceInfo cri) throws Exception {
Class<?> annotatedClass = getPathAnnotatedClass(cri.getServiceClass());
private ClassDocs getClassDocInternal(Class<?> cls) throws Exception {
Class<?> annotatedClass = getPathAnnotatedClass(cls);
String resource = annotatedClass.getName().replace(".", "/") + ".html";
ClassDocs classDocs = docs.get(resource);
if (classDocs == null) {
Expand All @@ -169,12 +169,13 @@ private ClassDocs getClassDocInternal(ClassResourceInfo cri) throws Exception {


private MethodDocs getOperationDocInternal(OperationResourceInfo ori) throws Exception {
ClassDocs classDoc = getClassDocInternal(ori.getClassResourceInfo());
Method method = ori.getAnnotatedMethod() == null
? ori.getMethodToInvoke()
: ori.getAnnotatedMethod();
ClassDocs classDoc = getClassDocInternal(method.getDeclaringClass());
if (classDoc == null) {
return null;
}
Method method = ori.getAnnotatedMethod() == null ? ori.getMethodToInvoke()
: ori.getAnnotatedMethod();
MethodDocs mDocs = classDoc.getMethodDocs(method);
if (mDocs == null) {
String operLink = getOperLink();
Expand Down