Merge pull request #543 from IABTechLab/gdm-UID2-5837-v4-uid

Author: gmsdelmundo

src/main/java/com/uid2/shared/audit/AuditParams.java

@@ -4,7 +4,6 @@
 import java.util.List;
 
 public record AuditParams(List<String> queryParams, List<String> bodyParams) {
-
     public AuditParams(List<String> queryParams, List<String> bodyParams) {
         this.queryParams = queryParams != null
                 ? Collections.unmodifiableList(queryParams)

src/main/java/com/uid2/shared/store/salt/SaltFileParser.java

@@ -40,11 +40,11 @@ private SaltEntry parseLine(String line, int lineNumber) {
             SaltEntry.KeyMaterial currentKeySalt = null;
             SaltEntry.KeyMaterial previousKeySalt = null;
             if (trimToNull(fields[5]) != null && trimToNull(fields[6]) != null) {
-                currentKeySalt = new SaltEntry.KeyMaterial(Integer.parseInt(fields[5]), fields[6], fields[7]);
+                currentKeySalt = new SaltEntry.KeyMaterial(Integer.parseInt(fields[5]), trimToNull(fields[6]), trimToNull(fields[7]));
             }
 
             if (trimToNull(fields[8]) != null && trimToNull(fields[9]) != null) {
-                previousKeySalt = new SaltEntry.KeyMaterial(Integer.parseInt(fields[8]), fields[9], fields[10]);
+                previousKeySalt = new SaltEntry.KeyMaterial(Integer.parseInt(fields[8]), trimToNull(fields[9]), trimToNull(fields[10]));
             }
 
             return new SaltEntry(id, hashedId, lastUpdated, salt, refreshFrom, previousSalt, currentKeySalt, previousKeySalt);