Repository: knox Updated Branches: refs/heads/master e08d54530 -> 381eef37a
http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java index a7ba974..e49ba8e 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/hdfs/Status.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway.shell.hdfs; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -33,7 +33,7 @@ public class Status { private String file; - Request(Hadoop session) { + Request(KnoxSession session) { super(session); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java index 7ab79d9..2ac0dd9 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Hive.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.job; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -41,7 +41,7 @@ public class Hive { private String statusDir; List<NameValuePair> params = new ArrayList<>(); - public Request( Hadoop session ) { + public Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java index eb1cba6..69b50ed 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Java.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.job; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -43,7 +43,7 @@ class Java { String output; List<NameValuePair> params = new ArrayList<>(); - public Request( Hadoop session ) { + public Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Job.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Job.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Job.java index ec57df1..68a4d09 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Job.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Job.java @@ -17,33 +17,33 @@ */ package org.apache.knox.gateway.shell.job; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; public class Job { static final String SERVICE_PATH = "/templeton/v1"; - public static Java.Request submitJava( Hadoop session ) { + public static Java.Request submitJava( KnoxSession session ) { return new Java.Request( session ); } - public static Sqoop.Request submitSqoop( Hadoop session ) { + public static Sqoop.Request submitSqoop( KnoxSession session ) { return new Sqoop.Request( session ); } - public static Pig.Request submitPig( Hadoop session ) { + public static Pig.Request submitPig( KnoxSession session ) { return new Pig.Request( session ); } - public static Hive.Request submitHive( Hadoop session ) { + public static Hive.Request submitHive( KnoxSession session ) { return new Hive.Request( session ); } - public static Queue.Request queryQueue( Hadoop session ) { + public static Queue.Request queryQueue( KnoxSession session ) { return new Queue.Request( session ); } - public static Status.Request queryStatus( Hadoop session ) { + public static Status.Request queryStatus( KnoxSession session ) { return new Status.Request( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java index 5203d81..77383a5 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Pig.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.job; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -41,7 +41,7 @@ public class Pig { private String statusDir; List<NameValuePair> params = new ArrayList<>(); - public Request( Hadoop session ) { + public Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java index d2609a2..79ac9f2 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Queue.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway.shell.job; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -30,7 +30,7 @@ class Queue { public static class Request extends AbstractRequest<Response> { - public Request( Hadoop session ) { + public Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java index a5b9556..030b0c1 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Sqoop.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.job; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.NameValuePair; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -39,7 +39,7 @@ public class Sqoop { private String statusDir; List<NameValuePair> params = new ArrayList<>(); - public Request( Hadoop session ) { + public Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java index 0aa203c..52bf296 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/job/Status.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway.shell.job; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -32,7 +32,7 @@ class Status { private String jobId; - public Request( Hadoop session ) { + public Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java index 83b9c9a..cf7ab19 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Get.java @@ -22,7 +22,7 @@ import java.util.concurrent.Callable; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -33,7 +33,7 @@ import org.apache.http.client.utils.URIBuilder; */ public class Get { public static class Request extends AbstractRequest<Response> { - Request(Hadoop session) { + Request(KnoxSession session) { super(session); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Token.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Token.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Token.java index e70b699..35c4250 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Token.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/knox/token/Token.java @@ -17,13 +17,13 @@ */ package org.apache.knox.gateway.shell.knox.token; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; public class Token { static String SERVICE_PATH = "/knoxtoken/api/v1/token"; - public static Get.Request get( Hadoop session ) { + public static Get.Request get( KnoxSession session ) { return new Get.Request( session ); } } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/DeployResourceRequest.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/DeployResourceRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/DeployResourceRequest.java index 3c7613e..01f03e5 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/DeployResourceRequest.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/DeployResourceRequest.java @@ -24,7 +24,7 @@ import org.apache.http.entity.ContentType; import org.apache.http.entity.FileEntity; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import java.io.File; import java.io.FileNotFoundException; @@ -38,7 +38,7 @@ class DeployResourceRequest extends AbstractRequest<BasicResponse> { private String resourceFileName = null; - DeployResourceRequest(Hadoop session, ResourceType type, String name, String resourceFileName) { + DeployResourceRequest(KnoxSession session, ResourceType type, String name, String resourceFileName) { super(session); this.resourceType = type; this.resourceName = name; http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListDescriptorsRequest.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListDescriptorsRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListDescriptorsRequest.java index 42fea37..3cb5d52 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListDescriptorsRequest.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListDescriptorsRequest.java @@ -16,11 +16,11 @@ */ package org.apache.knox.gateway.shell.manager; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; class ListDescriptorsRequest extends ListResourcesRequest { - ListDescriptorsRequest(Hadoop session) { + ListDescriptorsRequest(KnoxSession session) { super(session, ResourceType.Descriptor); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListProviderConfigurationsRequest.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListProviderConfigurationsRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListProviderConfigurationsRequest.java index ef5785c..865d27a 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListProviderConfigurationsRequest.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListProviderConfigurationsRequest.java @@ -16,11 +16,11 @@ */ package org.apache.knox.gateway.shell.manager; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; class ListProviderConfigurationsRequest extends ListResourcesRequest { - ListProviderConfigurationsRequest(Hadoop session) { + ListProviderConfigurationsRequest(KnoxSession session) { super(session, ResourceType.ProviderConfiguration); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java index 2b688d1..3074b47 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListResourcesRequest.java @@ -23,7 +23,7 @@ import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ class ListResourcesRequest extends AbstractRequest<BasicResponse> { private ResourceType resourceType = null; - ListResourcesRequest(Hadoop session, ResourceType resourceType) { + ListResourcesRequest(KnoxSession session, ResourceType resourceType) { super(session); this.resourceType = resourceType; } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListTopologiesRequest.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListTopologiesRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListTopologiesRequest.java index 5bcee79..2bb3d67 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListTopologiesRequest.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/ListTopologiesRequest.java @@ -20,14 +20,14 @@ import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; import net.minidev.json.parser.JSONParser; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import java.util.ArrayList; import java.util.List; class ListTopologiesRequest extends ListResourcesRequest { - ListTopologiesRequest(Hadoop session) { + ListTopologiesRequest(KnoxSession session) { super(session, ResourceType.Topology); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/Manager.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/Manager.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/Manager.java index 0396d53..377a6ff 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/Manager.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/Manager.java @@ -16,7 +16,7 @@ */ package org.apache.knox.gateway.shell.manager; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import java.util.List; @@ -25,39 +25,39 @@ import java.util.List; */ public class Manager { - public static List<String> listDescriptors(Hadoop session) throws Exception { + public static List<String> listDescriptors(KnoxSession session) throws Exception { return (new ListDescriptorsRequest(session)).execute(); } - public static void deployDescriptor(Hadoop session, String name, String descriptorFileName) throws Exception { + public static void deployDescriptor(KnoxSession session, String name, String descriptorFileName) throws Exception { (new DeployResourceRequest(session, ResourceType.Descriptor, name, descriptorFileName)).execute(); } - public static void undeployDescriptor(Hadoop session, String name) throws Exception { + public static void undeployDescriptor(KnoxSession session, String name) throws Exception { (new UndeployResourceRequest(session, ResourceType.Descriptor, name)).execute(); } - public static List<String> listProviderConfigurations(Hadoop session) throws Exception { + public static List<String> listProviderConfigurations(KnoxSession session) throws Exception { return (new ListProviderConfigurationsRequest(session)).execute(); } - public static void deployProviderConfiguration(Hadoop session, + public static void deployProviderConfiguration(KnoxSession session, String name, String providerConfigFileName) throws Exception { (new DeployResourceRequest(session, ResourceType.ProviderConfiguration, name, providerConfigFileName)).execute(); } - public static void undeployProviderConfiguration(Hadoop session, String name) throws Exception { + public static void undeployProviderConfiguration(KnoxSession session, String name) throws Exception { (new UndeployResourceRequest(session, ResourceType.ProviderConfiguration, name)).execute(); } - public static List<String> listTopologies(Hadoop session) throws Exception { + public static List<String> listTopologies(KnoxSession session) throws Exception { return (new ListTopologiesRequest(session)).execute(); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/UndeployResourceRequest.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/UndeployResourceRequest.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/UndeployResourceRequest.java index a6c6495..c6a21b4 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/UndeployResourceRequest.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/manager/UndeployResourceRequest.java @@ -20,7 +20,7 @@ import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.utils.URIBuilder; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import java.util.concurrent.Callable; @@ -30,7 +30,7 @@ class UndeployResourceRequest extends AbstractRequest<BasicResponse> { private String resourceName = null; - UndeployResourceRequest(Hadoop session, ResourceType type, String name) { + UndeployResourceRequest(KnoxSession session, ResourceType type, String name) { super(session); this.resourceType = type; this.resourceName = name; http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java index 2f18eaf..2c5612e 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Status.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway.shell.workflow; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -32,7 +32,7 @@ class Status { private String jobId; - Request( Hadoop session ) { + Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java index f7c920b..d22d85e 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Submit.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.workflow; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; @@ -42,7 +42,7 @@ class Submit { private String file; private String action = "start"; - Request( Hadoop session ) { + Request( KnoxSession session ) { super( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Workflow.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Workflow.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Workflow.java index 13619da..09ce177 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Workflow.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/workflow/Workflow.java @@ -17,17 +17,17 @@ */ package org.apache.knox.gateway.shell.workflow; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; public class Workflow { static final String SERVICE_PATH = "/oozie/v1"; - public static Submit.Request submit( Hadoop session ) { + public static Submit.Request submit( KnoxSession session ) { return new Submit.Request( session ); } - public static Status.Request status( Hadoop session ) { + public static Status.Request status( KnoxSession session ) { return new Status.Request( session ); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/AppState.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/AppState.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/AppState.java index 5cdeb46..729432c 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/AppState.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/AppState.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.yarn; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.utils.URIBuilder; @@ -34,7 +34,7 @@ public class AppState { private String appId; - Request(Hadoop session) { + Request(KnoxSession session) { super(session); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/KillApp.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/KillApp.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/KillApp.java index 245a036..b5972c5 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/KillApp.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/KillApp.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway.shell.yarn; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPut; import org.apache.http.client.utils.URIBuilder; @@ -34,7 +34,7 @@ public class KillApp { private String appId; - Request(Hadoop session) { + Request(KnoxSession session) { super(session); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/NewApp.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/NewApp.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/NewApp.java index 6ffa7dd..8f3cc4d 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/NewApp.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/NewApp.java @@ -20,7 +20,7 @@ package org.apache.knox.gateway.shell.yarn; import com.jayway.jsonpath.JsonPath; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.client.utils.URIBuilder; @@ -32,7 +32,7 @@ public class NewApp { public static class Request extends AbstractRequest<Response> { - protected Request(Hadoop session) { + protected Request(KnoxSession session) { super(session); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java index a9d734e..65e7f1e 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/SubmitApp.java @@ -19,7 +19,7 @@ package org.apache.knox.gateway.shell.yarn; import org.apache.knox.gateway.shell.AbstractRequest; import org.apache.knox.gateway.shell.BasicResponse; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; @@ -38,7 +38,7 @@ public class SubmitApp { private String text; private String file; - Request(Hadoop session) { + Request(KnoxSession session) { super(session); } http://git-wip-us.apache.org/repos/asf/knox/blob/381eef37/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/Yarn.java ---------------------------------------------------------------------- diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/Yarn.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/Yarn.java index 31cfbf2..a9f3bf4 100644 --- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/Yarn.java +++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/yarn/Yarn.java @@ -17,25 +17,25 @@ */ package org.apache.knox.gateway.shell.yarn; -import org.apache.knox.gateway.shell.Hadoop; +import org.apache.knox.gateway.shell.KnoxSession; public class Yarn { static final String SERVICE_PATH = "/resourcemanager"; - public static NewApp.Request newApp(Hadoop session) { + public static NewApp.Request newApp(KnoxSession session) { return new NewApp.Request(session); } - public static SubmitApp.Request submitApp(Hadoop session) { + public static SubmitApp.Request submitApp(KnoxSession session) { return new SubmitApp.Request(session); } - public static KillApp.Request killApp(Hadoop session) { + public static KillApp.Request killApp(KnoxSession session) { return new KillApp.Request(session); } - public static AppState.Request appState(Hadoop session) { + public static AppState.Request appState(KnoxSession session) { return new AppState.Request(session); }
