Merge pull request #123 from WindowsAzure/dev

Dev
Azure · Jun 4, 2013 · 15a6307 · 15a6307
2 parents 810ca6a + 004e9e6
commit 15a6307
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/...e-api/src/main/resources/schemas.microsoft.com.netservices.2010.10.servicebus.connect.xsd b/...e-api/src/main/resources/schemas.microsoft.com.netservices.2010.10.servicebus.connect.xsd
@@ -406,17 +406,6 @@
       <xs:enumeration value="MessagePartitioning" />
     </xs:restriction>
   </xs:simpleType>
-  <xs:complexType name ="KeyValueOfStringAnyType">
-    <xs:sequence>
-      <xs:element name ="Key" type="xs:string" />
-      <xs:element name ="Value" type="xs:anyType" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="FilterProperties">
-    <xs:sequence>
-      <xs:element minOccurs="0" maxOccurs="unbounded" name="KeyValueOfstringanyType" type="tns:KeyValueOfStringAnyType" />
-    </xs:sequence>
-  </xs:complexType>
   <xs:complexType name="CorrelationFilter">
     <xs:complexContent mixed="false">
       <xs:extension base="tns:Filter">
@@ -429,12 +418,10 @@
           <xs:element minOccurs="0" name="SessionId" type="xs:string" />
           <xs:element minOccurs="0" name="ReplyToSessionId" type="xs:string" />
           <xs:element minOccurs="0" name="ContentType" type="xs:string" />
-          <xs:element minOccurs="0" name="Properties" type="tns:FilterProperties" />
         </xs:sequence>
       </xs:extension>
     </xs:complexContent>
   </xs:complexType>
-  <xs:element name="CorrelationFilter" nillable="true" type="tns:CorrelationFilter" />
   <xs:complexType name="RuleAction">
     <xs:sequence />
   </xs:complexType>

diff --git a/...c/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusIntegrationTest.java b/...c/test/java/com/microsoft/windowsazure/services/serviceBus/ServiceBusIntegrationTest.java
@@ -37,8 +37,6 @@
 import com.microsoft.windowsazure.services.serviceBus.implementation.EmptyRuleAction;
 import com.microsoft.windowsazure.services.serviceBus.implementation.EntityStatus;
 import com.microsoft.windowsazure.services.serviceBus.implementation.FalseFilter;
-import com.microsoft.windowsazure.services.serviceBus.implementation.FilterProperties;
-import com.microsoft.windowsazure.services.serviceBus.implementation.KeyValueOfStringAnyType;
 import com.microsoft.windowsazure.services.serviceBus.implementation.RuleDescription;
 import com.microsoft.windowsazure.services.serviceBus.implementation.SqlFilter;
 import com.microsoft.windowsazure.services.serviceBus.implementation.SqlRuleAction;
@@ -707,15 +705,10 @@ public void subscriptionsCanBeCreatedOnTopics() throws Exception {
     @Test
     public void createSubscriptionWithCorrelationFilter() throws Exception {
         // Arrange
-        String topicName = "createSubscriptionWithCorrelationFilter";
+        String topicName = "testCreateSubscriptionWithCorrelationFilter";
         service.createTopic(new TopicInfo(topicName));
         CorrelationFilter correlationFilter = new CorrelationFilter();
-        FilterProperties filterProperties = new FilterProperties();
-        KeyValueOfStringAnyType keyValueOfStringAnyType = new KeyValueOfStringAnyType();
-        keyValueOfStringAnyType.setKey("AKey");
-        keyValueOfStringAnyType.setValue(new String("A Value"));
-        filterProperties.getKeyValueOfstringanyTypes().add(keyValueOfStringAnyType);
-        correlationFilter.setProperties(filterProperties);
+        correlationFilter.setContentType("sampleCorrelationId");
         RuleDescription ruleDescription = new RuleDescription();
         ruleDescription.setFilter(correlationFilter);