From 62e7207c128841e47a44a877d311cf5a7fdbff76 Mon Sep 17 00:00:00 2001
From: fangyincheng <fangyincheng@sina.com>
Date: Tue, 7 Jan 2020 17:43:13 +0800
Subject: [PATCH] revert filter dir
---
filter/{filter => impl}/access_log_filter.go | 2 +-
filter/{filter => impl}/access_log_filter_test.go | 2 +-
filter/{filter => impl}/active_filter.go | 2 +-
filter/{filter => impl}/echo_filter.go | 2 +-
filter/{filter => impl}/echo_filter_test.go | 2 +-
filter/{filter => impl}/execute_limit_filter.go | 2 +-
filter/{filter => impl}/execute_limit_filter_test.go | 2 +-
filter/{filter => impl}/generic_filter.go | 2 +-
filter/{filter => impl}/generic_filter_test.go | 2 +-
filter/{filter => impl}/generic_service_filter.go | 2 +-
filter/{filter => impl}/generic_service_filter_test.go | 2 +-
filter/{filter => impl}/graceful_shutdown_filter.go | 2 +-
filter/{filter => impl}/graceful_shutdown_filter_test.go | 2 +-
filter/{filter => impl}/hystrix_filter.go | 2 +-
filter/{filter => impl}/hystrix_filter_test.go | 2 +-
filter/{filter => impl}/token_filter.go | 2 +-
filter/{filter => impl}/token_filter_test.go | 2 +-
filter/{ => impl}/tps/tps_limit_fix_window_strategy.go | 0
filter/{ => impl}/tps/tps_limit_fix_window_strategy_test.go | 0
filter/{ => impl}/tps/tps_limit_sliding_window_strategy.go | 0
.../{ => impl}/tps/tps_limit_sliding_window_strategy_test.go | 0
filter/{ => impl}/tps/tps_limit_strategy_mock.go | 0
.../tps/tps_limit_thread_safe_fix_window_strategy.go | 0
.../tps/tps_limit_thread_safe_fix_window_strategy_test.go | 0
filter/{ => impl}/tps/tps_limiter_method_service.go | 0
filter/{ => impl}/tps/tps_limiter_method_service_test.go | 0
filter/{ => impl}/tps/tps_limiter_mock.go | 0
filter/{filter => impl}/tps_limit_filter.go | 4 ++--
filter/{filter => impl}/tps_limit_filter_test.go | 4 ++--
29 files changed, 21 insertions(+), 21 deletions(-)
rename filter/{filter => impl}/access_log_filter.go (99%)
rename filter/{filter => impl}/access_log_filter_test.go (99%)
rename filter/{filter => impl}/active_filter.go (99%)
rename filter/{filter => impl}/echo_filter.go (99%)
rename filter/{filter => impl}/echo_filter_test.go (98%)
rename filter/{filter => impl}/execute_limit_filter.go (99%)
rename filter/{filter => impl}/execute_limit_filter_test.go (99%)
rename filter/{filter => impl}/generic_filter.go (99%)
rename filter/{filter => impl}/generic_filter_test.go (99%)
rename filter/{filter => impl}/generic_service_filter.go (99%)
rename filter/{filter => impl}/generic_service_filter_test.go (99%)
rename filter/{filter => impl}/graceful_shutdown_filter.go (99%)
rename filter/{filter => impl}/graceful_shutdown_filter_test.go (99%)
rename filter/{filter => impl}/hystrix_filter.go (99%)
rename filter/{filter => impl}/hystrix_filter_test.go (99%)
rename filter/{filter => impl}/token_filter.go (99%)
rename filter/{filter => impl}/token_filter_test.go (99%)
rename filter/{ => impl}/tps/tps_limit_fix_window_strategy.go (100%)
rename filter/{ => impl}/tps/tps_limit_fix_window_strategy_test.go (100%)
rename filter/{ => impl}/tps/tps_limit_sliding_window_strategy.go (100%)
rename filter/{ => impl}/tps/tps_limit_sliding_window_strategy_test.go (100%)
rename filter/{ => impl}/tps/tps_limit_strategy_mock.go (100%)
rename filter/{ => impl}/tps/tps_limit_thread_safe_fix_window_strategy.go (100%)
rename filter/{ => impl}/tps/tps_limit_thread_safe_fix_window_strategy_test.go (100%)
rename filter/{ => impl}/tps/tps_limiter_method_service.go (100%)
rename filter/{ => impl}/tps/tps_limiter_method_service_test.go (100%)
rename filter/{ => impl}/tps/tps_limiter_mock.go (100%)
rename filter/{filter => impl}/tps_limit_filter.go (97%)
rename filter/{filter => impl}/tps_limit_filter_test.go (98%)
diff --git a/filter/filter/access_log_filter.go b/filter/impl/access_log_filter.go
similarity index 99%
rename from filter/filter/access_log_filter.go
rename to filter/impl/access_log_filter.go
index cce2c5050..89fa34952 100644
--- a/filter/filter/access_log_filter.go
+++ b/filter/impl/access_log_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"os"
diff --git a/filter/filter/access_log_filter_test.go b/filter/impl/access_log_filter_test.go
similarity index 99%
rename from filter/filter/access_log_filter_test.go
rename to filter/impl/access_log_filter_test.go
index 2c17021a9..834d531f0 100644
--- a/filter/filter/access_log_filter_test.go
+++ b/filter/impl/access_log_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"context"
diff --git a/filter/filter/active_filter.go b/filter/impl/active_filter.go
similarity index 99%
rename from filter/filter/active_filter.go
rename to filter/impl/active_filter.go
index e0f73c2b2..36a4e1a76 100644
--- a/filter/filter/active_filter.go
+++ b/filter/impl/active_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"github.com/apache/dubbo-go/common/extension"
diff --git a/filter/filter/echo_filter.go b/filter/impl/echo_filter.go
similarity index 99%
rename from filter/filter/echo_filter.go
rename to filter/impl/echo_filter.go
index 1515c0a99..18e42c8cb 100644
--- a/filter/filter/echo_filter.go
+++ b/filter/impl/echo_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"github.com/apache/dubbo-go/common/constant"
diff --git a/filter/filter/echo_filter_test.go b/filter/impl/echo_filter_test.go
similarity index 98%
rename from filter/filter/echo_filter_test.go
rename to filter/impl/echo_filter_test.go
index d57d54329..e2e592974 100644
--- a/filter/filter/echo_filter_test.go
+++ b/filter/impl/echo_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"testing"
diff --git a/filter/filter/execute_limit_filter.go b/filter/impl/execute_limit_filter.go
similarity index 99%
rename from filter/filter/execute_limit_filter.go
rename to filter/impl/execute_limit_filter.go
index 4b5ea7491..ef7c0997f 100644
--- a/filter/filter/execute_limit_filter.go
+++ b/filter/impl/execute_limit_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"strconv"
diff --git a/filter/filter/execute_limit_filter_test.go b/filter/impl/execute_limit_filter_test.go
similarity index 99%
rename from filter/filter/execute_limit_filter_test.go
rename to filter/impl/execute_limit_filter_test.go
index 326b13677..5d729c0e6 100644
--- a/filter/filter/execute_limit_filter_test.go
+++ b/filter/impl/execute_limit_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"net/url"
diff --git a/filter/filter/generic_filter.go b/filter/impl/generic_filter.go
similarity index 99%
rename from filter/filter/generic_filter.go
rename to filter/impl/generic_filter.go
index 9fb26f15a..067939a34 100644
--- a/filter/filter/generic_filter.go
+++ b/filter/impl/generic_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"reflect"
diff --git a/filter/filter/generic_filter_test.go b/filter/impl/generic_filter_test.go
similarity index 99%
rename from filter/filter/generic_filter_test.go
rename to filter/impl/generic_filter_test.go
index d5298adbd..9797c40df 100644
--- a/filter/filter/generic_filter_test.go
+++ b/filter/impl/generic_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"reflect"
diff --git a/filter/filter/generic_service_filter.go b/filter/impl/generic_service_filter.go
similarity index 99%
rename from filter/filter/generic_service_filter.go
rename to filter/impl/generic_service_filter.go
index 514a51f0b..2fde925d6 100644
--- a/filter/filter/generic_service_filter.go
+++ b/filter/impl/generic_service_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"reflect"
diff --git a/filter/filter/generic_service_filter_test.go b/filter/impl/generic_service_filter_test.go
similarity index 99%
rename from filter/filter/generic_service_filter_test.go
rename to filter/impl/generic_service_filter_test.go
index 599a6a66d..89898694c 100644
--- a/filter/filter/generic_service_filter_test.go
+++ b/filter/impl/generic_service_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"context"
diff --git a/filter/filter/graceful_shutdown_filter.go b/filter/impl/graceful_shutdown_filter.go
similarity index 99%
rename from filter/filter/graceful_shutdown_filter.go
rename to filter/impl/graceful_shutdown_filter.go
index c682c7ef7..022693223 100644
--- a/filter/filter/graceful_shutdown_filter.go
+++ b/filter/impl/graceful_shutdown_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"sync/atomic"
diff --git a/filter/filter/graceful_shutdown_filter_test.go b/filter/impl/graceful_shutdown_filter_test.go
similarity index 99%
rename from filter/filter/graceful_shutdown_filter_test.go
rename to filter/impl/graceful_shutdown_filter_test.go
index af57cd4ec..1fa3a74ac 100644
--- a/filter/filter/graceful_shutdown_filter_test.go
+++ b/filter/impl/graceful_shutdown_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"net/url"
diff --git a/filter/filter/hystrix_filter.go b/filter/impl/hystrix_filter.go
similarity index 99%
rename from filter/filter/hystrix_filter.go
rename to filter/impl/hystrix_filter.go
index a7c57b4dd..3fd9f8716 100644
--- a/filter/filter/hystrix_filter.go
+++ b/filter/impl/hystrix_filter.go
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package filter
+package impl
import (
"fmt"
diff --git a/filter/filter/hystrix_filter_test.go b/filter/impl/hystrix_filter_test.go
similarity index 99%
rename from filter/filter/hystrix_filter_test.go
rename to filter/impl/hystrix_filter_test.go
index 374329403..d3a5183ed 100644
--- a/filter/filter/hystrix_filter_test.go
+++ b/filter/impl/hystrix_filter_test.go
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package filter
+package impl
import (
"regexp"
diff --git a/filter/filter/token_filter.go b/filter/impl/token_filter.go
similarity index 99%
rename from filter/filter/token_filter.go
rename to filter/impl/token_filter.go
index 07b80f340..d10dff5b7 100644
--- a/filter/filter/token_filter.go
+++ b/filter/impl/token_filter.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package filter
+package impl
import (
"strings"
diff --git a/filter/filter/token_filter_test.go b/filter/impl/token_filter_test.go
similarity index 99%
rename from filter/filter/token_filter_test.go
rename to filter/impl/token_filter_test.go
index 4434865de..1473f2740 100644
--- a/filter/filter/token_filter_test.go
+++ b/filter/impl/token_filter_test.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package filter
+package impl
import (
"net/url"
diff --git a/filter/tps/tps_limit_fix_window_strategy.go b/filter/impl/tps/tps_limit_fix_window_strategy.go
similarity index 100%
rename from filter/tps/tps_limit_fix_window_strategy.go
rename to filter/impl/tps/tps_limit_fix_window_strategy.go
diff --git a/filter/tps/tps_limit_fix_window_strategy_test.go b/filter/impl/tps/tps_limit_fix_window_strategy_test.go
similarity index 100%
rename from filter/tps/tps_limit_fix_window_strategy_test.go
rename to filter/impl/tps/tps_limit_fix_window_strategy_test.go
diff --git a/filter/tps/tps_limit_sliding_window_strategy.go b/filter/impl/tps/tps_limit_sliding_window_strategy.go
similarity index 100%
rename from filter/tps/tps_limit_sliding_window_strategy.go
rename to filter/impl/tps/tps_limit_sliding_window_strategy.go
diff --git a/filter/tps/tps_limit_sliding_window_strategy_test.go b/filter/impl/tps/tps_limit_sliding_window_strategy_test.go
similarity index 100%
rename from filter/tps/tps_limit_sliding_window_strategy_test.go
rename to filter/impl/tps/tps_limit_sliding_window_strategy_test.go
diff --git a/filter/tps/tps_limit_strategy_mock.go b/filter/impl/tps/tps_limit_strategy_mock.go
similarity index 100%
rename from filter/tps/tps_limit_strategy_mock.go
rename to filter/impl/tps/tps_limit_strategy_mock.go
diff --git a/filter/tps/tps_limit_thread_safe_fix_window_strategy.go b/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go
similarity index 100%
rename from filter/tps/tps_limit_thread_safe_fix_window_strategy.go
rename to filter/impl/tps/tps_limit_thread_safe_fix_window_strategy.go
diff --git a/filter/tps/tps_limit_thread_safe_fix_window_strategy_test.go b/filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go
similarity index 100%
rename from filter/tps/tps_limit_thread_safe_fix_window_strategy_test.go
rename to filter/impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go
diff --git a/filter/tps/tps_limiter_method_service.go b/filter/impl/tps/tps_limiter_method_service.go
similarity index 100%
rename from filter/tps/tps_limiter_method_service.go
rename to filter/impl/tps/tps_limiter_method_service.go
diff --git a/filter/tps/tps_limiter_method_service_test.go b/filter/impl/tps/tps_limiter_method_service_test.go
similarity index 100%
rename from filter/tps/tps_limiter_method_service_test.go
rename to filter/impl/tps/tps_limiter_method_service_test.go
diff --git a/filter/tps/tps_limiter_mock.go b/filter/impl/tps/tps_limiter_mock.go
similarity index 100%
rename from filter/tps/tps_limiter_mock.go
rename to filter/impl/tps/tps_limiter_mock.go
diff --git a/filter/filter/tps_limit_filter.go b/filter/impl/tps_limit_filter.go
similarity index 97%
rename from filter/filter/tps_limit_filter.go
rename to filter/impl/tps_limit_filter.go
index ccccec00d..3945a4f0b 100644
--- a/filter/filter/tps_limit_filter.go
+++ b/filter/impl/tps_limit_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"github.com/apache/dubbo-go/common/constant"
@@ -23,7 +23,7 @@ import (
"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/tps"
+ _ "github.com/apache/dubbo-go/filter/impl/tps"
"github.com/apache/dubbo-go/protocol"
)
diff --git a/filter/filter/tps_limit_filter_test.go b/filter/impl/tps_limit_filter_test.go
similarity index 98%
rename from filter/filter/tps_limit_filter_test.go
rename to filter/impl/tps_limit_filter_test.go
index 6acaab703..cb5fdcda9 100644
--- a/filter/filter/tps_limit_filter_test.go
+++ b/filter/impl/tps_limit_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package filter
+package impl
import (
"net/url"
@@ -25,7 +25,7 @@ import (
import (
"github.com/apache/dubbo-go/filter"
common2 "github.com/apache/dubbo-go/filter/common"
- "github.com/apache/dubbo-go/filter/tps"
+ "github.com/apache/dubbo-go/filter/impl/tps"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)
--
GitLab