Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ A parser for [TOML](https://toml.io/en/) files with minimum dependencies.

## Maven & Gradle coordinates

- Current version: 13.4.2
- Current version: 13.5.1
- 13 - Dependency on Antlr 4.13.1
- 4 - TOML grammar version 4
- 2 - Release 2
- 5 - TOML grammar version 5 (supports TOML 1.1 specification)
- 1 - Release 1

Maven:

```xml
<dependency>
<groupId>net.vieiro</groupId>
<artifactId>toml-java</artifactId>
<version>13.4.2</version>
<version>13.5.1</version>
</dependency>
```

Gradle:

```groovy
implementation 'net.vieiro:toml-java:13.4.2'
implementation 'net.vieiro:toml-java:13.5.1'
```

## Basic usage
Expand Down Expand Up @@ -232,3 +232,7 @@ This version depends on Antlr4 v4.11.1 (changed to adhere to NetBeans Antlr4 ver

- Handling of unclosed inline-tables and arrays with invalid tokens for NetBeans.

## 13.5.1

- Support TOML v1.1

4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.vieiro</groupId>
<artifactId>toml-java</artifactId>
<version>13.4.3-SNAPSHOT</version>
<version>13.5.1-SNAPSHOT</version>
<packaging>jar</packaging>

<name>toml-java</name>
Expand Down Expand Up @@ -81,7 +81,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<version.antlr>4.13.1</version.antlr>
<maven.compiler.release>11</maven.compiler.release>
</properties>

<dependencies>
Expand Down Expand Up @@ -193,6 +192,7 @@
<version>3.14.1</version>
<configuration>
<compilerArgument>-Xlint:unchecked</compilerArgument>
<release>8</release>
</configuration>
</plugin>
<plugin>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/vieiro/toml/TOMLSimpleQuery.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ static <T> Optional<T> get(Map<String, Object> root, String path, Class<T> clazz
Object context = root;
for (int i = 0; i < parts.length; i++) {
String part = parts[i];
if (part.isBlank()) {
if (part.trim().isEmpty()) {
continue;
}
if (context instanceof Map) {
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/net/vieiro/toml/TOMLSimpleQueryTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ public void testShouldSimpleQueryIgnoreDifferentSlashes() throws Exception {
TOML toml = Util.parse("array-of-tables-test.toml", verbose);

// When we query something starting with a single "/"
String red = toml.getString("/fruit/apple/color").orElseThrow();
String red = toml.getString("/fruit/apple/color").orElseThrow(() -> new IllegalStateException("/fruit/apple/color"));
// Then we get the proper value
Assertions.assertEquals("red", red);

// When we remove the leading "/"
red = toml.getString("fruit/apple/color").orElseThrow();
red = toml.getString("fruit/apple/color").orElseThrow(() -> new IllegalStateException("fruit/apple/color"));
// Then the value is also correct
Assertions.assertEquals("red", red);

// When we add different contigous slashes
red = toml.getString("fruit///apple/color").orElseThrow();
red = toml.getString("fruit///apple/color").orElseThrow( () -> new IllegalStateException("fruit///apple/color"));
// Then the value is also correct
Assertions.assertEquals("red", red);

Expand Down