Base64Util (#188 continued) (#189)

* Use Base64Util in generator * Regenerate * Fully remove apache commons dependency * Bump to v2.0.17 * Use RunServerListener instead of exec plugin to run testserver * Reduce wait time for testserver to start * Fix remaining tests
Azure · Apr 25, 2018 · 1a2b7b2 · 1a2b7b2
1 parent 13cae91
commit 1a2b7b2
Show file tree

Hide file tree

Showing 26 changed files with 377 additions and 428 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft.azure/autorest.java",
-  "version": "2.0.16",
+  "version": "2.0.17",
   "description": "The Java extension for classic generators in AutoRest.",
   "scripts": {
     "autorest": "autorest",

diff --git a/pom.xml b/pom.xml
@@ -82,17 +82,6 @@
         <artifactId>azure-client-runtime</artifactId>
         <version>2.0.0-SNAPSHOT</version>
       </dependency>
-      <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <version>1.10</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>2.4</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>

diff --git a/src/JavaCodeGenerator.cs b/src/JavaCodeGenerator.cs
@@ -5318,7 +5318,7 @@ private static void ConvertClientTypesToWireTypes(JavaBlock function, IEnumerabl
                         {
                             if (parameterWireType.IsPrimaryType(AutoRestKnownPrimaryType.String))
                             {
-                                function.Line($"{parameterWireTypeName} {parameterWireName} = Base64.encodeBase64String({parameterName});");
+                                function.Line($"{parameterWireTypeName} {parameterWireName} = Base64Util.encodeToString({parameterName});");
                             }
                             else
                             {

diff --git a/src/Model/ClientMethod.cs b/src/Model/ClientMethod.cs
@@ -141,7 +141,7 @@ public virtual void AddImportsTo(ISet<string> imports, bool includeImplementatio
                     {
                         if (parameterModelType.IsPrimaryType(AutoRestKnownPrimaryType.ByteArray))
                         {
-                            imports.Add("org.apache.commons.codec.binary.Base64");
+                            imports.Add("com.microsoft.rest.v2.util.Base64Util");
                         }
                         else if (parameterModelType is AutoRestSequenceType)
                         {

diff --git a/src/Model/RestAPIParameter.cs b/src/Model/RestAPIParameter.cs
@@ -101,7 +101,7 @@ public void AddImportsTo(ISet<string> imports, bool includeImplementationImports
             {
                 if (Type == ArrayType.ByteArray)
                 {
-                    imports.Add("org.apache.commons.codec.binary.Base64");
+                    imports.Add("com.microsoft.rest.v2.util.Base64Util");
                 }
                 else if (Type is ListType)
                 {

diff --git a/test/azure/pom.xml b/test/azure/pom.xml
@@ -65,6 +65,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>codegen-tests</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -102,36 +109,13 @@
         </configuration>
       </plugin>
 
-    <plugin>
-        <artifactId>exec-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>run-server</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>node</executable>
-              <workingDirectory>${session.executionRootDirectory}</workingDirectory>
-              <arguments>
-                <argument>node_modules/@microsoft.azure/autorest.testserver</argument>
-              </arguments>
-              <async>true</async>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <properties>
             <property>
               <name>listener</name>
-              <value>fixtures.azurereport.CoverageReporter</value>
+              <value>fixtures.azurereport.CoverageReporter,fixtures.server.RunServerListener</value>
             </property>
           </properties>
         </configuration>

diff --git a/test/azurefluent/pom.xml b/test/azurefluent/pom.xml
@@ -69,6 +69,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>codegen-tests</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -106,36 +113,13 @@
         </configuration>
       </plugin>
 
-    <plugin>
-        <artifactId>exec-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>run-server</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>node</executable>
-              <workingDirectory>${session.executionRootDirectory}</workingDirectory>
-              <arguments>
-                <argument>node_modules/@microsoft.azure/autorest.testserver</argument>
-              </arguments>
-              <async>true</async>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <properties>
             <property>
               <name>listener</name>
-              <value>fixtures.azurereport.CoverageReporter</value>
+              <value>fixtures.azurereport.CoverageReporter,fixtures.server.RunServerListener</value>
             </property>
           </properties>
         </configuration>

diff --git a/test/clienttypeprefix/pom.xml b/test/clienttypeprefix/pom.xml
@@ -69,6 +69,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>codegen-tests</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -106,27 +113,16 @@
         </configuration>
       </plugin>
 
-    <plugin>
-        <artifactId>exec-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>run-server</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>node</executable>
-              <workingDirectory>${session.executionRootDirectory}</workingDirectory>
-              <arguments>
-                <argument>node_modules/@microsoft.azure/autorest.testserver</argument>
-              </arguments>
-              <async>true</async>
-            </configuration>
-          </execution>
-        </executions>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <properties>
+            <property>
+              <name>listener</name>
+              <value>fixtures.server.RunServerListener</value>
+            </property>
+          </properties>
+        </configuration>
       </plugin>
 
       <plugin>

diff --git a/test/generateclientinterfaces/pom.xml b/test/generateclientinterfaces/pom.xml
@@ -69,6 +69,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>codegen-tests</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -106,27 +113,16 @@
         </configuration>
       </plugin>
 
-    <plugin>
-        <artifactId>exec-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>run-server</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>node</executable>
-              <workingDirectory>${session.executionRootDirectory}</workingDirectory>
-              <arguments>
-                <argument>node_modules/@microsoft.azure/autorest.testserver</argument>
-              </arguments>
-              <async>true</async>
-            </configuration>
-          </execution>
-        </executions>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <properties>
+            <property>
+              <name>listener</name>
+              <value>fixtures.server.RunServerListener</value>
+            </property>
+          </properties>
+        </configuration>
       </plugin>
 
       <plugin>

diff --git a/test/implementationsubpackage-empty/pom.xml b/test/implementationsubpackage-empty/pom.xml
@@ -69,6 +69,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>codegen-tests</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -106,27 +113,16 @@
         </configuration>
       </plugin>
 
-    <plugin>
-        <artifactId>exec-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>run-server</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>node</executable>
-              <workingDirectory>${session.executionRootDirectory}</workingDirectory>
-              <arguments>
-                <argument>node_modules/@microsoft.azure/autorest.testserver</argument>
-              </arguments>
-              <async>true</async>
-            </configuration>
-          </execution>
-        </executions>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <properties>
+            <property>
+              <name>listener</name>
+              <value>fixtures.server.RunServerListener</value>
+            </property>
+          </properties>
+        </configuration>
       </plugin>
 
       <plugin>

diff --git a/test/implementationsubpackage/pom.xml b/test/implementationsubpackage/pom.xml
@@ -69,6 +69,13 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.microsoft.azure</groupId>
+      <artifactId>codegen-tests</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -106,27 +113,16 @@
         </configuration>
       </plugin>
 
-    <plugin>
-        <artifactId>exec-maven-plugin</artifactId>
-        <groupId>org.codehaus.mojo</groupId>
-        <version>1.5.0</version>
-        <executions>
-          <execution>
-            <id>run-server</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>exec</goal>
-            </goals>
-            <configuration>
-              <executable>node</executable>
-              <workingDirectory>${session.executionRootDirectory}</workingDirectory>
-              <arguments>
-                <argument>node_modules/@microsoft.azure/autorest.testserver</argument>
-              </arguments>
-              <async>true</async>
-            </configuration>
-          </execution>
-        </executions>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <properties>
+            <property>
+              <name>listener</name>
+              <value>fixtures.server.RunServerListener</value>
+            </property>
+          </properties>
+        </configuration>
       </plugin>
 
       <plugin>