refactor: clean up Guava removal per code review

- Fix broken indentation in PersonProvider and PlNationalIdentityCardNumberProvider
- Use Validate.notNull/isTrue from commons-lang3 instead of hand-rolled if/throw
- Use StringUtils.isNotEmpty instead of manual null+isEmpty check
- Use Set.of() directly instead of new HashSet<>(Set.of()) for immutable set
- Use List.of() instead of Arrays.asList() for constant lists
- Remove redundant Arrays.asList wrapper around String.split result
- Fix stale comment referencing removed checkArgument

Author: mariuszs

src/main/java/com/devskiller/jfairy/data/MapBasedDataMaster.java

@@ -13,6 +13,7 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.EnumUtils;
+import org.apache.commons.lang3.Validate;
 import org.snakeyaml.engine.v2.api.Load;
 import org.snakeyaml.engine.v2.api.LoadSettings;
 import com.devskiller.jfairy.producer.BaseProducer;
@@ -74,22 +75,15 @@ public LanguageCode getLanguage() {
 		return EnumUtils.getEnum(LanguageCode.class, getString(LANGUAGE_TAG).toUpperCase());
 	}
 
-	@SuppressWarnings({"unchecked", "ConstantConditions"}) // checked by checkArgument
+	@SuppressWarnings({"unchecked", "ConstantConditions"}) // checked by Validate
 	<T> T getData(String key, Class<T> type) {
-		if (key == null) {
-			throw new IllegalArgumentException("key cannot be null");
-		}
-		if (type == null) {
-			throw new IllegalArgumentException("type cannot be null");
-		}
+		Validate.notNull(key, "key cannot be null");
+		Validate.notNull(type, "type cannot be null");
 
 		Object element = dataSource.get(key);
-		if (element == null) {
-			throw new IllegalArgumentException("No such key: " + key);
-		}
-		if (!type.isAssignableFrom(element.getClass())) {
-			throw new IllegalArgumentException("Element under desired key has incorrect type - should be " + type.getSimpleName());
-		}
+		Validate.isTrue(element != null, "No such key: %s", key);
+		Validate.isTrue(type.isAssignableFrom(element.getClass()),
+			"Element under desired key has incorrect type - should be %s", type.getSimpleName());
 
 		return (T) element;
 	}

src/main/java/com/devskiller/jfairy/producer/DateProducer.java

@@ -11,6 +11,8 @@
 import java.time.Period;
 import java.time.ZoneOffset;
 
+import org.apache.commons.lang3.Validate;
+
 import static java.time.temporal.TemporalAdjusters.firstDayOfYear;
 import static java.time.temporal.TemporalAdjusters.lastDayOfYear;
 
@@ -28,9 +30,7 @@ public DateProducer(BaseProducer baseProducer, TimeProvider timeProvider) {
 	}
 
 	public LocalDateTime randomDateInThePast(int maxYearsEarlier) {
-		if (maxYearsEarlier < 0) {
-			throw new IllegalArgumentException(maxYearsEarlier + " has to be >= 0");
-		}
+		Validate.isTrue(maxYearsEarlier >= 0, "%d has to be >= 0", maxYearsEarlier);
 		LocalDateTime currentDate = timeProvider.getCurrentTime();
 		LocalDateTime latestDateInThePast = currentDate.minusSeconds(SECONDS_BEFORE_TO_BE_IN_THE_PAST);
 		LocalDateTime maxYearsEarlierDate = currentDate.minusYears(maxYearsEarlier);
@@ -54,9 +54,7 @@ public LocalDateTime randomDateBetweenTwoDates(LocalDateTime from, LocalDateTime
 	}
 
 	public LocalDateTime randomDateBetweenYears(int fromYear, int toYear) {
-		if (fromYear > toYear) {
-			throw new IllegalArgumentException(fromYear + " has to be <= " + toYear);
-		}
+		Validate.isTrue(fromYear <= toYear, "%d has to be <= %d", fromYear, toYear);
 		LocalDateTime fromDate = getDateForFirstDayForGivenYear(fromYear);
 		LocalDateTime toDate = getDateForLastDayForGivenYear(toYear);
 		return randomDateBetweenTwoDates(fromDate, toDate);

src/main/java/com/devskiller/jfairy/producer/company/locale/en/EnVATIdentificationNumberProvider.java

@@ -1,6 +1,5 @@
 package com.devskiller.jfairy.producer.company.locale.en;
 
-import java.util.HashSet;
 import java.util.Set;
 
 import com.devskiller.jfairy.producer.BaseProducer;
@@ -27,7 +26,7 @@ public class EnVATIdentificationNumberProvider implements VATIdentificationNumbe
 	private static final int AREA_NUMBER_LENGTH = 2;
 
 	private BaseProducer baseProducer;
-	private static Set<Integer> excludedNumbers = new HashSet<>(Set.of(7, 8, 9, 17, 18, 19, 28, 29, 41, 47, 49, 69, 70, 79, 89, 96, 97));
+	private static final Set<Integer> EXCLUDED_NUMBERS = Set.of(7, 8, 9, 17, 18, 19, 28, 29, 41, 47, 49, 69, 70, 79, 89, 96, 97);
 
 
 	public EnVATIdentificationNumberProvider(BaseProducer baseProducer) {
@@ -58,7 +57,7 @@ private void fillAreaNumber(char[] ein) {
 		Integer number;
 		do {
 			number = baseProducer.randomBetween(0, 99);
-		} while (excludedNumbers.contains(number));
+		} while (EXCLUDED_NUMBERS.contains(number));
 		char[] digits = leftPad(number.toString(), AREA_NUMBER_LENGTH, "0").toCharArray();
 		arraycopy(digits, 0, ein, 0, digits.length);
 

src/main/java/com/devskiller/jfairy/producer/payment/DefaultIBANProvider.java

@@ -3,6 +3,7 @@
 import java.util.IllegalFormatCodePointException;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.iban4j.CountryCode;
 import org.iban4j.Iban;
 import org.iban4j.UnsupportedCountryException;
@@ -48,7 +49,7 @@ public IBAN get() {
 					.bankCode(bankCode)
 					.branchCode(branchCode)
 					.nationalCheckDigit(nationalCheckDigit);
-				if (accountNumber != null && !accountNumber.isEmpty()) {
+				if (StringUtils.isNotEmpty(accountNumber)) {
 					builder.accountNumber(accountNumber);
 				}
 				Iban iban = builder.buildRandom();

src/main/java/com/devskiller/jfairy/producer/person/PersonProvider.java

@@ -9,11 +9,11 @@ public interface PersonProvider extends Supplier<Person> {
 
 	int MIN_AGE = 1;
 	int MAX_AGE = 100;
-String FIRST_NAME = "firstNames";
-String LAST_NAME = "lastNames";
-String PERSONAL_EMAIL = "personalEmails";
-String TELEPHONE_NUMBER_FORMATS = "telephone_number_formats";
-String JOB_TITLE = "jobTitles";
+	String FIRST_NAME = "firstNames";
+	String LAST_NAME = "lastNames";
+	String PERSONAL_EMAIL = "personalEmails";
+	String TELEPHONE_NUMBER_FORMATS = "telephone_number_formats";
+	String JOB_TITLE = "jobTitles";
 
 	@Override
 	Person get();

src/main/java/com/devskiller/jfairy/producer/person/locale/en/EnNationalIdentityCardNumberProvider.java

@@ -1,6 +1,5 @@
 package com.devskiller.jfairy.producer.person.locale.en;
 
-import java.util.Arrays;
 import java.util.List;
 
 import com.devskiller.jfairy.producer.BaseProducer;
@@ -22,7 +21,7 @@ public class EnNationalIdentityCardNumberProvider implements NationalIdentityCar
 	private static final int AREA_NUMBER_LENGTH = 3;
 	private static final int GROUP_NUMBER_LENGTH = 2;
 	private static final int GROUP_NUMBER_INDEX = 4;
-	private static final List<Integer> HYPHEN_INDEXES = Arrays.asList(3, 6);
+	private static final List<Integer> HYPHEN_INDEXES = List.of(3, 6);
 	private static final int SERIAL_NUMBER_LENGTH = 4;
 	private static final int SERIAL_NUMBER_INDEX = 7;
 

src/main/java/com/devskiller/jfairy/producer/person/locale/pl/PlNationalIdentityCardNumberProvider.java

@@ -6,6 +6,8 @@
 import com.devskiller.jfairy.producer.DateProducer;
 import com.devskiller.jfairy.producer.person.NationalIdentityCardNumberProvider;
 import com.devskiller.jfairy.producer.util.AlphaNumberSystem;
+import org.apache.commons.lang3.Validate;
+
 import static java.lang.String.copyValueOf;
 import static java.lang.String.valueOf;
 import static java.lang.System.arraycopy;
@@ -18,16 +20,16 @@
  */
 public class PlNationalIdentityCardNumberProvider implements NationalIdentityCardNumberProvider {
 
-static final int ISSUING_BEGIN = 2000;
+	static final int ISSUING_BEGIN = 2000;
 
 	private static final int[] WEIGHTS = new int[]{7, 3, 1, 0, 7, 3, 1, 7, 3};
 	private static final int CHECKSUM_INDEX = 3;
 
 	private static final int DIGITS_PART_SIZE = 5;
 
-static final int MAX_DIGITS_PART_VALUE = 99999;
+	static final int MAX_DIGITS_PART_VALUE = 99999;
 
-static final int LETTER_WEIGHT = 45;
+	static final int LETTER_WEIGHT = 45;
 	private static final int LETTERS_PART_SIZE = 3;
 	private static final int LETTER_VALUE_MODIFIER = 10;
 	private static final int ALPHABET_SIZE = 26;
@@ -53,9 +55,7 @@ public String get() {
 
 	public String get(LocalDate date) {
 
-		if (date.getYear() < ISSUING_BEGIN) {
-			throw new IllegalArgumentException("Polish ID was introduced in 2000");
-		}
+		Validate.isTrue(date.getYear() >= ISSUING_BEGIN, "Polish ID was introduced in 2000");
 
 		char[] id = new char[WEIGHTS.length];
 

src/main/java/com/devskiller/jfairy/producer/text/TextProducerInternal.java

@@ -4,7 +4,6 @@
 package com.devskiller.jfairy.producer.text;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import com.devskiller.jfairy.data.DataMaster;
@@ -105,8 +104,9 @@ public String latinSentence(int wordCount) {
 
 	private String sentence(List<String> words, int wordCount) {
 		String randomWords = rawWords(words, wordCount, WORD_COUNT_PRECISION_IN_SENTENCE);
-		List<String> sentences = new ArrayList<>();
-		for (String sentence : Arrays.asList(randomWords.split("\\. "))) {
+		String[] parts = randomWords.split("\\. ");
+		List<String> sentences = new ArrayList<>(parts.length);
+		for (String sentence : parts) {
 			sentences.add(capitalize(sentence));
 		}
 		String sentence = capitalize(String.join(". ", sentences));

src/test/groovy/com/devskiller/jfairy/producer/company/locale/en/EnVATIdentificationNumberProviderSpec.groovy

@@ -41,7 +41,7 @@ class EnVATIdentificationNumberProviderSpec extends Specification {
 			for (char digit : areaPart.toCharArray()) {
 				digit.isDigit()
 			}
-			!EnVATIdentificationNumberProvider.excludedNumbers.contains(areaNumber)
+			!EnVATIdentificationNumberProvider.EXCLUDED_NUMBERS.contains(areaNumber)
 	}
 
 	def "should generate number with valid serial part"() {