From 28e5d609c1a642ed7462b55464bf7904ae2c367b Mon Sep 17 00:00:00 2001 From: German Attanasio Ruiz Date: Mon, 1 Aug 2016 14:16:52 -0400 Subject: [PATCH] :bug: replace the endpoint only if it's not in VCAP_SERVICES --- .../developer_cloud/concept_insights/v2/ConceptInsights.java | 3 ++- .../conversation/v1_experimental/ConversationService.java | 2 +- .../document_conversion/v1/DocumentConversion.java | 3 ++- .../language_translation/v2/LanguageTranslation.java | 3 ++- .../v1/NaturalLanguageClassifier.java | 3 ++- .../personality_insights/v2/PersonalityInsights.java | 3 ++- .../developer_cloud/retrieve_and_rank/v1/RetrieveAndRank.java | 3 ++- .../com/ibm/watson/developer_cloud/service/AlchemyService.java | 3 ++- .../watson/developer_cloud/speech_to_text/v1/SpeechToText.java | 3 ++- .../watson/developer_cloud/text_to_speech/v1/TextToSpeech.java | 3 ++- .../watson/developer_cloud/tone_analyzer/v3/ToneAnalyzer.java | 3 ++- .../tradeoff_analytics/v1/TradeoffAnalytics.java | 3 ++- .../visual_recognition/v3/VisualRecognition.java | 3 ++- 13 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsights.java b/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsights.java index 6cc8d15fd7a..48a6a9f16e1 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsights.java +++ b/src/main/java/com/ibm/watson/developer_cloud/concept_insights/v2/ConceptInsights.java @@ -147,7 +147,8 @@ public class ConceptInsights extends WatsonService { */ public ConceptInsights() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/conversation/v1_experimental/ConversationService.java b/src/main/java/com/ibm/watson/developer_cloud/conversation/v1_experimental/ConversationService.java index 974bf2ce12d..ef997630c39 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/conversation/v1_experimental/ConversationService.java +++ b/src/main/java/com/ibm/watson/developer_cloud/conversation/v1_experimental/ConversationService.java @@ -49,7 +49,7 @@ public final class ConversationService extends WatsonService { */ public ConversationService(final String versionDate) { super(SERVICE_NAME); - if (getEndPoint() == null) + if (getEndPoint() == null || getEndPoint().isEmpty()) setEndPoint(URL); Validator.isTrue(versionDate != null && !versionDate.isEmpty(), diff --git a/src/main/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversion.java b/src/main/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversion.java index 46ba6611d9e..76b2fbb3bd7 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversion.java +++ b/src/main/java/com/ibm/watson/developer_cloud/document_conversion/v1/DocumentConversion.java @@ -76,7 +76,8 @@ public class DocumentConversion extends WatsonService { */ public DocumentConversion(String versionDate) { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); this.versionDate = versionDate; } diff --git a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java index b19c87c657e..d012a2e4100 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java +++ b/src/main/java/com/ibm/watson/developer_cloud/language_translation/v2/LanguageTranslation.java @@ -83,7 +83,8 @@ public class LanguageTranslation extends WatsonService { */ public LanguageTranslation() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifier.java b/src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifier.java index 55f3a0ee02a..85d010c6bbd 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifier.java +++ b/src/main/java/com/ibm/watson/developer_cloud/natural_language_classifier/v1/NaturalLanguageClassifier.java @@ -62,7 +62,8 @@ public class NaturalLanguageClassifier extends WatsonService { */ public NaturalLanguageClassifier() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsights.java b/src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsights.java index 23b3aa85ae6..89d039d98e8 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsights.java +++ b/src/main/java/com/ibm/watson/developer_cloud/personality_insights/v2/PersonalityInsights.java @@ -47,7 +47,8 @@ public class PersonalityInsights extends WatsonService { */ public PersonalityInsights() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRank.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRank.java index 86fae949d4d..0269e0f2816 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRank.java +++ b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRank.java @@ -83,7 +83,8 @@ public class RetrieveAndRank extends WatsonService implements ClusterLifecycleMa */ public RetrieveAndRank() { super("retrieve_and_rank"); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/service/AlchemyService.java b/src/main/java/com/ibm/watson/developer_cloud/service/AlchemyService.java index 39ebda69e74..a30abb28b07 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/service/AlchemyService.java +++ b/src/main/java/com/ibm/watson/developer_cloud/service/AlchemyService.java @@ -58,7 +58,8 @@ public abstract class AlchemyService extends WatsonService { */ public AlchemyService() { super(SERVICE_NAME); - setEndPoint(ENDPOINT); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(ENDPOINT); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToText.java b/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToText.java index e3c57a43808..f96d2f57e33 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToText.java +++ b/src/main/java/com/ibm/watson/developer_cloud/speech_to_text/v1/SpeechToText.java @@ -82,7 +82,8 @@ public class SpeechToText extends WatsonService { */ public SpeechToText() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeech.java b/src/main/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeech.java index 7a950631d82..129179b86b6 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeech.java +++ b/src/main/java/com/ibm/watson/developer_cloud/text_to_speech/v1/TextToSpeech.java @@ -75,7 +75,8 @@ public class TextToSpeech extends WatsonService { */ public TextToSpeech() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzer.java b/src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzer.java index 505acc44361..aea7733a3a9 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzer.java +++ b/src/main/java/com/ibm/watson/developer_cloud/tone_analyzer/v3/ToneAnalyzer.java @@ -59,7 +59,8 @@ public class ToneAnalyzer extends WatsonService { */ public ToneAnalyzer(String versionDate) { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); this.versionDate = versionDate; } diff --git a/src/main/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalytics.java b/src/main/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalytics.java index 2ffa841c0d0..fa5bc1fda31 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalytics.java +++ b/src/main/java/com/ibm/watson/developer_cloud/tradeoff_analytics/v1/TradeoffAnalytics.java @@ -46,7 +46,8 @@ public class TradeoffAnalytics extends WatsonService { */ public TradeoffAnalytics() { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); } /** diff --git a/src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/VisualRecognition.java b/src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/VisualRecognition.java index 3556f76101a..4cfb0d924d9 100644 --- a/src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/VisualRecognition.java +++ b/src/main/java/com/ibm/watson/developer_cloud/visual_recognition/v3/VisualRecognition.java @@ -85,7 +85,8 @@ public class VisualRecognition extends WatsonService { */ public VisualRecognition(String versionDate) { super(SERVICE_NAME); - setEndPoint(URL); + if (getEndPoint() == null || getEndPoint().isEmpty()) + setEndPoint(URL); Validator.notNull(versionDate, "versionDate cannot be null. Use '2016-05-19'"); this.versionDate = versionDate; }