fix: linter bugs

Signed-off-by: Dr. Carsten Leue <carsten.leue@de.ibm.com>

http/builder/builder.go

@@ -56,7 +56,11 @@ var (
 	Monoid = ENDO.Monoid[*Builder]()
 
 	// Url is a [L.Lens] for the URL
-	Url = L.MakeLensRef((*Builder).GetUrl, (*Builder).SetUrl)
+	//
+	// Deprecated: use [URL] instead
+	Url = L.MakeLensRef((*Builder).GetURL, (*Builder).SetURL)
+	// URL is a [L.Lens] for the URL
+	URL = L.MakeLensRef((*Builder).GetURL, (*Builder).SetURL)
 	// Method is a [L.Lens] for the HTTP method
 	Method = L.MakeLensRef((*Builder).GetMethod, (*Builder).SetMethod)
 	// Body is a [L.Lens] for the request body
@@ -83,8 +87,12 @@ var (
 	WithQuery = Query.Set
 	// WithMethod creates a [Endomorphism] for a certain method
 	WithMethod = Method.Set
-	// WithUrl creates a [Endomorphism] for a certain method
-	WithUrl = Url.Set
+	// WithUrl creates a [Endomorphism] for the URL
+	//
+	// Deprecated: use [WithURL] instead
+	WithUrl = URL.Set
+	// WithURL creates a [Endomorphism] for the URL
+	WithURL = URL.Set
 	// WithHeaders creates a [Endomorphism] for a set of headers
 	WithHeaders = Headers.Set
 	// WithBody creates a [Endomorphism] for a request body
@@ -148,7 +156,14 @@ func (builder *Builder) clone() *Builder {
 }
 
 // GetTargetUrl constructs a full URL with query parameters on top of the provided URL string
+//
+// Deprecated: use [GetTargetURL] instead
 func (builder *Builder) GetTargetUrl() E.Either[error, string] {
+	return builder.GetTargetURL()
+}
+
+// GetTargetURL constructs a full URL with query parameters on top of the provided URL string
+func (builder *Builder) GetTargetURL() E.Either[error, string] {
 	// construct the final URL
 	return F.Pipe3(
 		builder,
@@ -176,10 +191,15 @@ func (builder *Builder) GetTargetUrl() E.Either[error, string] {
 	)
 }
 
+// Deprecated: use [GetURL] instead
 func (builder *Builder) GetUrl() string {
 	return builder.url
 }
 
+func (builder *Builder) GetURL() string {
+	return builder.url
+}
+
 func (builder *Builder) GetMethod() string {
 	return F.Pipe1(
 		builder.method,
@@ -209,11 +229,17 @@ func (builder *Builder) SetMethod(method string) *Builder {
 	return builder
 }
 
+// Deprecated: use [SetURL] instead
 func (builder *Builder) SetUrl(url string) *Builder {
 	builder.url = url
 	return builder
 }
 
+func (builder *Builder) SetURL(url string) *Builder {
+	builder.url = url
+	return builder
+}
+
 func (builder *Builder) SetHeaders(headers http.Header) *Builder {
 	builder.headers = headers
 	return builder
@@ -278,14 +304,21 @@ func WithoutHeader(name string) Endomorphism {
 }
 
 // WithJson creates a [Endomorphism] to send JSON payload
+//
+// Deprecated: use [WithJSON] instead
 func WithJson[T any](data T) Endomorphism {
+	return WithJSON[T](data)
+}
+
+// WithJSON creates a [Endomorphism] to send JSON payload
+func WithJSON[T any](data T) Endomorphism {
 	return Monoid.Concat(
 		F.Pipe2(
 			data,
 			J.Marshal[T],
 			WithBody,
 		),
-		WithContentType(C.Json),
+		WithContentType(C.JSON),
 	)
 }
 

http/builder/builder_test.go

@@ -34,7 +34,7 @@ func TestBuilder(t *testing.T) {
 
 	b1 := F.Pipe1(
 		Default,
-		withContentType(C.Json),
+		withContentType(C.JSON),
 	)
 
 	b2 := F.Pipe1(
@@ -48,7 +48,7 @@ func TestBuilder(t *testing.T) {
 	)
 
 	assert.Equal(t, O.None[string](), Default.GetHeader(name))
-	assert.Equal(t, O.Of(C.Json), b1.GetHeader(name))
+	assert.Equal(t, O.Of(C.JSON), b1.GetHeader(name))
 	assert.Equal(t, O.Of(C.TextPlain), b2.GetHeader(name))
 	assert.Equal(t, O.None[string](), b3.GetHeader(name))
 }

http/content/content.go

@@ -17,6 +17,7 @@ package content
 
 const (
 	TextPlain   = "text/plain"
-	Json        = "application/json"
+	JSON        = "application/json"
+	Json        = JSON // Deprecated: use [JSON] instead
 	FormEncoded = "application/x-www-form-urlencoded"
 )

http/utils.go

@@ -45,29 +45,33 @@ type (
 
 var (
 	// mime type to check if a media type matches
-	reJsonMimeType = regexp.MustCompile(`application/(?:\w+\+)?json`)
+	reJSONMimeType = regexp.MustCompile(`application/(?:\w+\+)?json`)
 	// ValidateResponse validates an HTTP response and returns an [E.Either] if the response is not a success
 	ValidateResponse = E.FromPredicate(isValidStatus, StatusCodeError)
 	// alidateJsonContentTypeString parses a content type a validates that it is valid JSON
-	validateJsonContentTypeString = F.Flow2(
+	validateJSONContentTypeString = F.Flow2(
 		ParseMediaType,
 		E.ChainFirst(F.Flow2(
 			T.First[string, map[string]string],
-			E.FromPredicate(reJsonMimeType.MatchString, func(mimeType string) error {
+			E.FromPredicate(reJSONMimeType.MatchString, func(mimeType string) error {
 				return fmt.Errorf("mimetype [%s] is not a valid JSON content type", mimeType)
 			}),
 		)),
 	)
-	// ValidateJsonResponse checks if an HTTP response is a valid JSON response
-	ValidateJsonResponse = F.Flow2(
+	// ValidateJSONResponse checks if an HTTP response is a valid JSON response
+	ValidateJSONResponse = F.Flow2(
 		E.Of[error, *H.Response],
 		E.ChainFirst(F.Flow5(
 			GetHeader,
 			R.Lookup[H.Header](HeaderContentType),
 			O.Chain(A.First[string]),
 			E.FromOption[string](errors.OnNone("unable to access the [%s] header", HeaderContentType)),
-			E.ChainFirst(validateJsonContentTypeString),
+			E.ChainFirst(validateJSONContentTypeString),
 		)))
+	// ValidateJsonResponse checks if an HTTP response is a valid JSON response
+	//
+	// Deprecated: use [ValidateJSONResponse] instead
+	ValidateJsonResponse = ValidateJSONResponse
 )
 
 const (

http/utils_test.go

@@ -39,7 +39,7 @@ func Error[A any](t *testing.T) func(E.Either[error, A]) bool {
 func TestValidateJsonContentTypeString(t *testing.T) {
 
 	res := F.Pipe1(
-		validateJsonContentTypeString(C.Json),
+		validateJSONContentTypeString(C.JSON),
 		NoError[ParsedMediaType](t),
 	)
 
@@ -49,7 +49,7 @@ func TestValidateJsonContentTypeString(t *testing.T) {
 func TestValidateInvalidJsonContentTypeString(t *testing.T) {
 
 	res := F.Pipe1(
-		validateJsonContentTypeString("application/xml"),
+		validateJSONContentTypeString("application/xml"),
 		Error[ParsedMediaType](t),
 	)