Merge branch 'release' of https://github.com/WindowsAzure/azure-sdk-f…

…or-java-pr into release
gcheng · May 17, 2013 · f4ae1b8 · f4ae1b8
2 parents 2a3347e + d618563
commit f4ae1b8
Show file tree

Hide file tree

Showing 13 changed files with 2,444 additions and 173 deletions.
diff --git a/...-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java b/...-api/src/main/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusContract.java
diff --git a/...crosoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java b/...crosoft/windowsazure/services/serviceBus/implementation/ServiceBusExceptionProcessor.java
@@ -238,6 +238,19 @@ public ListQueuesResult listQueues() throws ServiceException {
         }
     }
 
+    @Override
+    public QueueInfo updateQueue(QueueInfo queueInfo) throws ServiceException {
+        try {
+            return next.updateQueue(queueInfo);
+        }
+        catch (UniformInterfaceException e) {
+            throw processCatch(new ServiceException(e));
+        }
+        catch (ClientHandlerException e) {
+            throw processCatch(new ServiceException(e));
+        }
+    }
+
     @Override
     public CreateTopicResult createTopic(TopicInfo topic) throws ServiceException {
         try {
@@ -290,6 +303,19 @@ public ListTopicsResult listTopics() throws ServiceException {
         }
     }
 
+    @Override
+    public TopicInfo updateTopic(TopicInfo topicInfo) throws ServiceException {
+        try {
+            return next.updateTopic(topicInfo);
+        }
+        catch (UniformInterfaceException e) {
+            throw processCatch(new ServiceException(e));
+        }
+        catch (ClientHandlerException e) {
+            throw processCatch(new ServiceException(e));
+        }
+    }
+
     @Override
     public CreateSubscriptionResult createSubscription(String topicPath, SubscriptionInfo subscription)
             throws ServiceException {
@@ -343,6 +369,20 @@ public ListSubscriptionsResult listSubscriptions(String topicPath) throws Servic
         }
     }
 
+    @Override
+    public SubscriptionInfo updateSubscription(String topicName, SubscriptionInfo subscriptionInfo)
+            throws ServiceException {
+        try {
+            return next.updateSubscription(topicName, subscriptionInfo);
+        }
+        catch (UniformInterfaceException e) {
+            throw processCatch(new ServiceException(e));
+        }
+        catch (ClientHandlerException e) {
+            throw processCatch(new ServiceException(e));
+        }
+    }
+
     @Override
     public CreateRuleResult createRule(String topicPath, String subscriptionName, RuleInfo rule)
             throws ServiceException {
@@ -489,4 +529,31 @@ public ReceiveMessageResult receiveMessage(String path, ReceiveMessageOptions op
         }
     }
 
+    @Override
+    public void renewQueueLock(String queueName, String messageId, String lockToken) throws ServiceException {
+        try {
+            next.renewQueueLock(queueName, messageId, lockToken);
+        }
+        catch (UniformInterfaceException e) {
+            throw processCatch(new ServiceException(e));
+        }
+        catch (ClientHandlerException e) {
+            throw processCatch(new ServiceException(e));
+        }
+    }
+
+    @Override
+    public void renewSubscriptionLock(String topicName, String subscriptionName, String messageId, String lockToken)
+            throws ServiceException {
+        try {
+            next.renewSubscriptionLock(topicName, subscriptionName, messageId, lockToken);
+        }
+        catch (UniformInterfaceException e) {
+            throw processCatch(new ServiceException(e));
+        }
+        catch (ClientHandlerException e) {
+            throw processCatch(new ServiceException(e));
+        }
+    }
+
 }
diff --git a/...va/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java b/...va/com/microsoft/windowsazure/services/serviceBus/implementation/ServiceBusRestProxy.java
@@ -30,6 +30,7 @@
 import com.microsoft.windowsazure.services.core.ServiceFilter;
 import com.microsoft.windowsazure.services.core.UserAgentFilter;
 import com.microsoft.windowsazure.services.core.utils.pipeline.ClientFilterAdapter;
+import com.microsoft.windowsazure.services.core.utils.pipeline.PipelineHelpers;
 import com.microsoft.windowsazure.services.serviceBus.ServiceBusContract;
 import com.microsoft.windowsazure.services.serviceBus.models.AbstractListOptions;
 import com.microsoft.windowsazure.services.serviceBus.models.BrokeredMessage;
@@ -109,7 +110,7 @@ public void setChannel(Client channel) {
     }
 
     private WebResource getResource() {
-        WebResource resource = getChannel().resource(uri);
+        WebResource resource = getChannel().resource(uri).queryParam("api-version", "2012-08");
         for (ServiceFilter filter : filters) {
             resource.addFilter(new ClientFilterAdapter(filter));
         }
@@ -293,6 +294,12 @@ public ListQueuesResult listQueues(ListQueuesOptions options) throws ServiceExce
         return result;
     }
 
+    @Override
+    public QueueInfo updateQueue(QueueInfo queueInfo) throws ServiceException {
+        return getResource().path(queueInfo.getPath()).type("application/atom+xml;type=entry;charset=utf-8")
+                .header("If-Match", "*").put(QueueInfo.class, queueInfo);
+    }
+
     private WebResource listOptions(AbstractListOptions<?> options, WebResource path) {
         if (options.getTop() != null) {
             path = path.queryParam("$top", options.getTop().toString());
@@ -331,6 +338,12 @@ public ListTopicsResult listTopics(ListTopicsOptions options) throws ServiceExce
         return result;
     }
 
+    @Override
+    public TopicInfo updateTopic(TopicInfo topicInfo) throws ServiceException {
+        return getResource().path(topicInfo.getPath()).type("application/atom+xml;type=entry;charset=utf-8")
+                .header("If-Match", "*").put(TopicInfo.class, topicInfo);
+    }
+
     @Override
     public CreateSubscriptionResult createSubscription(String topicPath, SubscriptionInfo subscription) {
         return new CreateSubscriptionResult(getResource().path(topicPath).path("subscriptions")
@@ -361,6 +374,14 @@ public ListSubscriptionsResult listSubscriptions(String topicPath, ListSubscript
         return result;
     }
 
+    @Override
+    public SubscriptionInfo updateSubscription(String topicName, SubscriptionInfo subscriptionInfo)
+            throws ServiceException {
+        return getResource().path(topicName).path("subscriptions").path(subscriptionInfo.getName())
+                .type("application/atom+xml;type=entry;charset=utf-8").header("If-Match", "*")
+                .put(SubscriptionInfo.class, subscriptionInfo);
+    }
+
     @Override
     public CreateRuleResult createRule(String topicPath, String subscriptionName, RuleInfo rule) {
         return new CreateRuleResult(getResource().path(topicPath).path("subscriptions").path(subscriptionName)
@@ -414,4 +435,19 @@ public ListRulesResult listRules(String topicName, String subscriptionName) thro
         return listRules(topicName, subscriptionName, ListRulesOptions.DEFAULT);
     }
 
+    @Override
+    public void renewQueueLock(String queueName, String messageId, String lockToken) throws ServiceException {
+        ClientResponse clientResponse = getResource().path(queueName).path("messages").path(messageId).path(lockToken)
+                .post(ClientResponse.class, "");
+        PipelineHelpers.ThrowIfNotSuccess(clientResponse);
+    }
+
+    @Override
+    public void renewSubscriptionLock(String topicName, String subscriptionName, String messageId, String lockToken)
+            throws ServiceException {
+        ClientResponse clientResponse = getResource().path(topicName).path("Subscriptions").path(subscriptionName)
+                .path("messages").path(messageId).path(lockToken).post(ClientResponse.class, "");
+        PipelineHelpers.ThrowIfNotSuccess(clientResponse);
+    }
+
 }