Merge pull request Azure#281 from RikkiGibson/MigratePom

Migrate to v2 package and add v2 to groupId in POMs
sima-zhu · Oct 30, 2017 · 057efef · 057efef
2 parents eb7ebcc + 70c635f
commit 057efef
Show file tree

Hide file tree

Showing 177 changed files with 530 additions and 531 deletions.
diff --git a/azure-client-authentication/pom.xml b/azure-client-authentication/pom.xml
@@ -6,7 +6,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.microsoft.azure</groupId>
+    <groupId>com.microsoft.azure.v2</groupId>
     <artifactId>autorest-clientruntime-for-java</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -48,7 +48,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.azure</groupId>
+      <groupId>com.microsoft.azure.v2</groupId>
       <artifactId>azure-client-runtime</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>

diff --git a/...dentials/ApplicationTokenCredentials.java → ...dentials/ApplicationTokenCredentials.java b/...dentials/ApplicationTokenCredentials.java → ...dentials/ApplicationTokenCredentials.java
@@ -4,15 +4,15 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.google.common.io.BaseEncoding;
 import com.microsoft.aad.adal4j.AsymmetricKeyCredential;
 import com.microsoft.aad.adal4j.AuthenticationContext;
 import com.microsoft.aad.adal4j.AuthenticationException;
 import com.microsoft.aad.adal4j.AuthenticationResult;
 import com.microsoft.aad.adal4j.ClientCredential;
-import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

diff --git a/...microsoft/azure/credentials/AuthFile.java → ...rosoft/azure/v2/credentials/AuthFile.java b/...microsoft/azure/credentials/AuthFile.java → ...rosoft/azure/v2/credentials/AuthFile.java
@@ -4,17 +4,17 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import com.google.common.reflect.TypeToken;
-import com.microsoft.azure.AzureEnvironment;
-import com.microsoft.azure.AzureEnvironment.Endpoint;
+import com.microsoft.azure.v2.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment.Endpoint;
 import com.microsoft.azure.management.apigeneration.Beta;
 import com.microsoft.azure.management.apigeneration.Beta.SinceVersion;
-import com.microsoft.rest.serializer.JacksonAdapter;
+import com.microsoft.rest.v2.serializer.JacksonAdapter;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...zure/credentials/AzureCliCredentials.java → ...e/v2/credentials/AzureCliCredentials.java b/...zure/credentials/AzureCliCredentials.java → ...e/v2/credentials/AzureCliCredentials.java
@@ -4,13 +4,13 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment;
 import com.microsoft.azure.management.apigeneration.Beta;
-import com.microsoft.rest.serializer.JacksonAdapter;
+import com.microsoft.rest.v2.serializer.JacksonAdapter;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...ure/credentials/AzureCliSubscription.java → .../v2/credentials/AzureCliSubscription.java b/...ure/credentials/AzureCliSubscription.java → .../v2/credentials/AzureCliSubscription.java
@@ -4,10 +4,10 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.microsoft.aad.adal4j.AuthenticationResult;
-import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment;
 import com.microsoft.azure.management.apigeneration.Beta;
 
 import java.io.IOException;

diff --git a/...soft/azure/credentials/AzureCliToken.java → ...t/azure/v2/credentials/AzureCliToken.java b/...soft/azure/credentials/AzureCliToken.java → ...t/azure/v2/credentials/AzureCliToken.java
@@ -4,7 +4,7 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.aad.adal4j.AuthenticationResult;

diff --git a/...oft/azure/credentials/MSICredentials.java → .../azure/v2/credentials/MSICredentials.java b/...oft/azure/credentials/MSICredentials.java → .../azure/v2/credentials/MSICredentials.java
@@ -4,12 +4,12 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment;
 import com.microsoft.azure.management.apigeneration.Beta;
-import com.microsoft.azure.serializer.AzureJacksonAdapter;
+import com.microsoft.azure.v2.serializer.AzureJacksonAdapter;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...azure/credentials/RefreshTokenClient.java → ...re/v2/credentials/RefreshTokenClient.java b/...azure/credentials/RefreshTokenClient.java → ...re/v2/credentials/RefreshTokenClient.java
@@ -4,23 +4,23 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.escape.Escaper;
 import com.google.common.net.UrlEscapers;
 import com.microsoft.aad.adal4j.AuthenticationResult;
 import com.microsoft.azure.management.apigeneration.Beta;
-import com.microsoft.rest.RestClient;
-import com.microsoft.rest.RestProxy;
-import com.microsoft.rest.annotations.BodyParam;
-import com.microsoft.rest.annotations.ExpectedResponses;
-import com.microsoft.rest.annotations.POST;
-import com.microsoft.rest.annotations.PathParam;
-import com.microsoft.rest.http.HttpClient;
-import com.microsoft.rest.http.NettyClient;
-import com.microsoft.rest.policy.RequestPolicy;
-import com.microsoft.rest.protocol.SerializerAdapter;
+import com.microsoft.rest.v2.RestClient;
+import com.microsoft.rest.v2.RestProxy;
+import com.microsoft.rest.v2.annotations.BodyParam;
+import com.microsoft.rest.v2.annotations.ExpectedResponses;
+import com.microsoft.rest.v2.annotations.POST;
+import com.microsoft.rest.v2.annotations.PathParam;
+import com.microsoft.rest.v2.http.HttpClient;
+import com.microsoft.rest.v2.http.NettyClient;
+import com.microsoft.rest.v2.policy.RequestPolicy;
+import com.microsoft.rest.v2.protocol.SerializerAdapter;
 import rx.Single;
 import rx.functions.Func1;
 

diff --git a/...ure/credentials/UserTokenCredentials.java → .../v2/credentials/UserTokenCredentials.java b/...ure/credentials/UserTokenCredentials.java → .../v2/credentials/UserTokenCredentials.java
@@ -4,11 +4,11 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.microsoft.aad.adal4j.AuthenticationContext;
 import com.microsoft.aad.adal4j.AuthenticationResult;
-import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...osoft/azure/credentials/package-info.java → ...ft/azure/v2/credentials/package-info.java b/...osoft/azure/credentials/package-info.java → ...ft/azure/v2/credentials/package-info.java
@@ -2,4 +2,4 @@
  * The package provides 2 credential classes that work with AutoRest
  * generated Azure clients for authentication purposes through Azure.
  */
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
diff --git a/...soft/azure/credentials/AuthFileTests.java → ...t/azure/v2/credentials/AuthFileTests.java b/...soft/azure/credentials/AuthFileTests.java → ...t/azure/v2/credentials/AuthFileTests.java
@@ -4,7 +4,7 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/.../credentials/RefreshTokenClientTests.java → .../credentials/RefreshTokenClientTests.java b/.../credentials/RefreshTokenClientTests.java → .../credentials/RefreshTokenClientTests.java
@@ -1,9 +1,9 @@
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.CharStreams;
-import com.microsoft.azure.credentials.http.MockHttpClient;
-import com.microsoft.rest.http.HttpRequest;
+import com.microsoft.azure.v2.credentials.http.MockHttpClient;
+import com.microsoft.rest.v2.http.HttpRequest;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -22,7 +22,7 @@ public void refreshToken() throws IOException {
         assertEquals(1, httpClient.requests().size());
         final HttpRequest request = httpClient.requests().get(0);
         assertEquals("POST", request.httpMethod());
-        assertEquals("com.microsoft.azure.credentials.RefreshTokenClient$RefreshTokenService.refreshToken", request.callerMethod());
+        assertEquals("com.microsoft.azure.v2.credentials.RefreshTokenClient$RefreshTokenService.refreshToken", request.callerMethod());
         assertEquals("http://my.base.url/mockTenant/oauth2/token", request.url());
         assertEquals("client_id=mockClientId&grant_type=refresh_token&resource=mockResource&refresh_token=mockRefreshToken", CharStreams.toString(new InputStreamReader(request.body().createInputStream(), Charsets.UTF_8)));
     }

diff --git a/...redentials/UserTokenCredentialsTests.java → ...redentials/UserTokenCredentialsTests.java b/...redentials/UserTokenCredentialsTests.java → ...redentials/UserTokenCredentialsTests.java
@@ -4,10 +4,10 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials;
+package com.microsoft.azure.v2.credentials;
 
 import com.microsoft.aad.adal4j.AuthenticationResult;
-import com.microsoft.azure.AzureEnvironment;
+import com.microsoft.azure.v2.AzureEnvironment;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...zure/credentials/http/MockHttpClient.java → ...e/v2/credentials/http/MockHttpClient.java b/...zure/credentials/http/MockHttpClient.java → ...e/v2/credentials/http/MockHttpClient.java
@@ -4,14 +4,13 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials.http;
+package com.microsoft.azure.v2.credentials.http;
 
-import com.microsoft.rest.http.HttpClient;
-import com.microsoft.rest.http.HttpRequest;
-import com.microsoft.rest.http.HttpResponse;
+import com.microsoft.rest.v2.http.HttpClient;
+import com.microsoft.rest.v2.http.HttpRequest;
+import com.microsoft.rest.v2.http.HttpResponse;
 import rx.Single;
 
-import java.net.Proxy;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...re/credentials/http/MockHttpResponse.java → ...v2/credentials/http/MockHttpResponse.java b/...re/credentials/http/MockHttpResponse.java → ...v2/credentials/http/MockHttpResponse.java
@@ -4,12 +4,12 @@
  * license information.
  */
 
-package com.microsoft.azure.credentials.http;
+package com.microsoft.azure.v2.credentials.http;
 
-import com.microsoft.rest.http.HttpHeaders;
-import com.microsoft.rest.http.HttpResponse;
-import com.microsoft.rest.protocol.SerializerAdapter;
-import com.microsoft.rest.serializer.JacksonAdapter;
+import com.microsoft.rest.v2.http.HttpHeaders;
+import com.microsoft.rest.v2.http.HttpResponse;
+import com.microsoft.rest.v2.protocol.SerializerAdapter;
+import com.microsoft.rest.v2.serializer.JacksonAdapter;
 import rx.Observable;
 import rx.Single;
 

diff --git a/azure-client-runtime/pom.xml b/azure-client-runtime/pom.xml
@@ -6,7 +6,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>com.microsoft.azure</groupId>
+    <groupId>com.microsoft.azure.v2</groupId>
     <artifactId>autorest-clientruntime-for-java</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
@@ -47,7 +47,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.microsoft.rest</groupId>
+      <groupId>com.microsoft.rest.v2</groupId>
       <artifactId>client-runtime</artifactId>
       <version>2.0.0-SNAPSHOT</version>
     </dependency>

diff --git a/...crosoft/azure/AsyncOperationResource.java → ...soft/azure/v2/AsyncOperationResource.java b/...crosoft/azure/AsyncOperationResource.java → ...soft/azure/v2/AsyncOperationResource.java
@@ -4,7 +4,7 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...zure/AzureAsyncOperationPollStrategy.java → ...e/v2/AzureAsyncOperationPollStrategy.java b/...zure/AzureAsyncOperationPollStrategy.java → ...e/v2/AzureAsyncOperationPollStrategy.java
@@ -4,12 +4,12 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
-import com.microsoft.rest.RestProxy;
-import com.microsoft.rest.protocol.SerializerAdapter;
-import com.microsoft.rest.http.HttpRequest;
-import com.microsoft.rest.http.HttpResponse;
+import com.microsoft.rest.v2.RestProxy;
+import com.microsoft.rest.v2.protocol.SerializerAdapter;
+import com.microsoft.rest.v2.http.HttpRequest;
+import com.microsoft.rest.v2.http.HttpResponse;
 import rx.Single;
 import rx.functions.Func1;
 

diff --git a/...com/microsoft/azure/AzureEnvironment.java → .../microsoft/azure/v2/AzureEnvironment.java b/...com/microsoft/azure/AzureEnvironment.java → .../microsoft/azure/v2/AzureEnvironment.java
@@ -4,9 +4,9 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
-import com.microsoft.rest.protocol.Environment;
+import com.microsoft.rest.v2.protocol.Environment;
 
 import java.util.Arrays;
 import java.util.HashMap;

diff --git a/.../java/com/microsoft/azure/AzureProxy.java → ...va/com/microsoft/azure/v2/AzureProxy.java b/.../java/com/microsoft/azure/AzureProxy.java → ...va/com/microsoft/azure/v2/AzureProxy.java
@@ -4,18 +4,18 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
 import com.google.common.reflect.TypeToken;
-import com.microsoft.azure.annotations.AzureHost;
-import com.microsoft.rest.protocol.SerializerAdapter;
-import com.microsoft.rest.InvalidReturnTypeException;
-import com.microsoft.rest.RestProxy;
-import com.microsoft.rest.SwaggerInterfaceParser;
-import com.microsoft.rest.SwaggerMethodParser;
-import com.microsoft.rest.http.HttpClient;
-import com.microsoft.rest.http.HttpRequest;
-import com.microsoft.rest.http.HttpResponse;
+import com.microsoft.azure.v2.annotations.AzureHost;
+import com.microsoft.rest.v2.protocol.SerializerAdapter;
+import com.microsoft.rest.v2.InvalidReturnTypeException;
+import com.microsoft.rest.v2.RestProxy;
+import com.microsoft.rest.v2.SwaggerInterfaceParser;
+import com.microsoft.rest.v2.SwaggerMethodParser;
+import com.microsoft.rest.v2.http.HttpClient;
+import com.microsoft.rest.v2.http.HttpRequest;
+import com.microsoft.rest.v2.http.HttpResponse;
 import rx.Observable;
 import rx.Single;
 import rx.exceptions.Exceptions;

diff --git a/...m/microsoft/azure/AzureServiceClient.java → ...icrosoft/azure/v2/AzureServiceClient.java b/...m/microsoft/azure/AzureServiceClient.java → ...icrosoft/azure/v2/AzureServiceClient.java
@@ -4,13 +4,13 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
 import com.google.common.hash.Hashing;
-import com.microsoft.azure.serializer.AzureJacksonAdapter;
-import com.microsoft.rest.RestClient;
-import com.microsoft.rest.ServiceClient;
-import com.microsoft.rest.credentials.ServiceClientCredentials;
+import com.microsoft.azure.v2.serializer.AzureJacksonAdapter;
+import com.microsoft.rest.v2.RestClient;
+import com.microsoft.rest.v2.ServiceClient;
+import com.microsoft.rest.v2.credentials.ServiceClientCredentials;
 
 import java.net.NetworkInterface;
 import java.util.Enumeration;

diff --git a/.../java/com/microsoft/azure/CloudError.java → ...va/com/microsoft/azure/v2/CloudError.java b/.../java/com/microsoft/azure/CloudError.java → ...va/com/microsoft/azure/v2/CloudError.java
@@ -4,7 +4,7 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...a/com/microsoft/azure/CloudException.java → ...om/microsoft/azure/v2/CloudException.java b/...a/com/microsoft/azure/CloudException.java → ...om/microsoft/azure/v2/CloudException.java
@@ -4,10 +4,10 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
-import com.microsoft.rest.RestException;
-import com.microsoft.rest.http.HttpResponse;
+import com.microsoft.rest.v2.RestException;
+import com.microsoft.rest.v2.http.HttpResponse;
 
 /**
  * Exception thrown for an invalid response with custom error information.

diff --git a/...icrosoft/azure/CompletedPollStrategy.java → ...osoft/azure/v2/CompletedPollStrategy.java b/...icrosoft/azure/CompletedPollStrategy.java → ...osoft/azure/v2/CompletedPollStrategy.java
@@ -4,12 +4,12 @@
  * license information.
  */
 
-package com.microsoft.azure;
+package com.microsoft.azure.v2;
 
-import com.microsoft.rest.RestProxy;
-import com.microsoft.rest.SwaggerMethodParser;
-import com.microsoft.rest.http.HttpRequest;
-import com.microsoft.rest.http.HttpResponse;
+import com.microsoft.rest.v2.RestProxy;
+import com.microsoft.rest.v2.SwaggerMethodParser;
+import com.microsoft.rest.v2.http.HttpRequest;
+import com.microsoft.rest.v2.http.HttpResponse;
 import rx.Observable;
 import rx.Single;