Remove deprecated services/methods and rename Conversation service class

Author: lpatino10

README.md

@@ -211,7 +211,7 @@ For example, if you have the conversation service in Germany, the Endpoint may b
 You will need to call
 
 ```java
-ConversationService service = new ConversationService("<version-date>");
+Conversation service = new Conversation("<version-date>");
 service.sentEndPoint("https://gateway-fra.watsonplatform.net/conversation/api")
 ```
 

conversation/README.md

@@ -21,7 +21,7 @@
 Use the [Conversation][conversation] service to identify intents, entities, and conduct conversations.
 
 ```java
-ConversationService service = new ConversationService(ConversationService.VERSION_DATE_2017_05_26);
+Conversation service = new Conversation(Conversation.VERSION_DATE_2017_05_26);
 service.setUsernameAndPassword("<username>", "<password>");
 
 InputData input = new InputData.Builder("Hi").build();

…conversation/v1/ConversationService.java …_cloud/conversation/v1/Conversation.javaconversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationService.java renamed to conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/Conversation.java conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationService.java renamed to conversation/src/main/java/com/ibm/watson/developer_cloud/conversation/v1/Conversation.java

@@ -91,7 +91,7 @@
  * @version v1
  * @see <a href="http://www.ibm.com/watson/developercloud/conversation.html">Conversation</a>
  */
-public class ConversationService extends WatsonService {
+public class Conversation extends WatsonService {
 
   private static final String SERVICE_NAME = "conversation";
   private static final String URL = "https://gateway.watsonplatform.net/conversation/api";
@@ -114,7 +114,7 @@ public class ConversationService extends WatsonService {
    * @param versionDate The version date (yyyy-MM-dd) of the REST API to use. Specifying this value will keep your API
    *          calls from failing when the service introduces breaking changes.
    */
-  public ConversationService(String versionDate) {
+  public Conversation(String versionDate) {
     super(SERVICE_NAME);
     if ((getEndPoint() == null) || getEndPoint().isEmpty()) {
       setEndPoint(URL);
@@ -134,7 +134,7 @@ public ConversationService(String versionDate) {
    * @param username the username
    * @param password the password
    */
-  public ConversationService(String versionDate, String username, String password) {
+  public Conversation(String versionDate, String username, String password) {
     this(versionDate);
     setUsernameAndPassword(username, password);
   }

conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationServiceIT.java

@@ -91,7 +91,7 @@
 import jersey.repackaged.jsr166e.CompletableFuture;
 
 /**
- * Integration test for the {@link ConversationService}.
+ * Integration test for the {@link Conversation}.
  */
 @RunWith(RetryRunner.class)
 public class ConversationServiceIT extends ConversationServiceTest {
@@ -105,7 +105,7 @@ public class ConversationServiceIT extends ConversationServiceTest {
    */
   @Test
   public void testReadme() {
-    // ConversationService service = new ConversationService(ConversationService.VERSION_DATE_2017_05_26);
+    // Conversation service = new Conversation(Conversation.VERSION_DATE_2017_05_26);
     // service.setUsernameAndPassword("<username>", "<password>");
 
     InputData input = new InputData.Builder("Hi").build();
@@ -119,7 +119,7 @@ public void testReadme() {
    */
   @Test
   public void testExample() {
-    // ConversationService service = new ConversationService(ConversationService.VERSION_DATE_2017_05_26);
+    // Conversation service = new Conversation(Conversation.VERSION_DATE_2017_05_26);
     // service.setUsernameAndPassword("<username>", "<password>");
 
     InputData input = new InputData.Builder("Hi").build();
@@ -178,7 +178,7 @@ public void accept(OutputData output) {
 
   @Test(expected = UnauthorizedException.class)
   public void pingBadCredentialsThrowsException() {
-    ConversationService badService = new ConversationService(ConversationService.VERSION_DATE_2017_05_26, "foo", "bar");
+    Conversation badService = new Conversation(Conversation.VERSION_DATE_2017_05_26, "foo", "bar");
     MessageOptions options = new MessageOptions.Builder(workspaceId).build();
     badService.message(options).execute();
   }
@@ -223,7 +223,7 @@ public void testSendMessages() throws InterruptedException {
   /**
    * Assert {@link MessageResponse} from service.
    *
-   * @param message the message from the {@link ConversationService}
+   * @param message the message from the {@link Conversation}
    */
   private void assertMessageFromService(MessageResponse message) {
     assertNotNull(message);

conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationServiceTest.java

@@ -21,7 +21,7 @@
 
 public class ConversationServiceTest extends WatsonServiceTest {
 
-  ConversationService service;
+  Conversation service;
   String workspaceId;
 
   /*
@@ -40,7 +40,7 @@ public void setUp() throws Exception {
     Assume.assumeFalse("config.properties doesn't have valid credentials.",
             (username == null) || username.equals(PLACEHOLDER));
 
-    service = new ConversationService(ConversationService.VERSION_DATE_2017_05_26);
+    service = new Conversation(Conversation.VERSION_DATE_2017_05_26);
     service.setEndPoint(getProperty("conversation.v1.url"));
     service.setUsernameAndPassword(username, password);
     service.setDefaultHeaders(getDefaultHeaders());

conversation/src/test/java/com/ibm/watson/developer_cloud/conversation/v1/ConversationTest.java

@@ -59,10 +59,10 @@
 import okhttp3.mockwebserver.RecordedRequest;
 
 /**
- * Unit tests for the {@link ConversationService}.
+ * Unit tests for the {@link Conversation}.
  */
 public class ConversationTest extends WatsonServiceUnitTest {
-  private ConversationService service;
+  private Conversation service;
   private static final String FIXTURE = "src/test/resources/conversation/conversation.json";
   private static final String WORKSPACE_ID = "123";
   private static final String PATH_MESSAGE = "/v1/workspaces/" + WORKSPACE_ID + "/message";
@@ -79,7 +79,7 @@ public class ConversationTest extends WatsonServiceUnitTest {
   @Before
   public void setUp() throws Exception {
     super.setUp();
-    service = new ConversationService(ConversationService.VERSION_DATE_2017_05_26);
+    service = new Conversation(Conversation.VERSION_DATE_2017_05_26);
     service.setApiKey(EMPTY);
     service.setEndPoint(getMockWebServerUrl());
 
@@ -90,15 +90,15 @@ public void setUp() throws Exception {
    */
   @Test(expected = IllegalArgumentException.class)
   public void testConstructorWithNullVersionDate() {
-    new ConversationService(null);
+    new Conversation(null);
   }
 
   /**
    * Negative - Test constructor with empty version date.
    */
   @Test(expected = IllegalArgumentException.class)
   public void testConstructorWithEmptyVersionDate() {
-    new ConversationService("");
+    new Conversation("");
   }
 
   /**
@@ -160,7 +160,7 @@ public void testSendMessage() throws IOException, InterruptedException {
     // first request
     RecordedRequest request = server.takeRequest();
 
-    String path = StringUtils.join(PATH_MESSAGE, "?", VERSION, "=", ConversationService.VERSION_DATE_2017_05_26);
+    String path = StringUtils.join(PATH_MESSAGE, "?", VERSION, "=", Conversation.VERSION_DATE_2017_05_26);
     assertEquals(path, request.getPath());
     assertArrayEquals(new String[]{"Do you want to get a quote?"},
             serviceResponse.getOutput().getText().toArray(new String[0]));
@@ -204,7 +204,7 @@ public void testSendMessageWithAlternateIntents() throws IOException, Interrupte
     // first request
     RecordedRequest request = server.takeRequest();
 
-    String path = StringUtils.join(PATH_MESSAGE, "?", VERSION, "=", ConversationService.VERSION_DATE_2017_05_26);
+    String path = StringUtils.join(PATH_MESSAGE, "?", VERSION, "=", Conversation.VERSION_DATE_2017_05_26);
     assertEquals(path, request.getPath());
     assertArrayEquals(new String[]{"Do you want to get a quote?"},
             serviceResponse.getOutput().getText().toArray(new String[0]));