This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/3.0 by this push:
new d2b3b67 [#1288] fix the inconsistent filepath key logic for v3.0
(#1290)
d2b3b67 is described below
commit d2b3b6710399a413221abf6d61671a58798ffcbf
Author: williamfeng323 <[email protected]>
AuthorDate: Fri Jul 2 14:04:08 2021 +0800
[#1288] fix the inconsistent filepath key logic for v3.0 (#1290)
---
metadata/identifier/base_metadata_identifier.go | 9 ++-------
metadata/identifier/base_metadata_identifier_test.go | 2 +-
metadata/identifier/metadata_identifier_test.go | 2 +-
metadata/identifier/service_metadata_identifier_test.go | 2 +-
4 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/metadata/identifier/base_metadata_identifier.go
b/metadata/identifier/base_metadata_identifier.go
index 8d81180..9659e45 100644
--- a/metadata/identifier/base_metadata_identifier.go
+++ b/metadata/identifier/base_metadata_identifier.go
@@ -18,7 +18,7 @@
package identifier
import (
- "encoding/base64"
+ "net/url"
)
import (
@@ -74,13 +74,8 @@ func (mdi *BaseMetadataIdentifier) getFilePathKey(params
...string) string {
func serviceToPath(serviceInterface string) string {
if serviceInterface == constant.ANY_VALUE {
return ""
- } else {
- decoded, err :=
base64.URLEncoding.DecodeString(serviceInterface)
- if err != nil {
- return ""
- }
- return string(decoded)
}
+ return url.PathEscape(serviceInterface)
}
// withPathSeparator return "/" + @path
diff --git a/metadata/identifier/base_metadata_identifier_test.go
b/metadata/identifier/base_metadata_identifier_test.go
index 5b60992..8baeed4 100644
--- a/metadata/identifier/base_metadata_identifier_test.go
+++ b/metadata/identifier/base_metadata_identifier_test.go
@@ -33,7 +33,7 @@ var baseId = &BaseMetadataIdentifier{
}
func TestBaseGetFilePathKey(t *testing.T) {
- assert.Equal(t, "metadata/1.0.0/Group/provider/a/b/c",
baseId.getFilePathKey("a", "b", "c"))
+ assert.Equal(t,
"metadata/org.apache.pkg.mockService/1.0.0/Group/provider/a/b/c",
baseId.getFilePathKey("a", "b", "c"))
}
func TestBaseGetIdentifierKey(t *testing.T) {
diff --git a/metadata/identifier/metadata_identifier_test.go
b/metadata/identifier/metadata_identifier_test.go
index cba3c0d..2b4d89f 100644
--- a/metadata/identifier/metadata_identifier_test.go
+++ b/metadata/identifier/metadata_identifier_test.go
@@ -36,7 +36,7 @@ var metadataId = &MetadataIdentifier{
}
func TestGetFilePathKey(t *testing.T) {
- assert.Equal(t, "metadata/1.0.0/Group/provider/app",
metadataId.GetFilePathKey())
+ assert.Equal(t,
"metadata/org.apache.pkg.mockService/1.0.0/Group/provider/app",
metadataId.GetFilePathKey())
}
func TestGetIdentifierKey(t *testing.T) {
diff --git a/metadata/identifier/service_metadata_identifier_test.go
b/metadata/identifier/service_metadata_identifier_test.go
index d7ef44a..ccf4ea1 100644
--- a/metadata/identifier/service_metadata_identifier_test.go
+++ b/metadata/identifier/service_metadata_identifier_test.go
@@ -37,7 +37,7 @@ var serviceMetadataId = &ServiceMetadataIdentifier{
}
func TestServiceGetFilePathKey(t *testing.T) {
- assert.Equal(t, "metadata/1.0.0/Group/provider/dubbo/revision1.0",
serviceMetadataId.GetFilePathKey())
+ assert.Equal(t,
"metadata/org.apache.pkg.mockService/1.0.0/Group/provider/dubbo/revision1.0",
serviceMetadataId.GetFilePathKey())
}
func TestServiceGetIdentifierKey(t *testing.T) {
