Merge pull request #1044 from watson-developer-cloud/use-updated-core

Use updated core package

Author: lpatino10

.gitignore

@@ -12,6 +12,7 @@ bin/
 *.iml
 *.ipr
 *.iws
+config.properties
 .config.properties
 .checkstyle
 .gradletasknamecache

assistant/build.gradle

@@ -56,8 +56,8 @@ checkstyle {
 
 dependencies {
     compile project(':common')
-    compile 'com.ibm.cloud:sdk-core:1.2.2'
-    testCompile group: 'com.ibm.cloud', name:'sdk-core', version: '1.2.2', classifier: 'tests'
+    testCompile project(':common').sourceSets.test.output
+    compile 'com.ibm.cloud:sdk-core:2.0.0'
     signature 'org.codehaus.mojo.signature:java17:1.0@signature'
 }
 

assistant/src/main/java/com/ibm/watson/assistant/v1/Assistant.java

@@ -15,7 +15,7 @@
 import com.google.gson.JsonObject;
 import com.ibm.cloud.sdk.core.http.RequestBuilder;
 import com.ibm.cloud.sdk.core.http.ServiceCall;
-import com.ibm.cloud.sdk.core.service.WatsonService;
+import com.ibm.cloud.sdk.core.service.BaseService;
 import com.ibm.cloud.sdk.core.service.security.IamOptions;
 import com.ibm.cloud.sdk.core.util.GsonSingleton;
 import com.ibm.cloud.sdk.core.util.ResponseConverterUtils;
@@ -33,7 +33,7 @@
  * @version v2
  * @see <a href="http://www.ibm.com/watson/developercloud/assistant.html">Assistant</a>
  */
-public class Assistant extends WatsonService {
+public class Assistant extends BaseService {
 
   private static final String SERVICE_NAME = "assistant";
   private static final String URL = "https://gateway.watsonplatform.net/assistant/api";
@@ -101,7 +101,7 @@ public ServiceCall<SessionResponse> createSession(CreateSessionOptions createSes
     String[] pathParameters = { createSessionOptions.assistantId() };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
-    builder.query(VERSION, versionDate);
+    builder.query("version", versionDate);
     builder.header("X-IBMCloud-SDK-Analytics",
         "service_name=conversation;service_version=v2;operation_id=createSession");
     return createServiceCall(builder.build(), ResponseConverterUtils.getObject(SessionResponse.class));
@@ -121,7 +121,7 @@ public ServiceCall<Void> deleteSession(DeleteSessionOptions deleteSessionOptions
     String[] pathParameters = { deleteSessionOptions.assistantId(), deleteSessionOptions.sessionId() };
     RequestBuilder builder = RequestBuilder.delete(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
-    builder.query(VERSION, versionDate);
+    builder.query("version", versionDate);
     builder.header("X-IBMCloud-SDK-Analytics",
         "service_name=conversation;service_version=v2;operation_id=deleteSession");
     return createServiceCall(builder.build(), ResponseConverterUtils.getVoid());
@@ -143,7 +143,7 @@ public ServiceCall<MessageResponse> message(MessageOptions messageOptions) {
     String[] pathParameters = { messageOptions.assistantId(), messageOptions.sessionId() };
     RequestBuilder builder = RequestBuilder.post(RequestBuilder.constructHttpUrl(getEndPoint(), pathSegments,
         pathParameters));
-    builder.query(VERSION, versionDate);
+    builder.query("version", versionDate);
     builder.header("X-IBMCloud-SDK-Analytics", "service_name=conversation;service_version=v2;operation_id=message");
     final JsonObject contentJson = new JsonObject();
     if (messageOptions.input() != null) {

assistant/src/main/java/com/ibm/watson/assistant/v2/Assistant.java

@@ -15,7 +15,6 @@
 import com.ibm.cloud.sdk.core.http.ServiceCallback;
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
 import com.ibm.cloud.sdk.core.service.exception.UnauthorizedException;
-import com.ibm.cloud.sdk.core.test.util.RetryRunner;
 import com.ibm.watson.assistant.v1.model.Context;
 import com.ibm.watson.assistant.v1.model.Counterexample;
 import com.ibm.watson.assistant.v1.model.CounterexampleCollection;
@@ -73,6 +72,7 @@
 import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettings;
 import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettingsDisambiguation;
 import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettingsTooling;
+import com.ibm.watson.common.RetryRunner;
 import jersey.repackaged.jsr166e.CompletableFuture;
 import org.junit.Before;
 import org.junit.Ignore;

assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceIT.java

@@ -12,7 +12,7 @@
  */
 package com.ibm.watson.assistant.v1;
 
-import com.ibm.cloud.sdk.core.test.WatsonServiceTest;
+import com.ibm.watson.common.WatsonServiceTest;
 import org.junit.Assume;
 import org.junit.Before;
 

assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantServiceTest.java

@@ -13,7 +13,6 @@
 package com.ibm.watson.assistant.v1;
 
 import com.ibm.cloud.sdk.core.http.HttpHeaders;
-import com.ibm.cloud.sdk.core.test.WatsonServiceUnitTest;
 import com.ibm.watson.assistant.v1.model.Context;
 import com.ibm.watson.assistant.v1.model.CreateCounterexample;
 import com.ibm.watson.assistant.v1.model.CreateDialogNode;
@@ -48,6 +47,7 @@
 import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettings;
 import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettingsDisambiguation;
 import com.ibm.watson.assistant.v1.model.WorkspaceSystemSettingsTooling;
+import com.ibm.watson.common.WatsonServiceUnitTest;
 import okhttp3.mockwebserver.RecordedRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.Before;

assistant/src/test/java/com/ibm/watson/assistant/v1/AssistantTest.java

@@ -13,7 +13,6 @@
 package com.ibm.watson.assistant.v1;
 
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
-import com.ibm.cloud.sdk.core.test.util.RetryRunner;
 import com.ibm.watson.assistant.v1.model.CreateEntityOptions;
 import com.ibm.watson.assistant.v1.model.CreateValue;
 import com.ibm.watson.assistant.v1.model.DeleteEntityOptions;
@@ -24,6 +23,7 @@
 import com.ibm.watson.assistant.v1.model.ListEntitiesOptions;
 import com.ibm.watson.assistant.v1.model.UpdateEntityOptions;
 import com.ibm.watson.assistant.v1.model.ValueExport;
+import com.ibm.watson.common.RetryRunner;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;

assistant/src/test/java/com/ibm/watson/assistant/v1/EntitiesIT.java

@@ -13,7 +13,6 @@
 package com.ibm.watson.assistant.v1;
 
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
-import com.ibm.cloud.sdk.core.test.util.RetryRunner;
 import com.ibm.watson.assistant.v1.model.CreateEntityOptions;
 import com.ibm.watson.assistant.v1.model.CreateSynonymOptions;
 import com.ibm.watson.assistant.v1.model.CreateValueOptions;
@@ -23,6 +22,7 @@
 import com.ibm.watson.assistant.v1.model.Synonym;
 import com.ibm.watson.assistant.v1.model.SynonymCollection;
 import com.ibm.watson.assistant.v1.model.UpdateSynonymOptions;
+import com.ibm.watson.common.RetryRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

assistant/src/test/java/com/ibm/watson/assistant/v1/SynonymsIT.java

@@ -13,7 +13,6 @@
 package com.ibm.watson.assistant.v1;
 
 import com.ibm.cloud.sdk.core.service.exception.NotFoundException;
-import com.ibm.cloud.sdk.core.test.util.RetryRunner;
 import com.ibm.watson.assistant.v1.model.CreateEntityOptions;
 import com.ibm.watson.assistant.v1.model.CreateValueOptions;
 import com.ibm.watson.assistant.v1.model.DeleteValueOptions;
@@ -23,6 +22,7 @@
 import com.ibm.watson.assistant.v1.model.Value;
 import com.ibm.watson.assistant.v1.model.ValueCollection;
 import com.ibm.watson.assistant.v1.model.ValueExport;
+import com.ibm.watson.common.RetryRunner;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;