[app_discovery] fix compile

pom.xml

@@ -82,13 +82,10 @@
         <rocksdbjni.version>6.4.6</rocksdbjni.version>
         <main.user.dir>${user.dir}</main.user.dir>
         <argLine>-Dnetwork_interface_denylist=docker0</argLine>
-<<<<<<< HEAD
         <!-- for linke 添加isSkipUT, isSkipIT参数声明，防止编译时产生错误 -->
         <isSkipUT>false</isSkipUT>
         <isSkipIT>false</isSkipIT>
-=======
         <fastjson.version>1.2.51.sec09_noneautotype</fastjson.version>
->>>>>>> [app_discovery] support subscribe app and interface publisher
     </properties>
 
     <dependencyManagement>

server/common/model/pom.xml

@@ -39,5 +39,13 @@
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
         </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
     </dependencies>
 </project>

server/common/model/src/main/java/com/alipay/sofa/registry/common/model/slot/DataSlotDiffSyncResult.java

@@ -20,11 +20,10 @@
 import com.alipay.sofa.registry.common.model.store.Publisher;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
+import org.springframework.util.CollectionUtils;
 
 import java.io.Serializable;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;

server/common/model/src/main/java/com/alipay/sofa/registry/common/model/store/Publisher.java

@@ -20,14 +20,9 @@
 
 import com.alipay.sofa.registry.common.model.*;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.google.common.collect.Collections2;
-import org.apache.commons.collections.CollectionUtils;
-import com.alipay.sofa.registry.common.model.AppRegisterServerDataBox;
-import com.alipay.sofa.registry.common.model.AppRegisterServerDataBox.ParamInfo;
-import com.alipay.sofa.registry.common.model.AppRegisterServerDataBox.ServiceParamInfo;
+
 import com.alipay.sofa.registry.common.model.PublishType;
 import com.alipay.sofa.registry.common.model.ServerDataBox;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 
 /**
  *

server/server/data/src/main/java/com/alipay/sofa/registry/server/data/remoting/metaserver/handler/SlotTableChangeHandler.java

@@ -27,8 +27,6 @@
 import com.alipay.sofa.registry.server.data.slot.SlotManager;
 import com.alipay.sofa.registry.server.shared.remoting.AbstractClientHandler;
 import com.alipay.sofa.registry.util.ParaCheckUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.alipay.sofa.registry.server.meta.registry.Registry;
 
 /**
  *

server/server/integration/pom.xml

@@ -55,6 +55,30 @@
             <version>6.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>registry-common-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>registry-server-data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>registry-server-data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>registry-server-session</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>registry-server-data</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa</groupId>
+            <artifactId>registry-server-meta</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

server/server/meta/src/main/java/com/alipay/sofa/registry/server/meta/bootstrap/MetaServerConfiguration.java

@@ -67,7 +67,6 @@
 import com.alipay.sofa.registry.server.meta.remoting.connection.SessionConnectionHandler;
 import com.alipay.sofa.registry.server.meta.remoting.handler.FetchProvideDataRequestHandler;
 import com.alipay.sofa.registry.server.meta.remoting.handler.HeartbeatRequestHandler;
-import com.alipay.sofa.registry.server.meta.resource.*;
 import com.alipay.sofa.registry.server.meta.slot.impl.*;
 import com.alipay.sofa.registry.server.shared.remoting.AbstractServerHandler;
 import com.alipay.sofa.registry.server.meta.repository.NodeConfirmStatusService;
@@ -83,19 +82,9 @@
 import com.alipay.sofa.registry.server.meta.task.processor.SessionNodeSingleTaskProcessor;
 import com.alipay.sofa.registry.store.api.DBService;
 import com.alipay.sofa.registry.util.DefaultExecutorFactory;
-import com.alipay.sofa.registry.util.NamedThreadFactory;
 import com.alipay.sofa.registry.util.OsUtils;
 import com.alipay.sofa.registry.util.PropertySplitter;
-import org.glassfish.jersey.jackson.JacksonFeature;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
-import java.util.ArrayList;
-import java.util.Collection;
 import java.util.concurrent.*;
 
 /**

server/server/meta/src/main/java/com/alipay/sofa/registry/server/meta/remoting/connection/MetaConnectionHandler.java

@@ -23,6 +23,7 @@
 import com.alipay.sofa.registry.remoting.Channel;
 import com.alipay.sofa.registry.server.meta.bootstrap.config.NodeConfig;
 import com.alipay.sofa.registry.server.shared.remoting.ListenServerChannelHandler;
+import com.alipay.sofa.registry.server.meta.remoting.handler.AbstractServerHandler;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.net.InetSocketAddress;