Merge pull request #962 from jianghaolu/javavnext

Move models into same folders as operations in Azure.Java
Azure · Apr 20, 2016 · f91e917 · f91e917
2 parents 0e14ae1 + 2b0bcee
commit f91e917
Show file tree

Hide file tree

Showing 155 changed files with 338 additions and 897 deletions.
diff --git a/...ping/models/implementation/api/Error.java → ...tergrouping/implementation/api/Error.java b/...ping/models/implementation/api/Error.java → ...tergrouping/implementation/api/Error.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureparametergrouping.models.implementation.api;
+package fixtures.azureparametergrouping.implementation.api;
 
 
 /**

diff --git a/...ests/src/main/java/fixtures/azureparametergrouping/implementation/api/ErrorException.java b/...ests/src/main/java/fixtures/azureparametergrouping/implementation/api/ErrorException.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+package fixtures.azureparametergrouping.implementation.api;
+
+import com.microsoft.rest.RestException;
+import retrofit2.Response;
+
+/**
+ * Exception thrown for an invalid response with Error information.
+ */
+public class ErrorException extends RestException {
+    /**
+     * Information about the associated HTTP response.
+     */
+    private Response response;
+    /**
+     * The actual response body.
+     */
+    private Error body;
+    /**
+     * Initializes a new instance of the ErrorException class.
+     */
+    public ErrorException() { }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message The exception message.
+     */
+    public ErrorException(final String message) {
+        super(message);
+    }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param message the exception message
+     * @param cause   exception that caused this exception to occur
+     */
+    public ErrorException(final String message, final Throwable cause) {
+        super(message, cause);
+    }
+    /**
+     * Initializes a new instance of the ErrorException class.
+     *
+     * @param cause exception that caused this exception to occur
+     */
+    public ErrorException(final Throwable cause) {
+        super(cause);
+    }
+    /**
+     * Gets information about the associated HTTP response.
+     *
+     * @return the HTTP response
+     */
+    public Response getResponse() {
+        return response;
+    }
+    /**
+     * Gets the HTTP response body.
+     *
+     * @return the response body
+     */
+    public Error getBody() {
+        return body;
+    }
+    /**
+     * Sets the HTTP response.
+     *
+     * @param response the HTTP response
+     */
+    public void setResponse(Response response) {
+        this.response = response;
+    }
+    /**
+     * Sets the HTTP response body.
+     *
+     * @param body the response body
+     */
+    public void setBody(Error body) {
+        this.body = body;
+    }
+}
diff --git a/...ntation/api/FirstParameterGroupInner.java → ...ntation/api/FirstParameterGroupInner.java b/...ntation/api/FirstParameterGroupInner.java → ...ntation/api/FirstParameterGroupInner.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureparametergrouping.models.implementation.api;
+package fixtures.azureparametergrouping.implementation.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...ultiParamGroupsSecondParamGroupInner.java → ...ultiParamGroupsSecondParamGroupInner.java b/...ultiParamGroupsSecondParamGroupInner.java → ...ultiParamGroupsSecondParamGroupInner.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureparametergrouping.models.implementation.api;
+package fixtures.azureparametergrouping.implementation.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...rGroupingPostOptionalParametersInner.java → ...rGroupingPostOptionalParametersInner.java b/...rGroupingPostOptionalParametersInner.java → ...rGroupingPostOptionalParametersInner.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureparametergrouping.models.implementation.api;
+package fixtures.azureparametergrouping.implementation.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...rGroupingPostRequiredParametersInner.java → ...rGroupingPostRequiredParametersInner.java b/...rGroupingPostRequiredParametersInner.java → ...rGroupingPostRequiredParametersInner.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureparametergrouping.models.implementation.api;
+package fixtures.azureparametergrouping.implementation.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

diff --git a/...main/java/fixtures/azureparametergrouping/implementation/api/ParameterGroupingsInner.java b/...main/java/fixtures/azureparametergrouping/implementation/api/ParameterGroupingsInner.java
@@ -17,11 +17,6 @@
 import com.microsoft.rest.ServiceResponse;
 import com.microsoft.rest.ServiceResponseCallback;
 import com.microsoft.rest.Validator;
-import fixtures.azureparametergrouping.models.implementation.api.ErrorException;
-import fixtures.azureparametergrouping.models.implementation.api.FirstParameterGroupInner;
-import fixtures.azureparametergrouping.models.implementation.api.ParameterGroupingPostMultiParamGroupsSecondParamGroupInner;
-import fixtures.azureparametergrouping.models.implementation.api.ParameterGroupingPostOptionalParametersInner;
-import fixtures.azureparametergrouping.models.implementation.api.ParameterGroupingPostRequiredParametersInner;
 import java.io.IOException;
 import okhttp3.ResponseBody;
 import retrofit2.Call;

diff --git a/...c/main/java/fixtures/azureparametergrouping/models/implementation/api/ErrorException.java b/...c/main/java/fixtures/azureparametergrouping/models/implementation/api/ErrorException.java
diff --git a/...src/main/java/fixtures/azureparametergrouping/models/implementation/api/package-info.java b/...src/main/java/fixtures/azureparametergrouping/models/implementation/api/package-info.java
diff --git a/...sts/src/main/java/fixtures/azureparametergrouping/models/implementation/package-info.java b/...sts/src/main/java/fixtures/azureparametergrouping/models/implementation/package-info.java
diff --git a/...a/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/package-info.java b/...a/Azure.Java.Tests/src/main/java/fixtures/azureparametergrouping/models/package-info.java
diff --git a/.../main/java/fixtures/azurereport/implementation/api/AutoRestReportServiceForAzureImpl.java b/.../main/java/fixtures/azurereport/implementation/api/AutoRestReportServiceForAzureImpl.java
@@ -21,7 +21,6 @@
 import com.microsoft.rest.ServiceCallback;
 import com.microsoft.rest.ServiceResponse;
 import com.microsoft.rest.ServiceResponseCallback;
-import fixtures.azurereport.models.implementation.api.ErrorException;
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;

diff --git a/...port/models/implementation/api/Error.java → ...azurereport/implementation/api/Error.java b/...port/models/implementation/api/Error.java → ...azurereport/implementation/api/Error.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azurereport.models.implementation.api;
+package fixtures.azurereport.implementation.api;
 
 
 /**

diff --git a/...ls/implementation/api/ErrorException.java → ...rt/implementation/api/ErrorException.java b/...ls/implementation/api/ErrorException.java → ...rt/implementation/api/ErrorException.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azurereport.models.implementation.api;
+package fixtures.azurereport.implementation.api;
 
 import com.microsoft.rest.RestException;
 import retrofit2.Response;

diff --git a/...Java.Tests/src/main/java/fixtures/azurereport/models/implementation/api/package-info.java b/...Java.Tests/src/main/java/fixtures/azurereport/models/implementation/api/package-info.java
diff --git a/...ure.Java.Tests/src/main/java/fixtures/azurereport/models/implementation/package-info.java b/...ure.Java.Tests/src/main/java/fixtures/azurereport/models/implementation/package-info.java
diff --git a/...erators/Java/Azure.Java.Tests/src/main/java/fixtures/azurereport/models/package-info.java b/...erators/Java/Azure.Java.Tests/src/main/java/fixtures/azurereport/models/package-info.java
diff --git a/.../fixtures/azureresource/implementation/api/AutoRestResourceFlatteningTestServiceImpl.java b/.../fixtures/azureresource/implementation/api/AutoRestResourceFlatteningTestServiceImpl.java
@@ -22,10 +22,6 @@
 import com.microsoft.rest.ServiceResponse;
 import com.microsoft.rest.ServiceResponseCallback;
 import com.microsoft.rest.Validator;
-import fixtures.azureresource.models.implementation.api.ErrorException;
-import fixtures.azureresource.models.implementation.api.FlattenedProductInner;
-import fixtures.azureresource.models.implementation.api.ResourceCollectionInner;
-import fixtures.azureresource.models.implementation.api.ResourceInner;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

diff --git a/...urce/models/implementation/api/Error.java → ...ureresource/implementation/api/Error.java b/...urce/models/implementation/api/Error.java → ...ureresource/implementation/api/Error.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureresource.models.implementation.api;
+package fixtures.azureresource.implementation.api;
 
 
 /**

diff --git a/...ls/implementation/api/ErrorException.java → ...ce/implementation/api/ErrorException.java b/...ls/implementation/api/ErrorException.java → ...ce/implementation/api/ErrorException.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureresource.models.implementation.api;
+package fixtures.azureresource.implementation.api;
 
 import com.microsoft.rest.RestException;
 import retrofit2.Response;

diff --git a/...ementation/api/FlattenedProductInner.java → ...ementation/api/FlattenedProductInner.java b/...ementation/api/FlattenedProductInner.java → ...ementation/api/FlattenedProductInner.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureresource.models.implementation.api;
+package fixtures.azureresource.implementation.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;

diff --git a/...entation/api/ResourceCollectionInner.java → ...entation/api/ResourceCollectionInner.java b/...entation/api/ResourceCollectionInner.java → ...entation/api/ResourceCollectionInner.java
@@ -8,7 +8,7 @@
  * regenerated.
  */
 
-package fixtures.azureresource.models.implementation.api;
+package fixtures.azureresource.implementation.api;
 
 import java.util.List;
 import java.util.Map;