Repository: incubator-ratis Updated Branches: refs/heads/master d7fb566c4 -> e0a90d788
RATIS-28 addendum: previous commit missing the interface changes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ratis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ratis/commit/e0a90d78 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ratis/tree/e0a90d78 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ratis/diff/e0a90d78 Branch: refs/heads/master Commit: e0a90d788b583cdf5658ee246f0b7b00eae957b7 Parents: d7fb566 Author: Tsz-Wo Nicholas Sze <[email protected]> Authored: Fri Feb 24 16:20:13 2017 -0800 Committer: Tsz-Wo Nicholas Sze <[email protected]> Committed: Fri Feb 24 16:20:13 2017 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/ratis/RaftConfigKeys.java | 12 ++++++------ .../java/org/apache/ratis/netty/NettyConfigKeys.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/e0a90d78/ratis-common/src/main/java/org/apache/ratis/RaftConfigKeys.java ---------------------------------------------------------------------- diff --git a/ratis-common/src/main/java/org/apache/ratis/RaftConfigKeys.java b/ratis-common/src/main/java/org/apache/ratis/RaftConfigKeys.java index f3a5942..4155023 100644 --- a/ratis-common/src/main/java/org/apache/ratis/RaftConfigKeys.java +++ b/ratis-common/src/main/java/org/apache/ratis/RaftConfigKeys.java @@ -25,17 +25,17 @@ import java.util.function.BiFunction; public interface RaftConfigKeys { String PREFIX = "raft"; - abstract class Rpc { - public static final String PREFIX = RaftConfigKeys.PREFIX + ".rpc"; + interface Rpc { + String PREFIX = RaftConfigKeys.PREFIX + ".rpc"; - public static final String TYPE_KEY = PREFIX + ".type"; - public static final RpcType TYPE_DEFAULT = RpcType.GRPC; + String TYPE_KEY = PREFIX + ".type"; + RpcType TYPE_DEFAULT = RpcType.GRPC; - public static RpcType type(BiFunction<String, RpcType, RpcType> getRpcType) { + static RpcType type(BiFunction<String, RpcType, RpcType> getRpcType) { return ConfUtils.get(getRpcType, TYPE_KEY, TYPE_DEFAULT); } - public static void setType(BiConsumer<String, RpcType> setRpcType, RpcType type) { + static void setType(BiConsumer<String, RpcType> setRpcType, RpcType type) { ConfUtils.set(setRpcType, TYPE_KEY, type); } } http://git-wip-us.apache.org/repos/asf/incubator-ratis/blob/e0a90d78/ratis-netty/src/main/java/org/apache/ratis/netty/NettyConfigKeys.java ---------------------------------------------------------------------- diff --git a/ratis-netty/src/main/java/org/apache/ratis/netty/NettyConfigKeys.java b/ratis-netty/src/main/java/org/apache/ratis/netty/NettyConfigKeys.java index 07d131c..5cdeb65 100644 --- a/ratis-netty/src/main/java/org/apache/ratis/netty/NettyConfigKeys.java +++ b/ratis-netty/src/main/java/org/apache/ratis/netty/NettyConfigKeys.java @@ -25,17 +25,17 @@ import java.util.function.BiFunction; public interface NettyConfigKeys { String PREFIX = "raft.netty"; - abstract class Server { - static String PREFIX = NettyConfigKeys.PREFIX + ".server"; + interface Server { + String PREFIX = NettyConfigKeys.PREFIX + ".server"; - public static String PORT_KEY = PREFIX + ".port"; - public static int PORT_DEFAULT = 0; + String PORT_KEY = PREFIX + ".port"; + int PORT_DEFAULT = 0; - public static int port(BiFunction<String, Integer, Integer> getInt) { + static int port(BiFunction<String, Integer, Integer> getInt) { return ConfUtils.getInt(getInt, PORT_KEY, PORT_DEFAULT, 0, 65536); } - public static void setPort(BiConsumer<String, Integer> setString, int port) { + static void setPort(BiConsumer<String, Integer> setString, int port) { ConfUtils.setInt(setString, PORT_KEY, port); } }
