Move contract/inter to inter

confetti-framework · May 11, 2022 · 4a98a3e · 4a98a3e
1 parent cd148f6
commit 4a98a3e
Show file tree

Hide file tree

Showing 143 changed files with 115 additions and 273 deletions.
diff --git a/contract/.gitignore b/contract/.gitignore
diff --git a/contract/LICENSE b/contract/LICENSE
diff --git a/contract/README.md b/contract/README.md
diff --git a/foundation/.gitignore b/foundation/.gitignore
diff --git a/foundation/LICENSE b/foundation/LICENSE
diff --git a/foundation/application.go b/foundation/application.go
@@ -3,9 +3,9 @@ package foundation
 import (
 	"fmt"
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
 	"github.com/confetti-framework/framework/foundation/db"
 	"github.com/confetti-framework/framework/foundation/loggers"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type Application struct {

diff --git a/foundation/console/app_info.go b/foundation/console/app_info.go
@@ -1,7 +1,7 @@
 package console
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"runtime"
 )
 

diff --git a/foundation/console/app_serve.go b/foundation/console/app_serve.go
@@ -1,8 +1,8 @@
 package console
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
 	"github.com/confetti-framework/framework/foundation/http"
+	"github.com/confetti-framework/framework/inter"
 	net "net/http"
 	"strconv"
 	"time"

diff --git a/foundation/console/baker.go b/foundation/console/baker.go
@@ -2,7 +2,7 @@ package console
 
 import (
 	"github.com/confetti-framework/baker"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"os"
 )
 

diff --git a/foundation/console/facade/cli.go b/foundation/console/facade/cli.go
@@ -2,7 +2,7 @@ package facade
 
 import (
 	"fmt"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/jedib0t/go-pretty/v6/table"
 	"github.com/manifoldco/promptui"
 	"github.com/schollz/progressbar/v3"

diff --git a/foundation/console/foundation_commands.go b/foundation/console/foundation_commands.go
@@ -1,6 +1,6 @@
 package console
 
-import "github.com/confetti-framework/framework/contract/inter"
+import "github.com/confetti-framework/framework/inter"
 
 var FoundationCommands = []inter.Command{
 	AppInfo{},

diff --git a/foundation/console/kernel.go b/foundation/console/kernel.go
@@ -2,10 +2,10 @@ package console
 
 import (
 	"flag"
-	"github.com/confetti-framework/framework/contract/inter"
 	"github.com/confetti-framework/framework/foundation/console/facade"
 	"github.com/confetti-framework/framework/foundation/console/flag_type"
 	"github.com/confetti-framework/framework/foundation/console/service"
+	"github.com/confetti-framework/framework/inter"
 	"io"
 )
 

diff --git a/foundation/console/log_clear.go b/foundation/console/log_clear.go
@@ -1,7 +1,7 @@
 package console
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type LogClear struct{}

diff --git a/foundation/console/route_list.go b/foundation/console/route_list.go
@@ -7,7 +7,7 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 

diff --git a/foundation/console/service/command.go b/foundation/console/service/command.go
@@ -3,7 +3,7 @@ package service
 import (
 	"flag"
 	"fmt"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"reflect"
 	"strings"
 )

diff --git a/foundation/console/service/flags.go b/foundation/console/service/flags.go
@@ -2,8 +2,8 @@ package service
 
 import (
 	"flag"
-	"github.com/confetti-framework/framework/contract/inter"
 	"github.com/confetti-framework/framework/foundation/console/flag_type"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/confetti-framework/framework/support"
 	"reflect"
 )

diff --git a/foundation/console/service/help.go b/foundation/console/service/help.go
@@ -2,7 +2,7 @@ package service
 
 import (
 	"fmt"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/confetti-framework/framework/support"
 	"github.com/jedib0t/go-pretty/v6/table"
 )

diff --git a/foundation/console/service/index.go b/foundation/console/service/index.go
@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 

diff --git a/foundation/container.go b/foundation/container.go
@@ -2,7 +2,7 @@ package foundation
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/confetti-framework/framework/support"
 	"reflect"
 )

diff --git a/foundation/db/database.go b/foundation/db/database.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"database/sql"
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/confetti-framework/framework/support"
 )
 

diff --git a/foundation/decorator/container_decorator/bootstrap.go b/foundation/decorator/container_decorator/bootstrap.go
@@ -1,7 +1,7 @@
 package container_decorator
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type Handler struct {

diff --git a/foundation/decorator/response_decorator/decorate.go b/foundation/decorator/response_decorator/decorate.go
@@ -1,6 +1,6 @@
 package response_decorator
 
-import "github.com/confetti-framework/framework/contract/inter"
+import "github.com/confetti-framework/framework/inter"
 
 type Handler struct {
 	Decorators []inter.ResponseDecorator

diff --git a/foundation/decorator/response_decorator/filter_sensitive_error.go b/foundation/decorator/response_decorator/filter_sensitive_error.go
@@ -2,7 +2,7 @@ package response_decorator
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	net "net/http"
 )
 

diff --git a/foundation/decorator/response_decorator/http_status.go b/foundation/decorator/response_decorator/http_status.go
@@ -2,7 +2,7 @@ package response_decorator
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type HttpStatus struct {

diff --git a/foundation/decorator/response_decorator/log_error.go b/foundation/decorator/response_decorator/log_error.go
@@ -2,7 +2,7 @@ package response_decorator
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type LogError struct{}

diff --git a/foundation/decorator/route_decorator/contraint_parameter.go b/foundation/decorator/route_decorator/contraint_parameter.go
@@ -1,7 +1,7 @@
 package route_decorator
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"strings"
 )
 

diff --git a/foundation/decorator/route_decorator/decorate.go b/foundation/decorator/route_decorator/decorate.go
@@ -1,6 +1,6 @@
 package route_decorator
 
-import "github.com/confetti-framework/framework/contract/inter"
+import "github.com/confetti-framework/framework/inter"
 
 func Decorate(route inter.Route, decorators []inter.RouteDecorator) inter.Route {
 	for _, decorator := range decorators {

diff --git a/foundation/decorator/route_decorator/optional_parameter.go b/foundation/decorator/route_decorator/optional_parameter.go
@@ -1,7 +1,7 @@
 package route_decorator
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"regexp"
 	"strings"
 )

diff --git a/foundation/decorator/route_decorator/optional_slash.go b/foundation/decorator/route_decorator/optional_slash.go
@@ -1,7 +1,7 @@
 package route_decorator
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"strings"
 )
 

diff --git a/foundation/decorator/route_decorator/prefix_uri_slash.go b/foundation/decorator/route_decorator/prefix_uri_slash.go
@@ -1,7 +1,7 @@
 package route_decorator
 
 import (
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"strings"
 )
 

diff --git a/foundation/encoder/encode_through.go b/foundation/encoder/encode_through.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"reflect"
 )
 

diff --git a/foundation/encoder/errors_to_html.go b/foundation/encoder/errors_to_html.go
@@ -3,7 +3,7 @@ package encoder
 import (
 	"fmt"
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/confetti-framework/framework/foundation/http/view_helper"
 	"github.com/confetti-framework/framework/support/str"
 )

diff --git a/foundation/encoder/errors_to_json.go b/foundation/encoder/errors_to_json.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/confetti-framework/framework/support/str"
 )
 

diff --git a/foundation/encoder/html_reader_to_json.go b/foundation/encoder/html_reader_to_json.go
@@ -3,7 +3,7 @@ package encoder
 import (
 	"fmt"
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"reflect"
 )
 

diff --git a/foundation/encoder/interface_to_html.go b/foundation/encoder/interface_to_html.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"github.com/spf13/cast"
 )
 

diff --git a/foundation/encoder/interface_to_json.go b/foundation/encoder/interface_to_json.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"encoding/json"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type InterfaceToJson struct{}

diff --git a/foundation/encoder/json_reader_to_json.go b/foundation/encoder/json_reader_to_json.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"reflect"
 )
 

diff --git a/foundation/encoder/json_to_json.go b/foundation/encoder/json_to_json.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"encoding/json"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 )
 
 type JsonToJson struct{}

diff --git a/foundation/encoder/raw_to_html.go b/foundation/encoder/raw_to_html.go
@@ -2,7 +2,7 @@ package encoder
 
 import (
 	"github.com/confetti-framework/errors"
-	"github.com/confetti-framework/framework/contract/inter"
+	"github.com/confetti-framework/framework/inter"
 	"reflect"
 )