commit cc730a66f5f0784bd13005833267933827397fb3
author Jian Li <pyguni@gmail.com> Tue May 10 16:36:16 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Wed May 11 04:34:59 2016 +0000
tree 20568051815fa5a2e82c056430209c4079ce7b9a
parent 5617994076a5f5a90e8b5354316e36b9420a50d3

Clean up source code of REST API

- Add missing @Produces annotation
- Correct comments
- Restrict variable access level

Change-Id: I7f75650b83651248370e7781b1e8aec7eac2314c

web/api/src/main/java/org/onosproject/rest/resources/TenantWebResource.java

diff --git a/web/api/src/main/java/org/onosproject/rest/resources/TenantWebResource.java b/web/api/src/main/java/org/onosproject/rest/resources/TenantWebResource.java
index 83c6c4d..c9062c7 100755
--- a/web/api/src/main/java/org/onosproject/rest/resources/TenantWebResource.java
+++ b/web/api/src/main/java/org/onosproject/rest/resources/TenantWebResource.java
@@ -49,14 +49,14 @@
     private static final String INVALID_TENANTID = "Invalid tenant identifier ";
 
     @Context
-    UriInfo uriInfo;
+    private UriInfo uriInfo;
 
     private final VirtualNetworkAdminService vnetAdminService = get(VirtualNetworkAdminService.class);
 
     /**
-     * Returns all tenants.
+     * Returns all tenant identifiers.
      *
-     * @return 200 OK
+     * @return 200 OK with set of tenant identifiers
      * @onos.rsModel TenantIds
      */
     @GET
@@ -109,7 +109,7 @@
     }
 
     /**
-     * Get the tenant identifier from the JSON stream.
+     * Gets the tenant identifier from the JSON stream.
      *
      * @param stream TenantId JSON stream
      * @return TenantId
@@ -129,17 +129,16 @@
      * Get the matching tenant identifier from existing tenant identifiers in system.
      *
      * @param vnetAdminSvc virtual network administration service
-     * @param tidIn tenant identifier
+     * @param tidIn        tenant identifier
      * @return TenantId
      */
-     static TenantId getExistingTenantId(VirtualNetworkAdminService vnetAdminSvc,
-                                               TenantId tidIn) {
-        final TenantId resultTid = vnetAdminSvc
+    protected static TenantId getExistingTenantId(VirtualNetworkAdminService vnetAdminSvc,
+                                                TenantId tidIn) {
+        return vnetAdminSvc
                 .getTenantIds()
                 .stream()
                 .filter(tenantId -> tenantId.equals(tidIn))
                 .findFirst()
                 .orElseThrow(() -> new ItemNotFoundException(TENANTID_NOT_FOUND));
-        return resultTid;
     }
 }