simpler

Author: maxdml

dbos/admin_server_test.go

@@ -347,12 +347,12 @@ func TestAdminServer(t *testing.T) {
 				// Empty string workflow: both input and output are empty strings
 				// According to the logic, empty strings should not have Input/Output fields
 				input, hasInput := wf["Input"]
-				require.Equal(t, "", input)
+				require.Equal(t, "\"\"", input)
 				require.True(t, hasInput, "Empty string workflow should have Input field")
 
 				output, hasOutput := wf["Output"]
 				require.True(t, hasOutput, "Empty string workflow should have Output field")
-				require.Equal(t, "", output)
+				require.Equal(t, "\"\"", output)
 
 			} else if wfID == structHandle.GetWorkflowID() {
 				// Struct workflow: input and output should be marshaled as JSON strings
@@ -876,7 +876,7 @@ func TestAdminServer(t *testing.T) {
 			case "emptyStep":
 				// Empty string is returned as an empty JSON string
 				output := step["output"]
-				require.Equal(t, "", output, "Empty step output should be an empty string")
+				require.Equal(t, "\"\"", output, "Empty step output should be an empty string")
 				assert.Nil(t, step["error"], "Empty step should have no error")
 			}
 		}

dbos/serialization.go

@@ -26,12 +26,6 @@ func (j *jsonSerializer[T]) Encode(data T) (*string, error) {
 	}
 
 	// Check if the value is a zero value (but not nil)
-	if isZeroValue(data) {
-		// For zero values, encode an empty byte slice directly to base64
-		emptyStr := base64.StdEncoding.EncodeToString([]byte{})
-		return &emptyStr, nil
-	}
-
 	jsonBytes, err := json.Marshal(data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to encode data: %w", err)
@@ -48,10 +42,6 @@ func (j *jsonSerializer[T]) Decode(data *string) (T, error) {
 
 	// If *data is an empty string, return zero value
 	var result T
-	if *data == "" {
-		return result, nil
-	}
-
 	dataBytes, err := base64.StdEncoding.DecodeString(*data)
 	if err != nil {
 		return result, fmt.Errorf("failed to decode base64 data: %w", err)
@@ -77,21 +67,6 @@ func isNilValue(v any) bool {
 	return false
 }
 
-// isZeroValue checks if a value is a zero value (but not nil).
-func isZeroValue(v any) bool {
-	val := reflect.ValueOf(v)
-	if !val.IsValid() {
-		return false
-	}
-	// For pointer-like types, if it's not nil, it's not a zero value
-	switch val.Kind() {
-	case reflect.Pointer, reflect.Slice, reflect.Map, reflect.Chan, reflect.Func, reflect.Interface:
-		return false
-	}
-	// For other types, check if it's the zero value
-	return val.IsZero()
-}
-
 // getNilOrZeroValue returns nil for pointer types, or zero value for non-pointer types.
 func getNilOrZeroValue[T any]() T {
 	var result T

dbos/serialization_test.go

@@ -548,7 +548,7 @@ func TestSerializer(t *testing.T) {
 	})
 
 	t.Run("Int", func(t *testing.T) {
-		testAllSerializationPaths(t, executor, recoveryIntWorkflow, 42, "recovery-int-wf")
+		testAllSerializationPaths(t, executor, recoveryIntWorkflow, 0, "recovery-int-wf")
 	})
 
 	t.Run("EmptyString", func(t *testing.T) {

dbos/workflows_test.go

@@ -3223,8 +3223,7 @@ func TestWorkflowTimeout(t *testing.T) {
 
 		// Wait for the workflow to complete and check the result. Should we AwaitedWorkflowCancelled
 		result, err := recoveredHandle.GetResult()
-		// Recovery handles are of type any, so when the handle decoded the result into any, it returned a zero value of any, which is nil, not an empty string.
-		assert.Nil(t, result, "expected result to be nil")
+		assert.Equal(t, "", result, "expected result to be an empty string")
 		// Check the error type
 		dbosErr, ok := err.(*DBOSError)
 		require.True(t, ok, "expected error to be of type *DBOSError, got %T", err)