commit 63a56286bf2929b95410525594e1f0808a40d26e Author: John Ahlroos Date: Thu Oct 24 20:59:28 2024 +0200 Initial import diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b63da45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/codeStyles b/.idea/codeStyles new file mode 100644 index 0000000..860e427 --- /dev/null +++ b/.idea/codeStyles @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 0000000..6dafaf6 --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,403 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..b948380 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,16 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..f0c744c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ddcf079 --- /dev/null +++ b/build.gradle @@ -0,0 +1,29 @@ +plugins { + id 'java-library' +} + +group = 'com.devsoap' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + + api 'jakarta.json.bind:jakarta.json.bind-api:3.0.1' + api 'jakarta.json:jakarta.json-api:2.1.3' + + implementation 'org.assertj:assertj-core:3.26.3' + + testImplementation platform('org.junit:junit-bom:5.10.0') + testImplementation 'org.junit.jupiter:junit-jupiter' + testImplementation 'org.eclipse:yasson:3.0.4' +} + +test { + useJUnitPlatform() + testLogging { + events "passed", "skipped", "failed" + } +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..845c8a9 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Oct 22 16:23:49 CEST 2024 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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 + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# 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 +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..6cc6ba3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'assertj-json' + diff --git a/src/main/java/com/devsoap/json/JsonArrayAssert.java b/src/main/java/com/devsoap/json/JsonArrayAssert.java new file mode 100644 index 0000000..cc1571b --- /dev/null +++ b/src/main/java/com/devsoap/json/JsonArrayAssert.java @@ -0,0 +1,35 @@ +package com.devsoap.json; + +import jakarta.json.JsonArray; +import jakarta.json.JsonValue; +import org.assertj.core.api.AbstractListAssert; + +import java.util.List; + +public class JsonArrayAssert extends AbstractListAssert, + List, + VALUE_TYPE, JsonValueAssert> { + + private final String fieldName; + + protected JsonArrayAssert(String fieldName, JsonArray array) { + super(array.getValuesAs(jsonValue -> (VALUE_TYPE) jsonValue), JsonArrayAssert.class); + this.fieldName = fieldName; + } + + public JsonArrayAssert(String fieldName, VALUE_TYPE value) { + super(List.of(value), JsonArrayAssert.class); + this.fieldName = fieldName; + } + + @Override + protected JsonValueAssert toAssert(VALUE_TYPE value, String description) { + return new JsonValueAssert<>(fieldName, (JsonValue) value, value); + } + + @Override + protected JsonArrayAssert newAbstractIterableAssert(Iterable iterable) { + //TODO + return null; + } +} \ No newline at end of file diff --git a/src/main/java/com/devsoap/json/JsonAssert.java b/src/main/java/com/devsoap/json/JsonAssert.java new file mode 100644 index 0000000..5ef7a6f --- /dev/null +++ b/src/main/java/com/devsoap/json/JsonAssert.java @@ -0,0 +1,249 @@ +package com.devsoap.json; + +import jakarta.json.*; +import jakarta.json.stream.JsonParser; +import org.assertj.core.api.AbstractAssert; +import org.assertj.core.api.ListAssert; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +public class JsonAssert extends AbstractAssert { + + protected JsonAssert(String json) { + super(json, JsonAssert.class); + } + + public static JsonAssert assertThat(String json) { + return new JsonAssert(json); + } + public static JsonAssert assertThat(Object object) { + return assertThat(object.toString()); + } + + public JsonValueAssert firstField(String fieldName) { + try (var stream = new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))) { + var actualParser = Json.createParser(stream); + actualParser.next(); // START_OBJECT + return findFieldInObjectOnAnyDepth(fieldName, actualParser) + .orElseThrow(() -> failure("Field %s not found.", fieldName) ); + } catch (IOException e) { + throw failure("Failed to parse field"); + } + } + + public JsonValueAssert lastField(String fieldName) { + try (var stream = new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))) { + var scannerParser = Json.createParser(stream); + scannerParser.next(); // START_OBJECT + return findLastFieldInObject(fieldName, scannerParser) + .orElseThrow(() -> failure("Field %s not found.", fieldName) ); + } catch (IOException e) { + throw failure("Failed to parse field"); + } + } + + public JsonValueAssert nthField(String fieldName, int index) { + try (var stream = new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))) { + var parser = Json.createParser(stream); + parser.next(); // START_OBJECT + return findNthFieldInObject(fieldName, parser, index) + .orElseThrow(() -> failure("%d nth field %s not found.", index, fieldName) ); + } catch (IOException e) { + throw failure("Failed to parse field"); + } + } + + public JsonValueAssert field(String fieldName) { + try (var stream = new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))) { + var actualParser = Json.createParser(stream); + actualParser.next(); // START_OBJECT + return findFieldInObject(fieldName, actualParser) + .orElseThrow(() -> failure("Field %s not found.", fieldName) ); + } catch (IOException e) { + throw failure("Failed to parse field"); + } + } + + public JsonArrayAssert array(String fieldName) { + try (var stream = new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))) { + var actualParser = Json.createParser(stream); + actualParser.next(); // START_OBJECT + return findArrayInObject(fieldName, actualParser); + } catch (IOException e) { + throw failure("Failed to parse field"); + } + } + + public ListAssert array(String fieldName, Class itemClass) { + try (var stream = new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))) { + var actualParser = Json.createParser(stream); + actualParser.next(); // START_OBJECT + return findArrayInObject(fieldName, actualParser, itemClass); + } catch (IOException e) { + throw failure("Failed to parse field"); + } + } + + public JsonValueAssert path(String... fields) { + var actualParser = Json.createParser(new ByteArrayInputStream(actual.getBytes(StandardCharsets.UTF_8))); + actualParser.next(); // START_OBJECT + var fieldList = new ArrayList<>(List.of(fields)); + var currentField = field(fieldList.removeFirst()); + return currentField.path(fieldList.toArray(String[]::new)); + } + + private static Optional> findFieldInObject(String fieldName, JsonParser parser) { + if (parser.currentEvent() != JsonParser.Event.START_OBJECT) { + throw new IllegalArgumentException("Current event must be START_OBJECT"); + } + return typedJsonValue(fieldName, parser.getObject().get(fieldName)); + } + + private static JsonArrayAssert findArrayInObject(String fieldName, JsonParser parser) { + if (parser.currentEvent() != JsonParser.Event.START_OBJECT) { + throw new IllegalArgumentException("Current event must be START_OBJECT"); + } + return typedJsonArray(fieldName, parser.getObject().get(fieldName)); + } + + private static ListAssert findArrayInObject(String fieldName, JsonParser parser, Class itemClass) { + if (parser.currentEvent() != JsonParser.Event.START_OBJECT) { + throw new IllegalArgumentException("Current event must be START_OBJECT"); + } + return typedJsonArray(parser.getObject().get(fieldName)); + } + + private static Optional> findFieldInObjectOnAnyDepth(String fieldName, JsonParser parser) { + if (parser.currentEvent() != JsonParser.Event.START_OBJECT) { + throw new IllegalArgumentException("Current event must be START_OBJECT"); + } + while (parser.hasNext()) { + var keyEvent = parser.next(); + if (keyEvent == JsonParser.Event.KEY_NAME ) { + var key = parser.getString(); + parser.next(); // VALUE + if (key.equalsIgnoreCase(fieldName)) { + return typedJsonValue(key, parser.getValue()); + } + } + } + return Optional.empty(); + } + + private static Optional> findNthFieldInObject(String fieldName, JsonParser parser, int index) { + if (parser.currentEvent() != JsonParser.Event.START_OBJECT) { + throw new IllegalArgumentException("Current event must be START_OBJECT"); + } + var counter = 0; + while (parser.hasNext()) { + var keyEvent = parser.next(); + if (keyEvent == JsonParser.Event.KEY_NAME ) { + var key = parser.getString(); + parser.next(); // VALUE + if (key.equalsIgnoreCase(fieldName)) { + if (counter == index) { + return typedJsonValue(key, parser.getValue()); + } + counter++; + } + } + } + return Optional.empty(); + } + + private static Optional> findLastFieldInObject(String fieldName, JsonParser scannerParser) { + if (scannerParser.currentEvent() != JsonParser.Event.START_OBJECT) { + throw new IllegalArgumentException("Current event must be START_OBJECT"); + } + + JsonValue current = null; + while (scannerParser.hasNext()) { + var keyEvent = scannerParser.next(); + if (keyEvent == JsonParser.Event.KEY_NAME ) { + var key = scannerParser.getString(); + scannerParser.next(); // VALUE + if (key.equalsIgnoreCase(fieldName)) { + current = scannerParser.getValue(); + } + } + } + + if (current == null) { + return Optional.empty(); + } + + if (current.getValueType() == JsonValue.ValueType.OBJECT) { + try (var stream = new ByteArrayInputStream(current.toString().getBytes(StandardCharsets.UTF_8))) { + var parser = Json.createParser(stream); + parser.next(); // START_OBJECT + var found = findLastFieldInObject(fieldName, parser); + if (found.isPresent()) { + return found; + } + } catch (IOException e) { + throw new IllegalStateException("Failed to parse json value"); + } + } + + return Optional.of(current).flatMap(v -> typedJsonValue(fieldName, v)); + } + + + static Optional> typedJsonValue(String fieldName, JsonValue jsonValue) { + return Optional.ofNullable(jsonValue).map(v -> switch (jsonValue.getValueType()) { + case ARRAY -> null; + case OBJECT -> new JsonValueAssert<>(fieldName, jsonValue, jsonValue.asJsonObject()); + case STRING -> new JsonValueAssert<>(fieldName, jsonValue, ((JsonString) jsonValue).getString()); + case TRUE -> new JsonValueAssert<>(fieldName, jsonValue, true); + case FALSE -> new JsonValueAssert<>(fieldName, jsonValue, false); + case NULL -> new JsonValueAssert<>(fieldName, jsonValue, null); + case NUMBER -> { + Number number = ((JsonNumber) jsonValue).numberValue(); + if (number instanceof Integer) { + yield new JsonValueAssert<>(fieldName, jsonValue, (Integer) number); + } + if (number instanceof Short) { + yield new JsonValueAssert<>(fieldName, jsonValue, (Short) number); + } + if (number instanceof Long) { + yield new JsonValueAssert<>(fieldName, jsonValue, (Long) number); + } + if (number instanceof Double) { + yield new JsonValueAssert<>(fieldName, jsonValue, (Double) number); + } + if (number instanceof Float) { + yield new JsonValueAssert<>(fieldName, jsonValue, (Float) number); + } + if (number instanceof BigDecimal) { + yield new JsonValueAssert<>(fieldName, jsonValue, (BigDecimal) number); + } + if (number instanceof BigInteger) { + yield new JsonValueAssert<>(fieldName, jsonValue, (BigInteger) number); + } + yield new JsonValueAssert<>(fieldName, jsonValue, ((JsonNumber) jsonValue).bigDecimalValue()); + } + }); + } + + static JsonArrayAssert typedJsonArray(String fieldName, JsonValue jsonArray) { + return new JsonArrayAssert<>(fieldName, (JsonArray) jsonArray); + } + static ListAssert typedJsonArray(JsonValue jsonArray) { + return new ListAssert<>(((JsonArray)jsonArray).getValuesAs(value -> (ITEM) switch (value.getValueType()) { + case ARRAY -> null; + case OBJECT -> null; + case STRING -> ((JsonString) value).toString(); + case NUMBER -> ((JsonNumber) value).intValue(); + case TRUE -> Boolean.TRUE; + case FALSE -> Boolean.FALSE; + case NULL -> null; + })); + } +} \ No newline at end of file diff --git a/src/main/java/com/devsoap/json/JsonValueAssert.java b/src/main/java/com/devsoap/json/JsonValueAssert.java new file mode 100644 index 0000000..3b8cb82 --- /dev/null +++ b/src/main/java/com/devsoap/json/JsonValueAssert.java @@ -0,0 +1,145 @@ +package com.devsoap.json; + +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; +import org.assertj.core.api.*; + +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.regex.Pattern; + +import static com.devsoap.json.JsonAssert.typedJsonArray; + +public class JsonValueAssert extends AbstractAssert, VALUE_TYPE> { + + private final String fieldName; + private final JsonValue value; + + protected JsonValueAssert(String fieldName, JsonValue value, VALUE_TYPE fieldValue) { + super(fieldValue, JsonValueAssert.class); + this.fieldName = fieldName; + this.value = value; + } + + public JsonValueAssert field(String fieldName) { + if (value.getValueType() != JsonValue.ValueType.OBJECT) { + failWithActualExpectedAndMessage(value.getValueType(), JsonValue.ValueType.OBJECT, + "Only objects can have fields"); + } + return JsonAssert.typedJsonValue(fieldName, value.asJsonObject().get(fieldName)) + .orElseGet(() -> this.withFailMessage("Field %s not found", fieldName)); + } + + public JsonValueAssert field(String fieldName, Class type) { + if (value.getValueType() != JsonValue.ValueType.OBJECT) { + failWithActualExpectedAndMessage(value.getValueType(), JsonValue.ValueType.OBJECT, + "Only objects can have fields"); + } + return (JsonValueAssert) JsonAssert.typedJsonValue(fieldName, value.asJsonObject().get(fieldName)) + .orElseGet(() -> this.withFailMessage("Field %s not found", fieldName)); + } + + public JsonArrayAssert array(String fieldName) { + if (value.getValueType() != JsonValue.ValueType.OBJECT) { + failWithActualExpectedAndMessage(value.getValueType(), JsonValue.ValueType.OBJECT, + "Only objects can have fields"); + } + + JsonValue jsonValue = value.asJsonObject().get(fieldName); + if (jsonValue.getValueType() != JsonValue.ValueType.ARRAY) { + failWithActualExpectedAndMessage(value.getValueType(), JsonValue.ValueType.OBJECT, + "Field must be an array"); + } + + return typedJsonArray(fieldName, jsonValue); + } + + public ListAssert array(String fieldName, Class itemClass) { + if (value.getValueType() != JsonValue.ValueType.OBJECT) { + failWithActualExpectedAndMessage(value.getValueType(), JsonValue.ValueType.OBJECT, + "Only objects can have fields"); + } + + JsonValue jsonValue = value.asJsonObject().get(fieldName); + if (jsonValue.getValueType() != JsonValue.ValueType.ARRAY) { + failWithActualExpectedAndMessage(value.getValueType(), JsonValue.ValueType.OBJECT, + "Field must be an array"); + } + + JsonArray array = (JsonArray) jsonValue; + return new ListAssert<>(array.getValuesAs(value -> (ITEM) switch (value.getValueType()) { + case ARRAY -> throw failure("Cannot convert ARRAY to %s", itemClass); + case OBJECT -> throw failure("Cannot convert OBJECT to %s", itemClass); + case STRING -> ((JsonString) value).toString(); + case NUMBER -> ((JsonNumber) value).intValue(); + case TRUE -> Boolean.TRUE; + case FALSE -> Boolean.FALSE; + case NULL -> null; + })); + } + + public JsonValueAssert path(String... fields) { + JsonValueAssert currentField = this; + for (String field : fields) { + currentField = currentField.field(field); + } + return currentField; + } + + public IntegerAssert asInteger() { + if (actual instanceof Integer) { + return new IntegerAssert((Integer) actual); + } + return new IntegerAssert(Integer.parseInt(actual.toString())); + } + + public BigDecimalAssert asBigDecimal() { + if (actual instanceof BigDecimal) { + return new BigDecimalAssert((BigDecimal) actual); + } + return new BigDecimalAssert(BigDecimal.valueOf(Double.parseDouble(actual.toString()))); + } + + public BigIntegerAssert asBigInteger() { + if (actual instanceof BigInteger) { + return new BigIntegerAssert((BigInteger) actual); + } + return new BigIntegerAssert(BigInteger.valueOf(Integer.parseInt(actual.toString()))); + } + + public DoubleAssert asDouble() { + if (actual instanceof Double) { + return new DoubleAssert((Double) actual); + } + return new DoubleAssert(Double.parseDouble(actual.toString())); + } + + public AbstractLongAssert asLong() { + if (actual instanceof Long) { + return new LongAssert((Long) actual); + } + return new LongAssert(Long.parseLong(actual.toString())); + } + + public JsonArrayAssert asArray() { + if (value.getValueType() == JsonValue.ValueType.ARRAY) { + return new JsonArrayAssert<>(fieldName, (JsonArray) value); + } + return new JsonArrayAssert<>(fieldName, value); + } + + public JsonValueAssert matches(String regex) { + return matches(valueType -> Pattern.matches(regex, valueType.toString())); + } + + public JsonValueAssert notMatches(String regex) { + return matches(valueType -> !Pattern.matches(regex, valueType.toString())); + } + + @Override + public JsonValueAssert isEqualTo(Object expected) { + return super.isEqualTo(expected); + } +} \ No newline at end of file diff --git a/src/test/java/com/devsoap/json/ArrayTraversalAssertionTest.java b/src/test/java/com/devsoap/json/ArrayTraversalAssertionTest.java new file mode 100644 index 0000000..02eaa15 --- /dev/null +++ b/src/test/java/com/devsoap/json/ArrayTraversalAssertionTest.java @@ -0,0 +1,117 @@ +package com.devsoap.json; + +import org.junit.jupiter.api.Test; + +import static com.devsoap.json.JsonAssert.assertThat; + +public class ArrayTraversalAssertionTest { + + private static final String JSON = """ + { + "array": [ + { "item": 1 }, + { "item": 2 } + ], + + "numericArray": [ + 1,2,3 + ], + + "fieldArray": { + "array": [ + { "item": 3 }, + { "item": 4 } + ], + "numericArray": [ + 1,2,3 + ] + }, + + "matrix": [ + [1,2], + [3,4] + ] + } + """; + + @Test + public void rootArray() { + assertThat(JSON) + .array("array") + .first() + .field("item") + .isEqualTo(1); + + assertThat(JSON) + .array("array") + .last() + .field("item") + .isEqualTo(2); + } + + @Test + public void fieldArray() { + assertThat(JSON) + .field("fieldArray") + .array("array") + .first() + .field("item") + .isEqualTo(3); + + assertThat(JSON) + .field("fieldArray") + .array("array") + .last() + .field("item") + .isEqualTo(4); + } + + @Test + public void numericArray() { + assertThat(JSON) + .array("numericArray", Integer.class) + .first() + .isEqualTo(1); + + assertThat(JSON) + .field("fieldArray") + .array("numericArray", Integer.class) + .first() + .isEqualTo(1); + } + + @Test + public void matrix() { + assertThat(JSON) + .array("matrix") + .first() + .asArray() + .first() + .asInteger() + .isEqualTo(1); + + assertThat(JSON) + .array("matrix") + .first() + .asArray() + .last() + .asInteger() + .isEqualTo(2); + + assertThat(JSON) + .array("matrix") + .last() + .asArray() + .first() + .asInteger() + .isEqualTo(3); + + assertThat(JSON) + .array("matrix") + .last() + .asArray() + .last() + .asInteger() + .isEqualTo(4); + } +} \ No newline at end of file diff --git a/src/test/java/com/devsoap/json/DoubleAssertionTest.java b/src/test/java/com/devsoap/json/DoubleAssertionTest.java new file mode 100644 index 0000000..00e0d07 --- /dev/null +++ b/src/test/java/com/devsoap/json/DoubleAssertionTest.java @@ -0,0 +1,64 @@ +package com.devsoap.json; + +import org.junit.jupiter.api.Test; + +import static com.devsoap.json.JsonAssert.assertThat; + +public class DoubleAssertionTest { + + private static final String JSON = """ + { + "positive": 1.2134, + "negative": -1.321, + "zero": 0.0000 + } + """; + + @Test + public void equals() { + assertThat(JSON) + .field("positive") + .asDouble() + .isEqualTo(1.2134D); + assertThat(JSON) + .field("negative") + .asDouble() + .isEqualTo(-1.321D); + assertThat(JSON) + .field("zero") + .asDouble() + .isEqualTo(0D); + } + + @Test + public void greaterThan() { + assertThat(JSON) + .field("positive") + .asDouble() + .isGreaterThan(0); + assertThat(JSON) + .field("negative") + .asDouble() + .isGreaterThan(-2); + assertThat(JSON) + .field("zero") + .asDouble() + .isGreaterThan(-1); + } + + @Test + public void lessThan() { + assertThat(JSON) + .field("positive") + .asDouble() + .isLessThan(2); + assertThat(JSON) + .field("negative") + .asDouble() + .isLessThan(0); + assertThat(JSON) + .field("zero") + .asDouble() + .isLessThan(1); + } +} \ No newline at end of file diff --git a/src/test/java/com/devsoap/json/FieldTraversalAssertionTest.java b/src/test/java/com/devsoap/json/FieldTraversalAssertionTest.java new file mode 100644 index 0000000..892cafa --- /dev/null +++ b/src/test/java/com/devsoap/json/FieldTraversalAssertionTest.java @@ -0,0 +1,85 @@ +package com.devsoap.json; + +import org.junit.jupiter.api.Test; + +import static com.devsoap.json.JsonAssert.assertThat; + +public class FieldTraversalAssertionTest { + + private static final String JSON = """ + { + "level": 0, + "root": { + "level": 1, + "child": { + "level": 2, + "child": { + "level": 3, + "last": 42 + } + } + } + } + """; + + @Test + public void root() { + assertThat(JSON).field("level").isEqualTo(0); + assertThat(JSON).field("root").isNotNull(); + } + + @Test + public void fieldTraversal() { + assertThat(JSON) + .field("root") + .field("child") + .field("level") + .isEqualTo(2); + } + + @Test + public void pathTraversal() { + assertThat(JSON) + .path("root", "child", "level") + .isEqualTo(2); + } + + @Test + public void firstFieldMatching() { + assertThat(JSON) + .firstField("child") + .field("level") + .isEqualTo(2); + + assertThat(JSON) + .firstField("last") + .isEqualTo(42); + } + + @Test + public void lastFieldMatching() { + assertThat(JSON) + .lastField("child") + .field("level") + .isEqualTo(3); + + assertThat(JSON) + .lastField("level") + .isEqualTo(3); + } + + @Test + public void nthFieldMatching() { + assertThat(JSON) + .nthField("child", 1) + .field("level") + .isEqualTo(3); + + for (var level=0; level<=3; level++) { + assertThat(JSON) + .nthField("level", level) + .isEqualTo(level); + } + } + +} \ No newline at end of file diff --git a/src/test/java/com/devsoap/json/IntegerAssertionTest.java b/src/test/java/com/devsoap/json/IntegerAssertionTest.java new file mode 100644 index 0000000..0c7966c --- /dev/null +++ b/src/test/java/com/devsoap/json/IntegerAssertionTest.java @@ -0,0 +1,61 @@ +package com.devsoap.json; + +import org.junit.jupiter.api.Test; + +import static com.devsoap.json.JsonAssert.assertThat; + +public class IntegerAssertionTest { + + private static final String JSON = """ + { + "positive": 1, + "negative": -1, + "zero": 0 + } + """; + + @Test + public void equals() { + assertThat(JSON) + .field("positive") + .isEqualTo(1); + assertThat(JSON) + .field("negative") + .isEqualTo(-1); + assertThat(JSON) + .field("zero") + .isEqualTo(0); + } + + @Test + public void greaterThan() { + assertThat(JSON) + .field("positive") + .asInteger() + .isGreaterThan(0); + assertThat(JSON) + .field("negative") + .asInteger() + .isGreaterThan(-2); + assertThat(JSON) + .field("zero") + .asInteger() + .isGreaterThan(-1); + } + + @Test + public void lessThan() { + assertThat(JSON) + .field("positive") + .asInteger() + .isLessThan(2); + assertThat(JSON) + .field("negative") + .asInteger() + .isLessThan(0); + assertThat(JSON) + .field("zero") + .asInteger() + .isLessThan(1); + } +} \ No newline at end of file diff --git a/src/test/java/com/devsoap/json/LongAssertionTest.java b/src/test/java/com/devsoap/json/LongAssertionTest.java new file mode 100644 index 0000000..cfc803d --- /dev/null +++ b/src/test/java/com/devsoap/json/LongAssertionTest.java @@ -0,0 +1,64 @@ +package com.devsoap.json; + +import org.junit.jupiter.api.Test; + +import static com.devsoap.json.JsonAssert.assertThat; + +public class LongAssertionTest { + + private static final String JSON = """ + { + "positive": 100000000012, + "negative": -100000000032, + "zero": 0 + } + """; + + @Test + public void equals() { + assertThat(JSON) + .field("positive") + .asLong() + .isEqualTo(100000000012L); + assertThat(JSON) + .field("negative") + .asLong() + .isEqualTo(-100000000032L); + assertThat(JSON) + .field("zero") + .asLong() + .isEqualTo(0L); + } + + @Test + public void greaterThan() { + assertThat(JSON) + .field("positive") + .asLong() + .isGreaterThan(10000); + assertThat(JSON) + .field("negative") + .asLong() + .isGreaterThan(-100000000052L); + assertThat(JSON) + .field("zero") + .asLong() + .isGreaterThan(-1); + } + + @Test + public void lessThan() { + assertThat(JSON) + .field("positive") + .asLong() + .isLessThan(2100000000012L); + assertThat(JSON) + .field("negative") + .asLong() + .isLessThan(0); + assertThat(JSON) + .field("zero") + .asLong() + .isLessThan(1); + } +} \ No newline at end of file diff --git a/src/test/java/com/devsoap/json/StringAssertionTest.java b/src/test/java/com/devsoap/json/StringAssertionTest.java new file mode 100644 index 0000000..05d1e78 --- /dev/null +++ b/src/test/java/com/devsoap/json/StringAssertionTest.java @@ -0,0 +1,57 @@ +package com.devsoap.json; + +import org.junit.jupiter.api.Test; + +import java.math.BigDecimal; +import java.math.BigInteger; + +import static com.devsoap.json.JsonAssert.assertThat; + +public class StringAssertionTest { + + private static final String JSON = """ + { + "foo": "bar", + "number": "1234" + } + """; + + @Test + public void equals() { + assertThat(JSON) + .field("foo") + .isEqualTo("bar") + .isNotEqualTo("baz"); + } + + @Test + public void matches() { + assertThat(JSON) + .field("foo") + .matches("b+a+r+") + .notMatches("baz"); + } + + @Test + public void stringToNumber() { + assertThat(JSON) + .field("number") + .asInteger() + .isEqualTo(1234); + assertThat(JSON) + .field("number") + .asDouble() + .isEqualTo(1234.0); + assertThat(JSON) + .field("number") + .asLong() + .isEqualTo(1234L); + assertThat(JSON) + .field("number") + .asBigDecimal() + .isEqualTo(BigDecimal.valueOf(1234.0)); + assertThat(JSON) + .field("number") + .asBigInteger() + .isEqualTo(BigInteger.valueOf(1234)); } +} \ No newline at end of file