From e3ec26007ead0024ad2408cace6f7e4921487af2 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Fri, 16 Nov 2007 18:13:41 +0000
Subject: [PATCH] patched to load java-based flow definition eagerly to reduce
 class loading overhead

---
 .../config/FlowRegistryFactoryBean.java       | 67 ++++++-------------
 1 file changed, 19 insertions(+), 48 deletions(-)

diff --git a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java
index f43cf3d6..50895b73 100644
--- a/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java
+++ b/spring-webflow/src/main/java/org/springframework/webflow/config/FlowRegistryFactoryBean.java
@@ -41,7 +41,7 @@ class FlowRegistryFactoryBean implements FactoryBean, ResourceLoaderAware, BeanF
 	/**
 	 * The definition registry produced by this factory bean.
 	 */
-	private FlowDefinitionRegistry flowRegistry;
+	private FlowDefinitionRegistryImpl flowRegistry;
 
 	/**
 	 * Flow definitions defined in external files that should be registered in the registry produced by this factory
@@ -129,8 +129,8 @@ class FlowRegistryFactoryBean implements FactoryBean, ResourceLoaderAware, BeanF
 	private void registerFlowBuilders() {
 		if (flowBuilders != null) {
 			for (int i = 0; i < flowBuilders.length; i++) {
-				FlowBuilderInfo builder = flowBuilders[i];
-				flowRegistry.registerFlowDefinition(createFlowDefinitionHolder(builder));
+				FlowBuilderInfo builderInfo = flowBuilders[i];
+				flowRegistry.registerFlowDefinition(buildFlowDefinition(builderInfo));
 			}
 		}
 	}
@@ -184,12 +184,22 @@ class FlowRegistryFactoryBean implements FactoryBean, ResourceLoaderAware, BeanF
 		}
 	}
 
-	private FlowDefinitionHolder createFlowDefinitionHolder(FlowBuilderInfo builder) {
-		ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
-		AttributeMap flowAttributes = getFlowAttributes(builder.getAttributes());
-		FlowBuilderContext builderContext = new FlowBuilderContextImpl(builder.getId(), flowAttributes, flowRegistry,
-				flowBuilderServices);
-		return new FlowBuilderCreatingFlowDefinitionHolder(builder.getClassName(), classLoader, builderContext);
+	private FlowDefinition buildFlowDefinition(FlowBuilderInfo builderInfo) {
+		try {
+			Class flowBuilderClass = ClassUtils.forName(builderInfo.getClassName());
+			FlowBuilder builder = (FlowBuilder) flowBuilderClass.newInstance();
+			AttributeMap flowAttributes = getFlowAttributes(builderInfo.getAttributes());
+			FlowBuilderContext builderContext = new FlowBuilderContextImpl(builderInfo.getId(), flowAttributes,
+					flowRegistry, flowBuilderServices);
+			FlowAssembler assembler = new FlowAssembler(builder, builderContext);
+			return assembler.assembleFlow();
+		} catch (ClassNotFoundException e) {
+			throw new FlowDefinitionConstructionException(builderInfo.getId(), e);
+		} catch (InstantiationException e) {
+			throw new FlowDefinitionConstructionException(builderInfo.getId(), e);
+		} catch (IllegalAccessException e) {
+			throw new FlowDefinitionConstructionException(builderInfo.getId(), e);
+		}
 	}
 
 	private void initFlowBuilderServices() {
@@ -197,43 +207,4 @@ class FlowRegistryFactoryBean implements FactoryBean, ResourceLoaderAware, BeanF
 		flowBuilderServices.setResourceLoader(resourceLoader);
 		flowBuilderServices.setBeanFactory(beanFactory);
 	}
-
-	class FlowBuilderCreatingFlowDefinitionHolder implements FlowDefinitionHolder {
-
-		private String flowBuilderClassName;
-
-		private ClassLoader classLoader;
-
-		private FlowBuilderContext builderContext;
-
-		public FlowBuilderCreatingFlowDefinitionHolder(String flowBuilderClassName, ClassLoader classLoader,
-				FlowBuilderContext builderContext) {
-			this.flowBuilderClassName = flowBuilderClassName;
-			this.classLoader = classLoader;
-			this.builderContext = builderContext;
-		}
-
-		public String getFlowDefinitionId() {
-			return builderContext.getFlowId();
-		}
-
-		public FlowDefinition getFlowDefinition() throws FlowDefinitionConstructionException {
-			try {
-				Class flowBuilderClass = classLoader.loadClass(flowBuilderClassName);
-				FlowBuilder builder = (FlowBuilder) flowBuilderClass.newInstance();
-				FlowAssembler assembler = new FlowAssembler(builder, builderContext);
-				return assembler.assembleFlow();
-			} catch (ClassNotFoundException e) {
-				throw new FlowDefinitionConstructionException(getFlowDefinitionId(), e);
-			} catch (InstantiationException e) {
-				throw new FlowDefinitionConstructionException(getFlowDefinitionId(), e);
-			} catch (IllegalAccessException e) {
-				throw new FlowDefinitionConstructionException(getFlowDefinitionId(), e);
-			}
-		}
-
-		public void refresh() throws FlowDefinitionConstructionException {
-		}
-
-	}
 }
\ No newline at end of file