Adding changes to abstract better

README.md

@@ -1,4 +1,4 @@
-# Go API client for swagger
+# Go API client for Bitbucket (bitbucket-server V1)
 
 
 ## Overview
@@ -6,13 +6,6 @@ This API client was generated by the [swagger-codegen](https://github.com/swagge
 
 - API version: 
 - Package version: 1.0.0
-- Build package: io.swagger.codegen.languages.GoClientCodegen
-
-## Installation
-Put the package under your project folder and add the following in import:
-```
-    "./swagger"
-```
 
 ## Documentation for API Endpoints
 

api_client.go

@@ -2,43 +2,44 @@
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
 
-package swagger
+package bitbucketv1
 
 import (
 	"bytes"
 	"encoding/json"
 	"encoding/xml"
-	"fmt"
 	"errors"
+	"fmt"
 	"io"
 	"mime/multipart"
-    "golang.org/x/oauth2"
-    "golang.org/x/net/context"
 	"net/http"
 	"net/url"
-	"time"
 	"os"
 	"path/filepath"
 	"reflect"
 	"regexp"
-	"strings"
-	"unicode/utf8"
 	"strconv"
+	"strings"
+	"time"
+	"unicode/utf8"
+
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
 )
 
 var (
 	jsonCheck = regexp.MustCompile("(?i:[application|text]/json)")
-	xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)")
+	xmlCheck  = regexp.MustCompile("(?i:[application|text]/xml)")
 )
 
 // APIClient manages communication with the  API v
 // In most cases there should be only one, shared, APIClient.
 type APIClient struct {
-	cfg 	*Configuration
+	cfg    *Configuration
-	common 	service 		// Reuse a single struct instead of allocating one for each service on the heap.
+	common service // Reuse a single struct instead of allocating one for each service on the heap.
-
+	ctx    context.Context
-	 // API Services
+	// API Services
-	DefaultApi	*DefaultApiService
+	DefaultApi *DefaultApiService
 }
 
 type service struct {
@@ -47,12 +48,13 @@ type service struct {
 
 // NewAPIClient creates a new API client. Requires a userAgent string describing your application.
 // optionally a custom http.Client to allow for advanced features such as caching.
-func NewAPIClient(cfg *Configuration) *APIClient {
+func NewAPIClient(ctx context.Context, cfg *Configuration) *APIClient {
 	if cfg.HTTPClient == nil {
 		cfg.HTTPClient = http.DefaultClient
 	}
 
 	c := &APIClient{}
+	c.ctx = ctx
 	c.cfg = cfg
 	c.common.client = c
 
@@ -66,7 +68,6 @@ func atoi(in string) (int, error) {
 	return strconv.Atoi(in)
 }
 
-
 // selectHeaderContentType select a content type from the available list.
 func selectHeaderContentType(contentTypes []string) string {
 	if len(contentTypes) == 0 {
@@ -137,18 +138,18 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 	return fmt.Sprintf("%v", obj)
 }
 
-// callAPI do the request. 
+// callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
-	 return c.cfg.HTTPClient.Do(request)
+	return c.cfg.HTTPClient.Do(request)
 }
 
 // Change base path to allow switching to mocks
-func (c *APIClient) ChangeBasePath (path string) {
+func (c *APIClient) ChangeBasePath(path string) {
 	c.cfg.BasePath = path
 }
 
 // prepareRequest build the request
-func (c *APIClient) prepareRequest (
+func (c *APIClient) prepareRequest(
 	ctx context.Context,
 	path string, method string,
 	postBody interface{},
@@ -208,7 +209,7 @@ func (c *APIClient) prepareRequest (
 			// Set the Boundary in the Content-Type
 			headerParams["Content-Type"] = w.FormDataContentType()
 		}
-		
+
 		// Set Content-Length
 		headerParams["Content-Length"] = fmt.Sprintf("%d", body.Len())
 		w.Close()
@@ -254,10 +255,9 @@ func (c *APIClient) prepareRequest (
 	if c.cfg.Host != "" {
 		localVarRequest.Host = c.cfg.Host
 	}
-	
+
 	// Add the user agent to the request.
 	localVarRequest.Header.Add("User-Agent", c.cfg.UserAgent)
-	
 
 	if ctx != nil {
 		// add context to the request
@@ -283,18 +283,17 @@ func (c *APIClient) prepareRequest (
 
 		// AccessToken Authentication
 		if auth, ok := ctx.Value(ContextAccessToken).(string); ok {
-			localVarRequest.Header.Add("Authorization", "Bearer " + auth)
+			localVarRequest.Header.Add("Authorization", "Bearer "+auth)
 		}
 	}
 
 	for header, value := range c.cfg.DefaultHeader {
 		localVarRequest.Header.Add(header, value)
 	}
-	
+
 	return localVarRequest, nil
 }
 
-
 // Add a file to the multipart request
 func addFile(w *multipart.Writer, fieldName, path string) error {
 	file, err := os.Open(path)
@@ -313,7 +312,7 @@ func addFile(w *multipart.Writer, fieldName, path string) error {
 }
 
 // Prevent trying to import "fmt"
-func reportError(format string, a ...interface{}) (error) {
+func reportError(format string, a ...interface{}) error {
 	return fmt.Errorf(format, a...)
 }
 
@@ -350,7 +349,7 @@ func setBody(body interface{}, contentType string) (bodyBuf *bytes.Buffer, err e
 func detectContentType(body interface{}) string {
 	contentType := "text/plain; charset=utf-8"
 	kind := reflect.TypeOf(body).Kind()
-	
+
 	switch kind {
 	case reflect.Struct, reflect.Map, reflect.Ptr:
 		contentType = "application/json; charset=utf-8"
@@ -367,7 +366,6 @@ func detectContentType(body interface{}) string {
 	return contentType
 }
 
-
 // Ripped from https://github.com/gregjones/httpcache/blob/master/httpcache.go
 type cacheControl map[string]string
 
@@ -390,7 +388,7 @@ func parseCacheControl(headers http.Header) cacheControl {
 }
 
 // CacheExpires helper function to determine remaining time before repeating a request.
-func CacheExpires(r *http.Response) (time.Time) {
+func CacheExpires(r *http.Response) time.Time {
 	// Figure out when the cache expires.
 	var expires time.Time
 	now, err := time.Parse(time.RFC1123, r.Header.Get("date"))
@@ -398,7 +396,7 @@ func CacheExpires(r *http.Response) (time.Time) {
 		return time.Now()
 	}
 	respCacheControl := parseCacheControl(r.Header)
-	
+
 	if maxAge, ok := respCacheControl["max-age"]; ok {
 		lifetime, err := time.ParseDuration(maxAge + "s")
 		if err != nil {
@@ -417,7 +415,6 @@ func CacheExpires(r *http.Response) (time.Time) {
 	return expires
 }
 
-func strlen(s string) (int) {
+func strlen(s string) int {
 	return utf8.RuneCountInString(s)
 }
-

api_response.go

@@ -2,37 +2,52 @@
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
 
-package swagger
+package bitbucketv1
 
 import (
+	"encoding/json"
 	"net/http"
 )
 
+// APIResponse contains generic data from API Response
 type APIResponse struct {
 	*http.Response `json:"-"`
-	Message string `json:"message,omitempty"`
+	Message        string `json:"message,omitempty"`
 	// Operation is the name of the swagger operation.
-	Operation       string `json:"operation,omitempty"`
+	Operation string `json:"operation,omitempty"`
 	// RequestURL is the request URL. This value is always available, even if the
 	// embedded *http.Response is nil.
-	RequestURL      string `json:"url,omitempty"`
+	RequestURL string `json:"url,omitempty"`
 	// Method is the HTTP method used for the request.  This value is always
 	// available, even if the embedded *http.Response is nil.
-	Method          string `json:"method,omitempty"`
+	Method string `json:"method,omitempty"`
 	// Payload holds the contents of the response body (which may be nil or empty).
 	// This is provided here as the raw response.Body() reader will have already
 	// been drained.
 	Payload []byte `json:"-"`
+	Values  map[string]interface{}
 }
 
+// NewAPIResponse create new APIResponse from http.Response
 func NewAPIResponse(r *http.Response) *APIResponse {
 
 	response := &APIResponse{Response: r}
 	return response
 }
 
-func NewAPIResponseWithError(errorMessage string) *APIResponse {
+// NewAPIResponseWithError create new erroneous API response from http.response and error
+func NewAPIResponseWithError(r *http.Response, err error) (*APIResponse, error) {
 
-	response := &APIResponse{Message: errorMessage}
+	response := &APIResponse{Response: r, Message: err.Error()}
-	return response
+	return response, err
+}
+
+// NewBitbucketAPIResponse create new API response from http.response
+func NewBitbucketAPIResponse(r *http.Response) (*APIResponse, error) {
+	response := &APIResponse{Response: r}
+	err := json.NewDecoder(r.Body).Decode(&response.Values)
+	if err != nil {
+		return nil, err
+	}
+	return response, err
 }

cmd/main.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/gfleury/go-bitbucket-v1"
+)
+
+func main() {
+	basicAuth := bitbucketv1.BasicAuth{UserName: "gfleury", Password: "killmore"}
+	ctx, cancel := context.WithTimeout(context.Background(), 6000*time.Millisecond)
+	ctx = context.WithValue(ctx, bitbucketv1.ContextBasicAuth, basicAuth)
+	defer cancel()
+
+	client := bitbucketv1.NewAPIClient(
+		ctx,
+		bitbucketv1.NewConfiguration("http://ec2-54-186-25-213.us-west-2.compute.amazonaws.com/rest"),
+	)
+	response, err := client.DefaultApi.GetUsers(nil)
+	if err != nil {
+		fmt.Printf("%s\n", err.Error())
+	}
+	fmt.Printf("%v", response)
+
+}

configuration.go

@@ -2,7 +2,7 @@
  * Generated by: Swagger Codegen (https://github.com/swagger-api/swagger-codegen.git)
  */
 
-package swagger
+package bitbucketv1
 
 import (
 	"net/http"
@@ -20,48 +20,51 @@ func (c contextKey) String() string {
 
 var (
 	// ContextOAuth2 takes a oauth2.TokenSource as authentication for the request.
-	ContextOAuth2    	= contextKey("token")
+	ContextOAuth2 = contextKey("token")
 
 	// ContextBasicAuth takes BasicAuth as authentication for the request.
-	ContextBasicAuth 	= contextKey("basic")
+	ContextBasicAuth = contextKey("basic")
 
 	// ContextAccessToken takes a string oauth2 access token as authentication for the request.
-	ContextAccessToken 	= contextKey("accesstoken")
+	ContextAccessToken = contextKey("accesstoken")
 
 	// ContextAPIKey takes an APIKey as authentication for the request
- 	ContextAPIKey 		= contextKey("apikey")
+	ContextAPIKey = contextKey("apikey")
 )
 
-// BasicAuth provides basic http authentication to a request passed via context using ContextBasicAuth 
+// BasicAuth provides basic http authentication to a request passed via context using ContextBasicAuth
 type BasicAuth struct {
-	UserName      string            `json:"userName,omitempty"`
+	UserName string `json:"userName,omitempty"`
-	Password      string            `json:"password,omitempty"`	
+	Password string `json:"password,omitempty"`
 }
 
 // APIKey provides API key based authentication to a request passed via context using ContextAPIKey
 type APIKey struct {
-	Key 	string
+	Key    string
-	Prefix	string
+	Prefix string
 }
 
+// Configuration provides the configuration to connect
 type Configuration struct {
-	BasePath      string            	`json:"basePath,omitempty"`
+	BasePath      string            `json:"basePath,omitempty"`
-	Host          string            	`json:"host,omitempty"`
+	Host          string            `json:"host,omitempty"`
-	Scheme        string            	`json:"scheme,omitempty"`
+	Scheme        string            `json:"scheme,omitempty"`
-	DefaultHeader map[string]string 	`json:"defaultHeader,omitempty"`
+	DefaultHeader map[string]string `json:"defaultHeader,omitempty"`
-	UserAgent     string            	`json:"userAgent,omitempty"`
+	UserAgent     string            `json:"userAgent,omitempty"`
-	HTTPClient 	  *http.Client
+	HTTPClient    *http.Client
 }
 
-func NewConfiguration() *Configuration {
+// NewConfiguration create new configuration
+func NewConfiguration(basePath string) *Configuration {
 	cfg := &Configuration{
-		BasePath:      "http://example.com/rest/",
+		BasePath:      basePath,
 		DefaultHeader: make(map[string]string),
-		UserAgent:     "Swagger-Codegen/1.0.0/go",
+		UserAgent:     "go-bitbucket/1.0.0/go",
 	}
 	return cfg
 }
 
+// AddDefaultHeader adds defaults headers to requests
 func (c *Configuration) AddDefaultHeader(key string, value string) {
 	c.DefaultHeader[key] = value
-}
+}