Merge pull request #39 from project-flogo/#38-changePatternDirectory

#38 change pattern directory

action.go

@@ -22,7 +22,6 @@ import (
 	"github.com/project-flogo/microgateway/api"
 	"github.com/project-flogo/microgateway/internal/core"
 	_ "github.com/project-flogo/microgateway/internal/function"
-	"github.com/project-flogo/microgateway/internal/pattern"
 	"github.com/project-flogo/microgateway/internal/schema"
 )
 
@@ -135,7 +134,7 @@ func (f *Factory) New(config *action.Config) (action.Action, error) {
 			actionData = resData.Object().(*api.Microgateway)
 		}
 	} else if p := act.settings.Pattern; p != "" {
-		definition, err := pattern.Load(p)
+		definition, err := Load(p)
 		if err != nil {
 			return nil, err
 		}

examples/api/async-gateway/main.go

@@ -11,4 +11,4 @@ func main() {
 		panic(err)
 	}
 	engine.RunEngine(e)
-}
+}

examples/examples.go

@@ -10,7 +10,6 @@ import (
 	"github.com/project-flogo/core/engine/channels"
 	"github.com/project-flogo/microgateway"
 	microapi "github.com/project-flogo/microgateway/api"
-	"github.com/project-flogo/microgateway/internal/pattern"
 )
 
 // BasicGatewayExample returns a Basic Gateway API example
@@ -231,7 +230,7 @@ func DefaultChannelPattern() (engine.Engine, error) {
 
 // CustomPattern returns an engine configured for given pattern name
 func CustomPattern(patternName string, custompattern string) (engine.Engine, error) {
-	err := pattern.Register(patternName, custompattern)
+	err := microgateway.Register(patternName, custompattern)
 	if err != nil {
 		panic(err)
 	}

examples/examples_test.go

@@ -346,7 +346,7 @@ func testAsyncGatewayExample(t *testing.T, e engine.Engine) {
 	}
 
 	body := request()
-	fmt.Println("body is:",body)
+	fmt.Println("body is:", body)
 	assert.NotEqual(t, 0, len(body))
 }
 

internal/pattern/generate.go

@@ -0,0 +1,3 @@
+//go:generate go-bindata -pkg pattern -o assets.go DefaultHttpPattern.json DefaultChannelPattern.json
+
+package pattern

internal/pattern/pattern.go → pattern.go

@@ -1,11 +1,10 @@
-//go:generate go-bindata -pkg pattern -o assets.go DefaultHttpPattern.json DefaultChannelPattern.json
-
-package pattern
+package microgateway
 
 import (
 	"encoding/json"
 	"fmt"
 	"github.com/project-flogo/microgateway/api"
+	"github.com/project-flogo/microgateway/internal/pattern"
 )
 
 var patternMap = make(map[string][]byte)
@@ -14,7 +13,7 @@ func init() {
 	patterns := []string{"DefaultChannelPattern", "DefaultHttpPattern"}
 	for i := range patterns {
 		patternName := patterns[i] + ".json"
-		JSON, err := Asset(patternName)
+		JSON, err := pattern.Asset(patternName)
 		if err != nil {
 			fmt.Println("Error from Asset function")
 		}