Merge branch 'master' of github.com:/amplafi/amplafi-flow-core

Conflicts: src/main/java/org/amplafi/flow/FlowStateJsonRenderer.java
amplafi · May 15, 2012 · 49b60c1 · 49b60c1
2 parents 7ef082a + d1516f9
commit 49b60c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/amplafi/flow/FlowStateJsonRenderer.java b/src/main/java/org/amplafi/flow/FlowStateJsonRenderer.java
@@ -19,6 +19,7 @@
 
 import org.amplafi.json.IJsonWriter;
 import org.amplafi.json.JSONObject;
+import org.amplafi.json.JSONWriter;
 import org.amplafi.json.JsonRenderer;
 
 import com.sworddance.util.ApplicationIllegalStateException;
@@ -76,10 +77,9 @@ protected void renderState(IJsonWriter jsonWriter, FlowState flowState) {
 
 	protected void renderProperty(IJsonWriter jsonWriter, FlowState flowState,
 			FlowPropertyDefinition flowPropertyDefinition) {
-		String propertyName = flowPropertyDefinition.getName();
+	    String propertyName = flowPropertyDefinition.getName();
 	    Object property = flowState.getProperty(propertyName);
-	    jsonWriter.key(propertyName);
+	    jsonWriter.keyValueIfNotBlankValue(propertyName, flowPropertyDefinition.serialize(new JSONWriter(), property).toString());
-	    flowPropertyDefinition.serialize(jsonWriter, property);
 	    ApplicationIllegalStateException.checkState(jsonWriter.isInKeyMode(), "Not in value mode after serializing key/value for ", flowPropertyDefinition.getName());
 	}
 

diff --git a/src/main/java/org/amplafi/flow/impl/JsonFlowRenderer.java b/src/main/java/org/amplafi/flow/impl/JsonFlowRenderer.java
@@ -85,7 +85,7 @@ protected void renderError(FlowState flowState, String message, Exception except
             jsonWriter.object();
             jsonWriter.keyValueIfNotBlankValue(ServicesConstants.ERROR_MESSAGE, message);
             if (flowState != null) {
-                jsonWriter.key(FLOW_STATE_JSON_KEY).value(flowState);
+                jsonWriter.keyValueIfNotNullValue(FLOW_STATE_JSON_KEY, flowState);
                 // TODO : probably need to check on PropertyRequired.finish
                 Map<String, FlowValidationResult> result = flowState.getFlowValidationResults(FlowActivityPhase.advance, FlowStepDirection.forward);
                 writeValidationResult(jsonWriter, result);