Merge pull request #39 from camporter/additional_identifier_validation

Add additional keyword replacement for 'native'.

Author: camporter

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

@@ -18,6 +18,7 @@ public class MetaConverter {
         keywordReplacements = new HashMap<String, String>(2);
         keywordReplacements.put("package", "pkg");
         keywordReplacements.put("private", "priv");
+        keywordReplacements.put("native", "nat");
         keywords = new HashSet<String>(Arrays.asList(new String[] {
             "abstract", "continue", "for", "new", "switch",
             "assert", "default", "goto", "package", "synchronized",
@@ -57,7 +58,7 @@ public String getClassName(String typeName) {
         if (invalidClassNames.contains(name)) {
             name = pieces[pieces.length - 2] + name;
         }
-        return name;
+        return getValidJavaIdentifier(name);
     }
 
     public String getMethodOrPropertyName(String className, String name) {
@@ -66,7 +67,7 @@ public String getMethodOrPropertyName(String className, String name) {
             name = Character.toLowerCase(className.charAt(0)) + className.substring(1) +
                 Character.toUpperCase(name.charAt(0)) + name.substring(1);
         }
-        return name;
+        return getValidJavaIdentifier(name);
     }
 
     public String getPackageName(String typeName) {
@@ -79,11 +80,27 @@ public String getPackageName(String typeName) {
         for (int i = 0; i < pieces.length - 1; i++) {
             String piece = pieces[i].toLowerCase();
             String replacement = keywordReplacements.get(piece);
-            pkg.append('.').append(replacement != null ? replacement : piece);
+            piece = replacement != null ? replacement : piece;
+            pkg.append('.').append(getValidJavaIdentifier(piece));
         }
         return pkg.toString();
     }
 
+    /**
+     * Provides a valid java identifier from the given name.
+     * Currently only checks for a valid start character and adds 'z'
+     * if the name has an invalid character at the start.
+     *
+     * @param name The identifier name to use.
+     * @return The new name after validating.
+     */
+    public String getValidJavaIdentifier(String name) {
+        if (!Character.isJavaIdentifierStart(name.charAt(0))) {
+            name = "z" + name;
+        }
+        return name;
+    }
+
     public TypeClass buildTypeClass() {
         imports.clear();
         String packageName = getPackageName(type.name);

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

@@ -22,6 +22,6 @@ public interface HttpClient extends Closeable {
     /** Make asynchronous HTTP invocation. All errors (inability to connect or API errors) are in the future. */
     public Future<HttpResponse> invokeAsync(Callable<?> setupBody);
 
-    /** Callback-form of {@link #invokeAsync()} */
+    /** Callback-form of {@link #invokeAsync(Callable)} */
     public Future<?> invokeAsync(Callable<?> setupBody, ResponseHandler<HttpResponse> callback);
 }