Repository: incubator-reef Updated Branches: refs/heads/master 732982480 -> cd77ecc1c
[REEF-370]: Fix violations of MissingSwitchDefault checkstyle This addressed the issue by * adding default clause where it was missing * rewriting 2 single-case switches as if-then JIRA: [REEF-370](https://issues.apache.org/jira/browse/REEF-370) Pull Request: This closes #225 Project: http://git-wip-us.apache.org/repos/asf/incubator-reef/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-reef/commit/cd77ecc1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-reef/tree/cd77ecc1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-reef/diff/cd77ecc1 Branch: refs/heads/master Commit: cd77ecc1c69cba39f46451e158a100162675cffa Parents: 7329824 Author: Mariia Mykhailova <[email protected]> Authored: Mon Jun 15 17:56:50 2015 -0700 Committer: Markus Weimer <[email protected]> Committed: Tue Jun 16 09:20:12 2015 -0700 ---------------------------------------------------------------------- .../runtime/common/driver/evaluator/EvaluatorManager.java | 2 ++ .../driver/resourcemanager/ResourceManagerStatus.java | 6 ++++++ .../reef/runtime/common/evaluator/task/TaskStatus.java | 3 ++- .../apache/reef/runtime/mesos/driver/REEFScheduler.java | 10 ++++------ .../main/java/org/apache/reef/tests/fail/task/Driver.java | 4 ++++ 5 files changed, 18 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/cd77ecc1/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java index f58fe5e..ea677e6 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/evaluator/EvaluatorManager.java @@ -378,6 +378,8 @@ public final class EvaluatorManager implements Identifiable, AutoCloseable { case RUNNING: case SUSPEND: break; + default: + throw new RuntimeException("Unknown state: " + message.getState()); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/cd77ecc1/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java index 832774e..23d7d44 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/driver/resourcemanager/ResourceManagerStatus.java @@ -80,6 +80,12 @@ public final class ResourceManagerStatus implements EventHandler<RuntimeStatusEv case RUNNING: this.onRMRunning(runtimeStatusEvent); break; + case INIT: + case SUSPEND: + case KILLED: + break; + default: + throw new RuntimeException("Unknown state: " + newState); } } http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/cd77ecc1/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java index fc028ec..ba1d475 100644 --- a/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java +++ b/lang/java/reef-common/src/main/java/org/apache/reef/runtime/common/evaluator/task/TaskStatus.java @@ -182,8 +182,9 @@ public final class TaskStatus { return ReefServiceProtos.State.FAILED; case KILLED: return ReefServiceProtos.State.KILLED; + default: + throw new RuntimeException("Unknown state: " + this.state); } - throw new RuntimeException("Unknown state: " + this.state); } void setException(final Throwable throwable) { http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/cd77ecc1/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java index fd14bef..020f388 100644 --- a/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java +++ b/lang/java/reef-runtime-mesos/src/main/java/org/apache/reef/runtime/mesos/driver/REEFScheduler.java @@ -434,9 +434,8 @@ final class REEFScheduler implements Scheduler { private int getMemory(final Offer offer) { for (final Resource resource : offer.getResourcesList()) { - switch (resource.getName()) { - case "mem": - return (int)resource.getScalar().getValue(); + if (resource.getName().equals("mem")) { + return (int)resource.getScalar().getValue(); } } return 0; @@ -444,9 +443,8 @@ final class REEFScheduler implements Scheduler { private int getCpu(final Offer offer) { for (final Resource resource : offer.getResourcesList()) { - switch (resource.getName()) { - case "cpus": - return (int)resource.getScalar().getValue(); + if (resource.getName().equals("cpus")) { + return (int)resource.getScalar().getValue(); } } return 0; http://git-wip-us.apache.org/repos/asf/incubator-reef/blob/cd77ecc1/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/task/Driver.java ---------------------------------------------------------------------- diff --git a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/task/Driver.java b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/task/Driver.java index eb61fbb..60fceda 100644 --- a/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/task/Driver.java +++ b/lang/java/reef-tests/src/main/java/org/apache/reef/tests/fail/task/Driver.java @@ -110,6 +110,8 @@ public final class Driver { .set(TaskConfiguration.TASK, FailTaskClose.class) .set(TaskConfiguration.ON_CLOSE, FailTaskClose.class); break; + default: + break; } eval.submitContextAndTask(contextConfig, taskConfig.build()); @@ -147,6 +149,8 @@ public final class Driver { LOG.log(Level.INFO, "TaskRuntime: Stop/Close: {0}", task); task.close(); break; + default: + break; } } }
