Merge pull request #411 from microsoft/trboehre/invoke-and-serializer-fix

Corrected Invoke Activity reply type and Serialization class

Author: tracyboehrer

libraries/bot-builder/src/main/java/com/microsoft/bot/builder/ActivityHandler.java

@@ -69,7 +69,7 @@ public CompletableFuture<Void> onTurn(TurnContext turnContext) {
                         if (invokeResponse != null
                             && turnContext.getTurnState().get(BotFrameworkAdapter.INVOKE_RESPONSE_KEY) == null) {
 
-                            Activity activity = new Activity(ActivityTypes.INVOKE);
+                            Activity activity = new Activity(ActivityTypes.INVOKE_RESPONSE);
                             activity.setValue(invokeResponse);
 
                             return turnContext.sendActivity(activity);

libraries/bot-builder/src/main/java/com/microsoft/bot/builder/TurnContext.java

@@ -142,6 +142,17 @@ static CompletableFuture<ResourceResponse> traceActivity(
      */
     CompletableFuture<ResourceResponse> sendActivity(Activity activity);
 
+    /**
+     * Sends an Activity to the sender of the incoming Activity without
+     * returning a ResourceResponse.
+     *
+     * @param activity The activity to send.
+     * @return A task that represents the work queued to execute.
+     */
+    default CompletableFuture<Void> sendActivityBlind(Activity activity) {
+        return sendActivity(activity).thenApply(aVoid -> null);
+    }
+
     /**
      * Sends a list of activities to the sender of the incoming activity.
      *

libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Activity.java

@@ -771,6 +771,14 @@ public void setAttachments(List<Attachment> withAttachments) {
         this.attachments = withAttachments;
     }
 
+    /**
+     * Sets a single attachment on the Activity.
+     * @param withAttachment The Attachment object.
+     */
+    public void setAttachment(Attachment withAttachment) {
+        setAttachments(Collections.singletonList(withAttachment));
+    }
+
     /**
      * Returns payload version of the Entities in an Activity.
      *
@@ -1194,6 +1202,14 @@ public Activity createTrace(String withName, Object withValue, String withValueT
         return reply;
     }
 
+    /**
+     * Creates a new message activity as a response to this activity.
+     * @return The new message activity.
+     */
+    public Activity createReply() {
+        return createReply(null, null);
+    }
+
     /**
      * Creates a new message activity as a response to this activity.
      *

libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Serialization.java

@@ -4,6 +4,7 @@
 package com.microsoft.bot.schema;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -22,6 +23,7 @@ private Serialization() {
 
     static {
         objectMapper = new ObjectMapper();
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         objectMapper.findAndRegisterModules();
     }