diff --git a/filter/impl/access_log_filter.go b/filter/default_filters/access_log_filter.go similarity index 99% rename from filter/impl/access_log_filter.go rename to filter/default_filters/access_log_filter.go index 89fa34952f99057f1d8bb35794a57f9905f5f169..a00c729efd4df39f892ac96115eb5969e5da28de 100644 --- a/filter/impl/access_log_filter.go +++ b/filter/default_filters/access_log_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "os" diff --git a/filter/impl/access_log_filter_test.go b/filter/default_filters/access_log_filter_test.go similarity index 99% rename from filter/impl/access_log_filter_test.go rename to filter/default_filters/access_log_filter_test.go index 834d531f05f952c41abfe8e1c56c20c0285926b8..4e883de2b4119c1144f57b4165b633a56b2e175a 100644 --- a/filter/impl/access_log_filter_test.go +++ b/filter/default_filters/access_log_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "context" diff --git a/filter/impl/active_filter.go b/filter/default_filters/active_filter.go similarity index 98% rename from filter/impl/active_filter.go rename to filter/default_filters/active_filter.go index 36a4e1a767ab7170ce8e5bebf2cfa4403f6ad4ff..f84a5fbd14a206abc4db3c480e14d87d3869af77 100644 --- a/filter/impl/active_filter.go +++ b/filter/default_filters/active_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "github.com/apache/dubbo-go/common/extension" diff --git a/filter/impl/echo_filter.go b/filter/default_filters/echo_filter.go similarity index 98% rename from filter/impl/echo_filter.go rename to filter/default_filters/echo_filter.go index 18e42c8cb2b15acb27573c5e24f11a8b69e0d496..5d327291c545f9918acc7524f27a9d1688229c65 100644 --- a/filter/impl/echo_filter.go +++ b/filter/default_filters/echo_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "github.com/apache/dubbo-go/common/constant" diff --git a/filter/impl/echo_filter_test.go b/filter/default_filters/echo_filter_test.go similarity index 98% rename from filter/impl/echo_filter_test.go rename to filter/default_filters/echo_filter_test.go index e2e592974701ad18c5b01e884485c022ee2320b8..ff9a7e9157fb88a1502fd3b3b47c91d9f881a7b7 100644 --- a/filter/impl/echo_filter_test.go +++ b/filter/default_filters/echo_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "testing" diff --git a/filter/impl/execute_limit_filter.go b/filter/default_filters/execute_limit_filter.go similarity index 98% rename from filter/impl/execute_limit_filter.go rename to filter/default_filters/execute_limit_filter.go index ef7c0997f1586b6acb615fcfc226e033fabe6419..28b6a81f2f2b68c235467f19c7c45709fa759ed3 100644 --- a/filter/impl/execute_limit_filter.go +++ b/filter/default_filters/execute_limit_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "strconv" @@ -32,7 +32,7 @@ import ( "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/filter" - _ "github.com/apache/dubbo-go/filter/common" + _ "github.com/apache/dubbo-go/filter/handler" "github.com/apache/dubbo-go/protocol" ) diff --git a/filter/impl/execute_limit_filter_test.go b/filter/default_filters/execute_limit_filter_test.go similarity index 99% rename from filter/impl/execute_limit_filter_test.go rename to filter/default_filters/execute_limit_filter_test.go index 5d729c0e6a1205902856eccfa6aa96b0bee0e790..6864ed04ed721e9e0fbb483f673bb35aabe2263c 100644 --- a/filter/impl/execute_limit_filter_test.go +++ b/filter/default_filters/execute_limit_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "net/url" diff --git a/filter/impl/generic_filter.go b/filter/default_filters/generic_filter.go similarity index 99% rename from filter/impl/generic_filter.go rename to filter/default_filters/generic_filter.go index 067939a34b889198a25b08af23892ad4037e642e..b7921caf82416c6fdfff7cbb6e74c86eae4fc1bd 100644 --- a/filter/impl/generic_filter.go +++ b/filter/default_filters/generic_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "reflect" diff --git a/filter/impl/generic_filter_test.go b/filter/default_filters/generic_filter_test.go similarity index 99% rename from filter/impl/generic_filter_test.go rename to filter/default_filters/generic_filter_test.go index 9797c40df1f57017241675013620a53320e475ad..2160c1ceeb4768d04d21a1a6a560cfe4ea9309c0 100644 --- a/filter/impl/generic_filter_test.go +++ b/filter/default_filters/generic_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "reflect" diff --git a/filter/impl/generic_service_filter.go b/filter/default_filters/generic_service_filter.go similarity index 99% rename from filter/impl/generic_service_filter.go rename to filter/default_filters/generic_service_filter.go index 2fde925d66a89a5f8bbf208d2f72362d2cbeab89..1d40cf68fc989825a0393ac824234a3e0fc2c422 100644 --- a/filter/impl/generic_service_filter.go +++ b/filter/default_filters/generic_service_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "reflect" diff --git a/filter/impl/generic_service_filter_test.go b/filter/default_filters/generic_service_filter_test.go similarity index 99% rename from filter/impl/generic_service_filter_test.go rename to filter/default_filters/generic_service_filter_test.go index 89898694c267ad5a84814651b16d3ff9bcfc871a..f4696f92ab7f896268feb44e39368baffc0c3e0d 100644 --- a/filter/impl/generic_service_filter_test.go +++ b/filter/default_filters/generic_service_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "context" diff --git a/filter/impl/graceful_shutdown_filter.go b/filter/default_filters/graceful_shutdown_filter.go similarity index 99% rename from filter/impl/graceful_shutdown_filter.go rename to filter/default_filters/graceful_shutdown_filter.go index 02269322393bccd4ff3c9c18667bc16af73bc409..4fc92afa1a266bd019a0dfceee4807825556abd7 100644 --- a/filter/impl/graceful_shutdown_filter.go +++ b/filter/default_filters/graceful_shutdown_filter.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "sync/atomic" diff --git a/filter/impl/graceful_shutdown_filter_test.go b/filter/default_filters/graceful_shutdown_filter_test.go similarity index 97% rename from filter/impl/graceful_shutdown_filter_test.go rename to filter/default_filters/graceful_shutdown_filter_test.go index 1fa3a74ac950bf22077cda5ffdba546f64725e70..a17dfa5410189690ad479caf833fd1e316f20607 100644 --- a/filter/impl/graceful_shutdown_filter_test.go +++ b/filter/default_filters/graceful_shutdown_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "net/url" @@ -32,7 +32,7 @@ import ( "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/config" "github.com/apache/dubbo-go/filter" - common2 "github.com/apache/dubbo-go/filter/common" + common2 "github.com/apache/dubbo-go/filter/handler" "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/protocol/invocation" ) diff --git a/filter/impl/hystrix_filter.go b/filter/default_filters/hystrix_filter.go similarity index 99% rename from filter/impl/hystrix_filter.go rename to filter/default_filters/hystrix_filter.go index 3fd9f87168616b69d5ec72460767890d6956c154..3abe821bba063f95e3abbd6e99dc069900f2534c 100644 --- a/filter/impl/hystrix_filter.go +++ b/filter/default_filters/hystrix_filter.go @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package impl +package default_filters import ( "fmt" diff --git a/filter/impl/hystrix_filter_test.go b/filter/default_filters/hystrix_filter_test.go similarity index 99% rename from filter/impl/hystrix_filter_test.go rename to filter/default_filters/hystrix_filter_test.go index d3a5183ede25d8a325bb1c73020edddd2ffbc638..1303cbaeb8810a4c23035440e2c552687090310d 100644 --- a/filter/impl/hystrix_filter_test.go +++ b/filter/default_filters/hystrix_filter_test.go @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package impl +package default_filters import ( "regexp" diff --git a/filter/impl/token_filter.go b/filter/default_filters/token_filter.go similarity index 98% rename from filter/impl/token_filter.go rename to filter/default_filters/token_filter.go index d10dff5b761d0fbe40ff3a14a93ee8962d000e02..6279a100f1b7455c3c0acbc746df485c96d37dc6 100644 --- a/filter/impl/token_filter.go +++ b/filter/default_filters/token_filter.go @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package impl +package default_filters import ( "strings" diff --git a/filter/impl/token_filter_test.go b/filter/default_filters/token_filter_test.go similarity index 99% rename from filter/impl/token_filter_test.go rename to filter/default_filters/token_filter_test.go index 1473f274037699260725ff9ebb1b3d1377efb326..0a5967265af91c25879a9d7ba05c118864726c02 100644 --- a/filter/impl/token_filter_test.go +++ b/filter/default_filters/token_filter_test.go @@ -15,7 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package impl +package default_filters import ( "net/url" diff --git a/filter/impl/tps/tps_limit_fix_window_strategy.go b/filter/default_filters/tps/tps_limit_fix_window_strategy.go similarity index 100% rename from filter/impl/tps/tps_limit_fix_window_strategy.go rename to filter/default_filters/tps/tps_limit_fix_window_strategy.go diff --git a/filter/impl/tps/tps_limit_fix_window_strategy_test.go b/filter/default_filters/tps/tps_limit_fix_window_strategy_test.go similarity index 100% rename from filter/impl/tps/tps_limit_fix_window_strategy_test.go rename to filter/default_filters/tps/tps_limit_fix_window_strategy_test.go diff --git a/filter/impl/tps/tps_limit_sliding_window_strategy.go b/filter/default_filters/tps/tps_limit_sliding_window_strategy.go similarity index 100% rename from filter/impl/tps/tps_limit_sliding_window_strategy.go rename to filter/default_filters/tps/tps_limit_sliding_window_strategy.go diff --git a/filter/impl/tps/tps_limit_sliding_window_strategy_test.go b/filter/default_filters/tps/tps_limit_sliding_window_strategy_test.go similarity index 100% rename from filter/impl/tps/tps_limit_sliding_window_strategy_test.go rename to filter/default_filters/tps/tps_limit_sliding_window_strategy_test.go diff --git a/filter/impl/tps/tps_limit_strategy_mock.go b/filter/default_filters/tps/tps_limit_strategy_mock.go similarity index 100% rename from filter/impl/tps/tps_limit_strategy_mock.go rename to filter/default_filters/tps/tps_limit_strategy_mock.go diff --git a/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go b/filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy.go similarity index 100% rename from filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go rename to filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy.go diff --git a/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go b/filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy_test.go similarity index 100% rename from filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go rename to filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy_test.go diff --git a/filter/impl/tps/tps_limiter_method_service.go b/filter/default_filters/tps/tps_limiter_method_service.go similarity index 100% rename from filter/impl/tps/tps_limiter_method_service.go rename to filter/default_filters/tps/tps_limiter_method_service.go diff --git a/filter/impl/tps/tps_limiter_method_service_test.go b/filter/default_filters/tps/tps_limiter_method_service_test.go similarity index 100% rename from filter/impl/tps/tps_limiter_method_service_test.go rename to filter/default_filters/tps/tps_limiter_method_service_test.go diff --git a/filter/impl/tps/tps_limiter_mock.go b/filter/default_filters/tps/tps_limiter_mock.go similarity index 100% rename from filter/impl/tps/tps_limiter_mock.go rename to filter/default_filters/tps/tps_limiter_mock.go diff --git a/filter/impl/tps_limit_filter.go b/filter/default_filters/tps_limit_filter.go similarity index 95% rename from filter/impl/tps_limit_filter.go rename to filter/default_filters/tps_limit_filter.go index 3945a4f0befd4377bcae957c2194fc57442fa58d..d73a8fa28d2177da3bb37a4f118b3a94e77b5c69 100644 --- a/filter/impl/tps_limit_filter.go +++ b/filter/default_filters/tps_limit_filter.go @@ -15,15 +15,15 @@ * limitations under the License. */ -package impl +package default_filters import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/filter" - _ "github.com/apache/dubbo-go/filter/common" - _ "github.com/apache/dubbo-go/filter/impl/tps" + _ "github.com/apache/dubbo-go/filter/default_filters/tps" + _ "github.com/apache/dubbo-go/filter/handler" "github.com/apache/dubbo-go/protocol" ) diff --git a/filter/impl/tps_limit_filter_test.go b/filter/default_filters/tps_limit_filter_test.go similarity index 96% rename from filter/impl/tps_limit_filter_test.go rename to filter/default_filters/tps_limit_filter_test.go index cb5fdcda9c0c6bb96bfc5c339b9e85b737deb0c2..7b9f5b5694bb0d3a21dfbc21a6fbe16db721ab8a 100644 --- a/filter/impl/tps_limit_filter_test.go +++ b/filter/default_filters/tps_limit_filter_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package impl +package default_filters import ( "net/url" @@ -24,8 +24,8 @@ import ( import ( "github.com/apache/dubbo-go/filter" - common2 "github.com/apache/dubbo-go/filter/common" - "github.com/apache/dubbo-go/filter/impl/tps" + "github.com/apache/dubbo-go/filter/default_filters/tps" + common2 "github.com/apache/dubbo-go/filter/handler" "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" ) diff --git a/filter/common/rejected_execution_handler_mock.go b/filter/handler/rejected_execution_handler_mock.go similarity index 99% rename from filter/common/rejected_execution_handler_mock.go rename to filter/handler/rejected_execution_handler_mock.go index a5631af9f7600cae772437877b1ac9139655cc5f..a5bef63b3729a7b04d911c9844320aa778ac357a 100644 --- a/filter/common/rejected_execution_handler_mock.go +++ b/filter/handler/rejected_execution_handler_mock.go @@ -18,7 +18,7 @@ // Source: rejected_execution_handler.go // Package filter is a generated GoMock package. -package common +package handler import ( reflect "reflect" diff --git a/filter/common/rejected_execution_handler_only_log.go b/filter/handler/rejected_execution_handler_only_log.go similarity index 99% rename from filter/common/rejected_execution_handler_only_log.go rename to filter/handler/rejected_execution_handler_only_log.go index 65abe677f129fa2fbe412c7e3ea2b23de2f1ade6..83d85fd1e1a80462e454ef5a8bcd375f5a2b0bcb 100644 --- a/filter/common/rejected_execution_handler_only_log.go +++ b/filter/handler/rejected_execution_handler_only_log.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package common +package handler import ( "github.com/apache/dubbo-go/filter" diff --git a/filter/common/rejected_execution_handler_only_log_test.go b/filter/handler/rejected_execution_handler_only_log_test.go similarity index 98% rename from filter/common/rejected_execution_handler_only_log_test.go rename to filter/handler/rejected_execution_handler_only_log_test.go index 0efc3d813771577d38fd5e7989255fc097b49a08..409f09f61bd958992749231fca045b54601fc627 100644 --- a/filter/common/rejected_execution_handler_only_log_test.go +++ b/filter/handler/rejected_execution_handler_only_log_test.go @@ -15,7 +15,7 @@ * limitations under the License. */ -package common +package handler import ( "net/url"