HDDS-690. Javadoc build fails in hadoop-ozone.

Contributed by Takanobu Asanuma.
This commit is contained in:
Anu Engineer 2018-10-18 12:14:54 -07:00
parent c64018026e
commit f8d61b9fc2
11 changed files with 24 additions and 20 deletions

View File

@ -74,7 +74,7 @@ public final class BucketArgs {
/** /**
* Returns the ACL's associated with this bucket. * Returns the ACL's associated with this bucket.
* @return List<OzoneAcl> * @return {@literal List<OzoneAcl>}
*/ */
public List<OzoneAcl> getAcls() { public List<OzoneAcl> getAcls() {
return acls; return acls;

View File

@ -100,7 +100,7 @@ public final class OmBucketArgs implements Auditable {
/** /**
* Returns the ACL's that are to be added. * Returns the ACL's that are to be added.
* @return List<OzoneAclInfo> * @return {@literal List<OzoneAclInfo>}
*/ */
public List<OzoneAcl> getAddAcls() { public List<OzoneAcl> getAddAcls() {
return addAcls; return addAcls;
@ -108,7 +108,7 @@ public final class OmBucketArgs implements Auditable {
/** /**
* Returns the ACL's that are to be removed. * Returns the ACL's that are to be removed.
* @return List<OzoneAclInfo> * @return {@literal List<OzoneAclInfo>}
*/ */
public List<OzoneAcl> getRemoveAcls() { public List<OzoneAcl> getRemoveAcls() {
return removeAcls; return removeAcls;

View File

@ -101,7 +101,7 @@ public final class OmBucketInfo implements Auditable {
/** /**
* Returns the ACL's associated with this bucket. * Returns the ACL's associated with this bucket.
* @return List<OzoneAcl> * @return {@literal List<OzoneAcl>}
*/ */
public List<OzoneAcl> getAcls() { public List<OzoneAcl> getAcls() {
return acls; return acls;

View File

@ -119,7 +119,6 @@ public final class OmKeyInfo {
* This will be called when the key is being committed to OzoneManager. * This will be called when the key is being committed to OzoneManager.
* *
* @param locationInfoList list of locationInfo * @param locationInfoList list of locationInfo
* @throws IOException
*/ */
public void updateLocationInfoList(List<OmKeyLocationInfo> locationInfoList) { public void updateLocationInfoList(List<OmKeyLocationInfo> locationInfoList) {
long latestVersion = getLatestVersionLocations().getVersion(); long latestVersion = getLatestVersionLocations().getVersion();

View File

@ -60,7 +60,8 @@ public class VolumeHandler implements Volume {
* Creates a volume. * Creates a volume.
* *
* @param volume Volume Name, this has to be unique at Ozone cluster level * @param volume Volume Name, this has to be unique at Ozone cluster level
* @param quota Quota for this Storage Volume - <int>(<BYTES|MB|GB|TB>) * @param quota Quota for this Storage Volume
* - {@literal <int>(<BYTES|MB|GB|TB>)}
* @param req Request Object * @param req Request Object
* @param uriInfo URI info * @param uriInfo URI info
* @param headers Http Headers * @param headers Http Headers
@ -114,7 +115,8 @@ public class VolumeHandler implements Volume {
* with neither of these actions, update just returns 200 OK. * with neither of these actions, update just returns 200 OK.
* *
* @param volume Volume Name, this has to be unique at Ozone Level * @param volume Volume Name, this has to be unique at Ozone Level
* @param quota Quota for this volume - <int>(<BYTES|MB|GB|TB>)|remove * @param quota Quota for this volume
* - {@literal <int>(<BYTES|MB|GB|TB>)}|remove
* @param req - Request Object * @param req - Request Object
* @param uriInfo - URI info * @param uriInfo - URI info
* @param headers Http Headers * @param headers Http Headers

View File

@ -25,7 +25,7 @@ package org.apache.hadoop.ozone.web.interfaces;
* TODO : Technically we need to report bucket creation and deletion too * TODO : Technically we need to report bucket creation and deletion too
* since the bucket names and metadata consume storage. * since the bucket names and metadata consume storage.
* <p> * <p>
* TODO : We should separate out reporting metadata & data -- * TODO : We should separate out reporting metadata &amp; data --
* <p> * <p>
* In some cases end users will only want to account for the data they are * In some cases end users will only want to account for the data they are
* storing since metadata is mostly a cost of business. * storing since metadata is mostly a cost of business.

View File

@ -54,11 +54,12 @@ public interface Volume {
* *
* Params : * Params :
* Quota - Specifies the Maximum usable size by the user * Quota - Specifies the Maximum usable size by the user
* the valid parameters for quota are <int>(<BYTES| MB|GB|TB>) | remove. * the valid parameters for quota are {@literal <int>(<BYTES| MB|GB|TB>)}
* For example 10GB or "remove". * | remove. For example 10GB or "remove".
* *
* @param volume Volume Name, this has to be unique at Ozone Level * @param volume Volume Name, this has to be unique at Ozone Level
* @param quota Quota for this Storage Volume - <int>(<MB|GB|TB>) | remove * @param quota Quota for this Storage Volume - {@literal <int>(<MB|GB|TB>)}
* | remove
* @param req - Request Object - Request Object * @param req - Request Object - Request Object
* @param uriInfo - Http UriInfo * @param uriInfo - Http UriInfo
* @param headers Http Headers HttpHeaders * @param headers Http Headers HttpHeaders
@ -91,11 +92,12 @@ public interface Volume {
* Params : * Params :
* Owner - Specifies the name of the owner * Owner - Specifies the name of the owner
* Quota - Specifies the Maximum usable size by the user * Quota - Specifies the Maximum usable size by the user
* the valid parameters for quota are <int>(<MB|GB|TB>) | remove. * the valid parameters for quota are {@literal <int>(<MB|GB|TB>)} | remove.
* For example 10GB or "remove". * For example 10GB or "remove".
* *
* @param volume Volume Name, this has to be unique at Ozone Level * @param volume Volume Name, this has to be unique at Ozone Level
* @param quota Quota for this Storage Volume - <int>(<MB|GB|TB>) | remove * @param quota Quota for this Storage Volume - {@literal <int>(<MB|GB|TB>)}
* | remove
* @param req - Request Object - Request Object * @param req - Request Object - Request Object
* @param headers Http Headers HttpHeaders * @param headers Http Headers HttpHeaders
* *

View File

@ -72,7 +72,7 @@ public interface KeyManager {
* *
* @param args the args of the key provided by client. * @param args the args of the key provided by client.
* @return a OpenKeySession instance client uses to talk to container. * @return a OpenKeySession instance client uses to talk to container.
* @throws Exception * @throws IOException
*/ */
OpenKeySession openKey(OmKeyArgs args) throws IOException; OpenKeySession openKey(OmKeyArgs args) throws IOException;

View File

@ -33,6 +33,7 @@ import static org.apache.hadoop.ozone.OzoneConsts.OM_USER_PREFIX;
* We also maintain lock hierarchy, based on the weight. * We also maintain lock hierarchy, based on the weight.
* *
* <table> * <table>
* <caption></caption>
* <tr> * <tr>
* <td><b> WEIGHT </b></td> <td><b> LOCK </b></td> * <td><b> WEIGHT </b></td> <td><b> LOCK </b></td>
* </tr> * </tr>
@ -53,9 +54,9 @@ import static org.apache.hadoop.ozone.OzoneConsts.OM_USER_PREFIX;
* <p> * <p>
* For example: * For example:
* <br> * <br>
* -> acquireVolumeLock (will work)<br> * {@literal ->} acquireVolumeLock (will work)<br>
* +-> acquireBucketLock (will work)<br> * {@literal +->} acquireBucketLock (will work)<br>
* +--> acquireUserLock (will throw Exception)<br> * {@literal +-->} acquireUserLock (will throw Exception)<br>
* </p> * </p>
* <br> * <br>
* To acquire a user lock you should not hold any Volume/Bucket lock. Similarly * To acquire a user lock you should not hold any Volume/Bucket lock. Similarly

View File

@ -41,7 +41,7 @@ import java.io.PrintWriter;
* *
* The return format is of JSON and in the form * The return format is of JSON and in the form
* <p> * <p>
* <code><pre> * <pre><code>
* { * {
* "services" : [ * "services" : [
* { * {
@ -54,7 +54,7 @@ import java.io.PrintWriter;
* } * }
* ] * ]
* } * }
* </pre></code> * </code></pre>
* <p> * <p>
* *
*/ */

View File

@ -40,7 +40,7 @@ import java.util.List;
* This tool generates an ozone-site.xml with minimally required configs. * This tool generates an ozone-site.xml with minimally required configs.
* This tool can be invoked as follows:<br> * This tool can be invoked as follows:<br>
* <ul> * <ul>
* <li>ozone genconf <Path to output file></li> * <li>ozone genconf {@literal <Path to output file>}</li>
* <li>ozone genconf --help</li> * <li>ozone genconf --help</li>
* <li>ozone genconf -h</li> * <li>ozone genconf -h</li>
* </ul> * </ul>