Changes mentioned from pull request. Added tests for the HTTP basic auth class.

Author: camporter

gen/src/main/java/com/softlayer/api/gen/MetaConverter.java

@@ -72,14 +72,13 @@ public String getPackageName(String typeName) {
             typeName = typeName.substring(10);
         }
         String[] pieces = typeName.split("_");
-        Arrays.stream(pieces)
-                .limit(pieces.length - 1) // Skip the last, it's the class name
-                .map(String::toLowerCase)
-                .map(piece -> {
-                    String replacement = keywordReplacements.get(piece);
-                    return replacement != null ? replacement : piece;
-                })
-                .forEach(piece -> pkg.append('.').append(getValidJavaIdentifier(piece)));
+        // Skip the last one, it's the class name
+        for (int i = 0; i < pieces.length - 1; i++) {
+            String piece = pieces[i].toLowerCase();
+            String replacement = keywordReplacements.get(piece);
+            piece = replacement != null ? replacement : piece;
+            pkg.append('.').append(getValidJavaIdentifier(piece));
+        }
         return pkg.toString();
     }
 

src/main/java/com/softlayer/api/http/BuiltInHttpClientFactory.java

@@ -139,14 +139,10 @@ public HttpResponse invokeSync(Callable<?> setupBody) {
             //  fairly fast and safe.
             openConnection();
             if (credentials != null) {
-                try {
-                    connection.addRequestProperty(
-                            "Authorization",
-                            credentials.getHeader()
-                    );
-                } catch (UnsupportedEncodingException e) {
-                    throw new RuntimeException(e);
-                }
+                connection.addRequestProperty(
+                    "Authorization",
+                    credentials.getHeader()
+                );
             }
             for (Map.Entry<String, List<String>> headerEntry : headers.entrySet()) {
                 for (String headerValue : headerEntry.getValue()) {

src/main/java/com/softlayer/api/http/HttpBasicAuthCredentials.java

@@ -1,6 +1,5 @@
 package com.softlayer.api.http;
 
-import java.io.UnsupportedEncodingException;
 import java.util.Base64;
 
 /** HTTP basic authorization support for username and API key */
@@ -19,16 +18,10 @@ public HttpBasicAuthCredentials(String username, String apiKey) {
      * for use in an HTTP Authorization header.
      *
      * @return String
-     * @throws UnsupportedEncodingException If encoding with UTF-8 fails.
      */
-    public String getHeader() throws UnsupportedEncodingException
+    public String getHeader()
     {
         String authPair = username + ':' + apiKey;
-        String result = "Basic ";
-        result += new String(
-            Base64.getEncoder().encode(authPair.getBytes("UTF-8")),
-            "UTF-8"
-        );
-        return result;
+        return "Basic " + Base64.getEncoder().encodeToString(authPair.getBytes());
     }
 }

src/test/java/com/softlayer/api/http/HttpBasicAuthCredentialsTest.java

@@ -0,0 +1,23 @@
+package com.softlayer.api.http;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class HttpBasicAuthCredentialsTest {
+
+    @Test
+    public void testConstructor()
+    {
+        HttpBasicAuthCredentials authCredentials = new HttpBasicAuthCredentials("username", "apiKey");
+        assertEquals("username", authCredentials.username);
+        assertEquals("apiKey", authCredentials.apiKey);
+    }
+
+    @Test
+    public void testGetHeader()
+    {
+        HttpBasicAuthCredentials authCredentials = new HttpBasicAuthCredentials("username", "apiKey");
+        assertEquals("Basic dXNlcm5hbWU6YXBpS2V5", authCredentials.getHeader());
+    }
+}