This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch performance-tuning-2.7.x
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/performance-tuning-2.7.x by
this push:
new faec551 performance tuning: Applicationmodel revert (#4245)
faec551 is described below
commit faec551df75cb22c65970c0d83d446e306184926
Author: ken.lj <[email protected]>
AuthorDate: Tue Jun 4 17:49:00 2019 +0800
performance tuning: Applicationmodel revert (#4245)
---
.../org/apache/dubbo/common/beanutil/Bean.java | 6 ++--
.../common/beanutil/JavaBeanSerializeUtilTest.java | 10 +++---
.../apache/dubbo/common/utils/PojoUtilsTest.java | 19 +++++-----
.../apache/dubbo/{common => rpc}/model/Person.java | 2 +-
.../{common => rpc}/model/SerializablePerson.java | 2 +-
.../apache/dubbo/{common => rpc}/model/User.java | 2 +-
.../dubbo/{common => rpc}/model/media/Image.java | 2 +-
.../dubbo/{common => rpc}/model/media/Media.java | 2 +-
.../{common => rpc}/model/person/BigPerson.java | 2 +-
.../{common => rpc}/model/person/FullAddress.java | 2 +-
.../{common => rpc}/model/person/PersonInfo.java | 2 +-
.../{common => rpc}/model/person/PersonStatus.java | 42 +++++++++++-----------
.../dubbo/{common => rpc}/model/person/Phone.java | 2 +-
.../org/apache/dubbo/config/MethodConfigTest.java | 2 +-
.../org/apache/dubbo/config/AbstractConfig.java | 2 +-
.../dubbo/config/AbstractInterfaceConfig.java | 2 +-
.../org/apache/dubbo/config/ReferenceConfig.java | 4 +--
.../org/apache/dubbo/config/ServiceConfig.java | 4 +--
.../dubbo/monitor/dubbo/DubboMonitorFactory.java | 2 +-
.../apache/dubbo/monitor/dubbo/MetricsFilter.java | 2 +-
.../java/org/apache/dubbo/qos/command/impl/Ls.java | 6 ++--
.../org/apache/dubbo/qos/command/impl/Offline.java | 4 +--
.../org/apache/dubbo/qos/command/impl/Online.java | 4 +--
.../org/apache/dubbo/qos/command/impl/LsTest.java | 6 ++--
.../apache/dubbo/qos/command/impl/OfflineTest.java | 4 +--
.../apache/dubbo/qos/command/impl/OnlineTest.java | 4 +--
.../registry/integration/RegistryDirectory.java | 2 +-
.../registry/integration/RegistryProtocol.java | 2 +-
.../java/org/apache/dubbo/rpc/RpcInvocation.java | 2 +-
.../apache/dubbo/rpc}/model/ApplicationModel.java | 2 +-
.../org/apache/dubbo/rpc}/model/ConsumerModel.java | 2 +-
.../org/apache/dubbo/rpc}/model/MethodModel.java | 2 +-
.../org/apache/dubbo/rpc}/model/ProviderModel.java | 2 +-
.../org/apache/dubbo/rpc}/model/ServiceModel.java | 2 +-
.../protocol/dubbo/DecodeableRpcInvocation.java | 6 ++--
.../rpc/protocol/dubbo/filter/FutureFilter.java | 4 +--
.../protocol/dubbo/telnet/InvokeTelnetHandler.java | 6 ++--
.../protocol/dubbo/telnet/ListTelnetHandler.java | 8 ++---
.../rpc/protocol/dubbo/ImplicitCallBackTest.java | 4 +--
.../dubbo/telnet/InvokerTelnetHandlerTest.java | 4 +--
.../dubbo/telnet/ListTelnetHandlerTest.java | 4 +--
.../dubbo/telnet/SelectTelnetHandlerTest.java | 4 +--
.../dubbo/rpc/protocol/rest/RestProtocol.java | 2 +-
.../dubbo/rpc/protocol/rest/RestProtocolTest.java | 4 +--
44 files changed, 102 insertions(+), 101 deletions(-)
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java
index 2ca32b2..e17a538 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java
@@ -1,8 +1,8 @@
package org.apache.dubbo.common.beanutil;
-import org.apache.dubbo.common.model.person.FullAddress;
-import org.apache.dubbo.common.model.person.PersonStatus;
-import org.apache.dubbo.common.model.person.Phone;
+import org.apache.dubbo.rpc.model.person.FullAddress;
+import org.apache.dubbo.rpc.model.person.PersonStatus;
+import org.apache.dubbo.rpc.model.person.Phone;
import java.util.Collection;
import java.util.Date;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
index 68c7100..c98ea15 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.dubbo.common.beanutil;
-import org.apache.dubbo.common.model.person.BigPerson;
-import org.apache.dubbo.common.model.person.FullAddress;
-import org.apache.dubbo.common.model.person.PersonInfo;
-import org.apache.dubbo.common.model.person.PersonStatus;
-import org.apache.dubbo.common.model.person.Phone;
import org.apache.dubbo.common.utils.PojoUtilsTest;
+import org.apache.dubbo.rpc.model.person.BigPerson;
+import org.apache.dubbo.rpc.model.person.FullAddress;
+import org.apache.dubbo.rpc.model.person.PersonInfo;
+import org.apache.dubbo.rpc.model.person.PersonStatus;
+import org.apache.dubbo.rpc.model.person.Phone;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
index 3595efb..f435e06 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java
@@ -16,14 +16,15 @@
*/
package org.apache.dubbo.common.utils;
-import org.apache.dubbo.common.model.Person;
-import org.apache.dubbo.common.model.SerializablePerson;
-import org.apache.dubbo.common.model.User;
-import org.apache.dubbo.common.model.person.BigPerson;
-import org.apache.dubbo.common.model.person.FullAddress;
-import org.apache.dubbo.common.model.person.PersonInfo;
-import org.apache.dubbo.common.model.person.PersonStatus;
-import org.apache.dubbo.common.model.person.Phone;
+import org.apache.dubbo.rpc.model.Person;
+import org.apache.dubbo.rpc.model.SerializablePerson;
+import org.apache.dubbo.rpc.model.User;
+import org.apache.dubbo.rpc.model.person.BigPerson;
+import org.apache.dubbo.rpc.model.person.FullAddress;
+import org.apache.dubbo.rpc.model.person.PersonInfo;
+import org.apache.dubbo.rpc.model.person.PersonStatus;
+import org.apache.dubbo.rpc.model.person.Phone;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
@@ -40,13 +41,13 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class PojoUtilsTest {
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/Person.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/Person.java
similarity index 98%
rename from dubbo-common/src/test/java/org/apache/dubbo/common/model/Person.java
rename to dubbo-common/src/test/java/org/apache/dubbo/rpc/model/Person.java
index 5a551a7..8cd13e4 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/model/Person.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/Person.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import java.util.Arrays;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/SerializablePerson.java
similarity index 98%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java
rename to
dubbo-common/src/test/java/org/apache/dubbo/rpc/model/SerializablePerson.java
index d78c592..fa3015a 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/SerializablePerson.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import java.io.Serializable;
import java.util.Arrays;
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/model/User.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/User.java
similarity index 98%
rename from dubbo-common/src/test/java/org/apache/dubbo/common/model/User.java
rename to dubbo-common/src/test/java/org/apache/dubbo/rpc/model/User.java
index 33d20bb..c49130c 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/model/User.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/User.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import java.util.Objects;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Image.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/media/Image.java
similarity index 98%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Image.java
rename to dubbo-common/src/test/java/org/apache/dubbo/rpc/model/media/Image.java
index a59eff3..423c6a4 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Image.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/media/Image.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model.media;
+package org.apache.dubbo.rpc.model.media;
public class Image implements java.io.Serializable {
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Media.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/media/Media.java
similarity index 99%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Media.java
rename to dubbo-common/src/test/java/org/apache/dubbo/rpc/model/media/Media.java
index 042a3a5..bb2be00 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Media.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/media/Media.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model.media;
+package org.apache.dubbo.rpc.model.media;
import java.util.List;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
similarity index 98%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
rename to
dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
index 4ce7900..9e0856c 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/BigPerson.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model.person;
+package org.apache.dubbo.rpc.model.person;
import java.io.Serializable;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/FullAddress.java
similarity index 99%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java
rename to
dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/FullAddress.java
index 3892167..9536389 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/FullAddress.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model.person;
+package org.apache.dubbo.rpc.model.person;
import java.io.Serializable;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/PersonInfo.java
similarity index 99%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java
rename to
dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/PersonInfo.java
index 15f1238..57f156b 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/PersonInfo.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model.person;
+package org.apache.dubbo.rpc.model.person;
import java.io.Serializable;
import java.util.List;
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/PersonStatus.java
similarity index 92%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java
rename to
dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/PersonStatus.java
index 727a155..8f432f4 100644
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java
+++
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/PersonStatus.java
@@ -1,22 +1,22 @@
-/*
- * 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 org.apache.dubbo.common.model.person;
-
-public enum PersonStatus {
- ENABLED,
- DISABLED
+/*
+ * 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 org.apache.dubbo.rpc.model.person;
+
+public enum PersonStatus {
+ ENABLED,
+ DISABLED
}
\ No newline at end of file
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/Phone.java
b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/Phone.java
similarity index 98%
rename from
dubbo-common/src/test/java/org/apache/dubbo/common/model/person/Phone.java
rename to
dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/Phone.java
index 41fd38a..ebc00ad 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/Phone.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/rpc/model/person/Phone.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model.person;
+package org.apache.dubbo.rpc.model.person;
import java.io.Serializable;
diff --git
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
index bfc3afe..aaf680b 100644
---
a/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
+++
b/dubbo-compatible/src/test/java/org/apache/dubbo/config/MethodConfigTest.java
@@ -17,7 +17,7 @@
package org.apache.dubbo.config;
-import org.apache.dubbo.common.model.ConsumerModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
import org.apache.dubbo.service.Person;
import com.alibaba.dubbo.config.ArgumentConfig;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
index 3bf74bb..5786b5d 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java
@@ -24,13 +24,13 @@ import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ConsumerModel;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.MethodUtils;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.support.Parameter;
+import org.apache.dubbo.rpc.model.ConsumerModel;
import java.io.Serializable;
import java.lang.reflect.Method;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
index 630d0bb..8130a5f 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java
@@ -21,7 +21,6 @@ import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.config.Environment;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConfigUtils;
@@ -41,6 +40,7 @@ import org.apache.dubbo.rpc.Filter;
import org.apache.dubbo.rpc.InvokerListener;
import org.apache.dubbo.rpc.ProxyFactory;
import org.apache.dubbo.rpc.cluster.Cluster;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.support.MockInvoker;
import java.io.IOException;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
index 08a8c02..ffef86d 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -20,8 +20,6 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.bytecode.Wrapper;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ConsumerModel;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConfigUtils;
@@ -39,6 +37,8 @@ import org.apache.dubbo.rpc.cluster.Cluster;
import org.apache.dubbo.rpc.cluster.directory.StaticDirectory;
import org.apache.dubbo.rpc.cluster.support.ClusterUtils;
import org.apache.dubbo.rpc.cluster.support.RegistryAwareCluster;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
import org.apache.dubbo.rpc.protocol.injvm.InjvmProtocol;
import org.apache.dubbo.rpc.service.GenericService;
import org.apache.dubbo.rpc.support.ProtocolUtils;
diff --git
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
index cc1212b..2b16496 100644
---
a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
+++
b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java
@@ -22,8 +22,6 @@ import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.bytecode.Wrapper;
import org.apache.dubbo.common.config.Environment;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.ClassUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConfigUtils;
@@ -40,6 +38,8 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.ProxyFactory;
import org.apache.dubbo.rpc.cluster.ConfiguratorFactory;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.apache.dubbo.rpc.service.GenericService;
import org.apache.dubbo.rpc.support.ProtocolUtils;
diff --git
a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
index 0d552c0..20460d5 100644
---
a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
+++
b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java
@@ -18,7 +18,6 @@ package org.apache.dubbo.monitor.dubbo;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.monitor.Monitor;
import org.apache.dubbo.monitor.MonitorService;
@@ -26,6 +25,7 @@ import
org.apache.dubbo.monitor.support.AbstractMonitorFactory;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.ProxyFactory;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import static org.apache.dubbo.common.constants.CommonConstants.DUBBO_PROTOCOL;
import static org.apache.dubbo.common.constants.CommonConstants.PROTOCOL_KEY;
diff --git
a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
index 34c59bf..2f26743 100644
---
a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
+++
b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
@@ -20,7 +20,6 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.store.DataStore;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.monitor.MetricsService;
@@ -32,6 +31,7 @@ import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.support.RpcUtils;
import com.alibaba.fastjson.JSON;
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
index 7ff5f50..ca23068 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java
@@ -16,13 +16,13 @@
*/
package org.apache.dubbo.qos.command.impl;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ConsumerModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.qos.command.BaseCommand;
import org.apache.dubbo.qos.command.CommandContext;
import org.apache.dubbo.qos.command.annotation.Cmd;
import org.apache.dubbo.qos.textui.TTable;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import java.util.Collection;
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java
index 33bc702..cf2862e 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java
@@ -19,8 +19,6 @@ package org.apache.dubbo.qos.command.impl;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.qos.command.BaseCommand;
import org.apache.dubbo.qos.command.CommandContext;
import org.apache.dubbo.qos.command.annotation.Cmd;
@@ -28,6 +26,8 @@ import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.RegistryFactory;
import org.apache.dubbo.registry.support.ProviderConsumerRegTable;
import org.apache.dubbo.registry.support.ProviderInvokerWrapper;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import java.util.Collection;
import java.util.Set;
diff --git
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java
index c91dbda..6bcf089 100644
---
a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java
+++
b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java
@@ -19,8 +19,6 @@ package org.apache.dubbo.qos.command.impl;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.ArrayUtils;
import org.apache.dubbo.qos.command.BaseCommand;
import org.apache.dubbo.qos.command.CommandContext;
@@ -29,6 +27,8 @@ import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.RegistryFactory;
import org.apache.dubbo.registry.support.ProviderConsumerRegTable;
import org.apache.dubbo.registry.support.ProviderInvokerWrapper;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import java.util.Collection;
import java.util.Set;
diff --git
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
index be08559..4b4fda2 100644
---
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
+++
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/LsTest.java
@@ -17,14 +17,14 @@
package org.apache.dubbo.qos.command.impl;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ConsumerModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.qos.command.CommandContext;
import org.apache.dubbo.registry.integration.RegistryDirectory;
import org.apache.dubbo.registry.support.ProviderConsumerRegTable;
import org.apache.dubbo.registry.support.ProviderInvokerWrapper;
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
diff --git
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
index 7d71b4e..6f6be8e 100644
---
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
+++
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OfflineTest.java
@@ -17,13 +17,13 @@
package org.apache.dubbo.qos.command.impl;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.qos.command.CommandContext;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.support.ProviderConsumerRegTable;
import org.apache.dubbo.registry.support.ProviderInvokerWrapper;
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
diff --git
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
index 8c83315..b419f0c 100644
---
a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
+++
b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/OnlineTest.java
@@ -17,13 +17,13 @@
package org.apache.dubbo.qos.command.impl;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.qos.command.CommandContext;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.support.ProviderConsumerRegTable;
import org.apache.dubbo.registry.support.ProviderInvokerWrapper;
import org.apache.dubbo.rpc.Invoker;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.junit.jupiter.api.Test;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
index 250119f..2f3a835 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java
@@ -22,7 +22,6 @@ import org.apache.dubbo.common.Version;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.NetUtils;
@@ -44,6 +43,7 @@ import org.apache.dubbo.rpc.cluster.RouterFactory;
import org.apache.dubbo.rpc.cluster.directory.AbstractDirectory;
import org.apache.dubbo.rpc.cluster.directory.StaticDirectory;
import org.apache.dubbo.rpc.cluster.support.ClusterUtils;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.protocol.InvokerWrapper;
import java.util.ArrayList;
diff --git
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index 320edfe..9afa7ab 100644
---
a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++
b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -22,7 +22,6 @@ import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.extension.ExtensionLoader;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.common.utils.StringUtils;
@@ -41,6 +40,7 @@ import org.apache.dubbo.rpc.ProxyFactory;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.cluster.Cluster;
import org.apache.dubbo.rpc.cluster.Configurator;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.protocol.InvokerWrapper;
import java.util.ArrayList;
diff --git
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
index ad46cd7..de6f728 100644
---
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java
@@ -17,8 +17,8 @@
package org.apache.dubbo.rpc;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.utils.StringUtils;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import java.io.Serializable;
import java.lang.reflect.Method;
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ApplicationModel.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
similarity index 99%
rename from
dubbo-common/src/main/java/org/apache/dubbo/common/model/ApplicationModel.java
rename to
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
index 0f5c688..7a7a4be 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ApplicationModel.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ConsumerModel.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
similarity index 99%
rename from
dubbo-common/src/main/java/org/apache/dubbo/common/model/ConsumerModel.java
rename to
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
index 1641b8b..135cadb 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ConsumerModel.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ConsumerModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.utils.Assert;
import org.apache.dubbo.common.utils.CollectionUtils;
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/MethodModel.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/MethodModel.java
similarity index 98%
rename from
dubbo-common/src/main/java/org/apache/dubbo/common/model/MethodModel.java
rename to
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/MethodModel.java
index adc8933..1ef9a33 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/model/MethodModel.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/MethodModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.utils.ReflectUtils;
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ProviderModel.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
similarity index 97%
rename from
dubbo-common/src/main/java/org/apache/dubbo/common/model/ProviderModel.java
rename to
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
index 3cee816..41f6f7c 100644
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ProviderModel.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ProviderModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import java.util.Set;
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ServiceModel.java
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java
similarity index 98%
rename from
dubbo-common/src/main/java/org/apache/dubbo/common/model/ServiceModel.java
rename to
dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java
index e28adee..94e0ad2 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/model/ServiceModel.java
+++
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/model/ServiceModel.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dubbo.common.model;
+package org.apache.dubbo.rpc.model;
import org.apache.dubbo.common.utils.CollectionUtils;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
index 8f93f9e..6d0d995 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java
@@ -19,9 +19,6 @@ package org.apache.dubbo.rpc.protocol.dubbo;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.MethodModel;
-import org.apache.dubbo.common.model.ServiceModel;
import org.apache.dubbo.common.serialize.Cleanable;
import org.apache.dubbo.common.serialize.ObjectInput;
import org.apache.dubbo.common.utils.Assert;
@@ -32,6 +29,9 @@ import org.apache.dubbo.remoting.Decodeable;
import org.apache.dubbo.remoting.exchange.Request;
import org.apache.dubbo.remoting.transport.CodecSupport;
import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.MethodModel;
+import org.apache.dubbo.rpc.model.ServiceModel;
import java.io.IOException;
import java.io.InputStream;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
index 9714b41..45a26cd 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
@@ -20,13 +20,13 @@ import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ConsumerModel;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.ListenableFilter;
import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
index cc23846..1534bb2 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
@@ -17,9 +17,6 @@
package org.apache.dubbo.rpc.protocol.dubbo.telnet;
import org.apache.dubbo.common.extension.Activate;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.MethodModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
@@ -27,6 +24,9 @@ import org.apache.dubbo.remoting.Channel;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
import org.apache.dubbo.remoting.telnet.support.Help;
import org.apache.dubbo.rpc.AppResponse;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.MethodModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import com.alibaba.fastjson.JSON;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java
index 10167a8..f0953ea 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java
@@ -17,15 +17,15 @@
package org.apache.dubbo.rpc.protocol.dubbo.telnet;
import org.apache.dubbo.common.extension.Activate;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ConsumerModel;
-import org.apache.dubbo.common.model.MethodModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.remoting.Channel;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
import org.apache.dubbo.remoting.telnet.support.Help;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
+import org.apache.dubbo.rpc.model.MethodModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import java.lang.reflect.Method;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java
index 25869c2..ffc175f 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java
@@ -18,12 +18,12 @@ package org.apache.dubbo.rpc.protocol.dubbo;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ConsumerModel;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.rpc.Exporter;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcContext;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ConsumerModel;
import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils;
import org.junit.jupiter.api.AfterEach;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
index 931029e..e14b5dc 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java
@@ -17,13 +17,13 @@
package org.apache.dubbo.rpc.protocol.dubbo.telnet;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.Channel;
import org.apache.dubbo.remoting.ChannelHandler;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService;
import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl;
import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
index f8052ca..420cbd4 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.dubbo.rpc.protocol.dubbo.telnet;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.ReflectUtils;
import org.apache.dubbo.remoting.Channel;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService;
import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl;
import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils;
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/SelectTelnetHandlerTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/SelectTelnetHandlerTest.java
index d8680e4..fbff17b 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/SelectTelnetHandlerTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/SelectTelnetHandlerTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.dubbo.rpc.protocol.dubbo.telnet;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.remoting.Channel;
import org.apache.dubbo.remoting.RemotingException;
import org.apache.dubbo.remoting.telnet.TelnetHandler;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService;
import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl;
import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils;
diff --git
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
index 86486e4..c433b00 100644
---
a/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
+++
b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java
@@ -17,12 +17,12 @@
package org.apache.dubbo.rpc.protocol.rest;
import org.apache.dubbo.common.URL;
-import org.apache.dubbo.common.model.ApplicationModel;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.remoting.http.HttpBinder;
import org.apache.dubbo.remoting.http.servlet.BootstrapListener;
import org.apache.dubbo.remoting.http.servlet.ServletManager;
import org.apache.dubbo.rpc.RpcException;
+import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.protocol.AbstractProxyProtocol;
import org.apache.http.HeaderElement;
diff --git
a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
index 881366f..f3d77af 100644
---
a/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
+++
b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java
@@ -18,8 +18,6 @@ package org.apache.dubbo.rpc.protocol.rest;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.extension.ExtensionLoader;
-import org.apache.dubbo.common.model.ApplicationModel;
-import org.apache.dubbo.common.model.ProviderModel;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.rpc.Exporter;
import org.apache.dubbo.rpc.Invoker;
@@ -29,6 +27,8 @@ import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcContext;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.RpcInvocation;
+import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.ProviderModel;
import org.hamcrest.CoreMatchers;
import org.junit.jupiter.api.AfterEach;
