This is an automated email from the ASF dual-hosted git repository.
phily pushed a commit to branch rest-protocol
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/rest-protocol by this push:
new 6f82edfc1 fix conflict and clean code
6f82edfc1 is described below
commit 6f82edfc1f4274973aea04cd0816403a20848d8e
Author: PhilYue <[email protected]>
AuthorDate: Wed Jul 13 20:38:06 2022 +0800
fix conflict and clean code
---
config/rest_config.go | 2 +-
protocol/rest/config/reader/rest_config_reader.go | 1 -
protocol/rest/config/reader/rest_config_reader_test.go | 9 +--------
protocol/rest/rest_protocol.go | 1 -
protocol/rest/rest_protocol_test.go | 1 -
protocol/rest/server/go_restful_server.go | 1 -
protocol/rest/server/rest_server.go | 1 -
7 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/config/rest_config.go b/config/rest_config.go
index 1a6c815ce..b6d14d03a 100644
--- a/config/rest_config.go
+++ b/config/rest_config.go
@@ -18,6 +18,7 @@
package config
import (
+ "github.com/dubbogo/gost/log/logger"
"strconv"
"strings"
)
@@ -28,7 +29,6 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
- "dubbo.apache.org/dubbo-go/v3/common/logger"
common "dubbo.apache.org/dubbo-go/v3/protocol/rest/config"
)
diff --git a/protocol/rest/config/reader/rest_config_reader.go
b/protocol/rest/config/reader/rest_config_reader.go
index 2935f249f..6466bdb62 100644
--- a/protocol/rest/config/reader/rest_config_reader.go
+++ b/protocol/rest/config/reader/rest_config_reader.go
@@ -34,7 +34,6 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/config/interfaces"
common "dubbo.apache.org/dubbo-go/v3/protocol/rest/config"
diff --git a/protocol/rest/config/reader/rest_config_reader_test.go
b/protocol/rest/config/reader/rest_config_reader_test.go
index 1f672f24d..e5815cdde 100644
--- a/protocol/rest/config/reader/rest_config_reader_test.go
+++ b/protocol/rest/config/reader/rest_config_reader_test.go
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -29,17 +28,12 @@ import (
"github.com/stretchr/testify/assert"
)
-import (
- "dubbo.apache.org/dubbo-go/v3/protocol/rest/config"
-)
-
func TestRestConfigReaderReadConsumerConfig(t *testing.T) {
bs, err := yaml.LoadYMLConfig("./testdata/consumer_config.yml")
assert.NoError(t, err)
configReader := NewRestConfigReader()
err = configReader.ReadConsumerConfig(bytes.NewBuffer(bs))
assert.NoError(t, err)
- assert.NotEmpty(t, config.GetRestConsumerServiceConfigMap())
}
func TestRestConfigReaderReadProviderConfig(t *testing.T) {
@@ -48,5 +42,4 @@ func TestRestConfigReaderReadProviderConfig(t *testing.T) {
configReader := NewRestConfigReader()
err = configReader.ReadProviderConfig(bytes.NewBuffer(bs))
assert.NoError(t, err)
- assert.NotEmpty(t, config.GetRestProviderServiceConfigMap())
-}
\ No newline at end of file
+}
diff --git a/protocol/rest/rest_protocol.go b/protocol/rest/rest_protocol.go
index 5a4cfae1f..615ee5705 100644
--- a/protocol/rest/rest_protocol.go
+++ b/protocol/rest/rest_protocol.go
@@ -31,7 +31,6 @@ import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/constant"
"dubbo.apache.org/dubbo-go/v3/common/extension"
- "dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol"
"dubbo.apache.org/dubbo-go/v3/protocol/rest/client"
diff --git a/protocol/rest/rest_protocol_test.go
b/protocol/rest/rest_protocol_test.go
index f061a90f5..129935114 100644
--- a/protocol/rest/rest_protocol_test.go
+++ b/protocol/rest/rest_protocol_test.go
@@ -33,7 +33,6 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common"
"dubbo.apache.org/dubbo-go/v3/common/extension"
- _ "dubbo.apache.org/dubbo-go/v3/common/proxy/proxy_factory"
rest_config "dubbo.apache.org/dubbo-go/v3/config"
)
diff --git a/protocol/rest/server/go_restful_server.go
b/protocol/rest/server/go_restful_server.go
index 31e80a495..5cdf25af9 100644
--- a/protocol/rest/server/go_restful_server.go
+++ b/protocol/rest/server/go_restful_server.go
@@ -36,7 +36,6 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common"
- "dubbo.apache.org/dubbo-go/v3/common/logger"
"dubbo.apache.org/dubbo-go/v3/config"
)
diff --git a/protocol/rest/server/rest_server.go
b/protocol/rest/server/rest_server.go
index 1e787692b..b921b6d6b 100644
--- a/protocol/rest/server/rest_server.go
+++ b/protocol/rest/server/rest_server.go
@@ -33,7 +33,6 @@ import (
import (
"dubbo.apache.org/dubbo-go/v3/common"
- "dubbo.apache.org/dubbo-go/v3/common/logger"
rconfig "dubbo.apache.org/dubbo-go/v3/config"
"dubbo.apache.org/dubbo-go/v3/protocol"
"dubbo.apache.org/dubbo-go/v3/protocol/invocation"
