http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/5c897d53/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java index 65643c3..2f9183b 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/messaging/driver/DriverMessaging.java @@ -154,7 +154,7 @@ public final class DriverMessaging { public void onNext(final FailedJob job) { LOG.log(Level.SEVERE, "Received an error for job " + job.getId(), job.getReason().orElse(null)); synchronized (DriverMessaging.this) { - DriverMessaging.this.status = LauncherStatus.FAILED(job.getReason()); + DriverMessaging.this.status = LauncherStatus.failed(job.getReason()); DriverMessaging.this.notify(); } } @@ -165,7 +165,7 @@ public final class DriverMessaging { public void onNext(final FailedRuntime error) { LOG.log(Level.SEVERE, "Received a runtime error: " + error, error.getReason().orElse(null)); synchronized (DriverMessaging.this) { - DriverMessaging.this.status = LauncherStatus.FAILED(error.getReason()); + DriverMessaging.this.status = LauncherStatus.failed(error.getReason()); DriverMessaging.this.notify(); } }
http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/5c897d53/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java index fb677d3..17446cc 100644 --- a/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java +++ b/lang/java/reef-wake/wake/src/main/java/org/apache/reef/wake/remote/ports/RangeTcpPortProvider.java @@ -59,13 +59,14 @@ public final class RangeTcpPortProvider implements TcpPortProvider { } /** - * @deprecated have an instance injected instead. + * @deprecated in 0.12 have an instance injected instead. */ @Deprecated + @SuppressWarnings("checkstyle:constantname") public static final RangeTcpPortProvider Default = new RangeTcpPortProvider( - Integer.parseInt(TcpPortRangeBegin.default_value), - Integer.parseInt(TcpPortRangeCount.default_value), - Integer.parseInt(TcpPortRangeTryCount.default_value)); + Integer.parseInt(TcpPortRangeBegin.DEFAULT_VALUE), + Integer.parseInt(TcpPortRangeCount.DEFAULT_VALUE), + Integer.parseInt(TcpPortRangeTryCount.DEFAULT_VALUE)); @Override public String toString() { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/5c897d53/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 d499604..de580d9 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 @@ -24,9 +24,15 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * First tcp port number to try. */ -@NamedParameter(doc = "First tcp port number to try", default_value = TcpPortRangeBegin.default_value) +@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"; + 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/5c897d53/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 4b4a3e5..e659a32 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 @@ -24,9 +24,15 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * Number of tcp ports in the range. */ -@NamedParameter(doc = "Number of tcp ports in the range", default_value = TcpPortRangeCount.default_value) +@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"; + 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/5c897d53/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 75687a9..256b8e4 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 @@ -24,9 +24,15 @@ import org.apache.reef.tang.annotations.NamedParameter; /** * Max number tries for port numbers. */ -@NamedParameter(doc = "Max number tries for port numbers", default_value = TcpPortRangeTryCount.default_value) +@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"; + 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/5c897d53/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java index 8d092c1..1d0e35e 100644 --- a/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java +++ b/lang/java/reef-webserver/src/main/java/org/apache/reef/webserver/HttpServerReefEventHandler.java @@ -146,7 +146,7 @@ public final class HttpServerReefEventHandler implements HttpHandler { response.getWriter().println("Enforced closing"); break; case "kill": - reefStateManager.OnClientKill(); + reefStateManager.onClientKill(); response.getWriter().println("Killing"); break; case "duration": http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/5c897d53/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 175c646..6143bc2 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 @@ -208,11 +208,21 @@ public final class ReefEventStateManager { /** * Kill driver by calling onComplete() . This method is called when client wants to kill the driver and evaluators. */ - public void OnClientKill() { + public void onClientKill() { driverStatusManager.onComplete(); } /** + * 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> {
