From 06e957721fdca4db11ca8af1344757ee4eda10a1 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:28:13 +0300 Subject: [PATCH 1/9] Remove unused imports --- .../java/com/github/javafaker/service/FakeValuesService.java | 2 -- src/test/java/com/github/javafaker/InternetTest.java | 1 - src/test/java/com/github/javafaker/OverwatchTest.java | 1 - 3 files changed, 4 deletions(-) diff --git a/src/main/java/com/github/javafaker/service/FakeValuesService.java b/src/main/java/com/github/javafaker/service/FakeValuesService.java index ddfdb564..d5de95b7 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesService.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesService.java @@ -13,11 +13,9 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; diff --git a/src/test/java/com/github/javafaker/InternetTest.java b/src/test/java/com/github/javafaker/InternetTest.java index 54340c08..c1496601 100644 --- a/src/test/java/com/github/javafaker/InternetTest.java +++ b/src/test/java/com/github/javafaker/InternetTest.java @@ -5,7 +5,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.commons.validator.routines.EmailValidator; import org.hamcrest.Matchers; -import org.hamcrest.core.IsNot; import org.junit.Test; import java.util.List; diff --git a/src/test/java/com/github/javafaker/OverwatchTest.java b/src/test/java/com/github/javafaker/OverwatchTest.java index ee536dce..8379649a 100644 --- a/src/test/java/com/github/javafaker/OverwatchTest.java +++ b/src/test/java/com/github/javafaker/OverwatchTest.java @@ -1,6 +1,5 @@ package com.github.javafaker; -import com.github.javafaker.repeating.Repeat; import org.junit.Test; import static com.github.javafaker.matchers.MatchesRegularExpression.matchesRegularExpression; From dfc446a73e0d11b51440bddd95942603b6098c02 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:31:44 +0300 Subject: [PATCH 2/9] Remove redundant character escapes from regexp-s --- .../java/com/github/javafaker/service/FakeValuesService.java | 4 ++-- src/test/java/com/github/javafaker/InternetTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/javafaker/service/FakeValuesService.java b/src/main/java/com/github/javafaker/service/FakeValuesService.java index d5de95b7..a5472c22 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesService.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesService.java @@ -22,7 +22,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class FakeValuesService { - private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?(?:'([^']+)')?(?:,'([^']+)')*\\}"); + private static final Pattern EXPRESSION_PATTERN = Pattern.compile("#\\{([a-z0-9A-Z_.]+)\\s?(?:'([^']+)')?(?:,'([^']+)')*}"); private final Logger log = Logger.getLogger("faker"); @@ -106,7 +106,7 @@ public class FakeValuesService { * with new Locale("pt","BR"). */ private Locale normalizeLocale(Locale locale) { - final String[] parts = locale.toString().split("[-\\_]"); + final String[] parts = locale.toString().split("[-_]"); if (parts.length == 1) { return new Locale(parts[0]); diff --git a/src/test/java/com/github/javafaker/InternetTest.java b/src/test/java/com/github/javafaker/InternetTest.java index c1496601..373a222d 100644 --- a/src/test/java/com/github/javafaker/InternetTest.java +++ b/src/test/java/com/github/javafaker/InternetTest.java @@ -197,7 +197,7 @@ public class InternetTest extends AbstractFakerTest { assertThat(faker.internet().ipV4Cidr(), countOf('/', is(1))); for (int i = 0; i < 1000; i++) { - assertThat(parseInt(faker.internet().ipV4Cidr().split("\\/")[1]), + assertThat(parseInt(faker.internet().ipV4Cidr().split("/")[1]), both(greaterThanOrEqualTo(1)).and(lessThan(32))); } } @@ -256,7 +256,7 @@ public class InternetTest extends AbstractFakerTest { assertThat(faker.internet().ipV6Cidr(), countOf('/', is(1))); for (int i = 0; i < 1000; i++) { - assertThat(parseInt(faker.internet().ipV6Cidr().split("\\/")[1]), + assertThat(parseInt(faker.internet().ipV6Cidr().split("/")[1]), both(greaterThanOrEqualTo(1)).and(lessThan(128))); } } From a7129622e24fa44574d120deb12c165b15401253 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:32:24 +0300 Subject: [PATCH 3/9] Make inner private class static --- .../java/com/github/javafaker/service/FakeValuesService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/javafaker/service/FakeValuesService.java b/src/main/java/com/github/javafaker/service/FakeValuesService.java index a5472c22..6dc403da 100644 --- a/src/main/java/com/github/javafaker/service/FakeValuesService.java +++ b/src/main/java/com/github/javafaker/service/FakeValuesService.java @@ -571,7 +571,7 @@ public class FakeValuesService { * this is useful as we get to find the method and coerce the arguments in one * shot, returning both when successful. This saves us from doing it more than once (coercing args). */ - private class MethodAndCoercedArgs { + private static class MethodAndCoercedArgs { private final Method method; From 082feffeba173c147d8a68d5a761ab775a2d2bf2 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:44:06 +0300 Subject: [PATCH 4/9] Fix redundant `Class.getClass()` invocation --- src/main/java/com/github/javafaker/Relationships.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/javafaker/Relationships.java b/src/main/java/com/github/javafaker/Relationships.java index 24804828..2f5434ef 100644 --- a/src/main/java/com/github/javafaker/Relationships.java +++ b/src/main/java/com/github/javafaker/Relationships.java @@ -37,7 +37,7 @@ public class Relationships { } public String any() { - Method currentMethod = Relationships.class.getClass().getEnclosingMethod(); + Method currentMethod = getClass().getEnclosingMethod(); try { Method[] methods = Relationships.class.getDeclaredMethods(); @@ -57,4 +57,4 @@ public class Relationships { } } -} \ No newline at end of file +} From bf6644c30cd89776b0bce329d619088c11982cf6 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:51:19 +0300 Subject: [PATCH 5/9] Replace `for` loop with `foreach` --- src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java b/src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java index 3bd0a121..b580f916 100644 --- a/src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java +++ b/src/main/java/com/github/javafaker/idnumbers/EnIdNumber.java @@ -14,8 +14,8 @@ public class EnIdNumber { String ssn = f.regexify("[0-8]\\d{2}-\\d{2}-\\d{4}"); boolean isValid = true; - for (int i = 0; i < invalidSSNPatterns.length; i++) { - if (ssn.matches(invalidSSNPatterns[i])) { + for (String invalidSSNPattern : invalidSSNPatterns) { + if (ssn.matches(invalidSSNPattern)) { isValid = false; break; } From 9c5c00f169e8528f1db026266bc4ce76675ed16c Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:53:22 +0300 Subject: [PATCH 6/9] Replace StringBuilder with String concatenation --- src/main/java/com/github/javafaker/File.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/github/javafaker/File.java b/src/main/java/com/github/javafaker/File.java index 7213fe5a..f8ab58f9 100644 --- a/src/main/java/com/github/javafaker/File.java +++ b/src/main/java/com/github/javafaker/File.java @@ -24,6 +24,6 @@ public class File { final String dir = dirOrNull == null ? faker.internet().slug() : dirOrNull; final String name = nameOrNull == null ? faker.lorem().word().toLowerCase() : nameOrNull; final String ext = extensionOrNull == null ? extension() : extensionOrNull; - return new StringBuilder(dir).append(sep).append(name).append(".").append(ext).toString(); + return dir + sep + name + "." + ext; } } From 59fb7208e5714ae9a2ef31c3a4d4a00fe9f1826a Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 15:55:55 +0300 Subject: [PATCH 7/9] Remove exlicit array creation for varargs parameters --- src/main/java/com/github/javafaker/Company.java | 4 ++-- src/main/java/com/github/javafaker/Internet.java | 4 ++-- src/main/java/com/github/javafaker/Name.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/github/javafaker/Company.java b/src/main/java/com/github/javafaker/Company.java index ba1a4420..a82bb6ca 100644 --- a/src/main/java/com/github/javafaker/Company.java +++ b/src/main/java/com/github/javafaker/Company.java @@ -69,13 +69,13 @@ public class Company { } public String url() { - return join(new Object[]{ + return join( "www", ".", FakerIDN.toASCII(domainName()), ".", domainSuffix() - }); + ); } private String domainName(){ diff --git a/src/main/java/com/github/javafaker/Internet.java b/src/main/java/com/github/javafaker/Internet.java index 393e5515..163a072e 100644 --- a/src/main/java/com/github/javafaker/Internet.java +++ b/src/main/java/com/github/javafaker/Internet.java @@ -51,7 +51,7 @@ public class Internet { } public String url() { - return join(new Object[]{ + return join( "www", ".", FakerIDN.toASCII( @@ -61,7 +61,7 @@ public class Internet { ), ".", domainSuffix() - }); + ); } /** diff --git a/src/main/java/com/github/javafaker/Name.java b/src/main/java/com/github/javafaker/Name.java index be66e816..0a5238f1 100644 --- a/src/main/java/com/github/javafaker/Name.java +++ b/src/main/java/com/github/javafaker/Name.java @@ -121,10 +121,10 @@ public class Name { */ public String username() { - String username = StringUtils.join(new String[]{ + String username = StringUtils.join( firstName().replaceAll("'", "").toLowerCase(), ".", - lastName().replaceAll("'", "").toLowerCase()} + lastName().replaceAll("'", "").toLowerCase() ); return StringUtils.deleteWhitespace(username); From 0002cc24a770f04e54b58791463934b980d25f10 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 16:03:48 +0300 Subject: [PATCH 8/9] Fix FoodTest.ingredient: ingredient names may contain dashes (e.g. Sun-Dried Tomatoes) --- src/test/java/com/github/javafaker/FoodTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/javafaker/FoodTest.java b/src/test/java/com/github/javafaker/FoodTest.java index 877b6027..bd6ff146 100644 --- a/src/test/java/com/github/javafaker/FoodTest.java +++ b/src/test/java/com/github/javafaker/FoodTest.java @@ -9,7 +9,7 @@ public class FoodTest extends AbstractFakerTest { @Test public void ingredient() { - assertThat(faker.food().ingredient(), matchesRegularExpression("[A-Za-z ]+")); + assertThat(faker.food().ingredient(), matchesRegularExpression("[A-Za-z- ]+")); } @Test From 12be503e8719c912cac6a3271705a3580e7de390 Mon Sep 17 00:00:00 2001 From: Valery Yatsynovich Date: Tue, 13 Aug 2019 16:16:26 +0300 Subject: [PATCH 9/9] Fix LeagueOfLegendsTest.champion: champion names may contain ampersands (e.g. Nunu & Willump) --- src/test/java/com/github/javafaker/LeagueOfLegendsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java index 0e3265a0..0ff71b01 100644 --- a/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java +++ b/src/test/java/com/github/javafaker/LeagueOfLegendsTest.java @@ -10,7 +10,7 @@ public class LeagueOfLegendsTest extends AbstractFakerTest { @Test public void champion() { - assertThat(faker.leagueOfLegends().champion(), matchesRegularExpression("^(\\w+\\.?-?'?\\s?)+$")); + assertThat(faker.leagueOfLegends().champion(), matchesRegularExpression("^(\\w+\\.?-?'?\\s?&?\\s?)+$")); } @Test