add javadoc
Merge branch 'origin/3.0-autotest'