Upgrade to Java (and upgrade dependencies)

This commit also:
- removes unused imports
- replace some calls to deprecated APIs

# Conflicts:
#	.travis.yml
#	pom.xml

Author: ghostd

pom.xml

@@ -32,8 +32,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <!-- Could be updated to 22.0, however requires Java 1.8 -->
-      <version>20.0</version>
+      <version>28.1-jre</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
@@ -76,8 +75,8 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
       </plugin>

src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java

@@ -85,12 +85,7 @@ public class BaseAssertionGenerator implements AssertionGenerator, AssertionsEnt
   private static final String THROWS_JAVADOC = "${throws_javadoc}";
   private static final String LINE_SEPARATOR = "\n";
 
-  private static final Comparator<String> ORDER_BY_INCREASING_LENGTH = new Comparator<String>() {
-    @Override
-    public int compare(final String o1, final String o2) {
-      return o1.length() - o2.length();
-    }
-  };
+  private static final Comparator<String> ORDER_BY_INCREASING_LENGTH = Comparator.comparingInt(String::length);
 
   private static final Set<String> JAVA_KEYWORDS = newHashSet("abstract",
                                                               "assert",

src/main/java/org/assertj/assertions/generator/Template.java

@@ -22,8 +22,6 @@
  */
 package org.assertj.assertions.generator;
 
-import org.apache.commons.lang3.CharEncoding;
-
 import com.google.common.io.CharStreams;
 
 import java.io.File;
@@ -32,6 +30,7 @@
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 
 import static com.google.common.io.Closeables.closeQuietly;
 import static java.lang.Thread.currentThread;
@@ -87,7 +86,7 @@ public Template(Type type, String templateContent) {
   public Template(Type type, URL url) {
     this.type = type;
     try {
-      File urlFile = new File(URLDecoder.decode(url.getFile(), CharEncoding.UTF_8));
+      File urlFile = new File(URLDecoder.decode(url.getFile(), StandardCharsets.UTF_8.name()));
       if (!urlFile.isFile()) {
         throw new RuntimeException("Failed to read template from an URL which is not a file, URL was :" + url);
       }

src/main/java/org/assertj/assertions/generator/cli/AssertionGeneratorLauncher.java

@@ -37,7 +37,7 @@ public static void main(String[] args) throws IOException {
     Options options = new Options();
     options.addOption("H", "hierarchical", false, "Generate a hierarchy of assertions that follows the hierarchy of classes to assert");
     options.addOption("h", "help", false, "Print this help message");
-    CommandLineParser parser = new BasicParser();
+    CommandLineParser parser = new DefaultParser();
 
     try {
       CommandLine line = parser.parse(options, args);

src/main/java/org/assertj/assertions/generator/description/ClassDescription.java

@@ -13,7 +13,6 @@
 package org.assertj.assertions.generator.description;
 
 import com.google.common.reflect.TypeToken;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -22,6 +21,7 @@
 import java.util.TreeSet;
 
 import static com.google.common.collect.Sets.union;
+import static org.apache.commons.lang3.RegExUtils.removeAll;
 import static org.apache.commons.lang3.StringUtils.*;
 import static org.assertj.assertions.generator.util.ClassUtil.*;
 

src/main/java/org/assertj/assertions/generator/description/DataDescription.java

@@ -17,15 +17,13 @@
 import com.google.common.primitives.Ints;
 import com.google.common.primitives.Primitives;
 import com.google.common.reflect.TypeToken;
-import org.apache.commons.lang3.StringUtils;
-import org.assertj.assertions.generator.util.ClassUtil;
 
 import java.lang.reflect.Member;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import static org.apache.commons.lang3.StringUtils.removeAll;
+import static org.apache.commons.lang3.RegExUtils.removeAll;
 import static org.apache.commons.lang3.StringUtils.removeStart;
 import static org.assertj.assertions.generator.util.ClassUtil.*;
 import static org.assertj.assertions.generator.util.StringUtil.camelCaseToWords;

src/main/java/org/assertj/assertions/generator/description/GetterDescription.java

@@ -15,7 +15,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.reflect.Invokable;
 import com.google.common.reflect.TypeToken;
-import org.assertj.assertions.generator.util.ClassUtil;
 
 import java.lang.reflect.Method;
 

src/main/java/org/assertj/assertions/generator/util/ClassUtil.java

@@ -38,6 +38,7 @@
 import static java.lang.reflect.Modifier.isPublic;
 import static java.lang.reflect.Modifier.isStatic;
 import static java.util.Arrays.asList;
+import static org.apache.commons.lang3.RegExUtils.removeAll;
 import static org.apache.commons.lang3.StringUtils.*;
 
 /**
@@ -48,12 +49,7 @@ public class ClassUtil {
 
   public static final String GET_PREFIX = "get";
   private static final String CLASS_SUFFIX = ".class";
-  private static final Comparator<Method> GETTER_COMPARATOR = new Comparator<Method>() {
-    @Override
-    public int compare(Method m1, Method m2) {
-      return m1.getName().compareTo(m2.getName());
-    }
-  };
+  private static final Comparator<Method> GETTER_COMPARATOR = Comparator.comparing(Method::getName);
   public static final Package JAVA_LANG_PACKAGE = Object.class.getPackage();
   private static final String CAPITAL_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
@@ -334,12 +330,9 @@ public static boolean isValidGetterName(String methodName) {
 
   static public final Map<String, String> PREDICATE_PREFIXES;
 
-  static private final Comparator<String> LONGEST_TO_SHORTEST = new Comparator<String>() {
-    @Override
-    public int compare(String o1, String o2) {
-      final int lengthComp = o2.length() - o1.length();
-      return lengthComp == 0 ? o1.compareTo(o2) : lengthComp;
-    }
+  static private final Comparator<String> LONGEST_TO_SHORTEST = (o1, o2) -> {
+    final int lengthComp = o2.length() - o1.length();
+    return lengthComp == 0 ? o1.compareTo(o2) : lengthComp;
   };
 
   static {

src/main/java/org/assertj/assertions/generator/util/StringUtil.java

@@ -16,8 +16,8 @@
 
 public class StringUtil {
 
-  public static String camelCaseToWords(String camleCaseString) {
-    return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, camleCaseString).replace('_', ' ');
+  public static String camelCaseToWords(String camelCaseString) {
+    return CaseFormat.UPPER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, camelCaseString).replace('_', ' ');
   }
 
 }

src/test/java/org/assertj/assertions/generator/AssertionGeneratorTest.java

@@ -13,7 +13,6 @@
 package org.assertj.assertions.generator;
 
 import com.google.common.base.Optional;
-import com.google.common.net.InetAddresses;
 import com.google.common.reflect.TypeToken;
 import org.assertj.assertions.generator.data.*;
 import org.assertj.assertions.generator.data.art.ArtWork;