mv back to the original place the config interface

jmartin82 · Aug 23, 2019 · 6066ecc · 6066ecc
1 parent b98c1fa
commit 6066ecc
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 26 deletions.
diff --git a/cmd/mmock/main.go b/cmd/mmock/main.go
@@ -10,12 +10,11 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/jmartin82/mmock/internal/config"
+	"github.com/jmartin82/mmock/internal/config/parser"
 	"github.com/jmartin82/mmock/internal/console"
-	"github.com/jmartin82/mmock/internal/fs"
-	"github.com/jmartin82/mmock/internal/fs/parser"
 	"github.com/jmartin82/mmock/internal/server"
 	"github.com/jmartin82/mmock/internal/statistics"
-	"github.com/jmartin82/mmock/pkg/config"
 	"github.com/jmartin82/mmock/pkg/match"
 	"github.com/jmartin82/mmock/pkg/match/payload"
 	"github.com/jmartin82/mmock/pkg/mock"
@@ -96,16 +95,16 @@ func getMapping(path string) config.Mapping {
 		log.Fatalln(ErrNotFoundPath.Error())
 	}
 
-	fsMapper := fs.NewFileSystemMapper()
+	fsMapper := config.NewFileSystemMapper()
 	fsMapper.AddParser(parser.JSONReader{})
 	fsMapper.AddParser(parser.YAMLReader{})
 
 	fsUpdate := make(chan struct{})
 
-	watcher := fs.NewFileWatcher(path, fsUpdate)
+	watcher := config.NewFileWatcher(path, fsUpdate)
 	watcher.Bind()
 
-	return fs.NewConfigMapping(path, fsMapper, fsUpdate)
+	return config.NewConfigMapping(path, fsMapper, fsUpdate)
 }
 
 func getRouter(mapping config.Mapping, checker match.Matcher) *server.Router {

diff --git a/internal/fs/filesystem.go → internal/config/filesystem.go b/internal/fs/filesystem.go → internal/config/filesystem.go
@@ -1,4 +1,4 @@
-package fs
+package config
 
 import (
 	"encoding/json"

diff --git a/internal/fs/filesystem_test.go → internal/config/filesystem_test.go b/internal/fs/filesystem_test.go → internal/config/filesystem_test.go
@@ -1,4 +1,4 @@
-package fs
+package config
 
 import (
 	"errors"

diff --git a/internal/fs/mapping.go → internal/config/mapping.go b/internal/fs/mapping.go → internal/config/mapping.go
@@ -1,20 +1,28 @@
-package fs
+package config
 
 import (
 	"errors"
-	"github.com/jmartin82/mmock/pkg/mock"
 	"log"
 	"os"
 	"path"
 	"path/filepath"
 	"sort"
 	"strings"
 	"sync"
+
+	"github.com/jmartin82/mmock/pkg/mock"
 )
 
 var ErrFilePathIsNotUnderConfigPath = errors.New("File path is not under config path")
 var ErrMockDoesntExist = errors.New("Definition doesn't exist")
 
+type Mapping interface {
+	Set(URI string, mock mock.Definition) error
+	Delete(URI string) error
+	Get(URI string) (mock.Definition, bool)
+	List() []mock.Definition
+}
+
 //PrioritySort mock array sorted by priority
 type PrioritySort []mock.Definition
 

diff --git a/internal/fs/mapping_test.go → internal/config/mapping_test.go b/internal/fs/mapping_test.go → internal/config/mapping_test.go
@@ -1,4 +1,4 @@
-package fs
+package config
 
 import (
 	"github.com/jmartin82/mmock/pkg/mock"

diff --git a/internal/fs/parser/json_reader.go → internal/config/parser/json_reader.go b/internal/fs/parser/json_reader.go → internal/config/parser/json_reader.go
diff --git a/internal/fs/parser/json_reader_test.go → internal/config/parser/json_reader_test.go b/internal/fs/parser/json_reader_test.go → internal/config/parser/json_reader_test.go
diff --git a/internal/fs/parser/yaml_reader.go → internal/config/parser/yaml_reader.go b/internal/fs/parser/yaml_reader.go → internal/config/parser/yaml_reader.go
diff --git a/internal/fs/parser/yaml_reader_test.go → internal/config/parser/yaml_reader_test.go b/internal/fs/parser/yaml_reader_test.go → internal/config/parser/yaml_reader_test.go
diff --git a/internal/fs/watcher.go → internal/config/watcher.go b/internal/fs/watcher.go → internal/config/watcher.go
@@ -1,4 +1,4 @@
-package fs
+package config
 
 import (
 	"log"

diff --git a/internal/fs/watcher_test.go → internal/config/watcher_test.go b/internal/fs/watcher_test.go → internal/config/watcher_test.go
@@ -1,4 +1,4 @@
-package fs
+package config
 
 import (
 	"io/ioutil"

diff --git a/internal/console/dispatcher.go b/internal/console/dispatcher.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	assetfs "github.com/elazarl/go-bindata-assetfs"
-	"github.com/jmartin82/mmock/pkg/config"
+	"github.com/jmartin82/mmock/internal/config"
 	"github.com/jmartin82/mmock/pkg/match"
 	"github.com/jmartin82/mmock/pkg/mock"
 

diff --git a/internal/server/router.go b/internal/server/router.go
@@ -4,11 +4,10 @@ import (
 	"bytes"
 	"encoding/gob"
 
-	"github.com/jmartin82/mmock/pkg/config"
-
 	"log"
 
 	"github.com/jmartin82/mmock/pkg/mock"
+	"github.com/jmartin82/mmock/internal/config"
 
 	"github.com/jmartin82/mmock/pkg/match"
 )

diff --git a/pkg/config/mapping.go b/pkg/config/mapping.go