Refactor request creation to explicitly state JSON or XML usage

DEXPRO-Solutions-GmbH · Feb 2, 2024 · bef6848 · bef6848
1 parent b396ac2
commit bef6848
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/r_get_record.go b/r_get_record.go
@@ -23,7 +23,7 @@ type RecordAttachment struct {
 }
 
 func (c *StoreClient) GetRecord(ctx context.Context, id uuid.UUID) (*Record, error) {
-	req, err := c.newRequest(ctx)
+	req, err := c.newRequestJSON(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/r_get_record_attachment.go b/r_get_record_attachment.go
@@ -12,7 +12,7 @@ import (
 //
 // This returns the number of bytes written and an error if any.
 func (c *StoreClient) GetRecordAttachment(ctx context.Context, writer io.Writer, recordID, attachmentID uuid.UUID) (int64, error) {
-	req, err := c.newRequest(ctx)
+	req, err := c.newRequestJSON(ctx)
 	if err != nil {
 		return 0, err
 	}

diff --git a/r_get_store_status.go b/r_get_store_status.go
@@ -46,7 +46,7 @@ type StoreStatus struct {
 }
 
 func (c *StoreClient) GetStoreStatus(ctx context.Context) (*StoreStatus, error) {
-	req, err := c.newRequest(ctx)
+	req, err := c.newRequestJSON(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/r_put_store.go b/r_put_store.go
@@ -19,7 +19,7 @@ type PutStoreRequest struct {
 }
 
 func (c *ServerClient) PutStore(ctx context.Context, storeName string, request *PutStoreRequest) error {
-	req, err := newRequest(ctx, c.c)
+	req, err := newRequestJSON(ctx, c.c)
 	if err != nil {
 		return err
 	}

diff --git a/r_store_post_record.go b/r_store_post_record.go
@@ -19,7 +19,7 @@ type PostRecordResponse struct {
 }
 
 func (c *StoreClient) PostRecord(ctx context.Context, request *RecordRequest) (*PostRecordResponse, error) {
-	req, err := c.newRequest(ctx)
+	req, err := c.newRequestJSON(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/r_store_search.go b/r_store_search.go
@@ -104,7 +104,7 @@ func (c *StoreClient) SearchQuery(ctx context.Context, url string) (*SearchRespo
 }
 
 func (c *StoreClient) Search(ctx context.Context, request *SearchRequest) (*SearchResponse, error) {
-	req, err := c.newRequest(ctx)
+	req, err := c.newRequestJSON(ctx)
 	if err != nil {
 		return nil, err
 	}

diff --git a/store_client.go b/store_client.go
@@ -18,19 +18,31 @@ func NewStoreClient(c *resty.Client) *StoreClient {
 	return &StoreClient{c: c}
 }
 
-func (c *StoreClient) newRequest(ctx context.Context) (*resty.Request, error) {
-	return newRequest(ctx, c.c)
+func (c *StoreClient) newRequestJSON(ctx context.Context) (*resty.Request, error) {
+	return newRequestJSON(ctx, c.c)
 }
 
-func newRequest(ctx context.Context, c *resty.Client) (*resty.Request, error) {
+func (c *StoreClient) newRequestXML(ctx context.Context) (*resty.Request, error) {
+	return newRequestXML(ctx, c.c)
+}
+
+func newRequestJSON(ctx context.Context, c *resty.Client) (*resty.Request, error) {
+	return newRequest(ctx, c, "application/json")
+}
+
+func newRequestXML(ctx context.Context, c *resty.Client) (*resty.Request, error) {
+	return newRequest(ctx, c, "application/xml")
+}
+
+func newRequest(ctx context.Context, c *resty.Client, contentType string) (*resty.Request, error) {
 	claims := UserClaimsFromContext(ctx)
 	if claims == nil {
 		return nil, errors.New("missing user claims in context object")
 	}
 
 	req := c.NewRequest()
 	req.SetContext(ctx)
-	req.SetHeader("Accept", "application/json")
+	req.SetHeader("Accept", contentType)
 	claims.SetOnHeader(req.Header)
 
 	return req, nil