Fixed dependencies on backend (the Proxy profile should no longer depend on the RPC profile)

Author: amedviediev

devicehive-backend/src/main/java/com/devicehive/application/BackendProxyClientConfig.java

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.devicehive.model.ServerEvent;
 import com.devicehive.proxy.ProxyMessageDispatcher;
 import com.devicehive.proxy.ProxyRequestHandler;
 import com.devicehive.proxy.ProxyServerEventHandler;
@@ -31,7 +32,6 @@
 import com.devicehive.proxy.client.WebSocketKafkaProxyClient;
 import com.devicehive.proxy.config.WebSocketKafkaProxyConfig;
 import com.devicehive.shim.api.server.MessageDispatcher;
-import com.devicehive.shim.kafka.server.ServerEvent;
 import com.google.gson.Gson;
 import com.lmax.disruptor.*;
 import org.springframework.beans.factory.annotation.Autowired;

devicehive-backend/src/main/java/com/devicehive/proxy/ProxyRequestHandler.java

@@ -20,10 +20,10 @@
  * #L%
  */
 
+import com.devicehive.model.ServerEvent;
 import com.devicehive.proxy.api.NotificationHandler;
 import com.devicehive.proxy.api.ProxyClient;
 import com.devicehive.shim.api.Request;
-import com.devicehive.shim.kafka.server.ServerEvent;
 import com.google.gson.Gson;
 import com.lmax.disruptor.RingBuffer;
 import org.slf4j.Logger;

devicehive-backend/src/main/java/com/devicehive/proxy/ProxyServerEventHandler.java

@@ -21,6 +21,7 @@
  */
 
 import com.devicehive.application.RequestHandlersMapper;
+import com.devicehive.model.ServerEvent;
 import com.devicehive.proxy.api.ProxyClient;
 import com.devicehive.proxy.api.ProxyMessage;
 import com.devicehive.proxy.api.ProxyMessageBuilder;
@@ -31,7 +32,6 @@
 import com.devicehive.shim.api.Request;
 import com.devicehive.shim.api.Response;
 import com.devicehive.shim.api.server.RequestHandler;
-import com.devicehive.shim.kafka.server.ServerEvent;
 import com.google.gson.Gson;
 import com.lmax.disruptor.WorkHandler;
 import org.slf4j.Logger;

devicehive-shim-kafka-impl/src/main/java/com/devicehive/shim/kafka/server/ServerEvent.java devicehive-common/src/main/java/com/devicehive/model/ServerEvent.java

@@ -1,4 +1,4 @@
-package com.devicehive.shim.kafka.server;
+package com.devicehive.model;
 
 /*
  * #%L

devicehive-proxy-ws-kafka-impl/pom.xml

@@ -28,5 +28,9 @@
             <artifactId>javax.websocket-client-api</artifactId>
             <version>${javax.websocket.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.lmax</groupId>
+            <artifactId>disruptor</artifactId>
+        </dependency>
     </dependencies>
 </project>

devicehive-shim-kafka-impl/src/main/java/com/devicehive/shim/config/server/KafkaRpcServerConfig.java

@@ -28,7 +28,7 @@
 import com.devicehive.shim.kafka.server.KafkaRpcServer;
 import com.devicehive.shim.config.KafkaRpcConfig;
 import com.devicehive.shim.kafka.server.RequestConsumer;
-import com.devicehive.shim.kafka.server.ServerEvent;
+import com.devicehive.model.ServerEvent;
 import com.devicehive.shim.kafka.server.ServerEventHandler;
 import com.devicehive.shim.kafka.topic.KafkaTopicService;
 import com.google.gson.Gson;

devicehive-shim-kafka-impl/src/main/java/com/devicehive/shim/kafka/builder/ServerBuilder.java

@@ -26,7 +26,7 @@
 import com.devicehive.shim.api.server.RpcServer;
 import com.devicehive.shim.kafka.server.KafkaRpcServer;
 import com.devicehive.shim.kafka.server.RequestConsumer;
-import com.devicehive.shim.kafka.server.ServerEvent;
+import com.devicehive.model.ServerEvent;
 import com.devicehive.shim.kafka.server.ServerEventHandler;
 import com.lmax.disruptor.FatalExceptionHandler;
 import com.lmax.disruptor.WorkerPool;

devicehive-shim-kafka-impl/src/main/java/com/devicehive/shim/kafka/server/KafkaRpcServer.java

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.devicehive.model.ServerEvent;
 import com.devicehive.shim.api.server.MessageDispatcher;
 import com.devicehive.shim.api.server.RpcServer;
 import com.lmax.disruptor.RingBuffer;

devicehive-shim-kafka-impl/src/main/java/com/devicehive/shim/kafka/server/RequestConsumer.java

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.devicehive.model.ServerEvent;
 import com.devicehive.shim.api.Request;
 import com.lmax.disruptor.RingBuffer;
 import org.apache.kafka.clients.consumer.ConsumerRecords;

devicehive-shim-kafka-impl/src/main/java/com/devicehive/shim/kafka/server/ServerEventHandler.java

@@ -20,6 +20,7 @@
  * #L%
  */
 
+import com.devicehive.model.ServerEvent;
 import com.devicehive.shim.api.Request;
 import com.devicehive.shim.api.Response;
 import com.devicehive.shim.api.server.MessageDispatcher;