Skip to content

Commit 9bd0308

Browse files
committed
Added default configuration check
1 parent 4c7b1d3 commit 9bd0308

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

src/com/ibm/cto/Configuration.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ public static Configuration getInstance() {
5252
if(CONVERSATION_WORKSPACE_STRING == null) {
5353
System.out.println("### No environment variables, using default hardcode settings ###");
5454

55-
// TODO: If you're testing this application locally, please get the credentials from Bluemix
55+
// TODO: [Required] Blockchain API Endpoint
56+
instance.APPLICATION_API_URL = "https://webchatbot-blockchain.mybluemix.net/api/order/newinfo";
57+
// TODO: [Required] Visual Recognition API key and trained classifier ID
58+
instance.VISUAL_RECOGNITION_API_KEY = "";
59+
instance.VISUAL_RECOGNITION_CLASSIFIER_ID = "";
60+
61+
// [Optional] If you're testing this application locally, please get the credentials from Bluemix
5662
instance.TEXT_TO_SPEECH_USERNAME = "";
5763
instance.TEXT_TO_SPEECH_PASSWORD = "";
5864
instance.SPEECH_TO_TEXT_USERNAME = "";
@@ -61,11 +67,6 @@ public static Configuration getInstance() {
6167
instance.CONVERSATION_PASSWORD = "";
6268
instance.CONVERSATION_WORKSPACE_ID = "";
6369

64-
// Blockchain URL:
65-
instance.APPLICATION_API_URL = "https://blockchainlab01.mybluemix.net/api/order/newinfo";
66-
instance.VISUAL_RECOGNITION_API_KEY = "";
67-
instance.VISUAL_RECOGNITION_CLASSIFIER_ID = "";
68-
6970
return instance;
7071
}
7172
else {
@@ -164,12 +165,19 @@ public static JSONObject getObjectSettings(String key) {
164165

165166
public String getLayout() {
166167
if(instance.TEXT_TO_SPEECH_USERNAME == "" ||
167-
instance.TEXT_TO_SPEECH_PASSWORD == "" ||
168+
instance.TEXT_TO_SPEECH_USERNAME == "your_username" ||
169+
instance.TEXT_TO_SPEECH_PASSWORD == "" ||
170+
instance.TEXT_TO_SPEECH_PASSWORD == "your_password" ||
168171
instance.SPEECH_TO_TEXT_USERNAME == "" ||
172+
instance.SPEECH_TO_TEXT_USERNAME == "your_username" ||
169173
instance.SPEECH_TO_TEXT_PASSWORD == "" ||
174+
instance.SPEECH_TO_TEXT_PASSWORD == "your_password" ||
170175
instance.CONVERSATION_USERNAME == "" ||
176+
instance.CONVERSATION_USERNAME == "your_username" ||
171177
instance.CONVERSATION_PASSWORD == "" ||
172-
instance.CONVERSATION_WORKSPACE_ID == "")
178+
instance.CONVERSATION_PASSWORD == "your_password" ||
179+
instance.CONVERSATION_WORKSPACE_ID == "" ||
180+
instance.CONVERSATION_WORKSPACE_ID == "your_work_space_id")
173181
{
174182
return "non-conversation";
175183
}

0 commit comments

Comments
 (0)