From fc444ff6a9e0b925a440a3301020e987ff69ea80 Mon Sep 17 00:00:00 2001 From: Greg Gibeling Date: Sat, 11 Oct 2025 07:22:53 -0700 Subject: [PATCH] G2-1784 Cleanup warnings --- .../convert/contract/ContractModule.java | 5 +++- .../convert/term/StandardTermModule.java | 4 +++ .../reassert/summary/ReassertSummarizer.java | 26 ++++++++++--------- .../summary/convert/ASummaryModule.java | 2 ++ .../reassert/contract/CSVTermsLoader.java | 9 ++++--- .../convert/simpleedge/SimpleEdgeModule.java | 4 +++ .../maven/model/convert/MavenXmlModule.java | 2 ++ 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/contract/ContractModule.java b/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/contract/ContractModule.java index 1752ef8..ff933db 100644 --- a/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/contract/ContractModule.java +++ b/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/contract/ContractModule.java @@ -24,18 +24,21 @@ public class ContractModule extends SimpleModule { protected final ContractParser parser; - @Override public void setupModule(SetupContext context) { super.setupModule(context); context.addBeanDeserializerModifier(new BeanDeserializerModifier() { + private static final long serialVersionUID = 4940931805636291357L; + public JsonDeserializer modifyDeserializer(DeserializationConfig config, BeanDescription description, JsonDeserializer deserializer) { if (IVertex.class.isAssignableFrom(description.getBeanClass())) return new ContractDeserializer(deserializer, getParser()); return deserializer; } }); context.addBeanSerializerModifier(new BeanSerializerModifier() { + private static final long serialVersionUID = -4855611336964247038L; + @Override public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription description, JsonSerializer serializer) { if (IVertex.class.isAssignableFrom(description.getBeanClass())) return new ContractSerializer(serializer, getDescriber(), getParser()); diff --git a/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/term/StandardTermModule.java b/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/term/StandardTermModule.java index 9b0d440..a09c841 100644 --- a/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/term/StandardTermModule.java +++ b/re-assert-test/src/test/java/com/g2forge/reassert/reassert/convert/term/StandardTermModule.java @@ -30,6 +30,8 @@ public void setupModule(SetupContext context) { super.setupModule(context); context.addBeanDeserializerModifier(new BeanDeserializerModifier() { + private static final long serialVersionUID = -618720025694338390L; + public JsonDeserializer modifyDeserializer(DeserializationConfig config, BeanDescription description, JsonDeserializer deserializer) { if (ITerm.class.isAssignableFrom(description.getBeanClass())) return new StandardTermDeserializer(deserializer); if (ITerms.class.isAssignableFrom(description.getBeanClass())) return new TermsDeserializer(); @@ -37,6 +39,8 @@ public JsonDeserializer modifyDeserializer(DeserializationConfig config, Bean } }); context.addBeanSerializerModifier(new BeanSerializerModifier() { + private static final long serialVersionUID = 3390001814604938831L; + @Override public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription description, JsonSerializer serializer) { if (ITerm.class.isAssignableFrom(description.getBeanClass())) return new StandardTermSerializer(); diff --git a/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/ReassertSummarizer.java b/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/ReassertSummarizer.java index 78dbc94..d69c965 100644 --- a/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/ReassertSummarizer.java +++ b/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/ReassertSummarizer.java @@ -18,6 +18,7 @@ import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.dataformat.csv.CsvMapper; +import com.fasterxml.jackson.dataformat.csv.CsvMapper.Builder; import com.g2forge.alexandria.java.adt.compare.CollectionComparator; import com.g2forge.alexandria.java.adt.compare.ComparableComparator; import com.g2forge.alexandria.java.adt.compare.MappedComparator; @@ -60,7 +61,7 @@ public class ReassertSummarizer { protected Set computeOrigins(IReport report, final Graph graph) { final Set> reportOrigins = report.getOrigins().getOrigins().keySet(); if (graph.vertexSet().containsAll(reportOrigins)) return Collections.unmodifiableSet(reportOrigins); - + final ITypeRef> artifactType = new ATypeRef>() {}; return graph.vertexSet().stream().flatMap(artifactType::castIfInstance).filter(a -> !graph.incomingEdgesOf(a).stream().map(graph::getEdgeSource).anyMatch(artifactType::isInstance)).collect(Collectors.toSet()); } @@ -69,10 +70,19 @@ protected Set computeOrigins(IReport report, final Graph new ReportRenderer(mode, context); } + protected List> readable(List> paths) { + return paths.stream().filter(path -> { + final List vertexList = path.getVertexList(); + if (vertexList.size() <= 2) return true; + return vertexList.subList(1, vertexList.size() - 1).stream().allMatch(v -> !(v instanceof Work)); + }).collect(Collectors.toList()); + } + protected void render(Class writenType, Class schemaType, Collection value, IDataSink sink, ASummaryModule module) { - final CsvMapper mapper = new CsvMapper(); - mapper.disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY); - mapper.registerModule(module); + final Builder mapperBuilder = CsvMapper.builder(); + mapperBuilder.disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY); + mapperBuilder.addModule(module); + final CsvMapper mapper = mapperBuilder.build(); final ObjectWriter writer = mapper.writerFor(writenType).with(mapper.schemaFor(schemaType).withHeader().withColumnReordering(true).withArrayElementSeparator("\n")); try (final OutputStream stream = sink.getStream(ITypeRef.of(OutputStream.class))) { @@ -164,12 +174,4 @@ public int compare(IVertex o1, IVertex o2) { return retVal.build(); } - - protected List> readable(List> paths) { - return paths.stream().filter(path -> { - final List vertexList = path.getVertexList(); - if (vertexList.size() <= 2) return true; - return vertexList.subList(1, vertexList.size() - 1).stream().allMatch(v -> !(v instanceof Work)); - }).collect(Collectors.toList()); - } } diff --git a/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/convert/ASummaryModule.java b/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/convert/ASummaryModule.java index 6818401..9650db6 100644 --- a/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/convert/ASummaryModule.java +++ b/re-assert/src/main/java/com/g2forge/reassert/reassert/summary/convert/ASummaryModule.java @@ -36,6 +36,8 @@ public void setupModule(SetupContext context) { super.setupModule(context); context.addBeanSerializerModifier(new BeanSerializerModifier() { + private static final long serialVersionUID = 2340456774216459044L; + @Override public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription description, JsonSerializer serializer) { return modify(description, serializer); diff --git a/re-contract/src/main/java/com/g2forge/reassert/contract/CSVTermsLoader.java b/re-contract/src/main/java/com/g2forge/reassert/contract/CSVTermsLoader.java index f9788a3..504b17f 100644 --- a/re-contract/src/main/java/com/g2forge/reassert/contract/CSVTermsLoader.java +++ b/re-contract/src/main/java/com/g2forge/reassert/contract/CSVTermsLoader.java @@ -17,6 +17,7 @@ import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.databind.type.MapLikeType; import com.fasterxml.jackson.dataformat.csv.CsvMapper; +import com.fasterxml.jackson.dataformat.csv.CsvMapper.Builder; import com.fasterxml.jackson.dataformat.csv.CsvSchema; import com.fasterxml.jackson.dataformat.csv.CsvSchema.ColumnType; import com.fasterxml.jackson.module.paranamer.ParanamerModule; @@ -58,10 +59,10 @@ public void setTerm(T term, TermRelation relation) { private static final CsvMapper mapper = computeMapper(); protected static CsvMapper computeMapper() { - final CsvMapper mapper = new CsvMapper(); - mapper.configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true); - mapper.registerModule(new ParanamerModule()); - return mapper; + final Builder mapperBuilder = CsvMapper.builder(); + mapperBuilder.enable(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES); + mapperBuilder.addModule(new ParanamerModule()); + return mapperBuilder.build(); } public Map> read(Class contractClass, Class termClass, IDataSource source) { diff --git a/re-list/src/main/java/com/g2forge/reassert/list/convert/simpleedge/SimpleEdgeModule.java b/re-list/src/main/java/com/g2forge/reassert/list/convert/simpleedge/SimpleEdgeModule.java index df7efc2..e2ba127 100644 --- a/re-list/src/main/java/com/g2forge/reassert/list/convert/simpleedge/SimpleEdgeModule.java +++ b/re-list/src/main/java/com/g2forge/reassert/list/convert/simpleedge/SimpleEdgeModule.java @@ -17,12 +17,16 @@ public class SimpleEdgeModule extends SimpleModule { public void setupModule(SetupContext context) { super.setupModule(context); context.addBeanDeserializerModifier(new BeanDeserializerModifier() { + private static final long serialVersionUID = -7441441779625262166L; + public JsonDeserializer modifyDeserializer(DeserializationConfig config, BeanDescription description, JsonDeserializer deserializer) { if (IEdge.class.isAssignableFrom(description.getBeanClass())) return new SimpleEdgeDeserializer(deserializer); return deserializer; } }); context.addBeanSerializerModifier(new BeanSerializerModifier() { + private static final long serialVersionUID = -5870420170827620394L; + @Override public JsonSerializer modifySerializer(SerializationConfig config, BeanDescription description, JsonSerializer serializer) { if (IEdge.class.isAssignableFrom(description.getBeanClass()) && description.findProperties().isEmpty()) return new SimpleEdgeSerializer(); diff --git a/re-maven/src/main/java/com/g2forge/reassert/maven/model/convert/MavenXmlModule.java b/re-maven/src/main/java/com/g2forge/reassert/maven/model/convert/MavenXmlModule.java index febc89d..6750831 100644 --- a/re-maven/src/main/java/com/g2forge/reassert/maven/model/convert/MavenXmlModule.java +++ b/re-maven/src/main/java/com/g2forge/reassert/maven/model/convert/MavenXmlModule.java @@ -18,6 +18,8 @@ public void setupModule(SetupContext context) { addDeserializer(IMavenPackaging.class, new MavenPackagingDeserializer()); super.setupModule(context); context.addBeanDeserializerModifier(new BeanDeserializerModifier() { + private static final long serialVersionUID = 9132457908029868158L; + @Override public JsonDeserializer modifyCollectionDeserializer(DeserializationConfig config, CollectionType type, BeanDescription beanDescription, JsonDeserializer deserializer) { if (deserializer instanceof CollectionDeserializer) return new XmlWhitespaceCollectionDeserialiser((CollectionDeserializer) deserializer);