diff --git a/build.gradle b/build.gradle index 2b63508c6..643bcfacf 100644 --- a/build.gradle +++ b/build.gradle @@ -83,6 +83,31 @@ allprojects { } } + +tasks.register('writeVersion') { + def propsFile = file("$projectDir/common/src/main/resources/version.properties") + def propsDir = propsFile.parentFile + + doLast { + if (propsDir.exists()) { + if (propsFile.exists()) { + println "File exists: $propsFile" + } else { + println "$propsFile does not exist. Creating file." + propsFile.createNewFile() + } + } else { + println "Creating directory: $propsDir" + propsDir.mkdirs() + propsFile.createNewFile() + } + + def props = new Properties() + props.setProperty("version", version) + props.store(propsFile.newWriter(), null) + } +} + subprojects { apply plugin: 'java' apply plugin: 'java-library' @@ -145,6 +170,19 @@ subprojects { test { useJUnitPlatform() } + + // Ensure all packaging tasks depend on writeVersion from root project + tasks.withType(org.springframework.boot.gradle.tasks.bundling.BootJar) { + dependsOn(rootProject.tasks.writeVersion) + } + + tasks.withType(Jar) { + dependsOn(rootProject.tasks.writeVersion) + } + + tasks.withType(org.gradle.api.tasks.bundling.Zip) { + dependsOn(rootProject.tasks.writeVersion) + } } tasks.withType(JavaCompile).configureEach { @@ -516,32 +554,9 @@ tasks.named("test") { useJUnitPlatform() } -tasks.register('writeVersion') { - def propsFile = file("$projectDir/common/src/main/resources/version.properties") - def propsDir = propsFile.parentFile - - doLast { - if (propsDir.exists()) { - if (propsFile.exists()) { - println "File exists: $propsFile" - } else { - println "$propsFile does not exist. Creating file." - propsFile.createNewFile() - } - } else { - println "Creating directory: $propsDir" - propsDir.mkdirs() - propsFile.createNewFile() - } - - def props = new Properties() - props.setProperty("version", version) - props.store(propsFile.newWriter(), null) - } -} +// Make sure all relevant processes depend on writeVersion processResources.dependsOn(writeVersion) -project(':stirling-pdf').tasks.bootJar.dependsOn(writeVersion) tasks.register('printVersion') { doLast { diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java index 9720cacf0..48d1da980 100644 --- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java +++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CMSProcessableInputStream.java @@ -19,6 +19,7 @@ package org.apache.pdfbox.examples.signature; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; + import org.bouncycastle.asn1.ASN1ObjectIdentifier; import org.bouncycastle.asn1.cms.CMSObjectIdentifiers; import org.bouncycastle.cms.CMSException; diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java index 51737ad5b..aba11d9b0 100644 --- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java +++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/CreateSignatureBase.java @@ -30,6 +30,7 @@ import java.security.cert.CertificateException; import java.security.cert.X509Certificate; import java.util.Arrays; import java.util.Enumeration; + import org.apache.pdfbox.pdmodel.interactive.digitalsignature.SignatureInterface; import org.bouncycastle.cert.jcajce.JcaCertStore; import org.bouncycastle.cms.CMSException; diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java index 4b6494194..6f57e205a 100644 --- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java +++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/TSAClient.java @@ -28,6 +28,7 @@ import java.security.MessageDigest; import java.security.SecureRandom; import java.util.Base64; import java.util.Random; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.bouncycastle.asn1.ASN1ObjectIdentifier; diff --git a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java index 0003ddefc..d01666d76 100644 --- a/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java +++ b/stirling-pdf/src/main/java/org/apache/pdfbox/examples/signature/ValidationTimeStamp.java @@ -27,6 +27,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; + import org.bouncycastle.asn1.ASN1Encodable; import org.bouncycastle.asn1.ASN1EncodableVector; import org.bouncycastle.asn1.ASN1ObjectIdentifier; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java b/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java index 000c87270..49be7fd42 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/Factories/ReplaceAndInvertColorFactory.java @@ -2,6 +2,7 @@ package stirling.software.SPDF.Factories; import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; + import stirling.software.common.model.api.misc.HighContrastColorCombination; import stirling.software.common.model.api.misc.ReplaceAndInvert; import stirling.software.common.util.misc.CustomColorReplaceStrategy; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java b/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java index 80358545b..2be2a082c 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/LibreOfficeListener.java @@ -1,11 +1,13 @@ package stirling.software.SPDF; -import io.github.pixee.security.SystemCommand; import java.io.IOException; import java.net.InetSocketAddress; import java.net.Socket; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; + +import io.github.pixee.security.SystemCommand; + import lombok.extern.slf4j.Slf4j; @Slf4j diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java b/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java index 7d28f7e1e..cd356e8da 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/SPDFApplication.java @@ -1,8 +1,5 @@ package stirling.software.SPDF; -import io.github.pixee.security.SystemCommand; -import jakarta.annotation.PostConstruct; -import jakarta.annotation.PreDestroy; import java.io.IOException; import java.net.URISyntaxException; import java.nio.file.Files; @@ -12,12 +9,20 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.Properties; -import lombok.extern.slf4j.Slf4j; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.core.env.Environment; import org.springframework.scheduling.annotation.EnableScheduling; + +import io.github.pixee.security.SystemCommand; + +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.UI.WebBrowser; import stirling.software.common.configuration.AppConfig; import stirling.software.common.configuration.ConfigInitializer; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java index a10f28e5e..959e7f354 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/DesktopBrowser.java @@ -1,6 +1,5 @@ package stirling.software.SPDF.UI.impl; -import jakarta.annotation.PreDestroy; import java.awt.AWTException; import java.awt.BorderLayout; import java.awt.Frame; @@ -15,16 +14,13 @@ import java.io.File; import java.io.InputStream; import java.util.Objects; import java.util.concurrent.CompletableFuture; + import javax.imageio.ImageIO; import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.Timer; -import lombok.extern.slf4j.Slf4j; -import me.friwi.jcefmaven.CefAppBuilder; -import me.friwi.jcefmaven.EnumProgress; -import me.friwi.jcefmaven.MavenCefAppHandlerAdapter; -import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler; + import org.cef.CefApp; import org.cef.CefClient; import org.cef.CefSettings; @@ -36,6 +32,16 @@ import org.cef.handler.CefDownloadHandlerAdapter; import org.cef.handler.CefLoadHandlerAdapter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Component; + +import jakarta.annotation.PreDestroy; + +import lombok.extern.slf4j.Slf4j; + +import me.friwi.jcefmaven.CefAppBuilder; +import me.friwi.jcefmaven.EnumProgress; +import me.friwi.jcefmaven.MavenCefAppHandlerAdapter; +import me.friwi.jcefmaven.impl.progress.ConsoleProgressHandler; + import stirling.software.SPDF.UI.WebBrowser; import stirling.software.common.configuration.InstallationPathConfig; import stirling.software.common.util.UIScaling; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java index 102539bed..5c7381fa4 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/UI/impl/LoadingWindow.java @@ -1,6 +1,5 @@ package stirling.software.SPDF.UI.impl; -import io.github.pixee.security.BoundedLineReader; import java.awt.*; import java.io.BufferedReader; import java.io.InputStream; @@ -8,9 +7,14 @@ import java.io.InputStreamReader; import java.util.HashSet; import java.util.Set; import java.util.concurrent.TimeUnit; + import javax.imageio.ImageIO; import javax.swing.*; + +import io.github.pixee.security.BoundedLineReader; + import lombok.extern.slf4j.Slf4j; + import stirling.software.common.util.UIScaling; @Slf4j diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java index f94819ff8..c4c528f77 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/AppUpdateService.java @@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Scope; + import stirling.software.common.configuration.interfaces.ShowAdminInterface; import stirling.software.common.model.ApplicationProperties; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java index b2a5ac230..cc9daff83 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/CleanUrlInterceptor.java @@ -1,14 +1,16 @@ package stirling.software.SPDF.config; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + public class CleanUrlInterceptor implements HandlerInterceptor { private static final List ALLOWED_PARAMS = diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java index 374e9f340..c9872992a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointConfiguration.java @@ -5,9 +5,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import lombok.extern.slf4j.Slf4j; + import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.ApplicationProperties; @Service diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java index afe6331df..d9ceb0f9d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInspector.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.TreeSet; -import lombok.RequiredArgsConstructor; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; @@ -17,6 +17,8 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import lombok.RequiredArgsConstructor; + @Component @RequiredArgsConstructor public class EndpointInspector implements ApplicationListener { diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java index 0c50872d8..52fb42e07 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/EndpointInterceptor.java @@ -1,11 +1,13 @@ package stirling.software.SPDF.config; +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; + import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.web.servlet.HandlerInterceptor; @Component @Slf4j diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java index 4062d5676..7dd6d2b3b 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/ExternalAppDepConfig.java @@ -1,13 +1,17 @@ package stirling.software.SPDF.config; -import jakarta.annotation.PostConstruct; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; + import org.springframework.context.annotation.Configuration; + +import jakarta.annotation.PostConstruct; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.configuration.RuntimePathConfig; @Configuration diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java index 4770cc824..d242bfeab 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/InitialSetup.java @@ -1,17 +1,22 @@ package stirling.software.SPDF.config; -import io.micrometer.common.util.StringUtils; -import jakarta.annotation.PostConstruct; import java.io.IOException; import java.util.Properties; import java.util.UUID; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.stereotype.Component; + +import io.micrometer.common.util.StringUtils; + +import jakarta.annotation.PostConstruct; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.ApplicationProperties; import stirling.software.common.util.GeneralUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java index 11646fa3f..97fbb4d21 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LocaleConfiguration.java @@ -1,7 +1,7 @@ package stirling.software.SPDF.config; import java.util.Locale; -import lombok.RequiredArgsConstructor; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.LocaleResolver; @@ -9,6 +9,9 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.SessionLocaleResolver; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.ApplicationProperties; @Configuration diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java index 14a207bb7..f5839637d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/LogbackPropertyLoader.java @@ -1,8 +1,9 @@ package stirling.software.SPDF.config; -import ch.qos.logback.core.PropertyDefinerBase; import stirling.software.common.configuration.InstallationPathConfig; +import ch.qos.logback.core.PropertyDefinerBase; + public class LogbackPropertyLoader extends PropertyDefinerBase { @Override public String getPropertyValue() { diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java index ed9083dbf..7012ad517 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsConfig.java @@ -1,10 +1,11 @@ package stirling.software.SPDF.config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import io.micrometer.core.instrument.Meter; import io.micrometer.core.instrument.config.MeterFilter; import io.micrometer.core.instrument.config.MeterFilterReply; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; @Configuration public class MetricsConfig { diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java index 0df05576d..7813222e2 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/MetricsFilter.java @@ -1,16 +1,21 @@ package stirling.software.SPDF.config; +import java.io.IOException; + +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + import io.micrometer.core.instrument.Counter; import io.micrometer.core.instrument.MeterRegistry; + import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import java.io.IOException; + import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; -import org.springframework.web.filter.OncePerRequestFilter; + import stirling.software.common.util.RequestUriUtils; @Component diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java index ce477c1ae..78d2a3d2b 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/OpenApiConfig.java @@ -1,5 +1,8 @@ package stirling.software.SPDF.config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Contact; @@ -7,9 +10,9 @@ import io.swagger.v3.oas.models.info.Info; import io.swagger.v3.oas.models.info.License; import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; + import lombok.RequiredArgsConstructor; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; + import stirling.software.common.model.ApplicationProperties; @Configuration diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java index 514328185..737b47d5d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/StartupApplicationListener.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.config; import java.time.LocalDateTime; + import org.springframework.context.ApplicationListener; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.stereotype.Component; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java index d738749ae..3e84f6465 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/config/WebMvcConfig.java @@ -1,10 +1,12 @@ package stirling.software.SPDF.config; -import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.configuration.InstallationPathConfig; @Configuration diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java index 317c1e424..e5d3ba884 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AdditionalLanguageJsController.java @@ -1,16 +1,21 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Hidden; -import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; import java.util.Set; -import lombok.RequiredArgsConstructor; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Hidden; + +import jakarta.servlet.http.HttpServletResponse; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.service.LanguageService; @RestController diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java index e7f23f877..b6419890a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/AnalysisController.java @@ -1,10 +1,8 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.util.*; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentInformation; @@ -14,6 +12,12 @@ import org.apache.pdfbox.pdmodel.encryption.PDEncryption; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation; import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; import org.springframework.web.bind.annotation.*; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java index c8117c72d..3a2d16757 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/CropController.java @@ -1,10 +1,8 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.multipdf.LayerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -17,6 +15,12 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.general.CropPdfForm; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java index 098305277..6a30e6bb3 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/EditTableOfContentsController.java @@ -1,16 +1,11 @@ package stirling.software.SPDF.controller.api; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline; @@ -25,6 +20,16 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.EditTableOfContentsRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java index edf12f28b..5e37314a6 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MergeController.java @@ -1,7 +1,5 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -12,8 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; import java.util.List; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.multipdf.PDFMergerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; @@ -29,6 +26,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.general.MergePdfsRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.GeneralUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java index a4fffdf9d..c57e3a6c0 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/MultiPageLayoutController.java @@ -1,12 +1,9 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.io.ByteArrayOutputStream; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.multipdf.LayerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -20,6 +17,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.general.MergeMultiplePagesRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java index 073ca1fe2..d6602351e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfImageRemovalController.java @@ -1,16 +1,20 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.service.PdfImageRemovalService; import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java index e95fbb782..e6fc2c561 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/PdfOverlayController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -11,7 +8,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.Loader; import org.apache.pdfbox.multipdf.Overlay; import org.apache.pdfbox.pdmodel.PDDocument; @@ -22,6 +19,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.general.OverlayPdfsRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.GeneralUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java index 063ef87aa..3bf2ec802 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RearrangePagesPDFController.java @@ -1,14 +1,10 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.springframework.http.ResponseEntity; @@ -17,6 +13,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.SortTypes; import stirling.software.SPDF.model.api.PDFWithPageNums; import stirling.software.SPDF.model.api.general.RearrangePagesRequest; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java index aa013e0e8..afdfc54d9 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/RotationController.java @@ -1,10 +1,7 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageTree; @@ -14,6 +11,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.general.RotatePDFRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java index a5913bc68..b2d689728 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ScalePagesController.java @@ -1,13 +1,10 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.multipdf.LayerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -21,6 +18,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.general.ScalePagesRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java index a5fdb12d8..0e9cd96dc 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SettingsController.java @@ -1,10 +1,8 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Hidden; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.util.Map; -import lombok.RequiredArgsConstructor; + import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; @@ -12,6 +10,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; + +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.config.EndpointConfiguration; import stirling.software.common.configuration.InstallationPathConfig; import stirling.software.common.model.ApplicationProperties; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java index d6645438f..1b65891ac 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPDFController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.file.Files; @@ -12,8 +9,7 @@ import java.util.List; import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.springframework.http.MediaType; @@ -23,6 +19,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.PDFWithPageNums; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java index 965b4f7cc..94cf6aa6d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfByChaptersController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.nio.file.Files; import java.nio.file.Path; @@ -10,12 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline; @@ -27,6 +19,18 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.SplitPdfByChaptersRequest; import stirling.software.common.model.PdfMetadata; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java index b56090570..c2bbd31b5 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySectionsController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.file.Files; @@ -11,7 +8,7 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.multipdf.LayerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -27,6 +24,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.SplitPdfBySectionsRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java index b62dd4664..3df62816f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/SplitPdfBySizeController.java @@ -1,16 +1,12 @@ package stirling.software.SPDF.controller.api; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.springframework.http.MediaType; @@ -20,6 +16,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.general.SplitPdfBySizeOrCountRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.GeneralUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java index 3ec758a43..9085f41b1 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/ToSinglePageController.java @@ -1,11 +1,9 @@ package stirling.software.SPDF.controller.api; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.geom.AffineTransform; import java.io.ByteArrayOutputStream; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.multipdf.LayerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -17,6 +15,12 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java index e63be6fc4..32aedf57c 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java @@ -1,12 +1,8 @@ package stirling.software.SPDF.controller.api.converters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.nio.charset.StandardCharsets; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.jetbrains.annotations.NotNull; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -16,6 +12,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.configuration.RuntimePathConfig; import stirling.software.common.model.api.converters.EmlToPdfRequest; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java index 660958daa..cdd9bc1a7 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertHtmlToPDF.java @@ -1,15 +1,18 @@ package stirling.software.SPDF.controller.api.converters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.configuration.RuntimePathConfig; import stirling.software.common.model.ApplicationProperties; import stirling.software.common.model.api.converters.HTMLToPdfRequest; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java index 2adde53c3..3125f8335 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertImgPDFController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.converters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.FileOutputStream; import java.io.IOException; @@ -13,8 +10,7 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.FileUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -26,6 +22,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.converters.ConvertToImageRequest; import stirling.software.SPDF.model.api.converters.ConvertToPdfRequest; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java index 62cfb95c0..98f96fbdb 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertMarkdownToPdf.java @@ -1,11 +1,8 @@ package stirling.software.SPDF.controller.api.converters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; import java.util.Map; -import lombok.RequiredArgsConstructor; + import org.commonmark.Extension; import org.commonmark.ext.gfm.tables.TableBlock; import org.commonmark.ext.gfm.tables.TablesExtension; @@ -19,6 +16,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.configuration.RuntimePathConfig; import stirling.software.common.model.ApplicationProperties; import stirling.software.common.model.api.GeneralFile; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java index 0aaa136cc..d81e3843f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertOfficeController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.converters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -10,7 +7,7 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import lombok.RequiredArgsConstructor; + import org.apache.commons.io.FilenameUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.springframework.http.ResponseEntity; @@ -19,6 +16,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.configuration.RuntimePathConfig; import stirling.software.common.model.api.GeneralFile; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java index 68c8703b8..9015dee2e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToHtml.java @@ -1,13 +1,15 @@ package stirling.software.SPDF.controller.api.converters; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.util.PDFToFile; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java index c41387566..585185460 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToOffice.java @@ -1,10 +1,7 @@ package stirling.software.SPDF.controller.api.converters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.springframework.http.MediaType; @@ -14,6 +11,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.converters.PdfToPresentationRequest; import stirling.software.SPDF.model.api.converters.PdfToTextOrRTFRequest; import stirling.software.SPDF.model.api.converters.PdfToWordRequest; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java index a289a5421..89282b925 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertPDFToPDFA.java @@ -2,9 +2,6 @@ package stirling.software.SPDF.controller.api.converters; import java.awt.Color; import java.io.ByteArrayOutputStream; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -21,7 +18,6 @@ import java.util.Optional; import java.util.Set; import java.util.TimeZone; -import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; import org.apache.pdfbox.Loader; import org.apache.pdfbox.cos.COSArray; @@ -63,6 +59,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.converters.PdfToPdfARequest; import stirling.software.common.util.ProcessExecutor; import stirling.software.common.util.ProcessExecutor.ProcessExecutorResult; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java index 25a63c3fd..b16cc01d9 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertWebsiteToPDF.java @@ -1,20 +1,24 @@ package stirling.software.SPDF.controller.api.converters; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.converters.UrlToPdfRequest; import stirling.software.common.configuration.RuntimePathConfig; import stirling.software.common.model.ApplicationProperties; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java index 767dc503d..847904b60 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/converters/ExtractCSVController.java @@ -1,7 +1,5 @@ package stirling.software.SPDF.controller.api.converters; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringWriter; @@ -11,8 +9,7 @@ import java.util.Collections; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.QuoteMode; import org.apache.pdfbox.pdmodel.PDDocument; @@ -24,9 +21,17 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.PDFWithPageNums; import stirling.software.SPDF.pdf.FlexibleCSVWriter; import stirling.software.common.service.CustomPDFDocumentFactory; + import technology.tabula.ObjectExtractor; import technology.tabula.Page; import technology.tabula.Table; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java index 8591ca8b3..96322ad80 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/filters/FilterController.java @@ -1,10 +1,7 @@ package stirling.software.SPDF.controller.api.filters; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.common.PDRectangle; @@ -14,6 +11,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.PDFComparisonAndCount; import stirling.software.SPDF.model.api.PDFWithPageNums; import stirling.software.SPDF.model.api.filter.ContainsTextRequest; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java index 955cb2e14..8d803708c 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoRenameController.java @@ -1,14 +1,10 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.TextPosition; @@ -18,6 +14,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.ExtractHeaderRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java index a1705ac97..44d575575 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/AutoSplitPdfController.java @@ -1,10 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import com.google.zxing.*; -import com.google.zxing.common.HybridBinarizer; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.image.BufferedImage; import java.awt.image.DataBufferByte; import java.awt.image.DataBufferInt; @@ -18,8 +13,7 @@ import java.util.List; import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.PDFRenderer; import org.springframework.http.MediaType; @@ -29,6 +23,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import com.google.zxing.*; +import com.google.zxing.common.HybridBinarizer; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.AutoSplitPdfRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java index ec95fbfa8..a7314fc7e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/BlankPageController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -10,8 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageTree; @@ -25,6 +21,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.RemoveBlankPagesRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.PdfUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java index d314f7e84..8509f5056 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/CompressController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; @@ -20,17 +17,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; + import javax.imageio.IIOImage; import javax.imageio.ImageIO; import javax.imageio.ImageWriteParam; import javax.imageio.ImageWriter; import javax.imageio.plugins.jpeg.JPEGImageWriteParam; import javax.imageio.stream.ImageOutputStream; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -44,6 +38,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.config.EndpointConfiguration; import stirling.software.SPDF.model.api.misc.OptimizePdfRequest; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java index 036f6c911..cfbc88e8b 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/DecompressPdfController.java @@ -1,14 +1,11 @@ package stirling.software.SPDF.controller.api.misc; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.HashSet; import java.util.Set; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.cos.*; import org.apache.pdfbox.io.IOUtils; import org.apache.pdfbox.pdfwriter.compress.CompressParameters; @@ -20,6 +17,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java index 6330aca79..d5d3a63fb 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImageScansController.java @@ -1,7 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.image.BufferedImage; import java.io.FileOutputStream; import java.io.IOException; @@ -12,9 +10,9 @@ import java.util.Arrays; import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import javax.imageio.ImageIO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.FileUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.rendering.PDFRenderer; @@ -25,6 +23,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.ExtractImageScansRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.CheckProgramInstall; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java index fc6bb89e4..4ec844485 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ExtractImagesController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.image.RenderedImage; @@ -20,9 +17,9 @@ import java.util.concurrent.Future; import java.util.zip.Deflater; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import javax.imageio.ImageIO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -34,6 +31,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.PDFExtractImagesRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.ImageProcessingUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java index 4b238c9fc..7872a4b09 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FakeScanController.java @@ -1,9 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; import java.awt.Color; import java.awt.Graphics2D; import java.awt.RenderingHints; @@ -12,8 +8,7 @@ import java.awt.image.BufferedImage; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Random; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -28,6 +23,16 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import jakarta.validation.Valid; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.FakeScanRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java index fde974484..d82a1971a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/FlattenController.java @@ -1,12 +1,8 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.image.BufferedImage; import java.io.IOException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -21,6 +17,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.FlattenRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java index f5fc88548..1d5196940 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/MetadataController.java @@ -1,16 +1,12 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Map; import java.util.Map.Entry; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentInformation; @@ -18,6 +14,14 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.MetadataRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java index dc219fbdd..be6c4649c 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OCRController.java @@ -1,9 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.BoundedLineReader; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.image.BufferedImage; import java.io.*; import java.nio.file.Files; @@ -11,9 +7,9 @@ import java.nio.file.Path; import java.util.*; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; + import javax.imageio.ImageIO; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.multipdf.PDFMergerUtility; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -26,6 +22,15 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.BoundedLineReader; +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.ProcessPdfWithOcrRequest; import stirling.software.common.model.ApplicationProperties; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java index 666b28697..d50c80967 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/OverlayImageController.java @@ -1,11 +1,7 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; @@ -13,6 +9,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.OverlayImageRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.PdfUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java index 96e19c653..4233d11e4 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PageNumbersController.java @@ -1,12 +1,9 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.List; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -20,6 +17,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.misc.AddPageNumbersRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.GeneralUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java index a1af36d6b..79140c571 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/PrintFileController.java @@ -1,6 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.awt.image.BufferedImage; import java.awt.print.PageFormat; @@ -9,10 +8,11 @@ import java.awt.print.PrinterException; import java.awt.print.PrinterJob; import java.io.IOException; import java.util.Arrays; + import javax.imageio.ImageIO; import javax.print.PrintService; import javax.print.PrintServiceLookup; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.printing.PDFPageable; @@ -22,6 +22,11 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.misc.PrintFileRequest; @RestController diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java index c11cc8f09..85340a163 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/RepairController.java @@ -1,20 +1,24 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.List; -import lombok.RequiredArgsConstructor; + import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.ProcessExecutor; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java index bad7c9b43..85fb7cfc3 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ReplaceAndInvertColorController.java @@ -1,9 +1,7 @@ package stirling.software.SPDF.controller.api.misc; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.springframework.core.io.InputStreamResource; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -12,6 +10,12 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.misc.ReplaceAndInvertColorRequest; import stirling.software.SPDF.service.misc.ReplaceAndInvertColorService; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java index 2d8da92cc..94e9b57c6 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/ShowJavascript.java @@ -1,11 +1,8 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.nio.charset.StandardCharsets; import java.util.Map; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.common.PDNameTreeNode; import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript; @@ -16,6 +13,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java index d6dee9192..9c0ad2909 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/StampController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.awt.image.BufferedImage; import java.io.File; @@ -11,8 +8,9 @@ import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; import java.util.List; + import javax.imageio.ImageIO; -import lombok.RequiredArgsConstructor; + import org.apache.commons.io.IOUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -33,6 +31,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.misc.AddStampRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java index d845c8548..e7dfba041 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/misc/UnlockPDFFormsController.java @@ -1,13 +1,10 @@ package stirling.software.SPDF.controller.api.misc; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.nio.charset.StandardCharsets; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.cos.*; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.common.PDStream; @@ -19,6 +16,13 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java index 7eab3ce92..d573301d0 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineController.java @@ -1,9 +1,5 @@ package stirling.software.SPDF.controller.api.pipeline; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.util.HashMap; @@ -11,8 +7,7 @@ import java.util.List; import java.util.Map; import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.core.io.Resource; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -21,6 +16,16 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.PipelineConfig; import stirling.software.SPDF.model.PipelineOperation; import stirling.software.SPDF.model.PipelineResult; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java index c9bce8207..a3548ed49 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineDirectoryProcessor.java @@ -1,6 +1,5 @@ package stirling.software.SPDF.controller.api.pipeline; -import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -23,11 +22,16 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.stream.Stream; -import lombok.extern.slf4j.Slf4j; + import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.PipelineConfig; import stirling.software.SPDF.model.PipelineOperation; import stirling.software.SPDF.model.PipelineResult; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java index c70964bf7..222ecd1c6 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.pipeline; -import io.github.pixee.security.Filenames; -import io.github.pixee.security.ZipSecurity; -import jakarta.servlet.ServletContext; import java.io.*; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; @@ -16,7 +13,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import lombok.extern.slf4j.Slf4j; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; @@ -26,6 +23,14 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.RestTemplate; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.github.pixee.security.ZipSecurity; + +import jakarta.servlet.ServletContext; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.SPDFApplication; import stirling.software.SPDF.model.PipelineConfig; import stirling.software.SPDF.model.PipelineOperation; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java index 7e351f86b..3260eb31f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/CertSignController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.security; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.beans.PropertyEditorSupport; import java.io.*; @@ -14,8 +11,7 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.util.Calendar; import java.util.List; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.commons.io.FileUtils; import org.apache.pdfbox.examples.signature.CreateSignatureBase; import org.apache.pdfbox.pdmodel.PDDocument; @@ -67,6 +63,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.api.security.SignPDFWithCertRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java index a10574d09..c630106e4 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/GetInfoOnPDF.java @@ -1,17 +1,11 @@ package stirling.software.SPDF.controller.api.security; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; import java.util.*; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.cos.COSInputStream; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSString; @@ -56,6 +50,17 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java index ae38c2a49..4567fcb7e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/PasswordController.java @@ -1,10 +1,7 @@ package stirling.software.SPDF.controller.api.security; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.encryption.AccessPermission; import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy; @@ -14,6 +11,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.security.AddPasswordRequest; import stirling.software.SPDF.model.api.security.PDFPasswordRequest; import stirling.software.common.service.CustomPDFDocumentFactory; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java index c7dea99fd..88d271cfb 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RedactController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.security; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -11,8 +8,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageContentStream; @@ -26,6 +22,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.PDFText; import stirling.software.SPDF.model.api.security.ManualRedactPdfRequest; import stirling.software.SPDF.model.api.security.RedactPdfRequest; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java index 264e4b81b..79fd18914 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/RemoveCertSignController.java @@ -1,10 +1,7 @@ package stirling.software.SPDF.controller.api.security; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.util.List; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDDocumentCatalog; import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm; @@ -16,6 +13,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java index d45a896a6..47e45c595 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/SanitizeController.java @@ -1,10 +1,7 @@ package stirling.software.SPDF.controller.api.security; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; @@ -30,6 +27,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.security.SanitizePdfRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.WebResponseUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java index 24d9923ae..b3f01ef47 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/ValidateSignatureController.java @@ -1,7 +1,5 @@ package stirling.software.SPDF.controller.api.security; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.beans.PropertyEditorSupport; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -12,7 +10,7 @@ import java.security.interfaces.RSAPublicKey; import java.util.ArrayList; import java.util.Date; import java.util.List; -import lombok.RequiredArgsConstructor; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.interactive.digitalsignature.PDSignature; import org.bouncycastle.cert.X509CertificateHolder; @@ -33,6 +31,12 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.security.SignatureValidationRequest; import stirling.software.SPDF.model.api.security.SignatureValidationResult; import stirling.software.SPDF.service.CertificateValidationService; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java index 71e18e824..fd8f1cf8a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/api/security/WatermarkController.java @@ -1,8 +1,5 @@ package stirling.software.SPDF.controller.api.security; -import io.github.pixee.security.Filenames; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import java.awt.*; import java.awt.image.BufferedImage; import java.beans.PropertyEditorSupport; @@ -11,8 +8,9 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.nio.file.Files; + import javax.imageio.ImageIO; -import lombok.RequiredArgsConstructor; + import org.apache.commons.io.IOUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; @@ -34,6 +32,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.github.pixee.security.Filenames; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.model.api.security.AddWatermarkRequest; import stirling.software.common.service.CustomPDFDocumentFactory; import stirling.software.common.util.PdfUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java index 0c16c2ace..34f8a8daa 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/ConverterWebController.java @@ -1,11 +1,13 @@ package stirling.software.SPDF.controller.web; -import io.swagger.v3.oas.annotations.Hidden; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; + +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; + import stirling.software.common.util.CheckProgramInstall; @Controller diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java index 9985455d2..72486a28f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java @@ -1,9 +1,5 @@ package stirling.software.SPDF.controller.web; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.swagger.v3.oas.annotations.Hidden; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.File; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -12,13 +8,22 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; import java.util.stream.Stream; -import lombok.extern.slf4j.Slf4j; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.SignatureFile; import stirling.software.SPDF.service.SignatureService; import stirling.software.common.configuration.InstallationPathConfig; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java index aec8e986d..2b36f95af 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/HomeWebController.java @@ -1,15 +1,11 @@ package stirling.software.SPDF.controller.web; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import io.swagger.v3.oas.annotations.Hidden; import java.io.IOException; import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; import org.springframework.http.MediaType; @@ -17,6 +13,15 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ResponseBody; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; + +import io.swagger.v3.oas.annotations.Hidden; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.Dependency; import stirling.software.common.model.ApplicationProperties; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java index 8a313ea99..e82acaffa 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/MetricsController.java @@ -1,22 +1,27 @@ package stirling.software.SPDF.controller.web; -import io.micrometer.core.instrument.Counter; -import io.micrometer.core.instrument.MeterRegistry; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.PostConstruct; import java.time.Duration; import java.time.LocalDateTime; import java.util.*; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; + import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; + +import io.micrometer.core.instrument.Counter; +import io.micrometer.core.instrument.MeterRegistry; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; + +import jakarta.annotation.PostConstruct; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.config.EndpointInspector; import stirling.software.SPDF.config.StartupApplicationListener; import stirling.software.common.model.ApplicationProperties; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java index 4da017766..25333d495 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/OtherWebController.java @@ -1,16 +1,20 @@ package stirling.software.SPDF.controller.web; -import io.swagger.v3.oas.annotations.Hidden; -import io.swagger.v3.oas.annotations.tags.Tag; import java.io.File; import java.util.Arrays; import java.util.Collections; import java.util.List; -import lombok.RequiredArgsConstructor; + import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.servlet.ModelAndView; + +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; + +import lombok.RequiredArgsConstructor; + import stirling.software.common.model.ApplicationProperties; import stirling.software.common.util.CheckProgramInstall; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java index 3e153841f..eb7245e5a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SecurityWebController.java @@ -1,11 +1,12 @@ package stirling.software.SPDF.controller.web; -import io.swagger.v3.oas.annotations.Hidden; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; +import io.swagger.v3.oas.annotations.Hidden; +import io.swagger.v3.oas.annotations.tags.Tag; + @Controller @Tag(name = "Security", description = "Security APIs") public class SecurityWebController { diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java index 63e3ca7fb..de03680e1 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.controller.web; import java.io.IOException; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -9,6 +10,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; + import stirling.software.SPDF.service.SignatureService; import stirling.software.common.service.UserServiceInterface; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java index 4e9405d4c..2c4ed9bec 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java @@ -2,9 +2,12 @@ package stirling.software.SPDF.controller.web; import java.util.Locale; import java.util.regex.Pattern; -import lombok.extern.slf4j.Slf4j; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.ApplicationProperties; @Service diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java index 44e8c40fd..dfb06f0d8 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/ApiEndpoint.java @@ -1,9 +1,10 @@ package stirling.software.SPDF.model; -import com.fasterxml.jackson.databind.JsonNode; import java.util.HashMap; import java.util.Map; +import com.fasterxml.jackson.databind.JsonNode; + public class ApiEndpoint { private final String name; private Map parameters; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java index 7dac4ef1b..b0d3a3e7d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineConfig.java @@ -1,7 +1,9 @@ package stirling.software.SPDF.model; -import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; + +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.Data; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java index 322b1ec3d..30a5ad52b 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineOperation.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.model; import java.util.Map; + import lombok.Data; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java index 46a74b07f..8ecf0d97e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/PipelineResult.java @@ -1,9 +1,11 @@ package stirling.software.SPDF.model; import java.util.List; -import lombok.Data; + import org.springframework.core.io.Resource; +import lombok.Data; + @Data public class PipelineResult { private List outputFiles; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java index 24b3cf918..51e3bc159 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/EditTableOfContentsRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java index 60531e30b..7f425dc04 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/HandleDataRequest.java @@ -1,9 +1,11 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java index 700052d9c..bd51ac8db 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/ImageFile.java @@ -1,9 +1,11 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java index 9545c183d..b56a52c7a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/MultiplePDFFiles.java @@ -1,9 +1,11 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java index 55fcc1166..9524cd274 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparison.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java index a9a1515c8..32037ea9f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFComparisonAndCount.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java index f78c36bb4..272c5c8b1 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFExtractImagesRequest.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java index 49e70a4ae..c2e8d2658 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithImageFormatRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java index 1b79e88de..062c890fc 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageNums.java @@ -1,12 +1,16 @@ package stirling.software.SPDF.model.api; +import java.util.List; + +import org.apache.pdfbox.pdmodel.PDDocument; + import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import java.util.List; + import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.pdfbox.pdmodel.PDDocument; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.util.GeneralUtils; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java index e682b5455..83501fb35 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/PDFWithPageSize.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java index c736cdf7f..364faeca4 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfByChaptersRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java index 877e62458..3a89ab686 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/SplitPdfBySectionsRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java index 096775590..fbbd4723a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertPDFToMarkdown.java @@ -1,13 +1,15 @@ package stirling.software.SPDF.model.api.converters; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.util.PDFToFile; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java index b7d040506..149676946 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToImageRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.converters; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFWithPageNums; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java index 39f70d56c..c3b059fe0 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/ConvertToPdfRequest.java @@ -1,9 +1,11 @@ package stirling.software.SPDF.model.api.converters; +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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java index a8b87f533..474981e76 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToBookRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java index 821b396d8..0553988ca 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPdfARequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java index 57eae7398..8a5b3d376 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToPresentationRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java index 8b8ced398..bad03d97a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToTextOrRTFRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java index 2e005d1ba..e28bb9be8 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/PdfToWordRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java index cef870b3e..954045f01 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/converters/UrlToPdfRequest.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.model.api.converters; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java index aecdfd992..0435e5835 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/ContainsTextRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.filter; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFWithPageNums; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java index c1f40bbe9..a3c57077d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/FileSizeRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.filter; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFComparison; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java index 41cea6842..05fd10c31 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageRotationRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.filter; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFComparison; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java index 355ca1e10..2fa74f040 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/filter/PageSizeRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.filter; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFComparison; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java index 3f54621db..913f94a10 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/CropPdfForm.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java index c52d8a4cd..6d9254023 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergeMultiplePagesRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java index 1ddaadc3f..75f75223e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/MergePdfsRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.MultiplePDFFiles; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java index f4d6e8b7b..f89ba320f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/OverlayPdfsRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.general; +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; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java index bbc3c1e9c..050dc1eba 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RearrangePagesRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.SortTypes; import stirling.software.SPDF.model.api.PDFWithPageNums; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java index 389ae2fb8..aebc2b399 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/RotatePDFRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java index 319a5dc57..653697f4e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/ScalePagesRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFWithPageSize; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java index 900b9206b..0dd599781 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/general/SplitPdfBySizeOrCountRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.general; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java index 2b1df026b..5f0f71695 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddPageNumbersRequest.java @@ -2,8 +2,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFWithPageNums; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java index 2f872ef92..48d470a5a 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AddStampRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.misc; +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; + import stirling.software.SPDF.model.api.PDFWithPageNums; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java index 9be5fb14c..0ba3ad8bd 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/AutoSplitPdfRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java index 8d9591e7d..cbb51a390 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractHeaderRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java index 62063c4ca..6345d4489 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ExtractImageScansRequest.java @@ -1,9 +1,11 @@ package stirling.software.SPDF.model.api.misc; +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 diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java index b8a0df1d5..1237d2305 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FakeScanRequest.java @@ -1,10 +1,13 @@ package stirling.software.SPDF.model.api.misc; +import org.springframework.web.multipart.MultipartFile; + import io.swagger.v3.oas.annotations.media.Schema; + import jakarta.validation.constraints.NotNull; + import lombok.Data; import lombok.EqualsAndHashCode; -import org.springframework.web.multipart.MultipartFile; @Data @EqualsAndHashCode diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java index a64e9f9d9..cf4e7c575 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/FlattenRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java index ef3f1d17c..63b267196 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/MetadataRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.misc; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.Map; + +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java index 9977c3ea3..eafeeceaa 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OptimizePdfRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java index f86cff258..759daa991 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/OverlayImageRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.misc; +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; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java index f98649162..3119c32d7 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/PrintFileRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java index bd4d9bdba..00279eb96 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ProcessPdfWithOcrRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.misc; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; + +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java index e031a67a0..cef00dcc0 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/RemoveBlankPagesRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java index 37cfe0316..50ef14b1e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/misc/ReplaceAndInvertColorRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.misc; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; import stirling.software.common.model.api.misc.HighContrastColorCombination; import stirling.software.common.model.api.misc.ReplaceAndInvert; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java index 5d71bad42..666318a49 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddPasswordRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.security; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java index a9049f205..00408c55e 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/AddWatermarkRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.security; +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; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java index 830dd707c..48cb5bc67 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/ManualRedactPdfRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.security; -import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; + +import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.SPDF.model.api.PDFWithPageNums; import stirling.software.common.model.api.security.RedactionArea; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java index d5df9b95e..cea62b079 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/PDFPasswordRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.security; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java index f8bc0f7c9..279a41a27 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/RedactPdfRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.security; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java index c3d94155d..736fbb20d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SanitizePdfRequest.java @@ -1,8 +1,10 @@ package stirling.software.SPDF.model.api.security; import io.swagger.v3.oas.annotations.media.Schema; + import lombok.Data; import lombok.EqualsAndHashCode; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java index fd244ea6f..acb4b55fd 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignPDFWithCertRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.security; +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; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java index ac3b6154a..dd301e0e1 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationRequest.java @@ -1,9 +1,12 @@ package stirling.software.SPDF.model.api.security; +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; + import stirling.software.common.model.api.PDFFile; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java index 3a4e2942c..b4c51f365 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/model/api/security/SignatureValidationResult.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.model.api.security; import java.util.List; + import lombok.Data; @Data diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java index 42e13dcd6..94a48d935 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/FlexibleCSVWriter.java @@ -1,6 +1,7 @@ package stirling.software.SPDF.pdf; import org.apache.commons.csv.CSVFormat; + import technology.tabula.writers.CSVWriter; public class FlexibleCSVWriter extends CSVWriter { diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java index bd341435e..4119b3eac 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/pdf/TextFinder.java @@ -5,10 +5,13 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import lombok.extern.slf4j.Slf4j; + import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.apache.pdfbox.text.TextPosition; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.PDFText; @Slf4j diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java index d2c67256b..d5cc76af8 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/ApiDocService.java @@ -1,15 +1,12 @@ package stirling.software.SPDF.service; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import jakarta.servlet.ServletContext; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import lombok.extern.slf4j.Slf4j; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -17,6 +14,14 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import org.springframework.web.client.RestTemplate; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +import jakarta.servlet.ServletContext; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.SPDFApplication; import stirling.software.SPDF.model.ApiEndpoint; import stirling.software.common.model.enumeration.Role; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java index f0190b48c..f8b94f8df 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/CertificateValidationService.java @@ -1,14 +1,17 @@ package stirling.software.SPDF.service; -import io.github.pixee.security.BoundedLineReader; -import jakarta.annotation.PostConstruct; import java.io.*; import java.security.KeyStore; import java.security.KeyStoreException; import java.security.cert.*; import java.util.*; + import org.springframework.stereotype.Service; +import io.github.pixee.security.BoundedLineReader; + +import jakarta.annotation.PostConstruct; + @Service public class CertificateValidationService { private KeyStore trustStore; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java index 5049c676d..4731716a9 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/LanguageService.java @@ -5,10 +5,13 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; -import lombok.extern.slf4j.Slf4j; + import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.stereotype.Service; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.common.model.ApplicationProperties; @Service diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java index 371fa3448..acd0669c0 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/MetricsAggregatorService.java @@ -1,15 +1,19 @@ package stirling.software.SPDF.service; -import io.micrometer.core.instrument.MeterRegistry; -import io.micrometer.core.instrument.search.Search; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import lombok.RequiredArgsConstructor; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; + +import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.search.Search; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.config.EndpointInspector; import stirling.software.common.service.PostHogService; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java index 0f7f7526e..029d0924c 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/PdfImageRemovalService.java @@ -3,6 +3,7 @@ package stirling.software.SPDF.service; import java.io.IOException; import java.util.ArrayList; import java.util.List; + import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java index 15ed2a777..1d25f409f 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/SignatureService.java @@ -7,9 +7,12 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; -import lombok.extern.slf4j.Slf4j; + import org.springframework.stereotype.Service; import org.thymeleaf.util.StringUtils; + +import lombok.extern.slf4j.Slf4j; + import stirling.software.SPDF.model.SignatureFile; import stirling.software.common.configuration.InstallationPathConfig; diff --git a/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java b/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java index 72696f180..dc61a1e1d 100644 --- a/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java +++ b/stirling-pdf/src/main/java/stirling/software/SPDF/service/misc/ReplaceAndInvertColorService.java @@ -1,10 +1,13 @@ package stirling.software.SPDF.service.misc; import java.io.IOException; -import lombok.RequiredArgsConstructor; + import org.springframework.core.io.InputStreamResource; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; + +import lombok.RequiredArgsConstructor; + import stirling.software.SPDF.Factories.ReplaceAndInvertColorFactory; import stirling.software.common.model.api.misc.HighContrastColorCombination; import stirling.software.common.model.api.misc.ReplaceAndInvert;