From 1aa012b697d2c3ebfbafe7907a0daf5a00d9c9e6 Mon Sep 17 00:00:00 2001 From: Lucas Amiaud Date: Wed, 17 Jan 2024 17:55:28 +0100 Subject: [PATCH] upgrade libraries --- .gitignore | 4 ++++ pom.xml | 14 +++++++------- src/main/java/com/coreoz/ppt/PptHidingMapper.java | 4 +--- src/main/java/com/coreoz/ppt/PptImageMapper.java | 12 +++++------- .../com/coreoz/ppt/PptImageReplacementMode.java | 2 +- src/main/java/com/coreoz/ppt/PptParser.java | 4 ++-- .../java/com/coreoz/ppt/PptStyleShapeMapper.java | 4 +--- .../java/com/coreoz/ppt/PptStyleTextMapper.java | 9 +++------ src/main/java/com/coreoz/ppt/PptTemplates.java | 8 ++++---- src/main/java/com/coreoz/ppt/PptTextMapper.java | 6 ++---- src/main/java/com/coreoz/ppt/PptVariable.java | 6 ++---- .../org/apache/poi/{ => ooxml}/PptPoiBridge.java | 2 +- 12 files changed, 33 insertions(+), 42 deletions(-) rename src/main/java/org/apache/poi/{ => ooxml}/PptPoiBridge.java (97%) diff --git a/.gitignore b/.gitignore index 1824ace..366fcc0 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,7 @@ /full_content_transformed.pptx /.apt_generated/ /.factorypath + +# IntelliJ +/.idea +*.iml diff --git a/pom.xml b/pom.xml index fc1ee24..c8d7400 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.8 -Xdoclint:none - 3.17 + 5.2.5 @@ -163,38 +163,38 @@ net.coobird thumbnailator - 0.4.8 + 0.4.20 org.slf4j slf4j-api - 1.7.25 + 2.0.7 org.projectlombok lombok - 1.16.18 + 1.18.30 provided junit junit - 4.12 + 4.13.2 test org.assertj assertj-core - 3.8.0 + 3.23.1 test ch.qos.logback logback-classic - 1.2.3 + 1.4.12 test diff --git a/src/main/java/com/coreoz/ppt/PptHidingMapper.java b/src/main/java/com/coreoz/ppt/PptHidingMapper.java index d25776d..b23c070 100644 --- a/src/main/java/com/coreoz/ppt/PptHidingMapper.java +++ b/src/main/java/com/coreoz/ppt/PptHidingMapper.java @@ -6,7 +6,5 @@ @Value(staticConstructor = "of") class PptHidingMapper { - - private final Predicate shouldHide; - + Predicate shouldHide; } diff --git a/src/main/java/com/coreoz/ppt/PptImageMapper.java b/src/main/java/com/coreoz/ppt/PptImageMapper.java index fe4d13e..ede0587 100644 --- a/src/main/java/com/coreoz/ppt/PptImageMapper.java +++ b/src/main/java/com/coreoz/ppt/PptImageMapper.java @@ -6,14 +6,12 @@ @Value(staticConstructor = "of") class PptImageMapper { - public static final float DEFAULT_QUALITY_FACTOR = 1F; public static final double DEFAULT_QUALITY_MULTIPLICATOR = 2.0; - private final PictureType targetFormat; - private final PptImageReplacementMode replacementMode; - private final byte[] value; - private final float qualityFactory; - private final double qualityMultiplicator; - + PictureType targetFormat; + PptImageReplacementMode replacementMode; + byte[] value; + float qualityFactory; + double qualityMultiplicator; } diff --git a/src/main/java/com/coreoz/ppt/PptImageReplacementMode.java b/src/main/java/com/coreoz/ppt/PptImageReplacementMode.java index 744b052..61451a3 100644 --- a/src/main/java/com/coreoz/ppt/PptImageReplacementMode.java +++ b/src/main/java/com/coreoz/ppt/PptImageReplacementMode.java @@ -30,7 +30,7 @@ byte[] resize(byte[] imageData, String targetFormat, int width, int height, } @FunctionalInterface - private static interface ResizeFunction { + private interface ResizeFunction { byte[] resizeImage( byte[] imageData, String targetFormat, diff --git a/src/main/java/com/coreoz/ppt/PptParser.java b/src/main/java/com/coreoz/ppt/PptParser.java index 4412189..b99dfa9 100644 --- a/src/main/java/com/coreoz/ppt/PptParser.java +++ b/src/main/java/com/coreoz/ppt/PptParser.java @@ -170,7 +170,7 @@ private static State process(State before, char c) { } @AllArgsConstructor - private static enum State { + private enum State { INITIAL(false), MAY_BE_VARIABLE(true), START_VARIABLE(true), @@ -180,7 +180,7 @@ private static enum State { END_VARIABLE(false) ; - private boolean inVariable; + private final boolean inVariable; } } diff --git a/src/main/java/com/coreoz/ppt/PptStyleShapeMapper.java b/src/main/java/com/coreoz/ppt/PptStyleShapeMapper.java index ef054be..089db2e 100644 --- a/src/main/java/com/coreoz/ppt/PptStyleShapeMapper.java +++ b/src/main/java/com/coreoz/ppt/PptStyleShapeMapper.java @@ -8,7 +8,5 @@ @Value(staticConstructor = "of") class PptStyleShapeMapper { - - private final BiConsumer applyStyle; - + BiConsumer applyStyle; } diff --git a/src/main/java/com/coreoz/ppt/PptStyleTextMapper.java b/src/main/java/com/coreoz/ppt/PptStyleTextMapper.java index dfb2ce1..c9b6ea1 100644 --- a/src/main/java/com/coreoz/ppt/PptStyleTextMapper.java +++ b/src/main/java/com/coreoz/ppt/PptStyleTextMapper.java @@ -1,14 +1,11 @@ package com.coreoz.ppt; -import java.util.function.BiConsumer; - +import lombok.Value; import org.apache.poi.sl.usermodel.TextRun; -import lombok.Value; +import java.util.function.BiConsumer; @Value(staticConstructor = "of") class PptStyleTextMapper { - - private final BiConsumer applyStyle; - + BiConsumer applyStyle; } diff --git a/src/main/java/com/coreoz/ppt/PptTemplates.java b/src/main/java/com/coreoz/ppt/PptTemplates.java index ea841c7..4c5d4b2 100644 --- a/src/main/java/com/coreoz/ppt/PptTemplates.java +++ b/src/main/java/com/coreoz/ppt/PptTemplates.java @@ -8,9 +8,9 @@ import java.util.Optional; import java.util.function.Consumer; -import org.apache.poi.POIXMLDocumentPart; -import org.apache.poi.POIXMLDocumentPart.RelationPart; -import org.apache.poi.PptPoiBridge; +import org.apache.poi.ooxml.POIXMLDocumentPart; +import org.apache.poi.ooxml.POIXMLDocumentPart.RelationPart; +import org.apache.poi.ooxml.PptPoiBridge; import org.apache.poi.common.usermodel.HyperlinkType; import org.apache.poi.sl.usermodel.Hyperlink; import org.apache.poi.sl.usermodel.ShapeContainer; @@ -357,7 +357,7 @@ private static Optional parseHyperlinkVariable(XSLFSimpleShape simp private static Optional parseHyperlinkVariale(Hyperlink link) { - if(link != null && link.getTypeEnum() == HyperlinkType.URL) { + if(link != null && link.getType() == HyperlinkType.URL) { return PptParser.parse(link.getAddress()); } return Optional.empty(); diff --git a/src/main/java/com/coreoz/ppt/PptTextMapper.java b/src/main/java/com/coreoz/ppt/PptTextMapper.java index fb1434b..8fcf36d 100644 --- a/src/main/java/com/coreoz/ppt/PptTextMapper.java +++ b/src/main/java/com/coreoz/ppt/PptTextMapper.java @@ -6,8 +6,6 @@ @Value(staticConstructor = "of") class PptTextMapper { - - private final Object value; - private final Function argumentToValue; - + Object value; + Function argumentToValue; } diff --git a/src/main/java/com/coreoz/ppt/PptVariable.java b/src/main/java/com/coreoz/ppt/PptVariable.java index d7e5aea..4dfda08 100644 --- a/src/main/java/com/coreoz/ppt/PptVariable.java +++ b/src/main/java/com/coreoz/ppt/PptVariable.java @@ -4,8 +4,6 @@ @Value(staticConstructor = "of") class PptVariable { - - private final String name; - private final String arg1; - + String name; + String arg1; } diff --git a/src/main/java/org/apache/poi/PptPoiBridge.java b/src/main/java/org/apache/poi/ooxml/PptPoiBridge.java similarity index 97% rename from src/main/java/org/apache/poi/PptPoiBridge.java rename to src/main/java/org/apache/poi/ooxml/PptPoiBridge.java index 3b64ec3..b434535 100644 --- a/src/main/java/org/apache/poi/PptPoiBridge.java +++ b/src/main/java/org/apache/poi/ooxml/PptPoiBridge.java @@ -1,4 +1,4 @@ -package org.apache.poi; +package org.apache.poi.ooxml; import org.apache.poi.xslf.usermodel.XSLFTextRun; import org.apache.xmlbeans.XmlObject;