YARN-716. Making ApplicationID immutable. Contributed by Siddharth Seth.

MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after YARN-716. Contributed by Siddharth Seth.
svn merge --ignore-ancestry -c 1487994 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1487995 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -306,6 +306,9 @@ Release 2.0.5-beta - UNRELEASED
     MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617.
     (Omkar Vinit Joshi via vinodkv)
 
+    MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after
+    YARN-716. (Siddharth Seth via vinodkv)
+
   BREAKDOWN OF HADOOP-8562 SUBTASKS
 
     MAPREDUCE-4739. Some MapReduce tests fail to find winutils.

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/MRApp.java

@@ -128,9 +128,7 @@ public class MRApp extends MRAppMaster {
   static ApplicationId applicationId;
 
   static {
-    applicationId = recordFactory.newRecordInstance(ApplicationId.class);
+    applicationId = ApplicationId.newInstance(0, 0);
-    applicationId.setClusterTimestamp(0);
-    applicationId.setId(0);
   }
 
   public MRApp(int maps, int reduces, boolean autoComplete, String testName,

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestRuntimeEstimators.java

@@ -789,9 +789,7 @@ public class TestRuntimeEstimators {
     private final Map<JobId, Job> allJobs;
 
     MyAppContext(int numberMaps, int numberReduces) {
-      myApplicationID = recordFactory.newRecordInstance(ApplicationId.class);
+      myApplicationID = ApplicationId.newInstance(clock.getTime(), 1);
-      myApplicationID.setClusterTimestamp(clock.getTime());
-      myApplicationID.setId(1);
 
       myAppAttemptID = recordFactory
           .newRecordInstance(ApplicationAttemptId.class);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestStagingCleanup.java

@@ -84,9 +84,8 @@ import org.junit.Test;
      ApplicationAttemptId attemptId = recordFactory.newRecordInstance(
          ApplicationAttemptId.class);
      attemptId.setAttemptId(0);
-     ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+     ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(),
-     appId.setClusterTimestamp(System.currentTimeMillis());
+        0);
-     appId.setId(0);
      attemptId.setApplicationId(appId);
      JobId jobid = recordFactory.newRecordInstance(JobId.class);
      jobid.setAppId(appId);
@@ -113,9 +112,8 @@ import org.junit.Test;
      ApplicationAttemptId attemptId = recordFactory.newRecordInstance(
          ApplicationAttemptId.class);
      attemptId.setAttemptId(0);
-     ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+     ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(),
-     appId.setClusterTimestamp(System.currentTimeMillis());
+         0);
-     appId.setId(0);
      attemptId.setApplicationId(appId);
      ContainerAllocator mockAlloc = mock(ContainerAllocator.class);
      Assert.assertTrue(MRJobConfig.DEFAULT_MR_AM_MAX_ATTEMPTS > 1);
@@ -141,9 +139,8 @@ import org.junit.Test;
      ApplicationAttemptId attemptId = recordFactory.newRecordInstance(
          ApplicationAttemptId.class);
      attemptId.setAttemptId(1);
-     ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+     ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(),
-     appId.setClusterTimestamp(System.currentTimeMillis());
+         0);
-     appId.setId(0);
      attemptId.setApplicationId(appId);
      ContainerAllocator mockAlloc = mock(ContainerAllocator.class);
      MRAppMaster appMaster = new TestMRApp(attemptId, mockAlloc,
@@ -169,9 +166,8 @@ import org.junit.Test;
      ApplicationAttemptId attemptId = recordFactory.newRecordInstance(
          ApplicationAttemptId.class);
      attemptId.setAttemptId(0);
-     ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+     ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(),
-     appId.setClusterTimestamp(System.currentTimeMillis());
+         0);
-     appId.setId(0);
      attemptId.setApplicationId(appId);
      JobId jobid = recordFactory.newRecordInstance(JobId.class);
      jobid.setAppId(appId);
@@ -197,9 +193,8 @@ import org.junit.Test;
      ApplicationAttemptId attemptId = recordFactory.newRecordInstance(
          ApplicationAttemptId.class);
      attemptId.setAttemptId(1);
-     ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+     ApplicationId appId = ApplicationId.newInstance(System.currentTimeMillis(),
-     appId.setClusterTimestamp(System.currentTimeMillis());
+         0);
-     appId.setId(0);
      attemptId.setApplicationId(appId);
      JobId jobid = recordFactory.newRecordInstance(JobId.class);
      jobid.setAppId(appId);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestTaskImpl.java

@@ -224,9 +224,7 @@ public class TestTaskImpl {
     metrics = mock(MRAppMetrics.class);  
     dataLocations = new String[1];
     
-    appId = Records.newRecord(ApplicationId.class);
+    appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
-    appId.setClusterTimestamp(System.currentTimeMillis());
-    appId.setId(1);
 
     jobId = Records.newRecord(JobId.class);
     jobId.setId(1);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAppController.java

@@ -27,7 +27,6 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.mapreduce.v2.app.AppContext;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.util.Records;
 import org.apache.hadoop.yarn.webapp.Controller.RequestContext;
 import org.junit.Before;
 import org.junit.Test;
@@ -41,7 +40,7 @@ public class TestAppController {
   public void setUp() {
     AppContext context = mock(AppContext.class);
     when(context.getApplicationID()).thenReturn(
-        Records.newRecord(ApplicationId.class));
+        ApplicationId.newInstance(0, 0));
     App app = new App(context);
     Configuration conf = new Configuration();
     ctx = mock(RequestContext.class);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/TypeConverter.java

@@ -76,9 +76,8 @@ public class TypeConverter {
     JobId jobId = recordFactory.newRecordInstance(JobId.class);
     jobId.setId(id.getId()); //currently there is 1-1 mapping between appid and jobid
 
-    ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(
-    appId.setId(id.getId());
+        toClusterTimeStamp(id.getJtIdentifier()), id.getId());
-    appId.setClusterTimestamp(toClusterTimeStamp(id.getJtIdentifier()));
     jobId.setAppId(appId);
     return jobId;
   }

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/TestTypeConverter.java

@@ -17,6 +17,9 @@
  */
 package org.apache.hadoop.mapreduce;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -28,18 +31,13 @@ import org.apache.hadoop.mapreduce.v2.api.records.JobState;
 import org.apache.hadoop.mapreduce.v2.api.records.TaskState;
 import org.apache.hadoop.mapreduce.v2.api.records.TaskType;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
 import org.apache.hadoop.yarn.api.records.ApplicationReport;
-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationIdPBImpl;
+import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationReportPBImpl;
+import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
-import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationResourceUsageReportPBImpl;
-import org.apache.hadoop.yarn.api.records.impl.pb.QueueInfoPBImpl;
-import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl;
 import org.apache.hadoop.yarn.api.records.QueueState;
-
+import org.apache.hadoop.yarn.api.records.Resource;
-import static org.mockito.Mockito.mock;
+import org.apache.hadoop.yarn.api.records.YarnApplicationState;
-import static org.mockito.Mockito.when;
+import org.apache.hadoop.yarn.util.Records;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -74,14 +72,16 @@ public class TestTypeConverter {
   public void testFromYarn() throws Exception {
     int appStartTime = 612354;
     YarnApplicationState state = YarnApplicationState.RUNNING;
-    ApplicationId applicationId = new ApplicationIdPBImpl();
+    ApplicationId applicationId = ApplicationId.newInstance(0, 0);
-    ApplicationReportPBImpl applicationReport = new ApplicationReportPBImpl();
+    ApplicationReport applicationReport = Records
+        .newRecord(ApplicationReport.class);
     applicationReport.setApplicationId(applicationId);
     applicationReport.setYarnApplicationState(state);
     applicationReport.setStartTime(appStartTime);
     applicationReport.setUser("TestTypeConverter-user");
-    ApplicationResourceUsageReportPBImpl appUsageRpt = new ApplicationResourceUsageReportPBImpl();
+    ApplicationResourceUsageReport appUsageRpt = Records
-    ResourcePBImpl r = new ResourcePBImpl();
+        .newRecord(ApplicationResourceUsageReport.class);
+    Resource r = Records.newRecord(Resource.class);
     r.setMemory(2048);
     appUsageRpt.setNeededResources(r);
     appUsageRpt.setNumReservedContainers(1);
@@ -107,8 +107,9 @@ public class TestTypeConverter {
     when(mockReport.getUser()).thenReturn("dummy-user");
     when(mockReport.getQueue()).thenReturn("dummy-queue");
     String jobFile = "dummy-path/job.xml";
-    ApplicationResourceUsageReportPBImpl appUsageRpt = new ApplicationResourceUsageReportPBImpl();
+    ApplicationResourceUsageReport appUsageRpt = Records
-    ResourcePBImpl r = new ResourcePBImpl();
+        .newRecord(ApplicationResourceUsageReport.class);
+    Resource r = Records.newRecord(Resource.class);
     r.setMemory(2048);
     appUsageRpt.setNeededResources(r);
     appUsageRpt.setNumReservedContainers(1);
@@ -134,7 +135,8 @@ public class TestTypeConverter {
 
   @Test
   public void testFromYarnQueueInfo() {
-    org.apache.hadoop.yarn.api.records.QueueInfo queueInfo = new QueueInfoPBImpl();
+    org.apache.hadoop.yarn.api.records.QueueInfo queueInfo = Records
+        .newRecord(org.apache.hadoop.yarn.api.records.QueueInfo.class);
     queueInfo.setQueueState(org.apache.hadoop.yarn.api.records.QueueState.STOPPED);
     org.apache.hadoop.mapreduce.QueueInfo returned =
       TypeConverter.fromYarn(queueInfo, new Configuration());

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/test/java/org/apache/hadoop/mapreduce/v2/util/TestMRApps.java

@@ -82,7 +82,7 @@ public class TestMRApps {
   @Test (timeout = 120000)
   public void testJobIDtoString() {
     JobId jid = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(JobId.class);
-    jid.setAppId(RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class));
+    jid.setAppId(ApplicationId.newInstance(0, 0));
     assertEquals("job_0_0000", MRApps.toString(jid));
   }
 
@@ -104,7 +104,7 @@ public class TestMRApps {
   public void testTaskIDtoString() {
     TaskId tid = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(TaskId.class);
     tid.setJobId(RecordFactoryProvider.getRecordFactory(null).newRecordInstance(JobId.class));
-    tid.getJobId().setAppId(RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class));
+    tid.getJobId().setAppId(ApplicationId.newInstance(0, 0));
     tid.setTaskType(TaskType.MAP);
     TaskType type = tid.getTaskType();
     System.err.println(type);
@@ -146,7 +146,7 @@ public class TestMRApps {
     taid.setTaskId(RecordFactoryProvider.getRecordFactory(null).newRecordInstance(TaskId.class));
     taid.getTaskId().setTaskType(TaskType.MAP);
     taid.getTaskId().setJobId(RecordFactoryProvider.getRecordFactory(null).newRecordInstance(JobId.class));
-    taid.getTaskId().getJobId().setAppId(RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class));
+    taid.getTaskId().getJobId().setAppId(ApplicationId.newInstance(0, 0));
     assertEquals("attempt_0_0000_m_000000_0", MRApps.toString(taid));
   }
 

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/TestShufflePlugin.java

@@ -21,7 +21,6 @@ package org.apache.hadoop.mapreduce;
 import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
-import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.fs.LocalDirAllocator;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.mapred.Task.CombineOutputCollector;
@@ -30,7 +29,6 @@ import org.apache.hadoop.util.Progress;
 import org.apache.hadoop.mapred.Reporter;
 import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.mapreduce.task.reduce.Shuffle;
-import org.apache.hadoop.mapred.Counters;
 import org.apache.hadoop.mapred.Counters.Counter;
 import org.apache.hadoop.mapred.MapOutputFile;
 import org.apache.hadoop.mapred.JobConf;
@@ -40,7 +38,6 @@ import org.apache.hadoop.mapred.TaskStatus;
 import org.apache.hadoop.mapred.TaskUmbilicalProtocol;
 import org.apache.hadoop.mapred.ShuffleConsumerPlugin;
 import org.apache.hadoop.mapred.RawKeyValueIterator;
-import org.apache.hadoop.mapred.Reducer;
 
 /**
   * A JUnit for testing availability and accessibility of shuffle related API.
@@ -181,10 +178,6 @@ public class TestShufflePlugin<K, V> {
    * AuxiliaryService(s) which are "Shuffle-Providers" (ShuffleHandler and 3rd party plugins)
    */
   public void testProviderApi() {
-
-    ApplicationId mockApplicationId = mock(ApplicationId.class);
-    mockApplicationId.setClusterTimestamp(new Long(10));
-    mockApplicationId.setId(mock(JobID.class).getId());
     LocalDirAllocator mockLocalDirAllocator = mock(LocalDirAllocator.class);
     JobConf mockJobConf = mock(JobConf.class);
     try {

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JobHistory.java

@@ -74,8 +74,7 @@ public class JobHistory extends AbstractService implements HistoryContext {
   public void init(Configuration conf) throws YarnException {
     LOG.info("JobHistory Init");
     this.conf = conf;
-    this.appID = RecordFactoryProvider.getRecordFactory(conf)
+    this.appID = ApplicationId.newInstance(0, 0);
-        .newRecordInstance(ApplicationId.class);
     this.appAttemptID = RecordFactoryProvider.getRecordFactory(conf)
         .newRecordInstance(ApplicationAttemptId.class);
 

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestResourceMgrDelegate.java

@@ -129,7 +129,7 @@ public class TestResourceMgrDelegate {
     ApplicationResourceUsageReport appResources = Mockito
         .mock(ApplicationResourceUsageReport.class);
     Mockito.when(appReport.getApplicationId()).thenReturn(
-        Records.newRecord(ApplicationId.class));
+        ApplicationId.newInstance(0, 0));
     Mockito.when(appResources.getNeededResources()).thenReturn(
         Records.newRecord(Resource.class));
     Mockito.when(appResources.getReservedResources()).thenReturn(

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestYARNRunner.java

@@ -140,9 +140,7 @@ public class TestYARNRunner extends TestCase {
         ).when(yarnRunner).createApplicationSubmissionContext(any(Configuration.class),
             any(String.class), any(Credentials.class));
 
-    appId = recordFactory.newRecordInstance(ApplicationId.class);
+    appId = ApplicationId.newInstance(System.currentTimeMillis(), 1);
-    appId.setClusterTimestamp(System.currentTimeMillis());
-    appId.setId(1);
     jobId = TypeConverter.fromYarn(appId);
     if (testWorkDir.exists()) {
       FileContext.getLocalFSFileContext().delete(new Path(testWorkDir.toString()), true);

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java

@@ -79,7 +79,6 @@ import org.apache.hadoop.yarn.server.nodemanager.containermanager.AuxServices;
 import org.apache.hadoop.yarn.server.nodemanager.containermanager.localizer.ContainerLocalizer;
 import org.apache.hadoop.yarn.service.AbstractService;
 import org.apache.hadoop.yarn.util.ConverterUtils;
-import org.apache.hadoop.yarn.util.Records;
 import org.jboss.netty.bootstrap.ServerBootstrap;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.channel.Channel;
@@ -549,9 +548,8 @@ public class ShuffleHandler extends AbstractService
       // $x/$user/appcache/$appId/output/$mapId
       // TODO: Once Shuffle is out of NM, this can use MR APIs to convert between App and Job
       JobID jobID = JobID.forName(jobId);
-      ApplicationId appID = Records.newRecord(ApplicationId.class);
+      ApplicationId appID = ApplicationId.newInstance(
-      appID.setClusterTimestamp(Long.parseLong(jobID.getJtIdentifier()));
+          Long.parseLong(jobID.getJtIdentifier()), jobID.getId());
-      appID.setId(jobID.getId());
       final String base =
           ContainerLocalizer.USERCACHE + "/" + user + "/"
               + ContainerLocalizer.APPCACHE + "/"

hadoop-yarn-project/CHANGES.txt

@@ -52,6 +52,8 @@ Release 2.0.5-beta - UNRELEASED
     YARN-571. Remove user from ContainerLaunchContext. (Omkar Vinit Joshi via
     vinodkv)
 
+    YARN-716. Making ApplicationID immutable. (Siddharth Seth via vinodkv)
+
   NEW FEATURES
 
     YARN-482. FS: Extend SchedulingMode to intermediate queues. 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/ApplicationId.java

@@ -23,7 +23,7 @@ import java.text.NumberFormat;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceAudience.Public;
 import org.apache.hadoop.classification.InterfaceStability.Stable;
-import org.apache.hadoop.classification.InterfaceStability.Unstable;
+import org.apache.hadoop.yarn.util.Records;
 
 /**
  * <p><code>ApplicationId</code> represents the <em>globally unique</em> 
@@ -40,6 +40,14 @@ public abstract class ApplicationId implements Comparable<ApplicationId> {
   
   public static final String appIdStrPrefix = "application_";
 
+  public static ApplicationId newInstance(long clusterTimestamp, int id) {
+    ApplicationId appId = Records.newRecord(ApplicationId.class);
+    appId.setClusterTimestamp(clusterTimestamp);
+    appId.setId(id);
+    appId.build();
+    return appId;
+  }
+
   /**
    * Get the short integer identifier of the <code>ApplicationId</code>
    * which is unique for all applications started by a particular instance
@@ -51,8 +59,7 @@ public abstract class ApplicationId implements Comparable<ApplicationId> {
   public abstract int getId();
   
   @Private
-  @Unstable
+  protected abstract void setId(int id);
-  public abstract void setId(int id);
   
   /**
    * Get the <em>start time</em> of the <code>ResourceManager</code> which is 
@@ -62,10 +69,9 @@ public abstract class ApplicationId implements Comparable<ApplicationId> {
   public abstract long getClusterTimestamp();
   
   @Private
-  @Unstable
+  protected abstract void setClusterTimestamp(long clusterTimestamp);
-  public abstract void setClusterTimestamp(long clusterTimestamp);
 
-  
+  protected abstract void build();
   
   static final ThreadLocal<NumberFormat> appIdFormat =
     new ThreadLocal<NumberFormat>() {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ApplicationIdPBImpl.java

@@ -21,58 +21,49 @@ package org.apache.hadoop.yarn.api.records.impl.pb;
 
 import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationIdProto;
-import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationIdProtoOrBuilder;
+
+import com.google.common.base.Preconditions;
 
 
-    
 public class ApplicationIdPBImpl extends ApplicationId {
-  ApplicationIdProto proto = ApplicationIdProto.getDefaultInstance();
+  ApplicationIdProto proto = null;
   ApplicationIdProto.Builder builder = null;
-  boolean viaProto = false;
+
-  
   public ApplicationIdPBImpl() {
     builder = ApplicationIdProto.newBuilder();
   }
 
   public ApplicationIdPBImpl(ApplicationIdProto proto) {
     this.proto = proto;
-    viaProto = true;
   }
 
-  public synchronized ApplicationIdProto getProto() {
+  public ApplicationIdProto getProto() {
-    proto = viaProto ? proto : builder.build();
-    viaProto = true;
     return proto;
   }
 
-  private synchronized void maybeInitBuilder() {
-    if (viaProto || builder == null) {
-      builder = ApplicationIdProto.newBuilder(proto);
-    }
-    viaProto = false;
-  }
-    
-  
   @Override
-  public synchronized int getId() {
+  public int getId() {
-    ApplicationIdProtoOrBuilder p = viaProto ? proto : builder;
+    Preconditions.checkNotNull(proto);
-    return (p.getId());
+    return proto.getId();
   }
 
   @Override
-  public synchronized void setId(int id) {
+  protected void setId(int id) {
-    maybeInitBuilder();
+    builder.setId(id);
-    builder.setId((id));
   }
   @Override
-  public synchronized long getClusterTimestamp() {
+  public long getClusterTimestamp() {
-    ApplicationIdProtoOrBuilder p = viaProto ? proto : builder;
+    Preconditions.checkNotNull(proto);
-    return (p.getClusterTimestamp());
+    return proto.getClusterTimestamp();
   }
 
   @Override
-  public synchronized void setClusterTimestamp(long clusterTimestamp) {
+  protected void setClusterTimestamp(long clusterTimestamp) {
-    maybeInitBuilder();
     builder.setClusterTimestamp((clusterTimestamp));
   }
+
+  @Override
+  protected void build() {
+    proto = builder.build();
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestYarnClient.java

@@ -43,7 +43,6 @@ import org.apache.hadoop.yarn.exceptions.YarnRemoteException;
 import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
 import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
-import org.apache.hadoop.yarn.util.Records;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -90,9 +89,8 @@ public class TestYarnClient {
     for (int i = 0; i < exitStates.length; ++i) {
       ApplicationSubmissionContext context =
           mock(ApplicationSubmissionContext.class);
-      ApplicationId applicationId = Records.newRecord(ApplicationId.class);
+      ApplicationId applicationId = ApplicationId.newInstance(
-      applicationId.setClusterTimestamp(System.currentTimeMillis());
+          System.currentTimeMillis(), i);
-      applicationId.setId(i);
       when(context.getApplicationId()).thenReturn(applicationId);
       ((MockYarnClient) client).setYarnApplicationState(exitStates[i]);
       try {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java

@@ -24,7 +24,6 @@ import java.util.Map;
 import org.apache.hadoop.util.StringInterner;
 import org.apache.hadoop.yarn.YarnException;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 
 import static org.apache.hadoop.yarn.util.StringHelper.*;
 
@@ -45,10 +44,8 @@ public class Apps {
       throwParseException(sjoin(prefix, ID), s);
     }
     shouldHaveNext(prefix, s, it);
-    ApplicationId appId = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(Long.parseLong(it.next()),
-    appId.setClusterTimestamp(Long.parseLong(it.next()));
+        Integer.parseInt(it.next()));
-    shouldHaveNext(prefix, s, it);
-    appId.setId(Integer.parseInt(it.next()));
     return appId;
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/BuilderUtils.java

@@ -132,28 +132,17 @@ public class BuilderUtils {
 
   public static ApplicationId newApplicationId(RecordFactory recordFactory,
       long clustertimestamp, CharSequence id) {
-    ApplicationId applicationId =
+    return ApplicationId.newInstance(clustertimestamp,
-        recordFactory.newRecordInstance(ApplicationId.class);
+        Integer.valueOf(id.toString()));
-    applicationId.setId(Integer.valueOf(id.toString()));
-    applicationId.setClusterTimestamp(clustertimestamp);
-    return applicationId;
   }
 
   public static ApplicationId newApplicationId(RecordFactory recordFactory,
       long clusterTimeStamp, int id) {
-    ApplicationId applicationId =
+    return ApplicationId.newInstance(clusterTimeStamp, id);
-        recordFactory.newRecordInstance(ApplicationId.class);
-    applicationId.setId(id);
-    applicationId.setClusterTimestamp(clusterTimeStamp);
-    return applicationId;
   }
 
   public static ApplicationId newApplicationId(long clusterTimeStamp, int id) {
-    ApplicationId applicationId =
+    return ApplicationId.newInstance(clusterTimeStamp, id);
-        recordFactory.newRecordInstance(ApplicationId.class);
-    applicationId.setId(id);
-    applicationId.setClusterTimestamp(clusterTimeStamp);
-    return applicationId;
   }
 
   public static ApplicationAttemptId newApplicationAttemptId(
@@ -166,11 +155,8 @@ public class BuilderUtils {
   }
 
   public static ApplicationId convert(long clustertimestamp, CharSequence id) {
-    ApplicationId applicationId =
+    return ApplicationId.newInstance(clustertimestamp,
-        recordFactory.newRecordInstance(ApplicationId.class);
+        Integer.valueOf(id.toString()));
-    applicationId.setId(Integer.valueOf(id.toString()));
-    applicationId.setClusterTimestamp(clustertimestamp);
-    return applicationId;
   }
 
   public static ContainerId newContainerId(ApplicationAttemptId appAttemptId,

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/ConverterUtils.java

@@ -114,18 +114,15 @@ public class ConverterUtils {
 
   private static ApplicationId toApplicationId(RecordFactory recordFactory,
       Iterator<String> it) {
-    ApplicationId appId =
+    ApplicationId appId = ApplicationId.newInstance(Long.parseLong(it.next()),
-        recordFactory.newRecordInstance(ApplicationId.class);
+        Integer.parseInt(it.next()));
-    appId.setClusterTimestamp(Long.parseLong(it.next()));
-    appId.setId(Integer.parseInt(it.next()));
     return appId;
   }
 
   private static ApplicationAttemptId toApplicationAttemptId(
       Iterator<String> it) throws NumberFormatException {
-    ApplicationId appId = Records.newRecord(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(Long.parseLong(it.next()),
-    appId.setClusterTimestamp(Long.parseLong(it.next()));
+        Integer.parseInt(it.next()));
-    appId.setId(Integer.parseInt(it.next()));
     ApplicationAttemptId appAttemptId = Records
         .newRecord(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);
@@ -135,9 +132,8 @@ public class ConverterUtils {
 
   private static ApplicationId toApplicationId(
       Iterator<String> it) throws NumberFormatException {
-    ApplicationId appId = Records.newRecord(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(Long.parseLong(it.next()),
-    appId.setClusterTimestamp(Long.parseLong(it.next()));
+        Integer.parseInt(it.next()));
-    appId.setId(Integer.parseInt(it.next()));
     return appId;
   }
 

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/MockApps.java

@@ -62,10 +62,7 @@ public class MockApps {
   }
 
   public static ApplicationId newAppID(int i) {
-    ApplicationId id = Records.newRecord(ApplicationId.class);
+    return ApplicationId.newInstance(TS, i);
-    id.setClusterTimestamp(TS);
-    id.setId(i);
-    return id;
   }
 
   public static ApplicationAttemptId newAppAttemptID(ApplicationId appId, int i) {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestContainerLaunchRPC.java

@@ -91,12 +91,9 @@ public class TestContainerLaunchRPC {
           .newRecordInstance(ContainerLaunchContext.class);
       ContainerId containerId = recordFactory
           .newRecordInstance(ContainerId.class);
-      ApplicationId applicationId = recordFactory
+      ApplicationId applicationId = ApplicationId.newInstance(0, 0);
-          .newRecordInstance(ApplicationId.class);
       ApplicationAttemptId applicationAttemptId = recordFactory
           .newRecordInstance(ApplicationAttemptId.class);
-      applicationId.setClusterTimestamp(0);
-      applicationId.setId(0);
       applicationAttemptId.setApplicationId(applicationId);
       applicationAttemptId.setAttemptId(0);
       containerId.setApplicationAttemptId(applicationAttemptId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/TestRPC.java

@@ -113,12 +113,9 @@ public class TestRPC {
         recordFactory.newRecordInstance(ContainerLaunchContext.class);
     ContainerId containerId = 
         recordFactory.newRecordInstance(ContainerId.class);
-    ApplicationId applicationId = 
+    ApplicationId applicationId = ApplicationId.newInstance(0, 0);
-        recordFactory.newRecordInstance(ApplicationId.class);
     ApplicationAttemptId applicationAttemptId =
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
-    applicationId.setClusterTimestamp(0);
-    applicationId.setId(0);
     applicationAttemptId.setApplicationId(applicationId);
     applicationAttemptId.setAttemptId(0);
     containerId.setApplicationAttemptId(applicationAttemptId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestEventFlow.java

@@ -126,10 +126,7 @@ public class TestEventFlow {
     ContainerLaunchContext launchContext = 
         recordFactory.newRecordInstance(ContainerLaunchContext.class);
     ContainerId cID = recordFactory.newRecordInstance(ContainerId.class);
-    ApplicationId applicationId =
+    ApplicationId applicationId = ApplicationId.newInstance(0, 0);
-        recordFactory.newRecordInstance(ApplicationId.class);
-    applicationId.setClusterTimestamp(0);
-    applicationId.setId(0);
     ApplicationAttemptId applicationAttemptId = 
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
     applicationAttemptId.setApplicationId(applicationId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java

@@ -249,9 +249,7 @@ public class TestNodeManagerReboot {
   }
 
   private ContainerId createContainerId() {
-    ApplicationId appId = Records.newRecord(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(0, 0);
-    appId.setClusterTimestamp(0);
-    appId.setId(0);
     ApplicationAttemptId appAttemptId =
         Records.newRecord(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java

@@ -219,9 +219,8 @@ public class TestNodeManagerShutdown {
   }
   
   public static ContainerId createContainerId() {
-    ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(0, 0);
-    appId.setClusterTimestamp(0);
+    
-    appId.setId(0);
     ApplicationAttemptId appAttemptId = 
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeStatusUpdater.java

@@ -151,8 +151,6 @@ public class TestNodeStatusUpdater {
       return response;
     }
 
-    ApplicationId applicationID = recordFactory
-        .newRecordInstance(ApplicationId.class);
     ApplicationAttemptId appAttemptID = recordFactory
         .newRecordInstance(ApplicationAttemptId.class);
     ContainerId firstContainerID = recordFactory
@@ -191,12 +189,15 @@ public class TestNodeStatusUpdater {
           getAppToContainerStatusMap(nodeStatus.getContainersStatuses());
       org.apache.hadoop.yarn.api.records.Container mockContainer =
           mock(org.apache.hadoop.yarn.api.records.Container.class);
+      
+      ApplicationId appId1 = ApplicationId.newInstance(0, 1);
+      ApplicationId appId2 = ApplicationId.newInstance(0, 2);
+      
       if (heartBeatID == 1) {
         Assert.assertEquals(0, nodeStatus.getContainersStatuses().size());
 
         // Give a container to the NM.
-        applicationID.setId(heartBeatID);
+        appAttemptID.setApplicationId(appId1);
-        appAttemptID.setApplicationId(applicationID);
         firstContainerID.setApplicationAttemptId(appAttemptID);
         firstContainerID.setId(heartBeatID);
         ContainerLaunchContext launchContext = recordFactory
@@ -213,7 +214,7 @@ public class TestNodeStatusUpdater {
         Assert.assertEquals("Number of applications should only be one!", 1,
             nodeStatus.getContainersStatuses().size());
         Assert.assertEquals("Number of container for the app should be one!",
-            1, appToContainers.get(applicationID).size());
+            1, appToContainers.get(appId1).size());
 
         // Checks on the NM end
         ConcurrentMap<ContainerId, Container> activeContainers =
@@ -221,8 +222,7 @@ public class TestNodeStatusUpdater {
         Assert.assertEquals(1, activeContainers.size());
 
         // Give another container to the NM.
-        applicationID.setId(heartBeatID);
+        appAttemptID.setApplicationId(appId2);
-        appAttemptID.setApplicationId(applicationID);
         secondContainerID.setApplicationAttemptId(appAttemptID);
         secondContainerID.setId(heartBeatID);
         ContainerLaunchContext launchContext = recordFactory
@@ -239,7 +239,7 @@ public class TestNodeStatusUpdater {
         Assert.assertEquals("Number of applications should only be one!", 1,
             appToContainers.size());
         Assert.assertEquals("Number of container for the app should be two!",
-            2, appToContainers.get(applicationID).size());
+            2, appToContainers.get(appId2).size());
 
         // Checks on the NM end
         ConcurrentMap<ContainerId, Container> activeContainers =

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestAuxServices.java

@@ -18,8 +18,12 @@
 
 package org.apache.hadoop.yarn.server.nodemanager.containermanager;
 
-import org.junit.Test;
+import static org.apache.hadoop.yarn.service.Service.STATE.INITED;
-import static org.junit.Assert.*;
+import static org.apache.hadoop.yarn.service.Service.STATE.STARTED;
+import static org.apache.hadoop.yarn.service.Service.STATE.STOPPED;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -30,17 +34,10 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.api.records.ContainerId;
 import org.apache.hadoop.yarn.conf.YarnConfiguration;
-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.AuxServices;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.AuxServicesEvent;
-import org.apache.hadoop.yarn.server.nodemanager.containermanager.AuxServicesEventType;
 import org.apache.hadoop.yarn.service.AbstractService;
 import org.apache.hadoop.yarn.service.Service;
-
+import org.junit.Test;
-
-import static org.apache.hadoop.yarn.service.Service.STATE.*;
 
 public class TestAuxServices {
   private static final Log LOG = LogFactory.getLog(TestAuxServices.class);
@@ -123,18 +120,17 @@ public class TestAuxServices {
     aux.init(conf);
     aux.start();
 
-    ApplicationId appId = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class);
+    ApplicationId appId1 = ApplicationId.newInstance(0, 65);
-    appId.setId(65);
     ByteBuffer buf = ByteBuffer.allocate(6);
     buf.putChar('A');
     buf.putInt(65);
     buf.flip();
     AuxServicesEvent event = new AuxServicesEvent(
-        AuxServicesEventType.APPLICATION_INIT, "user0", appId, "Asrv", buf);
+        AuxServicesEventType.APPLICATION_INIT, "user0", appId1, "Asrv", buf);
     aux.handle(event);
-    appId.setId(66);
+    ApplicationId appId2 = ApplicationId.newInstance(0, 66);
     event = new AuxServicesEvent(
-        AuxServicesEventType.APPLICATION_STOP, "user0", appId, "Bsrv", null);
+        AuxServicesEventType.APPLICATION_STOP, "user0", appId2, "Bsrv", null);
     // verify all services got the stop event 
     aux.handle(event);
     Collection<AuxServices.AuxiliaryService> servs = aux.getServices();

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestContainerManager.java

@@ -78,9 +78,7 @@ public class TestContainerManager extends BaseContainerManagerTest {
   }
 
   private ContainerId createContainerId() {
-    ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(0, 0);
-    appId.setClusterTimestamp(0);
-    appId.setId(0);
     ApplicationAttemptId appAttemptId = 
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/launcher/TestContainerLaunch.java

@@ -167,9 +167,7 @@ public class TestContainerLaunch extends BaseContainerManagerTest {
 
     Container mockContainer = mock(Container.class);
     // ////// Construct the Container-id
-    ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(0, 0);
-    appId.setClusterTimestamp(0);
-    appId.setId(0);
     ApplicationAttemptId appAttemptId = 
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);
@@ -341,9 +339,7 @@ public class TestContainerLaunch extends BaseContainerManagerTest {
 
     Container mockContainer = mock(Container.class);
     // ////// Construct the Container-id
-    ApplicationId appId = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appId = ApplicationId.newInstance(1, 1);
-    appId.setClusterTimestamp(1);
-    appId.setId(1);
     ApplicationAttemptId appAttemptId = 
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java

@@ -709,10 +709,7 @@ public class TestLogAggregationService extends BaseContainerManagerTest {
         recordFactory.newRecordInstance(ContainerLaunchContext.class);
     Container mockContainer = mock(Container.class);
     // ////// Construct the Container-id
-    ApplicationId appId =
+    ApplicationId appId = ApplicationId.newInstance(0, 0);
-        recordFactory.newRecordInstance(ApplicationId.class);
-    appId.setClusterTimestamp(0);
-    appId.setId(0);
     ApplicationAttemptId appAttemptId =
         BuilderUtils.newApplicationAttemptId(appId, 1);
     ContainerId cId = BuilderUtils.newContainerId(appAttemptId, 0);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/monitor/TestContainersMonitor.java

@@ -204,10 +204,7 @@ public class TestContainersMonitor extends BaseContainerManagerTest {
         recordFactory.newRecordInstance(ContainerLaunchContext.class);
     Container mockContainer = mock(Container.class);
     // ////// Construct the Container-id
-    ApplicationId appId =
+    ApplicationId appId = ApplicationId.newInstance(0, 0);
-        recordFactory.newRecordInstance(ApplicationId.class);
-    appId.setClusterTimestamp(0);
-    appId.setId(0);
     ApplicationAttemptId appAttemptId =
         recordFactory.newRecordInstance(ApplicationAttemptId.class);
     appAttemptId.setApplicationId(appId);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java

@@ -157,8 +157,7 @@ public class TestClientRMService {
     RecordFactory recordFactory = RecordFactoryProvider.getRecordFactory(null);
     GetApplicationReportRequest request = recordFactory
         .newRecordInstance(GetApplicationReportRequest.class);
-    request.setApplicationId(recordFactory
+    request.setApplicationId(ApplicationId.newInstance(0, 0));
-        .newRecordInstance(ApplicationId.class));
     GetApplicationReportResponse applicationReport = rmService
         .getApplicationReport(request);
     Assert.assertNull("It should return null as application report for absent application.",
@@ -436,11 +435,7 @@ public class TestClientRMService {
   }
 
   private ApplicationId getApplicationId(int id) {
-    ApplicationId applicationId = recordFactory
+    return ApplicationId.newInstance(123456, id);
-        .newRecordInstance(ApplicationId.class);
-    applicationId.setClusterTimestamp(123456);
-    applicationId.setId(id);
-    return applicationId;
   }
 
   private RMAppImpl getRMApp(RMContext rmContext, YarnScheduler yarnScheduler,

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java

@@ -20,6 +20,7 @@ package org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.Comparator;
@@ -30,6 +31,7 @@ import junit.framework.Assert;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.yarn.api.records.ApplicationId;
 import org.apache.hadoop.yarn.api.records.Priority;
 import org.apache.hadoop.yarn.api.records.QueueInfo;
 import org.apache.hadoop.yarn.api.records.QueueUserACLInfo;
@@ -51,13 +53,10 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSc
 import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeRemovedSchedulerEvent;
 import org.apache.hadoop.yarn.server.resourcemanager.security.ClientToAMTokenSecretManagerInRM;
 import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager;
-import org.apache.hadoop.yarn.api.records.ApplicationId;
-import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
-import static org.mockito.Mockito.*;
 
 
 public class TestCapacityScheduler {
@@ -468,15 +467,9 @@ public class TestCapacityScheduler {
     {
       CapacityScheduler cs = new CapacityScheduler();
       Comparator<FiCaSchedulerApp> appComparator= cs.getApplicationComparator();
-      ApplicationId id1 = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class);
+      ApplicationId id1 = ApplicationId.newInstance(1, 1);
-      id1.setClusterTimestamp(1);
+      ApplicationId id2 = ApplicationId.newInstance(1, 2);
-      id1.setId(1);
+      ApplicationId id3 = ApplicationId.newInstance(2, 1);
-      ApplicationId id2 = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class);
-      id2.setClusterTimestamp(1);
-      id2.setId(2);
-      ApplicationId id3 = RecordFactoryProvider.getRecordFactory(null).newRecordInstance(ApplicationId.class);
-      id3.setClusterTimestamp(2);
-      id3.setId(1);
       //same clusterId
       FiCaSchedulerApp app1 = Mockito.mock(FiCaSchedulerApp.class);
       when(app1.getApplicationId()).thenReturn(id1);

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFSSchedulerApp.java

@@ -36,8 +36,7 @@ public class TestFSSchedulerApp {
 
   private ApplicationAttemptId createAppAttemptId(int appId, int attemptId) {
     ApplicationAttemptId attId = recordFactory.newRecordInstance(ApplicationAttemptId.class);
-    ApplicationId appIdImpl = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appIdImpl = ApplicationId.newInstance(0, appId);
-    appIdImpl.setId(appId);
     attId.setAttemptId(attemptId);
     attId.setApplicationId(appIdImpl);
     return attId;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java

@@ -143,8 +143,7 @@ public class TestFairScheduler {
 
   private ApplicationAttemptId createAppAttemptId(int appId, int attemptId) {
     ApplicationAttemptId attId = recordFactory.newRecordInstance(ApplicationAttemptId.class);
-    ApplicationId appIdImpl = recordFactory.newRecordInstance(ApplicationId.class);
+    ApplicationId appIdImpl = ApplicationId.newInstance(0, appId);
-    appIdImpl.setId(appId);
     attId.setAttemptId(attemptId);
     attId.setApplicationId(appIdImpl);
     return attId;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fifo/TestFifoScheduler.java

@@ -97,9 +97,7 @@ public class TestFifoScheduler {
   private ApplicationAttemptId createAppAttemptId(int appId, int attemptId) {
     ApplicationAttemptId attId = recordFactory
         .newRecordInstance(ApplicationAttemptId.class);
-    ApplicationId appIdImpl = recordFactory
+    ApplicationId appIdImpl = ApplicationId.newInstance(0, appId);
-        .newRecordInstance(ApplicationId.class);
-    appIdImpl.setId(appId);
     attId.setAttemptId(attemptId);
     attId.setApplicationId(appIdImpl);
     return attId;