Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2026-03-13 02:18:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

conflict fix again

Browse Source
This commit is contained in:
Anthony Stirling
2025-10-12 21:13:01 +01:00
parent 45c438d66d
commit 884944527e
36 changed files with 74 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/src/main/java/stirling/software/common/model/ApplicationProperties.java
View File

@@ -303,18 +303,11 @@ public class ApplicationProperties {
@Data
public static class Jwt {
<<<<<<< HEAD
private boolean enabled = true;
private boolean keyCleanup = true;
private int keyRetentionDays = 7;
private Boolean secureCookie;
=======
private boolean enableKeystore = true;
private boolean enableKeyRotation = false;
private boolean enableKeyCleanup = true;
private int keyRetentionDays = 7;
private boolean secureCookie;
>>>>>>> refs/remotes/origin/V2
}
}

2
app/common/src/main/java/stirling/software/common/model/InputStreamTemplateResource.java
View File

@@ -4,8 +4,6 @@ package stirling.software.common.model;
* This class will be removed when frontend migration to React is complete
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
@Getter

4
app/common/src/test/java/stirling/software/common/model/ApplicationPropertiesLogicTest.java
View File

@@ -46,10 +46,10 @@ class ApplicationPropertiesLogicTest {
assertEquals(expectedLibre, tfm.getLibreofficeDir());
tfm.setBaseTmpDir("/custom/base");
assertEquals("/custom/base", normalize.apply(tfm.getBaseTmpDir()));
assertEquals(normalize.apply("/custom/base"), normalize.apply(tfm.getBaseTmpDir()));
tfm.setLibreofficeDir("/opt/libre");
assertEquals("/opt/libre", normalize.apply(tfm.getLibreofficeDir()));
assertEquals(normalize.apply("/opt/libre"), normalize.apply(tfm.getLibreofficeDir()));
}
@Test

12
app/common/src/test/java/stirling/software/common/model/InputStreamTemplateResourceTest.java
View File

@@ -1,15 +1,8 @@
package stirling.software.common.model;
import static org.junit.jupiter.api.Assertions.*;
/* Commented out - InputStreamTemplateResource class removed with Thymeleaf migration
* This test will be removed when frontend migration to React is complete
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.Reader;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Arrays;
import org.junit.jupiter.api.Test;
public class InputStreamTemplateResourceTest {
@@ -92,3 +85,4 @@ public class InputStreamTemplateResourceTest {
assertFalse(resource.exists());
}
}
*/