style: improve formatting and import order consistency across codebase (#3761)

# Description of Changes This pull request applies consistent formatting and import ordering across the codebase. Specifically: - Reordered imports according to the configured Spotless `importOrder()` directive. - Enabled formatting flags such as `trimTrailingWhitespace`, `leadingTabsToSpaces`, and `endWithNewline`. - Resolved inconsistencies in blank lines and spacing between imports and annotations. - Applied consistent formatting to annotations and method declarations. - Removed unused or redundant import statements. This change improves code readability, enforces a consistent style, and prepares the codebase for future automated formatting checks. --- ## Checklist ### General - [x] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [x] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [x] I have performed a self-review of my own code - [x] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details.
2026-07-16 19:33:11 +02:00 · 2025-06-18 17:00:26 +01:00
parent a208d55525
commit 8632ccb870
136 changed files with 1328 additions and 954 deletions
@@ -5,7 +5,13 @@ bootRun {
 spotless {
    java {
        target sourceSets.main.allJava
-        googleJavaFormat(googleJavaFormatVersion).aosp()
+        googleJavaFormat(googleJavaFormatVersion).aosp().reorderImports(false)
+
+        importOrder("java", "javax", "org", "com", "net", "io", "jakarta", "lombok", "me", "stirling")
+        toggleOffOn()
+        trimTrailingWhitespace()
+        leadingTabsToSpaces()
+        endWithNewline()
    }
 }
 dependencies {
@@ -4,9 +4,11 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.io.RandomAccessReadBufferedFile;

+import lombok.extern.slf4j.Slf4j;
+
 /** A custom RandomAccessRead implementation that deletes the file when closed */
@Slf4j
 public class DeletingRandomAccessFile extends RandomAccessReadBufferedFile {
@@ -8,9 +8,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Properties;
 import java.util.function.Predicate;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -24,6 +22,11 @@ import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.spring6.SpringTemplateEngine;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.ApplicationProperties;

@Lazy
@@ -10,7 +10,9 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.util.YamlHelper;

 /**
@@ -3,13 +3,16 @@ package stirling.software.common.configuration;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.thymeleaf.IEngineConfiguration;
 import org.thymeleaf.templateresolver.AbstractConfigurableTemplateResolver;
 import org.thymeleaf.templateresource.FileTemplateResource;
 import org.thymeleaf.templateresource.ITemplateResource;
+
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.InputStreamTemplateResource;

@Slf4j
@@ -2,6 +2,7 @@ package stirling.software.common.configuration;

 import java.io.File;
 import java.nio.file.Paths;
+
 import lombok.extern.slf4j.Slf4j;

@Slf4j
@@ -1,12 +1,15 @@
 package stirling.software.common.configuration;

-import com.posthog.java.PostHog;
-import jakarta.annotation.PreDestroy;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+import com.posthog.java.PostHog;
+
+import jakarta.annotation.PreDestroy;
+
+import lombok.extern.slf4j.Slf4j;
+
@Configuration
@Slf4j
 public class PostHogConfig {
@@ -1,9 +1,11 @@
 package stirling.software.common.configuration;

-import com.posthog.java.PostHogLogger;
-import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

+import com.posthog.java.PostHogLogger;
+
+import lombok.extern.slf4j.Slf4j;
+
@Slf4j
@Component
 public class PostHogLoggerImpl implements PostHogLogger {
@@ -2,10 +2,13 @@ package stirling.software.common.configuration;

 import java.nio.file.Files;
 import java.nio.file.Path;
-import lombok.Getter;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Configuration;
+
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.ApplicationProperties.CustomPaths.Operations;
 import stirling.software.common.model.ApplicationProperties.CustomPaths.Pipeline;
@@ -1,6 +1,7 @@
 package stirling.software.common.configuration;

 import java.util.Properties;
+
 import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.env.PropertySource;
@@ -12,11 +12,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.ToString;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.core.Ordered;
@@ -28,6 +24,13 @@ import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.EncodedResource;
 import org.springframework.stereotype.Component;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.configuration.InstallationPathConfig;
 import stirling.software.common.configuration.YamlPropertySourceFactory;
 import stirling.software.common.model.exception.UnsupportedProviderException;
@@ -486,14 +489,14 @@ public class ApplicationProperties {
        public static class EnterpriseFeatures {
            private PersistentMetrics persistentMetrics = new PersistentMetrics();
            private Audit audit = new Audit();
-            
+
            @Data
            public static class Audit {
                private boolean enabled = true;
                private int level = 2; // 0=OFF, 1=BASIC, 2=STANDARD, 3=VERBOSE
                private int retentionDays = 90;
            }
-            
+
            @Data
            public static class PersistentMetrics {
                private boolean enabled;
@@ -5,6 +5,7 @@ import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;

@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+
 import org.thymeleaf.templateresource.ITemplateResource;

 public class InputStreamTemplateResource implements ITemplateResource {
@@ -1,6 +1,7 @@
 package stirling.software.common.model;

 import java.util.Calendar;
+
 import lombok.Builder;
 import lombok.Data;

@@ -1,9 +1,11 @@
 package stirling.software.common.model.api;

+import org.springframework.web.multipart.MultipartFile;
+
 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.web.multipart.MultipartFile;

@Data
@EqualsAndHashCode
@@ -1,10 +1,12 @@
 package stirling.software.common.model.api;

+import org.springframework.web.multipart.MultipartFile;
+
 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.springframework.web.multipart.MultipartFile;

@Data
@NoArgsConstructor
@@ -1,8 +1,10 @@
 package stirling.software.common.model.api.converters;

 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;

@Data
@@ -1,8 +1,10 @@
 package stirling.software.common.model.api.converters;

 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;

@Data
@@ -1,6 +1,7 @@
 package stirling.software.common.model.api.security;

 import io.swagger.v3.oas.annotations.media.Schema;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;

@@ -2,6 +2,7 @@ package stirling.software.common.model.enumeration;

 import java.util.LinkedHashMap;
 import java.util.Map;
+
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

@@ -2,7 +2,9 @@ package stirling.software.common.model.oauth2;

 import java.util.ArrayList;
 import java.util.Collection;
+
 import lombok.NoArgsConstructor;
+
 import stirling.software.common.model.enumeration.UsernameAttribute;

@NoArgsConstructor
@@ -2,7 +2,9 @@ package stirling.software.common.model.oauth2;

 import java.util.ArrayList;
 import java.util.Collection;
+
 import lombok.NoArgsConstructor;
+
 import stirling.software.common.model.enumeration.UsernameAttribute;

@NoArgsConstructor
@@ -2,7 +2,9 @@ package stirling.software.common.model.oauth2;

 import java.util.ArrayList;
 import java.util.Collection;
+
 import lombok.NoArgsConstructor;
+
 import stirling.software.common.model.enumeration.UsernameAttribute;

@NoArgsConstructor
@@ -5,8 +5,10 @@ import static stirling.software.common.model.enumeration.UsernameAttribute.EMAIL
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 import stirling.software.common.model.enumeration.UsernameAttribute;
 import stirling.software.common.model.exception.UnsupportedClaimException;

@@ -8,8 +8,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.concurrent.atomic.AtomicLong;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.examples.util.DeletingRandomAccessFile;
 import org.apache.pdfbox.io.IOUtils;
@@ -19,6 +18,10 @@ import org.apache.pdfbox.io.ScratchFile;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.api.PDFFile;

 /**
@@ -1,10 +1,12 @@
 package stirling.software.common.service;

 import java.util.Calendar;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+
 import stirling.software.common.model.ApplicationProperties;
 import stirling.software.common.model.PdfMetadata;

@@ -1,6 +1,5 @@
 package stirling.software.common.service;

-import com.posthog.java.PostHog;
 import java.io.File;
 import java.lang.management.GarbageCollectorMXBean;
 import java.lang.management.ManagementFactory;
@@ -17,11 +16,15 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
+
+import com.posthog.java.PostHog;
+
 import stirling.software.common.model.ApplicationProperties;

@Service
@@ -3,6 +3,7 @@ package stirling.software.common.util;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
+
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;

 public class CheckProgramInstall {
@@ -19,10 +19,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import lombok.Data;
-import lombok.Getter;
-import lombok.experimental.UtilityClass;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
@@ -38,6 +35,12 @@ import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.experimental.UtilityClass;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.api.converters.EmlToPdfRequest;

@Slf4j
@@ -2,6 +2,7 @@ package stirling.software.common.util;

 import java.io.PrintWriter;
 import java.io.StringWriter;
+
 import org.springframework.ui.Model;
 import org.springframework.web.servlet.ModelAndView;

@@ -11,10 +11,13 @@ import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
 import java.util.stream.Stream;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.configuration.RuntimePathConfig;

@Component
@@ -1,6 +1,5 @@
 package stirling.software.common.util;

-import io.github.pixee.security.ZipSecurity;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileVisitResult;
@@ -14,6 +13,9 @@ import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
+
+import io.github.pixee.security.ZipSecurity;
+
 import stirling.software.common.model.api.converters.HTMLToPdfRequest;
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;

@@ -1,8 +1,5 @@
 package stirling.software.common.util;

-import com.fathzer.soft.javaluator.DoubleEvaluator;
-import io.github.pixee.security.HostValidator;
-import io.github.pixee.security.Urls;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -17,11 +14,19 @@ import java.util.Arrays;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.UUID;
-import lombok.extern.slf4j.Slf4j;
+
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.ResourcePatternUtils;
 import org.springframework.web.multipart.MultipartFile;
+
+import com.fathzer.soft.javaluator.DoubleEvaluator;
+
+import io.github.pixee.security.HostValidator;
+import io.github.pixee.security.Urls;
+
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.configuration.InstallationPathConfig;

@Slf4j
@@ -1,18 +1,22 @@
 package stirling.software.common.util;

+import java.awt.geom.AffineTransform;
+import java.awt.image.*;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+import javax.imageio.ImageIO;
+
+import org.springframework.web.multipart.MultipartFile;
+
 import com.drew.imaging.ImageMetadataReader;
 import com.drew.imaging.ImageProcessingException;
 import com.drew.metadata.Metadata;
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.exif.ExifSubIFDDirectory;
-import java.awt.geom.AffineTransform;
-import java.awt.image.*;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import javax.imageio.ImageIO;
+
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.multipart.MultipartFile;

@Slf4j
 public class ImageProcessingUtils {
@@ -1,8 +1,5 @@
 package stirling.software.common.util;

-import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
-import com.vladsch.flexmark.util.data.MutableDataSet;
-import io.github.pixee.security.Filenames;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -15,14 +12,22 @@ import java.util.List;
 import java.util.Objects;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;
+
+import com.vladsch.flexmark.html2md.converter.FlexmarkHtmlConverter;
+import com.vladsch.flexmark.util.data.MutableDataSet;
+
+import io.github.pixee.security.Filenames;
+
+import lombok.NoArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult;

@Slf4j
@@ -1,6 +1,5 @@
 package stirling.software.common.util;

-import io.github.pixee.security.Filenames;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
@@ -11,9 +10,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
+
 import javax.imageio.*;
 import javax.imageio.stream.ImageOutputStream;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -30,6 +30,11 @@ import org.apache.pdfbox.rendering.ImageType;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.apache.pdfbox.text.PDFTextStripper;
 import org.springframework.web.multipart.MultipartFile;
+
+import io.github.pixee.security.Filenames;
+
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.service.CustomPDFDocumentFactory;

@Slf4j
@@ -1,6 +1,5 @@
 package stirling.software.common.util;

-import io.github.pixee.security.BoundedLineReader;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -13,7 +12,11 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+
+import io.github.pixee.security.BoundedLineReader;
+
 import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.ApplicationProperties;

@Slf4j
@@ -1,9 +1,10 @@
 package stirling.software.common.util;

-import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.net.ServerSocket;

+import jakarta.servlet.http.HttpServletRequest;
+
 public class UrlUtils {

    public static String getOrigin(HttpServletRequest request) {
@@ -1,10 +1,10 @@
 package stirling.software.common.util;

-import io.github.pixee.security.Filenames;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -12,6 +12,8 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.multipart.MultipartFile;

+import io.github.pixee.security.Filenames;
+
 public class WebResponseUtils {

    public static ResponseEntity<byte[]> boasToWebResponse(
@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-import lombok.extern.slf4j.Slf4j;
+
 import org.snakeyaml.engine.v2.api.Dump;
 import org.snakeyaml.engine.v2.api.DumpSettings;
 import org.snakeyaml.engine.v2.api.LoadSettings;
@@ -30,6 +30,8 @@ import org.snakeyaml.engine.v2.nodes.Tag;
 import org.snakeyaml.engine.v2.parser.ParserImpl;
 import org.snakeyaml.engine.v2.scanner.StreamReader;

+import lombok.extern.slf4j.Slf4j;
+
@Slf4j
 public class YamlHelper {

@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
 import java.util.Set;
-import lombok.extern.slf4j.Slf4j;
+
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -21,6 +21,9 @@ import org.apache.pdfbox.pdmodel.font.Standard14Fonts;
 import org.apache.pdfbox.text.TextPosition;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
+
+import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.api.misc.HighContrastColorCombination;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;

@@ -7,7 +7,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+
 import javax.imageio.ImageIO;
+
 import org.apache.pdfbox.Loader;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -16,6 +18,7 @@ import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
 import org.apache.pdfbox.rendering.PDFRenderer;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
+
 import stirling.software.common.model.api.misc.ReplaceAndInvert;

 public class InvertFullColorStrategy extends ReplaceAndInvertColorStrategy {
@@ -3,6 +3,7 @@ package stirling.software.common.util.misc;
 import java.awt.geom.Rectangle2D;
 import java.io.IOException;
 import java.util.List;
+
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.text.PDFTextStripperByArea;
 import org.apache.pdfbox.text.TextPosition;
@@ -1,10 +1,13 @@
 package stirling.software.common.util.misc;

 import java.io.IOException;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.web.multipart.MultipartFile;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import stirling.software.common.model.api.PDFFile;
 import stirling.software.common.model.api.misc.ReplaceAndInvert;

@@ -1,12 +1,15 @@
 package stirling.software.common.util.propertyeditor;

+import java.beans.PropertyEditorSupport;
+import java.util.ArrayList;
+import java.util.List;
+
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.beans.PropertyEditorSupport;
-import java.util.ArrayList;
-import java.util.List;
+
 import lombok.extern.slf4j.Slf4j;
+
 import stirling.software.common.model.api.security.RedactionArea;

@Slf4j
@@ -1,11 +1,12 @@
 package stirling.software.common.util.propertyeditor;

-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import java.beans.PropertyEditorSupport;
 import java.util.HashMap;
 import java.util.Map;

+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 public class StringToMapPropertyEditor extends PropertyEditorSupport {

    private final ObjectMapper objectMapper = new ObjectMapper();