refactor(core): Add null check for old API key during service init

lpatino10 · lpatino10 · commit 0899f1203d65 · 2019-01-09T08:54:02.000-05:00
diff --git a/core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java b/core/src/main/java/com/ibm/watson/developer_cloud/service/WatsonService.java
@@ -131,7 +131,7 @@ private void setCredentialFields(CredentialUtils.ServiceCredentials serviceCrede
 
     if ((serviceCredentials.getUsername() != null) && (serviceCredentials.getPassword() != null)) {
       setUsernameAndPassword(serviceCredentials.getUsername(), serviceCredentials.getPassword());
-    } else {
+    } else if (serviceCredentials.getOldApiKey() != null) {
       setApiKey(serviceCredentials.getOldApiKey());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private void setCredentialFields(CredentialUtils.ServiceCredentials serviceCrede`
`131`	`131`
`132`	`132`	`if ((serviceCredentials.getUsername() != null) && (serviceCredentials.getPassword() != null)) {`
`133`	`133`	`setUsernameAndPassword(serviceCredentials.getUsername(), serviceCredentials.getPassword());`
`134`		`- } else {`
	`134`	`+ } else if (serviceCredentials.getOldApiKey() != null) {`
`135`	`135`	`setApiKey(serviceCredentials.getOldApiKey());`
`136`	`136`	`}`
`137`	`137`