INT: Bump logback-classic to 1.5.25, Jackson to 2.21.0 + Cleaning + gradle 10.0 changes

Author: tsegall

ChangeLog.md

@@ -1,6 +1,11 @@
 
 ## Changes ##
 
+### 17.3.0
+ - INT: Bump logback-classic to 1.5.25, Jackson to 2.21.0
+ - INT: Cleaning.
+ - INT: More gradle 10.0 changes
+
 ### 17.3.0
  - ENH: Change approach to registering plugins - no longer require dataStream name.  Some methods added and some deprecated.
 

build.gradle

@@ -3,6 +3,9 @@ plugins {
 	id "com.github.spotbugs" version "6.4.8" apply false
 }
 
+import com.github.spotbugs.snom.Confidence
+import com.github.spotbugs.snom.Effort
+
 wrapper {
 	gradleVersion = '9.3.0'
 }
@@ -59,8 +62,9 @@ subprojects {
 		}
 	}
 
-	artifacts {
-		archives javadocJar, sourcesJar
+	tasks.named("assemble") {
+		dependsOn javadocJar
+		dependsOn sourcesJar
 	}
 
 	jar {
@@ -157,7 +161,7 @@ subprojects {
 
 	spotbugs {
 		toolVersion = "4.9.8"
-		effort = "max"
+		effort = Effort.MAX
 		reportLevel = "low"
 		ignoreFailures = true
 	}

settings.gradle

@@ -40,7 +40,7 @@ includeBuild 'examples/core/speed'
 dependencyResolutionManagement {
 	versionCatalogs {
 		libs {
-			version('fta', '17.3.0')
+			version('fta', '17.3.1')
 			version('jacoco', '0.8.12')
 
 // https://mvnrepository.com/artifact/de.siegmar/fastcsv
@@ -50,13 +50,13 @@ dependencyResolutionManagement {
 // https://mvnrepository.com/artifact/commons-validator/commons-validator
 			library('commonsValidator', 'commons-validator:commons-validator:1.10.1')
 // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
-			library('jacksonDataCore', 'com.fasterxml.jackson.core:jackson-core:2.20.1')
+			library('jacksonDataCore', 'com.fasterxml.jackson.core:jackson-core:2.21.0')
 // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind
-			library('jacksonDataBind', 'com.fasterxml.jackson.core:jackson-databind:2.20.1')
+			library('jacksonDataBind', 'com.fasterxml.jackson.core:jackson-databind:2.21.0')
 // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
 			library('jacksonAnnotations', 'com.fasterxml.jackson.core:jackson-annotations:2.19.2')
 // https://mvnrepository.com/artifact/com.fasterxml.jackson.datatype/jackson-datatype-jsr310
-			library('jacksonDataType', 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.20.1')
+			library('jacksonDataType', 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.0')
 // https://mvnrepository.com/artifact/com.googlecode.libphonenumber/libphonenumber
 			library('googlePhoneNumber', 'com.googlecode.libphonenumber:libphonenumber:9.0.22')
 // https://mvnrepository.com/artifact/org.apache.commons/commons-text
@@ -70,7 +70,7 @@ dependencyResolutionManagement {
 // https://mvnrepository.com/artifact/com.google.guava/guava
 			library('guava', 'com.google.guava:guava:33.5.0-jre')
 // https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
-			library('logbackClassic', 'ch.qos.logback:logback-classic:1.5.24')
+			library('logbackClassic', 'ch.qos.logback:logback-classic:1.5.25')
 // https://mvnrepository.com/artifact/com.datadoghq/sketches-java
 			library('sketches', 'com.datadoghq:sketches-java:0.8.3')
 		}

types/src/main/java/com/cobber/fta/LogicalType.java

@@ -191,7 +191,7 @@ public String getSignature() {
 
 		structureSignature += getSemanticType();
 
-		MessageDigest md;
+		final MessageDigest md;
 		try {
 			md = MessageDigest.getInstance("SHA-1");
 		} catch (NoSuchAlgorithmException e) {

types/src/main/java/com/cobber/fta/LogicalTypeFiniteSimple.java

@@ -34,7 +34,7 @@ public abstract class LogicalTypeFiniteSimple extends LogicalTypeFinite {
 	protected Reader reader;
 	protected SingletonSet memberSet;
 
-	private final static CacheLRU<String, String> cache = new CacheLRU<>(30);
+	private static final CacheLRU<String, String> cache = new CacheLRU<>(30);
 
 	public LogicalTypeFiniteSimple(final PluginDefinition plugin, final String backout, final int threshold) {
 		super(plugin);

types/src/main/java/com/cobber/fta/PluginAnalysis.java

@@ -20,10 +20,10 @@ public class PluginAnalysis {
 	private String newPattern;
 
 	/** Analysis was successful. */
-	public final static PluginAnalysis OK = new PluginAnalysis();
+	public static final PluginAnalysis OK = new PluginAnalysis();
 
 	/** Analysis was unsuccessful - and we want to back out to a wildcard match. */
-	public final static PluginAnalysis SIMPLE_NOT_OK = new PluginAnalysis(KnownTypes.PATTERN_ANY_VARIABLE);
+	public static final PluginAnalysis SIMPLE_NOT_OK = new PluginAnalysis(KnownTypes.PATTERN_ANY_VARIABLE);
 
 	/**
 	 * Construct a 'happy' analysis.

types/src/main/java/com/cobber/fta/PluginDefinition.java

@@ -42,7 +42,7 @@
  */
 public class PluginDefinition {
 	/** Priority of plugins must be between 0 and PRIORITY_MAX. */
-	public final static int PRIORITY_MAX = 10000;
+	public static final int PRIORITY_MAX = 10000;
 
 	private static List<PluginDefinition> builtinPlugins;
 
@@ -114,11 +114,11 @@ public PluginDefinition() {
 	public int getOrder() {
 		switch (precedence) {
 			case BUILTIN:
-				return priority + PluginDefinition.PRIORITY_MAX;
+				return priority + PRIORITY_MAX;
 			case PRE_BUILTIN:
 				return priority;
 			case POST_BUILTIN:
-				return priority + 2 * PluginDefinition.PRIORITY_MAX;
+				return priority + 2 * PRIORITY_MAX;
 			default:
 				return -1;
 		}
@@ -219,7 +219,7 @@ public static PluginDefinition findByName(final String semanticTypeName) {
 	}
 
 	public boolean isMandatoryHeaderUnsatisfied(final Locale locale, final String streamName) {
-		PluginLocaleEntry localeEntry;
+		final PluginLocaleEntry localeEntry;
 		try {
 			localeEntry = getLocaleEntry(locale);
 		} catch (FTAPluginException e) {

types/src/main/java/com/cobber/fta/Plugins.java

@@ -165,9 +165,7 @@ protected void registerPluginListCore(final List<PluginDefinition> plugins, fina
 				else
 					plugin.setPrecedence(PluginDefinition.Precedence.POST_BUILTIN);
 
-			boolean register = plugin.isLocaleSupported(analysisConfig.getLocale());
-
-			if (register)
+			if (plugin.isLocaleSupported(analysisConfig.getLocale()))
 				if ("java".equals(plugin.pluginType))
 					registerLogicalTypeClass(plugin, analysisConfig);
 				else if ("list".equals(plugin.pluginType))
@@ -208,9 +206,9 @@ private void registerLogicalType(final LogicalType logical, final AnalysisConfig
 	 * @throws FTAPluginException
 	 */
 	private void registerLogicalTypeClass(final PluginDefinition plugin, final AnalysisConfig analysisConfig) throws FTAPluginException {
-		Class<?> newLogicalType;
-		Constructor<?> ctor;
-		Object logical;
+		final Class<?> newLogicalType;
+		final Constructor<?> ctor;
+		final Object logical;
 
 		try {
 			newLogicalType = Class.forName(plugin.clazz);

types/src/main/java/com/cobber/fta/SemanticType.java

@@ -132,10 +132,10 @@ public String[] getLanguages() {
 	}
 
 	public String toJSONString() {
-		final StringBuilder b = new StringBuilder();
+		final StringBuilder b = new StringBuilder(128);
 		b.append("Id: ").append(id).append(", Description: ").append(description).append(", Languages: ");
 		for (final String language : languages)
-			b.append(language).append(" ");
+			b.append(language).append(' ');
 
 		return b.toString();
 	}

types/src/main/java/com/cobber/fta/SingletonSet.java

@@ -39,7 +39,7 @@ public class SingletonSet {
 	private final String key;
 	private final String commentLeader;
 
-	private final static Map<String, RandomSet<String>> MEMBER_CACHE = new ConcurrentHashMap<>();
+	private static final Map<String, RandomSet<String>> MEMBER_CACHE = new ConcurrentHashMap<>();
 
 	/**
 	 * Create a SingletonSet using "#" as the comment character.