Skip to content

Commit 7e6e165

Browse files
committed
[doc] resolve a bunch of javadoc lint warnings
1 parent 2d8eb75 commit 7e6e165

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

pom.xml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -336,15 +336,26 @@
336336
<groupId>org.apache.maven.plugins</groupId>
337337
<artifactId>maven-javadoc-plugin</artifactId>
338338
<version>3.11.2</version>
339+
<configuration>
340+
<tags>
341+
<tag>
342+
<name>apiNote</name>
343+
<placement>a</placement>
344+
<head>API:</head>
345+
</tag>
346+
<tag>
347+
<name>implNote</name>
348+
<placement>a</placement>
349+
<head>NOTE:</head>
350+
</tag>
351+
</tags>
352+
</configuration>
339353
<executions>
340354
<execution>
341355
<id>attach-javadocs</id>
342356
<goals>
343357
<goal>jar</goal>
344358
</goals>
345-
<configuration>
346-
<additionalparam>${javadoc.opts}</additionalparam>
347-
</configuration>
348359
</execution>
349360
</executions>
350361
</plugin>
@@ -365,15 +376,6 @@
365376
</plugins>
366377
</build>
367378
</profile>
368-
<profile>
369-
<id>java8-disable-doclint</id>
370-
<activation>
371-
<jdk>[1.8,)</jdk>
372-
</activation>
373-
<properties>
374-
<javadoc.opts>-Xdoclint:none</javadoc.opts>
375-
</properties>
376-
</profile>
377379
</profiles>
378380

379381
</project>

src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void setRackupScript(String rackupScript) {
7676
/**
7777
* Initialize this factory using the given context.
7878
*
79-
* NOTE: exception handling is left to the outer factory.
79+
* @implNote exception handling is left to the outer factory.
8080
* @param rackContext the RackContext
8181
*/
8282
@Override
@@ -94,7 +94,7 @@ public void init(final RackContext rackContext) {
9494
/**
9595
* Creates a new application instance (without initializing it).
9696
*
97-
* NOTE: exception handling is left to the outer factory.
97+
* @implNote exception handling is left to the outer factory.
9898
* @return new application instance
9999
*/
100100
@Override
@@ -109,7 +109,7 @@ public IRubyObject create(Ruby runtime) {
109109
/**
110110
* Creates a new application and initializes it.
111111
*
112-
* NOTE: exception handling is left to the outer factory.
112+
* @implNote exception handling is left to the outer factory.
113113
* @return new, initialized application
114114
*/
115115
@Override
@@ -122,7 +122,7 @@ public RackApplication getApplication() {
122122
/**
123123
* Destroys the application (assumably) created by this factory.
124124
*
125-
* NOTE: exception handling is left to the outer factory.
125+
* @implNote exception handling is left to the outer factory.
126126
* @param app the application to "release"
127127
*/
128128
@Override
@@ -352,9 +352,9 @@ protected void loadJRubyRack(final Ruby runtime) {
352352
/**
353353
* Initializes the runtime (exports the context, boots the Rack handler).
354354
*
355-
* NOTE: visible due to specs
355+
* @apiNote Internal API, only visible due tests.
356356
*
357-
* @param runtime
357+
* @param runtime the JRuby runtime
358358
*/
359359
public void initRuntime(final Ruby runtime) {
360360
loadJRubyRack(runtime);
@@ -399,11 +399,11 @@ public void initRuntime(final Ruby runtime) {
399399
/**
400400
* Checks and sets the required Rack version (if specified as a magic comment).
401401
*
402-
* e.g. # rack.version: ~>1.3.6
402+
* e.g. # rack.version: =1.3.6
403403
*
404-
* NOTE: (package) visible due specs
404+
* @apiNote Internal API, only visible due tests.
405405
*
406-
* @param runtime
406+
* @param runtime the JRuby runtime
407407
* @return the rack version requirement
408408
*/
409409
public String checkAndSetRackVersion(final Ruby runtime) {

src/main/java/org/jruby/rack/RackConfig.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ public interface RackConfig {
8080
* By returning null the environment (JRuby sets up System.getenv) will be
8181
* kept as is.
8282
*
83-
* NOTE: This method if not returning null should return a mutable map.
84-
*
83+
* @apiNote This method if not returning null should return a mutable map.
8584
* @return the <code>ENV</code> to be used in started Ruby runtimes
8685
*/
8786
Map<String, String> getRuntimeEnvironment();

0 commit comments

Comments
 (0)