Refactored restclient to remove uneeded code (#895)

microsoft · Jan 7, 2021 · 1eca556 · 1eca556
1 parent 398ecc6
commit 1eca556
Show file tree

Hide file tree

Showing 126 changed files with 485 additions and 4,614 deletions.
diff --git a/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
@@ -41,7 +41,7 @@
 import com.microsoft.bot.schema.TokenExchangeState;
 import com.microsoft.bot.schema.TokenResponse;
 import com.microsoft.bot.schema.TokenStatus;
-import com.microsoft.bot.rest.retry.RetryStrategy;
+import com.microsoft.bot.restclient.retry.RetryStrategy;
 import java.util.Collections;
 import org.apache.commons.lang3.StringUtils;
 

diff --git a/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/MemoryConnectorClient.java b/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/MemoryConnectorClient.java
@@ -3,8 +3,8 @@
 import com.microsoft.bot.connector.Attachments;
 import com.microsoft.bot.connector.ConnectorClient;
 import com.microsoft.bot.connector.Conversations;
-import com.microsoft.bot.rest.RestClient;
-import com.microsoft.bot.rest.credentials.ServiceClientCredentials;
+import com.microsoft.bot.restclient.RestClient;
+import com.microsoft.bot.restclient.credentials.ServiceClientCredentials;
 
 public class MemoryConnectorClient implements ConnectorClient {
     private MemoryConversations conversations = new MemoryConversations();

diff --git a/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/MockConnectorClient.java b/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/MockConnectorClient.java
@@ -4,8 +4,8 @@
 import com.microsoft.bot.connector.ConnectorClient;
 import com.microsoft.bot.connector.Conversations;
 import com.microsoft.bot.connector.authentication.AppCredentials;
-import com.microsoft.bot.rest.RestClient;
-import com.microsoft.bot.rest.credentials.ServiceClientCredentials;
+import com.microsoft.bot.restclient.RestClient;
+import com.microsoft.bot.restclient.credentials.ServiceClientCredentials;
 
 public class MockConnectorClient implements ConnectorClient {
 

diff --git a/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/TurnContextTests.java b/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/TurnContextTests.java
@@ -8,13 +8,13 @@
 import com.microsoft.bot.connector.Attachments;
 import com.microsoft.bot.connector.ConnectorClient;
 import com.microsoft.bot.connector.Conversations;
-import com.microsoft.bot.rest.credentials.ServiceClientCredentials;
+import com.microsoft.bot.restclient.credentials.ServiceClientCredentials;
 import com.microsoft.bot.schema.Activity;
 import com.microsoft.bot.schema.ActivityTypes;
 import com.microsoft.bot.schema.ConversationAccount;
 import com.microsoft.bot.schema.ConversationReference;
 import com.microsoft.bot.schema.ResourceResponse;
-import com.microsoft.bot.rest.RestClient;
+import com.microsoft.bot.restclient.RestClient;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/base/TestBase.java b/libraries/bot-builder/src/test/java/com/microsoft/bot/builder/base/TestBase.java
@@ -4,13 +4,13 @@
 package com.microsoft.bot.builder.base;
 
 import com.microsoft.bot.connector.authentication.MicrosoftAppCredentials;
-import com.microsoft.bot.rest.LogLevel;
-import com.microsoft.bot.rest.RestClient;
-import com.microsoft.bot.rest.ServiceResponseBuilder;
-import com.microsoft.bot.rest.credentials.ServiceClientCredentials;
-import com.microsoft.bot.rest.credentials.TokenCredentials;
-import com.microsoft.bot.rest.interceptors.LoggingInterceptor;
-import com.microsoft.bot.rest.serializer.JacksonAdapter;
+import com.microsoft.bot.restclient.LogLevel;
+import com.microsoft.bot.restclient.RestClient;
+import com.microsoft.bot.restclient.ServiceResponseBuilder;
+import com.microsoft.bot.restclient.credentials.ServiceClientCredentials;
+import com.microsoft.bot.restclient.credentials.TokenCredentials;
+import com.microsoft.bot.restclient.interceptors.LoggingInterceptor;
+import com.microsoft.bot.restclient.serializer.JacksonAdapter;
 import org.junit.*;
 import org.junit.rules.TestName;
 

diff --git a/.../bot-builder/src/test/java/com/microsoft/bot/builder/teams/TeamsActivityHandlerTests.java b/.../bot-builder/src/test/java/com/microsoft/bot/builder/teams/TeamsActivityHandlerTests.java
@@ -15,7 +15,7 @@
 import com.microsoft.bot.connector.Conversations;
 import com.microsoft.bot.connector.authentication.AppCredentials;
 import com.microsoft.bot.connector.authentication.MicrosoftAppCredentials;
-import com.microsoft.bot.rest.serializer.JacksonAdapter;
+import com.microsoft.bot.restclient.serializer.JacksonAdapter;
 import com.microsoft.bot.schema.Activity;
 import com.microsoft.bot.schema.ActivityTypes;
 import com.microsoft.bot.schema.ChannelAccount;

diff --git a/libraries/bot-connector/pom.xml b/libraries/bot-connector/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>20.0</version>
+      <version>30.1-jre</version>
     </dependency>
     <dependency>
       <groupId>com.squareup.retrofit2</groupId>
@@ -174,7 +174,7 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
             <configuration>
-              <excludes>com/microsoft/bot/rest/**,com/microsoft/bot/azure/**</excludes>
+              <excludes>com/microsoft/bot/restclient/**</excludes>
             </configuration>
           </plugin>
         </plugins>

diff --git a/libraries/bot-connector/src/main/java/com/microsoft/bot/azure/AzureAsyncOperation.java b/libraries/bot-connector/src/main/java/com/microsoft/bot/azure/AzureAsyncOperation.java