From 4a98a3e5f0641ddeb3367212a88c3b738a2ff254 Mon Sep 17 00:00:00 2001 From: Vaggelis Yfantis Date: Wed, 11 May 2022 23:54:34 +0300 Subject: [PATCH] Move contract/inter to inter --- contract/.gitignore | 16 -------------- contract/LICENSE | 21 ------------------- contract/README.md | 9 -------- foundation/.gitignore | 16 -------------- foundation/LICENSE | 21 ------------------- foundation/application.go | 2 +- foundation/console/app_info.go | 2 +- foundation/console/app_serve.go | 2 +- foundation/console/baker.go | 2 +- foundation/console/facade/cli.go | 2 +- foundation/console/foundation_commands.go | 2 +- foundation/console/kernel.go | 2 +- foundation/console/log_clear.go | 2 +- foundation/console/route_list.go | 2 +- foundation/console/service/command.go | 2 +- foundation/console/service/flags.go | 2 +- foundation/console/service/help.go | 2 +- foundation/console/service/index.go | 2 +- foundation/container.go | 2 +- foundation/db/database.go | 2 +- .../container_decorator/bootstrap.go | 2 +- .../decorator/response_decorator/decorate.go | 2 +- .../filter_sensitive_error.go | 2 +- .../response_decorator/http_status.go | 2 +- .../decorator/response_decorator/log_error.go | 2 +- .../route_decorator/contraint_parameter.go | 2 +- .../decorator/route_decorator/decorate.go | 2 +- .../route_decorator/optional_parameter.go | 2 +- .../route_decorator/optional_slash.go | 2 +- .../route_decorator/prefix_uri_slash.go | 2 +- foundation/encoder/encode_through.go | 2 +- foundation/encoder/errors_to_html.go | 2 +- foundation/encoder/errors_to_json.go | 2 +- foundation/encoder/html_reader_to_json.go | 2 +- foundation/encoder/interface_to_html.go | 2 +- foundation/encoder/interface_to_json.go | 2 +- foundation/encoder/json_reader_to_json.go | 2 +- foundation/encoder/json_to_json.go | 2 +- foundation/encoder/raw_to_html.go | 2 +- foundation/encoder/raw_to_json.go | 2 +- .../encoder/request_with_form_to_value.go | 2 +- .../encoder/request_with_json_to_value.go | 2 +- foundation/encoder/string_to_string.go | 2 +- foundation/encoder/view_to_html.go | 2 +- foundation/http/handle_http_kernel.go | 2 +- foundation/http/http_helper/header.go | 2 +- foundation/http/http_helper/method.go | 2 +- foundation/http/http_helper/mux.go | 2 +- foundation/http/kernel.go | 2 +- .../http/middleware/cast_panic_to_response.go | 2 +- .../middleware/default_response_outcome.go | 2 +- foundation/http/middleware/pipeline.go | 2 +- .../http/middleware/request_body_decoder.go | 2 +- foundation/http/middleware/request_id.go | 2 +- .../http/middleware/response_decorator.go | 2 +- foundation/http/outcome/content.go | 2 +- foundation/http/outcome/html.go | 2 +- foundation/http/outcome/json.go | 2 +- foundation/http/outcome/redirect_response.go | 2 +- foundation/http/outcome/response.go | 2 +- foundation/http/outcome/url_generator.go | 2 +- foundation/http/request.go | 2 +- foundation/http/router.go | 2 +- foundation/http/routing/controllers.go | 2 +- foundation/http/routing/creators.go | 2 +- foundation/http/routing/methods.go | 2 +- foundation/http/routing/route.go | 2 +- foundation/http/routing/route_collection.go | 2 +- foundation/http/view_helper/view.go | 2 +- foundation/loggers/logger_facade.go | 2 +- foundation/loggers/slack.go | 2 +- foundation/loggers/stack.go | 2 +- foundation/loggers/syslog.go | 2 +- .../providers/config_service_provider.go | 2 +- .../providers/database_service_provider.go | 2 +- foundation/test/config/receiver_test.go | 2 +- foundation/test/config/register_test.go | 2 +- foundation/test/console/app_info_test.go | 2 +- foundation/test/console/cast_options_test.go | 2 +- foundation/test/console/command_index_test.go | 2 +- .../test/console/command_log_clear_test.go | 2 +- foundation/test/console/help_test.go | 2 +- foundation/test/console/options_test.go | 2 +- foundation/test/console/route_list_test.go | 2 +- .../test/console/validate_options_test.go | 2 +- foundation/test/db/db_from_app_test.go | 2 +- foundation/test/encode/errors_to_html_test.go | 2 +- foundation/test/encode/errors_to_json_test.go | 2 +- .../test/encode/string_to_string_test.go | 2 +- .../test/http/request_id_middleware_test.go | 2 +- foundation/test/lifecycle/application_test.go | 2 +- foundation/test/lifecycle/container_test.go | 2 +- foundation/test/lifecycle/middleware_test.go | 2 +- foundation/test/log/channel_test.go | 2 +- .../test/log/log_error_from_response_test.go | 2 +- foundation/test/log/rotate_test.go | 2 +- foundation/test/log/stack_test.go | 2 +- foundation/test/mock/error_view.go | 2 +- foundation/test/mock/outcome.go | 2 +- foundation/test/request/content_type_test.go | 2 +- foundation/test/request/cookies_test.go | 2 +- foundation/test/request/files_test.go | 2 +- .../test/request/request_content_test.go | 2 +- .../test/response/error_to_response_test.go | 2 +- .../response/filter_sensitive_error_test.go | 2 +- foundation/test/routing/closure_test.go | 2 +- foundation/test/routing/cookie_test.go | 2 +- foundation/test/routing/domain_test.go | 2 +- foundation/test/routing/helper.go | 2 +- .../test/routing/http_middleware_test.go | 2 +- foundation/test/routing/method_test.go | 2 +- foundation/test/routing/named_route_test.go | 2 +- .../test/routing/optional_parameter_test.go | 2 +- .../parameter_regular_expression_test.go | 2 +- foundation/test/routing/redirect_test.go | 2 +- {contract/inter => inter}/app.go | 0 .../inter => inter}/boot_service_provider.go | 0 {contract/inter => inter}/bootstrap.go | 0 {contract/inter => inter}/console.go | 0 {contract/inter => inter}/container.go | 0 {contract/inter => inter}/controller.go | 0 {contract/inter => inter}/database.go | 0 {contract/inter => inter}/encoder.go | 0 {contract/inter => inter}/http_kernel.go | 0 {contract/inter => inter}/http_middleware.go | 0 {contract/inter => inter}/json_reader.go | 0 {contract/inter => inter}/logger.go | 0 .../register_service_provider.go | 0 {contract/inter => inter}/request.go | 0 {contract/inter => inter}/response.go | 0 {contract/inter => inter}/route.go | 0 {contract/inter => inter}/route_collection.go | 0 {contract/inter => inter}/rule.go | 0 {contract/inter => inter}/view.go | 0 support/.gitignore | 16 -------------- support/LICENSE | 21 ------------------- validation/.gitignore | 17 --------------- validation/LICENSE | 21 ------------------- validation/rule/accepted.go | 2 +- validation/rule/present.go | 2 +- validation/test/validator_test.go | 2 +- validation/val/field.go | 2 +- validation/val/validator.go | 2 +- 143 files changed, 115 insertions(+), 273 deletions(-) delete mode 100644 contract/.gitignore delete mode 100644 contract/LICENSE delete mode 100644 contract/README.md delete mode 100644 foundation/.gitignore delete mode 100644 foundation/LICENSE rename {contract/inter => inter}/app.go (100%) rename {contract/inter => inter}/boot_service_provider.go (100%) rename {contract/inter => inter}/bootstrap.go (100%) rename {contract/inter => inter}/console.go (100%) rename {contract/inter => inter}/container.go (100%) rename {contract/inter => inter}/controller.go (100%) rename {contract/inter => inter}/database.go (100%) rename {contract/inter => inter}/encoder.go (100%) rename {contract/inter => inter}/http_kernel.go (100%) rename {contract/inter => inter}/http_middleware.go (100%) rename {contract/inter => inter}/json_reader.go (100%) rename {contract/inter => inter}/logger.go (100%) rename {contract/inter => inter}/register_service_provider.go (100%) rename {contract/inter => inter}/request.go (100%) rename {contract/inter => inter}/response.go (100%) rename {contract/inter => inter}/route.go (100%) rename {contract/inter => inter}/route_collection.go (100%) rename {contract/inter => inter}/rule.go (100%) rename {contract/inter => inter}/view.go (100%) delete mode 100644 support/.gitignore delete mode 100644 support/LICENSE delete mode 100644 validation/.gitignore delete mode 100644 validation/LICENSE diff --git a/contract/.gitignore b/contract/.gitignore deleted file mode 100644 index 474b778..0000000 --- a/contract/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out -.idea - -# Dependency directories -vendor diff --git a/contract/LICENSE b/contract/LICENSE deleted file mode 100644 index 413b7ef..0000000 --- a/contract/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Confetti - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/contract/README.md b/contract/README.md deleted file mode 100644 index e7a50d5..0000000 --- a/contract/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# contract - -This repository contains all the interfaces that are cross-repository. - -confetti-framework.github.io/docs - -## License - -Confetti is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). diff --git a/foundation/.gitignore b/foundation/.gitignore deleted file mode 100644 index 474b778..0000000 --- a/foundation/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out -.idea - -# Dependency directories -vendor diff --git a/foundation/LICENSE b/foundation/LICENSE deleted file mode 100644 index 413b7ef..0000000 --- a/foundation/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Confetti - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/foundation/application.go b/foundation/application.go index 23628f4..f9ca8c9 100644 --- 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 index c287dc3..49ec236 100644 --- 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 index d2972d6..6b894ca 100644 --- 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 index d9cf2c7..4d30983 100644 --- 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 index 759cfd8..99ea135 100644 --- 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 index 263ecc8..b3abb75 100644 --- 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 index 4cc535f..2f26422 100755 --- 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 index a7b2453..349f6d1 100644 --- 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 index b0a489b..8b09c3b 100644 --- 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 index 87d4ca9..a074508 100644 --- 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 index f1261ad..2dcb22f 100644 --- 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 index 57c087f..ae0b52f 100644 --- 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 index b6b2698..1778b17 100644 --- 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 index bfdcdaa..3dfe329 100644 --- 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 index e66b98f..976b1f8 100644 --- 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 index 4a13301..33df9cb 100644 --- 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 index 89eca64..89d2063 100644 --- 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 index c3d1c53..41a6abc 100644 --- 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 index 925213f..3e3413b 100644 --- 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 index fa2e276..0295725 100644 --- 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 index ff161c5..3863cc4 100644 --- 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 index 9200f91..89fde1e 100644 --- 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 index 0531fb1..7a809ac 100644 --- 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 index 30584ad..af5c9dc 100644 --- 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 index b37267d..c0ea9f9 100644 --- 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 index 6f1fd64..1561aef 100644 --- 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 index fb30b9b..118c0df 100644 --- 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 index eb685fb..8d0addd 100644 --- 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 index 89b0b0d..23a7ae9 100644 --- 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 index 3b73729..e1ab524 100644 --- 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 index 459e879..6688c15 100644 --- 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 index 288eb42..4ec658b 100644 --- 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 index 5b52c12..7b88abf 100644 --- 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 index 79236bb..4bccaaa 100644 --- 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" ) diff --git a/foundation/encoder/raw_to_json.go b/foundation/encoder/raw_to_json.go index 05cf54c..1cc5b48 100644 --- a/foundation/encoder/raw_to_json.go +++ b/foundation/encoder/raw_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/request_with_form_to_value.go b/foundation/encoder/request_with_form_to_value.go index ea0974f..98c7487 100644 --- a/foundation/encoder/request_with_form_to_value.go +++ b/foundation/encoder/request_with_form_to_value.go @@ -1,7 +1,7 @@ package encoder import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" ) diff --git a/foundation/encoder/request_with_json_to_value.go b/foundation/encoder/request_with_json_to_value.go index 978bf8e..aecf0ca 100644 --- a/foundation/encoder/request_with_json_to_value.go +++ b/foundation/encoder/request_with_json_to_value.go @@ -1,7 +1,7 @@ package encoder import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" "io/ioutil" ) diff --git a/foundation/encoder/string_to_string.go b/foundation/encoder/string_to_string.go index 5b2ab44..a5fc647 100644 --- a/foundation/encoder/string_to_string.go +++ b/foundation/encoder/string_to_string.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/view_to_html.go b/foundation/encoder/view_to_html.go index 2cad019..1cb642c 100644 --- a/foundation/encoder/view_to_html.go +++ b/foundation/encoder/view_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/confetti-framework/framework/foundation/http/view_helper" ) diff --git a/foundation/http/handle_http_kernel.go b/foundation/http/handle_http_kernel.go index 7329738..1a827dc 100644 --- a/foundation/http/handle_http_kernel.go +++ b/foundation/http/handle_http_kernel.go @@ -2,7 +2,7 @@ package http import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" net "net/http" "strings" ) diff --git a/foundation/http/http_helper/header.go b/foundation/http/http_helper/header.go index 5aa3cad..c500b33 100644 --- a/foundation/http/http_helper/header.go +++ b/foundation/http/http_helper/header.go @@ -1,7 +1,7 @@ package http_helper import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "strings" ) diff --git a/foundation/http/http_helper/method.go b/foundation/http/http_helper/method.go index 6e2ef02..c045268 100644 --- a/foundation/http/http_helper/method.go +++ b/foundation/http/http_helper/method.go @@ -1,7 +1,7 @@ package http_helper import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "strings" ) diff --git a/foundation/http/http_helper/mux.go b/foundation/http/http_helper/mux.go index 4bfb236..e13031e 100644 --- a/foundation/http/http_helper/mux.go +++ b/foundation/http/http_helper/mux.go @@ -1,7 +1,7 @@ package http_helper import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/gorilla/mux" ) diff --git a/foundation/http/kernel.go b/foundation/http/kernel.go index 4d59829..808d921 100644 --- a/foundation/http/kernel.go +++ b/foundation/http/kernel.go @@ -1,7 +1,7 @@ package http import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/http/http_helper" "github.com/confetti-framework/framework/foundation/http/middleware" ) diff --git a/foundation/http/middleware/cast_panic_to_response.go b/foundation/http/middleware/cast_panic_to_response.go index 90129e2..719ae2e 100644 --- a/foundation/http/middleware/cast_panic_to_response.go +++ b/foundation/http/middleware/cast_panic_to_response.go @@ -2,8 +2,8 @@ package middleware import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http/http_helper" + "github.com/confetti-framework/framework/inter" ) type PanicToResponse struct{} diff --git a/foundation/http/middleware/default_response_outcome.go b/foundation/http/middleware/default_response_outcome.go index 85e1893..8e5ea2c 100644 --- a/foundation/http/middleware/default_response_outcome.go +++ b/foundation/http/middleware/default_response_outcome.go @@ -1,7 +1,7 @@ package middleware import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" ) type DefaultResponseOutcome struct { diff --git a/foundation/http/middleware/pipeline.go b/foundation/http/middleware/pipeline.go index 3cfe3ab..3a562ae 100644 --- a/foundation/http/middleware/pipeline.go +++ b/foundation/http/middleware/pipeline.go @@ -1,7 +1,7 @@ package middleware import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support/caller" "sort" ) diff --git a/foundation/http/middleware/request_body_decoder.go b/foundation/http/middleware/request_body_decoder.go index 0cff80d..699b7a7 100644 --- a/foundation/http/middleware/request_body_decoder.go +++ b/foundation/http/middleware/request_body_decoder.go @@ -1,9 +1,9 @@ package middleware import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/encoder" "github.com/confetti-framework/framework/foundation/http/http_helper" + "github.com/confetti-framework/framework/inter" ) type RequestBodyDecoder struct{} diff --git a/foundation/http/middleware/request_id.go b/foundation/http/middleware/request_id.go index 91e6d15..c93cf6b 100644 --- a/foundation/http/middleware/request_id.go +++ b/foundation/http/middleware/request_id.go @@ -1,7 +1,7 @@ package middleware import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/google/uuid" ) diff --git a/foundation/http/middleware/response_decorator.go b/foundation/http/middleware/response_decorator.go index eb51d2d..825e88a 100644 --- a/foundation/http/middleware/response_decorator.go +++ b/foundation/http/middleware/response_decorator.go @@ -1,8 +1,8 @@ package middleware import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/decorator/response_decorator" + "github.com/confetti-framework/framework/inter" ) type DecorateResponse struct{} diff --git a/foundation/http/outcome/content.go b/foundation/http/outcome/content.go index 8e10222..da2ceba 100644 --- a/foundation/http/outcome/content.go +++ b/foundation/http/outcome/content.go @@ -1,7 +1,7 @@ package outcome import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/errors" "github.com/confetti-framework/framework/support" "io/ioutil" diff --git a/foundation/http/outcome/html.go b/foundation/http/outcome/html.go index 251ca6b..f07a2f0 100644 --- a/foundation/http/outcome/html.go +++ b/foundation/http/outcome/html.go @@ -1,7 +1,7 @@ package outcome import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "net/http" ) diff --git a/foundation/http/outcome/json.go b/foundation/http/outcome/json.go index aa3dc34..add4a0f 100644 --- a/foundation/http/outcome/json.go +++ b/foundation/http/outcome/json.go @@ -1,7 +1,7 @@ package outcome import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "net/http" ) diff --git a/foundation/http/outcome/redirect_response.go b/foundation/http/outcome/redirect_response.go index 015003d..1a3928b 100644 --- a/foundation/http/outcome/redirect_response.go +++ b/foundation/http/outcome/redirect_response.go @@ -2,7 +2,7 @@ package outcome import ( "bytes" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "html/template" net "net/http" ) diff --git a/foundation/http/outcome/response.go b/foundation/http/outcome/response.go index 5557fcf..60814a8 100644 --- a/foundation/http/outcome/response.go +++ b/foundation/http/outcome/response.go @@ -2,8 +2,8 @@ package outcome import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/encoder" + "github.com/confetti-framework/framework/inter" "net/http" "strings" ) diff --git a/foundation/http/outcome/url_generator.go b/foundation/http/outcome/url_generator.go index 7ede8b8..95dca88 100644 --- a/foundation/http/outcome/url_generator.go +++ b/foundation/http/outcome/url_generator.go @@ -3,10 +3,10 @@ package outcome import ( "fmt" "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/decorator/route_decorator" "github.com/confetti-framework/framework/foundation/http/http_helper" "github.com/confetti-framework/framework/foundation/http/method" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" ) diff --git a/foundation/http/request.go b/foundation/http/request.go index 8528425..fa263ed 100644 --- a/foundation/http/request.go +++ b/foundation/http/request.go @@ -3,7 +3,7 @@ package http import ( "bytes" "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/method" "github.com/confetti-framework/framework/support" "github.com/gorilla/mux" diff --git a/foundation/http/router.go b/foundation/http/router.go index ffa64a8..e0c9448 100644 --- a/foundation/http/router.go +++ b/foundation/http/router.go @@ -1,7 +1,7 @@ package http import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/http/middleware" ) diff --git a/foundation/http/routing/controllers.go b/foundation/http/routing/controllers.go index 9abc324..27d506a 100644 --- a/foundation/http/routing/controllers.go +++ b/foundation/http/routing/controllers.go @@ -1,8 +1,8 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http/outcome" + "github.com/confetti-framework/framework/inter" ) func redirectController(request inter.Request) inter.Response { diff --git a/foundation/http/routing/creators.go b/foundation/http/routing/creators.go index d17dc41..ce1f712 100644 --- a/foundation/http/routing/creators.go +++ b/foundation/http/routing/creators.go @@ -1,6 +1,6 @@ package routing -import "github.com/confetti-framework/framework/contract/inter" +import "github.com/confetti-framework/framework/inter" func createRoutes(methods []string, uri string, controller inter.Controller) *RouteCollection { routes := NewRouteCollection() diff --git a/foundation/http/routing/methods.go b/foundation/http/routing/methods.go index 6134c0f..5fc6c11 100644 --- a/foundation/http/routing/methods.go +++ b/foundation/http/routing/methods.go @@ -1,7 +1,7 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" net "net/http" diff --git a/foundation/http/routing/route.go b/foundation/http/routing/route.go index f60e71e..93a28d5 100644 --- a/foundation/http/routing/route.go +++ b/foundation/http/routing/route.go @@ -1,7 +1,7 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" "strings" ) diff --git a/foundation/http/routing/route_collection.go b/foundation/http/routing/route_collection.go index fe10967..6567de4 100644 --- a/foundation/http/routing/route_collection.go +++ b/foundation/http/routing/route_collection.go @@ -2,7 +2,7 @@ package routing import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/decorator/route_decorator" "github.com/confetti-framework/framework/foundation/http/http_helper" "github.com/confetti-framework/framework/foundation/http/outcome" diff --git a/foundation/http/view_helper/view.go b/foundation/http/view_helper/view.go index dac07ad..bf24d69 100644 --- a/foundation/http/view_helper/view.go +++ b/foundation/http/view_helper/view.go @@ -3,7 +3,7 @@ package view_helper import ( "bytes" "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "html/template" ) diff --git a/foundation/loggers/logger_facade.go b/foundation/loggers/logger_facade.go index c6b22c9..2e6d82e 100644 --- a/foundation/loggers/logger_facade.go +++ b/foundation/loggers/logger_facade.go @@ -1,7 +1,7 @@ package loggers import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/syslog/log_level" ) diff --git a/foundation/loggers/slack.go b/foundation/loggers/slack.go index c6d4b0b..b5ba7ca 100644 --- a/foundation/loggers/slack.go +++ b/foundation/loggers/slack.go @@ -5,7 +5,7 @@ import ( "encoding/json" "fmt" "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/syslog" "github.com/confetti-framework/syslog/log_level" "net/http" diff --git a/foundation/loggers/stack.go b/foundation/loggers/stack.go index 1c4b093..ece6752 100644 --- a/foundation/loggers/stack.go +++ b/foundation/loggers/stack.go @@ -2,7 +2,7 @@ package loggers import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/syslog/log_level" ) diff --git a/foundation/loggers/syslog.go b/foundation/loggers/syslog.go index b32c561..bdf57c4 100644 --- a/foundation/loggers/syslog.go +++ b/foundation/loggers/syslog.go @@ -3,8 +3,8 @@ package loggers import ( "encoding/json" "fmt" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/errors" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/syslog" "github.com/confetti-framework/syslog/log_level" "github.com/vigneshuvi/GoDateFormat" diff --git a/foundation/providers/config_service_provider.go b/foundation/providers/config_service_provider.go index 02adae3..0ca9a9b 100644 --- a/foundation/providers/config_service_provider.go +++ b/foundation/providers/config_service_provider.go @@ -1,7 +1,7 @@ package providers import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" ) type ConfigServiceProvider struct { diff --git a/foundation/providers/database_service_provider.go b/foundation/providers/database_service_provider.go index 2a6144c..d7815cf 100644 --- a/foundation/providers/database_service_provider.go +++ b/foundation/providers/database_service_provider.go @@ -2,7 +2,7 @@ package providers import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" ) type DatabaseServiceProvider struct { diff --git a/foundation/test/config/receiver_test.go b/foundation/test/config/receiver_test.go index 4fadd9b..14a3d73 100644 --- a/foundation/test/config/receiver_test.go +++ b/foundation/test/config/receiver_test.go @@ -1,9 +1,9 @@ package config import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/providers" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/config/register_test.go b/foundation/test/config/register_test.go index ba0a655..b0c2db4 100644 --- a/foundation/test/config/register_test.go +++ b/foundation/test/config/register_test.go @@ -1,9 +1,9 @@ package config import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/providers" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/console/app_info_test.go b/foundation/test/console/app_info_test.go index 96ed155..d413e29 100644 --- a/foundation/test/console/app_info_test.go +++ b/foundation/test/console/app_info_test.go @@ -5,8 +5,8 @@ package console import ( "bytes" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/console" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/console/cast_options_test.go b/foundation/test/console/cast_options_test.go index 0f034af..1aa5601 100644 --- a/foundation/test/console/cast_options_test.go +++ b/foundation/test/console/cast_options_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/console" "github.com/confetti-framework/framework/foundation/console/facade" diff --git a/foundation/test/console/command_index_test.go b/foundation/test/console/command_index_test.go index 5aa74f3..602ce83 100644 --- a/foundation/test/console/command_index_test.go +++ b/foundation/test/console/command_index_test.go @@ -4,7 +4,7 @@ package console import ( "flag" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/console" "github.com/confetti-framework/framework/foundation/console/facade" "github.com/confetti-framework/framework/foundation/console/service" diff --git a/foundation/test/console/command_log_clear_test.go b/foundation/test/console/command_log_clear_test.go index 53316f3..d159216 100644 --- a/foundation/test/console/command_log_clear_test.go +++ b/foundation/test/console/command_log_clear_test.go @@ -2,7 +2,7 @@ package console import ( "bytes" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/console" "github.com/confetti-framework/framework/foundation/loggers" "github.com/confetti-framework/syslog/log_level" diff --git a/foundation/test/console/help_test.go b/foundation/test/console/help_test.go index 7868984..6748b8e 100644 --- a/foundation/test/console/help_test.go +++ b/foundation/test/console/help_test.go @@ -1,7 +1,7 @@ package console import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/console" "github.com/stretchr/testify/require" "testing" diff --git a/foundation/test/console/options_test.go b/foundation/test/console/options_test.go index b8d311b..0c6742c 100644 --- a/foundation/test/console/options_test.go +++ b/foundation/test/console/options_test.go @@ -3,7 +3,7 @@ package console import ( "testing" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/console" "github.com/confetti-framework/framework/foundation/console/service" "github.com/confetti-framework/framework/support" diff --git a/foundation/test/console/route_list_test.go b/foundation/test/console/route_list_test.go index 85fd886..25b0193 100644 --- a/foundation/test/console/route_list_test.go +++ b/foundation/test/console/route_list_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/console" "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" ) diff --git a/foundation/test/console/validate_options_test.go b/foundation/test/console/validate_options_test.go index 0cda5c7..aa45b44 100644 --- a/foundation/test/console/validate_options_test.go +++ b/foundation/test/console/validate_options_test.go @@ -2,8 +2,8 @@ package console import ( "fmt" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/console" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/db/db_from_app_test.go b/foundation/test/db/db_from_app_test.go index 01fb0da..3ef5855 100644 --- a/foundation/test/db/db_from_app_test.go +++ b/foundation/test/db/db_from_app_test.go @@ -1,9 +1,9 @@ package db import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/db" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/encode/errors_to_html_test.go b/foundation/test/encode/errors_to_html_test.go index 8c21900..8bf3ac2 100644 --- a/foundation/test/encode/errors_to_html_test.go +++ b/foundation/test/encode/errors_to_html_test.go @@ -2,7 +2,7 @@ package encode import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/encoder" "github.com/confetti-framework/framework/foundation/test/mock" "github.com/stretchr/testify/require" diff --git a/foundation/test/encode/errors_to_json_test.go b/foundation/test/encode/errors_to_json_test.go index 60efcdb..85c4483 100644 --- a/foundation/test/encode/errors_to_json_test.go +++ b/foundation/test/encode/errors_to_json_test.go @@ -2,7 +2,7 @@ package encode import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/encoder" "github.com/confetti-framework/framework/foundation/test/mock" diff --git a/foundation/test/encode/string_to_string_test.go b/foundation/test/encode/string_to_string_test.go index d8a58db..faf59a2 100644 --- a/foundation/test/encode/string_to_string_test.go +++ b/foundation/test/encode/string_to_string_test.go @@ -1,7 +1,7 @@ package encode import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/encoder" "github.com/stretchr/testify/require" "testing" diff --git a/foundation/test/http/request_id_middleware_test.go b/foundation/test/http/request_id_middleware_test.go index 30fa0bb..8b06355 100644 --- a/foundation/test/http/request_id_middleware_test.go +++ b/foundation/test/http/request_id_middleware_test.go @@ -1,10 +1,10 @@ package http import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/middleware" "github.com/confetti-framework/framework/foundation/http/outcome" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" net "net/http" "testing" diff --git a/foundation/test/lifecycle/application_test.go b/foundation/test/lifecycle/application_test.go index b00c4bf..6646051 100644 --- a/foundation/test/lifecycle/application_test.go +++ b/foundation/test/lifecycle/application_test.go @@ -1,8 +1,8 @@ package lifecycle import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/lifecycle/container_test.go b/foundation/test/lifecycle/container_test.go index 3138bb0..250fd2b 100644 --- a/foundation/test/lifecycle/container_test.go +++ b/foundation/test/lifecycle/container_test.go @@ -1,8 +1,8 @@ package lifecycle import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" "github.com/stretchr/testify/require" "reflect" diff --git a/foundation/test/lifecycle/middleware_test.go b/foundation/test/lifecycle/middleware_test.go index a2ac194..bc0306e 100644 --- a/foundation/test/lifecycle/middleware_test.go +++ b/foundation/test/lifecycle/middleware_test.go @@ -3,12 +3,12 @@ package lifecycle import ( "testing" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/middleware" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" ) diff --git a/foundation/test/log/channel_test.go b/foundation/test/log/channel_test.go index e5ce73a..3d49b8c 100644 --- a/foundation/test/log/channel_test.go +++ b/foundation/test/log/channel_test.go @@ -1,7 +1,7 @@ package log import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/loggers" "github.com/confetti-framework/syslog/log_level" "github.com/stretchr/testify/require" diff --git a/foundation/test/log/log_error_from_response_test.go b/foundation/test/log/log_error_from_response_test.go index e8ced43..b02f669 100644 --- a/foundation/test/log/log_error_from_response_test.go +++ b/foundation/test/log/log_error_from_response_test.go @@ -3,7 +3,7 @@ package log import ( standardErrors "errors" supportErrors "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/decorator/response_decorator" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/loggers" diff --git a/foundation/test/log/rotate_test.go b/foundation/test/log/rotate_test.go index d939b8b..98e3c32 100644 --- a/foundation/test/log/rotate_test.go +++ b/foundation/test/log/rotate_test.go @@ -1,7 +1,7 @@ package log import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/loggers" "github.com/confetti-framework/syslog/log_level" diff --git a/foundation/test/log/stack_test.go b/foundation/test/log/stack_test.go index 6b445f5..313cb5e 100644 --- a/foundation/test/log/stack_test.go +++ b/foundation/test/log/stack_test.go @@ -1,7 +1,7 @@ package log import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/foundation/loggers" "github.com/confetti-framework/syslog/log_level" "github.com/stretchr/testify/require" diff --git a/foundation/test/mock/error_view.go b/foundation/test/mock/error_view.go index 66f27d2..2814862 100644 --- a/foundation/test/mock/error_view.go +++ b/foundation/test/mock/error_view.go @@ -4,7 +4,7 @@ import ( _ "embed" "fmt" "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" "golang.org/x/text/language" "strings" diff --git a/foundation/test/mock/outcome.go b/foundation/test/mock/outcome.go index cb54dac..53edc45 100644 --- a/foundation/test/mock/outcome.go +++ b/foundation/test/mock/outcome.go @@ -1,8 +1,8 @@ package mock import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/encoder" + "github.com/confetti-framework/framework/inter" ) var JsonEncoders = []inter.Encoder{ diff --git a/foundation/test/request/content_type_test.go b/foundation/test/request/content_type_test.go index fff70ad..ccdc75e 100644 --- a/foundation/test/request/content_type_test.go +++ b/foundation/test/request/content_type_test.go @@ -1,9 +1,9 @@ package request import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/http_helper" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" net "net/http" "testing" diff --git a/foundation/test/request/cookies_test.go b/foundation/test/request/cookies_test.go index 0bed5bb..6f7bed1 100644 --- a/foundation/test/request/cookies_test.go +++ b/foundation/test/request/cookies_test.go @@ -1,8 +1,8 @@ package request import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" net "net/http" "testing" diff --git a/foundation/test/request/files_test.go b/foundation/test/request/files_test.go index 665c5e2..1340483 100644 --- a/foundation/test/request/files_test.go +++ b/foundation/test/request/files_test.go @@ -1,8 +1,8 @@ package request import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "io/ioutil" "strings" diff --git a/foundation/test/request/request_content_test.go b/foundation/test/request/request_content_test.go index 616cbbc..c77f58d 100644 --- a/foundation/test/request/request_content_test.go +++ b/foundation/test/request/request_content_test.go @@ -2,7 +2,6 @@ package request import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/encoder" "github.com/confetti-framework/framework/foundation/http" @@ -11,6 +10,7 @@ import ( "github.com/confetti-framework/framework/foundation/http/middleware" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/test/mock" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" "github.com/gorilla/mux" "github.com/stretchr/testify/require" diff --git a/foundation/test/response/error_to_response_test.go b/foundation/test/response/error_to_response_test.go index ea3d47b..b05aa6b 100644 --- a/foundation/test/response/error_to_response_test.go +++ b/foundation/test/response/error_to_response_test.go @@ -2,11 +2,11 @@ package response import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/decorator/response_decorator" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/middleware" "github.com/confetti-framework/framework/foundation/http/outcome" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" net "net/http" "testing" diff --git a/foundation/test/response/filter_sensitive_error_test.go b/foundation/test/response/filter_sensitive_error_test.go index b82d20b..aaa4130 100644 --- a/foundation/test/response/filter_sensitive_error_test.go +++ b/foundation/test/response/filter_sensitive_error_test.go @@ -2,12 +2,12 @@ package response import ( "github.com/confetti-framework/errors" - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/decorator/response_decorator" "github.com/confetti-framework/framework/foundation/encoder" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/test/mock" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "html/template" net "net/http" diff --git a/foundation/test/routing/closure_test.go b/foundation/test/routing/closure_test.go index f37c135..048bf3c 100644 --- a/foundation/test/routing/closure_test.go +++ b/foundation/test/routing/closure_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" routing2 "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/cookie_test.go b/foundation/test/routing/cookie_test.go index 04bd95b..0479bf7 100644 --- a/foundation/test/routing/cookie_test.go +++ b/foundation/test/routing/cookie_test.go @@ -1,8 +1,8 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http/outcome" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "net/http" "testing" diff --git a/foundation/test/routing/domain_test.go b/foundation/test/routing/domain_test.go index 251ffcd..8f2c68b 100644 --- a/foundation/test/routing/domain_test.go +++ b/foundation/test/routing/domain_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/helper.go b/foundation/test/routing/helper.go index ac84c7f..04e5c15 100644 --- a/foundation/test/routing/helper.go +++ b/foundation/test/routing/helper.go @@ -1,10 +1,10 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/test/mock" + "github.com/confetti-framework/framework/inter" ) func emptyController() func(request inter.Request) inter.Response { diff --git a/foundation/test/routing/http_middleware_test.go b/foundation/test/routing/http_middleware_test.go index d52b06f..9552472 100644 --- a/foundation/test/routing/http_middleware_test.go +++ b/foundation/test/routing/http_middleware_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/method_test.go b/foundation/test/routing/method_test.go index 05fdac2..ca207aa 100644 --- a/foundation/test/routing/method_test.go +++ b/foundation/test/routing/method_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/named_route_test.go b/foundation/test/routing/named_route_test.go index b5d9269..d1ea462 100644 --- a/foundation/test/routing/named_route_test.go +++ b/foundation/test/routing/named_route_test.go @@ -1,12 +1,12 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/optional_parameter_test.go b/foundation/test/routing/optional_parameter_test.go index a0892c0..cfecf5e 100644 --- a/foundation/test/routing/optional_parameter_test.go +++ b/foundation/test/routing/optional_parameter_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" routing2 "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/parameter_regular_expression_test.go b/foundation/test/routing/parameter_regular_expression_test.go index e570282..338ed5e 100644 --- a/foundation/test/routing/parameter_regular_expression_test.go +++ b/foundation/test/routing/parameter_regular_expression_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" routing2 "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" "testing" ) diff --git a/foundation/test/routing/redirect_test.go b/foundation/test/routing/redirect_test.go index a204cf6..ae90693 100644 --- a/foundation/test/routing/redirect_test.go +++ b/foundation/test/routing/redirect_test.go @@ -1,11 +1,11 @@ package routing import ( - "github.com/confetti-framework/framework/contract/inter" "github.com/confetti-framework/framework/foundation/http" "github.com/confetti-framework/framework/foundation/http/method" "github.com/confetti-framework/framework/foundation/http/outcome" routing2 "github.com/confetti-framework/framework/foundation/http/routing" + "github.com/confetti-framework/framework/inter" "github.com/stretchr/testify/require" net "net/http" "testing" diff --git a/contract/inter/app.go b/inter/app.go similarity index 100% rename from contract/inter/app.go rename to inter/app.go diff --git a/contract/inter/boot_service_provider.go b/inter/boot_service_provider.go similarity index 100% rename from contract/inter/boot_service_provider.go rename to inter/boot_service_provider.go diff --git a/contract/inter/bootstrap.go b/inter/bootstrap.go similarity index 100% rename from contract/inter/bootstrap.go rename to inter/bootstrap.go diff --git a/contract/inter/console.go b/inter/console.go similarity index 100% rename from contract/inter/console.go rename to inter/console.go diff --git a/contract/inter/container.go b/inter/container.go similarity index 100% rename from contract/inter/container.go rename to inter/container.go diff --git a/contract/inter/controller.go b/inter/controller.go similarity index 100% rename from contract/inter/controller.go rename to inter/controller.go diff --git a/contract/inter/database.go b/inter/database.go similarity index 100% rename from contract/inter/database.go rename to inter/database.go diff --git a/contract/inter/encoder.go b/inter/encoder.go similarity index 100% rename from contract/inter/encoder.go rename to inter/encoder.go diff --git a/contract/inter/http_kernel.go b/inter/http_kernel.go similarity index 100% rename from contract/inter/http_kernel.go rename to inter/http_kernel.go diff --git a/contract/inter/http_middleware.go b/inter/http_middleware.go similarity index 100% rename from contract/inter/http_middleware.go rename to inter/http_middleware.go diff --git a/contract/inter/json_reader.go b/inter/json_reader.go similarity index 100% rename from contract/inter/json_reader.go rename to inter/json_reader.go diff --git a/contract/inter/logger.go b/inter/logger.go similarity index 100% rename from contract/inter/logger.go rename to inter/logger.go diff --git a/contract/inter/register_service_provider.go b/inter/register_service_provider.go similarity index 100% rename from contract/inter/register_service_provider.go rename to inter/register_service_provider.go diff --git a/contract/inter/request.go b/inter/request.go similarity index 100% rename from contract/inter/request.go rename to inter/request.go diff --git a/contract/inter/response.go b/inter/response.go similarity index 100% rename from contract/inter/response.go rename to inter/response.go diff --git a/contract/inter/route.go b/inter/route.go similarity index 100% rename from contract/inter/route.go rename to inter/route.go diff --git a/contract/inter/route_collection.go b/inter/route_collection.go similarity index 100% rename from contract/inter/route_collection.go rename to inter/route_collection.go diff --git a/contract/inter/rule.go b/inter/rule.go similarity index 100% rename from contract/inter/rule.go rename to inter/rule.go diff --git a/contract/inter/view.go b/inter/view.go similarity index 100% rename from contract/inter/view.go rename to inter/view.go diff --git a/support/.gitignore b/support/.gitignore deleted file mode 100644 index 35620a1..0000000 --- a/support/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# IDE -*.out -.idea - -# Dependency directories -vendor diff --git a/support/LICENSE b/support/LICENSE deleted file mode 100644 index 413b7ef..0000000 --- a/support/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2019 Confetti - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/validation/.gitignore b/validation/.gitignore deleted file mode 100644 index 0e9548c..0000000 --- a/validation/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -# Binaries for programs and plugins -main -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out -.idea/ - -# Dependency directories -vendor \ No newline at end of file diff --git a/validation/LICENSE b/validation/LICENSE deleted file mode 100644 index 1976b2c..0000000 --- a/validation/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 Confetti - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/validation/rule/accepted.go b/validation/rule/accepted.go index a031e5c..685eac1 100644 --- a/validation/rule/accepted.go +++ b/validation/rule/accepted.go @@ -1,7 +1,7 @@ package rule import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" ) diff --git a/validation/rule/present.go b/validation/rule/present.go index e00c5cc..32c3bdd 100644 --- a/validation/rule/present.go +++ b/validation/rule/present.go @@ -1,7 +1,7 @@ package rule import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" "github.com/confetti-framework/framework/support" ) diff --git a/validation/test/validator_test.go b/validation/test/validator_test.go index 4f3650c..b11600b 100644 --- a/validation/test/validator_test.go +++ b/validation/test/validator_test.go @@ -3,7 +3,7 @@ package test 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/support" "github.com/confetti-framework/framework/validation/rule" "github.com/confetti-framework/framework/validation/val" diff --git a/validation/val/field.go b/validation/val/field.go index 4d85da5..6052457 100644 --- a/validation/val/field.go +++ b/validation/val/field.go @@ -1,7 +1,7 @@ package val import ( - "github.com/confetti-framework/framework/contract/inter" + "github.com/confetti-framework/framework/inter" ) type Verification struct { diff --git a/validation/val/validator.go b/validation/val/validator.go index 75257ac..c187c2f 100644 --- a/validation/val/validator.go +++ b/validation/val/validator.go @@ -2,7 +2,7 @@ package val 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" rules "github.com/confetti-framework/framework/validation/rule" "github.com/confetti-framework/framework/validation/val_errors"