Merge pull request #11 from devilcove/develop

refactor jsonEndpoint

Author: mattkasun

examples/method/json/main.go

@@ -14,16 +14,13 @@ type Response struct {
 
 func main() {
 	var response Response
-	end := httpclient.Endpoint{
+	endpoint := httpclient.JSONEndpoint[Response]{
 		URL:           "https://api.ipify.org?format=json",
 		Route:         "",
 		Method:        http.MethodGet,
 		Authorization: "",
 		Data:          nil,
-	}
-	endpoint := httpclient.JSONEndpoint[Response]{
-		Endpoint: end,
-		Response: response,
+		Response:      response,
 	}
 	answer, err := endpoint.GetJSON(response)
 	if err != nil {

httpclient.go

@@ -19,9 +19,13 @@ type Endpoint struct {
 	Data          any
 }
 
-type JSONEndpoint[T comparable] struct {
-	Endpoint
-	Response T
+type JSONEndpoint[T any] struct {
+	URL           string
+	Method        string
+	Route         string
+	Authorization string
+	Data          any
+	Response      T
 }
 
 func init() {

httpclient_test.go

@@ -96,17 +96,14 @@ func TestGetJSON(t *testing.T) {
 		response := struct {
 			JWT string
 		}{}
-		e := Endpoint{
-			URL:    "http://firefly.nusak.ca",
-			Route:  "/login",
-			Method: http.MethodPost,
-			Data:   data,
+		e := JSONEndpoint[struct{ JWT string }]{
+			URL:      "http://firefly.nusak.ca",
+			Route:    "/login",
+			Method:   http.MethodPost,
+			Data:     data,
+			Response: response,
 		}
-		g := JSONEndpoint[struct{ JWT string }]{
-			e,
-			response,
-		}
-		answer, err := g.GetJSON(response)
+		answer, err := e.GetJSON(response)
 		is.NoErr(err)
 		answerType := fmt.Sprintf("%T", answer)
 		is.True(answerType == "struct { JWT string }")