Merge pull request #50 from softlayer/java8

Bump support up to requiring Java 8

Author: camporter

.travis.yml

@@ -1,7 +1,5 @@
 language: java
 jdk:
   - oraclejdk8
-  - oraclejdk7
-  - openjdk7
-  - openjdk6
+  - openjdk8
 install: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgpg.skip=true

README.md

@@ -7,7 +7,7 @@
 ## Introduction
 
 This library provides a JVM client for the [SoftLayer API](http://sldn.softlayer.com/article/SoftLayer-API-Overview). It
-has code generated and compiled via Maven. The client can work with any Java 6+ runtime. It uses the code generation
+has code generated and compiled via Maven. The client can work with any Java 8+ runtime. It uses the code generation
 project in `gen/` to generate the service and type related code. Although likely to work in resource-constrained
 environments (i.e. Android, J2ME, etc), using this is not recommended; Use the
 [REST](http://sldn.softlayer.com/article/REST) API instead.

examples/pom.xml

@@ -17,7 +17,7 @@
   </licenses>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.6</java.version>
+    <java.version>1.8</java.version>
   </properties>
   <dependencies>
     <dependency>
@@ -54,7 +54,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.7.0</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>

examples/src/main/java/com/softlayer/api/example/AddSecurityGroupRule.java

@@ -31,7 +31,7 @@ public void run(ApiClient client) throws Exception {
         rule.setDirection("ingress");
         rule.setProtocol("udp");
 
-        List<Rule> newRules = new ArrayList<Rule>();
+        List<Rule> newRules = new ArrayList<>();
         newRules.add(rule);
 
         // Now add the rule(s) to the security group

examples/src/main/java/com/softlayer/api/example/PaginationAsyncCallback.java

@@ -1,6 +1,5 @@
 package com.softlayer.api.example;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.NavigableSet;
 import java.util.Set;
@@ -28,12 +27,9 @@ public void run(ApiClient client) throws Exception {
         ((ThreadPooledHttpClientFactory) HttpClientFactory.getDefault()).setThreadPool(threadPool);
 
         // A thread-safe set is needed to hold the resulting packages ordered by name
-        final NavigableSet<Package> packages = new ConcurrentSkipListSet<Package>(new Comparator<Package>() {
-            @Override
-            public int compare(Package pkg1, Package pkg2) {
-                return pkg1.getName().compareToIgnoreCase(pkg2.getName());
-            }
-        });
+        final NavigableSet<Package> packages = new ConcurrentSkipListSet<>(
+                (pkg1, pkg2) -> pkg1.getName().compareToIgnoreCase(pkg2.getName())
+        );
 
         // To know how many calls have to be made to get all items, an initial call is required to get the
         //  first set of data AND the total count

examples/src/main/java/com/softlayer/api/example/PaginationAsyncPolling.java

@@ -1,7 +1,6 @@
 package com.softlayer.api.example;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import java.util.NavigableSet;
 import java.util.TreeSet;
@@ -27,7 +26,7 @@ public void run(ApiClient client) throws Exception {
         ((ThreadPooledHttpClientFactory) HttpClientFactory.getDefault()).setThreadPool(threadPool);
 
         // Asynchronous responses are held so they can be waited on once all are submitted
-        List<PackageResponseWrapper> responses = new ArrayList<PackageResponseWrapper>();
+        List<PackageResponseWrapper> responses = new ArrayList<>();
 
         // To know how many calls have to be made to get all items, an initial call is required to get the
         //  first set of data AND the total count
@@ -53,12 +52,9 @@ public void run(ApiClient client) throws Exception {
         threadPool.shutdown();
 
         // A set is needed to hold the resulting packages ordered by name
-        final NavigableSet<Package> packages = new TreeSet<Package>(new Comparator<Package>() {
-            @Override
-            public int compare(Package pkg1, Package pkg2) {
-                return pkg1.getName().compareToIgnoreCase(pkg2.getName());
-            }
-        });
+        final NavigableSet<Package> packages = new TreeSet<>(
+                (pkg1, pkg2) -> pkg1.getName().compareToIgnoreCase(pkg2.getName())
+        );
 
         // Unlike the callback approach, this approach guarantees they come in the order requested since a blocking
         //  call to get() is in the request order

gen/pom.xml

@@ -17,7 +17,7 @@
   </licenses>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.version>1.6</java.version>
+    <java.version>1.8</java.version>
     <exec.mainClass>com.softlayer.api.gen.Main</exec.mainClass>
   </properties>
   <dependencies>
@@ -58,12 +58,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
+        <version>3.0.0-M1</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.7.0</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>

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

@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashMap;
@@ -21,7 +22,7 @@
 public class ClassWriter extends JavaWriter {
 
     public static final String SLDN_URL_BASE_PATH = "http://sldn.softlayer.com/reference/";
-    
+
     public static final String TYPE_API_CLIENT = "com.softlayer.api.ApiClient";
     public static final String TYPE_API_METHOD = "com.softlayer.api.annotation.ApiMethod";
     public static final String TYPE_API_PROPERTY = "com.softlayer.api.annotation.ApiProperty";
@@ -63,7 +64,7 @@ public static void emitType(File baseDir, TypeClass type, Meta meta) throws IOEx
         File fileDir = new File(baseDir, type.packageName.replace('.', '/'));
         fileDir.mkdirs();
         Writer writer = new BufferedWriter(new OutputStreamWriter(
-            new FileOutputStream(new File(fileDir, type.className + ".java")), "UTF-8"));
+            new FileOutputStream(new File(fileDir, type.className + ".java")), StandardCharsets.UTF_8));
         try {
             new ClassWriter(writer, type, meta).emitType();
         } finally {
@@ -97,7 +98,7 @@ public ClassWriter(Writer out, TypeClass type, Meta meta) {
 
     public ClassWriter emitAnnotationWithAttrs(String annotationType, Object... attributes) throws IOException {
         int i = 0;
-        Map<String, Object> attrMap = new HashMap<String, Object>(attributes.length / 2 + 1);
+        Map<String, Object> attrMap = new HashMap<>(attributes.length / 2 + 1);
         while (i < attributes.length) {
             String key = attributes[i++].toString();
             attrMap.put(key, attributes[i++]);
@@ -134,7 +135,7 @@ public ClassWriter emitProperty(TypeClass.Property property) throws IOException
             emitJavadoc(property.meta.doc.replace("\n", "<br />\n"));
         }
 
-        Map<String, Object> params = new HashMap<String, Object>(2);
+        Map<String, Object> params = new HashMap<>(2);
         if (!property.name.equals(property.meta.name)) {
             params.put("value", stringLiteral(property.meta.name));
         }
@@ -267,7 +268,7 @@ public ClassWriter emitServiceMethod(TypeClass.Method method, boolean async) thr
                 "/" + method.meta.name + "\">" + type.meta.name + "::" + method.meta.name + "</a>";
             emitJavadoc(javadoc);
 
-            Map<String, Object> params = new HashMap<String, Object>(2);
+            Map<String, Object> params = new HashMap<>(2);
             if (!method.name.equals(method.meta.name)) {
                 params.put("value", stringLiteral(method.meta.name));
             }
@@ -433,8 +434,8 @@ public ClassWriter emitType() throws IOException {
     }
 
     public ClassWriter emitTypeImports() throws IOException {
-        Map<String, String> imports = new HashMap<String, String>(type.imports);
-        
+        Map<String, String> imports = new HashMap<>(type.imports);
+
         imports.remove("Mask");
         imports.remove(type.className);
         imports.put("ApiType", TYPE_API_TYPE);

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

@@ -3,6 +3,11 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -15,7 +20,13 @@ public class Generator {
     private final URL metadataUrl;
     private final Restriction whitelist;
     private final Restriction blacklist;
-    
+
+    /**
+     * @param dir The directory to generate classes into.
+     * @param metadataUrl The metadata to generate from.
+     * @param whitelist
+     * @param blacklist
+     */
     public Generator(File dir, URL metadataUrl, Restriction whitelist, Restriction blacklist) {
         this.dir = dir;
         this.metadataUrl = metadataUrl;
@@ -32,7 +43,7 @@ public void buildClient() throws IOException {
         applyRestrictions(meta);
 
         log("Generating source code");
-        List<TypeClass> classes = new ArrayList<TypeClass>(meta.types.size());
+        List<TypeClass> classes = new ArrayList<>(meta.types.size());
         for (Meta.Type type : meta.types.values()) {
             TypeClass typeClass = new MetaConverter(BASE_PKG, meta, type).buildTypeClass();
             ClassWriter.emitType(dir, typeClass, meta);
@@ -77,16 +88,22 @@ protected void log(String contents) {
         System.out.println(contents);
     }
 
-    public void recursivelyDelete(File file) {
-        if (file.isDirectory()) {
-            for (File child : file.listFiles()) {
-                recursivelyDelete(child);
+    public void recursivelyDelete(File file) throws IOException {
+        if (!file.exists()) {
+            return;
+        }
+        Files.walkFileTree(file.toPath(), new SimpleFileVisitor<Path>() {
+            @Override
+            public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+                Files.delete(file);
+                return FileVisitResult.CONTINUE;
             }
-            if (!file.delete()) {
-                throw new RuntimeException("Unable to delete: " + file);
+
+            @Override
+            public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+                Files.delete(dir);
+                return FileVisitResult.CONTINUE;
             }
-        } else if (file.exists() && !file.delete()) {
-            throw new RuntimeException("Unable to delete: " + file);
-        }
+        });
     }
 }

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

@@ -13,6 +13,9 @@
 
 /** Entry point for the code generator */
 public class Main {
+
+    protected static final String METADATA_URL = "https://api.softlayer.com/metadata/v3.1";
+    protected static final String DEFAULT_SOURCE_PATH = "../src/main/java";
 
     public static final String USAGE = 
         "Arguments:\n\n" +
@@ -35,15 +38,15 @@ public static void main(String[] args) throws Exception {
         Restriction whitelist;
         Restriction blacklist;
         try {
-            List<String> argList = new ArrayList<String>(Arrays.asList(args));
+            List<String> argList = Arrays.asList(args);
             if (argList.contains("--help")) {
                 System.out.println(USAGE);
                 return;
             }
             String dirString = getArg("--src", argList);
-            dir = new File(dirString != null ? dirString : "../src/main/java");
+            dir = new File(dirString != null ? dirString : DEFAULT_SOURCE_PATH);
             String urlString = getArg("--url", argList);
-            url = new URL(urlString != null ? urlString : "https://api.softlayer.com/metadata/v3.1");
+            url = new URL(urlString != null ? urlString : METADATA_URL);
             whitelist = getRestriction(getArg("--whitelist", argList));
             blacklist = getRestriction(getArg("--blacklist", argList));
             if (whitelist != null && blacklist != null) {
@@ -83,17 +86,13 @@ private static Restriction getRestriction(String filename) throws IOException {
                     line = line.trim();
                     if (line.contains("::")) {
                         String pieces[] = line.split("::", 2);
-                        Set<String> methods = restriction.methods.get(pieces[0]);
-                        if (methods == null) {
-                            methods = new HashSet<String>();
-                            restriction.methods.put(pieces[0], methods);
-                        }
+                        Set<String> methods = restriction.methods.computeIfAbsent(pieces[0], key -> new HashSet<>());
                         methods.add(pieces[1]);
                     } else if (line.contains(".")) {
                         String pieces[] = line.split(".", 2);
                         Set<String> properties = restriction.properties.get(pieces[0]);
                         if (properties == null) {
-                            properties = new HashSet<String>();
+                            properties = new HashSet<>();
                             restriction.methods.put(pieces[0], properties);
                         }
                         properties.add(pieces[1]);