go fmt

composition/composition_handler.go

@@ -51,7 +51,7 @@ func (agg *CompositionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 
 		} else if res.Def.Required {
 			log.WithField("fetchResult", res).Errorf("error loading content from: %v", res.Def.URL)
-                        res.Def.ErrHandler.Handle(res.Err, res.HttpStatus, w, r)
+			res.Def.ErrHandler.Handle(res.Err, res.HttpStatus, w, r)
 			return
 		} else {
 			log.WithField("fetchResult", res).Warnf("optional content not loaded: %v", res.Def.URL)

composition/composition_handler_test.go

@@ -173,9 +173,9 @@ func Test_CompositionHandler_ErrorInFetching(t *testing.T) {
 	contentFetcherFactory := func(r *http.Request) FetchResultSupplier {
 		return MockFetchResultSupplier{
 			&FetchResult{
-				Def:     NewFetchDefinition("/foo"),
-				Content: nil,
-				Err:     errors.New(errorString),
+				Def:        NewFetchDefinition("/foo"),
+				Content:    nil,
+				Err:        errors.New(errorString),
 				HttpStatus: 502,
 			},
 		}

composition/content_fetcher.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"github.com/tarent/lib-compose/logging"
-	"strings"
 	"net/http"
+	"strings"
 )
 
 // IsFetchable returns, whether the fetch definition refers to a fetchable resource
@@ -16,11 +16,11 @@ func (def *FetchDefinition) IsFetchable() bool {
 }
 
 type FetchResult struct {
-	Def     *FetchDefinition
-	Err     error
-	Content Content
+	Def        *FetchDefinition
+	Err        error
+	Content    Content
 	HttpStatus int
-	Hash    string // the hash of the FetchDefinition
+	Hash       string // the hash of the FetchDefinition
 }
 
 // ContentFetcher is a type, which can fetch a set of Content pages in parallel.
@@ -77,7 +77,7 @@ func (fetcher *ContentFetcher) AddFetchJob(d *FetchDefinition) {
 
 	fetcher.activeJobs.Add(1)
 
-	fetchResult := &FetchResult{Def: d, Hash: hash, Err: errors.New("not fetched"), HttpStatus:http.StatusBadGateway}
+	fetchResult := &FetchResult{Def: d, Hash: hash, Err: errors.New("not fetched"), HttpStatus: http.StatusBadGateway}
 	fetcher.r.results = append(fetcher.r.results, fetchResult)
 
 	go func() {

composition/fetch_definition.go

@@ -168,5 +168,5 @@ func NewDefaultErrorHandler() *DefaultErrorHandler {
 }
 
 func (der *DefaultErrorHandler) Handle(err error, status int, w http.ResponseWriter, r *http.Request) {
-        http.Error(w, "Error: " + err.Error(), status)
+	http.Error(w, "Error: "+err.Error(), status)
 }

composition/fetch_definition_test.go

@@ -41,5 +41,5 @@ func Test_FetchDefinition_use_DefaultErrorHandler_if_not_set(t *testing.T) {
 	a := assert.New(t)
 
 	fd := NewFetchDefinitionWithErrorHandler("http://upstream:8080/", nil)
-        a.Equal(NewDefaultErrorHandler(), fd.ErrHandler)
+	a.Equal(NewDefaultErrorHandler(), fd.ErrHandler)
 }

composition/file_content_loader.go

@@ -43,7 +43,7 @@ func (loader *FileContentLoader) Load(fd *FetchDefinition) (Content, error, int)
 			WithField("duration", time.Since(parsingStart)).
 			Debug("content parsing")
 		f.Close()
-		return c, err,c.httpStatusCode
+		return c, err, c.httpStatusCode
 	}
 
 	c.reader = f

composition/http_content_loader.go

@@ -25,7 +25,7 @@ func NewHttpContentLoader() *HttpContentLoader {
 // TODO: Should we filter the headers, which we forward here, or is it correct to copy all of them?
 func (loader *HttpContentLoader) Load(fd *FetchDefinition) (Content, error, int) {
 	client := &http.Client{Timeout: fd.Timeout}
-	statusCode:=502
+	statusCode := 502
 
 	var err error
 	request, err := http.NewRequest(fd.Method, fd.URL, fd.Body)
@@ -46,7 +46,6 @@ func (loader *HttpContentLoader) Load(fd *FetchDefinition) (Content, error, int)
 		statusCode = resp.StatusCode
 	}
 
-
 	logging.Call(request, resp, start, err)
 	if err != nil {
 		return nil, err, statusCode

composition/http_content_loader_test.go

@@ -159,7 +159,6 @@ func Test_HttpContentLoader_Pass_404(t *testing.T) {
 		w.Write([]byte("{}"))
 	}))
 
-
 	defer server.Close()
 
 	loader := &HttpContentLoader{}
@@ -169,8 +168,6 @@ func Test_HttpContentLoader_Pass_404(t *testing.T) {
 	a.Equal(404, status)
 }
 
-
-
 func Test_HttpContentLoader_LoadError500(t *testing.T) {
 	a := assert.New(t)
 
@@ -184,7 +181,7 @@ func Test_HttpContentLoader_LoadError500(t *testing.T) {
 	a.Error(err)
 	a.Nil(c)
 	a.Contains(err.Error(), "http 500")
-	assert.True(t, statusCode==500)
+	assert.True(t, statusCode == 500)
 }
 
 func Test_HttpContentLoader_LoadErrorNetwork(t *testing.T) {

composition/interface_mocks_test.go

@@ -5,7 +5,7 @@ package composition
 
 import (
 	gomock "github.com/golang/mock/gomock"
-	
+
 	io "io"
 	http "net/http"
 )

composition_example/example_ui_service.go

@@ -2,9 +2,9 @@ package main
 
 import (
 	gorilla "github.com/gorilla/handlers"
+	"github.com/tarent/lib-compose/composition"
 	"net/http"
 	"os"
-	"github.com/tarent/lib-compose/composition"
 )
 
 func main() {