AMBARI-19149. Code cleanup: fallthrough (Attila Doroszlai via oleewere) Change-Id: I6925a08c0ebe7c12b26691646d3c335342913b2e
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/076ed757 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/076ed757 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/076ed757 Branch: refs/heads/trunk Commit: 076ed757b83a5d6907f7239f6de1334c81aeecc7 Parents: e990fb8 Author: Attila Doroszlai <[email protected]> Authored: Mon Dec 12 16:58:54 2016 +0100 Committer: oleewere <[email protected]> Committed: Mon Dec 12 16:58:54 2016 +0100 ---------------------------------------------------------------------- ambari-server/checkstyle.xml | 2 ++ .../request/eventcreator/UserEventCreator.java | 1 + .../ambari/server/controller/ControllerModule.java | 1 + .../apache/ambari/server/orm/DBAccessorImpl.java | 1 + .../ambari/server/stack/ConfigurationDirectory.java | 15 ++++++++++----- .../java/org/apache/ambari/server/state/State.java | 3 +++ .../apache/ambari/server/agent/TestActionQueue.java | 16 +++++++++------- 7 files changed, 27 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/checkstyle.xml ---------------------------------------------------------------------- diff --git a/ambari-server/checkstyle.xml b/ambari-server/checkstyle.xml index 81f6380..b1c3c4a 100644 --- a/ambari-server/checkstyle.xml +++ b/ambari-server/checkstyle.xml @@ -13,5 +13,7 @@ <module name="Checker"> <module name="TreeWalker"> <module name="AvoidTransactionalOnPrivateMethodsCheck"/> + + <module name="FallThrough"/> </module> </module> http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java index bc469ac..f8eb670 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/audit/request/eventcreator/UserEventCreator.java @@ -137,6 +137,7 @@ public class UserEventCreator implements RequestAuditEventCreator { .withAffectedUsername(getUsername(request)) .build(); } + break; default: break; } http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java index 053031b..8058515 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java @@ -228,6 +228,7 @@ public class ControllerModule extends AbstractModule { properties.setProperty(JDBC_DRIVER, Configuration.JDBC_IN_MEMORY_DRIVER); properties.setProperty(DDL_GENERATION, DROP_AND_CREATE); properties.setProperty(THROW_EXCEPTIONS, "true"); + break; case REMOTE: properties.setProperty(JDBC_URL, configuration.getDatabaseUrl()); properties.setProperty(JDBC_DRIVER, configuration.getDatabaseDriver()); http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java index 123fa96..39e8488 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java @@ -1247,6 +1247,7 @@ public class DBAccessorImpl implements DBAccessor { case POSTGRES: case SQL_ANYWHERE: builder.append(String.format("ALTER %s SET DEFAULT %s", column.getName(), defaultValue)); + break; case ORACLE: builder.append(String.format("MODIFY %s DEFAULT %s", column.getName(), defaultValue)); break; http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java index cfdf9fc..0301f13 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java @@ -148,24 +148,29 @@ public class ConfigurationDirectory extends StackDefinitionDirectory { if (propertyFile.exists() && propertyFile.isFile()) { try { String propertyValue = FileUtils.readFileToString(propertyFile); + boolean valid = true; switch (propertyFileType.toLowerCase()) { case "xml" : if (!XmlUtils.isValidXml(propertyValue)) { + valid = false; LOG.error("Failed to load value from property file. Property file {} is not a valid XML file", propertyFilePath); - break; } - pi.setValue(propertyValue); break; case "json": - if(!JsonUtils.isValidJson(propertyValue)) { + if (!JsonUtils.isValidJson(propertyValue)) { + valid = false; LOG.error("Failed to load value from property file. Property file {} is not a valid JSON file", propertyFilePath); - break; } + break; case "text": + // fallthrough default: - pi.setValue(propertyValue); + // no validity check break; } + if (valid) { + pi.setValue(propertyValue); + } } catch (IOException e) { LOG.error("Failed to load value from property file {}. Error Message {}", propertyFilePath, e.getMessage()); } http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/src/main/java/org/apache/ambari/server/state/State.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/State.java b/ambari-server/src/main/java/org/apache/ambari/server/state/State.java index c3f30c3..7e83f87 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/State.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/State.java @@ -166,18 +166,21 @@ public enum State { || startState == State.UNINSTALLING) { return true; } + break; case INIT: if (startState == State.UNINSTALLED || startState == State.INIT || startState == State.WIPING_OUT) { return true; } + break; case DISABLED: if (startState == State.INSTALLED || startState == State.INSTALL_FAILED || startState == State.UNKNOWN) { return true; } + break; } return false; } http://git-wip-us.apache.org/repos/asf/ambari/blob/076ed757/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java index 632750b..869f5fd 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestActionQueue.java @@ -75,19 +75,21 @@ public class TestActionQueue { public void run() { try { switch (operation) { - case ENQUEUE: - enqueueOp(); - break; - case DEQUEUE: - dequeueOp(); - break; + case ENQUEUE: + enqueueOp(); + break; + case DEQUEUE: + dequeueOp(); + break; case DEQUEUEALL: dequeueAllOp(); + break; case CHECKPENDING: checkPending(); + break; case UPDATEHOSTLIST: updateHostList(); - break; + break; } } catch (Exception ex) { LOG.error("Failure", ex);
