Repository: ambari Updated Branches: refs/heads/branch-2.5 2daa20e1f -> 3c844cad8 refs/heads/trunk 37ba33ffd -> ec51e1663
AMBARI-20823. Remove user input from invalid renderer error message (Attila Magyar via adoroszlai) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec51e166 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec51e166 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec51e166 Branch: refs/heads/trunk Commit: ec51e16630debc6595d92a29690ce62fd719e2ca Parents: 37ba33f Author: Attila Magyar <[email protected]> Authored: Tue Apr 25 21:36:13 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Tue Apr 25 21:36:13 2017 +0200 ---------------------------------------------------------------------- .../ambari/server/api/resources/BaseResourceDefinition.java | 3 +-- .../ambari/server/api/resources/BaseResourceDefinitionTest.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ec51e166/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java index 99bcd03..4983920 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/BaseResourceDefinition.java @@ -132,8 +132,7 @@ public abstract class BaseResourceDefinition implements ResourceDefinition { || name.contains("zero_padding")) { return new MetricsPaddingRenderer(name); } else { - throw new IllegalArgumentException("Invalid renderer name: " + name + - " for resource of type: " + m_type); + throw new IllegalArgumentException("Invalid renderer name for resource of type " + m_type); } } http://git-wip-us.apache.org/repos/asf/ambari/blob/ec51e166/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java index e076268..8e83f56 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/resources/BaseResourceDefinitionTest.java @@ -141,7 +141,7 @@ public class BaseResourceDefinitionTest { resource.getRenderer("foo"); fail("Should have thrown an exception due to invalid renderer type"); } catch (IllegalArgumentException e) { - // expected + assertEquals("Invalid renderer name for resource of type Service", e.getMessage()); } }
