From 11ef22c95ea5d4a5599cd20a5eab1ca373823079 Mon Sep 17 00:00:00 2001 From: Aslak Knutsen Date: Wed, 13 Jul 2016 02:42:08 +0200 Subject: [PATCH] Reintroduce direct usage of satori/go.uuid ref: goadesign/goa#610 --- generator.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/generator.go b/generator.go index 3d8fa2f..cb68bb2 100644 --- a/generator.go +++ b/generator.go @@ -109,8 +109,7 @@ func (g *Generator) generateUserTypes(outdir string, api *design.APIDefinition) codegen.SimpleImport("github.com/goadesign/goa"), codegen.SimpleImport("github.com/jinzhu/gorm"), codegen.SimpleImport("golang.org/x/net/context"), - codegen.SimpleImport("golang.org/x/net/context"), - codegen.SimpleImport("github.com/goadesign/goa/uuid"), + codegen.NewImport("uuid", "github.com/satori/go.uuid"), } if model.Cached { @@ -168,8 +167,7 @@ func (g *Generator) generateUserHelpers(outdir string, api *design.APIDefinition codegen.SimpleImport("github.com/goadesign/goa"), codegen.SimpleImport("github.com/jinzhu/gorm"), codegen.SimpleImport("golang.org/x/net/context"), - codegen.SimpleImport("golang.org/x/net/context"), - codegen.SimpleImport("github.com/goadesign/goa/uuid"), + codegen.NewImport("uuid", "github.com/satori/go.uuid"), } if model.Cached {