From a9a90e0856ecd4d7a41fb63664aaeb0b5678d719 Mon Sep 17 00:00:00 2001
From: Sandesh Hegde <sandesh.hegde@gmail.com>
Date: Wed, 5 Oct 2016 07:48:36 -0700
Subject: [PATCH] APEXCORE-475 Making the application type of apex applications
 as ApacheApex and we will still keep DataTorrent as the deprecated tag.

---
 .../src/main/java/com/datatorrent/stram/StramClient.java | 9 +++++----
 .../src/main/java/com/datatorrent/stram/cli/ApexCli.java | 2 +-
 .../com/datatorrent/stram/client/StramClientUtils.java   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/engine/src/main/java/com/datatorrent/stram/StramClient.java b/engine/src/main/java/com/datatorrent/stram/StramClient.java
index 5094dee8fa..2009b499be 100644
--- a/engine/src/main/java/com/datatorrent/stram/StramClient.java
+++ b/engine/src/main/java/com/datatorrent/stram/StramClient.java
@@ -94,8 +94,9 @@
 public class StramClient
 {
   private static final Logger LOG = LoggerFactory.getLogger(StramClient.class);
-  public static final String YARN_APPLICATION_TYPE_DEPRECATED = "DataTorrent";
   public static final String YARN_APPLICATION_TYPE = "ApacheApex";
+  @Deprecated
+  public static final String YARN_APPLICATION_TYPE_DEPRECATED = "DataTorrent";
 
   public static final String LIB_JARS_SEP = ",";
 
@@ -116,7 +117,7 @@ public class StramClient
   private long clientTimeout = 600000;
   private String originalAppId;
   private String queueName;
-  private String applicationType = YARN_APPLICATION_TYPE_DEPRECATED;
+  private String applicationType = YARN_APPLICATION_TYPE;
   private String archives;
   private String files;
   private LinkedHashSet<String> resources;
@@ -322,7 +323,7 @@ public void startApplication() throws YarnException, IOException
   {
     Class<?>[] defaultClasses;
 
-    if (applicationType.equals(YARN_APPLICATION_TYPE_DEPRECATED)) {
+    if (applicationType.equals(YARN_APPLICATION_TYPE)) {
       //TODO restrict the security check to only check if security is enabled for webservices.
       if (UserGroupInformation.isSecurityEnabled()) {
         defaultClasses = DATATORRENT_SECURITY_CLASSES;
@@ -387,7 +388,7 @@ public void startApplication() throws YarnException, IOException
     // set the application name
     appContext.setApplicationName(dag.getValue(LogicalPlan.APPLICATION_NAME));
     appContext.setApplicationType(this.applicationType);
-    if (YARN_APPLICATION_TYPE_DEPRECATED.equals(this.applicationType)) {
+    if (YARN_APPLICATION_TYPE.equals(this.applicationType)) {
       //appContext.setMaxAppAttempts(1); // no retries until Stram is HA
     }
 
diff --git a/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java b/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
index 235ba58d01..69af2e32bf 100644
--- a/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
+++ b/engine/src/main/java/com/datatorrent/stram/cli/ApexCli.java
@@ -1593,7 +1593,7 @@ private String readLine(ConsoleReader reader)
   private List<ApplicationReport> getApplicationList()
   {
     try {
-      return yarnClient.getApplications(Sets.newHashSet(StramClient.YARN_APPLICATION_TYPE_DEPRECATED, StramClient.YARN_APPLICATION_TYPE));
+      return yarnClient.getApplications(Sets.newHashSet(StramClient.YARN_APPLICATION_TYPE, StramClient.YARN_APPLICATION_TYPE_DEPRECATED));
     } catch (Exception e) {
       throw new CliException("Error getting application list from resource manager", e);
     }
diff --git a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
index c7e375632e..7a3b8d479a 100644
--- a/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
+++ b/engine/src/main/java/com/datatorrent/stram/client/StramClientUtils.java
@@ -711,7 +711,7 @@ public static <T> T doAs(String userName, PrivilegedExceptionAction<T> action) t
 
   public static ApplicationReport getStartedAppInstanceByName(YarnClient clientRMService, String appName, String user, String excludeAppId) throws YarnException, IOException
   {
-    List<ApplicationReport> applications = clientRMService.getApplications(Sets.newHashSet(StramClient.YARN_APPLICATION_TYPE_DEPRECATED, StramClient.YARN_APPLICATION_TYPE), EnumSet.of(YarnApplicationState.RUNNING,
+    List<ApplicationReport> applications = clientRMService.getApplications(Sets.newHashSet(StramClient.YARN_APPLICATION_TYPE, StramClient.YARN_APPLICATION_TYPE_DEPRECATED), EnumSet.of(YarnApplicationState.RUNNING,
         YarnApplicationState.ACCEPTED,
         YarnApplicationState.NEW,
         YarnApplicationState.NEW_SAVING,
@@ -822,7 +822,7 @@ public static List<ApplicationReport> cleanAppDirectories(YarnClient clientRMSer
       throws IOException, YarnException
   {
     List<ApplicationReport> result = new ArrayList<>();
-    List<ApplicationReport> applications = clientRMService.getApplications(Sets.newHashSet(StramClient.YARN_APPLICATION_TYPE_DEPRECATED, StramClient.YARN_APPLICATION_TYPE),
+    List<ApplicationReport> applications = clientRMService.getApplications(Sets.newHashSet(StramClient.YARN_APPLICATION_TYPE, StramClient.YARN_APPLICATION_TYPE_DEPRECATED),
         EnumSet.of(YarnApplicationState.FAILED, YarnApplicationState.FINISHED, YarnApplicationState.KILLED));
     Path appsBasePath = new Path(StramClientUtils.getDTDFSRootDir(fs, conf), StramClientUtils.SUBDIR_APPS);
     for (ApplicationReport ar : applications) {