Replace the endpoint only if it's not in VCAP_SERVICES

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);
   }
 
   /**

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(),

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;
   }
 

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);
   }
 
   /**

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);
   }
 
   /**

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);
   }
 
   /**

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);
   }
 
   /**

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);
   }
 
   /**

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);
   }
 
   /**

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);
   }
 
   /**

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;
   }
 

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);
   }
 
   /**

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;
   }