ATLAS-4922: Addressed PR comments for Client-side Changes & Renamed Constants

Author: DishaTalreja3

atlas-examples/sample-app/src/main/java/org/apache/atlas/examples/sampleapp/AsyncImportApiExample.java

@@ -76,7 +76,10 @@ public void testGetAsyncImportStatus() throws Exception {
         try {
             PList<AsyncImportStatus> statuses = client.getAsyncImportStatus();
 
-            System.out.println("All Async Import Statuses: " + statuses);
+            System.out.println("All Async Import Statuses:");
+            for (AsyncImportStatus status : statuses.getList()) {
+                System.out.println(status);
+            }
         } catch (AtlasServiceException e) {
             System.err.println("Failed to fetch all async import statuses: " + e.getMessage());
 

client/client-v2/src/main/java/org/apache/atlas/AtlasClientV2.java

@@ -150,8 +150,6 @@ public class AtlasClientV2 extends AtlasBaseClient {
     // Async Import APIs
     private static final String ASYNC_IMPORT_URI              = BASE_URI + "admin/async/import";
     private static final String ASYNC_IMPORT_STATUS_URI       = BASE_URI + "admin/async/import/status";
-    private static final String ASYNC_IMPORT_STATUS_BY_ID_URI = BASE_URI + "admin/async/import/status/";
-    private static final String ASYNC_IMPORT_BY_ID_URI        = BASE_URI + "admin/async/import/";
 
     private static final String IMPORT_REQUEST_PARAMTER = "request";
     private static final String IMPORT_DATA_PARAMETER   = "data";
@@ -1060,7 +1058,15 @@ public AtlasAsyncImportRequest importAsync(AtlasImportRequest request, InputStre
     }
 
     public PList<AsyncImportStatus> getAsyncImportStatus() throws AtlasServiceException {
-        return callAPI(API_V2.ASYNC_IMPORT_STATUS_ALL, new GenericType<PList<AsyncImportStatus>>() {}, null);
+        return getAsyncImportStatus(0, 50);
+    }
+
+    public PList<AsyncImportStatus> getAsyncImportStatus(Integer offset, Integer limit) throws AtlasServiceException {
+        MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
+        queryParams.add("offset", String.valueOf(offset));
+        queryParams.add("limit", String.valueOf(limit));
+
+        return callAPI(API_V2.ASYNC_IMPORT_STATUS_ALL, new GenericType<PList<AsyncImportStatus>>() {}, queryParams);
     }
 
     public AtlasAsyncImportRequest getAsyncImportStatusById(String importId) throws AtlasServiceException {
@@ -1298,8 +1304,8 @@ public static class API_V2 extends API {
         // Async Import APIs
         public static final API_V2 ASYNC_IMPORT              = new API_V2(ASYNC_IMPORT_URI, HttpMethod.POST, Response.Status.OK, MediaType.MULTIPART_FORM_DATA, MediaType.APPLICATION_JSON);
         public static final API_V2 ASYNC_IMPORT_STATUS_ALL   = new API_V2(ASYNC_IMPORT_STATUS_URI, HttpMethod.GET, Response.Status.OK);
-        public static final API_V2 ASYNC_IMPORT_STATUS_BY_ID = new API_V2(ASYNC_IMPORT_STATUS_BY_ID_URI + "%s", HttpMethod.GET, Response.Status.OK);
-        public static final API_V2 ABORT_ASYNC_IMPORT_BY_ID = new API_V2(ASYNC_IMPORT_BY_ID_URI + "%s", HttpMethod.DELETE, Response.Status.NO_CONTENT);
+        public static final API_V2 ASYNC_IMPORT_STATUS_BY_ID = new API_V2(ASYNC_IMPORT_STATUS_URI + "/%s", HttpMethod.GET, Response.Status.OK);
+        public static final API_V2 ABORT_ASYNC_IMPORT_BY_ID = new API_V2(ASYNC_IMPORT_URI + "/%s", HttpMethod.DELETE, Response.Status.NO_CONTENT);
 
         // Glossary APIs
         public static final API_V2 GET_ALL_GLOSSARIES              = new API_V2(GLOSSARY_URI, HttpMethod.GET, Response.Status.OK);

common/src/main/java/org/apache/atlas/repository/Constants.java

@@ -233,7 +233,7 @@ public final class Constants {
      * Atlas Async Import vertex property keys.
      */
     public static final String ATLAS_ASYNC_IMPORT_PREFIX                            = INTERNAL_PROPERTY_KEY_PREFIX + "AtlasAsyncImportRequest.";
-    public static final String PROPERTY_KEY_RECEIVED_AT                             = encodePropertyKey(ATLAS_ASYNC_IMPORT_PREFIX + "receivedAt");
+    public static final String PROPERTY_KEY_RECEIVED_TIME                            = encodePropertyKey(ATLAS_ASYNC_IMPORT_PREFIX + "receivedTime");
     public static final String PROPERTY_KEY_ASYNC_IMPORT_STATUS                     = encodePropertyKey(ATLAS_ASYNC_IMPORT_PREFIX + "status");
     public static final String PROPERTY_KEY_ASYNC_IMPORT_ID                         = encodePropertyKey(ATLAS_ASYNC_IMPORT_PREFIX + "importId");
 

intg/src/main/java/org/apache/atlas/model/impexp/AsyncImportStatus.java

@@ -63,4 +63,14 @@ public String getImportRequestReceivedTime() {
     public String getImportRequestUser() {
         return importRequestUser;
     }
+
+    @Override
+    public String toString() {
+        return "AsyncImportStatus{" +
+                "importId='" + importId + '\'' +
+                ", status='" + status + '\'' +
+                ", importRequestReceivedTime='" + importRequestReceivedTime + '\'' +
+                ", importRequestUser='" + importRequestUser + '\'' +
+                '}';
+    }
 }

repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasGraphUtilsV2.java

@@ -67,7 +67,7 @@
 import static org.apache.atlas.repository.Constants.INDEX_SEARCH_VERTEX_PREFIX_DEFAULT;
 import static org.apache.atlas.repository.Constants.INDEX_SEARCH_VERTEX_PREFIX_PROPERTY;
 import static org.apache.atlas.repository.Constants.PROPAGATED_CLASSIFICATION_NAMES_KEY;
-import static org.apache.atlas.repository.Constants.PROPERTY_KEY_RECEIVED_AT;
+import static org.apache.atlas.repository.Constants.PROPERTY_KEY_RECEIVED_TIME;
 import static org.apache.atlas.repository.Constants.RELATIONSHIP_TYPE_PROPERTY_KEY;
 import static org.apache.atlas.repository.Constants.STATE_PROPERTY_KEY;
 import static org.apache.atlas.repository.Constants.SUPER_TYPES_PROPERTY_KEY;
@@ -565,7 +565,7 @@ public static List<String> findEntityPropertyValuesByTypeAndAttributes(AtlasGrap
             }
         }
 
-        query.orderBy(PROPERTY_KEY_RECEIVED_AT, ASC);
+        query.orderBy(PROPERTY_KEY_RECEIVED_TIME, ASC);
 
         List<String> propertyValues = new ArrayList<>();