Skip to content

Commit

Permalink
changes for review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
PracheerAgarwal-zz committed Jan 23, 2017
1 parent c38c51b commit 76215d7
Showing 1 changed file with 15 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -146,29 +146,8 @@ private JSONObject buildExtensionJobDetailResult(final String jobName) throws Fa
try {
detailsObject.put(JOB_NAME, jobsBean.getJobName());
detailsObject.put(EXTENSION_NAME, jobsBean.getExtensionName());

JSONObject feedsObject = new JSONObject();
for (String feed : jobsBean.getFeeds()) {
try {
EntityUtil.getEntity(EntityType.FEED, feed);
} catch (EntityNotRegisteredException e) {
feedsObject.put(feed, ENTITY_NOT_EXISTS_STATUS);
}
feedsObject.put(feed, ENTITY_EXISTS_STATUS);
}
detailsObject.put(FEEDS, feedsObject);

JSONObject processObject = new JSONObject();
for (String process : jobsBean.getProcesses()) {
try {
EntityUtil.getEntity(EntityType.PROCESS, process);
} catch (EntityNotRegisteredException e) {
processObject.put(process, ENTITY_NOT_EXISTS_STATUS);
}
processObject.put(process, ENTITY_EXISTS_STATUS);
}
detailsObject.put(PROCESSES, processObject);

detailsObject.put(FEEDS, getEntitiesStatus(jobsBean.getFeeds(), EntityType.FEED));
detailsObject.put(PROCESSES, getEntitiesStatus(jobsBean.getProcesses(), EntityType.PROCESS));
detailsObject.put(CONFIG, jobsBean.getConfig());
detailsObject.put(CREATION_TIME, jobsBean.getCreationTime());
detailsObject.put(LAST_UPDATE_TIME, jobsBean.getLastUpdatedTime());
Expand Down Expand Up @@ -281,4 +260,17 @@ protected static void checkIfExtensionJobNameExists(String jobName, String exten
Response.Status.INTERNAL_SERVER_ERROR);
}
}

private JSONObject getEntitiesStatus(List<String> entities, EntityType type) throws JSONException, FalconException {
JSONObject entityObject = new JSONObject();
for (String entity : entities) {
try {
EntityUtil.getEntity(type, entity);
} catch (EntityNotRegisteredException e) {
entityObject.put(entity, ENTITY_NOT_EXISTS_STATUS);
}
entityObject.put(entity, ENTITY_EXISTS_STATUS);
}
return entityObject;
}
}

0 comments on commit 76215d7

Please sign in to comment.