From dde6cc2d4940b55799271e1fa1f49f52779794f5 Mon Sep 17 00:00:00 2001 From: "stirlingbot[bot]" <195170888+stirlingbot[bot]@users.noreply.github.com> Date: Thu, 4 Sep 2025 23:46:20 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20format=20everything=20with=20pre?= =?UTF-8?q?-commit=20by=20stirlingbot=20(#4375)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: stirlingbot[bot] <195170888+stirlingbot[bot]@users.noreply.github.com> --- .../software/common/util/ProcessExecutor.java | 1 - .../software/common/util/TempFile.java | 3 +-- .../common/util/TempFileRegistry.java | 10 +++---- .../signature/CreateSignatureBase.java | 26 +++++++++---------- .../SPDF/config/EndpointConfiguration.java | 5 ++-- .../api/EditTableOfContentsController.java | 5 ++-- .../controller/api/misc/StampController.java | 7 +++-- .../controller/web/GeneralWebController.java | 5 ++-- .../controller/web/MetricsController.java | 5 ++-- .../software/SPDF/model/ApiEndpoint.java | 4 +-- .../software/SPDF/pdf/TextFinder.java | 5 ++-- 11 files changed, 33 insertions(+), 43 deletions(-) diff --git a/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java index 0abf9ade7..de23c2966 100644 --- a/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java +++ b/app/common/src/main/java/stirling/software/common/util/ProcessExecutor.java @@ -315,6 +315,5 @@ public class ProcessExecutor { this.rc = rc; this.messages = messages; } - } } diff --git a/app/common/src/main/java/stirling/software/common/util/TempFile.java b/app/common/src/main/java/stirling/software/common/util/TempFile.java index ce948fdac..2c730c937 100644 --- a/app/common/src/main/java/stirling/software/common/util/TempFile.java +++ b/app/common/src/main/java/stirling/software/common/util/TempFile.java @@ -15,8 +15,7 @@ import lombok.extern.slf4j.Slf4j; public class TempFile implements AutoCloseable { private final TempFileManager manager; - @Getter - private final File file; + @Getter private final File file; public TempFile(TempFileManager manager, String suffix) throws IOException { this.manager = manager; diff --git a/app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java b/app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java index cfdba632c..ab1304f5e 100644 --- a/app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java +++ b/app/common/src/main/java/stirling/software/common/util/TempFileRegistry.java @@ -11,9 +11,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.stream.Collectors; -import lombok.Getter; import org.springframework.stereotype.Component; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; /** @@ -25,18 +25,18 @@ import lombok.extern.slf4j.Slf4j; public class TempFileRegistry { private final ConcurrentMap registeredFiles = new ConcurrentHashMap<>(); + /** - * -- GETTER -- - * Get all registered third-party temporary files. + * -- GETTER -- Get all registered third-party temporary files. * * @return Set of third-party file paths */ @Getter private final Set thirdPartyTempFiles = Collections.newSetFromMap(new ConcurrentHashMap<>()); + /** - * -- GETTER -- - * Get all registered temporary directories. + * -- GETTER -- Get all registered temporary directories. * * @return Set of temporary directory paths */ diff --git a/app/core/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java b/app/core/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java index ba8a2d458..289f31501 100644 --- a/app/core/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java +++ b/app/core/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java @@ -31,8 +31,6 @@ import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Enumeration; -import lombok.Getter; -import lombok.Setter; import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface; import org.bouncycastle.cert.jcajce.JcaCertStore; import org.bouncycastle.cms.CMSException; @@ -44,24 +42,25 @@ import org.bouncycastle.operator.OperatorCreationException; import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import lombok.Getter; +import lombok.Setter; + public abstract class CreateSignatureBase implements SignatureInterface { private PrivateKey privateKey; - @Getter - private Certificate[] certificateChain; - @Setter - private String tsaUrl; + @Getter private Certificate[] certificateChain; + @Setter private String tsaUrl; + /** - * Specifies whether the external signing scenario should be used. - * If set to {@code true}, external signing will be performed and - * {@link SignatureInterface} will be used for signing. + * Specifies whether the external signing scenario should be used. If set to {@code true}, + * external signing will be performed and {@link SignatureInterface} will be used for signing. * If set to {@code false}, internal signing will be performed. + * *

Default: {@code false} * - * @param externalSigning {@code true} if external signing should be performed; {@code false} for internal signing + * @param externalSigning {@code true} if external signing should be performed; {@code false} + * for internal signing */ - @Setter - @Getter - private boolean externalSigning; + @Setter @Getter private boolean externalSigning; /** * Initialize the signature creator with a keystore (pkcs12) and pin that should be used for the @@ -158,5 +157,4 @@ public abstract class CreateSignatureBase implements SignatureInterface { throw new IOException(e); } } - } diff --git a/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java index c6e66d836..3e876a556 100644 --- a/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java +++ b/app/core/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java @@ -6,10 +6,10 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import lombok.Getter; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import stirling.software.common.model.ApplicationProperties; @@ -20,8 +20,7 @@ public class EndpointConfiguration { private static final String REMOVE_BLANKS = "remove-blanks"; private final ApplicationProperties applicationProperties; - @Getter - private Map endpointStatuses = new ConcurrentHashMap<>(); + @Getter private Map endpointStatuses = new ConcurrentHashMap<>(); private Map> endpointGroups = new ConcurrentHashMap<>(); private Set disabledGroups = new HashSet<>(); private Map> endpointAlternatives = new ConcurrentHashMap<>(); diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java index ca8a62cb0..84e110652 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java @@ -6,8 +6,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import lombok.Getter; -import lombok.Setter; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline; @@ -29,7 +27,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; import lombok.RequiredArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import stirling.software.SPDF.model.api.EditTableOfContentsRequest; @@ -242,6 +242,5 @@ public class EditTableOfContentsController { private String title; private int pageNumber; private List children = new ArrayList<>(); - } } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java index b245fa243..a5922a283 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java @@ -56,10 +56,9 @@ public class StampController { private final TempFileManager tempFileManager; /** - * Initialize data binder for multipart file uploads. - * This method registers a custom editor for MultipartFile to handle file uploads. - * It sets the MultipartFile to null if the uploaded file is empty. - * This is necessary to avoid binding errors when the file is not present. + * Initialize data binder for multipart file uploads. This method registers a custom editor for + * MultipartFile to handle file uploads. It sets the MultipartFile to null if the uploaded file + * is empty. This is necessary to avoid binding errors when the file is not present. */ @InitBinder public void initBinder(WebDataBinder binder) { diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java index c0aec935a..00f427016 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java @@ -9,8 +9,6 @@ import java.nio.file.Paths; import java.util.*; import java.util.stream.Stream; -import lombok.Getter; -import lombok.Setter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; @@ -24,6 +22,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Getter; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import stirling.software.SPDF.model.SignatureFile; @@ -334,6 +334,5 @@ public class GeneralWebController { this.extension = extension; this.type = getFormatFromExtension(extension); } - } } diff --git a/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java b/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java index 6b8049af6..bd681df3b 100644 --- a/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java +++ b/app/core/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java @@ -4,8 +4,6 @@ import java.time.Duration; import java.time.LocalDateTime; import java.util.*; -import lombok.Getter; -import lombok.Setter; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +19,9 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.PostConstruct; +import lombok.Getter; import lombok.RequiredArgsConstructor; +import lombok.Setter; import lombok.extern.slf4j.Slf4j; import stirling.software.SPDF.config.EndpointInspector; @@ -376,6 +376,5 @@ public class MetricsController { this.endpoint = endpoint; this.count = count; } - } } diff --git a/app/core/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java b/app/core/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java index 09ceedc00..ba4a62eeb 100644 --- a/app/core/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java +++ b/app/core/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java @@ -4,13 +4,13 @@ import java.util.HashMap; import java.util.Map; import com.fasterxml.jackson.databind.JsonNode; + import lombok.Getter; public class ApiEndpoint { private final String name; private Map parameters; - @Getter - private final String description; + @Getter private final String description; public ApiEndpoint(String name, JsonNode postNode) { this.name = name; diff --git a/app/core/src/main/java/stirling/software/SPDF/pdf/TextFinder.java b/app/core/src/main/java/stirling/software/SPDF/pdf/TextFinder.java index 00a61a51d..4a5c5efc3 100644 --- a/app/core/src/main/java/stirling/software/SPDF/pdf/TextFinder.java +++ b/app/core/src/main/java/stirling/software/SPDF/pdf/TextFinder.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import lombok.Getter; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.TextPosition; +import lombok.Getter; import lombok.extern.slf4j.Slf4j; import stirling.software.SPDF.model.PDFText; @@ -21,8 +21,7 @@ public class TextFinder extends PDFTextStripper { private final String searchTerm; private final boolean useRegex; private final boolean wholeWordSearch; - @Getter - private final List foundTexts = new ArrayList<>(); + @Getter private final List foundTexts = new ArrayList<>(); private final List pageTextPositions = new ArrayList<>(); private final StringBuilder pageTextBuilder = new StringBuilder();