From 32f83d4129fcb1302402b5584f80c8cca84f1fc1 Mon Sep 17 00:00:00 2001
From: fangyincheng <fangyincheng@sina.com>
Date: Wed, 8 Jan 2020 23:20:31 +0800
Subject: [PATCH] modify filter dir & version
---
common/constant/version.go | 2 +-
filter/{default_filters => filter_impl}/access_log_filter.go | 2 +-
.../access_log_filter_test.go | 2 +-
filter/{default_filters => filter_impl}/active_filter.go | 2 +-
filter/{default_filters => filter_impl}/echo_filter.go | 2 +-
filter/{default_filters => filter_impl}/echo_filter_test.go | 2 +-
.../{default_filters => filter_impl}/execute_limit_filter.go | 2 +-
.../execute_limit_filter_test.go | 2 +-
filter/{default_filters => filter_impl}/generic_filter.go | 2 +-
.../{default_filters => filter_impl}/generic_filter_test.go | 2 +-
.../generic_service_filter.go | 2 +-
.../generic_service_filter_test.go | 2 +-
.../graceful_shutdown_filter.go | 2 +-
.../graceful_shutdown_filter_test.go | 2 +-
filter/{default_filters => filter_impl}/hystrix_filter.go | 2 +-
.../{default_filters => filter_impl}/hystrix_filter_test.go | 2 +-
filter/{default_filters => filter_impl}/token_filter.go | 2 +-
filter/{default_filters => filter_impl}/token_filter_test.go | 2 +-
.../tps/tps_limit_fix_window_strategy.go | 0
.../tps/tps_limit_fix_window_strategy_test.go | 0
.../tps/tps_limit_sliding_window_strategy.go | 0
.../tps/tps_limit_sliding_window_strategy_test.go | 0
.../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
.../tps/tps_limiter_method_service.go | 0
.../tps/tps_limiter_method_service_test.go | 0
.../{default_filters => filter_impl}/tps/tps_limiter_mock.go | 0
filter/{default_filters => filter_impl}/tps_limit_filter.go | 4 ++--
.../{default_filters => filter_impl}/tps_limit_filter_test.go | 4 ++--
30 files changed, 22 insertions(+), 22 deletions(-)
rename filter/{default_filters => filter_impl}/access_log_filter.go (99%)
rename filter/{default_filters => filter_impl}/access_log_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/active_filter.go (98%)
rename filter/{default_filters => filter_impl}/echo_filter.go (98%)
rename filter/{default_filters => filter_impl}/echo_filter_test.go (98%)
rename filter/{default_filters => filter_impl}/execute_limit_filter.go (99%)
rename filter/{default_filters => filter_impl}/execute_limit_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/generic_filter.go (99%)
rename filter/{default_filters => filter_impl}/generic_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/generic_service_filter.go (99%)
rename filter/{default_filters => filter_impl}/generic_service_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/graceful_shutdown_filter.go (99%)
rename filter/{default_filters => filter_impl}/graceful_shutdown_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/hystrix_filter.go (99%)
rename filter/{default_filters => filter_impl}/hystrix_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/token_filter.go (98%)
rename filter/{default_filters => filter_impl}/token_filter_test.go (99%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_fix_window_strategy.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_fix_window_strategy_test.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_sliding_window_strategy.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_sliding_window_strategy_test.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_strategy_mock.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_thread_safe_fix_window_strategy.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limit_thread_safe_fix_window_strategy_test.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limiter_method_service.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limiter_method_service_test.go (100%)
rename filter/{default_filters => filter_impl}/tps/tps_limiter_mock.go (100%)
rename filter/{default_filters => filter_impl}/tps_limit_filter.go (97%)
rename filter/{default_filters => filter_impl}/tps_limit_filter_test.go (97%)
diff --git a/common/constant/version.go b/common/constant/version.go
index d4c6821e7..2f26ff42d 100644
--- a/common/constant/version.go
+++ b/common/constant/version.go
@@ -18,7 +18,7 @@
package constant
const (
- Version = "2.6.0"
+ Version = "1.3.0"
Name = "dubbogo"
DATE = "2019/05/06"
)
diff --git a/filter/default_filters/access_log_filter.go b/filter/filter_impl/access_log_filter.go
similarity index 99%
rename from filter/default_filters/access_log_filter.go
rename to filter/filter_impl/access_log_filter.go
index a00c729ef..a1b022f27 100644
--- a/filter/default_filters/access_log_filter.go
+++ b/filter/filter_impl/access_log_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"os"
diff --git a/filter/default_filters/access_log_filter_test.go b/filter/filter_impl/access_log_filter_test.go
similarity index 99%
rename from filter/default_filters/access_log_filter_test.go
rename to filter/filter_impl/access_log_filter_test.go
index 4e883de2b..507696248 100644
--- a/filter/default_filters/access_log_filter_test.go
+++ b/filter/filter_impl/access_log_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"context"
diff --git a/filter/default_filters/active_filter.go b/filter/filter_impl/active_filter.go
similarity index 98%
rename from filter/default_filters/active_filter.go
rename to filter/filter_impl/active_filter.go
index f84a5fbd1..b12f77632 100644
--- a/filter/default_filters/active_filter.go
+++ b/filter/filter_impl/active_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"github.com/apache/dubbo-go/common/extension"
diff --git a/filter/default_filters/echo_filter.go b/filter/filter_impl/echo_filter.go
similarity index 98%
rename from filter/default_filters/echo_filter.go
rename to filter/filter_impl/echo_filter.go
index 5d327291c..f67a47ac8 100644
--- a/filter/default_filters/echo_filter.go
+++ b/filter/filter_impl/echo_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"github.com/apache/dubbo-go/common/constant"
diff --git a/filter/default_filters/echo_filter_test.go b/filter/filter_impl/echo_filter_test.go
similarity index 98%
rename from filter/default_filters/echo_filter_test.go
rename to filter/filter_impl/echo_filter_test.go
index ff9a7e915..b75b9c19a 100644
--- a/filter/default_filters/echo_filter_test.go
+++ b/filter/filter_impl/echo_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"testing"
diff --git a/filter/default_filters/execute_limit_filter.go b/filter/filter_impl/execute_limit_filter.go
similarity index 99%
rename from filter/default_filters/execute_limit_filter.go
rename to filter/filter_impl/execute_limit_filter.go
index 28b6a81f2..a192aede4 100644
--- a/filter/default_filters/execute_limit_filter.go
+++ b/filter/filter_impl/execute_limit_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"strconv"
diff --git a/filter/default_filters/execute_limit_filter_test.go b/filter/filter_impl/execute_limit_filter_test.go
similarity index 99%
rename from filter/default_filters/execute_limit_filter_test.go
rename to filter/filter_impl/execute_limit_filter_test.go
index 6864ed04e..e3836251d 100644
--- a/filter/default_filters/execute_limit_filter_test.go
+++ b/filter/filter_impl/execute_limit_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"net/url"
diff --git a/filter/default_filters/generic_filter.go b/filter/filter_impl/generic_filter.go
similarity index 99%
rename from filter/default_filters/generic_filter.go
rename to filter/filter_impl/generic_filter.go
index b7921caf8..3bfae1e35 100644
--- a/filter/default_filters/generic_filter.go
+++ b/filter/filter_impl/generic_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"reflect"
diff --git a/filter/default_filters/generic_filter_test.go b/filter/filter_impl/generic_filter_test.go
similarity index 99%
rename from filter/default_filters/generic_filter_test.go
rename to filter/filter_impl/generic_filter_test.go
index 2160c1cee..c4dc19270 100644
--- a/filter/default_filters/generic_filter_test.go
+++ b/filter/filter_impl/generic_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"reflect"
diff --git a/filter/default_filters/generic_service_filter.go b/filter/filter_impl/generic_service_filter.go
similarity index 99%
rename from filter/default_filters/generic_service_filter.go
rename to filter/filter_impl/generic_service_filter.go
index 1d40cf68f..da33f13e5 100644
--- a/filter/default_filters/generic_service_filter.go
+++ b/filter/filter_impl/generic_service_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"reflect"
diff --git a/filter/default_filters/generic_service_filter_test.go b/filter/filter_impl/generic_service_filter_test.go
similarity index 99%
rename from filter/default_filters/generic_service_filter_test.go
rename to filter/filter_impl/generic_service_filter_test.go
index f4696f92a..e36ec5086 100644
--- a/filter/default_filters/generic_service_filter_test.go
+++ b/filter/filter_impl/generic_service_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"context"
diff --git a/filter/default_filters/graceful_shutdown_filter.go b/filter/filter_impl/graceful_shutdown_filter.go
similarity index 99%
rename from filter/default_filters/graceful_shutdown_filter.go
rename to filter/filter_impl/graceful_shutdown_filter.go
index 4fc92afa1..1af7e1f8c 100644
--- a/filter/default_filters/graceful_shutdown_filter.go
+++ b/filter/filter_impl/graceful_shutdown_filter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"sync/atomic"
diff --git a/filter/default_filters/graceful_shutdown_filter_test.go b/filter/filter_impl/graceful_shutdown_filter_test.go
similarity index 99%
rename from filter/default_filters/graceful_shutdown_filter_test.go
rename to filter/filter_impl/graceful_shutdown_filter_test.go
index a17dfa541..fc437c355 100644
--- a/filter/default_filters/graceful_shutdown_filter_test.go
+++ b/filter/filter_impl/graceful_shutdown_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"net/url"
diff --git a/filter/default_filters/hystrix_filter.go b/filter/filter_impl/hystrix_filter.go
similarity index 99%
rename from filter/default_filters/hystrix_filter.go
rename to filter/filter_impl/hystrix_filter.go
index 3abe821bb..a6e078030 100644
--- a/filter/default_filters/hystrix_filter.go
+++ b/filter/filter_impl/hystrix_filter.go
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"fmt"
diff --git a/filter/default_filters/hystrix_filter_test.go b/filter/filter_impl/hystrix_filter_test.go
similarity index 99%
rename from filter/default_filters/hystrix_filter_test.go
rename to filter/filter_impl/hystrix_filter_test.go
index 1303cbaeb..2bbc3e079 100644
--- a/filter/default_filters/hystrix_filter_test.go
+++ b/filter/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 default_filters
+package filter_impl
import (
"regexp"
diff --git a/filter/default_filters/token_filter.go b/filter/filter_impl/token_filter.go
similarity index 98%
rename from filter/default_filters/token_filter.go
rename to filter/filter_impl/token_filter.go
index 6279a100f..180f3e663 100644
--- a/filter/default_filters/token_filter.go
+++ b/filter/filter_impl/token_filter.go
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"strings"
diff --git a/filter/default_filters/token_filter_test.go b/filter/filter_impl/token_filter_test.go
similarity index 99%
rename from filter/default_filters/token_filter_test.go
rename to filter/filter_impl/token_filter_test.go
index 0a5967265..675d33dc7 100644
--- a/filter/default_filters/token_filter_test.go
+++ b/filter/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 default_filters
+package filter_impl
import (
"net/url"
diff --git a/filter/default_filters/tps/tps_limit_fix_window_strategy.go b/filter/filter_impl/tps/tps_limit_fix_window_strategy.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_fix_window_strategy.go
rename to filter/filter_impl/tps/tps_limit_fix_window_strategy.go
diff --git a/filter/default_filters/tps/tps_limit_fix_window_strategy_test.go b/filter/filter_impl/tps/tps_limit_fix_window_strategy_test.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_fix_window_strategy_test.go
rename to filter/filter_impl/tps/tps_limit_fix_window_strategy_test.go
diff --git a/filter/default_filters/tps/tps_limit_sliding_window_strategy.go b/filter/filter_impl/tps/tps_limit_sliding_window_strategy.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_sliding_window_strategy.go
rename to filter/filter_impl/tps/tps_limit_sliding_window_strategy.go
diff --git a/filter/default_filters/tps/tps_limit_sliding_window_strategy_test.go b/filter/filter_impl/tps/tps_limit_sliding_window_strategy_test.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_sliding_window_strategy_test.go
rename to filter/filter_impl/tps/tps_limit_sliding_window_strategy_test.go
diff --git a/filter/default_filters/tps/tps_limit_strategy_mock.go b/filter/filter_impl/tps/tps_limit_strategy_mock.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_strategy_mock.go
rename to filter/filter_impl/tps/tps_limit_strategy_mock.go
diff --git a/filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy.go b/filter/filter_impl/tps/tps_limit_thread_safe_fix_window_strategy.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy.go
rename to filter/filter_impl/tps/tps_limit_thread_safe_fix_window_strategy.go
diff --git a/filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy_test.go b/filter/filter_impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go
similarity index 100%
rename from filter/default_filters/tps/tps_limit_thread_safe_fix_window_strategy_test.go
rename to filter/filter_impl/tps/tps_limit_thread_safe_fix_window_strategy_test.go
diff --git a/filter/default_filters/tps/tps_limiter_method_service.go b/filter/filter_impl/tps/tps_limiter_method_service.go
similarity index 100%
rename from filter/default_filters/tps/tps_limiter_method_service.go
rename to filter/filter_impl/tps/tps_limiter_method_service.go
diff --git a/filter/default_filters/tps/tps_limiter_method_service_test.go b/filter/filter_impl/tps/tps_limiter_method_service_test.go
similarity index 100%
rename from filter/default_filters/tps/tps_limiter_method_service_test.go
rename to filter/filter_impl/tps/tps_limiter_method_service_test.go
diff --git a/filter/default_filters/tps/tps_limiter_mock.go b/filter/filter_impl/tps/tps_limiter_mock.go
similarity index 100%
rename from filter/default_filters/tps/tps_limiter_mock.go
rename to filter/filter_impl/tps/tps_limiter_mock.go
diff --git a/filter/default_filters/tps_limit_filter.go b/filter/filter_impl/tps_limit_filter.go
similarity index 97%
rename from filter/default_filters/tps_limit_filter.go
rename to filter/filter_impl/tps_limit_filter.go
index d73a8fa28..77414a8ea 100644
--- a/filter/default_filters/tps_limit_filter.go
+++ b/filter/filter_impl/tps_limit_filter.go
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
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/default_filters/tps"
+ _ "github.com/apache/dubbo-go/filter/filter_impl/tps"
_ "github.com/apache/dubbo-go/filter/handler"
"github.com/apache/dubbo-go/protocol"
)
diff --git a/filter/default_filters/tps_limit_filter_test.go b/filter/filter_impl/tps_limit_filter_test.go
similarity index 97%
rename from filter/default_filters/tps_limit_filter_test.go
rename to filter/filter_impl/tps_limit_filter_test.go
index 7b9f5b569..5e04804aa 100644
--- a/filter/default_filters/tps_limit_filter_test.go
+++ b/filter/filter_impl/tps_limit_filter_test.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package default_filters
+package filter_impl
import (
"net/url"
@@ -24,7 +24,7 @@ import (
import (
"github.com/apache/dubbo-go/filter"
- "github.com/apache/dubbo-go/filter/default_filters/tps"
+ "github.com/apache/dubbo-go/filter/filter_impl/tps"
common2 "github.com/apache/dubbo-go/filter/handler"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
--
GitLab