version bumped to 8.0.6

sureshrupnar · sureshrupnar · commit 605e0e7263ae · 2021-11-29T16:37:36.000+05:30
diff --git a/CHANGES.md b/CHANGES.md
@@ -181,3 +181,11 @@ Major release of chat workflow.  Most interfaces for this changed.  See migratio
 # Nov 8, 2021
 
  - Minor bugfix - KoreAI - JAVA_HOME variable replaced with actual path from System Property
+ 
+# Nov 29, 2021
+
+ - Fix for #264 - For ChatRequest and ChatButton - room exclusion feature
+ - Fix for #262 and #235 - For ChatRequest and ChatButton - rooms parameter
+ - Fix for #260 - We can search user from different POD as well
+ - Fix for #259 - Buttons are now visible on HelpPage
+  
diff --git a/demos/claim-bot/pom.xml b/demos/claim-bot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-chat-workflow-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/demos/demo-app/pom.xml b/demos/demo-app/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -38,7 +38,7 @@
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-app-spring-boot-starter</artifactId>
 			<scope>compile</scope>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
diff --git a/demos/demo-bot/pom.xml b/demos/demo-bot/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -33,13 +33,13 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-api-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>shared-stream-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/demos/todo-bot/pom.xml b/demos/todo-bot/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -24,7 +24,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-chat-workflow-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
diff --git a/libs/bindings/pom.xml b/libs/bindings/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -247,7 +247,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>identity</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- excluded by spring bom, but we need it for jersey-apache-connector -->
diff --git a/libs/chat-workflow/pom.xml b/libs/chat-workflow/pom.xml
@@ -8,7 +8,7 @@
     <parent>
     <groupId>org.finos.symphony.toolkit</groupId>
     <artifactId>symphony-java-toolkit</artifactId>
-    <version>8.0.5-SNAPSHOT</version>
+    <version>8.0.6-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent> 
   
diff --git a/libs/chat-workflow/src/main/java/org/finos/symphony/toolkit/workflow/java/mapping/ChatButtonChatHandlerMapping.java b/libs/chat-workflow/src/main/java/org/finos/symphony/toolkit/workflow/java/mapping/ChatButtonChatHandlerMapping.java
@@ -5,6 +5,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.finos.symphony.toolkit.workflow.actions.Action;
@@ -121,7 +122,7 @@ private boolean canBePerformedHere(FormAction a) {
 			private ChatHandlerExecutor matchesFormAction(FormAction a) {
 				MappingRegistration<?> me = this;
 				
-				if(a.getData().get("form").getClass() == HelpPage.class) {
+				if(Objects.nonNull(a.getData().get("form")) && a.getData().get("form").getClass() == HelpPage.class) {
 					return null;
 				}
 					
diff --git a/libs/chat-workflow/src/main/java/org/finos/symphony/toolkit/workflow/java/mapping/ChatRequestChatHandlerMapping.java b/libs/chat-workflow/src/main/java/org/finos/symphony/toolkit/workflow/java/mapping/ChatRequestChatHandlerMapping.java
@@ -9,6 +9,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -200,7 +201,7 @@ public ChatHandlerExecutor getExecutor(Action a) {
 
 				if (a instanceof FormAction) {
 
-					if (((FormAction) a).getData().get("form").getClass() != HelpPage.class) {
+					if (Objects.nonNull(((FormAction)a).getData().get("form")) && ((FormAction) a).getData().get("form").getClass() != HelpPage.class) {
 						return null;
 					}
 
diff --git a/libs/entity-json/pom.xml b/libs/entity-json/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
diff --git a/libs/identity/pom.xml b/libs/identity/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
diff --git a/libs/quickfix-json/pom.xml b/libs/quickfix-json/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.finos.symphony.toolkit</groupId>
         <artifactId>symphony-java-toolkit</artifactId>
-        <version>8.0.5-SNAPSHOT</version>
+        <version>8.0.6-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
 	
diff --git a/libs/shared-stream-spring-boot-starter/pom.xml b/libs/shared-stream-spring-boot-starter/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -23,19 +23,19 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>bindings</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>identity</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>entity-json</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-api-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
diff --git a/libs/symphony-api-spring-boot-starter/pom.xml b/libs/symphony-api-spring-boot-starter/pom.xml
@@ -10,21 +10,21 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>bindings</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>identity</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/libs/symphony-app-spring-boot-starter/pom.xml b/libs/symphony-app-spring-boot-starter/pom.xml
@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-api-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- used for certificate generation -->
diff --git a/libs/symphony-chat-workflow-spring-boot-starter/pom.xml b/libs/symphony-chat-workflow-spring-boot-starter/pom.xml
@@ -8,7 +8,7 @@
  <parent>
   <groupId>org.finos.symphony.toolkit</groupId>
   <artifactId>symphony-java-toolkit</artifactId>
-  <version>8.0.5-SNAPSHOT</version>
+  <version>8.0.6-SNAPSHOT</version>
   <relativePath>../..</relativePath>
  </parent>
 
@@ -21,17 +21,17 @@
   <dependency>
    <groupId>org.finos.symphony.toolkit</groupId>
    <artifactId>chat-workflow</artifactId>
-   <version>8.0.5-SNAPSHOT</version>
+   <version>8.0.6-SNAPSHOT</version>
   </dependency>
   <dependency>
    <groupId>org.finos.symphony.toolkit</groupId>
    <artifactId>symphony-api-spring-boot-starter</artifactId>
-   <version>8.0.5-SNAPSHOT</version>
+   <version>8.0.6-SNAPSHOT</version>
   </dependency>
   <dependency>
    <groupId>org.finos.symphony.toolkit</groupId>
    <artifactId>shared-stream-spring-boot-starter</artifactId>
-   <version>8.0.5-SNAPSHOT</version>
+   <version>8.0.6-SNAPSHOT</version>
   </dependency>
 
   <!-- allows chat workflow to send attachments -->
diff --git a/libs/symphony-chat-workflow-spring-boot-starter/src/test/java/org/finos/symphony/toolkit/workflow/TestHandlerMapping.java b/libs/symphony-chat-workflow-spring-boot-starter/src/test/java/org/finos/symphony/toolkit/workflow/TestHandlerMapping.java
@@ -4,16 +4,13 @@
 import java.io.FileInputStream;
 import java.nio.charset.Charset;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 
 import org.finos.symphony.toolkit.json.EntityJson;
 import org.finos.symphony.toolkit.workflow.actions.Action;
 import org.finos.symphony.toolkit.workflow.actions.FormAction;
 import org.finos.symphony.toolkit.workflow.actions.SimpleMessageAction;
-import org.finos.symphony.toolkit.workflow.annotations.ChatButton;
 import org.finos.symphony.toolkit.workflow.annotations.ChatRequest;
 import org.finos.symphony.toolkit.workflow.content.Chat;
 import org.finos.symphony.toolkit.workflow.content.CodeBlock;
@@ -24,9 +21,7 @@
 import org.finos.symphony.toolkit.workflow.content.Word;
 import org.finos.symphony.toolkit.workflow.fixture.OurController;
 import org.finos.symphony.toolkit.workflow.fixture.StartClaim;
-import org.finos.symphony.toolkit.workflow.fixture.TestObject;
 import org.finos.symphony.toolkit.workflow.form.ButtonList;
-import org.finos.symphony.toolkit.workflow.form.FormSubmission;
 import org.finos.symphony.toolkit.workflow.java.mapping.ChatHandlerMappingActionConsumer;
 import org.finos.symphony.toolkit.workflow.java.mapping.ChatMapping;
 import org.finos.symphony.toolkit.workflow.java.mapping.ChatRequestChatHandlerMapping;
@@ -49,10 +44,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.util.StreamUtils;
+import org.symphonyoss.Taxonomy;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.symphonyoss.Taxonomy;
 
 
 @SpringBootTest(classes = {
@@ -223,13 +218,14 @@ public void testHelp() throws Exception {
 				+ "      \"type\" : \"org.finos.symphony.toolkit.workflow.help.commandDescription\",\n"
 				+ "      \"version\" : \"1.0\",\n"
 				+ "      \"description\" : \"Display this help page\",\n"
-				+ "      \"examples\" : [ \"help\" ]\n"
+				+ "      \"buttonName\" : \"help\",\n"
+				+ "      \"examples\" : [ \"help\" ],\n"
+				+ "      \"button\" : true\n"
 				+ "    }"));
 		
-		Assertions.assertTrue(msg.getValue().contains("<tr>\n"
-				+ "            <th>Description</th>\n"
-				+ "            <th>Type... </th>\n"
-				+ "          </tr>"));
+		Assertions.assertTrue(msg.getValue().contains("<th>Button</th>"));
+		Assertions.assertTrue(msg.getValue().contains("<th>Or Type... </th>"));
+		Assertions.assertTrue(msg.getValue().contains("<th>Description</th>"));
 
 	}
 	
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>org.finos.symphony.toolkit</groupId>
 	<artifactId>symphony-java-toolkit</artifactId>
-	<version>8.0.5-SNAPSHOT</version>
+	<version>8.0.6-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Symphony Java Toolkit</name>
 	<description>A collection of Java projects for building Symphony bots and apps</description>
diff --git a/tools/koreai/pom.xml b/tools/koreai/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.finos.symphony.toolkit</groupId>
 		<artifactId>symphony-java-toolkit</artifactId>
-		<version>8.0.5-SNAPSHOT</version>
+		<version>8.0.6-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
@@ -25,17 +25,17 @@
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>symphony-api-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>entity-json</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.finos.symphony.toolkit</groupId>
 			<artifactId>shared-stream-spring-boot-starter</artifactId>
-			<version>8.0.5-SNAPSHOT</version>
+			<version>8.0.6-SNAPSHOT</version>
 		</dependency>
 
 		<!-- allows shared stream coordination -->
diff --git a/tools/poll-bot/pom.xml b/tools/poll-bot/pom.xml
diff --git a/tools/reminder-bot/pom.xml b/tools/reminder-bot/pom.xml
diff --git a/tools/rss-bot/pom.xml b/tools/rss-bot/pom.xml
diff --git a/tools/symphony-maven-build-reporter/pom.xml b/tools/symphony-maven-build-reporter/pom.xml
diff --git a/tools/teamcity-symphony-integration/build/pom.xml b/tools/teamcity-symphony-integration/build/pom.xml
diff --git a/tools/teamcity-symphony-integration/pom.xml b/tools/teamcity-symphony-integration/pom.xml
diff --git a/tools/teamcity-symphony-integration/teamcity-symphony-integration-server/pom.xml b/tools/teamcity-symphony-integration/teamcity-symphony-integration-server/pom.xml
