addressed cursor comments

Author: bluepal-prasanthi-moparthi

v2/arangodb/collection_documents_create_impl.go

@@ -24,6 +24,7 @@ import (
 	"context"
 	"io"
 	"net/http"
+	"reflect"
 
 	"github.com/pkg/errors"
 
@@ -177,12 +178,18 @@ func (c *collectionDocumentCreateResponseReader) Read() (CollectionDocumentCreat
 	var meta CollectionDocumentCreateResponse
 
 	if c.options != nil {
-		meta.Old = c.options.OldObject
-		meta.New = c.options.NewObject
+		if c.options.OldObject != nil {
+			meta.Old = reflect.New(reflect.TypeOf(c.options.OldObject).Elem()).Interface()
+		}
+		if c.options.NewObject != nil {
+			meta.New = reflect.New(reflect.TypeOf(c.options.NewObject).Elem()).Interface()
+		}
 	}
 
 	c.response.DocumentMeta = &meta.DocumentMeta
 	c.response.ResponseStruct = &meta.ResponseStruct
+	c.response.Old = newUnmarshalInto(meta.Old)
+	c.response.New = newUnmarshalInto(meta.New)
 
 	if err := c.array.Unmarshal(&c.response); err != nil {
 		if err == io.EOF {
@@ -191,12 +198,6 @@ func (c *collectionDocumentCreateResponseReader) Read() (CollectionDocumentCreat
 		return CollectionDocumentCreateResponse{}, err
 	}
 
-	// Update meta with the unmarshaled data
-	meta.DocumentMeta = *c.response.DocumentMeta
-	meta.ResponseStruct = *c.response.ResponseStruct
-	meta.Old = c.response.Old
-	meta.New = c.response.New
-
 	if meta.Error != nil && *meta.Error {
 		return meta, meta.AsArangoError()
 	}

v2/arangodb/collection_documents_replace_impl.go

@@ -177,19 +177,18 @@ func (c *collectionDocumentReplaceResponseReader) Read() (CollectionDocumentRepl
 	var meta CollectionDocumentReplaceResponse
 
 	if c.options != nil {
-		// Create new instances for each document to avoid reusing the same pointers
 		if c.options.OldObject != nil {
-			oldObjectType := reflect.TypeOf(c.options.OldObject).Elem()
-			meta.Old = reflect.New(oldObjectType).Interface()
+			meta.Old = reflect.New(reflect.TypeOf(c.options.OldObject).Elem()).Interface()
 		}
 		if c.options.NewObject != nil {
-			newObjectType := reflect.TypeOf(c.options.NewObject).Elem()
-			meta.New = reflect.New(newObjectType).Interface()
+			meta.New = reflect.New(reflect.TypeOf(c.options.NewObject).Elem()).Interface()
 		}
 	}
 
 	c.response.DocumentMetaWithOldRev = &meta.DocumentMetaWithOldRev
 	c.response.ResponseStruct = &meta.ResponseStruct
+	c.response.Old = newUnmarshalInto(meta.Old)
+	c.response.New = newUnmarshalInto(meta.New)
 
 	if err := c.array.Unmarshal(&c.response); err != nil {
 		if err == io.EOF {
@@ -198,12 +197,6 @@ func (c *collectionDocumentReplaceResponseReader) Read() (CollectionDocumentRepl
 		return CollectionDocumentReplaceResponse{}, err
 	}
 
-	// Update meta with the unmarshaled data
-	meta.DocumentMetaWithOldRev = *c.response.DocumentMetaWithOldRev
-	meta.ResponseStruct = *c.response.ResponseStruct
-	meta.Old = c.response.Old
-	meta.New = c.response.New
-
 	if meta.Error != nil && *meta.Error {
 		return meta, meta.AsArangoError()
 	}

v2/arangodb/collection_documents_update_impl.go

@@ -177,19 +177,18 @@ func (c *collectionDocumentUpdateResponseReader) Read() (CollectionDocumentUpdat
 	var meta CollectionDocumentUpdateResponse
 
 	if c.options != nil {
-		// Create new instances for each document to avoid reusing the same pointers
 		if c.options.OldObject != nil {
-			oldObjectType := reflect.TypeOf(c.options.OldObject).Elem()
-			meta.Old = reflect.New(oldObjectType).Interface()
+			meta.Old = reflect.New(reflect.TypeOf(c.options.OldObject).Elem()).Interface()
 		}
 		if c.options.NewObject != nil {
-			newObjectType := reflect.TypeOf(c.options.NewObject).Elem()
-			meta.New = reflect.New(newObjectType).Interface()
+			meta.New = reflect.New(reflect.TypeOf(c.options.NewObject).Elem()).Interface()
 		}
 	}
 
 	c.response.DocumentMetaWithOldRev = &meta.DocumentMetaWithOldRev
 	c.response.ResponseStruct = &meta.ResponseStruct
+	c.response.Old = newUnmarshalInto(meta.Old)
+	c.response.New = newUnmarshalInto(meta.New)
 
 	if err := c.array.Unmarshal(&c.response); err != nil {
 		if err == io.EOF {
@@ -198,12 +197,6 @@ func (c *collectionDocumentUpdateResponseReader) Read() (CollectionDocumentUpdat
 		return CollectionDocumentUpdateResponse{}, err
 	}
 
-	// Update meta with the unmarshaled data
-	meta.DocumentMetaWithOldRev = *c.response.DocumentMetaWithOldRev
-	meta.ResponseStruct = *c.response.ResponseStruct
-	meta.Old = c.response.Old
-	meta.New = c.response.New
-
 	if meta.Error != nil && *meta.Error {
 		return meta, meta.AsArangoError()
 	}