From 08e86a2fc64d98741f250dea4e3b3e6ac5e7af87 Mon Sep 17 00:00:00 2001
From: "vito.he" <hxmhlt@163.com>
Date: Fri, 10 Apr 2020 19:01:18 +0800
Subject: [PATCH] Mod:dir rename
---
common/extension/metadata_report_factory.go | 8 ++++----
.../{report_factory => report/factory}/report_factory.go | 2 +-
.../exporter}/configurable/exporter.go | 3 +--
.../exporter}/configurable/exporter_test.go | 3 ++-
.../{service_exporter => service/exporter}/exporter.go | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
rename metadata/{report_factory => report/factory}/report_factory.go (97%)
rename metadata/{service_exporter => service/exporter}/configurable/exporter.go (97%)
rename metadata/{service_exporter => service/exporter}/configurable/exporter_test.go (94%)
rename metadata/{service_exporter => service/exporter}/exporter.go (97%)
diff --git a/common/extension/metadata_report_factory.go b/common/extension/metadata_report_factory.go
index 7a113c460..89dab0409 100644
--- a/common/extension/metadata_report_factory.go
+++ b/common/extension/metadata_report_factory.go
@@ -18,20 +18,20 @@
package extension
import (
- "github.com/apache/dubbo-go/metadata/report_factory"
+ "github.com/apache/dubbo-go/metadata/report/factory"
)
var (
- metaDataReportFactories = make(map[string]func() report_factory.MetadataReportFactory, 8)
+ metaDataReportFactories = make(map[string]func() factory.MetadataReportFactory, 8)
)
// SetMetadataReportFactory ...
-func SetMetadataReportFactory(name string, v func() report_factory.MetadataReportFactory) {
+func SetMetadataReportFactory(name string, v func() factory.MetadataReportFactory) {
metaDataReportFactories[name] = v
}
// GetMetadataReportFactory ...
-func GetMetadataReportFactory(name string) report_factory.MetadataReportFactory {
+func GetMetadataReportFactory(name string) factory.MetadataReportFactory {
if metaDataReportFactories[name] == nil {
panic("metadata report for " + name + " is not existing, make sure you have import the package.")
}
diff --git a/metadata/report_factory/report_factory.go b/metadata/report/factory/report_factory.go
similarity index 97%
rename from metadata/report_factory/report_factory.go
rename to metadata/report/factory/report_factory.go
index b74334d6a..2774fcc31 100644
--- a/metadata/report_factory/report_factory.go
+++ b/metadata/report/factory/report_factory.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package report_factory
+package factory
import (
"github.com/apache/dubbo-go/common"
diff --git a/metadata/service_exporter/configurable/exporter.go b/metadata/service/exporter/configurable/exporter.go
similarity index 97%
rename from metadata/service_exporter/configurable/exporter.go
rename to metadata/service/exporter/configurable/exporter.go
index 8033e1642..a8d73c2a2 100644
--- a/metadata/service_exporter/configurable/exporter.go
+++ b/metadata/service/exporter/configurable/exporter.go
@@ -28,7 +28,6 @@ import (
"github.com/apache/dubbo-go/common/logger"
"github.com/apache/dubbo-go/config"
"github.com/apache/dubbo-go/metadata/service"
- "github.com/apache/dubbo-go/metadata/service_exporter"
)
// MetadataServiceExporter is the ConfigurableMetadataServiceExporter which implement MetadataServiceExporter interface
@@ -39,7 +38,7 @@ type MetadataServiceExporter struct {
}
// NewMetadataServiceExporter will return a service_exporter.MetadataServiceExporter with the specified metadata service
-func NewMetadataServiceExporter(metadataService service.MetadataService) service_exporter.MetadataServiceExporter {
+func NewMetadataServiceExporter(metadataService service.MetadataService) service.MetadataServiceExporter {
return &MetadataServiceExporter{
metadataService: metadataService,
}
diff --git a/metadata/service_exporter/configurable/exporter_test.go b/metadata/service/exporter/configurable/exporter_test.go
similarity index 94%
rename from metadata/service_exporter/configurable/exporter_test.go
rename to metadata/service/exporter/configurable/exporter_test.go
index 0975f0721..e67bf07a3 100644
--- a/metadata/service_exporter/configurable/exporter_test.go
+++ b/metadata/service/exporter/configurable/exporter_test.go
@@ -18,6 +18,7 @@
package configurable
import (
+ "github.com/apache/dubbo-go/metadata/service"
"testing"
)
@@ -54,7 +55,7 @@ func TestConfigurableExporter(t *testing.T) {
}})
config.MockInitProviderWithSingleRegistry()
metadataService := inmemory.NewMetadataService()
- exported := NewMetadataServiceExporter(metadataService)
+ exported := service.NewMetadataServiceExporter(metadataService)
assert.Equal(t, false, exported.IsExported())
assert.NoError(t, exported.Export())
assert.Equal(t, true, exported.IsExported())
diff --git a/metadata/service_exporter/exporter.go b/metadata/service/exporter/exporter.go
similarity index 97%
rename from metadata/service_exporter/exporter.go
rename to metadata/service/exporter/exporter.go
index 2ccf17f4d..3c7182057 100644
--- a/metadata/service_exporter/exporter.go
+++ b/metadata/service/exporter/exporter.go
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package service_exporter
+package exporter
import (
"github.com/apache/dubbo-go/common"
--
GitLab