From 148d722c429004305bff7298b3493305ffe0fa63 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Thu, 24 Apr 2008 02:21:31 +0000 Subject: [PATCH] polish --- .../registry/FlowDefinitionRegistryImpl.java | 3 ++- .../FlowDefinitionRegistryImplTests.java | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java index 7f6fe488..3e2d6b92 100644 --- a/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java +++ b/spring-webflow/src/main/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImpl.java @@ -52,6 +52,7 @@ public class FlowDefinitionRegistryImpl implements FlowDefinitionRegistry { public FlowDefinition getFlowDefinition(String id) throws NoSuchFlowDefinitionException, FlowDefinitionConstructionException { + Assert.hasText(id, "An id is required to lookup a FlowDefinition"); try { if (logger.isDebugEnabled()) { logger.debug("Getting FlowDefinition with id '" + id + "'"); @@ -87,7 +88,7 @@ public class FlowDefinitionRegistryImpl implements FlowDefinitionRegistry { public void registerFlowDefinition(FlowDefinitionHolder definitionHolder) { Assert.notNull(definitionHolder, "The holder of the flow definition to register is required"); if (logger.isDebugEnabled()) { - logger.debug("Registering flow definition " + definitionHolder); + logger.debug("Registering flow definition held by " + definitionHolder); } flowDefinitions.put(definitionHolder.getFlowDefinitionId(), definitionHolder); } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java b/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java index 38a787e3..b2661963 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/definition/registry/FlowDefinitionRegistryImplTests.java @@ -47,6 +47,24 @@ public class FlowDefinitionRegistryImplTests extends TestCase { } } + public void testNullFlowDefinitionId() { + try { + registry.getFlowDefinition(null); + fail("Should have bombed with illegal argument"); + } catch (IllegalArgumentException e) { + + } + } + + public void testBlankFlowDefinitionId() { + try { + registry.getFlowDefinition(""); + fail("Should have bombed with illegal argument"); + } catch (IllegalArgumentException e) { + + } + } + public void testRegisterFlow() { registry.registerFlowDefinition(new StaticFlowDefinitionHolder(fooFlow)); assertEquals(fooFlow, registry.getFlowDefinition("foo"));