don't use APIs marked for removal or deprecated ones (#8)

Author: TheJavaGuy

pom.xml

@@ -146,8 +146,11 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.14.1</version>
                     <configuration>
-                        <source>11</source>
-                        <target>11</target>
+                        <release>11</release>
+                        <compilerArgs>
+                            <arg>-Xlint:deprecation</arg>
+                            <arg>-Xlint:unchecked</arg>
+                        </compilerArgs>
                     </configuration>
                 </plugin>
                 <plugin>

src/main/java/com/github/javafaker/Code.java

@@ -1,8 +1,9 @@
 package com.github.javafaker;
 
-import org.apache.commons.lang3.ArrayUtils;
 import static org.apache.commons.lang3.math.NumberUtils.toInt;
 
+import org.apache.commons.lang3.ArrayUtils;
+
 /**
  * ISBN Rules : https://en.wikipedia.org/wiki/International_Standard_Book_Number
  */
@@ -74,7 +75,7 @@ public String isbnRegistrant() {
     public String isbn10() {
         return isbn10(false);
     }
-    
+
     /**
      * @param separator true if you want separators returned, false otherwise
      * @return a valid ISBN10 number with or without separators (ex. 9604250590, 960-425-059-0)
@@ -185,7 +186,7 @@ public String imei() {
         return new String(str);
     }
 
-    private static final String [] REPORTING_BODY_IDENTIFIERS 
+    private static final String [] REPORTING_BODY_IDENTIFIERS
         = {"01", "10", "30", "33", "35", "44", "45", "49", "50", "51", "52", "53", "54", "86", "91", "98", "99"};
 
     public String ean8() {

src/main/java/com/github/javafaker/Commerce.java

@@ -1,11 +1,11 @@
 package com.github.javafaker;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.text.DecimalFormat;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class Commerce {
     private final Faker faker;
 
@@ -19,7 +19,7 @@ public String color() {
 
     public String department() {
         int numberOfDepartments = Math.max(faker.random().nextInt(4), 1);
-        SortedSet<String> departments = new TreeSet<String>();
+        SortedSet<String> departments = new TreeSet<>();
         while (departments.size() < numberOfDepartments) {
             departments.add(faker.fakeValuesService().resolve("commerce.department", this, faker));
         }
@@ -32,8 +32,8 @@ public String department() {
     }
 
     public String productName() {
-        return StringUtils.join(new String[] { 
-            faker.fakeValuesService().resolve("commerce.product_name.adjective", this,faker), 
+        return StringUtils.join(new String[] {
+            faker.fakeValuesService().resolve("commerce.product_name.adjective", this,faker),
             faker.fakeValuesService().resolve("commerce.product_name.material", this, faker),
             faker.fakeValuesService().resolve("commerce.product_name.product", this, faker) }, " ");
     }
@@ -43,7 +43,7 @@ public String material() {
     }
 
     /**
-     * Generate a random price between 0.00 and 100.00 
+     * Generate a random price between 0.00 and 100.00
      */
     public String price() {
         return price(0, 100);

src/main/java/com/github/javafaker/Company.java

@@ -1,12 +1,13 @@
 package com.github.javafaker;
 
-import com.github.javafaker.service.FakerIDN;
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.commons.lang3.StringUtils.join;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.apache.commons.lang3.StringUtils.join;
+import org.apache.commons.lang3.StringUtils;
+
+import com.github.javafaker.service.FakerIDN;
 
 public class Company {
 
@@ -35,7 +36,7 @@ public String profession() {
     public String buzzword() {
         @SuppressWarnings("unchecked")
         List<List<String>> buzzwordLists = (List<List<String>>) faker.fakeValuesService().fetchObject("company.buzzwords");
-        List<String> buzzwords = new ArrayList<String>();
+        List<String> buzzwords = new ArrayList<>();
         for (List<String> buzzwordList : buzzwordLists) {
             buzzwords.addAll(buzzwordList);
         }
@@ -87,7 +88,7 @@ private String domainSuffix() {
     }
 
     private String joinSampleOfEachList(List<List<String>> listOfLists, String separator) {
-        List<String> words = new ArrayList<String>();
+        List<String> words = new ArrayList<>();
         for (List<String> list : listOfLists) {
            words.add(list.get(faker.random().nextInt(list.size())));
         }

src/main/java/com/github/javafaker/Faker.java

@@ -1,11 +1,11 @@
 package com.github.javafaker;
 
-import com.github.javafaker.service.FakeValuesService;
-import com.github.javafaker.service.RandomService;
-
 import java.util.Locale;
 import java.util.Random;
 
+import com.github.javafaker.service.FakeValuesService;
+import com.github.javafaker.service.RandomService;
+
 /**
  * Provides utility methods for generating fake strings, such as names, phone
  * numbers, addresses. generate random strings with given patterns

src/main/java/com/github/javafaker/Finance.java

@@ -1,13 +1,13 @@
 package com.github.javafaker;
 
-import org.apache.commons.lang3.StringUtils;
-
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang3.StringUtils;
+
 public class Finance {
     private final Faker faker;
 
@@ -25,7 +25,7 @@ public String creditCard(CreditCardType creditCardType) {
         final String template = faker.numerify(value);
 
         String[] split = template.replaceAll("[^0-9]", "").split("");
-        List<Integer> reversedAsInt = new ArrayList<Integer>();
+        List<Integer> reversedAsInt = new ArrayList<>();
         for (int i = 0; i < split.length; i++) {
             final String current = split[split.length - 1 - i];
             if (!current.isEmpty()) {
@@ -55,7 +55,7 @@ public String bic() {
     }
 
     public String iban() {
-        List<String> countryCodes = new ArrayList<String>(countryCodeToBasicBankAccountNumberPattern.keySet());
+        List<String> countryCodes = new ArrayList<>(countryCodeToBasicBankAccountNumberPattern.keySet());
         String randomCountryCode = countryCodes.get(faker.random().nextInt(countryCodes.size()));
         return iban(randomCountryCode);
     }
@@ -99,7 +99,7 @@ private static String calculateIbanChecksum(String countryCode, String basicBank
 
     private static Map<String, String> createCountryCodeToBasicBankAccountNumberPatternMap() {
         // source: https://www.swift.com/standards/data-standards/iban
-        Map<String, String> ibanFormats = new HashMap<String, String>();
+        Map<String, String> ibanFormats = new HashMap<>();
         ibanFormats.put("AL", "\\d{8}[0-9A-Za-z]{16}");
         ibanFormats.put("AD", "\\d{4}\\d{4}[0-9A-Za-z]{12}");
         ibanFormats.put("AT", "\\d{5}\\d{11}");

src/main/java/com/github/javafaker/Internet.java

@@ -1,15 +1,16 @@
 package com.github.javafaker;
 
-import com.github.javafaker.service.FakerIDN;
-import com.github.javafaker.service.RandomService;
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.commons.lang3.StringUtils.join;
+import static org.apache.commons.lang3.StringUtils.stripAccents;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
-import static org.apache.commons.lang3.StringUtils.join;
-import static org.apache.commons.lang3.StringUtils.stripAccents;
+import org.apache.commons.lang3.StringUtils;
+
+import com.github.javafaker.service.FakerIDN;
+import com.github.javafaker.service.RandomService;
 
 public class Internet {
     private final Faker faker;
@@ -138,18 +139,18 @@ public String password(int minimumLength, int maximumLength, boolean includeUppe
             return faker.lorem().characters(minimumLength, maximumLength, includeUppercase, includeDigit);
         }
     }
-    
+
     /**
      * <p>Returns a MAC address in the following format: 6-bytes in MM:MM:MM:SS:SS:SS format.</p>
      * @return a correctly formatted MAC address
      * @param prefix a prefix to put on the front of the address
      */
     public String macAddress(String prefix) {
         final String tmp = (prefix == null) ? "" : prefix;
-        final int prefixLength = tmp.trim().length() == 0 
-          ? 0 
+        final int prefixLength = tmp.trim().length() == 0
+          ? 0
           : tmp.split(":").length;
-        
+
         final StringBuilder out = new StringBuilder(tmp);
         for (int i=0;i < 6 - prefixLength;i++) {
             if (out.length() > 0) {
@@ -162,14 +163,14 @@ public String macAddress(String prefix) {
     }
 
     /**
-     * @see Internet#macAddress(String) 
+     * @see Internet#macAddress(String)
      */
     public String macAddress() {
         return macAddress("");
     }
 
     /**
-     * returns an IPv4 address in dot separated octets. 
+     * returns an IPv4 address in dot separated octets.
      * @return a correctly formatted IPv4 address.
      */
     public String ipV4Address() {
@@ -212,14 +213,14 @@ public String privateIpV4Address() {
      */
     public String publicIpV4Address() {
         final RandomService r = faker.random();
-        
+
         final int[] PRIVATE_FIRST_OCTET = {10,127,169,192,172};
 
         int first = r.nextInt(256),
                 second = r.nextInt(256),
                 third = r.nextInt(256),
                 fourth = r.nextInt(256);
-        
+
         while (Arrays.binarySearch(PRIVATE_FIRST_OCTET, first) > 0) {
             first = r.nextInt(256);
         }
@@ -301,7 +302,7 @@ public String slug(List<String> wordsOrNull, String glueOrNull) {
     public String uuid() {
         return UUID.randomUUID().toString();
     }
-          
+
     private <T> T random(T[] src) {
         return src[faker.random().nextInt(src.length)];
     }

src/main/java/com/github/javafaker/Lorem.java

@@ -1,20 +1,20 @@
 package com.github.javafaker;
 
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.commons.lang3.StringUtils.capitalize;
+import static org.apache.commons.lang3.StringUtils.join;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.apache.commons.lang3.StringUtils.capitalize;
-import static org.apache.commons.lang3.StringUtils.join;
+import org.apache.commons.lang3.StringUtils;
 
 public class Lorem {
     private final Faker faker;
 
     protected Lorem(Faker faker) {
         this.faker = faker;
     }
-    
+
     public char character() {
         return character(false);
     }
@@ -74,7 +74,7 @@ public String characters(int fixedNumberOfCharacters, boolean includeUppercase,
     }
 
     public List<String> words(int num) {
-        List<String> returnList = new ArrayList<String>();
+        List<String> returnList = new ArrayList<>();
         for (int i = 0; i < num; i++) {
             returnList.add(word());
         }
@@ -108,7 +108,7 @@ public String sentence(int wordCount) {
 
     /**
      * Create a sentence with a random number of words within the range (wordCount+1)..(wordCount+randomWordsToAdd).</p>
-     * 
+     *
      * Set {@code randomWordsToAdd} to 0 to generate sentences with a fixed number of words.
      * @param wordCount
      * @param randomWordsToAdd
@@ -120,7 +120,7 @@ public String sentence(int wordCount, int randomWordsToAdd) {
     }
 
     public List<String> sentences(int sentenceCount) {
-        List<String> sentences = new ArrayList<String>(sentenceCount);
+        List<String> sentences = new ArrayList<>(sentenceCount);
         for (int i = 0; i < sentenceCount; i++) {
             sentences.add(sentence());
         }
@@ -136,7 +136,7 @@ public String paragraph() {
     }
 
     public List<String> paragraphs(int paragraphCount) {
-        List<String> paragraphs = new ArrayList<String>(paragraphCount);
+        List<String> paragraphs = new ArrayList<>(paragraphCount);
         for (int i = 0; i < paragraphCount; i++) {
             paragraphs.add(paragraph());
         }

src/main/java/com/github/javafaker/Number.java

@@ -1,6 +1,7 @@
 package com.github.javafaker;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 
 public class Number {
     private final Faker faker;
@@ -24,17 +25,17 @@ public int randomDigitNotZero() {
     }
 
     /**
-     * @see Number#numberBetween(long, long) 
+     * @see Number#numberBetween(long, long)
      */
     public int numberBetween(int min, int max) {
         if (min == max) return min;
 
-        int value = decimalBetween(min,max).setScale(0, BigDecimal.ROUND_HALF_DOWN).intValue();
+        int value = decimalBetween(min,max).setScale(0, RoundingMode.HALF_DOWN).intValue();
         return value == max ? value - 1 : value;
     }
 
     /**
-     * Return a number between <em>min</em> and <em>max</em>.  If 
+     * Return a number between <em>min</em> and <em>max</em>.  If
      * min == max, then min is returned. So numberBetween(2,2) will yield 2 even though
      * it doesn't make sense.
      *
@@ -44,10 +45,10 @@ public int numberBetween(int min, int max) {
     public long numberBetween(long min, long max) {
         if (min == max) return min;
 
-        long value = decimalBetween(min, max).setScale(0, BigDecimal.ROUND_HALF_DOWN).longValue();
+        long value = decimalBetween(min, max).setScale(0, RoundingMode.HALF_DOWN).longValue();
         return value == max ? value - 1 : value;
     }
-    
+
     /**
      * @param numberOfDigits the number of digits the generated value should have
      * @param strict         whether or not the generated value should have exactly <code>numberOfDigits</code>
@@ -82,7 +83,7 @@ public double randomDouble(int maxNumberOfDecimals, int min, int max) {
      */
     public double randomDouble(int maxNumberOfDecimals, long min, long max) {
         return decimalBetween(min,max)
-                .setScale(maxNumberOfDecimals, BigDecimal.ROUND_HALF_DOWN)
+                .setScale(maxNumberOfDecimals, RoundingMode.HALF_DOWN)
                 .doubleValue();
     }
 
@@ -99,13 +100,12 @@ private BigDecimal decimalBetween(long min, long max) {
         final long trueMax = Math.max(min, max);
 
         final double range = (double) trueMax - (double) trueMin;
-        
+
         final double chunkCount = Math.sqrt(Math.abs(range));
-        final double chunkSize = chunkCount;
         final long randomChunk = faker.random().nextLong((long) chunkCount);
 
-        final double chunkStart = trueMin + randomChunk * chunkSize;
-        final double adj = chunkSize * faker.random().nextDouble();
+        final double chunkStart = trueMin + randomChunk * chunkCount;
+        final double adj = chunkCount * faker.random().nextDouble();
         return new BigDecimal(chunkStart + adj);
     }