github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-11 22:41:50 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2848: Sqoop2: RESTiliency: Simplify JobRequestHandler.getJobs similarly as was done for getLinks

Browse Source 
(Jarek Jarcec Cecho via Abraham Fine)
This commit is contained in:
Abraham Fine 2016-03-07 12:45:05 -08:00
parent dc39a5aafe
commit fd8299cba1
3 changed files with 105 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java
View File

@ -20,9 +20,11 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.Date;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.sqoop.audit.AuditLoggerManager;
import org.apache.sqoop.common.Direction;
@ -257,48 +259,35 @@ private JsonBean createUpdateJob(RequestContext ctx, boolean create) {
}
private JsonBean getJobs(RequestContext ctx) {
String connectorIdentifier = ctx.getLastURLElement();
JobBean jobBean;
String jobName = ctx.getLastURLElement();
List<MJob> jobs;
Locale locale = ctx.getAcceptLanguageHeader();
Repository repository = RepositoryManager.getInstance().getRepository();
// jobs by connector
if (ctx.getParameterValue(CONNECTOR_NAME_QUERY_PARAM) != null) {
connectorIdentifier = ctx.getParameterValue(CONNECTOR_NAME_QUERY_PARAM);
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(),
ctx.getRequest().getRemoteAddr(), "get", "jobsByConnector", connectorIdentifier);
List<MJob> jobList = repository.findJobsForConnector(connectorIdentifier);
// Authorization check
jobList = AuthorizationEngine.filterResource(ctx.getUserName(), MResource.TYPE.JOB, jobList);
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(), ctx.getRequest().getRemoteAddr(), "get", "job", jobName);
jobBean = createJobBean(jobList, locale);
} else
// all jobs in the system
if (ctx.getPath().contains(JOBS_PATH)
|| (ctx.getPath().contains(JOB_PATH) && connectorIdentifier.equals("all"))) {
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(),
ctx.getRequest().getRemoteAddr(), "get", "jobs", "all");
List<MJob> jobList = repository.findJobs();
if(jobName.equals("all")) { // Return all links (by perhaps only for given connector)
String connectorName = ctx.getParameterValue(CONNECTOR_NAME_QUERY_PARAM);
// Authorization check
jobList = AuthorizationEngine.filterResource(ctx.getUserName(), MResource.TYPE.JOB, jobList);
jobBean = createJobBean(jobList, locale);
if(StringUtils.isEmpty(connectorName)) {
jobs = repository.findJobs();
} else {
if(repository.findConnector(connectorName) == null) {
throw new SqoopException(ServerError.SERVER_0006, "Invalid connector: " + connectorName);
}
jobs = repository.findJobsForConnector(connectorName);
}
} else { // Return one specific job with name or id stored in identifier
MJob job = HandlerUtils.getJobFromIdentifier(jobName);
jobs = new LinkedList<>();
jobs.add(job);
}
// job by Id
else {
AuditLoggerManager.getInstance().logAuditEvent(ctx.getUserName(),
ctx.getRequest().getRemoteAddr(), "get", "job", connectorIdentifier);
MJob job = HandlerUtils.getJobFromIdentifier(connectorIdentifier);
String jobName = job.getName();
// Authorization check
jobs = AuthorizationEngine.filterResource(ctx.getUserName(), MResource.TYPE.JOB, jobs);
// Authorization check
AuthorizationEngine.readJob(ctx.getUserName(), jobName);
jobBean = createJobBean(Arrays.asList(job), locale);
}
return jobBean;
// And return resulting links
return createJobBean(jobs, locale);
}
private JobBean createJobBean(List<MJob> jobs, Locale locale) {

72
test/src/test/java/org/apache/sqoop/integration/server/rest/JobRestTest.java Normal file
View File

@ -0,0 +1,72 @@
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.sqoop.integration.server.rest;
import org.apache.sqoop.test.utils.ParametrizedUtils;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Factory;
import java.util.Iterator;
public class JobRestTest extends RestTest {
@BeforeMethod
public void setUp() {
createFirstJob();
}
private static Validator firstJob = new Validator() {
@Override
void validate() throws Exception {
assertResponseCode(200);
assertContains("first-job");
}
};
public static TestDescription[] PROVIDER_DATA = new TestDescription[]{
// Get
new TestDescription("Get all jobs", "v1/job/all", "GET", null, firstJob),
new TestDescription("Get job by name", "v1/job/first-job", "GET", null, firstJob),
new TestDescription("Get all jobs for connector", "v1/job/all?cname=hdfs-connector", "GET", null, firstJob),
new TestDescription("Get non existing job", "v1/job/i-dont-exists", "GET", null, new Validator() {
@Override
void validate() throws Exception {
assertResponseCode(500);
assertServerException("Entity requested doesn't exist", "SERVER_0006");
assertContains("Job: i-dont-exists doesn't exist");
}}),
new TestDescription("Get jobs for non existing connector", "v1/job/all?cname=i-dont-exists", "GET", null, new Validator() {
@Override
void validate() throws Exception {
assertResponseCode(500);
assertServerException("Entity requested doesn't exist", "SERVER_0006");
assertContains("Invalid connector: i-dont-exists");
}}),
};
@DataProvider(name="job-rest-test")
public static Iterator<Object[]> data() {
return ParametrizedUtils.toArrayOfArrays(PROVIDER_DATA).iterator();
}
@Factory(dataProvider = "job-rest-test")
public JobRestTest(TestDescription desc) {
super(desc);
}
}

10
test/src/test/java/org/apache/sqoop/integration/server/rest/RestTest.java
View File

@ -20,7 +20,9 @@
import org.apache.log4j.Logger;
import org.apache.commons.io.IOUtils;
import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticatedURL;
import org.apache.sqoop.connector.hdfs.configuration.ToFormat;
import org.apache.sqoop.model.MConfigList;
import org.apache.sqoop.model.MJob;
import org.apache.sqoop.model.MLink;
import org.apache.sqoop.test.infrastructure.Infrastructure;
import org.apache.sqoop.test.infrastructure.SqoopTestCase;
@ -123,6 +125,14 @@ public void createFirstLink() {
hdfsLinkFrom.setName("first-link");
saveLink(hdfsLinkFrom);
}
public void createFirstJob() {
createFirstLink();
MJob job = getClient().createJob("first-link", "first-link");
job.setName("first-job");
fillHdfsFromConfig(job);
fillHdfsToConfig(job, ToFormat.TEXT_FILE);
saveJob(job);
}
@AfterMethod
public void dropTestData() {