Renamed MessageFeedWorker to DataFeedWorker

slf4j-log4j12 dependency is now runtime scope

Author: ftbb

examples/lex/LexBotRelay.java

@@ -42,8 +42,8 @@
  */
 public class LexBotRelay implements ChatListener {
 
-    SymphonyClient symClient;
-    LexBotDetail lexBotDetail;
+    private SymphonyClient symClient;
+    private LexBotDetail lexBotDetail;
 
     private AWSCredentials credentials = new BasicAWSCredentials(System.getProperty("s3.key.id"), System.getProperty("s3.access.key"));
     private AmazonLexRuntime lexClient = AmazonLexRuntimeClientBuilder.standard().withRegion(Regions.US_EAST_1).withCredentials(new AWSStaticCredentialsProvider(credentials)).build();
@@ -70,7 +70,7 @@ public void onChatMessage(SymMessage message) {
 
         }else{
 
-            message.setMessageText(postTextResult.getMessage());
+            message.setMessageText(lexBotDetail.getBotName() + ": " + postTextResult.getMessage());
 
         }
 

pom.xml

@@ -108,6 +108,7 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <version>${slfj4-version}</version>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

symphony-client/src/main/java/org/symphonyoss/client/services/MessageFeedWorker.java renamed to symphony-client/src/main/java/org/symphonyoss/client/services/DataFeedWorker.java

@@ -30,7 +30,6 @@
 import org.symphonyoss.client.common.Constants;
 import org.symphonyoss.client.events.SymEvent;
 import org.symphonyoss.client.exceptions.DataFeedException;
-import org.symphonyoss.client.exceptions.SymFault;
 import org.symphonyoss.symphony.agent.model.Datafeed;
 import org.symphonyoss.symphony.clients.model.ApiVersion;
 
@@ -44,11 +43,11 @@
  *
  * @author Frank Tarsillo
  */
-class MessageFeedWorker implements Runnable {
+class DataFeedWorker implements Runnable {
 
     private final DataFeedListener dataFeedListener;
     private final SymphonyClient symClient;
-    private final Logger logger = LoggerFactory.getLogger(MessageFeedWorker.class);
+    private final Logger logger = LoggerFactory.getLogger(DataFeedWorker.class);
     private Datafeed datafeed;
     private boolean shutdown;
 
@@ -59,7 +58,7 @@ class MessageFeedWorker implements Runnable {
      * @param symClient        Identifies the BOT user and exposes client APIs
      * @param dataFeedListener Callback listener to publish new base messages on.
      */
-    public MessageFeedWorker(SymphonyClient symClient, DataFeedListener dataFeedListener) {
+    public DataFeedWorker(SymphonyClient symClient, DataFeedListener dataFeedListener) {
         this.symClient = symClient;
         this.dataFeedListener = dataFeedListener;
 
@@ -98,7 +97,7 @@ private void initDatafeed() {
                 datafeed = symClient.getDataFeedClient().createDatafeed(ApiVersion.V4);
 
                 break;
-            } catch (DataFeedException e) {
+            } catch (Exception e) {
 
         	/*
              * TODO:
@@ -149,7 +148,7 @@ private void readDatafeed() {
             }
 
 
-        } catch (DataFeedException e) {
+        } catch (Exception e) {
             logger.error("Failed to create read datafeed from pod, please check connection..resetting.", e);
             datafeed = null;
 

symphony-client/src/main/java/org/symphonyoss/client/services/MessageService.java

@@ -33,7 +33,6 @@
 import org.symphonyoss.client.model.Chat;
 import org.symphonyoss.client.model.Room;
 import org.symphonyoss.symphony.clients.model.*;
-import org.symphonyoss.symphony.pod.model.Stream;
 
 import java.util.List;
 import java.util.Set;
@@ -70,7 +69,7 @@ public class MessageService implements DataFeedListener {
     private final Set<ConnectionsEventListener> connectionsEventListeners = ConcurrentHashMap.newKeySet();
     private final Set<String> roomStreamCache = ConcurrentHashMap.newKeySet();
     private final Set<String> chatStreamCache = ConcurrentHashMap.newKeySet();
-    MessageFeedWorker messageFeedWorker;
+    DataFeedWorker dataFeedWorker;
 
 
     /**
@@ -98,9 +97,9 @@ public MessageService(SymphonyClient symClient, ApiVersion apiVersion) {
 
 
         //Lets startup the worker thread to listen for raw datafeed messages
-        messageFeedWorker = new MessageFeedWorker(symClient, this);
+        dataFeedWorker = new DataFeedWorker(symClient, this);
 
-        new Thread(messageFeedWorker).start();
+        new Thread(dataFeedWorker).start();
 
 
     }
@@ -521,9 +520,9 @@ public boolean removeChatListener(ChatListener chatListener) {
      */
     public void shutdown() {
 
-        if (messageFeedWorker != null) {
-            messageFeedWorker.shutdown();
-            messageFeedWorker = null;
+        if (dataFeedWorker != null) {
+            dataFeedWorker.shutdown();
+            dataFeedWorker = null;
         }