javier/Stirling-PDF
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flatten (#1167)

Browse Source
This commit is contained in:
Anthony Stirling
2024-05-05 13:33:17 +01:00
committed by GitHub
parent d6b1fec69d
commit ac5273244c
33 changed files with 145 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/stirling/software/SPDF/config/ConfigInitializer.java
View File

@@ -13,8 +13,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
@@ -76,6 +74,7 @@ public class ConfigInitializer
Files.createFile(customSettingsPath);
}
}
private static Map<String, String> extractEntries(List<String> lines) {
Map<String, String> entries = new HashMap<>();
StringBuilder currentEntry = new StringBuilder();
@@ -121,8 +120,10 @@ public class ConfigInitializer
return entries;
}
private static List<String> mergeConfigs(List<String> templateLines, Map<String, String> templateEntries, Map<String, String> userEntries) {
private static List<String> mergeConfigs(
List<String> templateLines,
Map<String, String> templateEntries,
Map<String, String> userEntries) {
List<String> mergedLines = new ArrayList<>();
Set<String> handledKeys = new HashSet<>();
@@ -141,7 +142,8 @@ public class ConfigInitializer
blockIndent = indentLevel;
}
if (userEntries.containsKey(currentBlockKey) && !handledKeys.contains(currentBlockKey)) {
if (userEntries.containsKey(currentBlockKey)
&& !handledKeys.contains(currentBlockKey)) {
mergedLines.add(userEntries.get(currentBlockKey));
handledKeys.add(currentBlockKey);
} else if (!handledKeys.contains(currentBlockKey)) {
@@ -152,8 +154,6 @@ public class ConfigInitializer
return mergedLines;
}
private static List<String> cleanInvalidYamlEntries(List<String> lines) {
List<String> cleanedLines = new ArrayList<>();
for (int i = 0; i < lines.size(); i++) {

2
src/main/java/stirling/software/SPDF/config/security/InitialSecuritySetup.java
View File

@@ -85,6 +85,7 @@ public class InitialSecuritySetup {
// Write back to the file
Files.write(path, lines);
}
private boolean isValidUUID(String uuid) {
if (uuid == null) {
return false;
@@ -96,5 +97,4 @@ public class InitialSecuritySetup {
return false;
}
}
}