From 86a2d761d72f5e87c68bd8d00937252dc21c4584 Mon Sep 17 00:00:00 2001 From: Pjandro Date: Mon, 26 Oct 2026 22:18:15 +0000 Subject: [PATCH] =?UTF-8?q?refactor(core):=20=D1=83=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20@SuppressWarnings("unchecked")=20=D0=B2=20Drawin?= =?UTF-8?q?gPreRenderer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Обход контента частей сузён до List (он только читается; мутация идёт в gd.getAny()), хелпер cast удалён, invokeList возвращает List через pattern matching — все три unchecked-подавления в main-коде больше не нужны. --- .../internal/chart/DrawingPreRenderer.java | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/DrawingPreRenderer.java b/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/DrawingPreRenderer.java index ff2d346..2f6e7c9 100644 --- a/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/DrawingPreRenderer.java +++ b/wordpdf-core/src/main/java/ru/pjandro/wordpdf/internal/chart/DrawingPreRenderer.java @@ -107,7 +107,7 @@ public final class DrawingPreRenderer { if (!handled.add(p)) { continue; } - List content = contentOf(p); + List content = contentOf(p); if (content.isEmpty()) { continue; } @@ -116,7 +116,7 @@ public final class DrawingPreRenderer { } /** Содержимое части, в котором могут лежать w:drawing. */ - private static List contentOf(Part part) { + private static List contentOf(Part part) { if (!(part instanceof JaxbXmlPart jaxb)) { return List.of(); } @@ -128,16 +128,15 @@ public final class DrawingPreRenderer { return doc.getBody() == null ? doc.getContent() : doc.getBody().getContent(); } if (root instanceof org.docx4j.wml.CTFootnotes fn) { - return cast(fn.getFootnote()); + return fn.getFootnote(); } if (root instanceof org.docx4j.wml.CTEndnotes en) { - return cast(en.getEndnote()); + return en.getEndnote(); } return invokeList(root, "getContent"); } - @SuppressWarnings("unchecked") - private static void walk(Part part, List content, WordprocessingMLPackage pkg, + private static void walk(Part part, List content, WordprocessingMLPackage pkg, DrawMlColor colors, int[] idSeq, ConvertOptions options) { for (Object o : content) { Object v = o instanceof JAXBElement ? ((JAXBElement) o).getValue() : o; @@ -145,24 +144,18 @@ public final class DrawingPreRenderer { replaceDrawing(part, drawing, pkg, colors, idSeq, options); continue; } - List nested = invokeList(v, "getContent"); + List nested = invokeList(v, "getContent"); if (!nested.isEmpty() && nested != content) { walk(part, nested, pkg, colors, idSeq, options); } } } - @SuppressWarnings("unchecked") - private static List cast(List l) { - return (List) l; - } - - @SuppressWarnings("unchecked") - private static List invokeList(Object target, String getter) { + private static List invokeList(Object target, String getter) { try { Method m = target.getClass().getMethod(getter); Object r = m.invoke(target); - return r instanceof List ? (List) r : List.of(); + return r instanceof List l ? l : List.of(); } catch (ReflectiveOperationException | RuntimeException e) { return List.of(); } -- 2.56.1