gh-38: Updated server based on Swagger v0.1.0. Closes #38

cmd/weaviate-server/main.go

@@ -24,10 +24,11 @@ import (
 	"github.com/weaviate/weaviate/restapi/operations"
 )
 
-
+// This file was generated by the swagger tool.
 // Make sure not to overwrite this file after you generated it because all your edits would be lost!
 
 func main() {
+
 	swaggerSpec, err := loads.Analyzed(restapi.SwaggerJSON, "")
 	if err != nil {
 		log.Fatalln(err)
@@ -38,8 +39,8 @@ func main() {
 	defer server.Shutdown()
 
 	parser := flags.NewParser(server, flags.Default)
-	parser.ShortDescription = `Weaviate API`
-	parser.LongDescription = `Lets you register, view and manage cloud ready devices.`
+	parser.ShortDescription = "Weaviate API"
+	parser.LongDescription = "Lets you register, view and manage cloud ready devices."
 
 	server.ConfigureFlags()
 	for _, optsGroup := range api.CommandLineOptionsGroups {
@@ -64,4 +65,5 @@ func main() {
 	if err := server.Serve(); err != nil {
 		log.Fatalln(err)
 	}
+
 }

models/acl_entries_list_response.go

@@ -13,14 +13,16 @@
  */
  package models
 
-
-
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
 
 import (
+	"strconv"
+
 	strfmt "github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
 
 	"github.com/go-openapi/errors"
+	"github.com/go-openapi/swag"
 )
 
 // ACLEntriesListResponse List of Access control list entries.
@@ -70,6 +72,9 @@ func (m *ACLEntriesListResponse) validateACLEntries(formats strfmt.Registry) err
 		if m.ACLEntries[i] != nil {
 
 			if err := m.ACLEntries[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("aclEntries" + "." + strconv.Itoa(i))
+				}
 				return err
 			}
 		}

models/acl_entry.go

@@ -13,17 +13,17 @@
  */
  package models
 
-
-
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
 
 import (
 	"encoding/json"
 	"strconv"
 
 	strfmt "github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
 
 	"github.com/go-openapi/errors"
+	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 )
 
@@ -128,6 +128,9 @@ func (m *ACLEntry) validateLocalAccessInfo(formats strfmt.Registry) error {
 	if m.LocalAccessInfo != nil {
 
 		if err := m.LocalAccessInfo.Validate(formats); err != nil {
+			if ve, ok := err.(*errors.Validation); ok {
+				return ve.ValidateName("localAccessInfo")
+			}
 			return err
 		}
 	}
@@ -185,11 +188,16 @@ func init() {
 }
 
 const (
-	aclEntryRoleManager string = "manager"
-	aclEntryRoleOwner   string = "owner"
-	aclEntryRoleRobot   string = "robot"
-	aclEntryRoleUser    string = "user"
-	aclEntryRoleViewer  string = "viewer"
+	// ACLEntryRoleManager captures enum value "manager"
+	ACLEntryRoleManager string = "manager"
+	// ACLEntryRoleOwner captures enum value "owner"
+	ACLEntryRoleOwner string = "owner"
+	// ACLEntryRoleRobot captures enum value "robot"
+	ACLEntryRoleRobot string = "robot"
+	// ACLEntryRoleUser captures enum value "user"
+	ACLEntryRoleUser string = "user"
+	// ACLEntryRoleViewer captures enum value "viewer"
+	ACLEntryRoleViewer string = "viewer"
 )
 
 // prop value enum
@@ -227,10 +235,14 @@ func init() {
 }
 
 const (
-	aclEntryScopeMembershipDelegator string = "delegator"
-	aclEntryScopeMembershipManager   string = "manager"
-	aclEntryScopeMembershipMember    string = "member"
-	aclEntryScopeMembershipNone      string = "none"
+	// ACLEntryScopeMembershipDelegator captures enum value "delegator"
+	ACLEntryScopeMembershipDelegator string = "delegator"
+	// ACLEntryScopeMembershipManager captures enum value "manager"
+	ACLEntryScopeMembershipManager string = "manager"
+	// ACLEntryScopeMembershipMember captures enum value "member"
+	ACLEntryScopeMembershipMember string = "member"
+	// ACLEntryScopeMembershipNone captures enum value "none"
+	ACLEntryScopeMembershipNone string = "none"
 )
 
 // prop value enum
@@ -268,11 +280,16 @@ func init() {
 }
 
 const (
-	aclEntryScopeTypeApplication string = "application"
-	aclEntryScopeTypeDomain      string = "domain"
-	aclEntryScopeTypeGroup       string = "group"
-	aclEntryScopeTypePublic      string = "public"
-	aclEntryScopeTypeUser        string = "user"
+	// ACLEntryScopeTypeApplication captures enum value "application"
+	ACLEntryScopeTypeApplication string = "application"
+	// ACLEntryScopeTypeDomain captures enum value "domain"
+	ACLEntryScopeTypeDomain string = "domain"
+	// ACLEntryScopeTypeGroup captures enum value "group"
+	ACLEntryScopeTypeGroup string = "group"
+	// ACLEntryScopeTypePublic captures enum value "public"
+	ACLEntryScopeTypePublic string = "public"
+	// ACLEntryScopeTypeUser captures enum value "user"
+	ACLEntryScopeTypeUser string = "user"
 )
 
 // prop value enum

models/adapter.go

@@ -13,8 +13,8 @@
  */
  package models
 
-
-
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
 
 import (
 	strfmt "github.com/go-openapi/strfmt"

models/adapters_list_response.go

@@ -13,14 +13,16 @@
  */
  package models
 
-
-
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
 
 import (
+	"strconv"
+
 	strfmt "github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
 
 	"github.com/go-openapi/errors"
+	"github.com/go-openapi/swag"
 )
 
 // AdaptersListResponse adapters list response
@@ -64,6 +66,9 @@ func (m *AdaptersListResponse) validateAdapters(formats strfmt.Registry) error {
 		if m.Adapters[i] != nil {
 
 			if err := m.Adapters[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("adapters" + "." + strconv.Itoa(i))
+				}
 				return err
 			}
 		}

models/application.go

@@ -13,16 +13,16 @@
  */
  package models
 
-
-
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
 
 import (
 	"encoding/json"
 
 	strfmt "github.com/go-openapi/strfmt"
-	"github.com/go-openapi/swag"
 
 	"github.com/go-openapi/errors"
+	"github.com/go-openapi/swag"
 	"github.com/go-openapi/validate"
 )
 
@@ -83,10 +83,14 @@ func init() {
 }
 
 const (
-	applicationTypeAndroid string = "android"
-	applicationTypeChrome  string = "chrome"
-	applicationTypeIos     string = "ios"
-	applicationTypeWeb     string = "web"
+	// ApplicationTypeAndroid captures enum value "android"
+	ApplicationTypeAndroid string = "android"
+	// ApplicationTypeChrome captures enum value "chrome"
+	ApplicationTypeChrome string = "chrome"
+	// ApplicationTypeIos captures enum value "ios"
+	ApplicationTypeIos string = "ios"
+	// ApplicationTypeWeb captures enum value "web"
+	ApplicationTypeWeb string = "web"
 )
 
 // prop value enum

models/associated_label.go

@@ -13,8 +13,8 @@
  */
  package models
 
-
-
+// This file was generated by the swagger tool.
+// Editing this file might prove futile when you re-run the swagger generate command
 
 import (
 	strfmt "github.com/go-openapi/strfmt"
@@ -31,9 +31,6 @@ type AssociatedLabel struct {
 
 	// name
 	Name string `json:"name,omitempty"`
-
-	// place Id
-	PlaceID string `json:"placeId,omitempty"`
 }
 
 // Validate validates this associated label