From bf9a00868d61bd6d7aa6606f2eca353d9b738cc5 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com.> Date: Tue, 24 Dec 2024 09:36:48 +0000 Subject: [PATCH] fixes --- src/main/java/stirling/software/SPDF/SPdfApplication.java | 3 ++- .../java/stirling/software/SPDF/config/AppUpdateService.java | 3 ++- .../software/SPDF/controller/api/pipeline/ApiDocService.java | 3 ++- .../SPDF/controller/api/pipeline/PipelineProcessor.java | 3 ++- .../software/SPDF/controller/web/GeneralWebController.java | 3 ++- .../software/SPDF/controller/web/SignatureController.java | 3 ++- src/test/java/stirling/software/SPDF/SPdfApplicationTest.java | 4 ++-- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/main/java/stirling/software/SPDF/SPdfApplication.java b/src/main/java/stirling/software/SPDF/SPdfApplication.java index 7391ce2c..4b8f58f5 100644 --- a/src/main/java/stirling/software/SPDF/SPdfApplication.java +++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java @@ -10,6 +10,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -40,7 +41,7 @@ public class SPdfApplication { private String baseUrl; public SPdfApplication( - Environment env, ApplicationProperties applicationProperties, WebBrowser webBrowser) { + Environment env, ApplicationProperties applicationProperties, @Autowired(required = false) WebBrowser webBrowser) { this.env = env; this.applicationProperties = applicationProperties; this.webBrowser = webBrowser; diff --git a/src/main/java/stirling/software/SPDF/config/AppUpdateService.java b/src/main/java/stirling/software/SPDF/config/AppUpdateService.java index df25e013..61112bea 100644 --- a/src/main/java/stirling/software/SPDF/config/AppUpdateService.java +++ b/src/main/java/stirling/software/SPDF/config/AppUpdateService.java @@ -1,5 +1,6 @@ package stirling.software.SPDF.config; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -15,7 +16,7 @@ class AppUpdateService { private final ShowAdminInterface showAdmin; public AppUpdateService( - ApplicationProperties applicationProperties, ShowAdminInterface showAdmin) { + ApplicationProperties applicationProperties, @Autowired(required = false) ShowAdminInterface showAdmin) { this.applicationProperties = applicationProperties; this.showAdmin = showAdmin; } diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java index da1b6bb7..68f4ad1a 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java +++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; @@ -34,7 +35,7 @@ public class ApiDocService { Map> outputToFileTypes = new HashMap<>(); JsonNode apiDocsJsonRootNode; - public ApiDocService(ServletContext servletContext, UserServiceInterface userService) { + public ApiDocService(ServletContext servletContext, @Autowired(required = false) UserServiceInterface userService) { this.servletContext = servletContext; this.userService = userService; } diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java index 6a44bf16..c9b741a0 100644 --- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java +++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java @@ -15,6 +15,7 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.http.*; @@ -46,7 +47,7 @@ public class PipelineProcessor { public PipelineProcessor( ApiDocService apiDocService, - UserServiceInterface userService, + @Autowired(required = false) UserServiceInterface userService, ServletContext servletContext) { this.apiDocService = apiDocService; this.userService = userService; diff --git a/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java b/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java index f10e1e4b..cb033028 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java @@ -10,6 +10,7 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; import org.springframework.core.io.support.ResourcePatternUtils; @@ -36,7 +37,7 @@ public class GeneralWebController { private static final String SIGNATURE_BASE_PATH = "customFiles/static/signatures/"; private static final String ALL_USERS_FOLDER = "ALL_USERS"; private final SignatureService signatureService; - private final UserServiceInterface userService; + private final @Autowired(required = false) UserServiceInterface userService; private final ResourceLoader resourceLoader; public GeneralWebController( diff --git a/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java b/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java index 886e7c02..e73167b2 100644 --- a/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java +++ b/src/main/java/stirling/software/SPDF/controller/web/SignatureController.java @@ -2,6 +2,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; import org.springframework.http.ResponseEntity; @@ -19,7 +20,7 @@ public class SignatureController { private final SignatureService signatureService; - private final UserServiceInterface userService; + private final @Autowired(required = false) UserServiceInterface userService; public SignatureController( SignatureService signatureService, UserServiceInterface userService) { diff --git a/src/test/java/stirling/software/SPDF/SPdfApplicationTest.java b/src/test/java/stirling/software/SPDF/SPdfApplicationTest.java index 64ea8454..37f27918 100644 --- a/src/test/java/stirling/software/SPDF/SPdfApplicationTest.java +++ b/src/test/java/stirling/software/SPDF/SPdfApplicationTest.java @@ -15,6 +15,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.env.Environment; +import stirling.software.SPDF.UI.WebBrowser; import stirling.software.SPDF.model.ApplicationProperties; @ExtendWith(MockitoExtension.class) @@ -25,13 +26,12 @@ public class SPdfApplicationTest { @Mock private ApplicationProperties applicationProperties; - + @InjectMocks private SPdfApplication sPdfApplication; @BeforeEach public void setUp() { - sPdfApplication = new SPdfApplication(env, applicationProperties, null); sPdfApplication.setServerPortStatic("8080"); }