diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index e2845cf2705..a81d9e3ecc7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -96,6 +96,9 @@ Release 2.1.0-beta - UNRELEASED YARN-755. Renamed AllocateResponse.reboot to AllocateResponse.resync. (Bikas Saha via vinodkv) + YARN-753. Added individual factory methods for all api protocol records and + converted the records to be abstract classes. (Jian He via vinodkv) + NEW FEATURES YARN-482. FS: Extend SchedulingMode to intermediate queues. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenRequest.java index 1217878ec08..9465a44a60c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.yarn.api.records.Token; +import org.apache.hadoop.yarn.util.Records; /** * The request issued by the client to the {@code ResourceManager} to cancel a @@ -28,7 +29,15 @@ */ @Public @Evolving -public interface CancelDelegationTokenRequest { - Token getDelegationToken(); - void setDelegationToken(Token dToken); +public abstract class CancelDelegationTokenRequest { + + public static CancelDelegationTokenRequest newInstance(Token dToken) { + CancelDelegationTokenRequest request = + Records.newRecord(CancelDelegationTokenRequest.class); + request.setDelegationToken(dToken); + return request; + } + + public abstract Token getDelegationToken(); + public abstract void setDelegationToken(Token dToken); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenResponse.java index c934291d72c..25eb3dce469 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/CancelDelegationTokenResponse.java @@ -20,6 +20,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; +import org.apache.hadoop.yarn.util.Records; /** * The response from the {@code ResourceManager} to a cancelDelegationToken @@ -27,5 +28,10 @@ */ @Public @Evolving -public interface CancelDelegationTokenResponse { +public abstract class CancelDelegationTokenResponse { + public static CancelDelegationTokenResponse newInstance() { + CancelDelegationTokenResponse response = + Records.newRecord(CancelDelegationTokenResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterRequest.java index 7a09e774523..7b95885b81d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterRequest.java @@ -23,6 +23,7 @@ import org.apache.hadoop.yarn.api.AMRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; +import org.apache.hadoop.yarn.util.Records; /** *

The finalization request sent by the ApplicationMaster to @@ -45,7 +46,19 @@ * * @see AMRMProtocol#finishApplicationMaster(FinishApplicationMasterRequest) */ -public interface FinishApplicationMasterRequest { +public abstract class FinishApplicationMasterRequest { + + public static FinishApplicationMasterRequest newInstance( + ApplicationAttemptId appAttemptId, FinalApplicationStatus finalAppStatus, + String diagnostics, String url) { + FinishApplicationMasterRequest request = + Records.newRecord(FinishApplicationMasterRequest.class); + request.setAppAttemptId(appAttemptId); + request.setFinishApplicationStatus(finalAppStatus); + request.setDiagnostics(diagnostics); + request.setTrackingUrl(url); + return request; + } /** * Get the ApplicationAttemptId being managed by the @@ -55,7 +68,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - ApplicationAttemptId getApplicationAttemptId(); + public abstract ApplicationAttemptId getApplicationAttemptId(); /** * Set the ApplicationAttemptId being managed by the @@ -65,7 +78,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - void setAppAttemptId(ApplicationAttemptId applicationAttemptId); + public abstract void setAppAttemptId(ApplicationAttemptId applicationAttemptId); /** * Get final state of the ApplicationMaster. @@ -73,7 +86,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - FinalApplicationStatus getFinalApplicationStatus(); + public abstract FinalApplicationStatus getFinalApplicationStatus(); /** * Set the finish state of the ApplicationMaster @@ -81,7 +94,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - void setFinishApplicationStatus(FinalApplicationStatus finishState); + public abstract void setFinishApplicationStatus(FinalApplicationStatus finishState); /** * Get diagnostic information on application failure. @@ -89,7 +102,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - String getDiagnostics(); + public abstract String getDiagnostics(); /** * Set diagnostic information on application failure. @@ -97,7 +110,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - void setDiagnostics(String diagnostics); + public abstract void setDiagnostics(String diagnostics); /** * Get the tracking URL for the ApplicationMaster. @@ -105,7 +118,7 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - String getTrackingUrl(); + public abstract String getTrackingUrl(); /** * Set the tracking URLfor the ApplicationMaster @@ -114,6 +127,6 @@ public interface FinishApplicationMasterRequest { */ @Public @Stable - void setTrackingUrl(String url); + public abstract void setTrackingUrl(String url); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterResponse.java index b7710c41cab..260be20cce9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/FinishApplicationMasterResponse.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.AMRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a @@ -32,6 +33,10 @@ */ @Public @Stable -public interface FinishApplicationMasterResponse { - +public abstract class FinishApplicationMasterResponse { + public static FinishApplicationMasterResponse newInstance() { + FinishApplicationMasterResponse response = + Records.newRecord(FinishApplicationMasterResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsRequest.java index ff42c053e94..b97c8c35602 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The request from clients to get a report of all Applications @@ -32,5 +33,10 @@ */ @Public @Stable -public interface GetAllApplicationsRequest { +public abstract class GetAllApplicationsRequest { + public static GetAllApplicationsRequest newInstance() { + GetAllApplicationsRequest request = + Records.newRecord(GetAllApplicationsRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsResponse.java index 3e2e401bb95..b805e2693f1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetAllApplicationsResponse.java @@ -26,6 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a client @@ -40,16 +41,25 @@ */ @Public @Stable -public interface GetAllApplicationsResponse { +public abstract class GetAllApplicationsResponse { + + public static GetAllApplicationsResponse newInstance( + List applications) { + GetAllApplicationsResponse response = + Records.newRecord(GetAllApplicationsResponse.class); + response.setApplicationList(applications); + return response; + } + /** * Get ApplicationReport for all applications. * @return ApplicationReport for all applications */ @Public @Stable - List getApplicationList(); + public abstract List getApplicationList(); @Private @Unstable - void setApplicationList(List applications); + public abstract void setApplicationList(List applications); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportRequest.java index d6f9ee48f04..d8ea51b420e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportRequest.java @@ -23,6 +23,7 @@ import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by a client to the ResourceManager to @@ -36,16 +37,25 @@ */ @Public @Stable -public interface GetApplicationReportRequest { +public abstract class GetApplicationReportRequest { + + public static GetApplicationReportRequest newInstance( + ApplicationId applicationId) { + GetApplicationReportRequest request = + Records.newRecord(GetApplicationReportRequest.class); + request.setApplicationId(applicationId); + return request; + } + /** * Get the ApplicationId of the application. * @return ApplicationId of the application */ - public ApplicationId getApplicationId(); + public abstract ApplicationId getApplicationId(); /** * Set the ApplicationId of the application * @param applicationId ApplicationId of the application */ - public void setApplicationId(ApplicationId applicationId); + public abstract void setApplicationId(ApplicationId applicationId); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportResponse.java index cc93f20c271..28daddec96d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetApplicationReportResponse.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationReport; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a client @@ -37,16 +38,25 @@ */ @Public @Stable -public interface GetApplicationReportResponse { +public abstract class GetApplicationReportResponse { + + public static GetApplicationReportResponse newInstance( + ApplicationReport ApplicationReport) { + GetApplicationReportResponse response = + Records.newRecord(GetApplicationReportResponse.class); + response.setApplicationReport(ApplicationReport); + return response; + } + /** * Get the ApplicationReport for the application. * @return ApplicationReport for the application */ @Public @Stable - public ApplicationReport getApplicationReport(); + public abstract ApplicationReport getApplicationReport(); @Private @Unstable - public void setApplicationReport(ApplicationReport ApplicationReport); + public abstract void setApplicationReport(ApplicationReport ApplicationReport); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsRequest.java index e2c2ca48af8..6ce4ffef66c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by clients to get cluster metrics from the @@ -32,6 +33,10 @@ */ @Public @Stable -public interface GetClusterMetricsRequest { - +public abstract class GetClusterMetricsRequest { + public static GetClusterMetricsRequest newInstance() { + GetClusterMetricsRequest request = + Records.newRecord(GetClusterMetricsRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsResponse.java index 691bcc0b38d..3ad7d22d44c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterMetricsResponse.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a client @@ -34,16 +35,25 @@ */ @Public @Stable -public interface GetClusterMetricsResponse { +public abstract class GetClusterMetricsResponse { + + public static GetClusterMetricsResponse + newInstance(YarnClusterMetrics metrics) { + GetClusterMetricsResponse response = + Records.newRecord(GetClusterMetricsResponse.class); + response.setClusterMetrics(metrics); + return response; + } + /** * Get the YarnClusterMetrics for the cluster. * @return YarnClusterMetrics for the cluster */ @Public @Stable - public YarnClusterMetrics getClusterMetrics(); + public abstract YarnClusterMetrics getClusterMetrics(); @Private @Unstable - public void setClusterMetrics(YarnClusterMetrics metrics); + public abstract void setClusterMetrics(YarnClusterMetrics metrics); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesRequest.java index 0bbbd280214..2c962261096 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The request from clients to get a report of all nodes @@ -32,6 +33,10 @@ */ @Public @Stable -public interface GetClusterNodesRequest { - +public abstract class GetClusterNodesRequest { + public static GetClusterNodesRequest newInstance() { + GetClusterNodesRequest request = + Records.newRecord(GetClusterNodesRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesResponse.java index 9acf9434647..6d574b56006 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetClusterNodesResponse.java @@ -26,6 +26,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.NodeReport; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a client @@ -40,16 +41,25 @@ */ @Public @Stable -public interface GetClusterNodesResponse { +public abstract class GetClusterNodesResponse { + + public static GetClusterNodesResponse + newInstance(List nodeReports) { + GetClusterNodesResponse response = + Records.newRecord(GetClusterNodesResponse.class); + response.setNodeReports(nodeReports); + return response; + } + /** * Get NodeReport for all nodes in the cluster. * @return NodeReport for all nodes in the cluster */ @Public @Stable - List getNodeReports(); + public abstract List getNodeReports(); @Private @Unstable - void setNodeReports(List nodeReports); + public abstract void setNodeReports(List nodeReports); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusRequest.java index 6cd91f2dd99..c621ca6852d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusRequest.java @@ -23,6 +23,7 @@ import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.records.ContainerId; import org.apache.hadoop.yarn.api.records.ContainerStatus; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by the ApplicationMaster to the @@ -32,7 +33,15 @@ */ @Public @Stable -public interface GetContainerStatusRequest { +public abstract class GetContainerStatusRequest { + + public static GetContainerStatusRequest newInstance(ContainerId containerId) { + GetContainerStatusRequest request = + Records.newRecord(GetContainerStatusRequest.class); + request.setContainerId(containerId); + return request; + } + /** * Get the ContainerId of container for which to obtain the * ContainerStatus. diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusResponse.java index 48ba6515261..61ee6bcd792 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetContainerStatusResponse.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.records.ContainerStatus; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the NodeManager to the @@ -34,7 +35,16 @@ */ @Public @Stable -public interface GetContainerStatusResponse { +public abstract class GetContainerStatusResponse { + + public static GetContainerStatusResponse newInstance( + ContainerStatus containerStatus) { + GetContainerStatusResponse response = + Records.newRecord(GetContainerStatusResponse.class); + response.setStatus(containerStatus); + return response; + } + /** * Get the ContainerStatus of the container. * @return ContainerStatus of the container diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenRequest.java index ba4cbd643a8..e1211c1bb66 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenRequest.java @@ -20,6 +20,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; +import org.apache.hadoop.yarn.util.Records; /** * The request issued by the client to get a delegation token from @@ -28,7 +29,15 @@ */ @Public @Evolving -public interface GetDelegationTokenRequest { - String getRenewer(); - void setRenewer(String renewer); +public abstract class GetDelegationTokenRequest { + + public GetDelegationTokenRequest newInstance(String renewer) { + GetDelegationTokenRequest request = + Records.newRecord(GetDelegationTokenRequest.class); + request.setRenewer(renewer); + return request; + } + + public abstract String getRenewer(); + public abstract void setRenewer(String renewer); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenResponse.java index 776361eb113..37f66c5838a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetDelegationTokenResponse.java @@ -22,6 +22,7 @@ import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier; import org.apache.hadoop.yarn.api.records.Token; +import org.apache.hadoop.yarn.util.Records; /** @@ -32,13 +33,20 @@ */ @Public @Evolving -public interface GetDelegationTokenResponse { +public abstract class GetDelegationTokenResponse { + + public static GetDelegationTokenResponse newInstance(Token rmDTToken) { + GetDelegationTokenResponse response = + Records.newRecord(GetDelegationTokenResponse.class); + response.setRMDelegationToken(rmDTToken); + return response; + } /** * The Delegation tokens have a identifier which maps to * {@link AbstractDelegationTokenIdentifier}. * */ - Token getRMDelegationToken(); - void setRMDelegationToken(Token rmDTToken); + public abstract Token getRMDelegationToken(); + public abstract void setRMDelegationToken(Token rmDTToken); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationRequest.java index 20d2d81194e..efa2b6ad77c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationRequest.java @@ -22,6 +22,7 @@ import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by clients to get a new {@link ApplicationId} for @@ -33,6 +34,10 @@ */ @Public @Stable -public interface GetNewApplicationRequest { - +public abstract class GetNewApplicationRequest { + public static GetNewApplicationRequest newInstance() { + GetNewApplicationRequest request = + Records.newRecord(GetNewApplicationRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java index 8da80e0afd6..e79c5b6810e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetNewApplicationResponse.java @@ -25,6 +25,7 @@ import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to the client for @@ -34,7 +35,19 @@ */ @Public @Stable -public interface GetNewApplicationResponse { +public abstract class GetNewApplicationResponse { + + public static GetNewApplicationResponse newInstance( + ApplicationId applicationId, Resource minCapability, + Resource maxCapability) { + GetNewApplicationResponse response = + Records.newRecord(GetNewApplicationResponse.class); + response.setApplicationId(applicationId); + response.setMinimumResourceCapability(minCapability); + response.setMaximumResourceCapability(maxCapability); + return response; + } + /** * Get the new ApplicationId allocated by the * ResourceManager. @@ -56,11 +69,11 @@ public interface GetNewApplicationResponse { */ @Public @Stable - public Resource getMinimumResourceCapability(); + public abstract Resource getMinimumResourceCapability(); @Private @Unstable - public void setMinimumResourceCapability(Resource capability); + public abstract void setMinimumResourceCapability(Resource capability); /** * Get the maximum capability for any {@link Resource} allocated by the @@ -69,9 +82,9 @@ public interface GetNewApplicationResponse { */ @Public @Stable - public Resource getMaximumResourceCapability(); + public abstract Resource getMaximumResourceCapability(); @Private @Unstable - public void setMaximumResourceCapability(Resource capability); + public abstract void setMaximumResourceCapability(Resource capability); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoRequest.java index 435b03cf170..8cdf3c1f56a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by clients to get queue information @@ -30,58 +31,70 @@ */ @Public @Stable -public interface GetQueueInfoRequest { +public abstract class GetQueueInfoRequest { + + public static GetQueueInfoRequest + newInstance(String queueName, boolean includeApplications, + boolean includeChildQueues, boolean recursive) { + GetQueueInfoRequest request = Records.newRecord(GetQueueInfoRequest.class); + request.setQueueName(queueName); + request.setIncludeApplications(includeApplications); + request.setIncludeChildQueues(includeChildQueues); + request.setRecursive(recursive); + return request; + } + /** * Get the queue name for which to get queue information. * @return queue name for which to get queue information */ - String getQueueName(); + public abstract String getQueueName(); /** * Set the queue name for which to get queue information * @param queueName queue name for which to get queue information */ - void setQueueName(String queueName); + public abstract void setQueueName(String queueName); /** * Is information about active applications required? * @return true if applications' information is to be included, * else false */ - boolean getIncludeApplications(); + public abstract boolean getIncludeApplications(); /** * Should we get fetch information about active applications? * @param includeApplications fetch information about active * applications? */ - void setIncludeApplications(boolean includeApplications); + public abstract void setIncludeApplications(boolean includeApplications); /** * Is information about child queues required? * @return true if information about child queues is required, * else false */ - boolean getIncludeChildQueues(); + public abstract boolean getIncludeChildQueues(); /** * Should we fetch information about child queues? * @param includeChildQueues fetch information about child queues? */ - void setIncludeChildQueues(boolean includeChildQueues); + public abstract void setIncludeChildQueues(boolean includeChildQueues); /** * Is information on the entire child queue hierarchy required? * @return true if information about entire hierarchy is * required, false otherwise */ - boolean getRecursive(); + public abstract boolean getRecursive(); /** * Should we fetch information on the entire child queue hierarchy? * @param recursive fetch information on the entire child queue * hierarchy? */ - void setRecursive(boolean recursive); + public abstract void setRecursive(boolean recursive); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoResponse.java index 830945744f3..5137fdd6e1e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueInfoResponse.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.QueueInfo; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a client @@ -38,14 +39,21 @@ */ @Public @Stable -public interface GetQueueInfoResponse { +public abstract class GetQueueInfoResponse { + + public static GetQueueInfoResponse newInstance(QueueInfo queueInfo) { + GetQueueInfoResponse response = Records.newRecord(GetQueueInfoResponse.class); + response.setQueueInfo(queueInfo); + return response; + } + /** * Get the QueueInfo for the specified queue. * @return QueueInfo for the specified queue */ - QueueInfo getQueueInfo(); + public abstract QueueInfo getQueueInfo(); @Private @Unstable - void setQueueInfo(QueueInfo queueInfo); + public abstract void setQueueInfo(QueueInfo queueInfo); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoRequest.java index 7a18094fa95..d251ed0fe5f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by clients to the ResourceManager to @@ -32,6 +33,10 @@ */ @Public @Stable -public interface GetQueueUserAclsInfoRequest { - +public abstract class GetQueueUserAclsInfoRequest { + public static GetQueueUserAclsInfoRequest newInstance() { + GetQueueUserAclsInfoRequest request = + Records.newRecord(GetQueueUserAclsInfoRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoResponse.java index 58f640593a6..8db9f808ab0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/GetQueueUserAclsInfoResponse.java @@ -27,6 +27,7 @@ import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.QueueACL; import org.apache.hadoop.yarn.api.records.QueueUserACLInfo; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to clients @@ -41,7 +42,15 @@ */ @Public @Stable -public interface GetQueueUserAclsInfoResponse { +public abstract class GetQueueUserAclsInfoResponse { + + public static GetQueueUserAclsInfoResponse newInstance( + List queueUserAclsList) { + GetQueueUserAclsInfoResponse response = + Records.newRecord(GetQueueUserAclsInfoResponse.class); + response.setUserAclsInfoList(queueUserAclsList); + return response; + } /** * Get the QueueUserACLInfo per queue for the user. @@ -49,10 +58,11 @@ public interface GetQueueUserAclsInfoResponse { */ @Public @Stable - public List getUserAclsInfoList(); + public abstract List getUserAclsInfoList(); @Private @Unstable - public void setUserAclsInfoList(List queueUserAclsList); + public abstract void setUserAclsInfoList( + List queueUserAclsList); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationRequest.java index c033e64bb20..ca54f30e18f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationRequest.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.ClientRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationId; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by the client to the ResourceManager @@ -36,7 +37,15 @@ */ @Public @Stable -public interface KillApplicationRequest { +public abstract class KillApplicationRequest { + + public static KillApplicationRequest newInstance(ApplicationId applicationId) { + KillApplicationRequest request = + Records.newRecord(KillApplicationRequest.class); + request.setApplicationId(applicationId); + return request; + } + /** * Get the ApplicationId of the application to be aborted. * @return ApplicationId of the application to be aborted diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationResponse.java index 2a8d0f06d29..4bfae078a6d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/KillApplicationResponse.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to the client @@ -32,6 +33,10 @@ */ @Public @Stable -public interface KillApplicationResponse { - +public abstract class KillApplicationResponse { + public static KillApplicationResponse newInstance() { + KillApplicationResponse response = + Records.newRecord(KillApplicationResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsRequest.java index 74692df1736..09b558dc4cf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsRequest.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshAdminAclsRequest { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshAdminAclsRequest { + public static RefreshAdminAclsRequest newInstance() { + RefreshAdminAclsRequest request = + Records.newRecord(RefreshAdminAclsRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsResponse.java index 1a470c37c38..3fd4129895f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshAdminAclsResponse.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshAdminAclsResponse { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshAdminAclsResponse { + public static RefreshAdminAclsResponse newInstance() { + RefreshAdminAclsResponse response = + Records.newRecord(RefreshAdminAclsResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesRequest.java index 0fbb9a39d91..c6024a64ab7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesRequest.java @@ -18,6 +18,11 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshNodesRequest { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshNodesRequest { + public static RefreshNodesRequest newInstance() { + RefreshNodesRequest request = Records.newRecord(RefreshNodesRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesResponse.java index 86b260a1eef..58218781943 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshNodesResponse.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshNodesResponse { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshNodesResponse { + public static RefreshNodesResponse newInstance() { + RefreshNodesResponse response = + Records.newRecord(RefreshNodesResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesRequest.java index 4fd7e16412b..80d34499a12 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesRequest.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshQueuesRequest { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshQueuesRequest { + public static RefreshQueuesRequest newInstance() { + RefreshQueuesRequest request = + Records.newRecord(RefreshQueuesRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesResponse.java index 91d39031a23..49bab38fcf6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshQueuesResponse.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshQueuesResponse { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshQueuesResponse { + public static RefreshQueuesResponse newInstance() { + RefreshQueuesResponse response = + Records.newRecord(RefreshQueuesResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsRequest.java index cb1ca27b1b3..dca7a407ac1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsRequest.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshServiceAclsRequest { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshServiceAclsRequest { + public static RefreshServiceAclsRequest newInstance() { + RefreshServiceAclsRequest request = + Records.newRecord(RefreshServiceAclsRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsResponse.java index 5c440329bf4..7c772f21a13 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshServiceAclsResponse.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshServiceAclsResponse { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshServiceAclsResponse { + public static RefreshServiceAclsResponse newInstance() { + RefreshServiceAclsResponse response = + Records.newRecord(RefreshServiceAclsResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationRequest.java index 17626890aec..ae47fa69f8a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationRequest.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshSuperUserGroupsConfigurationRequest { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshSuperUserGroupsConfigurationRequest { + public static RefreshSuperUserGroupsConfigurationRequest newInstance() { + RefreshSuperUserGroupsConfigurationRequest request = + Records.newRecord(RefreshSuperUserGroupsConfigurationRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationResponse.java index e83fb639403..8910f269fa7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshSuperUserGroupsConfigurationResponse.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshSuperUserGroupsConfigurationResponse { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshSuperUserGroupsConfigurationResponse { + public static RefreshSuperUserGroupsConfigurationResponse newInstance() { + RefreshSuperUserGroupsConfigurationResponse response = + Records.newRecord(RefreshSuperUserGroupsConfigurationResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsRequest.java index 7a8f4f0a22e..a769eec8165 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsRequest.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshUserToGroupsMappingsRequest { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshUserToGroupsMappingsRequest { + public static RefreshUserToGroupsMappingsRequest newInstance() { + RefreshUserToGroupsMappingsRequest request = + Records.newRecord(RefreshUserToGroupsMappingsRequest.class); + return request; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsResponse.java index c53d062112b..276962328c0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RefreshUserToGroupsMappingsResponse.java @@ -18,6 +18,12 @@ package org.apache.hadoop.yarn.api.protocolrecords; -public interface RefreshUserToGroupsMappingsResponse { +import org.apache.hadoop.yarn.util.Records; +public abstract class RefreshUserToGroupsMappingsResponse { + public static RefreshUserToGroupsMappingsResponse newInstance() { + RefreshUserToGroupsMappingsResponse response = + Records.newRecord(RefreshUserToGroupsMappingsResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterRequest.java index 1accbd22d6e..123c598cf82 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterRequest.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.AMRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by the ApplicationMaster to @@ -45,7 +46,19 @@ */ @Public @Stable -public interface RegisterApplicationMasterRequest { +public abstract class RegisterApplicationMasterRequest { + + public static RegisterApplicationMasterRequest newInstance( + ApplicationAttemptId applicationAttemptId, String host, int port, + String trackingUrl) { + RegisterApplicationMasterRequest request = + Records.newRecord(RegisterApplicationMasterRequest.class); + request.setApplicationAttemptId(applicationAttemptId); + request.setHost(host); + request.setRpcPort(port); + request.setTrackingUrl(trackingUrl); + return request; + } /** * Get the ApplicationAttemptId being managed by the @@ -55,7 +68,7 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - ApplicationAttemptId getApplicationAttemptId(); + public abstract ApplicationAttemptId getApplicationAttemptId(); /** * Set the ApplicationAttemptId being managed by the @@ -65,7 +78,7 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - void setApplicationAttemptId(ApplicationAttemptId applicationAttemptId); + public abstract void setApplicationAttemptId(ApplicationAttemptId applicationAttemptId); /** * Get the host on which the ApplicationMaster is @@ -74,7 +87,7 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - String getHost(); + public abstract String getHost(); /** * Set the host on which the ApplicationMaster is @@ -84,7 +97,7 @@ public interface RegisterApplicationMasterRequest { */ @Private @Unstable - void setHost(String host); + public abstract void setHost(String host); /** * Get the RPC port on which the ApplicationMaster @@ -94,7 +107,7 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - int getRpcPort(); + public abstract int getRpcPort(); /** * Set the RPC port on which the ApplicationMaster is @@ -104,7 +117,7 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - void setRpcPort(int port); + public abstract void setRpcPort(int port); /** * Get the tracking URL for the ApplicationMaster. @@ -112,7 +125,7 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - String getTrackingUrl(); + public abstract String getTrackingUrl(); /** * Set the tracking URL for the ApplicationMaster. @@ -121,5 +134,5 @@ public interface RegisterApplicationMasterRequest { */ @Public @Stable - void setTrackingUrl(String trackingUrl); + public abstract void setTrackingUrl(String trackingUrl); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterResponse.java index 8b1b7090c8c..ca507d0128f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RegisterApplicationMasterResponse.java @@ -27,6 +27,7 @@ import org.apache.hadoop.yarn.api.AMRMProtocol; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a new @@ -43,8 +44,19 @@ */ @Public @Stable -public interface RegisterApplicationMasterResponse { - +public abstract class RegisterApplicationMasterResponse { + + public static RegisterApplicationMasterResponse newInstance( + Resource minCapability, Resource maxCapability, + Map acls) { + RegisterApplicationMasterResponse response = + Records.newRecord(RegisterApplicationMasterResponse.class); + response.setMinimumResourceCapability(minCapability); + response.setMaximumResourceCapability(maxCapability); + response.setApplicationACLs(acls); + return response; + } + /** * Get the minimum capability for any {@link Resource} allocated by the * ResourceManager in the cluster. @@ -52,11 +64,11 @@ public interface RegisterApplicationMasterResponse { */ @Public @Stable - public Resource getMinimumResourceCapability(); + public abstract Resource getMinimumResourceCapability(); @Private @Unstable - public void setMinimumResourceCapability(Resource capability); + public abstract void setMinimumResourceCapability(Resource capability); /** * Get the maximum capability for any {@link Resource} allocated by the @@ -65,11 +77,11 @@ public interface RegisterApplicationMasterResponse { */ @Public @Stable - public Resource getMaximumResourceCapability(); + public abstract Resource getMaximumResourceCapability(); @Private @Unstable - public void setMaximumResourceCapability(Resource capability); + public abstract void setMaximumResourceCapability(Resource capability); /** * Get the ApplicationACLs for the application. @@ -77,7 +89,7 @@ public interface RegisterApplicationMasterResponse { */ @Public @Stable - public Map getApplicationACLs(); + public abstract Map getApplicationACLs(); /** * Set the ApplicationACLs for the application. @@ -85,5 +97,5 @@ public interface RegisterApplicationMasterResponse { */ @Private @Unstable - public void setApplicationACLs(Map acls); + public abstract void setApplicationACLs(Map acls); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenRequest.java index 1eb768c832a..89294ae7880 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenRequest.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.yarn.api.records.Token; +import org.apache.hadoop.yarn.util.Records; /** * The request issued by the client to renew a delegation token from @@ -28,7 +29,16 @@ */ @Public @Evolving -public interface RenewDelegationTokenRequest { - Token getDelegationToken(); - void setDelegationToken(Token dToken); +public abstract class RenewDelegationTokenRequest { + + public static RenewDelegationTokenRequest newInstance(Token dToken) { + RenewDelegationTokenRequest request = + Records.newRecord(RenewDelegationTokenRequest.class); + request.setDelegationToken(dToken); + return request; + } + + public abstract Token getDelegationToken(); + + public abstract void setDelegationToken(Token dToken); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenResponse.java index 91158a52003..96470f32922 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/RenewDelegationTokenResponse.java @@ -20,13 +20,23 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Evolving; +import org.apache.hadoop.yarn.util.Records; /** * The response to a renewDelegationToken call to the {@code ResourceManager}. */ @Public @Evolving -public interface RenewDelegationTokenResponse { - long getNextExpirationTime(); - void setNextExpirationTime(long expTime); +public abstract class RenewDelegationTokenResponse { + + public static RenewDelegationTokenResponse newInstance(long expTime) { + RenewDelegationTokenResponse response = + Records.newRecord(RenewDelegationTokenResponse.class); + response.setNextExpirationTime(expTime); + return response; + } + + public abstract long getNextExpirationTime(); + + public abstract void setNextExpirationTime(long expTime); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerRequest.java index 6b73d142082..3341aac81f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerRequest.java @@ -23,6 +23,7 @@ import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.Token; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by the ApplicationMaster to the @@ -38,7 +39,17 @@ */ @Public @Stable -public interface StartContainerRequest { +public abstract class StartContainerRequest { + + public static StartContainerRequest newInstance( + ContainerLaunchContext context, Token container) { + StartContainerRequest request = + Records.newRecord(StartContainerRequest.class); + request.setContainerLaunchContext(context); + request.setContainerToken(container); + return request; + } + /** * Get the ContainerLaunchContext for the container to be started * by the NodeManager. @@ -62,9 +73,9 @@ public interface StartContainerRequest { @Public @Stable - public Token getContainerToken(); + public abstract Token getContainerToken(); @Public @Stable - public void setContainerToken(Token container); + public abstract void setContainerToken(Token container); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerResponse.java index f0f2b4fd673..5fe8963c6cb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StartContainerResponse.java @@ -24,6 +24,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ContainerManager; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the NodeManager to the @@ -34,7 +35,16 @@ */ @Public @Stable -public interface StartContainerResponse { +public abstract class StartContainerResponse { + + public static StartContainerResponse newInstance( + Map serviceResponses) { + StartContainerResponse response = + Records.newRecord(StartContainerResponse.class); + response.setAllServiceResponse(serviceResponses); + return response; + } + /** *

Get the responses from all auxiliary services running on the * NodeManager.

@@ -42,7 +52,7 @@ public interface StartContainerResponse { * and their corresponding opaque blob ByteBuffers

* @return a Map between the auxiliary service names and their outputs */ - Map getAllServiceResponse(); + public abstract Map getAllServiceResponse(); /** * Set to the list of auxiliary services which have been started on the @@ -51,5 +61,5 @@ public interface StartContainerResponse { * @param serviceResponses A map from auxiliary service names to the opaque * blob ByteBuffers for that auxiliary service */ - void setAllServiceResponse(Map serviceResponses); + public abstract void setAllServiceResponse(Map serviceResponses); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerRequest.java index 2188939705e..331ead55bf6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerRequest.java @@ -22,6 +22,7 @@ import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ContainerManager; import org.apache.hadoop.yarn.api.records.ContainerId; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by the ApplicationMaster to the @@ -31,14 +32,22 @@ */ @Public @Stable -public interface StopContainerRequest { +public abstract class StopContainerRequest { + + public static StopContainerRequest newInstance(ContainerId containerId) { + StopContainerRequest request = + Records.newRecord(StopContainerRequest.class); + request.setContainerId(containerId); + return request; + } + /** * Get the ContainerId of the container to be stopped. * @return ContainerId of container to be stopped */ @Public @Stable - ContainerId getContainerId(); + public abstract ContainerId getContainerId(); /** * Set the ContainerId of the container to be stopped. @@ -46,5 +55,5 @@ public interface StopContainerRequest { */ @Public @Stable - void setContainerId(ContainerId containerId); + public abstract void setContainerId(ContainerId containerId); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerResponse.java index c94e6987423..ad8e6baa459 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/StopContainerResponse.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ContainerManager; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the NodeManager to the @@ -33,6 +34,10 @@ */ @Public @Stable -public interface StopContainerResponse { - +public abstract class StopContainerResponse { + public static StopContainerResponse newInstance() { + StopContainerResponse response = + Records.newRecord(StopContainerResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationRequest.java index 0d548428964..94a7cf330f7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationRequest.java @@ -24,6 +24,7 @@ import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; import org.apache.hadoop.yarn.api.records.Resource; +import org.apache.hadoop.yarn.util.Records; /** *

The request sent by a client to submit an application to the @@ -39,7 +40,16 @@ */ @Public @Stable -public interface SubmitApplicationRequest { +public abstract class SubmitApplicationRequest { + + public static SubmitApplicationRequest newInstance( + ApplicationSubmissionContext context) { + SubmitApplicationRequest request = + Records.newRecord(SubmitApplicationRequest.class); + request.setApplicationSubmissionContext(context); + return request; + } + /** * Get the ApplicationSubmissionContext for the application. * @return ApplicationSubmissionContext for the application diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationResponse.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationResponse.java index 7acd24c87d7..c0d3b3bffb0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationResponse.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/SubmitApplicationResponse.java @@ -21,6 +21,7 @@ import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Stable; import org.apache.hadoop.yarn.api.ClientRMProtocol; +import org.apache.hadoop.yarn.util.Records; /** *

The response sent by the ResourceManager to a client on @@ -32,6 +33,10 @@ */ @Public @Stable -public interface SubmitApplicationResponse { - +public abstract class SubmitApplicationResponse { + public static SubmitApplicationResponse newInstance() { + SubmitApplicationResponse response = + Records.newRecord(SubmitApplicationResponse.class); + return response; + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java index e1d87289dae..9e72095fd68 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenRequestPBImpl.java @@ -21,12 +21,10 @@ import org.apache.hadoop.security.proto.SecurityProtos.CancelDelegationTokenRequestProtoOrBuilder; import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.Token; import org.apache.hadoop.yarn.api.records.impl.pb.TokenPBImpl; public class CancelDelegationTokenRequestPBImpl extends - ProtoBase implements CancelDelegationTokenRequest { CancelDelegationTokenRequestProto proto = CancelDelegationTokenRequestProto @@ -64,7 +62,6 @@ public void setDelegationToken(Token token) { this.token = token; } - @Override public CancelDelegationTokenRequestProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -72,6 +69,26 @@ public CancelDelegationTokenRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (token != null) { builder.setToken(convertToProtoFormat(this.token)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenResponsePBImpl.java index 5eb2b0713d8..7bfa509a1e3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/CancelDelegationTokenResponsePBImpl.java @@ -19,11 +19,8 @@ import org.apache.hadoop.security.proto.SecurityProtos.CancelDelegationTokenResponseProto; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; -public class CancelDelegationTokenResponsePBImpl extends - ProtoBase implements - CancelDelegationTokenResponse { +public class CancelDelegationTokenResponsePBImpl extends CancelDelegationTokenResponse { CancelDelegationTokenResponseProto proto = CancelDelegationTokenResponseProto .getDefaultInstance(); @@ -36,9 +33,27 @@ public CancelDelegationTokenResponsePBImpl( this.proto = proto; } - @Override public CancelDelegationTokenResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterRequestPBImpl.java index 01b37388192..ad3a8220a91 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterRequestPBImpl.java @@ -22,7 +22,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterRequest; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.api.records.FinalApplicationStatus; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationAttemptIdPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationAttemptIdProto; import org.apache.hadoop.yarn.proto.YarnProtos.FinalApplicationStatusProto; @@ -31,7 +30,7 @@ import org.apache.hadoop.yarn.util.ProtoUtils; -public class FinishApplicationMasterRequestPBImpl extends ProtoBase implements FinishApplicationMasterRequest { +public class FinishApplicationMasterRequestPBImpl extends FinishApplicationMasterRequest { FinishApplicationMasterRequestProto proto = FinishApplicationMasterRequestProto.getDefaultInstance(); FinishApplicationMasterRequestProto.Builder builder = null; boolean viaProto = false; @@ -55,6 +54,26 @@ public FinishApplicationMasterRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.appAttemptId != null) { builder.setApplicationAttemptId(convertToProtoFormat(this.appAttemptId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterResponsePBImpl.java index 2fcbd5782e0..c335f195c78 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/FinishApplicationMasterResponsePBImpl.java @@ -20,12 +20,11 @@ import org.apache.hadoop.yarn.api.protocolrecords.FinishApplicationMasterResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.FinishApplicationMasterResponseProto; -public class FinishApplicationMasterResponsePBImpl extends ProtoBase implements FinishApplicationMasterResponse { +public class FinishApplicationMasterResponsePBImpl extends FinishApplicationMasterResponse { FinishApplicationMasterResponseProto proto = FinishApplicationMasterResponseProto.getDefaultInstance(); FinishApplicationMasterResponseProto.Builder builder = null; boolean viaProto = false; @@ -45,6 +44,26 @@ public FinishApplicationMasterResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void maybeInitBuilder() { if (viaProto || builder == null) { builder = FinishApplicationMasterResponseProto.newBuilder(proto); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsRequestPBImpl.java index 381539ff0b5..e003e5f080e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsRequestPBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.GetAllApplicationsRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllApplicationsRequestProto; -public class GetAllApplicationsRequestPBImpl extends - ProtoBase implements GetAllApplicationsRequest { +public class GetAllApplicationsRequestPBImpl extends GetAllApplicationsRequest { GetAllApplicationsRequestProto proto = GetAllApplicationsRequestProto.getDefaultInstance(); GetAllApplicationsRequestProto.Builder builder = null; boolean viaProto = false; @@ -37,11 +35,29 @@ public GetAllApplicationsRequestPBImpl(GetAllApplicationsRequestProto proto) { viaProto = true; } - @Override public GetAllApplicationsRequestProto getProto() { proto = viaProto ? proto : builder.build(); viaProto = true; return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsResponsePBImpl.java index 956f5893262..9d93abdf297 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetAllApplicationsResponsePBImpl.java @@ -24,15 +24,13 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetAllApplicationsResponse; import org.apache.hadoop.yarn.api.records.ApplicationReport; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationReportPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationReportProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllApplicationsResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetAllApplicationsResponseProtoOrBuilder; public class GetAllApplicationsResponsePBImpl -extends ProtoBase implements -GetAllApplicationsResponse { +extends GetAllApplicationsResponse { GetAllApplicationsResponseProto proto = GetAllApplicationsResponseProto.getDefaultInstance(); @@ -64,7 +62,6 @@ public void setApplicationList(List applications) { this.applicationList = applications; } - @Override public GetAllApplicationsResponseProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -72,6 +69,26 @@ public GetAllApplicationsResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.applicationList != null) { addLocalApplicationsToProto(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportRequestPBImpl.java index e7190f157b3..2970996d4e3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportRequestPBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportRequest; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationIdPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationIdProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetApplicationReportRequestProto; @@ -29,7 +28,7 @@ -public class GetApplicationReportRequestPBImpl extends ProtoBase implements GetApplicationReportRequest { +public class GetApplicationReportRequestPBImpl extends GetApplicationReportRequest { GetApplicationReportRequestProto proto = GetApplicationReportRequestProto.getDefaultInstance(); GetApplicationReportRequestProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public GetApplicationReportRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (applicationId != null) { builder.setApplicationId(convertToProtoFormat(this.applicationId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportResponsePBImpl.java index 46f62acd5c2..fd7c87cbbc8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetApplicationReportResponsePBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetApplicationReportResponse; import org.apache.hadoop.yarn.api.records.ApplicationReport; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationReportPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationReportProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetApplicationReportResponseProto; @@ -29,7 +28,7 @@ -public class GetApplicationReportResponsePBImpl extends ProtoBase implements GetApplicationReportResponse { +public class GetApplicationReportResponsePBImpl extends GetApplicationReportResponse { GetApplicationReportResponseProto proto = GetApplicationReportResponseProto.getDefaultInstance(); GetApplicationReportResponseProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public GetApplicationReportResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.applicationReport != null) { builder.setApplicationReport(convertToProtoFormat(this.applicationReport)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsRequestPBImpl.java index 2bf3998d4a5..acef40c2dec 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsRequestPBImpl.java @@ -20,12 +20,11 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetClusterMetricsRequestProto; -public class GetClusterMetricsRequestPBImpl extends ProtoBase implements GetClusterMetricsRequest { +public class GetClusterMetricsRequestPBImpl extends GetClusterMetricsRequest { GetClusterMetricsRequestProto proto = GetClusterMetricsRequestProto.getDefaultInstance(); GetClusterMetricsRequestProto.Builder builder = null; boolean viaProto = false; @@ -45,15 +44,23 @@ public GetClusterMetricsRequestProto getProto() { return proto; } - private void maybeInitBuilder() { - if (viaProto || builder == null) { - builder = GetClusterMetricsRequestProto.newBuilder(proto); - } - viaProto = false; + @Override + public int hashCode() { + return getProto().hashCode(); } - - - + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsResponsePBImpl.java index c3269646257..5edc7187062 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterMetricsResponsePBImpl.java @@ -20,7 +20,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetClusterMetricsResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.YarnClusterMetrics; import org.apache.hadoop.yarn.api.records.impl.pb.YarnClusterMetricsPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.YarnClusterMetricsProto; @@ -29,7 +28,7 @@ -public class GetClusterMetricsResponsePBImpl extends ProtoBase implements GetClusterMetricsResponse { +public class GetClusterMetricsResponsePBImpl extends GetClusterMetricsResponse { GetClusterMetricsResponseProto proto = GetClusterMetricsResponseProto.getDefaultInstance(); GetClusterMetricsResponseProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public GetClusterMetricsResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.yarnClusterMetrics != null) { builder.setClusterMetrics(convertToProtoFormat(this.yarnClusterMetrics)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java index 98d0d5e31ac..63460088ce9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesRequestPBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetClusterNodesRequestProto; -public class GetClusterNodesRequestPBImpl extends - ProtoBase implements GetClusterNodesRequest { +public class GetClusterNodesRequestPBImpl extends GetClusterNodesRequest { GetClusterNodesRequestProto proto = GetClusterNodesRequestProto.getDefaultInstance(); GetClusterNodesRequestProto.Builder builder = null; @@ -38,11 +36,29 @@ public GetClusterNodesRequestPBImpl(GetClusterNodesRequestProto proto) { viaProto = true; } - @Override public GetClusterNodesRequestProto getProto() { proto = viaProto ? proto : builder.build(); viaProto = true; return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java index b549ce19317..688ad85b328 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetClusterNodesResponsePBImpl.java @@ -24,14 +24,12 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetClusterNodesResponse; import org.apache.hadoop.yarn.api.records.NodeReport; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.NodeReportPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.NodeReportProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetClusterNodesResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetClusterNodesResponseProtoOrBuilder; -public class GetClusterNodesResponsePBImpl extends - ProtoBase implements GetClusterNodesResponse { +public class GetClusterNodesResponsePBImpl extends GetClusterNodesResponse { GetClusterNodesResponseProto proto = GetClusterNodesResponseProto.getDefaultInstance(); @@ -63,7 +61,6 @@ public void setNodeReports(List nodeManagers) { this.nodeManagerInfoList = nodeManagers; } - @Override public GetClusterNodesResponseProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -71,6 +68,26 @@ public GetClusterNodesResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.nodeManagerInfoList != null) { addLocalNodeManagerInfosToProto(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusRequestPBImpl.java index 33e8ca3685c..7b099faa9c7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusRequestPBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusRequest; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ContainerIdPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ContainerIdProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetContainerStatusRequestProto; @@ -29,7 +28,7 @@ -public class GetContainerStatusRequestPBImpl extends ProtoBase implements GetContainerStatusRequest { +public class GetContainerStatusRequestPBImpl extends GetContainerStatusRequest { GetContainerStatusRequestProto proto = GetContainerStatusRequestProto.getDefaultInstance(); GetContainerStatusRequestProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public GetContainerStatusRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.containerId != null) { builder.setContainerId(convertToProtoFormat(this.containerId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusResponsePBImpl.java index bb5de86f815..330cb3f1ff5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetContainerStatusResponsePBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusResponse; import org.apache.hadoop.yarn.api.records.ContainerStatus; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ContainerStatusPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ContainerStatusProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetContainerStatusResponseProto; @@ -29,7 +28,7 @@ -public class GetContainerStatusResponsePBImpl extends ProtoBase implements GetContainerStatusResponse { +public class GetContainerStatusResponsePBImpl extends GetContainerStatusResponse { GetContainerStatusResponseProto proto = GetContainerStatusResponseProto.getDefaultInstance(); GetContainerStatusResponseProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public GetContainerStatusResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.containerStatus != null) { builder.setStatus(convertToProtoFormat(this.containerStatus)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenRequestPBImpl.java index 687d469b76c..c5d685660c1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenRequestPBImpl.java @@ -20,10 +20,8 @@ import org.apache.hadoop.security.proto.SecurityProtos.GetDelegationTokenRequestProto; import org.apache.hadoop.security.proto.SecurityProtos.GetDelegationTokenRequestProtoOrBuilder; import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; -public class GetDelegationTokenRequestPBImpl extends - ProtoBase implements GetDelegationTokenRequest { +public class GetDelegationTokenRequestPBImpl extends GetDelegationTokenRequest { String renewer; @@ -60,7 +58,6 @@ public void setRenewer(String renewer) { this.renewer = renewer; } - @Override public GetDelegationTokenRequestProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -68,6 +65,25 @@ public GetDelegationTokenRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } private void mergeLocalToBuilder() { if (renewer != null) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java index 59651ff0ed5..30c085f2367 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetDelegationTokenResponsePBImpl.java @@ -22,12 +22,10 @@ import org.apache.hadoop.security.proto.SecurityProtos.GetDelegationTokenResponseProtoOrBuilder; import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.GetDelegationTokenResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.Token; import org.apache.hadoop.yarn.api.records.impl.pb.TokenPBImpl; -public class GetDelegationTokenResponsePBImpl extends -ProtoBase implements GetDelegationTokenResponse { +public class GetDelegationTokenResponsePBImpl extends GetDelegationTokenResponse { Token appToken; @@ -68,7 +66,6 @@ public void setRMDelegationToken(Token appToken) { this.appToken = appToken; } - @Override public GetDelegationTokenResponseProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -76,6 +73,25 @@ public GetDelegationTokenResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } private void mergeLocalToBuilder() { if (appToken != null) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationRequestPBImpl.java index 90eae078397..885ef4f475a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationRequestPBImpl.java @@ -20,11 +20,10 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetNewApplicationRequestProto; -public class GetNewApplicationRequestPBImpl extends ProtoBase implements GetNewApplicationRequest { +public class GetNewApplicationRequestPBImpl extends GetNewApplicationRequest { GetNewApplicationRequestProto proto = GetNewApplicationRequestProto.getDefaultInstance(); GetNewApplicationRequestProto.Builder builder = null; boolean viaProto = false; @@ -44,15 +43,23 @@ public GetNewApplicationRequestProto getProto() { return proto; } - private void maybeInitBuilder() { - if (viaProto || builder == null) { - builder = GetNewApplicationRequestProto.newBuilder(proto); - } - viaProto = false; + @Override + public int hashCode() { + return getProto().hashCode(); } - - - + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java index d15f1b75274..18b8a074bee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetNewApplicationResponsePBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetNewApplicationResponse; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationIdPBImpl; import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl; @@ -30,7 +29,7 @@ import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetNewApplicationResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetNewApplicationResponseProtoOrBuilder; -public class GetNewApplicationResponsePBImpl extends ProtoBase implements GetNewApplicationResponse { +public class GetNewApplicationResponsePBImpl extends GetNewApplicationResponse { GetNewApplicationResponseProto proto = GetNewApplicationResponseProto.getDefaultInstance(); GetNewApplicationResponseProto.Builder builder = null; boolean viaProto = false; @@ -55,6 +54,26 @@ public GetNewApplicationResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (applicationId != null) { builder.setApplicationId(convertToProtoFormat(this.applicationId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoRequestPBImpl.java index aec368e5c01..db0142582e6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoRequestPBImpl.java @@ -19,12 +19,10 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueInfoRequestProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueInfoRequestProtoOrBuilder; -public class GetQueueInfoRequestPBImpl extends - ProtoBase implements GetQueueInfoRequest { +public class GetQueueInfoRequestPBImpl extends GetQueueInfoRequest { GetQueueInfoRequestProto proto = GetQueueInfoRequestProto.getDefaultInstance(); @@ -99,11 +97,29 @@ private void maybeInitBuilder() { viaProto = false; } - @Override public GetQueueInfoRequestProto getProto() { proto = viaProto ? proto : builder.build(); viaProto = true; return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoResponsePBImpl.java index 9ef3428d3b4..6f4de3f247f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueInfoResponsePBImpl.java @@ -19,15 +19,13 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.GetQueueInfoResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.QueueInfo; import org.apache.hadoop.yarn.api.records.impl.pb.QueueInfoPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.QueueInfoProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueInfoResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueInfoResponseProtoOrBuilder; -public class GetQueueInfoResponsePBImpl extends ProtoBase -implements GetQueueInfoResponse { +public class GetQueueInfoResponsePBImpl extends GetQueueInfoResponse { QueueInfo queueInfo; @@ -45,7 +43,6 @@ public GetQueueInfoResponsePBImpl(GetQueueInfoResponseProto proto) { viaProto = true; } - @Override public GetQueueInfoResponseProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -53,6 +50,26 @@ public GetQueueInfoResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + @Override public QueueInfo getQueueInfo() { if (this.queueInfo != null) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoRequestPBImpl.java index 4c56eb80f1d..824721ac167 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoRequestPBImpl.java @@ -19,12 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueUserAclsInfoRequestProto; -public class GetQueueUserAclsInfoRequestPBImpl extends - ProtoBase implements - GetQueueUserAclsInfoRequest { +public class GetQueueUserAclsInfoRequestPBImpl extends GetQueueUserAclsInfoRequest { GetQueueUserAclsInfoRequestProto proto = GetQueueUserAclsInfoRequestProto.getDefaultInstance(); @@ -40,11 +37,29 @@ public GetQueueUserAclsInfoRequestPBImpl(GetQueueUserAclsInfoRequestProto proto) viaProto = true; } - @Override public GetQueueUserAclsInfoRequestProto getProto() { proto = viaProto ? proto : builder.build(); viaProto = true; return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java index 16ef53fecc8..c0f049985c6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/GetQueueUserAclsInfoResponsePBImpl.java @@ -24,15 +24,12 @@ import org.apache.hadoop.yarn.api.protocolrecords.GetQueueUserAclsInfoResponse; import org.apache.hadoop.yarn.api.records.QueueUserACLInfo; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.QueueUserACLInfoPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.QueueUserACLInfoProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueUserAclsInfoResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.GetQueueUserAclsInfoResponseProtoOrBuilder; -public class GetQueueUserAclsInfoResponsePBImpl extends -ProtoBase -implements GetQueueUserAclsInfoResponse { +public class GetQueueUserAclsInfoResponsePBImpl extends GetQueueUserAclsInfoResponse { List queueUserAclsInfoList; @@ -65,7 +62,6 @@ public void setUserAclsInfoList(List queueUserAclsList) { this.queueUserAclsInfoList = queueUserAclsList; } - @Override public GetQueueUserAclsInfoResponseProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -73,6 +69,26 @@ public GetQueueUserAclsInfoResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.queueUserAclsInfoList != null) { addLocalQueueUserACLInfosToProto(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationRequestPBImpl.java index e2761a090be..3e3ee92d2f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationRequestPBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationRequest; import org.apache.hadoop.yarn.api.records.ApplicationId; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationIdPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationIdProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.KillApplicationRequestProto; @@ -29,7 +28,7 @@ -public class KillApplicationRequestPBImpl extends ProtoBase implements KillApplicationRequest { +public class KillApplicationRequestPBImpl extends KillApplicationRequest { KillApplicationRequestProto proto = KillApplicationRequestProto.getDefaultInstance(); KillApplicationRequestProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public KillApplicationRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.applicationId != null) { builder.setApplicationId(convertToProtoFormat(this.applicationId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationResponsePBImpl.java index 61c42fd20d7..b6dd9f1d7c1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/KillApplicationResponsePBImpl.java @@ -20,12 +20,11 @@ import org.apache.hadoop.yarn.api.protocolrecords.KillApplicationResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.KillApplicationResponseProto; -public class KillApplicationResponsePBImpl extends ProtoBase implements KillApplicationResponse { +public class KillApplicationResponsePBImpl extends KillApplicationResponse { KillApplicationResponseProto proto = KillApplicationResponseProto.getDefaultInstance(); KillApplicationResponseProto.Builder builder = null; boolean viaProto = false; @@ -45,15 +44,30 @@ public KillApplicationResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void maybeInitBuilder() { if (viaProto || builder == null) { builder = KillApplicationResponseProto.newBuilder(proto); } viaProto = false; } - - - - - } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsRequestPBImpl.java index 82436af2caf..f8dc0a135df 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsRequestPBImpl.java @@ -19,12 +19,10 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshAdminAclsRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshAdminAclsRequestProto; public class RefreshAdminAclsRequestPBImpl -extends ProtoBase -implements RefreshAdminAclsRequest { +extends RefreshAdminAclsRequest { RefreshAdminAclsRequestProto proto = RefreshAdminAclsRequestProto.getDefaultInstance(); RefreshAdminAclsRequestProto.Builder builder = null; @@ -44,4 +42,24 @@ public RefreshAdminAclsRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsResponsePBImpl.java index e15200642c6..3016bb44d85 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshAdminAclsResponsePBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshAdminAclsResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshAdminAclsResponseProto; -public class RefreshAdminAclsResponsePBImpl extends ProtoBase -implements RefreshAdminAclsResponse { +public class RefreshAdminAclsResponsePBImpl extends RefreshAdminAclsResponse { RefreshAdminAclsResponseProto proto = RefreshAdminAclsResponseProto.getDefaultInstance(); RefreshAdminAclsResponseProto.Builder builder = null; @@ -43,4 +41,24 @@ public RefreshAdminAclsResponseProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesRequestPBImpl.java index 67e9e237caa..cf4b2e04098 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesRequestPBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshNodesRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshNodesRequestProto; -public class RefreshNodesRequestPBImpl extends ProtoBase -implements RefreshNodesRequest { +public class RefreshNodesRequestPBImpl extends RefreshNodesRequest { RefreshNodesRequestProto proto = RefreshNodesRequestProto.getDefaultInstance(); RefreshNodesRequestProto.Builder builder = null; @@ -43,4 +41,24 @@ public RefreshNodesRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesResponsePBImpl.java index 3eb6e60aa99..7f204578fb8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshNodesResponsePBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshNodesResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshNodesResponseProto; -public class RefreshNodesResponsePBImpl extends ProtoBase -implements RefreshNodesResponse { +public class RefreshNodesResponsePBImpl extends RefreshNodesResponse { RefreshNodesResponseProto proto = RefreshNodesResponseProto.getDefaultInstance(); RefreshNodesResponseProto.Builder builder = null; @@ -43,4 +41,24 @@ public RefreshNodesResponseProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesRequestPBImpl.java index 9a71fad4fae..94c82381c82 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesRequestPBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshQueuesRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshQueuesRequestProto; -public class RefreshQueuesRequestPBImpl extends ProtoBase -implements RefreshQueuesRequest { +public class RefreshQueuesRequestPBImpl extends RefreshQueuesRequest { RefreshQueuesRequestProto proto = RefreshQueuesRequestProto.getDefaultInstance(); RefreshQueuesRequestProto.Builder builder = null; @@ -43,4 +41,24 @@ public RefreshQueuesRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesResponsePBImpl.java index dfccb68a020..badb2d0e566 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshQueuesResponsePBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshQueuesResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshQueuesResponseProto; -public class RefreshQueuesResponsePBImpl extends ProtoBase -implements RefreshQueuesResponse { +public class RefreshQueuesResponsePBImpl extends RefreshQueuesResponse { RefreshQueuesResponseProto proto = RefreshQueuesResponseProto.getDefaultInstance(); RefreshQueuesResponseProto.Builder builder = null; @@ -43,4 +41,24 @@ public RefreshQueuesResponseProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsRequestPBImpl.java index 6b6250a946f..599ce350666 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsRequestPBImpl.java @@ -19,12 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshServiceAclsRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshServiceAclsRequestProto; -public class RefreshServiceAclsRequestPBImpl -extends ProtoBase -implements RefreshServiceAclsRequest { +public class RefreshServiceAclsRequestPBImpl extends RefreshServiceAclsRequest { RefreshServiceAclsRequestProto proto = RefreshServiceAclsRequestProto.getDefaultInstance(); @@ -46,4 +43,24 @@ public RefreshServiceAclsRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsResponsePBImpl.java index ad0443022ab..e8603756fc6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshServiceAclsResponsePBImpl.java @@ -19,12 +19,10 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshServiceAclsResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshServiceAclsResponseProto; -public class RefreshServiceAclsResponsePBImpl -extends ProtoBase -implements RefreshServiceAclsResponse { +public class RefreshServiceAclsResponsePBImpl extends + RefreshServiceAclsResponse { RefreshServiceAclsResponseProto proto = RefreshServiceAclsResponseProto.getDefaultInstance(); @@ -46,4 +44,24 @@ public RefreshServiceAclsResponseProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationRequestPBImpl.java index 94a2ff47bc2..9da26edefc3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationRequestPBImpl.java @@ -19,12 +19,10 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshSuperUserGroupsConfigurationRequestProto; public class RefreshSuperUserGroupsConfigurationRequestPBImpl -extends ProtoBase -implements RefreshSuperUserGroupsConfigurationRequest { +extends RefreshSuperUserGroupsConfigurationRequest { RefreshSuperUserGroupsConfigurationRequestProto proto = RefreshSuperUserGroupsConfigurationRequestProto.getDefaultInstance(); RefreshSuperUserGroupsConfigurationRequestProto.Builder builder = null; @@ -44,4 +42,24 @@ public RefreshSuperUserGroupsConfigurationRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationResponsePBImpl.java index b6f10769e3d..70860591310 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshSuperUserGroupsConfigurationResponsePBImpl.java @@ -22,8 +22,7 @@ import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshSuperUserGroupsConfigurationResponseProto; -public class RefreshSuperUserGroupsConfigurationResponsePBImpl extends ProtoBase -implements RefreshSuperUserGroupsConfigurationResponse { +public class RefreshSuperUserGroupsConfigurationResponsePBImpl extends RefreshSuperUserGroupsConfigurationResponse { RefreshSuperUserGroupsConfigurationResponseProto proto = RefreshSuperUserGroupsConfigurationResponseProto.getDefaultInstance(); RefreshSuperUserGroupsConfigurationResponseProto.Builder builder = null; @@ -43,4 +42,24 @@ public RefreshSuperUserGroupsConfigurationResponseProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsRequestPBImpl.java index 8dfbdc38550..cae1fed0bd1 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsRequestPBImpl.java @@ -19,12 +19,10 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshUserToGroupsMappingsRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshUserToGroupsMappingsRequestProto; public class RefreshUserToGroupsMappingsRequestPBImpl -extends ProtoBase -implements RefreshUserToGroupsMappingsRequest { +extends RefreshUserToGroupsMappingsRequest { RefreshUserToGroupsMappingsRequestProto proto = RefreshUserToGroupsMappingsRequestProto.getDefaultInstance(); RefreshUserToGroupsMappingsRequestProto.Builder builder = null; @@ -44,4 +42,24 @@ public RefreshUserToGroupsMappingsRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsResponsePBImpl.java index 791664e995a..89cd41fbebb 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RefreshUserToGroupsMappingsResponsePBImpl.java @@ -19,11 +19,9 @@ package org.apache.hadoop.yarn.api.protocolrecords.impl.pb; import org.apache.hadoop.yarn.api.protocolrecords.RefreshUserToGroupsMappingsResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServerResourceManagerServiceProtos.RefreshUserToGroupsMappingsResponseProto; -public class RefreshUserToGroupsMappingsResponsePBImpl extends ProtoBase -implements RefreshUserToGroupsMappingsResponse { +public class RefreshUserToGroupsMappingsResponsePBImpl extends RefreshUserToGroupsMappingsResponse { RefreshUserToGroupsMappingsResponseProto proto = RefreshUserToGroupsMappingsResponseProto.getDefaultInstance(); RefreshUserToGroupsMappingsResponseProto.Builder builder = null; @@ -43,4 +41,24 @@ public RefreshUserToGroupsMappingsResponseProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterRequestPBImpl.java index 1ab27773f24..999a515febe 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterRequestPBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationAttemptIdPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationAttemptIdProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.RegisterApplicationMasterRequestProto; @@ -29,7 +28,7 @@ -public class RegisterApplicationMasterRequestPBImpl extends ProtoBase implements RegisterApplicationMasterRequest { +public class RegisterApplicationMasterRequestPBImpl extends RegisterApplicationMasterRequest { RegisterApplicationMasterRequestProto proto = RegisterApplicationMasterRequestProto.getDefaultInstance(); RegisterApplicationMasterRequestProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public RegisterApplicationMasterRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.applicationAttemptId != null && !((ApplicationAttemptIdPBImpl)this.applicationAttemptId).getProto().equals(builder.getApplicationAttemptId())) { builder.setApplicationAttemptId(convertToProtoFormat(this.applicationAttemptId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java index b8612826fd7..aeeba997e30 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RegisterApplicationMasterResponsePBImpl.java @@ -26,7 +26,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse; import org.apache.hadoop.yarn.api.records.ApplicationAccessType; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.Resource; import org.apache.hadoop.yarn.api.records.impl.pb.ResourcePBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationACLMapProto; @@ -36,9 +35,8 @@ import org.apache.hadoop.yarn.util.ProtoUtils; -public class RegisterApplicationMasterResponsePBImpl -extends ProtoBase -implements RegisterApplicationMasterResponse { +public class RegisterApplicationMasterResponsePBImpl extends + RegisterApplicationMasterResponse { RegisterApplicationMasterResponseProto proto = RegisterApplicationMasterResponseProto.getDefaultInstance(); RegisterApplicationMasterResponseProto.Builder builder = null; @@ -64,6 +62,26 @@ public RegisterApplicationMasterResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToProto() { if (viaProto) maybeInitBuilder(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java index 963a714e8f0..bcffa17be78 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenRequestPBImpl.java @@ -21,12 +21,10 @@ import org.apache.hadoop.security.proto.SecurityProtos.RenewDelegationTokenRequestProtoOrBuilder; import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenRequest; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.Token; import org.apache.hadoop.yarn.api.records.impl.pb.TokenPBImpl; public class RenewDelegationTokenRequestPBImpl extends - ProtoBase implements RenewDelegationTokenRequest { RenewDelegationTokenRequestProto proto = RenewDelegationTokenRequestProto.getDefaultInstance(); @@ -63,7 +61,6 @@ public void setDelegationToken(Token token) { this.token = token; } - @Override public RenewDelegationTokenRequestProto getProto() { mergeLocalToProto(); proto = viaProto ? proto : builder.build(); @@ -71,6 +68,25 @@ public RenewDelegationTokenRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } private void mergeLocalToBuilder() { if (token != null) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenResponsePBImpl.java index ae1acc7ce1d..bd8fd54daf3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/RenewDelegationTokenResponsePBImpl.java @@ -22,8 +22,7 @@ import org.apache.hadoop.yarn.api.protocolrecords.RenewDelegationTokenResponse; import org.apache.hadoop.yarn.api.records.ProtoBase; -public class RenewDelegationTokenResponsePBImpl extends - ProtoBase implements +public class RenewDelegationTokenResponsePBImpl extends RenewDelegationTokenResponse { RenewDelegationTokenResponseProto proto = @@ -41,13 +40,32 @@ public RenewDelegationTokenResponsePBImpl ( this.viaProto = true; } - @Override public RenewDelegationTokenResponseProto getProto() { proto = viaProto ? proto : builder.build(); viaProto = true; return proto; } - + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void maybeInitBuilder() { if (viaProto || builder == null) { builder = RenewDelegationTokenResponseProto.newBuilder(proto); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerRequestPBImpl.java index fdb7e8854bb..65156e8419c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerRequestPBImpl.java @@ -22,7 +22,6 @@ import org.apache.hadoop.security.proto.SecurityProtos.TokenProto; import org.apache.hadoop.yarn.api.protocolrecords.StartContainerRequest; import org.apache.hadoop.yarn.api.records.ContainerLaunchContext; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.Token; import org.apache.hadoop.yarn.api.records.impl.pb.ContainerLaunchContextPBImpl; import org.apache.hadoop.yarn.api.records.impl.pb.TokenPBImpl; @@ -32,7 +31,7 @@ -public class StartContainerRequestPBImpl extends ProtoBase implements StartContainerRequest { +public class StartContainerRequestPBImpl extends StartContainerRequest { StartContainerRequestProto proto = StartContainerRequestProto.getDefaultInstance(); StartContainerRequestProto.Builder builder = null; boolean viaProto = false; @@ -57,6 +56,26 @@ public StartContainerRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.containerLaunchContext != null) { builder.setContainerLaunchContext(convertToProtoFormat(this.containerLaunchContext)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerResponsePBImpl.java index b175b29f06d..1fb9ad0cc81 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StartContainerResponsePBImpl.java @@ -22,17 +22,18 @@ import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Iterator; -import java.util.Map; import java.util.List; - +import java.util.Map; import org.apache.hadoop.yarn.api.protocolrecords.StartContainerResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; +import org.apache.hadoop.yarn.proto.YarnProtos.StringBytesMapProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.StartContainerResponseProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.StartContainerResponseProtoOrBuilder; -import org.apache.hadoop.yarn.proto.YarnProtos.StringBytesMapProto; +import org.apache.hadoop.yarn.util.ProtoUtils; + +import com.google.protobuf.ByteString; -public class StartContainerResponsePBImpl extends ProtoBase implements StartContainerResponse { +public class StartContainerResponsePBImpl extends StartContainerResponse { StartContainerResponseProto proto = StartContainerResponseProto.getDefaultInstance(); StartContainerResponseProto.Builder builder = null; boolean viaProto = false; @@ -55,12 +56,40 @@ public synchronized StartContainerResponseProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private synchronized void mergeLocalToBuilder() { if (this.serviceResponse != null) { addServiceResponseToProto(); } } + protected final ByteBuffer convertFromProtoFormat(ByteString byteString) { + return ProtoUtils.convertFromProtoFormat(byteString); + } + + protected final ByteString convertToProtoFormat(ByteBuffer byteBuffer) { + return ProtoUtils.convertToProtoFormat(byteBuffer); + } + private synchronized void mergeLocalToProto() { if (viaProto) { maybeInitBuilder(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerRequestPBImpl.java index 1aa59cf90a8..9fdce997de7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerRequestPBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.StopContainerRequest; import org.apache.hadoop.yarn.api.records.ContainerId; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ContainerIdPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ContainerIdProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.StopContainerRequestProto; @@ -29,7 +28,7 @@ -public class StopContainerRequestPBImpl extends ProtoBase implements StopContainerRequest { +public class StopContainerRequestPBImpl extends StopContainerRequest { StopContainerRequestProto proto = StopContainerRequestProto.getDefaultInstance(); StopContainerRequestProto.Builder builder = null; boolean viaProto = false; @@ -53,6 +52,26 @@ public StopContainerRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToBuilder() { if (this.containerId != null) { builder.setContainerId(convertToProtoFormat(this.containerId)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerResponsePBImpl.java index d9c06193ee3..18ac1678fdf 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/StopContainerResponsePBImpl.java @@ -20,12 +20,11 @@ import org.apache.hadoop.yarn.api.protocolrecords.StopContainerResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.StopContainerResponseProto; -public class StopContainerResponsePBImpl extends ProtoBase implements StopContainerResponse { +public class StopContainerResponsePBImpl extends StopContainerResponse { StopContainerResponseProto proto = StopContainerResponseProto.getDefaultInstance(); StopContainerResponseProto.Builder builder = null; boolean viaProto = false; @@ -44,16 +43,24 @@ public StopContainerResponseProto getProto() { viaProto = true; return proto; } - - private void maybeInitBuilder() { - if (viaProto || builder == null) { - builder = StopContainerResponseProto.newBuilder(proto); - } - viaProto = false; - } - - - - + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationRequestPBImpl.java index 10b2e2669c5..c3f1b4b919b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationRequestPBImpl.java @@ -21,7 +21,6 @@ import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationRequest; import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.api.records.impl.pb.ApplicationSubmissionContextPBImpl; import org.apache.hadoop.yarn.proto.YarnProtos.ApplicationSubmissionContextProto; import org.apache.hadoop.yarn.proto.YarnServiceProtos.SubmitApplicationRequestProto; @@ -29,7 +28,7 @@ -public class SubmitApplicationRequestPBImpl extends ProtoBase implements SubmitApplicationRequest { +public class SubmitApplicationRequestPBImpl extends SubmitApplicationRequest { SubmitApplicationRequestProto proto = SubmitApplicationRequestProto.getDefaultInstance(); SubmitApplicationRequestProto.Builder builder = null; boolean viaProto = false; @@ -52,6 +51,26 @@ public SubmitApplicationRequestProto getProto() { viaProto = true; return proto; } + + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } private void mergeLocalToBuilder() { if (this.applicationSubmissionContext != null) { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationResponsePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationResponsePBImpl.java index 21956322fb4..1818b3a093d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationResponsePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/protocolrecords/impl/pb/SubmitApplicationResponsePBImpl.java @@ -20,12 +20,11 @@ import org.apache.hadoop.yarn.api.protocolrecords.SubmitApplicationResponse; -import org.apache.hadoop.yarn.api.records.ProtoBase; import org.apache.hadoop.yarn.proto.YarnServiceProtos.SubmitApplicationResponseProto; -public class SubmitApplicationResponsePBImpl extends ProtoBase implements SubmitApplicationResponse { +public class SubmitApplicationResponsePBImpl extends SubmitApplicationResponse { SubmitApplicationResponseProto proto = SubmitApplicationResponseProto.getDefaultInstance(); SubmitApplicationResponseProto.Builder builder = null; boolean viaProto = false; @@ -45,15 +44,23 @@ public SubmitApplicationResponseProto getProto() { return proto; } - private void maybeInitBuilder() { - if (viaProto || builder == null) { - builder = SubmitApplicationResponseProto.newBuilder(proto); - } - viaProto = false; + @Override + public int hashCode() { + return getProto().hashCode(); } - - - + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/PreemptionResourceRequest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/PreemptionResourceRequest.java index 99c8d556469..d6982c757f5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/PreemptionResourceRequest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/PreemptionResourceRequest.java @@ -22,13 +22,21 @@ import org.apache.hadoop.classification.InterfaceStability.Evolving; import org.apache.hadoop.classification.InterfaceStability.Unstable; import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest; +import org.apache.hadoop.yarn.util.Records; /** * Description of resources requested back by the cluster. * @see PreemptionContract * @see AllocateRequest#setAskList(java.util.List) */ -public interface PreemptionResourceRequest { +public abstract class PreemptionResourceRequest { + + public static PreemptionResourceRequest newInstance(ResourceRequest req) { + PreemptionResourceRequest request = + Records.newRecord(PreemptionResourceRequest.class); + request.setResourceRequest(req); + return request; + } /** * @return Resource described in this request, to be matched against running @@ -36,10 +44,9 @@ public interface PreemptionResourceRequest { */ @Public @Evolving - public ResourceRequest getResourceRequest(); + public abstract ResourceRequest getResourceRequest(); @Private @Unstable - public void setResourceRequest(ResourceRequest req); - + public abstract void setResourceRequest(ResourceRequest req); } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContainerPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContainerPBImpl.java index edbb5d01f0d..a67e37a36ee 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContainerPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContainerPBImpl.java @@ -48,6 +48,26 @@ public synchronized PreemptionContainerProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToProto() { if (viaProto) maybeInitBuilder(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContractPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContractPBImpl.java index 129f653aac2..e6b97c3838d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContractPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionContractPBImpl.java @@ -56,6 +56,26 @@ public synchronized PreemptionContractProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToProto() { if (viaProto) maybeInitBuilder(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionMessagePBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionMessagePBImpl.java index 825ce6e7ec4..1163b0015ed 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionMessagePBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionMessagePBImpl.java @@ -50,6 +50,26 @@ public synchronized PreemptionMessageProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToProto() { if (viaProto) maybeInitBuilder(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionResourceRequestPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionResourceRequestPBImpl.java index 7d51ab612f8..3297fe55620 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionResourceRequestPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/PreemptionResourceRequestPBImpl.java @@ -23,7 +23,7 @@ import org.apache.hadoop.yarn.proto.YarnProtos.PreemptionResourceRequestProtoOrBuilder; import org.apache.hadoop.yarn.proto.YarnProtos.ResourceRequestProto; -public class PreemptionResourceRequestPBImpl implements PreemptionResourceRequest { +public class PreemptionResourceRequestPBImpl extends PreemptionResourceRequest { PreemptionResourceRequestProto proto = PreemptionResourceRequestProto.getDefaultInstance(); @@ -48,6 +48,26 @@ public synchronized PreemptionResourceRequestProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToProto() { if (viaProto) maybeInitBuilder(); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/StrictPreemptionContractPBImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/StrictPreemptionContractPBImpl.java index b8f92012623..4e06b87801a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/StrictPreemptionContractPBImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/StrictPreemptionContractPBImpl.java @@ -53,6 +53,26 @@ public synchronized StrictPreemptionContractProto getProto() { return proto; } + @Override + public int hashCode() { + return getProto().hashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == null) + return false; + if (other.getClass().isAssignableFrom(this.getClass())) { + return this.getProto().equals(this.getClass().cast(other).getProto()); + } + return false; + } + + @Override + public String toString() { + return getProto().toString().replaceAll("\\n", ", ").replaceAll("\\s+", " "); + } + private void mergeLocalToProto() { if (viaProto) maybeInitBuilder();