Skip to content

Commit 7e624a3

Browse files
authored
Fix javadoc error and run javadoc in CI (#10516)
1 parent 91991ab commit 7e624a3

7 files changed

Lines changed: 44 additions & 13 deletions

File tree

.github/workflows/skywalking.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ jobs:
163163
run: |
164164
./mvnw clean install -B -q \
165165
-Dmaven.test.skip \
166-
-Dmaven.javadoc.skip \
167166
-Dcheckstyle.skip
168167
- uses: actions/upload-artifact@v3
169168
name: Upload distribution tar

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/CoreModuleConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public class CoreModuleConfig extends ModuleConfig {
112112
* load for memory, network of OAP and storage.
113113
*
114114
* But, being activated, user could see the name in the storage entities, which make users easier to use 3rd party
115-
* tool, such as Kibana->ES, to query the data by themselves.
115+
* tool, such as Kibana->ES, to query the data by themselves.
116116
*/
117117
private boolean activeExtraModelColumns = false;
118118
/**

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/analysis/Layer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public enum Layer {
124124
MYSQL(18, true),
125125

126126
/**
127-
* Cache conjectured by client side plugin(eg. skywalking-java -> JedisPlugin LettucePlugin)
127+
* Cache conjectured by client side plugin(eg. skywalking-java -> JedisPlugin LettucePlugin)
128128
*/
129129
VIRTUAL_CACHE(19, false),
130130

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/BanyanDB.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
* <p>
6666
* Only work with {@link Column}
6767
*
68-
* @return non-negative if this column be used for sharding. -1 means not as a sharding key
6968
* @since 9.3.0 Rename as SeriesID.
7069
* @since 9.1.0 created as a new annotation.
7170
* @since 9.0.0 added in {@link Column}
@@ -84,7 +83,7 @@
8483
* considering OAP finds services by "layer", the "layer" 's index should be 0 to
8584
* trigger a prefix-scanning.
8685
*
87-
* @return index, from zero.
86+
* @return non-negative if this column be used for sharding. -1 means not as a sharding key
8887
*/
8988
int index() default -1;
9089
}
@@ -158,7 +157,7 @@ enum IndexType {
158157

159158
/**
160159
* StoreIDTag indicates a metric store its ID as a tag for searching.
161-
* @Since 9.4.0
160+
* @since 9.4.0
162161
*/
163162
@Target({ElementType.TYPE})
164163
@Retention(RetentionPolicy.RUNTIME)

oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/storage/annotation/SQLDatabase.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,18 @@
5959
* Support create additional tables from a model.<br>
6060
* <p>
6161
* Notice:
62+
* <ul>
6263
* <li>This feature only support `Record` type.
6364
* <li>An additional table only supports one list-type field.
6465
* <li>Create `MultiColumnsIndex` on the additional table only when it contains all need columns.
66+
* </ul>
6567
* <p>
6668
* The typical use is: when need to storage a `List` field, we can transform it to another table as row set.<br>
6769
* For example in SegmentRecord#tags create an additional table:
68-
* <pre>{@code
69-
* @SQLDatabase.AdditionalEntity(additionalTables = {ADDITIONAL_TAG_TABLE})
70-
* private List<String> tags;}</pre>
70+
* <pre>
71+
* {@code @SQLDatabase.AdditionalEntity(additionalTables = {ADDITIONAL_TAG_TABLE})}
72+
* {@code private List<String> tags;}
73+
* </pre>
7174
* <p>
7275
* In H2TraceQueryDAO#queryBasicTraces query tags as condition from this additional table, could build sql like this:
7376
* <pre>{@code
@@ -95,18 +98,19 @@
9598
* }
9699
* }</pre>
97100
* <p>
101+
* <ul>
98102
* <li>If no tags condition, only query segment table, the SQL should be: select
99103
* column1, column2 ... from segment where 1=1 and colunm1=xx ...
100104
*
101-
*<li> If 1 tag condition, query both segment and segment_tag tables, the SQL should be: select column1, column2 ...
105+
* <li> If 1 tag condition, query both segment and segment_tag tables, the SQL should be: select column1, column2 ...
102106
* from segment inner join segment_tag segment_tag0 on segment.id=segment_tag0.id where 1=1 and colunm1=xx ... and
103107
* segment_tag0=tagString0
104108
*
105-
*<li> If 2 or more tags condition, query both segment and segment_tag tables, the SQL should be: select column1,
109+
* <li> If 2 or more tags condition, query both segment and segment_tag tables, the SQL should be: select column1,
106110
* column2 ... from segment inner join segment_tag segment_tag0 on segment.id=segment_tag0.id inner join segment_tag
107111
* segment_tag1 on segment.id=segment_tag1.id ... where 1=1 and colunm1=xx ... and segment_tag0=tagString0 and
108112
* segment_tag1=tagString1 ...
109-
*
113+
* </ul>
110114
*/
111115
@Target({ElementType.FIELD})
112116
@Retention(RetentionPolicy.RUNTIME)

oap-server/server-storage-plugin/storage-elasticsearch-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/elasticsearch/StorageModuleElasticsearchConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public class StorageModuleElasticsearchConfig extends ModuleConfig {
145145

146146
/**
147147
* The number of threads for the underlying HTTP client to perform socket I/O.
148-
* If the value is <= 0, the number of available processors will be used.
148+
* If the value is {@code <= 0}, the number of available processors will be used.
149149
*/
150150
private int numHttpClientThread;
151151

pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,35 @@
473473
</execution>
474474
</executions>
475475
</plugin>
476+
477+
<plugin>
478+
<groupId>org.projectlombok</groupId>
479+
<artifactId>lombok-maven-plugin</artifactId>
480+
<version>1.18.20.0</version>
481+
<configuration>
482+
<sourceDirectory>${project.basedir}/src/main/java</sourceDirectory>
483+
</configuration>
484+
<executions>
485+
<execution>
486+
<phase>generate-sources</phase>
487+
<goals>
488+
<goal>delombok</goal>
489+
</goals>
490+
</execution>
491+
</executions>
492+
</plugin>
493+
<plugin>
494+
<groupId>org.apache.maven.plugins</groupId>
495+
<artifactId>maven-javadoc-plugin</artifactId>
496+
<configuration>
497+
<sourcepath>
498+
${project.build.directory}/generated-sources/delombok;
499+
${project.build.directory}/generated-sources/protobuf/java;
500+
${project.build.directory}/generated-sources/protobuf/grpc-java;
501+
${project.build.directory}/generated-sources/antlr4;;
502+
</sourcepath>
503+
</configuration>
504+
</plugin>
476505
</plugins>
477506
</build>
478507
</project>

0 commit comments

Comments
 (0)