Merge pull request #5 from Coreoz/evol/upgrade-libraries

upgrade libraries

.gitignore

@@ -5,3 +5,7 @@
 /full_content_transformed.pptx
 /.apt_generated/
 /.factorypath
+
+# IntelliJ
+/.idea
+*.iml

pom.xml

@@ -57,7 +57,7 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<additionalparam>-Xdoclint:none</additionalparam>
 
-		<poi.version>3.17</poi.version>
+		<poi.version>5.2.5</poi.version>
 	</properties>
 
 	<profiles>
@@ -163,38 +163,38 @@
 		<dependency>
 			<groupId>net.coobird</groupId>
 			<artifactId>thumbnailator</artifactId>
-			<version>0.4.8</version>
+			<version>0.4.20</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.7.25</version>
+			<version>2.0.7</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.18</version>
+			<version>1.18.30</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.12</version>
+			<version>4.13.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.assertj</groupId>
 			<artifactId>assertj-core</artifactId>
-			<version>3.8.0</version>
+			<version>3.23.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
-			<version>1.2.3</version>
+			<version>1.4.12</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/com/coreoz/ppt/PptHidingMapper.java

@@ -6,7 +6,5 @@
 
 @Value(staticConstructor = "of")
 class PptHidingMapper {
-
-	private final Predicate<String> shouldHide;
-
+	Predicate<String> shouldHide;
 }

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;
 }

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,

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;
 	}
 
 }

src/main/java/com/coreoz/ppt/PptStyleShapeMapper.java

@@ -8,7 +8,5 @@
 
 @Value(staticConstructor = "of")
 class PptStyleShapeMapper {
-
-	private final BiConsumer<String, XSLFSimpleShape> applyStyle;
-
+	BiConsumer<String, XSLFSimpleShape> applyStyle;
 }

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<String, TextRun> applyStyle;
-
+	BiConsumer<String, TextRun> applyStyle;
 }

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<PptVariable> parseHyperlinkVariable(XSLFSimpleShape simp
 
 
 	private static Optional<PptVariable> 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();

src/main/java/com/coreoz/ppt/PptTextMapper.java

@@ -6,8 +6,6 @@
 
 @Value(staticConstructor = "of")
 class PptTextMapper {
-
-	private final Object value;
-	private final Function<String, Object> argumentToValue;
-
+	Object value;
+	Function<String, Object> argumentToValue;
 }

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;
 }

src/main/java/org/apache/poi/PptPoiBridge.java → 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;