diff --git a/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java b/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java index 2101d65e3..15eb8d510 100644 --- a/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java +++ b/cli/src/main/java/org/apache/falcon/cli/FalconExtensionCLI.java @@ -152,10 +152,7 @@ void extensionCommand(CommandLine commandLine, FalconClient client) throws IOExc } else if (optionsList.contains(FalconCLIConstants.LIST_OPT)) { validateRequiredParameter(extensionName, EXTENSION_NAME_OPT); ExtensionJobList jobs = client.listExtensionJob(extensionName, doAsUser, - commandLine.getOptionValue(FalconCLIConstants.SORT_ORDER_OPT), - commandLine.getOptionValue(FalconCLIConstants.OFFSET_OPT), - commandLine.getOptionValue(FalconCLIConstants.NUM_RESULTS_OPT), - commandLine.getOptionValue(FalconCLIConstants.FIELDS_OPT)); + commandLine.getOptionValue(FalconCLIConstants.SORT_ORDER_OPT)); result = jobs != null ? jobs.toString() : "No extension job (" + extensionName + ") found."; } else if (optionsList.contains(INSTANCES_OPT)) { validateRequiredParameter(jobName, JOB_NAME_OPT); diff --git a/client/src/main/java/org/apache/falcon/client/FalconClient.java b/client/src/main/java/org/apache/falcon/client/FalconClient.java index ab98f4aa6..aca83e3d2 100644 --- a/client/src/main/java/org/apache/falcon/client/FalconClient.java +++ b/client/src/main/java/org/apache/falcon/client/FalconClient.java @@ -1247,15 +1247,11 @@ public APIResult deleteExtensionJob(final String jobName, final String doAsUser) } public ExtensionJobList listExtensionJob(final String extensionName, final String doAsUser, - final String sortOrder, final String offset, - final String numResults, final String fields) { + final String sortOrder) { ClientResponse clientResponse = new ResourceBuilder() .path(ExtensionOperations.LIST.path, extensionName) .addQueryParam(DO_AS_OPT, doAsUser) - .addQueryParam(FIELDS, fields) .addQueryParam(SORT_ORDER, sortOrder) - .addQueryParam(OFFSET, offset) - .addQueryParam(NUM_RESULTS, numResults) .call(ExtensionOperations.LIST); return getResponse(ExtensionJobList.class, clientResponse); } diff --git a/common-types/src/main/java/org/apache/falcon/resource/ExtensionJobList.java b/common-types/src/main/java/org/apache/falcon/resource/ExtensionJobList.java index ca031b5cd..244ea66d8 100644 --- a/common-types/src/main/java/org/apache/falcon/resource/ExtensionJobList.java +++ b/common-types/src/main/java/org/apache/falcon/resource/ExtensionJobList.java @@ -33,10 +33,10 @@ public class ExtensionJobList { @XmlElement - public int numJobs; + int numJobs; @XmlElementWrapper(name = "jobs") - public List job; + public List job; public ExtensionJobList() { numJobs = 0; @@ -45,54 +45,21 @@ public ExtensionJobList() { public ExtensionJobList(int numJobs) { this.numJobs = numJobs; - job = new ArrayList(); + job = new ArrayList<>(); } - public ExtensionJobList(int numJobs, List elements) { + public ExtensionJobList(int numJobs, List extensionJobNames) { this.numJobs = numJobs; - this.job = elements; - } - - public void addJob(JobElement element) { - job.add(element); + this.job = extensionJobNames; } @Override public String toString() { - StringBuilder buffer = new StringBuilder(); - buffer.append(numJobs + "\n\n"); - for (JobElement element : job) { - buffer.append(element.toString()); - } - return buffer.toString(); - } - - /** - * Element for a job. - */ - public static class JobElement { - @XmlElement - public String jobName; - - @XmlElement - public EntityList jobEntities; - - public JobElement() { - jobName = null; - jobEntities = null; - } - - public JobElement(String name, EntityList entities) { - jobName = name; - jobEntities = entities; - } - - @Override - public String toString() { - StringBuilder buffer = new StringBuilder(); - buffer.append("Job: " + jobName + ", #. entities: "); - buffer.append(jobEntities.toString() + "\n"); - return buffer.toString(); + StringBuilder builder = new StringBuilder(); + builder.append(numJobs).append("\n"); + for (String extensionJobNames : job) { + builder.append(extensionJobNames); } + return builder.toString(); } } diff --git a/common/src/main/java/org/apache/falcon/persistence/ExtensionJobsBean.java b/common/src/main/java/org/apache/falcon/persistence/ExtensionJobsBean.java index b6ac79d5f..acb5cf4b6 100644 --- a/common/src/main/java/org/apache/falcon/persistence/ExtensionJobsBean.java +++ b/common/src/main/java/org/apache/falcon/persistence/ExtensionJobsBean.java @@ -45,7 +45,7 @@ @NamedQuery(name = PersistenceConstants.GET_ALL_EXTENSION_JOBS, query = "select OBJECT(a) from ExtensionJobsBean a "), @NamedQuery(name = PersistenceConstants.DELETE_EXTENSION_JOB, query = "delete from ExtensionJobsBean a where a.jobName = :jobName "), @NamedQuery(name = PersistenceConstants.GET_EXTENSION_JOB, query = "select OBJECT(a) from ExtensionJobsBean a where a.jobName = :jobName"), - @NamedQuery(name = PersistenceConstants.GET_JOBS_FOR_AN_EXTENSION, query = "select OBJECT(a) from ExtensionJobsBean a where a.extensionName = :extensionName") + @NamedQuery(name = PersistenceConstants.GET_JOBS_FOR_AN_EXTENSION, query = "select a.jobName from ExtensionJobsBean a where a.extensionName = :extensionName") }) //RESUME CHECKSTYLE CHECK LineLengthCheck public class ExtensionJobsBean { diff --git a/docs/src/site/twiki/falconcli/ExtensionList.twiki b/docs/src/site/twiki/falconcli/ExtensionList.twiki index 8ddf5737f..e55f88b62 100644 --- a/docs/src/site/twiki/falconcli/ExtensionList.twiki +++ b/docs/src/site/twiki/falconcli/ExtensionList.twiki @@ -8,9 +8,9 @@ Usage: $FALCON_HOME/bin/falcon extension -list -extensionName <> Optional Args : -doAs <> --sortOrder <> -offset <> -numResults <> -fields <> +-sortOrder <> Parameters and examples described here. Example: -$FALCON_HOME/bin/falcon extension -list -extensionName hdfs-mirroring -offset 0 -numResults 10 +$FALCON_HOME/bin/falcon extension -list -extensionName hdfs-mirroring diff --git a/docs/src/site/twiki/restapi/ExtensionList.twiki b/docs/src/site/twiki/restapi/ExtensionList.twiki index dcd4d8d30..0a43a80f8 100644 --- a/docs/src/site/twiki/restapi/ExtensionList.twiki +++ b/docs/src/site/twiki/restapi/ExtensionList.twiki @@ -10,18 +10,15 @@ List jobs generated from an extension. ---++ Parameters * :extension-name Name of the extension. * sortOrder Sort order by job name. Valid options: "asc" (default) and "desc". - * offset Show results from the offset. Default is 0. - * numResults Number of results to show per request. Default is 10. - * fields Output fields separated by commas. Valid options: STATUS, TAGS, PIPELINES, CLUSTERS. * doAs Impersonate the user. ---++ Results -Total number of results and a list of jobs generated from the extension, followed by the associated entities. +Total number of results and a list of jobs implementing the given extension. ---++ Examples ---+++ Rest Call -GET http://localhost:15000/api/extensions/list/billCollection?fields=status,clusters,tags +GET http://localhost:15000/api/extensions/list/billCollection ---+++ Result @@ -29,42 +26,8 @@ GET http://localhost:15000/api/extensions/list/billCollection?fields=status,clus "numJobs":"2", "jobs":{ "job": [ - { - "jobName": "daily-health-bill", - "jobEntities: { - "totalResults": "2", - "entity": [ - { - "type":"FEED", - "name":"SampleUSHealthBill", - "status":"SUBMITTED”, - "tags":{"tag":["related=ushealthcare","department=billingDepartment","_falcon_extension_name=billCoollection","_falcon_extension_job=daily-health-bill"]}, - "clusters": {"cluster":["SampleCluster1","primaryCluster”]} - }, - { - "type":"PROCESS”, - "name":"SampleBillPay”, - "status":"RUNNING”, - "tags":{"tag":["related=healthcare","department=billingDepartment","_falcon_extension_name=billCoollection","_falcon_extension_job=daily-health-bill"]}, - "clusters":{"cluster":"primaryCluster”} - } - ] - } - }, - { - "jobName": "fsa-bill", - "jobEntities": { - "totalResults": "1", - "entity": - { - "type":"PROCESS”, - "name":"FSAPay”, - "status":"RUNNING”, - "tags”:{"tag":["related=healthcare","department=billingDepartment","_falcon_extension_name=billCollection","_falcon_extension_job=fsa-bill"]}, - "clusters":{"cluster":"primaryCluster”} - } - } - } + {"daily-health-bill"}, + {"fsa-bill"} ] } } diff --git a/extensions/src/main/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStore.java b/extensions/src/main/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStore.java index b47766c59..18c854076 100644 --- a/extensions/src/main/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStore.java +++ b/extensions/src/main/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStore.java @@ -27,6 +27,7 @@ import javax.persistence.EntityManager; import javax.persistence.Query; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -74,10 +75,7 @@ public Boolean checkIfExtensionExists(String extensionName) { } finally { commitAndCloseTransaction(entityManager); } - if (resultSize > 0){ - return true; - } - return false; + return resultSize > 0; } public Boolean checkIfExtensionJobExists(String jobName) { @@ -91,10 +89,7 @@ public Boolean checkIfExtensionJobExists(String jobName) { } finally { commitAndCloseTransaction(entityManager); } - if (resultSize > 0){ - return true; - } - return false; + return resultSize > 0; } public List getAllExtensions() { @@ -102,7 +97,7 @@ public List getAllExtensions() { beginTransaction(entityManager); Query q = entityManager.createNamedQuery(PersistenceConstants.GET_ALL_EXTENSIONS); try { - return (List)q.getResultList(); + return (List) q.getResultList(); } finally { commitAndCloseTransaction(entityManager); } @@ -113,7 +108,7 @@ public void deleteExtensionsOfType(ExtensionType extensionType) { beginTransaction(entityManager); Query q = entityManager.createNamedQuery(PersistenceConstants.DELETE_EXTENSIONS_OF_TYPE); q.setParameter(EXTENSION_TYPE, extensionType); - try{ + try { q.executeUpdate(); } finally { commitAndCloseTransaction(entityManager); @@ -128,7 +123,7 @@ public ExtensionBean getDetail(String extensionName) { try { List resultList = q.getResultList(); if (!resultList.isEmpty()) { - return (ExtensionBean)resultList.get(0); + return (ExtensionBean) resultList.get(0); } else { return null; } @@ -137,24 +132,26 @@ public ExtensionBean getDetail(String extensionName) { } } - public List getJobsForAnExtension(String extensionName) { + public List getJobsForAnExtension(String extensionName) { EntityManager entityManager = getEntityManager(); beginTransaction(entityManager); Query query = entityManager.createNamedQuery(PersistenceConstants.GET_JOBS_FOR_AN_EXTENSION); query.setParameter(EXTENSION_NAME, extensionName); + List jobNames = new ArrayList<>(); try { - return (List)query.getResultList(); + jobNames.addAll((List) query.getResultList()); } finally { commitAndCloseTransaction(entityManager); } + return jobNames; } - public void deleteExtension(String extensionName){ + public void deleteExtension(String extensionName) { EntityManager entityManager = getEntityManager(); beginTransaction(entityManager); Query q = entityManager.createNamedQuery(PersistenceConstants.DELETE_EXTENSION); q.setParameter(EXTENSION_NAME, extensionName); - try{ + try { q.executeUpdate(); } finally { commitAndCloseTransaction(entityManager); @@ -165,7 +162,7 @@ public void storeExtensionJob(String jobName, String extensionName, List byte[] config) { ExtensionMetaStore metaStore = ExtensionStore.getMetaStore(); boolean alreadySubmitted = false; - if (metaStore.getExtensionJobDetails(jobName) != null){ + if (metaStore.getExtensionJobDetails(jobName) != null) { alreadySubmitted = true; } ExtensionJobsBean extensionJobsBean = new ExtensionJobsBean(); @@ -195,7 +192,7 @@ public void deleteExtensionJob(String jobName) { beginTransaction(entityManager); Query query = entityManager.createNamedQuery(PersistenceConstants.DELETE_EXTENSION_JOB); query.setParameter(JOB_NAME, jobName); - try{ + try { query.executeUpdate(); } finally { commitAndCloseTransaction(entityManager); @@ -237,7 +234,7 @@ public ExtensionJobsBean getExtensionJobDetails(String jobName) { } } - public List getAllExtensionJobs() { + List getAllExtensionJobs() { EntityManager entityManager = getEntityManager(); beginTransaction(entityManager); Query q = entityManager.createNamedQuery(PersistenceConstants.GET_ALL_EXTENSION_JOBS); diff --git a/extensions/src/main/java/org/apache/falcon/extensions/store/ExtensionStore.java b/extensions/src/main/java/org/apache/falcon/extensions/store/ExtensionStore.java index c3b4feb49..c50d6dea5 100644 --- a/extensions/src/main/java/org/apache/falcon/extensions/store/ExtensionStore.java +++ b/extensions/src/main/java/org/apache/falcon/extensions/store/ExtensionStore.java @@ -28,7 +28,6 @@ import org.apache.falcon.extensions.jdbc.ExtensionMetaStore; import org.apache.falcon.hadoop.HadoopClientFactory; import org.apache.falcon.persistence.ExtensionBean; -import org.apache.falcon.persistence.ExtensionJobsBean; import org.apache.falcon.util.StartupProperties; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; @@ -383,17 +382,6 @@ public boolean isExtensionStoreInitialized() { return (storePath != null); } - public List getJobsForAnExtension(final String extensionName) throws FalconException { - List extensionJobs = metaStore.getJobsForAnExtension(extensionName); - List extensionJobNames = new ArrayList<>(); - if (null != extensionJobs && !extensionJobs.isEmpty()) { - for (ExtensionJobsBean extensionJobsBean : extensionJobs) { - extensionJobNames.add(extensionJobsBean.getJobName()); - } - } - return extensionJobNames; - } - public String updateExtensionStatus(final String extensionName, String currentUser, ExtensionStatus status) throws FalconException { validateStatusChange(extensionName, currentUser); diff --git a/extensions/src/test/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStoreTest.java b/extensions/src/test/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStoreTest.java index e3327e8a1..4c494457e 100644 --- a/extensions/src/test/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStoreTest.java +++ b/extensions/src/test/java/org/apache/falcon/extensions/jdbc/ExtensionMetaStoreTest.java @@ -45,7 +45,7 @@ public class ExtensionMetaStoreTest extends AbstractTestExtensionStore { private static ExtensionMetaStore stateStore; @BeforeClass - public void setup() throws Exception{ + public void setup() throws Exception { initExtensionStore(); this.dfsCluster = EmbeddedCluster.newCluster("testCluster"); this.conf = dfsCluster.getConf(); @@ -58,7 +58,7 @@ public void init() { } @Test - public void testExtension(){ + public void testExtension() { //insert stateStore.storeExtensionBean("test1", "test_location", ExtensionType.TRUSTED, "test_description", "falconUser"); @@ -86,6 +86,8 @@ public void testExtensionJob() { //storing again to check for entity manager merge to let submission go forward. stateStore.storeExtensionJob("job1", "test2", feeds, processes, config); + Assert.assertEquals(stateStore.getJobsForAnExtension("test2").size(), 1); + Assert.assertEquals(stateStore.getJobsForAnExtension("test2").get(0), "job1"); Assert.assertEquals(stateStore.getAllExtensionJobs().size(), 1); Assert.assertEquals(stateStore.getExtensionJobDetails("job1").getFeeds().get(0), "testFeed"); stateStore.deleteExtensionJob("job1"); diff --git a/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java b/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java index 8ada57652..c7da6e351 100644 --- a/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java +++ b/prism/src/main/java/org/apache/falcon/resource/AbstractExtensionManager.java @@ -113,7 +113,7 @@ public APIResult deleteExtensionMetadata(String extensionName) { } private void canDeleteExtension(String extensionName) throws FalconException { - ExtensionStore metaStore = ExtensionStore.get(); + ExtensionMetaStore metaStore = ExtensionStore.getMetaStore(); List extensionJobs = metaStore.getJobsForAnExtension(extensionName); if (!extensionJobs.isEmpty()) { LOG.error("Extension:{} cannot be unregistered as {} are instances of the extension", extensionName, @@ -190,7 +190,7 @@ protected String enableExtension(String extensionName, String currentUser) { private JSONObject buildExtensionDetailResult(final String extensionName) throws FalconException { ExtensionMetaStore metaStore = ExtensionStore.getMetaStore(); - if (!metaStore.checkIfExtensionExists(extensionName)){ + if (!metaStore.checkIfExtensionExists(extensionName)) { throw new ValidationException("No extension resources found for " + extensionName); } @@ -247,12 +247,22 @@ protected static void checkIfExtensionIsEnabled(String extensionName) { } } + protected static void checkIfExtensionExists(String extensionName) { + ExtensionMetaStore metaStore = ExtensionStore.getMetaStore(); + ExtensionBean extensionBean = metaStore.getDetail(extensionName); + if (extensionBean == null) { + LOG.error("Extension not found: " + extensionName); + throw FalconWebException.newAPIException("Extension not found:" + extensionName, + Response.Status.NOT_FOUND); + } + } + protected static void checkIfExtensionJobNameExists(String jobName, String extensionName) { ExtensionMetaStore metaStore = ExtensionStore.getMetaStore(); ExtensionJobsBean extensionJobsBean = metaStore.getExtensionJobDetails(jobName); if (extensionJobsBean != null && !extensionJobsBean.getExtensionName().equals(extensionName)) { LOG.error("Extension job with name: " + extensionName + " already exists."); - throw FalconWebException.newAPIException("Extension job with name: " + extensionName + " already exists.", + throw FalconWebException.newAPIException("Extension job with name: " + jobName + " already exists.", Response.Status.INTERNAL_SERVER_ERROR); } } diff --git a/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java b/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java index 100888496..efb548936 100644 --- a/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java +++ b/prism/src/main/java/org/apache/falcon/resource/proxy/ExtensionManagerProxy.java @@ -40,7 +40,6 @@ import org.apache.falcon.resource.InstancesResult; import org.apache.falcon.resource.APIResult; import org.apache.falcon.resource.AbstractExtensionManager; -import org.apache.falcon.resource.EntityList; import org.apache.falcon.resource.ExtensionInstanceList; import org.apache.falcon.resource.ExtensionJobList; import org.apache.falcon.security.CurrentUser; @@ -65,7 +64,6 @@ import javax.xml.bind.JAXBException; import java.util.Collections; import java.util.ArrayList; -import java.util.HashMap; import java.util.HashSet; import java.util.Arrays; import java.util.Set; @@ -86,7 +84,6 @@ public class ExtensionManagerProxy extends AbstractExtensionManager { public static final Logger LOG = LoggerFactory.getLogger(ExtensionManagerProxy.class); - private static final String TAG_PREFIX_EXTENSION_NAME = "_falcon_extension_name="; private static final String ASCENDING_SORT_ORDER = "asc"; private static final String DESCENDING_SORT_ORDER = "desc"; private Extension extension = new Extension(); @@ -97,31 +94,19 @@ public class ExtensionManagerProxy extends AbstractExtensionManager { private EntityProxyUtil entityProxyUtil = new EntityProxyUtil(); private static final String EXTENSION_PROPERTY_JSON_SUFFIX = "-properties.json"; + //SUSPEND CHECKSTYLE CHECK ParameterNumberCheck @GET @Path("list/{extension-name}") @Produces({MediaType.TEXT_XML, MediaType.APPLICATION_JSON}) public ExtensionJobList getExtensionJobs( @PathParam("extension-name") String extensionName, - @DefaultValue("") @QueryParam("fields") String fields, @DefaultValue(ASCENDING_SORT_ORDER) @QueryParam("sortOrder") String sortOrder, - @DefaultValue("0") @QueryParam("offset") Integer offset, - @QueryParam("numResults") Integer resultsPerPage, @DefaultValue("") @QueryParam("doAs") String doAsUser) { checkIfExtensionServiceIsEnabled(); - resultsPerPage = resultsPerPage == null ? getDefaultResultsPerPage() : resultsPerPage; + checkIfExtensionExists(extensionName); try { - // get filtered entities - List entities = getEntityList("", "", "", TAG_PREFIX_EXTENSION_NAME + extensionName, "", doAsUser); - if (entities.isEmpty()) { - return new ExtensionJobList(0); - } - - // group entities by extension job name - Map> groupedEntities = groupEntitiesByJob(entities); - - // sort by extension job name - List jobNames = new ArrayList<>(groupedEntities.keySet()); + List jobNames = ExtensionStore.getMetaStore().getJobsForAnExtension(extensionName); switch (sortOrder.toLowerCase()) { case DESCENDING_SORT_ORDER: Collections.sort(jobNames, Collections.reverseOrder(String.CASE_INSENSITIVE_ORDER)); @@ -129,19 +114,8 @@ public ExtensionJobList getExtensionJobs( default: Collections.sort(jobNames, String.CASE_INSENSITIVE_ORDER); } - - // pagination and format output - int pageCount = getRequiredNumberOfResults(jobNames.size(), offset, resultsPerPage); - HashSet fieldSet = new HashSet<>(Arrays.asList(fields.toUpperCase().split(","))); - ExtensionJobList jobList = new ExtensionJobList(pageCount); - for (int i = offset; i < offset + pageCount; i++) { - String jobName = jobNames.get(i); - List jobEntities = groupedEntities.get(jobName); - EntityList entityList = new EntityList(buildEntityElements(fieldSet, jobEntities), jobEntities.size()); - jobList.addJob(new ExtensionJobList.JobElement(jobName, entityList)); - } - return jobList; - } catch (FalconException | IOException e) { + return new ExtensionJobList(jobNames.size(), jobNames); + } catch (Throwable e) { LOG.error("Failed to get extension job list of " + extensionName + ": ", e); throw FalconWebException.newAPIException(e, Response.Status.INTERNAL_SERVER_ERROR); } @@ -783,18 +757,6 @@ private List generateEntities(String extensionName, InputStream configSt return entities; } - private Map> groupEntitiesByJob(List entities) { - Map> groupedEntities = new HashMap<>(); - for (Entity entity : entities) { - String jobName = getJobNameFromTag(entity.getTags()); - if (!groupedEntities.containsKey(jobName)) { - groupedEntities.put(jobName, new ArrayList()); - } - groupedEntities.get(jobName).add(entity); - } - return groupedEntities; - } - private static void checkIfExtensionServiceIsEnabled() { if (!Services.get().isRegistered(ExtensionService.SERVICE_NAME)) { LOG.error(ExtensionService.SERVICE_NAME + " is not enabled."); @@ -802,6 +764,4 @@ private static void checkIfExtensionServiceIsEnabled() { ExtensionService.SERVICE_NAME + " is not enabled.", Response.Status.NOT_FOUND); } } - - } diff --git a/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java b/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java index 349cfec2c..a4a207c6b 100644 --- a/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java +++ b/webapp/src/test/java/org/apache/falcon/resource/ExtensionManagerIT.java @@ -100,8 +100,6 @@ public void testTrustedExtensionJob() throws Exception { // validate job list results ExtensionJobList jobs = context.getExtensionJobs("hdfs-mirroring", null, null, null, null, null); Assert.assertEquals(jobs.numJobs, 2); - Assert.assertEquals(jobs.job.get(0).jobName, JOB_NAME_1); - Assert.assertEquals(jobs.job.get(1).jobName, JOB_NAME_2); // list extension job instances System.out.println("extension -instances -jobName " + JOB_NAME_1 + " -fields status,clusters,tags"); diff --git a/webapp/src/test/java/org/apache/falcon/resource/TestContext.java b/webapp/src/test/java/org/apache/falcon/resource/TestContext.java index fd4d36494..48df7fbbb 100644 --- a/webapp/src/test/java/org/apache/falcon/resource/TestContext.java +++ b/webapp/src/test/java/org/apache/falcon/resource/TestContext.java @@ -294,9 +294,6 @@ public ExtensionJobList getExtensionJobs(String extensionName, String fields, St String resultsPerPage, String doAsUser) { WebResource resource = this.service.path("api/extension/list/" + extensionName); resource = addQueryParam(resource, "doAs", doAsUser); - resource = addQueryParam(resource, "fields", fields); - resource = addQueryParam(resource, "sortOrder", sortOrder); - resource = addQueryParam(resource, "offset", offset); resource = addQueryParam(resource, "numResults", resultsPerPage); ClientResponse response = resource.header("Cookie", AUTH_COOKIE_EQ + authenticationToken) .accept(MediaType.APPLICATION_JSON).type(MediaType.TEXT_XML)