Merge pull request Azure#24 from Azure/revert-23-master

Revert "Changes from AutoRest & SDK"
jianghaolu · Jul 18, 2016 · e4d8dda · e4d8dda
2 parents 910cf5a + 06e3169
commit e4d8dda
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 148 deletions.
diff --git a/azure-client-authentication/build.gradle b/azure-client-authentication/build.gradle
@@ -14,9 +14,9 @@ version = '1.0.0-SNAPSHOT'
 
 checkstyle {
     toolVersion = "6.18"
-    configFile = new File("$rootDir/src/client/Java/build-tools/src/main/resources/checkstyle.xml")
-    configProperties = [samedir: "$rootDir/src/client/Java/build-tools/src/main/resources"]
-    reportsDir = new File("$rootDir/src/client/Java/build-tools/reports")
+    configFile = new File("$rootDir/ClientRuntimes/Java/build-tools/src/main/resources/checkstyle.xml")
+    configProperties = [samedir: "$rootDir/ClientRuntimes/Java/build-tools/src/main/resources"]
+    reportsDir = new File("$rootDir/ClientRuntimes/Java/build-tools/reports")
 }
 
 dependencies {
@@ -92,7 +92,7 @@ artifacts {
 
 test {
     reports.getHtml()
-    reports.html.destination = file("$rootDir/TestResults/JavaAzureRuntime")
+    reports.html.destination = file("${projectDir}/../../../TestResults/JavaAzureRuntime")
 }
 
 tasks.compileJava.dependsOn 'clean'
diff --git a/azure-client-runtime/build.gradle b/azure-client-runtime/build.gradle
@@ -14,9 +14,9 @@ version = '1.0.0-SNAPSHOT'
 
 checkstyle {
     toolVersion = "6.18"
-    configFile = new File("$rootDir/src/client/Java/build-tools/src/main/resources/checkstyle.xml")
-    configProperties = [samedir: "$rootDir/src/client/Java/build-tools/src/main/resources"]
-    reportsDir = new File("$rootDir/src/client/Java/build-tools/reports")
+    configFile = new File("$rootDir/ClientRuntimes/Java/build-tools/src/main/resources/checkstyle.xml")
+    configProperties = [samedir: "$rootDir/ClientRuntimes/Java/build-tools/src/main/resources"]
+    reportsDir = new File("$rootDir/ClientRuntimes/Java/build-tools/reports")
 }
 
 dependencies {
@@ -90,7 +90,7 @@ artifacts {
 
 test {
     reports.getHtml()
-    reports.html.destination = file("$rootDir/TestResults/JavaAzureRuntime")
+    reports.html.destination = file("${projectDir}/../../../TestResults/JavaAzureRuntime")
 }
 
 tasks.compileJava.dependsOn 'clean'
diff --git a/build-tools/src/main/resources/checkstyle.xml b/build-tools/src/main/resources/checkstyle.xml
@@ -231,6 +231,7 @@
         -->
 
         <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
         <module name="InterfaceIsType"/>
         <module name="VisibilityModifier">
             <property name="protectedAllowed" value="true"/>

diff --git a/client-runtime/build.gradle b/client-runtime/build.gradle
@@ -16,9 +16,9 @@ version = '1.0.0-SNAPSHOT'
 
 checkstyle {
     toolVersion = "6.18"
-    configFile = new File("$rootDir/src/client/Java/build-tools/src/main/resources/checkstyle.xml")
-    configProperties = [samedir: "$rootDir/src/client/Java/build-tools/src/main/resources"]
-    reportsDir = new File("$rootDir/src/client/Java/build-tools/reports")
+    configFile = new File("$rootDir/ClientRuntimes/Java/build-tools/src/main/resources/checkstyle.xml")
+    configProperties = [samedir: "$rootDir/ClientRuntimes/Java/build-tools/src/main/resources"]
+    reportsDir = new File("$rootDir/ClientRuntimes/Java/build-tools/reports")
 }
 
 dependencies {
@@ -99,7 +99,7 @@ artifacts {
 
 test {
     reports.getHtml()
-    reports.html.destination = file("$rootDir/TestResults/JavaRuntime")
+    reports.html.destination = file("${projectDir}/../../../TestResults/JavaRuntime")
 }
 
 tasks.compileJava.dependsOn 'clean'

diff --git a/client-runtime/src/main/java/com/microsoft/rest/Base64Url.java b/client-runtime/src/main/java/com/microsoft/rest/Base64Url.java
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceClient.java
@@ -40,9 +40,6 @@ protected ServiceClient(String baseUrl) {
     /**
      * Initializes a new instance of the ServiceClient class.
      *
-     * @param baseUrl the service base uri
-     * @param clientBuilder the http client builder
-     * @param restBuilder the retrofit rest client builder
      */
     protected ServiceClient(String baseUrl, OkHttpClient.Builder clientBuilder, Retrofit.Builder restBuilder) {
         if (clientBuilder == null) {

diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/Base64UrlSerializer.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/Base64UrlSerializer.java
diff --git a/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonMapperAdapter.java b/client-runtime/src/main/java/com/microsoft/rest/serializer/JacksonMapperAdapter.java
@@ -56,7 +56,6 @@ protected void initializeObjectMapper(ObjectMapper mapper) {
                 .setSerializationInclusion(JsonInclude.Include.NON_NULL)
                 .registerModule(new JodaModule())
                 .registerModule(ByteArraySerializer.getModule())
-                .registerModule(Base64UrlSerializer.getModule())
                 .registerModule(DateTimeSerializer.getModule())
                 .registerModule(DateTimeRfc1123Serializer.getModule())
                 .registerModule(HeadersSerializer.getModule());