diff --git a/benchmark/src/main/java/net/woggioni/wson/benchmark/Main.java b/benchmark/src/main/java/net/woggioni/wson/benchmark/Main.java index a692971..432c655 100644 --- a/benchmark/src/main/java/net/woggioni/wson/benchmark/Main.java +++ b/benchmark/src/main/java/net/woggioni/wson/benchmark/Main.java @@ -3,11 +3,11 @@ package net.woggioni.wson.benchmark; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.SneakyThrows; +import net.woggioni.jwo.Chronometer; import net.woggioni.wson.antlr.JSONLexer; import net.woggioni.wson.antlr.JSONListenerImpl; import net.woggioni.wson.serialization.binary.JBONParser; import net.woggioni.wson.serialization.json.JSONParser; -import net.woggioni.jwo.Chronometer; import net.woggioni.wson.value.ObjectValue; import net.woggioni.wson.xface.Value; import org.antlr.v4.runtime.CharStream; diff --git a/build.gradle b/build.gradle index b33fc93..a293227 100644 --- a/build.gradle +++ b/build.gradle @@ -39,10 +39,6 @@ allprojects { test { useJUnitPlatform() } - - java { - modularity.inferModulePath = true - } } ext { diff --git a/gradle.properties b/gradle.properties index 2c1ad2a..0757002 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -wson.version = 2023.03 +wson.version = 2023.009.30 -lys.version = 2023.03 +lys.version = 2023.09.26 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..c1962a7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c85a1f..c30b486 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 79a61d4..aeb74cb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/src/main/java/net/woggioni/wson/value/ArrayValue.java b/src/main/java/net/woggioni/wson/value/ArrayValue.java index 76f26bf..b6f25cb 100644 --- a/src/main/java/net/woggioni/wson/value/ArrayValue.java +++ b/src/main/java/net/woggioni/wson/value/ArrayValue.java @@ -4,7 +4,10 @@ import lombok.EqualsAndHashCode; import lombok.NonNull; import net.woggioni.wson.xface.Value; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; @EqualsAndHashCode public class ArrayValue implements Value, Iterable { diff --git a/src/main/java/net/woggioni/wson/value/ObjectValue.java b/src/main/java/net/woggioni/wson/value/ObjectValue.java index e375b19..f4baabb 100644 --- a/src/main/java/net/woggioni/wson/value/ObjectValue.java +++ b/src/main/java/net/woggioni/wson/value/ObjectValue.java @@ -2,10 +2,18 @@ package net.woggioni.wson.value; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import static net.woggioni.jwo.JWO.newThrowable; import net.woggioni.wson.xface.Value; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.TreeMap; + +import static net.woggioni.jwo.JWO.newThrowable; public interface ObjectValue extends Value, Iterable> { diff --git a/src/main/java/net/woggioni/wson/value/StringValue.java b/src/main/java/net/woggioni/wson/value/StringValue.java index 26e0871..f7caa3e 100644 --- a/src/main/java/net/woggioni/wson/value/StringValue.java +++ b/src/main/java/net/woggioni/wson/value/StringValue.java @@ -4,8 +4,6 @@ import lombok.EqualsAndHashCode; import lombok.NonNull; import net.woggioni.wson.xface.Value; -import java.util.Objects; - @EqualsAndHashCode public class StringValue implements Value { diff --git a/src/test/java/net/woggioni/wson/serialization/binary/JBONTest.java b/src/test/java/net/woggioni/wson/serialization/binary/JBONTest.java index 640a6cb..cd81762 100644 --- a/src/test/java/net/woggioni/wson/serialization/binary/JBONTest.java +++ b/src/test/java/net/woggioni/wson/serialization/binary/JBONTest.java @@ -9,7 +9,12 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -import java.io.*; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; import java.nio.file.Files; import java.nio.file.Path; diff --git a/wson-cli/src/main/kotlin/net/woggioni/wson/cli/main.kt b/wson-cli/src/main/kotlin/net/woggioni/wson/cli/main.kt index 99fa8fb..66547f1 100644 --- a/wson-cli/src/main/kotlin/net/woggioni/wson/cli/main.kt +++ b/wson-cli/src/main/kotlin/net/woggioni/wson/cli/main.kt @@ -1,22 +1,22 @@ package net.woggioni.wson.cli -import com.beust.jcommander.IStringConverter -import com.beust.jcommander.JCommander -import com.beust.jcommander.Parameter -import com.beust.jcommander.ParameterException -import com.beust.jcommander.converters.PathConverter -import kotlin.system.exitProcess -import net.woggioni.wson.serialization.binary.JBONDumper -import net.woggioni.wson.serialization.binary.JBONParser -import net.woggioni.wson.serialization.json.JSONDumper -import net.woggioni.wson.serialization.json.JSONParser -import net.woggioni.wson.xface.Value import java.io.BufferedInputStream import java.io.BufferedOutputStream import java.io.InputStreamReader import java.io.OutputStreamWriter import java.nio.file.Files import java.nio.file.Path +import kotlin.system.exitProcess +import com.beust.jcommander.IStringConverter +import com.beust.jcommander.JCommander +import com.beust.jcommander.Parameter +import com.beust.jcommander.ParameterException +import com.beust.jcommander.converters.PathConverter +import net.woggioni.wson.serialization.binary.JBONDumper +import net.woggioni.wson.serialization.binary.JBONParser +import net.woggioni.wson.serialization.json.JSONDumper +import net.woggioni.wson.serialization.json.JSONParser +import net.woggioni.wson.xface.Value sealed class SerializationFormat(val name: String) { diff --git a/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonProvider.java b/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonProvider.java index 8bf575c..af4dfcb 100644 --- a/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonProvider.java +++ b/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonProvider.java @@ -12,7 +12,6 @@ import jakarta.json.stream.JsonGenerator; import jakarta.json.stream.JsonGeneratorFactory; import jakarta.json.stream.JsonParser; import jakarta.json.stream.JsonParserFactory; -import net.woggioni.wson.value.ObjectValue; import java.io.InputStream; import java.io.OutputStream; diff --git a/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonValue.java b/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonValue.java index b1a0c40..9e422a6 100644 --- a/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonValue.java +++ b/wson-w3c-json/src/main/java/net/woggioni/wson/jakarta/WsonJsonValue.java @@ -1,24 +1,9 @@ package net.woggioni.wson.jakarta; -import jakarta.json.JsonArray; -import jakarta.json.JsonNumber; -import jakarta.json.JsonObject; -import jakarta.json.JsonString; import jakarta.json.JsonValue; import lombok.RequiredArgsConstructor; -import net.woggioni.jwo.CollectionUtils; -import net.woggioni.jwo.JWO; import net.woggioni.wson.xface.Value; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Set; - -import static net.woggioni.jwo.JWO.newThrowable; - @RequiredArgsConstructor public class WsonJsonValue implements JsonValue { private final Value value;