diff --git a/common/config/environment.go b/common/config/environment.go index 77a962a51183aec139dd2a8ce640b467a32763d3..a9447aa1206cf5cd329f2d307f81953cd1d0068f 100644 --- a/common/config/environment.go +++ b/common/config/environment.go @@ -19,11 +19,14 @@ package config import ( "container/list" - "github.com/apache/dubbo-go/config_center" "strings" "sync" ) +import ( + "github.com/apache/dubbo-go/config_center" +) + // There is dubbo.properties file and application level config center configuration which higner than normal config center in java. So in java the // configuration sequence will be config center > application level config center > dubbo.properties > spring bean configuration. // But in go, neither the dubbo.properties file or application level config center configuration will not support for the time being. diff --git a/common/config/environment_test.go b/common/config/environment_test.go index ab7cafae891a4f6832f9db9d297e6f5fdc19ad4b..0e1d679bc46d1a372d3ee9272429f1399dfd2bfc 100644 --- a/common/config/environment_test.go +++ b/common/config/environment_test.go @@ -19,6 +19,7 @@ package config import ( "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/config/base_config.go b/config/base_config.go index 65cc0fe3f99d6189ad7776cf5062b341f34149fb..6c85b5e46aaa1f6715d81ea3be4a5883419456e6 100644 --- a/config/base_config.go +++ b/config/base_config.go @@ -21,9 +21,11 @@ import ( "reflect" "strconv" ) + import ( perrors "github.com/pkg/errors" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/config" diff --git a/config/config_utils.go b/config/config_utils.go index 90837344cae7cead935308e77d350868015f89d4..6bc574a546ebad548aaa15ce7dc9bcf68b95c3a1 100644 --- a/config/config_utils.go +++ b/config/config_utils.go @@ -21,6 +21,7 @@ import ( "regexp" "strings" ) + import ( "github.com/apache/dubbo-go/common/constant" ) diff --git a/config/consumer_config.go b/config/consumer_config.go index 55082ffe41ad0a38ccbb6c2e788f0b609a8b4ef8..ebeb7fe75de93995b9ed1b826482d6c5d3c4b215 100644 --- a/config/consumer_config.go +++ b/config/consumer_config.go @@ -22,10 +22,12 @@ import ( "path" "time" ) + import ( perrors "github.com/pkg/errors" "gopkg.in/yaml.v2" ) + import ( "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/logger" diff --git a/config/protocol_config.go b/config/protocol_config.go index 6440f3090ddbb0dbbf8564ae816e3e951f60512d..b71423670c893402773ca2092d3d7a889a347439 100644 --- a/config/protocol_config.go +++ b/config/protocol_config.go @@ -19,6 +19,7 @@ package config import ( "strings" ) + import ( "github.com/apache/dubbo-go/common/constant" ) diff --git a/config/registry_config_test.go b/config/registry_config_test.go index f600a21a0117572349aaf4de1bdee5e1270f67b4..45d38b29cc7089dabc5d7b7e34390ee48a58dc97 100644 --- a/config/registry_config_test.go +++ b/config/registry_config_test.go @@ -20,11 +20,15 @@ import ( "fmt" "testing" ) + import ( - "github.com/apache/dubbo-go/common" "github.com/stretchr/testify/assert" ) +import ( + "github.com/apache/dubbo-go/common" +) + func Test_loadRegistries(t *testing.T) { target := "shanghai1" regs := map[string]*RegistryConfig{ diff --git a/config_center/configuration_listener.go b/config_center/configuration_listener.go index 5367ee72dfa71ffb5e2b66d78029fe2c92338e90..1419bcdd0ce10ec15d0c24c2439bb02747ce5391 100644 --- a/config_center/configuration_listener.go +++ b/config_center/configuration_listener.go @@ -1,8 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package config_center import ( "fmt" ) + import ( "github.com/apache/dubbo-go/remoting" ) diff --git a/config_center/configurator.go b/config_center/configurator.go index 0b0b1ddee81c242e5031cad8809ff236251baeb6..3ba293ec60302b76becce357f49b2baa543f69cd 100644 --- a/config_center/configurator.go +++ b/config_center/configurator.go @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package config_center import ( diff --git a/config_center/configurator/override.go b/config_center/configurator/override.go index a4a97294d22e922bc4edf90c5ddebff0f1587a75..458e2f44e92e17adf6c41786b9876ea7a6253f39 100644 --- a/config_center/configurator/override.go +++ b/config_center/configurator/override.go @@ -19,9 +19,11 @@ package configurator import ( "strings" ) + import ( "github.com/dubbogo/gost/container" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" diff --git a/config_center/configurator/override_test.go b/config_center/configurator/override_test.go index e03056ded50257e420afb50fe10c68093fd3b760..2790488f276f7fdf2dde2fc42e0c65e0916d6751 100644 --- a/config_center/configurator/override_test.go +++ b/config_center/configurator/override_test.go @@ -20,9 +20,11 @@ import ( "context" "testing" ) + import ( "github.com/stretchr/testify/assert" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" diff --git a/config_center/dynamic_configuration.go b/config_center/dynamic_configuration.go index c3718ee4c9deabfcbec38e8a83361cd7a57202e0..1028b26d963cfcb02636113abc3e482bb22192a0 100644 --- a/config_center/dynamic_configuration.go +++ b/config_center/dynamic_configuration.go @@ -20,6 +20,7 @@ package config_center import ( "time" ) + import ( "github.com/apache/dubbo-go/config_center/parser" ) diff --git a/config_center/mock_dynamic_config.go b/config_center/mock_dynamic_config.go index 7045c48ec9027b55d5edecd3aa8d3acb1c66da8f..e8f10d45ff3fb9e395ecc4df0955c25b99c1efd0 100644 --- a/config_center/mock_dynamic_config.go +++ b/config_center/mock_dynamic_config.go @@ -18,14 +18,18 @@ package config_center import ( - "github.com/apache/dubbo-go/common/constant" - "github.com/apache/dubbo-go/remoting" - "gopkg.in/yaml.v2" "sync" ) + +import ( + "gopkg.in/yaml.v2" +) + import ( "github.com/apache/dubbo-go/common" + "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/config_center/parser" + "github.com/apache/dubbo-go/remoting" ) type MockDynamicConfigurationFactory struct{} diff --git a/config_center/parser/configuration_parser.go b/config_center/parser/configuration_parser.go index bc0eb1182dc2e6d46cdc947138efa526ad80e2d2..da140da3ef5eeb6f2023e5c7eef6e8b46ed5dfcf 100644 --- a/config_center/parser/configuration_parser.go +++ b/config_center/parser/configuration_parser.go @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package parser import ( @@ -5,11 +22,13 @@ import ( "strconv" "strings" ) + import ( "github.com/magiconair/properties" perrors "github.com/pkg/errors" "gopkg.in/yaml.v2" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" diff --git a/config_center/parser/configuration_parser_test.go b/config_center/parser/configuration_parser_test.go index 08490e8581f4563fdc0e26c10e5126586a131ceb..7a59ea9b48b8b8d2a84735a416bcba1bb9ec8652 100644 --- a/config_center/parser/configuration_parser_test.go +++ b/config_center/parser/configuration_parser_test.go @@ -1,8 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package parser import ( "testing" ) + import ( "github.com/stretchr/testify/assert" ) diff --git a/config_center/zookeeper/factory.go b/config_center/zookeeper/factory.go index ac10d2a76fdb20cb6f6689a5e3d2f9475c160dfb..611f4b9785c38eac4181750eefcabfb39607135d 100644 --- a/config_center/zookeeper/factory.go +++ b/config_center/zookeeper/factory.go @@ -18,13 +18,14 @@ package zookeeper import ( - "github.com/apache/dubbo-go/config_center/parser" "sync" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/extension" "github.com/apache/dubbo-go/config_center" + "github.com/apache/dubbo-go/config_center/parser" ) func init() { diff --git a/config_center/zookeeper/impl.go b/config_center/zookeeper/impl.go index 1858a5a83d95818658fd54f94c1d99b36610d058..84e4b54e237fabb5775bfd0dfeb7043f1794a7ae 100644 --- a/config_center/zookeeper/impl.go +++ b/config_center/zookeeper/impl.go @@ -18,20 +18,22 @@ package zookeeper import ( - "github.com/apache/dubbo-go/config_center/parser" "strings" "sync" "time" ) + import ( perrors "github.com/pkg/errors" "github.com/samuel/go-zookeeper/zk" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/constant" "github.com/apache/dubbo-go/common/logger" "github.com/apache/dubbo-go/config_center" + "github.com/apache/dubbo-go/config_center/parser" "github.com/apache/dubbo-go/remoting/zookeeper" ) diff --git a/config_center/zookeeper/listener.go b/config_center/zookeeper/listener.go index 0874f0c2f78790c14fccaa0ed5571c7f30959c11..7128b6f5a39e243840a1076f9fc506d94c7ed2ed 100644 --- a/config_center/zookeeper/listener.go +++ b/config_center/zookeeper/listener.go @@ -21,6 +21,7 @@ import ( "strings" "sync" ) + import ( "github.com/apache/dubbo-go/config_center" "github.com/apache/dubbo-go/remoting" diff --git a/registry/base_configuration_listener.go b/registry/base_configuration_listener.go index 791996340d6b34e024a2f21554d48bd38ace52cd..925baa2198d9917824c1be78b7cd0c2f93bfb894 100644 --- a/registry/base_configuration_listener.go +++ b/registry/base_configuration_listener.go @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package registry import ( diff --git a/registry/mock_registry.go b/registry/mock_registry.go index 29922ef5bbfdd9b62b77d904a9e75f07db7b3e5a..512c452e39082d619ffceae7f82d28127fbe2975 100644 --- a/registry/mock_registry.go +++ b/registry/mock_registry.go @@ -18,13 +18,16 @@ package registry import ( - "github.com/apache/dubbo-go/common/logger" - "go.uber.org/atomic" "time" ) +import ( + "go.uber.org/atomic" +) + import ( "github.com/apache/dubbo-go/common" + "github.com/apache/dubbo-go/common/logger" ) type MockRegistry struct { diff --git a/registry/protocol/protocol_test.go b/registry/protocol/protocol_test.go index 45f9069a7327be15c15fe5028e85700645bf4ab8..56d9fe7d1a305a81125e978a454cd5513b591e4c 100644 --- a/registry/protocol/protocol_test.go +++ b/registry/protocol/protocol_test.go @@ -19,7 +19,6 @@ package protocol import ( "context" - "github.com/apache/dubbo-go/remoting" "testing" "time" ) @@ -40,6 +39,7 @@ import ( "github.com/apache/dubbo-go/protocol" "github.com/apache/dubbo-go/protocol/protocolwrapper" "github.com/apache/dubbo-go/registry" + "github.com/apache/dubbo-go/remoting" ) func init() { diff --git a/registry/zookeeper/listener.go b/registry/zookeeper/listener.go index 688ede8b65f4622d41d3f58f05b07f793ddb2224..857421f07706d6bdfec5a3ec21ba674627633458 100644 --- a/registry/zookeeper/listener.go +++ b/registry/zookeeper/listener.go @@ -19,15 +19,17 @@ package zookeeper import ( "context" - "github.com/apache/dubbo-go/config_center" "strings" ) + import ( perrors "github.com/pkg/errors" ) + import ( "github.com/apache/dubbo-go/common" "github.com/apache/dubbo-go/common/logger" + "github.com/apache/dubbo-go/config_center" "github.com/apache/dubbo-go/registry" "github.com/apache/dubbo-go/remoting" zk "github.com/apache/dubbo-go/remoting/zookeeper" diff --git a/registry/zookeeper/listener_test.go b/registry/zookeeper/listener_test.go index c30e5d47d2f7d1356e20ec3b7635813ad2adb0f6..ca8e442684dec21f361a1d1e8bed473977b72ccf 100644 --- a/registry/zookeeper/listener_test.go +++ b/registry/zookeeper/listener_test.go @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package zookeeper import (