Skip to content

fix: fixed not handling nameless and valueless properties correctly #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
quintesse merged 3 commits into from
Sep 23, 2026
Merged

fix: fixed not handling nameless and valueless properties correctly #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5387976
test: added a bunch more corner cases
quintesse Sep 23, 2026
b786aea
fix: fixed exception when dealing with empty values
quintesse Sep 23, 2026
5935ddf
fix: fixed not handling nameless and valueless properties correctly
quintesse Sep 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 68 additions & 52 deletions src/main/java/org/codejive/properties/Properties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.codejive.properties.PropertiesParser.Token;

/**
* This class is a replacement for <code>java.util.Properties</code>, with the difference that it
Expand Down Expand Up @@ -134,7 +134,7 @@ public Enumeration<String> propertyNames() {
* value are strings, including the keys in the default property list.
*/
public Set<String> stringPropertyNames() {
return Collections.unmodifiableSet(flatten().keySet());
return Collections.unmodifiableSet(flattened().keySet());
}

/**
Expand All @@ -144,7 +144,7 @@ public Set<String> stringPropertyNames() {
*/
public void list(PrintStream out) {
try {
flatten().store(out);
flattened().store(out);
} catch (IOException e) {
// Ignore any errors
}
Expand All @@ -157,7 +157,7 @@ public void list(PrintStream out) {
*/
public void list(PrintWriter out) {
try {
flatten().store(out);
flattened().store(out);
} catch (IOException e) {
// Ignore any errors
}
Expand Down Expand Up @@ -230,6 +230,7 @@ private void flatten(Properties target) {

@Override
public Set<Entry<String, String>> entrySet() {
if (tokens.isEmpty()) return Collections.emptySet();
return new AbstractSet<Entry<String, String>>() {
@Override
public Iterator<Entry<String, String>> iterator() {
Expand Down Expand Up @@ -272,6 +273,7 @@ public int size() {
* @return A set of raw key values
*/
public Set<String> rawKeySet() {
if (tokens.isEmpty()) return Collections.emptySet();
return tokens.stream()
.filter(t -> t.type == PropertiesParser.Type.KEY)
.map(PropertiesParser.Token::getRaw)
Expand All @@ -285,10 +287,10 @@ public Set<String> rawKeySet() {
* @return a collection of raw values.
*/
public Collection<String> rawValues() {
return combined(tokens)
.filter(ts -> ts.get(0).type == PropertiesParser.Type.KEY)
.map(ts -> ts.get(2).getRaw())
.collect(Collectors.toList());
if (tokens.isEmpty()) return Collections.emptyList();
List<String> result = new ArrayList<>();
walkProperties((key, value) -> result.add(value != null ? value.getRaw() : ""));
return result;
}

/**
Expand All @@ -298,10 +300,40 @@ public Collection<String> rawValues() {
* @return A set of raw key-value entries
*/
public Set<Entry<String, String>> rawEntrySet() {
return combined(tokens)
.filter(ts -> ts.get(0).type == PropertiesParser.Type.KEY)
.map(ts -> new SimpleEntry<>(ts.get(0).getRaw(), ts.get(2).getRaw()))
.collect(Collectors.toCollection(LinkedHashSet::new));
if (tokens.isEmpty()) return Collections.emptySet();
Set<Entry<String, String>> result = new LinkedHashSet<>();
walkProperties(
(key, value) ->
result.add(
new SimpleEntry<>(
key.getRaw(), value != null ? value.getRaw() : "")));
return result;
}

private void walkProperties(BiConsumer<Token, Token> func) {
if (tokens.isEmpty()) return;
Cursor c = Cursor.first(tokens);
while (c.hasToken()) {
if (c.isType(PropertiesParser.Type.KEY)) {
PropertiesParser.Token keyToken = c.token();
c.next();
if (c.isType(PropertiesParser.Type.SEPARATOR)) {
c.next();
if (c.isType(PropertiesParser.Type.VALUE)) {
func.accept(keyToken, c.token());
c.next();
} else {
// We're dealing with a value-less property
func.accept(keyToken, null);
}
} else {
// We're dealing with a key-only property
func.accept(keyToken, null);
}
} else {
c.next();
}
}
}

@Override
Expand Down Expand Up @@ -711,9 +743,7 @@ public Properties escaped() {
}

private static List<PropertiesParser.Token> escapeTokens(List<PropertiesParser.Token> tokens) {
return mapKeyValues(
tokens,
ts -> Arrays.asList(escapeToken(ts.get(0)), ts.get(1), escapeToken(ts.get(2))));
return mapKeyValues(tokens, Properties::escapeToken, Properties::escapeToken);
}

private static PropertiesParser.Token escapeToken(PropertiesParser.Token token) {
Expand All @@ -738,9 +768,7 @@ public Properties unescaped() {

private static List<PropertiesParser.Token> unescapeTokens(
List<PropertiesParser.Token> tokens) {
return mapKeyValues(
tokens,
ts -> Arrays.asList(unescapeToken(ts.get(0)), ts.get(1), unescapeToken(ts.get(2))));
return mapKeyValues(tokens, Properties::unescapeToken, Properties::unescapeToken);
}

private static PropertiesParser.Token unescapeToken(PropertiesParser.Token token) {
Expand All @@ -753,46 +781,22 @@ private static PropertiesParser.Token unescapeToken(PropertiesParser.Token token

private static List<PropertiesParser.Token> mapKeyValues(
List<PropertiesParser.Token> tokens,
Function<List<PropertiesParser.Token>, List<PropertiesParser.Token>> mapper) {
return combined(tokens)
Function<PropertiesParser.Token, PropertiesParser.Token> keyMapper,
Function<PropertiesParser.Token, PropertiesParser.Token> valueMapper) {
return tokens.stream()
.map(
ts -> {
if (ts.get(0).type == PropertiesParser.Type.KEY) {
return mapper.apply(ts);
tk -> {
if (tk.type == PropertiesParser.Type.KEY) {
return keyMapper.apply(tk);
} else if (tk.type == PropertiesParser.Type.VALUE) {
return valueMapper.apply(tk);
} else {
return ts;
return tk;
}
})
.flatMap(Collection::stream)
.collect(Collectors.toList());
}

private static Stream<List<PropertiesParser.Token>> combined(
List<PropertiesParser.Token> tokens) {
Iterator<List<PropertiesParser.Token>> iter =
new Iterator<List<PropertiesParser.Token>>() {
Iterator<PropertiesParser.Token> i = tokens.iterator();

@Override
public boolean hasNext() {
return i.hasNext();
}

@Override
public List<PropertiesParser.Token> next() {
PropertiesParser.Token t = i.next();
if (t.type == PropertiesParser.Type.KEY) {
return Arrays.asList(t, i.next(), i.next());
} else {
return Collections.singletonList(t);
}
}
};

return StreamSupport.stream(
Spliterators.spliterator(iter, tokens.size(), Spliterator.SORTED), false);
}

/**
* Copies all entries from the <code>java.util.Properties</code> object to this object
*
Expand Down Expand Up @@ -865,10 +869,22 @@ private Properties load(List<PropertiesParser.Token> ts) {
for (PropertiesParser.Token token : tokens) {
if (token.type == PropertiesParser.Type.KEY) {
key = token.getText();
}
if (token.type == PropertiesParser.Type.SEPARATOR && key == null) {
// In case if a name-less property
key = "";
} else if (token.type == PropertiesParser.Type.VALUE) {
values.put(key, token.getText());
key = null;
} else if (token.isEol() && key != null) {
// In case of value-less properties
values.put(key, "");
}
}
// In case of the last property being value-less
if (key != null) {
values.put(key, "");
}
return this;
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/codejive/properties/PropertiesParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public String getRaw() {
* Returns the token's processed value. Meaning this value will not contain any escape
* sequences but only actual characters.
*
* @return
* @return a string containing the token's processed value
*/
public String getText() {
return text != null ? text : raw;
Expand All @@ -115,6 +115,7 @@ public String getText() {
* @return true if whitespace ending in EOL, false otherwise
*/
public boolean isEol() {
if (raw.isEmpty()) return false;
int ch = raw.charAt(raw.length() - 1);
return type == Type.WHITESPACE && PropertiesParser.isEol(ch);
}
Expand All @@ -125,6 +126,7 @@ public boolean isEol() {
* @return true if whitespace NOT ending in EOL, false otherwise
*/
public boolean isWs() {
if (raw.isEmpty()) return false;
int ch = raw.charAt(raw.length() - 1);
return type == Type.WHITESPACE && !PropertiesParser.isEol(ch);
}
Expand Down
Loading
Loading