Bump libs + Some minor cleaning

tsegall · Dec 26, 2024 · 029fe8d · 029fe8d
1 parent 0fee0fe
commit 029fe8d
Show file tree

Hide file tree

Showing 40 changed files with 103 additions and 67 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,10 @@
 
 ## Changes ##
 
+### 15.11.1
+ - INT: Bump google phonenumber to 8.13.52, commons-text to 1.13.0, guava to 33.4.0-jre, logback-classic to 1.5.15, gradle to 8.12, org.springframework.boot to 3.4.1, io.spring.dependency-management to 1.1.7
+ - INT: Some minor cleaning
+
 ### 15.11.0
  - ENH: Add support for registering plugins on the RecordAnalyzer (via the template)
  - BUG: Added missing source for DateDemo and Serialize examples

diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 tasks.register('examples.build') {
@@ -31,6 +31,7 @@ subprojects {
 
 	compileJava {
 	    options.release = 11
+	    options.compilerArgs.add("-Xlint:unchecked")
 	}
 
 	java {

diff --git a/cli/src/main/java/com/cobber/fta/driver/faker/Faker.java b/cli/src/main/java/com/cobber/fta/driver/faker/Faker.java
@@ -39,7 +39,7 @@ public Faker(final DriverOptions options, final PrintStream output, final PrintS
 		this.error = error;
 	}
 
-	private String[] quoteAwareSplit(String input, char splitOn) {
+	private String[] quoteAwareSplit(final String input, final char splitOn) {
 		final LinkedHashSet<String> result = new LinkedHashSet<>();
 		boolean inQuotes = false;
 		int start = 0;

diff --git a/cli/src/main/java/com/cobber/fta/driver/faker/FakerBooleanLT.java b/cli/src/main/java/com/cobber/fta/driver/faker/FakerBooleanLT.java
@@ -23,7 +23,7 @@
 
 public class FakerBooleanLT extends FakerLT {
 	private boolean initialized = false;
-	private String[] values = new String[2];
+	private final String[] values = new String[2];
 	final Random random = new Random(31415926);
 
 	public FakerBooleanLT(final PluginDefinition plugin) {

diff --git a/core/src/main/java/com/cobber/fta/core/CircularBuffer.java b/core/src/main/java/com/cobber/fta/core/CircularBuffer.java
@@ -39,7 +39,7 @@ public boolean add(final String[] record) {
 	public String[] get() {
 		if (records == 0)
 			return null;
-		String[] ret = this.buffer[retrieve];
+		final String[] ret = this.buffer[retrieve];
 		records--;
 		retrieve = retrieve == depth - 1 ? 0 : retrieve + 1;
 		return ret;

diff --git a/core/src/test/java/com/cobber/fta/DetermineDateTimeFormatTests.java b/core/src/test/java/com/cobber/fta/DetermineDateTimeFormatTests.java
@@ -149,7 +149,7 @@ else if (FTAType.ZONEDDATETIME.equals(type)) {
 						text = offsetDateTime.format(formatter);
 						offsetDateTime = offsetDateTime.minusHours(209);
 					}
-					answer.append("\"").append(text).append("\"");
+					answer.append('"').append(text).append('"');
 					if (i + 1 < inputs.length)
 						answer.append(',');
 					else
@@ -2165,7 +2165,7 @@ public void testDTPResult_Unknown() {
 
 	@Test(groups = { TestGroups.ALL, TestGroups.DATETIME })
 	public void intuitAlmostISO4() {
-		final DateTimeParser det = new DateTimeParser().withDateResolutionMode(DateResolutionMode.MonthFirst);;
+		final DateTimeParser det = new DateTimeParser().withDateResolutionMode(DateResolutionMode.MonthFirst);
 		final String sample = "2004-01-01 12:35:41.999";
 		assertEquals(det.determineFormatString(sample), "yyyy-MM-dd HH:mm:ss.SSS");
 

diff --git a/core/src/test/java/com/cobber/fta/TestUtils.java b/core/src/test/java/com/cobber/fta/TestUtils.java
@@ -675,7 +675,7 @@ public void typeInfo() {
 		knownTypes.initialize(Locale.US);
 		assertTrue(knownTypes.getByID(KnownTypes.ID.ID_LONG).equals(knownTypes.getByID(KnownTypes.ID.ID_LONG)));
 		assertFalse(knownTypes.getByID(KnownTypes.ID.ID_LONG).equals(knownTypes.getByID(KnownTypes.ID.ID_LONG_GROUPING)));
-		assertFalse(knownTypes.getByID(KnownTypes.ID.ID_LONG).equals(null));
+		assertFalse(knownTypes.getByID(KnownTypes.ID.ID_LONG) == null);
 
 		assertFalse(knownTypes.getByID(KnownTypes.ID.ID_LONG).hasGrouping());
 		assertFalse(knownTypes.getByID(KnownTypes.ID.ID_LONG).isSigned());

diff --git a/examples/contextual/build.gradle b/examples/contextual/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/core/datedemo/build.gradle b/examples/core/datedemo/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/core/dateformat/build.gradle b/examples/core/dateformat/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/core/dateformattrained/build.gradle b/examples/core/dateformattrained/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/core/speed/build.gradle b/examples/core/speed/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/dateparsing/build.gradle b/examples/dateparsing/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/datetraining/build.gradle b/examples/datetraining/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/generation/build.gradle b/examples/generation/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/mergesimple/build.gradle b/examples/mergesimple/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/mergesimple/src/main/java/mergesimple/MergeSimple.java b/examples/mergesimple/src/main/java/mergesimple/MergeSimple.java
@@ -18,7 +18,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import com.cobber.fta.LogicalType;
 import com.cobber.fta.TextAnalysisResult;
 import com.cobber.fta.TextAnalyzer;
 import com.cobber.fta.core.FTAException;

diff --git a/examples/minicli/build.gradle b/examples/minicli/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/modebulk/build.gradle b/examples/modebulk/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/moderecord/build.gradle b/examples/moderecord/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/modestreaming/build.gradle b/examples/modestreaming/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/performance/build.gradle b/examples/performance/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/sampleplugin/build.gradle b/examples/sampleplugin/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/serialize/build.gradle b/examples/serialize/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/serialize/src/main/java/serialize/Serialize.java b/examples/serialize/src/main/java/serialize/Serialize.java
@@ -34,7 +34,7 @@ public static void main(final String[] args) throws FTAException {
 
 		String serialized = analysis.serialize();
 		for (int i = 0; i < 10000; i++) {
-			TextAnalyzer t = TextAnalyzer.deserialize(serialized);
+			final TextAnalyzer t = TextAnalyzer.deserialize(serialized);
 			t.train(options[r.nextInt(options.length)]);
 			serialized = t.serialize();
 		}
@@ -46,7 +46,7 @@ public static void main(final String[] args) throws FTAException {
 		System.err.println("Detail: " + result.asJSON(true, 1));
 
 		// Given the Semantic Type we retrieve the associated plugin
-		LogicalType semanticType = finalAnalysis.getPlugins().getRegistered(result.getSemanticType());
+		final LogicalType semanticType = finalAnalysis.getPlugins().getRegistered(result.getSemanticType());
 
 		// Use the plugin to get the non-localized description
 		System.err.printf("Description: %s%n", semanticType.getDescription());

diff --git a/examples/validation/build.gradle b/examples/validation/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 wrapper {
-	gradleVersion = '8.11.1'
+	gradleVersion = '8.12'
 }
 
 repositories {

diff --git a/examples/web/build.gradle b/examples/web/build.gradle
@@ -1,14 +1,14 @@
 plugins {
-	id 'org.springframework.boot' version '3.4.0'
-	id 'io.spring.dependency-management' version '1.1.6'
+	id 'org.springframework.boot' version '3.4.1'
+	id 'io.spring.dependency-management' version '1.1.7'
 	id "com.github.ben-manes.versions" version '0.51.0'
 	id 'java'
 	id 'war'
 	id 'eclipse'
 }
 
 wrapper {
-        gradleVersion = '8.11.1'
+        gradleVersion = '8.12'
 }
 
 group = 'com.cobber.fta'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle b/settings.gradle
@@ -2,7 +2,7 @@ pluginManagement {
 	repositories {
 		mavenCentral()
 		maven {
-		      url 'https://plugins.gradle.org/m2/'
+		      url = 'https://plugins.gradle.org/m2/'
 		}
 		gradlePluginPortal()
 	}
@@ -40,7 +40,7 @@ includeBuild 'examples/core/speed'
 dependencyResolutionManagement {
 	versionCatalogs {
 		libs {
-			version('fta', '15.11.0')
+			version('fta', '15.11.1')
 			version('jacoco', '0.8.12')
 
 // https://mvnrepository.com/artifact/com.univocity/univocity-parsers
@@ -54,19 +54,19 @@ dependencyResolutionManagement {
 // https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310
 			library('jacksonDataType', 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.2')
 // https://mvnrepository.com/artifact/com.googlecode.libphonenumber/libphonenumber
-			library('googlePhoneNumber', 'com.googlecode.libphonenumber:libphonenumber:8.13.51')
+			library('googlePhoneNumber', 'com.googlecode.libphonenumber:libphonenumber:8.13.52')
 // https://mvnrepository.com/artifact/org.apache.commons/commons-text
-			library('commonsText', 'org.apache.commons:commons-text:1.12.0')
+			library('commonsText', 'org.apache.commons:commons-text:1.13.0')
 // https://mvnrepository.com/artifact/com.github.krraghavan/xeger
 			library('xeger', 'com.github.krraghavan:xeger:1.0.0-RELEASE')
 // https://mvnrepository.com/artifact/dk.brics.automaton/automaton
 			library('automaton', 'dk.brics:automaton:1.12-4')
 // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
 			library('slf4jAPI', 'org.slf4j:slf4j-api:2.0.16')
 // https://mvnrepository.com/artifact/com.google.guava/guava
-			library('guava', 'com.google.guava:guava:33.3.1-jre')
+			library('guava', 'com.google.guava:guava:33.4.0-jre')
 // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
-			library('logbackClassic', 'ch.qos.logback:logback-classic:1.5.12')
+			library('logbackClassic', 'ch.qos.logback:logback-classic:1.5.15')
 // https://mvnrepository.com/artifact/com.datadoghq/sketches-java
 			library('sketches', 'com.datadoghq:sketches-java:0.8.3')
 		}

diff --git a/types/src/main/java/com/cobber/fta/CacheLRU.java b/types/src/main/java/com/cobber/fta/CacheLRU.java
@@ -23,22 +23,22 @@
 public class CacheLRU<K, V> {
     private final Cache<K, V> cache;
 
-    public CacheLRU(int capacity) {
+    public CacheLRU(final int capacity) {
         this.cache = CacheBuilder.newBuilder()
                 .maximumSize(capacity)
                 .expireAfterAccess(10, TimeUnit.MINUTES)
                 .build();
     }
 
-    public void put(K key, V value) {
+    public void put(final K key, final V value) {
         cache.put(key, value);
     }
 
     public V get(K key) {
         return cache.getIfPresent(key);
     }
 
-    public void invalidate(K key) {
+    public void invalidate(final K key) {
         cache.invalidate(key);
     }
 

diff --git a/types/src/main/java/com/cobber/fta/CommonComparator.java b/types/src/main/java/com/cobber/fta/CommonComparator.java
@@ -26,7 +26,7 @@
 
 import com.cobber.fta.core.FTAType;
 
-public class CommonComparator<T extends Comparable> implements Comparator<String> {
+public class CommonComparator<T extends Comparable<? super T>> implements Comparator<String> {
 	private final StringConverter stringConverter;
 
 	public CommonComparator(final StringConverter stringConverter) {
@@ -39,7 +39,7 @@ public int compare(final String input1, final String input2) {
 		if (val1 == null)
 			System.err.println("*** Failed to convert ... " + input1);
 		final T val2 = (T)stringConverter.getValue(input2);
-		final int value =  val1.compareTo(val2);
+		final int value = val1.compareTo(val2);
 
         if (value < 0)
             return -1;

diff --git a/types/src/main/java/com/cobber/fta/NumericInfo.java b/types/src/main/java/com/cobber/fta/NumericInfo.java
@@ -33,8 +33,8 @@ public class NumericInfo {
 
 	private NumericInfo nonLocalized;
 
-	private NumericInfo(char decimalSeparator, char groupingSeparator, char minusSign,
-			boolean hasNegativePrefix, char negativePrefix, boolean hasNegativeSuffix, char negativeSuffix) {
+	private NumericInfo(final char decimalSeparator, final char groupingSeparator, final char minusSign,
+			final boolean hasNegativePrefix, final char negativePrefix, final boolean hasNegativeSuffix, final char negativeSuffix) {
 		this.decimalSeparator = decimalSeparator;
 		this.groupingSeparator = groupingSeparator;
 		this.minusSign = minusSign;
@@ -47,7 +47,7 @@ public NumericInfo getNonLocalized() {
 		return nonLocalized;
 	}
 
-	NumericInfo(Locale locale) throws FTAUnsupportedLocaleException {
+	NumericInfo(final Locale locale) throws FTAUnsupportedLocaleException {
 		final DecimalFormatSymbols formatSymbols = new DecimalFormatSymbols(locale);
 		decimalSeparator = formatSymbols.getDecimalSeparator();
 		groupingSeparator = formatSymbols.getGroupingSeparator();