(minor code and import cleanup by stevel)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/e6dd7293 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/e6dd7293 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/e6dd7293 Branch: refs/heads/develop Commit: e6dd72936a990ac0a69ad38d9249edc16c1a152f Parents: 78a37ad Author: Steve Loughran <[email protected]> Authored: Fri Sep 25 18:23:47 2015 +0100 Committer: Steve Loughran <[email protected]> Committed: Fri Sep 25 18:23:57 2015 +0100 ---------------------------------------------------------------------- .../appmaster/AppMasterActionOperations.java | 3 -- .../appmaster/rpc/SliderClusterProtocolPB.java | 2 +- .../rpc/SliderClusterProtocolPBImpl.java | 39 ++++++++------------ 3 files changed, 16 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6dd7293/slider-core/src/main/java/org/apache/slider/server/appmaster/AppMasterActionOperations.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/AppMasterActionOperations.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/AppMasterActionOperations.java index d78b718..288f25a 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/AppMasterActionOperations.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/AppMasterActionOperations.java @@ -18,11 +18,8 @@ package org.apache.slider.server.appmaster; -import org.apache.slider.server.appmaster.operations.AbstractRMOperation; import org.apache.slider.server.appmaster.operations.RMOperationHandlerActions; -import java.util.List; - /** * Interface of AM operations */ http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6dd7293/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPB.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPB.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPB.java index 9d4ea99..7d237de 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPB.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPB.java @@ -23,5 +23,5 @@ import org.apache.slider.api.proto.SliderClusterAPI; public interface SliderClusterProtocolPB extends SliderClusterAPI.SliderClusterProtocolPB.BlockingInterface{ - public static final long versionID = SliderClusterProtocol.versionID; + long versionID = SliderClusterProtocol.versionID; } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/e6dd7293/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPBImpl.java ---------------------------------------------------------------------- diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPBImpl.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPBImpl.java index c597626..50534d2 100644 --- a/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPBImpl.java +++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/rpc/SliderClusterProtocolPBImpl.java @@ -26,7 +26,7 @@ import org.apache.slider.api.proto.Messages; import java.io.IOException; /** - * Relay from Protobuf to internal RPC. + * Server-side Relay from Protobuf to internal RPC. * */ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @@ -44,15 +44,14 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { return new ServiceException(e); } - public long getProtocolVersion(String protocol, long clientVersion) throws - IOException { + public long getProtocolVersion(String protocol, long clientVersion) + throws IOException { return SliderClusterProtocol.versionID; } - + @Override public Messages.StopClusterResponseProto stopCluster(RpcController controller, - Messages.StopClusterRequestProto request) throws - ServiceException { + Messages.StopClusterRequestProto request) throws ServiceException { try { return real.stopCluster(request); } catch (Exception e) { @@ -62,8 +61,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.UpgradeContainersResponseProto upgradeContainers(RpcController controller, - Messages.UpgradeContainersRequestProto request) throws - ServiceException { + Messages.UpgradeContainersRequestProto request) throws ServiceException { try { return real.upgradeContainers(request); } catch (Exception e) { @@ -73,8 +71,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.FlexClusterResponseProto flexCluster(RpcController controller, - Messages.FlexClusterRequestProto request) throws - ServiceException { + Messages.FlexClusterRequestProto request) throws ServiceException { try { return real.flexCluster(request); } catch (Exception e) { @@ -97,8 +94,8 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.GetInstanceDefinitionResponseProto getInstanceDefinition( RpcController controller, - Messages.GetInstanceDefinitionRequestProto request) throws - ServiceException { + Messages.GetInstanceDefinitionRequestProto request) + throws ServiceException { try { return real.getInstanceDefinition(request); } catch (Exception e) { @@ -119,8 +116,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.GetNodeResponseProto getNode(RpcController controller, - Messages.GetNodeRequestProto request) throws - ServiceException { + Messages.GetNodeRequestProto request) throws ServiceException { try { return real.getNode(request); } catch (Exception e) { @@ -130,8 +126,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.GetClusterNodesResponseProto getClusterNodes(RpcController controller, - Messages.GetClusterNodesRequestProto request) throws - ServiceException { + Messages.GetClusterNodesRequestProto request) throws ServiceException { try { return real.getClusterNodes(request); } catch (Exception e) { @@ -141,8 +136,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.EchoResponseProto echo(RpcController controller, - Messages.EchoRequestProto request) throws - ServiceException { + Messages.EchoRequestProto request) throws ServiceException { try { return real.echo(request); } catch (Exception e) { @@ -152,8 +146,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.KillContainerResponseProto killContainer(RpcController controller, - Messages.KillContainerRequestProto request) throws - ServiceException { + Messages.KillContainerRequestProto request) throws ServiceException { try { return real.killContainer(request); } catch (Exception e) { @@ -163,8 +156,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.AMSuicideResponseProto amSuicide(RpcController controller, - Messages.AMSuicideRequestProto request) throws - ServiceException { + Messages.AMSuicideRequestProto request) throws ServiceException { try { return real.amSuicide(request); } catch (Exception e) { @@ -175,8 +167,7 @@ public class SliderClusterProtocolPBImpl implements SliderClusterProtocolPB { @Override public Messages.ApplicationLivenessInformationProto getLivenessInformation( RpcController controller, - Messages.GetApplicationLivenessRequestProto request) throws - ServiceException { + Messages.GetApplicationLivenessRequestProto request) throws ServiceException { try { return real.getLivenessInformation(request); } catch (Exception e) {
