Repository: incubator-reef Updated Branches: refs/heads/master 593690f93 -> 35674a3df
[REEF-553] Remove code that has been deprecated during checkstyle violations cleanup This addressed the issue by * Removing deprecated fields and methods JIRA: [REEF-553](https://issues.apache.org/jira/browse/REEF-553) Pull Request: This closes #353 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/35674a3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/35674a3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/35674a3d Branch: refs/heads/master Commit: 35674a3df485838c69bde815fbcde9e27b366ca5 Parents: 593690f Author: Mariia Mykhailova <[email protected]> Authored: Fri Aug 7 13:11:14 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Fri Aug 7 13:45:01 2015 -0700 ---------------------------------------------------------------------- .../org/apache/reef/client/LauncherStatus.java | 18 ------------------ .../evaluator/EvaluatorMessageDispatcher.java | 18 ------------------ .../org/apache/reef/util/logging/LogParser.java | 14 -------------- .../reef/tang/util/ReflectionUtilities.java | 7 ------- .../ports/parameters/TcpPortRangeBegin.java | 6 ------ .../ports/parameters/TcpPortRangeCount.java | 6 ------ .../ports/parameters/TcpPortRangeTryCount.java | 6 ------ .../reef/webserver/ReefEventStateManager.java | 10 ---------- 8 files changed, 85 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java index c956b82..debda62 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/client/LauncherStatus.java @@ -47,28 +47,10 @@ public final class LauncherStatus { return new LauncherStatus(State.FAILED, ex); } - /** - * @deprecated in 0.12. Use Failed instead - */ - @Deprecated - @SuppressWarnings("checkstyle:methodname") - public static LauncherStatus FAILED(final Throwable ex) { - return failed(ex); - } - public static LauncherStatus failed(final Optional<Throwable> ex) { return new LauncherStatus(State.FAILED, ex.orElse(null)); } - /** - * @deprecated in 0.12. Use Failed instead - */ - @Deprecated - @SuppressWarnings("checkstyle:methodname") - public static LauncherStatus FAILED(final Optional<Throwable> ex) { - return failed(ex); - } - public Optional<Throwable> getError() { return this.error; } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java index 70ffffb..2fda8c6 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorMessageDispatcher.java @@ -240,28 +240,10 @@ public final class EvaluatorMessageDispatcher { this.dispatchForRestartedDriver(ActiveContext.class, activeContext); } - /* - * @deprecated in 0.12. Use onDriverRestartContextActive instead - */ - @Deprecated - @SuppressWarnings("checkstyle:methodname") - public void OnDriverRestartContextActive1(final ActiveContext activeContext) { - onDriverRestartContextActive(activeContext); - } - public void onDriverRestartCompleted(final DriverRestartCompleted restartCompleted) { this.dispatchForRestartedDriver(DriverRestartCompleted.class, restartCompleted); } - /* - * @deprecated in 0.12. Use onDriverRestartCompleted instead - */ - @Deprecated - @SuppressWarnings("checkstyle:methodname") - public void OnDriverRestartCompleted1(final DriverRestartCompleted restartCompleted) { - onDriverRestartCompleted(restartCompleted); - } - boolean isEmpty() { return this.applicationDispatcher.isEmpty(); } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java index 67fb5d1..9c50aa9 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/util/logging/LogParser.java @@ -41,13 +41,6 @@ public final class LogParser { LoggingScopeImpl.EXIT_PREFIX + LoggingScopeFactory.TASK_COMPLETE }; - /** - * @deprecated in 0.12. Use END_INDICATORS instead - */ - @Deprecated - @SuppressWarnings("checkstyle:constantname") - public static final String[] endIndicators = END_INDICATORS; - public static final String[] START_INDICATORS = { LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.DRIVER_START, LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.BRIDGE_SETUP, @@ -60,13 +53,6 @@ public final class LogParser { LoggingScopeImpl.START_PREFIX + LoggingScopeFactory.TASK_COMPLETE }; - /** - * @deprecated in 0.12. Use START_INDICATORS instead - */ - @Deprecated - @SuppressWarnings("checkstyle:constantname") - public static final String[] startIndicators = START_INDICATORS; - private LogParser() { } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java index a91e18e..2cc02a5 100644 --- a/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java +++ b/lang/java/reef-tang/tang/src/main/java/org/apache/reef/tang/util/ReflectionUtilities.java @@ -32,13 +32,6 @@ public final class ReflectionUtilities { * This is used to split Java classnames. Currently, we split on . and on $ */ public static final String REGEXP = "[\\.\\$]"; - /** - * This is used to split Java classnames. Currently, we split on . and on $ - * @deprecated in 0.12. Use onClientKill instead - */ - @Deprecated - @SuppressWarnings("checkstyle:constantname") - public static final String regexp = "[\\.\\$]"; /** * A map from numeric classes to the number of bits used by their representations. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeBegin.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeBegin.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeBegin.java index de580d9..b6a7aa0 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeBegin.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeBegin.java @@ -27,12 +27,6 @@ import org.apache.reef.tang.annotations.NamedParameter; @NamedParameter(doc = "First tcp port number to try", default_value = TcpPortRangeBegin.DEFAULT_VALUE) public final class TcpPortRangeBegin implements Name<Integer> { public static final String DEFAULT_VALUE = "10000"; - /** - * @deprecated in 0.12. Use DEFAULT_VALUE instead - */ - @Deprecated - @SuppressWarnings("checkstyle:constantname") - public static final String default_value = DEFAULT_VALUE; /** * Empty private constructor to prohibit instantiation of utility class. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeCount.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeCount.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeCount.java index e659a32..ee5879d 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeCount.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeCount.java @@ -27,12 +27,6 @@ import org.apache.reef.tang.annotations.NamedParameter; @NamedParameter(doc = "Number of tcp ports in the range", default_value = TcpPortRangeCount.DEFAULT_VALUE) public final class TcpPortRangeCount implements Name<Integer> { public static final String DEFAULT_VALUE = "10000"; - /** - * @deprecated in 0.12. Use DEFAULT_VALUE instead - */ - @Deprecated - @SuppressWarnings("checkstyle:constantname") - public static final String default_value = DEFAULT_VALUE; /** * Empty private constructor to prohibit instantiation of utility class. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeTryCount.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeTryCount.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeTryCount.java index 256b8e4..60cedea 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeTryCount.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/parameters/TcpPortRangeTryCount.java @@ -27,12 +27,6 @@ import org.apache.reef.tang.annotations.NamedParameter; @NamedParameter(doc = "Max number tries for port numbers", default_value = TcpPortRangeTryCount.DEFAULT_VALUE) public final class TcpPortRangeTryCount implements Name<Integer> { public static final String DEFAULT_VALUE = "1000"; - /** - * @deprecated in 0.12. Use DEFAULT_VALUE instead - */ - @Deprecated - @SuppressWarnings("checkstyle:constantname") - public static final String default_value = DEFAULT_VALUE; /** * Empty private constructor to prohibit instantiation of utility class. http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/35674a3d/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java index 60468f8..0f2aa73 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/ReefEventStateManager.java @@ -213,16 +213,6 @@ public final class ReefEventStateManager { } /** - * Kill driver by calling onComplete() . This method is called when client wants to kill the driver and evaluators. - * @deprecated in 0.12. Use onClientKill instead - */ - @Deprecated - @SuppressWarnings("checkstyle:methodname") - public void OnClientKill() { - onClientKill(); - } - - /** * Job Driver is ready and the clock is set up. */ public final class StartStateHandler implements EventHandler<StartTime> {
