Moved CreditCardType to an internal class. Cleaned up a few Qodana wa…

…rnings, and fixed Qodana URL. (#786)
datafaker-net · Apr 23, 2023 · eb2892d · eb2892d
1 parent 3d4c572
commit eb2892d
Show file tree

Hide file tree

Showing 15 changed files with 58 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@
 [![Maven Status](https://maven-badges.herokuapp.com/maven-central/net.datafaker/datafaker/badge.svg?style=flat)](http://mvnrepository.com/artifact/net.datafaker/datafaker)
 [![License](http://img.shields.io/:license-apache-brightgreen.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 [![codecov](https://codecov.io/gh/datafaker-net/datafaker/branch/main/graph/badge.svg?token=FJ6EXMUTFD)](https://codecov.io/gh/datafaker-net/datafaker)
-[![Qodana](https://github.com/datafaker-net/datafaker/actions/workflows/qodana.yml/badge.svg)](https://qodana.cloud/projects/AbQnV/reports/zZ7q9)
+[![Qodana](https://github.com/datafaker-net/datafaker/actions/workflows/qodana.yml/badge.svg)](https://qodana.cloud/projects/AbQnV)
 
 This library is a modern fork of [java-faker](https://github.com/DiUS/java-faker) with up to date libraries and several newly added Fake Generators. 
 

diff --git a/src/main/java/net/datafaker/idnumbers/NricNumber.java b/src/main/java/net/datafaker/idnumbers/NricNumber.java
@@ -18,7 +18,7 @@ private record NricType(char firstLetter, String matchLetters, int[] code, int i
 
         public String format(int[] digits) {
                 int value = initialValue;
-                StringBuilder id = new StringBuilder(firstLetter + "");
+                StringBuilder id = new StringBuilder(String.valueOf(firstLetter));
                 for (int i = 0; i < digits.length; i++) {
                     value += digits[i] * code[i];
                     id.append(digits[i]);

diff --git a/src/main/java/net/datafaker/idnumbers/ZhCnIdNumber.java b/src/main/java/net/datafaker/idnumbers/ZhCnIdNumber.java
@@ -72,7 +72,7 @@ public String getValidSsn(BaseProviders faker) {
         if (count == 10) {
             s += 'X';
         } else {
-            s += (count + "");
+            s += (String.valueOf(count));
         }
         return s;
     }

diff --git a/.../java/net/datafaker/service/FakerIDN.java → ...t/datafaker/internal/helper/FakerIDN.java b/.../java/net/datafaker/service/FakerIDN.java → ...t/datafaker/internal/helper/FakerIDN.java
@@ -1,4 +1,4 @@
-package net.datafaker.service;
+package net.datafaker.internal.helper;
 
 import java.net.IDN;
 
@@ -7,9 +7,9 @@
  */
 public class FakerIDN {
     /**
-     * {@link IDN#toASCII(String)} is too picky for our needs.  It was throwing exceptions for fa.yml and
-     * he.yml as they're Bidi languages and something was causing them to die.  This is kind of a brute force
-     * fix but it appears to fix the issue.
+     * {@link IDN#toASCII(String)} is too picky for our needs. It was throwing exceptions for fa.yml and
+     * he.yml as they are Bidi languages and something was causing them to die. This is kind of a brute force
+     * fix, but it appears to fix the issue.
      */
     public static String toASCII(String in) {
         try {

diff --git a/src/main/java/net/datafaker/internal/helper/SingletonLocale.java b/src/main/java/net/datafaker/internal/helper/SingletonLocale.java
@@ -51,4 +51,11 @@ public boolean equals(Object o) {
     public int hashCode() {
         return hashId;
     }
+
+    @Override
+    public String toString() {
+        return "SingletonLocale{" +
+            "locale=" + locale +
+            '}';
+    }
 }
diff --git a/src/main/java/net/datafaker/providers/base/Company.java b/src/main/java/net/datafaker/providers/base/Company.java
@@ -1,6 +1,6 @@
 package net.datafaker.providers.base;
 
-import net.datafaker.service.FakerIDN;
+import net.datafaker.internal.helper.FakerIDN;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/net/datafaker/providers/base/CreditCardType.java b/src/main/java/net/datafaker/providers/base/CreditCardType.java
diff --git a/src/main/java/net/datafaker/providers/base/Finance.java b/src/main/java/net/datafaker/providers/base/Finance.java
@@ -8,6 +8,21 @@
  * @since 0.8.0
  */
 public class Finance extends AbstractProvider<BaseProviders> {
+
+    enum CreditCardType {
+        VISA,
+        MASTERCARD,
+        DISCOVER,
+        AMERICAN_EXPRESS,
+        DINERS_CLUB,
+        JCB,
+        SWITCH,
+        SOLO,
+        DANKORT,
+        FORBRUGSFORENINGEN,
+        LASER
+    }
+
     private static final Pattern NUMBERS = Pattern.compile("[^0-9]");
     private static final Pattern EMPTY_STRING = Pattern.compile("");
 

diff --git a/src/main/java/net/datafaker/providers/base/Internet.java b/src/main/java/net/datafaker/providers/base/Internet.java
@@ -1,6 +1,6 @@
 package net.datafaker.providers.base;
 
-import net.datafaker.service.FakerIDN;
+import net.datafaker.internal.helper.FakerIDN;
 import net.datafaker.service.RandomService;
 
 import java.net.Inet4Address;

diff --git a/src/main/java/net/datafaker/providers/base/Twitter.java b/src/main/java/net/datafaker/providers/base/Twitter.java
@@ -16,7 +16,7 @@
  */
 public class Twitter extends AbstractProvider<BaseProviders> {
 
-    private final String basicstr = "QabR0cYdZ1efSg2hi3jNOPkTUM4VLlmXK5nJo6WIpHGqF7rEs8tDuC9vwBxAyz";
+    private static final String BASIC_STRING = "QabR0cYdZ1efSg2hi3jNOPkTUM4VLlmXK5nJo6WIpHGqF7rEs8tDuC9vwBxAyz";
 
     /**
      * @param faker used as constructor
@@ -110,7 +110,7 @@ public String text(String[] keywords, int sentenceMaxLength, int wordMaxLength)
         for (int i = 0; i < sentenceLength; i++) {
             int tmpWordLength = random.nextInt(3, wordMaxLength);
             for (int j = 0; j < tmpWordLength; j++) {
-                sb.append(basicstr.charAt(random.nextInt(basicstr.length())));
+                sb.append(BASIC_STRING.charAt(random.nextInt(BASIC_STRING.length())));
             }
             text.add(sb.toString());
             sb.setLength(0);
@@ -156,7 +156,7 @@ public String getLink(String username, int extraLength) {
         sb.append(username).append("/");
 
         for (int i = 0; i < extraLength; i++) {
-            sb.append(basicstr.charAt(random.nextInt(basicstr.length())));
+            sb.append(BASIC_STRING.charAt(random.nextInt(BASIC_STRING.length())));
         }
         return "https://twitter.com/" + sb;
     }

diff --git a/src/main/java/net/datafaker/transformations/JsonTransformer.java b/src/main/java/net/datafaker/transformations/JsonTransformer.java
@@ -126,7 +126,7 @@ private static void value2String(Object value, StringBuilder sb) {
                 sb.append("\"");
             }
             for (char c : String.valueOf(value).toCharArray()) {
-                sb.append(ESCAPING_MAP.getOrDefault(c, c + ""));
+                sb.append(ESCAPING_MAP.getOrDefault(c, String.valueOf(c)));
             }
             if (toWrap) {
                 sb.append("\"");

diff --git a/src/main/java/net/datafaker/transformations/XmlTransformer.java b/src/main/java/net/datafaker/transformations/XmlTransformer.java
@@ -151,7 +151,7 @@ private String escape(String str) {
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < str.length(); i++) {
             final char c = str.charAt(i);
-            sb.append(ESCAPING_MAP.getOrDefault(c, c + ""));
+            sb.append(ESCAPING_MAP.getOrDefault(c, String.valueOf(c)));
         }
         return sb.toString();
     }

diff --git a/src/main/java/net/datafaker/transformations/sql/SqlTransformer.java b/src/main/java/net/datafaker/transformations/sql/SqlTransformer.java
@@ -219,40 +219,40 @@ private String handlePrimitivesInArray(Class<?> componentType, Object value) {
         StringJoiner joiner = new StringJoiner(", ");
         if (componentType == byte.class) {
             byte[] array = (byte[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (byte b : array) {
+                joiner.add(String.valueOf(b));
             }
         }
         if (componentType == short.class) {
             short[] array = (short[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (short i : array) {
+                joiner.add(String.valueOf(i));
             }
         }
         if (componentType == boolean.class) {
             boolean[] array = (boolean[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (boolean b : array) {
+                joiner.add(String.valueOf(b));
             }
         } else if (componentType == int.class) {
             int[] array = (int[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (int i : array) {
+                joiner.add(String.valueOf(i));
             }
         } else if (componentType == long.class) {
             long[] array = (long[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (long l : array) {
+                joiner.add(String.valueOf(l));
             }
         } else if (componentType == float.class) {
             float[] array = (float[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (float v : array) {
+                joiner.add(String.valueOf(v));
             }
         } else if (componentType == double.class) {
             double[] array = (double[]) value;
-            for (int j = 0; j < array.length; j++) {
-                joiner.add(String.valueOf(array[j]));
+            for (double v : array) {
+                joiner.add(String.valueOf(v));
             }
         }
         return joiner.toString();
@@ -445,18 +445,19 @@ public SqlTransformerBuilder<IN> forceUseSqlQuoteIdentifier() {
         public SqlTransformer<IN> build() {
             if (dialect == null) {
                 return new SqlTransformer<>(
-                    schemaName, tableName, quote, dialect, sqlQuoteIdentifier, casing, withBatchMode, batchSize, keywordCase, forceSqlQuoteIdentifierUsage);
+                    schemaName, tableName, quote, null, sqlQuoteIdentifier, casing, withBatchMode, batchSize, keywordCase, forceSqlQuoteIdentifierUsage);
+            } else {
+                return new SqlTransformer<>(
+                    schemaName, tableName, quote, dialect, dialect.getSqlQuoteIdentifier(), dialect.getUnquotedCasing(),
+                    withBatchMode, batchSize, keywordCase, forceSqlQuoteIdentifierUsage);
             }
-            return new SqlTransformer<>(
-                schemaName, tableName, quote, dialect, dialect.getSqlQuoteIdentifier(), dialect.getUnquotedCasing(),
-                withBatchMode, batchSize, keywordCase, forceSqlQuoteIdentifierUsage);
         }
     }
 
     public enum Case {
         CAPITAL,
         LOWERCASE,
-        UPPERCASE;
+        UPPERCASE
     }
 
     enum SQLKeyWords {

diff --git a/...a/net/datafaker/service/FakerIDNTest.java → ...tafaker/internal/helper/FakerIDNTest.java b/...a/net/datafaker/service/FakerIDNTest.java → ...tafaker/internal/helper/FakerIDNTest.java
@@ -1,8 +1,7 @@
-package net.datafaker.service;
+package net.datafaker.internal.helper;
 
 import org.junit.jupiter.api.Test;
 
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 

diff --git a/src/test/java/net/datafaker/providers/base/FinanceTest.java b/src/test/java/net/datafaker/providers/base/FinanceTest.java
@@ -4,6 +4,7 @@
 import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
+import static net.datafaker.providers.base.Finance.*;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.List;