Remove health check feature

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

@@ -11,11 +11,9 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.microsoft.bot.connector.ConnectorClient;
 import com.microsoft.bot.schema.Activity;
 import com.microsoft.bot.schema.ActivityTypes;
 import com.microsoft.bot.schema.ChannelAccount;
-import com.microsoft.bot.schema.HealthCheckResponse;
 import com.microsoft.bot.schema.MessageReaction;
 import com.microsoft.bot.schema.ResourceResponse;
 import com.microsoft.bot.schema.SignInConstants;
@@ -415,10 +413,6 @@ protected CompletableFuture<InvokeResponse> onInvokeActivity(TurnContext turnCon
                     }
                     return new InvokeResponse(HttpURLConnection.HTTP_INTERNAL_ERROR, null);
                 });
-        } else if (StringUtils.equals(turnContext.getActivity().getName(), "healthCheck")) {
-            CompletableFuture<InvokeResponse> result = new CompletableFuture<>();
-            result.complete(new InvokeResponse(HttpURLConnection.HTTP_OK, onHealthCheck(turnContext)));
-            return result;
         }
 
         CompletableFuture<InvokeResponse> result = new CompletableFuture<>();
@@ -450,18 +444,6 @@ protected CompletableFuture<Void> onSignInInvoke(TurnContext turnContext) {
         return result;
     }
 
-    /**
-     * Invoked when a 'healthCheck' event is
-     * received when the base behavior of onInvokeActivity is used.
-     *
-     * @param turnContext The current TurnContext.
-     * @return A task that represents a HealthCheckResponse.
-     */
-    protected CompletableFuture<HealthCheckResponse> onHealthCheck(TurnContext turnContext) {
-        ConnectorClient client = turnContext.getTurnState().get(BotFrameworkAdapter.CONNECTOR_CLIENT_KEY);
-        return CompletableFuture.completedFuture(HealthCheck.createHealthCheckResponse(client));
-    }
-
     /**
      * Creates a success InvokeResponse with the specified body.
      *

libraries/bot-builder/src/test/java/com/microsoft/bot/builder/ActivityHandlerTests.java

@@ -10,9 +10,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicReference;
-import org.mockito.internal.matchers.Not;
 
 public class ActivityHandlerTests {
     @Test
@@ -428,98 +425,6 @@ public void TestUnrecognizedActivityType() {
         Assert.assertEquals("onUnrecognizedActivityType", bot.getRecord().get(0));
     }
 
-    @Test
-    public void TestHealthCheckAsyncOverride() {
-        Activity activity = new Activity() {
-            {
-                setType(ActivityTypes.INVOKE);
-                setName("healthCheck");
-            }
-        };
-
-        TurnContext turnContext = new TurnContextImpl(new TestInvokeAdapter(), activity);
-
-        TestActivityHandler bot = new TestActivityHandler();
-        bot.onTurn(turnContext).join();
-
-        Assert.assertEquals(2, bot.getRecord().size());
-        Assert.assertEquals("onInvokeActivity", bot.getRecord().get(0));
-        Assert.assertEquals("onHealthCheck", bot.getRecord().get(1));
-    }
-
-    @Test
-    public void TestHealthCheckAsync() {
-        Activity activity = new Activity() {
-            {
-                setType(ActivityTypes.INVOKE);
-                setName("healthCheck");
-            }
-        };
-
-        AtomicReference<List<Activity>> activitiesToSend = new AtomicReference<>();
-        TurnContext turnContext = new TurnContextImpl(new SimpleAdapter(activitiesToSend::set), activity);
-
-        ActivityHandler bot = new ActivityHandler();
-        bot.onTurn(turnContext).join();
-
-        Assert.assertNotNull(activitiesToSend.get());
-        Assert.assertEquals(1, activitiesToSend.get().size());
-        Assert.assertTrue(activitiesToSend.get().get(0).getValue() instanceof InvokeResponse);
-        Assert.assertEquals(200, ((InvokeResponse) activitiesToSend.get().get(0).getValue()).getStatus());
-        CompletableFuture future = ((CompletableFuture) ((InvokeResponse) activitiesToSend.get().get(0).getValue())
-                .getBody());
-        HealthCheckResponse result = new HealthCheckResponse();
-        result = (HealthCheckResponse) future.join();
-        Assert.assertTrue(result.getHealthResults().getSuccess());
-        String[] messages = result.getHealthResults().getMessages();
-        Assert.assertEquals(messages[0], "Health check succeeded.");
-    }
-
-    @Test
-    public void TestHealthCheckWithConnectorAsync() {
-        Activity activity = new Activity() {
-            {
-                setType(ActivityTypes.INVOKE);
-                setName("healthCheck");
-            }
-        };
-
-        AtomicReference<List<Activity>> activitiesToSend = new AtomicReference<>();
-        TurnContext turnContext = new TurnContextImpl(new SimpleAdapter(activitiesToSend::set), activity);
-        MockConnectorClient mockConnector = new MockConnectorClient("Windows/3.1", new MockAppCredentials("awesome"));
-        turnContext.getTurnState().add(BotFrameworkAdapter.CONNECTOR_CLIENT_KEY, mockConnector);
-        ActivityHandler bot = new ActivityHandler();
-        bot.onTurn(turnContext).join();
-
-        Assert.assertNotNull(activitiesToSend.get());
-        Assert.assertEquals(1, activitiesToSend.get().size());
-        Assert.assertTrue(activitiesToSend.get().get(0).getValue() instanceof InvokeResponse);
-        Assert.assertEquals(
-            200,
-            ((InvokeResponse) activitiesToSend.get().get(0).getValue()).getStatus()
-        );
-        CompletableFuture<HealthCheckResponse> future =
-            ((CompletableFuture<HealthCheckResponse>)
-            ((InvokeResponse) activitiesToSend.get().get(0).getValue()).getBody());
-        HealthCheckResponse result = new HealthCheckResponse();
-        result = (HealthCheckResponse) future.join();
-        Assert.assertTrue(result.getHealthResults().getSuccess());
-        Assert.assertEquals(result.getHealthResults().getAuthorization(), "awesome");
-        Assert.assertEquals(result.getHealthResults().getUserAgent(), "Windows/3.1");
-        String[] messages = result.getHealthResults().getMessages();
-        Assert.assertEquals(messages[0], "Health check succeeded.");
-    }
-
-    private static class TestInvokeAdapter extends NotImplementedAdapter {
-        @Override
-        public CompletableFuture<ResourceResponse[]> sendActivities(
-            TurnContext context,
-            List<Activity> activities
-        ) {
-            return CompletableFuture.completedFuture(new ResourceResponse[0]);
-        }
-    }
-
     private static class NotImplementedAdapter extends BotAdapter {
         @Override
         public CompletableFuture<ResourceResponse[]> sendActivities(
@@ -635,12 +540,6 @@ protected CompletableFuture<InvokeResponse> onInvokeActivity(TurnContext turnCon
             return super.onInvokeActivity(turnContext);
         }
 
-        @Override
-        protected CompletableFuture<HealthCheckResponse> onHealthCheck(TurnContext turnContext) {
-            record.add("onHealthCheck");
-            return super.onHealthCheck(turnContext);
-        }
-
         @Override
         protected CompletableFuture onInstallationUpdate(TurnContext turnContext) {
             record.add("onInstallationUpdate");