BUG: User-defined plugins not registered when merging two analyzers (Issue #155) + cleaning + bump libs

Author: tsegall

ChangeLog.md

@@ -1,6 +1,11 @@
 
 ## Changes ##
 
+### 17.4.1
+ - INT: Bump logback-classic to 1.5.27, google phonenumber to 9.0.23, gradle to 9.3.1
+ - INT: Cleaning.
+ - BUG: User-defined plugins not registered when merging two analyzers (Issue #155)
+
 ### 17.4.0
  - INT: Bump testng to 7.12.0, logback-classic to 1.5.26
  - ENH: Improve ZIP detection if have data of the form 99999- (i.e. a trailing hyphen)
@@ -16,15 +21,15 @@
  - ENH: Change approach to registering plugins - no longer require dataStream name.  Some methods added and some deprecated.
 
 ### 17.2.0
- - INT: Bump logback-classic to 1.5.24, gradle to 9.3.0, phonenumber to 9.0.21
+ - INT: Bump logback-classic to 1.5.24, gradle to 9.3.0, google phonenumber to 9.0.22
  - CLI: Add --semanticTypesPre to control whether user-defined types (--semanticType) are registered before built-ins
  - BUG: findByName on TextAnalyzer was not returning user-defined types
  - BUG: Preserve precedence on plugins registered on TextAnalyzer template for RecordAnalyzer (Issue #152)
  - BUG: Check for better RegExpTypes even if we have already detected a Semantic Type (Issue #152)
  - INT: Remove remaining references to deprecated registerPluginList()
 
 ### 17.1.10
- - INT: Bump logback-classic to 1.5.23, SpotBugs to 6.4.8, commons-text:1.15.0, google phonenumber to 9.0.21,
+ - INT: Bump logback-classic to 1.5.23, SpotBugs to 6.4.8, commons-text:1.15.0, google phonenumber to 9.0.21
  - ENH: Small improvement to Semantic Type NAME.FIRST_LAST to reject more company names (Issue #151)
 
 ### 17.1.9

build.gradle

@@ -7,7 +7,7 @@ import com.github.spotbugs.snom.Confidence
 import com.github.spotbugs.snom.Effort
 
 wrapper {
-	gradleVersion = '9.3.0'
+	gradleVersion = '9.3.1'
 }
 
 tasks.register('examples.clean') {

cli/src/main/java/com/cobber/fta/driver/FileProcessor.java

@@ -458,11 +458,11 @@ else if (result.getCardinality() > 20) {
 							else {
 								final ArrayNode enumArray = mapper.createArrayNode();
 
-								for (String key : result.getCardinalityDetails().keySet())
+								for (final String key : result.getCardinalityDetails().keySet())
 									enumArray.add(key);
 								fieldNode.set("values", enumArray);
 
-								Map<String, Long> map = result.getCardinalityDetails();
+								final Map<String, Long> map = result.getCardinalityDetails();
 								map.keySet().stream().sorted().collect(Collectors.joining(","));
 							}
 							break;
@@ -513,7 +513,7 @@ else if (result.getCardinality() > 20) {
 				}
 
 				if (options.validate == 2 && matched[i] != result.getMatchCount()) {
-					String logicalType = result.isSemanticType() ? "Logical Type " : "";
+					final String logicalType = result.isSemanticType() ? "Logical Type " : "";
 
 					if (matched[i] > result.getMatchCount())
 						error.printf("\t*** NOTE: Composite: %s, field: %s (%d), match Count via RegExp (%d) > %smatch analysis (%d) ***%n",

cli/src/main/java/com/cobber/fta/driver/faker/Faker.java

@@ -63,7 +63,7 @@ public boolean fake() {
 		}
 		final FakerParameters[] parameters = new FakerParameters[params.size()];
 		final LogicalType[] logicals = new LogicalType[params.size()];
-		for (FakerParameters param : params) {
+		for (final FakerParameters param : params) {
 			parameters[param.index] = param;
 			parameters[param.index].bind();
 		}

cli/src/main/java/com/cobber/fta/driver/faker/FakerParameters.java

@@ -31,9 +31,6 @@ public class FakerParameters {
 	public String distribution;
 	public String[] values;
 
-	public FakerParameters() {
-	}
-
 	public void bind() {
 		if ("LOCALDATE".equals(type))
 			clazz = "com.cobber.fta.driver.faker.FakerLocalDateLT";

cli/src/main/java/com/cobber/fta/driver/faker/FakerStringLT.java

@@ -67,7 +67,7 @@ public String nextRandom() {
 			return values[random.nextInt(values.length)];
 
 		if (format.startsWith(".{")) {
-			StringBuffer buf = new StringBuffer(freeText.nextRandom());
+			final StringBuffer buf = new StringBuffer(freeText.nextRandom());
 			while (buf.length() < minLength)
 				buf.append(" ").append(freeText.nextRandom());
 

core/src/main/java/com/cobber/fta/TypeInfo.java

@@ -50,18 +50,18 @@ int getFlag() {
 		}
 	}
 
-	public final static int SIGNED_FLAG = TypeModifier.SIGNED.getFlag();
-	public final static int GROUPING_FLAG = TypeModifier.GROUPING.getFlag();
-	public final static int EXPONENT_FLAG = TypeModifier.EXPONENT.getFlag();
-	public final static int NON_LOCALIZED_FLAG = TypeModifier.NON_LOCALIZED.getFlag();
-	public final static int SIGNED_TRAILING_FLAG = TypeModifier.SIGNED_TRAILING.getFlag();
-	public final static int NULL_FLAG = TypeModifier.NULL.getFlag();
-	public final static int BLANK_FLAG = TypeModifier.BLANK.getFlag();
-	public final static int BLANKORNULL_FLAG = TypeModifier.BLANKORNULL.getFlag();
-	public final static int TRUE_FALSE_FLAG = TypeModifier.TRUE_FALSE.getFlag();
-	public final static int YES_NO_FLAG = TypeModifier.YES_NO.getFlag();
-	public final static int Y_N_FLAG = TypeModifier.Y_N.getFlag();
-	public final static int ONE_ZERO_FLAG = TypeModifier.ONE_ZERO.getFlag();
+	public static final int SIGNED_FLAG = TypeModifier.SIGNED.getFlag();
+	public static final int GROUPING_FLAG = TypeModifier.GROUPING.getFlag();
+	public static final int EXPONENT_FLAG = TypeModifier.EXPONENT.getFlag();
+	public static final int NON_LOCALIZED_FLAG = TypeModifier.NON_LOCALIZED.getFlag();
+	public static final int SIGNED_TRAILING_FLAG = TypeModifier.SIGNED_TRAILING.getFlag();
+	public static final int NULL_FLAG = TypeModifier.NULL.getFlag();
+	public static final int BLANK_FLAG = TypeModifier.BLANK.getFlag();
+	public static final int BLANKORNULL_FLAG = TypeModifier.BLANKORNULL.getFlag();
+	public static final int TRUE_FALSE_FLAG = TypeModifier.TRUE_FALSE.getFlag();
+	public static final int YES_NO_FLAG = TypeModifier.YES_NO.getFlag();
+	public static final int Y_N_FLAG = TypeModifier.Y_N.getFlag();
+	public static final int ONE_ZERO_FLAG = TypeModifier.ONE_ZERO.getFlag();
 
 	private FTAType baseType;
 
@@ -267,7 +267,7 @@ public String getRegExp() {
 		return regexp;
 	}
 
-	public void setRegExp(String regexp) {
+	public void setRegExp(final String regexp) {
 		this.regexp = regexp;
 	}
 

core/src/main/java/com/cobber/fta/core/FTAType.java

@@ -86,7 +86,7 @@ public String toString() {
 	 * @return A boolean indicating if the Type for this pattern is numeric.
 	 */
 	public boolean isNumeric() {
-		return LONG.equals(this) || DOUBLE.equals(this);
+		return LONG == this || DOUBLE == this;
 	}
 
 	/**
@@ -95,8 +95,8 @@ public boolean isNumeric() {
 	 * @return A boolean indicating if the Type for this pattern includes a Date.
 	 */
 	public boolean isDateType() {
-		return LOCALDATE.equals(this) || LOCALDATETIME.equals(this) ||
-				OFFSETDATETIME.equals(this) || ZONEDDATETIME.equals(this);
+		return LOCALDATE == this || LOCALDATETIME == this ||
+				OFFSETDATETIME == this || ZONEDDATETIME == this;
 	}
 
 	/**
@@ -105,6 +105,6 @@ public boolean isDateType() {
 	 * @return A boolean indicating if the Type for this pattern includes a Date.
 	 */
 	public boolean isDateOrTimeType() {
-		return LOCALTIME.equals(this) || this.isDateType();
+		return LOCALTIME == this || this.isDateType();
 	}
 }

core/src/main/java/com/cobber/fta/core/PatternFG.java

@@ -28,15 +28,15 @@ public static PatternFG compile(final String wPattern) {
 	private PatternFG(final String wPattern) {
 		final String withSentinel = wPattern + '|';
 
-		long wordCount = withSentinel.codePoints().filter(ch -> ch =='|').count() + 1;
+		final long wordCount = withSentinel.codePoints().filter(ch -> ch =='|').count() + 1;
 		words = new String[(int)wordCount];
 
 		int start = 0;
 		int wordIndex = 0;
 		for (int i = start; i < withSentinel.length(); i++) {
 			if (withSentinel.charAt(i) == '|') {
 				if (i != withSentinel.length() - 1) {
-					char ch = withSentinel.charAt(i + 1);
+					final char ch = withSentinel.charAt(i + 1);
 					candidates[ch] = true;
 					if (Character.isLowerCase(ch))
 						candidates[Character.toUpperCase(ch)] = true;
@@ -57,15 +57,15 @@ public boolean matcher(final String input) {
 		if (input == null || input.isEmpty())
 			return false;
 
-		char ch = input.charAt(0);
+		final char ch = input.charAt(0);
 		if (ch >= candidates.length || !candidates[ch])
 			return false;
 
 		final int len = input.length();
 		if (len == 0 || len < minLength || len > maxLength)
 			return false;
 
-		for (String word : words)
+		for (final String word : words)
 			if (input.equalsIgnoreCase(word))
 				return true;
 

core/src/main/java/com/cobber/fta/core/RegExpGenerator.java

@@ -98,7 +98,7 @@ public static String merge(String firstRE, String secondRE) {
 		if (firstRE.equals(secondRE))
 			return firstRE;
 
-		String simpleAnswer = firstRE.compareTo(secondRE) < 0 ? firstRE + '|' + secondRE : secondRE + '|' + firstRE;
+		final String simpleAnswer = firstRE.compareTo(secondRE) < 0 ? firstRE + '|' + secondRE : secondRE + '|' + firstRE;
 
 		if (!firstRE.contains(secondRE) && !secondRE.contains(firstRE))
 			return simpleAnswer;
@@ -112,7 +112,7 @@ public static String merge(String firstRE, String secondRE) {
 
 		// Case 1: first starts with second (e.g. "\d{2}" and "\d{2}-\d{2}") should return "\d{2}(-\d{2})?")
 		if (firstRE.startsWith(secondRE)) {
-			String optionalTail = firstRE.substring(secondRE.length());
+			final String optionalTail = firstRE.substring(secondRE.length());
 			// We need to not merge if we have something like "\d{2}" and "\d-\d{2}" as we would NOT want to return "\d({2}-\d{2})?"
 			if (optionalTail.charAt(0) == '{')
 				return simpleAnswer;