Merge pull request #37 from garsue/remove-logger

Remove logger

client/client.go

@@ -4,14 +4,11 @@ import (
 	"context"
 	"fmt"
 	"net/http"
-
-	"github.com/garsue/sparql/logger"
 )
 
 // Client queries to its SPARQL endpoint.
 type Client struct {
 	HTTPClient   http.Client
-	Logger       logger.Logger
 	Endpoint     string
 	prefixes     map[string]URI
 	resultParser ResultParser
@@ -46,7 +43,6 @@ func WithPrefix(prefix string, uri URI) Option {
 // New returns `sparql.Client`.
 func New(endpoint string, opts ...Option) (*Client, error) {
 	client := &Client{
-		Logger:       *logger.New(),
 		Endpoint:     endpoint,
 		prefixes:     make(map[string]URI),
 		resultParser: NewXMLResultParser(),
@@ -66,7 +62,7 @@ func (c *Client) Close() error {
 }
 
 // Ping sends a HTTP HEAD request to the endpoint.
-func (c *Client) Ping(ctx context.Context) error {
+func (c *Client) Ping(ctx context.Context) (err error) {
 	request, err := http.NewRequest(http.MethodHead, c.Endpoint, nil)
 	if err != nil {
 		return err
@@ -76,8 +72,11 @@ func (c *Client) Ping(ctx context.Context) error {
 	if err != nil {
 		return err
 	}
-	defer c.Logger.LogCloseError(resp.Body)
-	c.Logger.Debug.Printf("Ping %+v", resp)
+	defer func() {
+		if err2 := resp.Body.Close(); err2 != nil {
+			err = err2
+		}
+	}()
 
 	if resp.StatusCode != http.StatusOK {
 		return fmt.Errorf("SPARQL ping error. status code %d", resp.StatusCode)

client/query.go

@@ -54,8 +54,6 @@ func (s *Statement) Query(
 	if err != nil {
 		return nil, err
 	}
-	defer s.c.Logger.LogCloseError(resp.Body)
-	s.c.Logger.Debug.Printf("%+v\n", resp)
 
 	if resp.StatusCode != http.StatusOK {
 		scanner := bufio.NewScanner(resp.Body)
@@ -89,7 +87,6 @@ func (s *Statement) request(ctx context.Context, params ...Param) (*http.Request
 
 	// Build the query
 	built := b.String()
-	s.c.Logger.Debug.Println(built)
 	url := request.URL.Query()
 	url.Set("query", built)
 	url.Set("format", s.c.resultParser.Format())

client/query_test.go

@@ -12,8 +12,6 @@ import (
 	"strings"
 	"testing"
 	"time"
-
-	"github.com/garsue/sparql/logger"
 )
 
 func ExampleClient_Query_simple() {
@@ -357,7 +355,6 @@ func TestClient_Query(t *testing.T) {
 
 		c := &Client{
 			HTTPClient:   *server.Client(),
-			Logger:       *logger.New(),
 			Endpoint:     server.URL,
 			resultParser: NewXMLResultParser(),
 		}
@@ -375,7 +372,6 @@ func TestClient_Query(t *testing.T) {
 
 		c := &Client{
 			HTTPClient:   *server.Client(),
-			Logger:       *logger.New(),
 			Endpoint:     server.URL,
 			resultParser: NewXMLResultParser(),
 		}
@@ -403,7 +399,6 @@ func TestClient_Query(t *testing.T) {
 
 		c := &Client{
 			HTTPClient:   *server.Client(),
-			Logger:       *logger.New(),
 			Endpoint:     server.URL,
 			prefixes:     map[string]URI{"foo": "bar"},
 			resultParser: NewXMLResultParser(),
@@ -480,7 +475,6 @@ func TestStatement_Query(t *testing.T) {
 
 		c := &Client{
 			HTTPClient:   *server.Client(),
-			Logger:       *logger.New(),
 			Endpoint:     server.URL,
 			resultParser: NewXMLResultParser(),
 		}
@@ -498,7 +492,6 @@ func TestStatement_Query(t *testing.T) {
 
 		c := &Client{
 			HTTPClient:   *server.Client(),
-			Logger:       *logger.New(),
 			Endpoint:     server.URL,
 			resultParser: NewXMLResultParser(),
 		}
@@ -526,7 +519,6 @@ func TestStatement_Query(t *testing.T) {
 
 		c := &Client{
 			HTTPClient:   *server.Client(),
-			Logger:       *logger.New(),
 			Endpoint:     server.URL,
 			prefixes:     map[string]URI{"foo": "bar"},
 			resultParser: NewXMLResultParser(),