You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by re...@apache.org on 2023/06/13 21:30:31 UTC
[cxf] 02/02: CXF-8886: Support scraping javadocs generated by Java 17 (restore more strict visibility levels) (#1302)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 526900ad65ce2c30f3f9c5a98a3cc74fabc42be8
Author: Andriy Redko <dr...@gmail.com>
AuthorDate: Tue Jun 13 11:45:39 2023 -0400
CXF-8886: Support scraping javadocs generated by Java 17 (restore more strict visibility levels) (#1302)
(cherry picked from commit facc79ab8541d41930d9f8858e8babe05b1c5abe)
---
.../cxf/jaxrs/model/doc/JavaDocProvider.java | 30 +++++++++++-----------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
index d7d620cf18..3b11d786ed 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/doc/JavaDocProvider.java
@@ -50,11 +50,11 @@ public class JavaDocProvider implements DocumentationProvider {
protected static final double JAVA_VERSION_17 = 17.0D;
- protected ClassLoader javaDocLoader;
+ private ClassLoader javaDocLoader;
- protected final ConcurrentHashMap<String, ClassDocs> docs = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<String, ClassDocs> docs = new ConcurrentHashMap<>();
- protected double javaDocsBuiltByVersion = JAVA_VERSION;
+ private double javaDocsBuiltByVersion = JAVA_VERSION;
public JavaDocProvider() {
}
@@ -152,7 +152,7 @@ public class JavaDocProvider implements DocumentationProvider {
return null;
}
- protected Class<?> getPathAnnotatedClass(Class<?> cls) {
+ private Class<?> getPathAnnotatedClass(Class<?> cls) {
if (cls.getAnnotation(Path.class) != null) {
return cls;
}
@@ -167,7 +167,7 @@ public class JavaDocProvider implements DocumentationProvider {
return cls;
}
- protected ClassDocs getClassDocInternal(Class<?> cls) throws Exception {
+ private ClassDocs getClassDocInternal(Class<?> cls) throws Exception {
Class<?> annotatedClass = getPathAnnotatedClass(cls);
String resource = annotatedClass.getName().replace(".", "/") + ".html";
ClassDocs classDocs = docs.get(resource);
@@ -192,7 +192,7 @@ public class JavaDocProvider implements DocumentationProvider {
return classDocs;
}
- protected MethodDocs getOperationDocInternal(OperationResourceInfo ori) throws Exception {
+ private MethodDocs getOperationDocInternal(OperationResourceInfo ori) throws Exception {
Method method = ori.getAnnotatedMethod() == null
? ori.getMethodToInvoke()
: ori.getAnnotatedMethod();
@@ -275,7 +275,7 @@ public class JavaDocProvider implements DocumentationProvider {
return mDocs;
}
- protected String getJavaDocText(String doc, String tag, String notAfterTag, int index) {
+ private String getJavaDocText(String doc, String tag, String notAfterTag, int index) {
int tagIndex = doc.indexOf(tag, index);
if (tagIndex != -1) {
int notAfterIndex = doc.indexOf(notAfterTag, index);
@@ -336,13 +336,13 @@ public class JavaDocProvider implements DocumentationProvider {
return javaDocsBuiltByVersion == JAVA_VERSION_1_8 ? "-" : ",";
}
- protected static class ClassDocs {
+ private static class ClassDocs {
- protected final String classDoc;
+ private final String classDoc;
- protected final String classInfo;
+ private final String classInfo;
- protected final ConcurrentHashMap<Method, MethodDocs> mdocs = new ConcurrentHashMap<>();
+ private final ConcurrentHashMap<Method, MethodDocs> mdocs = new ConcurrentHashMap<>();
ClassDocs(String classDoc, String classInfo) {
this.classDoc = classDoc;
@@ -366,13 +366,13 @@ public class JavaDocProvider implements DocumentationProvider {
}
}
- protected static class MethodDocs {
+ private static class MethodDocs {
- protected final String methodInfo;
+ private final String methodInfo;
- protected final List<String> paramInfo;
+ private final List<String> paramInfo;
- protected final String responseInfo;
+ private final String responseInfo;
MethodDocs(String methodInfo, List<String> paramInfo, String responseInfo) {
this.methodInfo = methodInfo;