Merge pull request #78 from merative/dlangst2

fix: bump core and okhttp3 to avoid CVE

Author: dlangst

modules/annotator-for-clinical-data/src/test/java/com/ibm/watson/health/acd/v1/AnnotatorForClinicaDataIT.java renamed to modules/annotator-for-clinical-data/src/test/java/com/ibm/watson/health/acd/v1/AnnotatorForClinicalDataIT.java

@@ -36,7 +36,7 @@
 import com.ibm.watson.health.acd.v1.cartridges.TestGetCartridgesCartridgeId;
 import com.ibm.watson.health.acd.v1.cartridges.TestUpdateCartridges;
 import com.ibm.watson.health.acd.v1.status.TestGetHealthCheckStatus;
-import com.ibm.watson.health.acd.v1.unit.AnnotatorForClinicalDataAcdTest;;
+import com.ibm.watson.health.acd.v1.unit.AnnotatorForClinicalDataAcdTest;
 
 
 
@@ -66,6 +66,6 @@
 })
 
 
-public class AnnotatorForClinicaDataIT {
+public class AnnotatorForClinicalDataIT {
 
 }

modules/examples/src/main/java/com/ibm/watson/health/acd/v1/AnnotatorForClinicalDataExample.java

@@ -21,8 +21,8 @@
 
 import com.ibm.cloud.sdk.core.http.Response;
 import com.ibm.cloud.sdk.core.http.ServiceCall;
-import com.ibm.cloud.sdk.core.security.Authenticator;
-import com.ibm.cloud.sdk.core.security.BasicAuthenticator;
+import com.ibm.cloud.sdk.core.security.BearerTokenAuthenticator;
+//import com.ibm.cloud.sdk.core.http.HttpConfigOptions;
 import com.ibm.watson.health.acd.v1.model.AcdCartridges;
 import com.ibm.watson.health.acd.v1.model.AcdCartridgesList;
 import com.ibm.watson.health.acd.v1.model.AcdFlow;
@@ -45,33 +45,30 @@
 /**
  * Sample ACD Java SDK Calls
  *
- * NOTE: To run this sample class, replace "YOUR_APIKEY" below with your apikey
- * for the Annotator for Clinical Data (ACD) service. Also, make sure the "url"
- * reflects the ACD service instance.
+ * NOTE: To run this sample class, replace "ACD_TOKEN" below with your ACD bearer token,
+ * and replace "ACD_URL" with the URL for the Annotator for Clinical Data (ACD) service endpoint.
  *
- * Optional: Update the "version" if you require a specific version of ACD.
+ * Optional: Update the "version" variable if you require a specific version of ACD.
  */
 public class AnnotatorForClinicalDataExample {
 
   protected AnnotatorForClinicalDataExample() { }
 
   public static void main(String[] args) throws Exception {
-    String apikey = "YOUR_APIKEY";
-    //String url = "https://us-east.wh-acd.cloud.ibm.com/wh-acd/api";
-    String url = "https://us-south.wh-acd.cloud.ibm.com/wh-acd/api";
+    String authToken = "ACD_TOKEN";
+    String url = "ACD_URL";
     String version = "2022-02-24";
     AnnotatorForClinicalData acd = null;
 
-    Authenticator authenticator = new BasicAuthenticator.Builder()
-        .username("apikey")
-        .password(apikey)
-        .build();
-
+    BearerTokenAuthenticator authenticator = new BearerTokenAuthenticator(authToken);
     acd = new AnnotatorForClinicalData(
         version,
         AnnotatorForClinicalData.DEFAULT_SERVICE_NAME,
         authenticator);
     acd.setServiceUrl(url);
+    // Uncomment the next 2 lines to disable SSL verification - not recommended
+    //HttpConfigOptions options = new HttpConfigOptions.Builder().disableSslVerification(true).build();
+    //acd.configureClient(options);
 
 
 

pom.xml

@@ -28,7 +28,7 @@
         <!-- This is the version associated with the Java core. The version used
             here should be compatible with the version of the SDK generator used to generate
             your SDK code.  -->
-        <sdk-core-version>9.17.4</sdk-core-version>
+        <sdk-core-version>9.17.5</sdk-core-version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <!-- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> -->
@@ -38,7 +38,7 @@
   	<!-- <git-repository-name>whcs-java-sdk</git-repository-name> -->
         <nexus-staging-plugin-version>1.6.8</nexus-staging-plugin-version>
         <testng-version>7.4.0</testng-version>
-        <okhttp3-version>4.9.1</okhttp3-version>
+        <okhttp3-version>4.10.0</okhttp3-version>
         <surefire-version>3.0.0-M3</surefire-version>
         <jacoco-plugin-version>0.8.5</jacoco-plugin-version>
         <maven-gpg-plugin-version>3.0.1</maven-gpg-plugin-version>