Merge pull request #364 from gcheng/mooncake

Update STS end point handling logic in service bus configuration.

microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusConnectionSettings.java

@@ -1,11 +1,11 @@
 /**
  * Copyright Microsoft Corporation
- *
+ * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * 
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -15,29 +15,30 @@
 
 package com.microsoft.windowsazure.services.serviceBus.implementation;
 
-import com.microsoft.windowsazure.services.core.utils.ConnectionStringSyntaxException;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import com.microsoft.windowsazure.services.core.utils.ConnectionStringSyntaxException;
+
 /**
  * Class that encapsulates all the various settings needed
  * to connect to Service Bus, provided via either a
  * connection string or via separate configuration variables.
  * <p/>
- * The connection string is looked for first, falling back
- * to separate config values if not found.
+ * The connection string is looked for first, falling back to separate config values if not found.
  */
 class ServiceBusConnectionSettings {
     private String uri;
     private String wrapUri;
     private String wrapName;
     private String wrapPassword;
 
-    public ServiceBusConnectionSettings(String connectionString, String uri, String wrapUri, String wrapName, String wrapPassword) throws ConnectionStringSyntaxException, URISyntaxException {
+    public ServiceBusConnectionSettings(String connectionString, String uri, String wrapUri, String wrapName,
+            String wrapPassword) throws ConnectionStringSyntaxException, URISyntaxException {
         if (connectionString != null) {
             parseConnectionString(connectionString);
-        } else {
+        }
+        else {
             this.uri = uri;
             this.wrapUri = wrapUri;
             this.wrapName = wrapName;
@@ -61,7 +62,8 @@ public String getWrapPassword() {
         return wrapPassword;
     }
 
-    private boolean parseConnectionString(String connectionString) throws URISyntaxException, ConnectionStringSyntaxException {
+    private boolean parseConnectionString(String connectionString) throws URISyntaxException,
+            ConnectionStringSyntaxException {
         ServiceBusConnectionString cs = new ServiceBusConnectionString(connectionString);
         setUri(cs);
         setWrapUri(cs);
@@ -79,8 +81,9 @@ private void setWrapUri(ServiceBusConnectionString connectionString) throws URIS
             URI hostUri = new URI(uri);
             String namespace = hostUri.getHost().split("\\.")[0];
             wrapUri = "https://" + namespace + "-sb.accesscontrol.windows.net/WRAPv0.9";
-        } else {
-            wrapUri = connectionString.getStsEndpoint();
+        }
+        else {
+            wrapUri = connectionString.getStsEndpoint().replaceAll("\\/$", "") + "/WRAPv0.9";
         }
     }
 }