Merge pull request #423 from rickle-msft/New-Storage-SDK-V10-Preview-dev

rickle-msft · web-flow · commit f2b4242c866a · 2019-01-15T10:24:36.000-08:00
New storage sdk v10 preview dev
diff --git a/pom.xml b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>com.microsoft.rest.v2</groupId>
             <artifactId>client-runtime</artifactId>
-            <version>2.0.0</version>
+            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
diff --git a/queue/BreakingChanges.txt b/queue/BreakingChanges.txt
@@ -0,0 +1,2 @@
+﻿2018.01.11 Version 10.0.1-Preview
+* Moved the Generated*** types into the queue package to avoid type conflicts with other modules.
diff --git a/queue/ChangeLog.txt b/queue/ChangeLog.txt
@@ -0,0 +1,2 @@
+2018.01.11 Version 10.0.1-Preview
+* Moved the Generated*** types into the queue package to avoid type conflicts with other modules.
diff --git a/queue/pom.xml b/queue/pom.xml
@@ -18,7 +18,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>azure-storage-queue</artifactId>
-    <version>10.0.0-Preview</version>
+    <version>10.0.1-Preview</version>
     <name>Azure Storage Queue</name>
     <description>The Azure Storage Java Queue library.</description>
 
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/Constants.java b/queue/src/main/java/com/microsoft/azure/storage/queue/Constants.java
@@ -111,7 +111,7 @@ static final class HeaderConstants {
         /**
          * Specifies the value to use for UserAgent header.
          */
-        static final String USER_AGENT_VERSION = "10.0.0-Preview";
+        static final String USER_AGENT_VERSION = "10.0.1-Preview";
 
         private HeaderConstants() {
             // Private to prevent construction.
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedMessageIDs.java b/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedMessageIDs.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package com.microsoft.azure.storage;
+package com.microsoft.azure.storage.queue;
 
 import com.microsoft.azure.storage.queue.models.MessageIDDeleteResponse;
 import com.microsoft.azure.storage.queue.models.MessageIDUpdateResponse;
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedMessages.java b/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedMessages.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package com.microsoft.azure.storage;
+package com.microsoft.azure.storage.queue;
 
 import com.microsoft.azure.storage.queue.models.DequeuedMessageItem;
 import com.microsoft.azure.storage.queue.models.EnqueuedMessage;
@@ -39,7 +39,6 @@
 import io.reactivex.Single;
 import io.reactivex.annotations.NonNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedQueues.java b/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedQueues.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package com.microsoft.azure.storage;
+package com.microsoft.azure.storage.queue;
 
 import com.microsoft.azure.storage.queue.implementation.SignedIdentifiersWrapper;
 import com.microsoft.azure.storage.queue.models.QueueCreateResponse;
@@ -38,8 +38,6 @@
 import io.reactivex.Maybe;
 import io.reactivex.Single;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedServices.java b/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedServices.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package com.microsoft.azure.storage;
+package com.microsoft.azure.storage.queue;
 
 import com.microsoft.azure.storage.queue.models.ListQueuesIncludeType;
 import com.microsoft.azure.storage.queue.models.ListQueuesResponse;
@@ -39,7 +39,6 @@
 import io.reactivex.Single;
 import io.reactivex.annotations.NonNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedStorageClient.java b/queue/src/main/java/com/microsoft/azure/storage/queue/GeneratedStorageClient.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package com.microsoft.azure.storage;
+package com.microsoft.azure.storage.queue;
 
 import com.microsoft.rest.v2.RestProxy;
 import com.microsoft.rest.v2.ServiceClient;
diff --git a/queue/src/main/java/com/microsoft/azure/storage/queue/StorageURL.java b/queue/src/main/java/com/microsoft/azure/storage/queue/StorageURL.java
@@ -14,7 +14,6 @@
  */
 package com.microsoft.azure.storage.queue;
 
-import com.microsoft.azure.storage.GeneratedStorageClient;
 import com.microsoft.rest.v2.http.HttpPipeline;
 import com.microsoft.rest.v2.http.UrlBuilder;
 import com.microsoft.rest.v2.policy.DecodingPolicyFactory;
diff --git a/queue/src/test/java/com/microsoft/azure/storage/ServiceAPITest.groovy b/queue/src/test/java/com/microsoft/azure/storage/ServiceAPITest.groovy
@@ -248,7 +248,7 @@ class ServiceAPITest extends APISpec {
     def "Get stats"() {
         setup:
         QueueURLParts parts = URLParser.parse(primaryServiceURL.toURL())
-        parts.withHost("azcopynextgendev1-secondary.queue.core.windows.net");
+        parts.withHost(primaryCreds.accountName +  "-secondary.queue.core.windows.net")
 
         when:
         ServiceURL secondary = new ServiceURL(parts.toURL(),
@@ -265,7 +265,7 @@ class ServiceAPITest extends APISpec {
     def "Get stats min"() {
         setup:
         QueueURLParts parts = URLParser.parse(primaryServiceURL.toURL())
-        parts.withHost("azcopynextgendev1-secondary.queue.core.windows.net");
+        parts.withHost(primaryCreds.accountName +  "-secondary.queue.core.windows.net")
         ServiceURL secondary = new ServiceURL(parts.toURL(),
                 StorageURL.createPipeline(primaryCreds, new PipelineOptions()))
         expect:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+2018.01.11 Version 10.0.1-Preview`
	`2`	`+* Moved the Generated*** types into the queue package to avoid type conflicts with other modules.`