From 4bdaaf3853a56d51d99259ee25f9893be157867e Mon Sep 17 00:00:00 2001 From: Miki Rozloznik Date: Fri, 5 Jan 2024 08:43:30 +0100 Subject: [PATCH] Add clang-format to the Java runtime project --- compiler/extensions/java/runtime/build.xml | 36 +- .../src/zserio/runtime/BitFieldUtil.java | 8 +- .../src/zserio/runtime/BitPositionUtil.java | 5 +- .../zserio/runtime/BitSizeOfCalculator.java | 7 +- .../src/zserio/runtime/BuiltInOperators.java | 6 +- .../src/zserio/runtime/ConstraintError.java | 2 +- .../src/zserio/runtime/DebugStringUtil.java | 16 +- .../runtime/src/zserio/runtime/FloatUtil.java | 56 +- .../src/zserio/runtime/VarSizeUtil.java | 2 +- .../src/zserio/runtime/ZserioError.java | 2 +- .../src/zserio/runtime/array/Array.java | 9 +- .../zserio/runtime/array/ArrayElement.java | 3 +- .../src/zserio/runtime/array/ArrayTraits.java | 10 +- .../zserio/runtime/array/DeltaContext.java | 2 +- .../runtime/array/PackedArrayTraits.java | 10 +- .../src/zserio/runtime/array/RawArray.java | 88 +- .../runtime/creator/ZserioTreeCreator.java | 34 +- .../src/zserio/runtime/io/BitBuffer.java | 9 +- .../zserio/runtime/io/BitStreamReader.java | 4 +- .../runtime/io/ByteArrayBitStreamBase.java | 4 +- .../runtime/io/ByteArrayBitStreamReader.java | 8 +- .../runtime/io/ByteArrayBitStreamWriter.java | 29 +- .../runtime/io/InitializeOffsetsWriter.java | 3 +- .../src/zserio/runtime/io/SerializeUtil.java | 6 +- .../src/zserio/runtime/io/package-info.java | 1 - .../src/zserio/runtime/json/JsonDecoder.java | 4 +- .../src/zserio/runtime/json/JsonParser.java | 3 +- .../zserio/runtime/json/JsonParserError.java | 2 +- .../src/zserio/runtime/json/JsonReader.java | 33 +- .../zserio/runtime/json/JsonTokenizer.java | 6 +- .../src/zserio/runtime/json/JsonWriter.java | 14 +- .../src/zserio/runtime/package-info.java | 1 - .../zserio/runtime/pubsub/PubsubCallback.java | 2 +- .../runtime/pubsub/PubsubInterface.java | 4 +- .../zserio/runtime/pubsub/package-info.java | 1 - .../runtime/service/ObjectServiceData.java | 4 +- .../service/ServiceClientInterface.java | 2 +- .../runtime/service/ServiceInterface.java | 2 +- .../zserio/runtime/typeinfo/FieldInfo.java | 4 +- .../zserio/runtime/typeinfo/MessageInfo.java | 4 +- .../src/zserio/runtime/typeinfo/TypeInfo.java | 175 ++-- .../validation/ValidationBitStreamReader.java | 31 +- .../runtime/validation/ValidationError.java | 22 +- .../runtime/validation/ValidationReport.java | 10 +- .../validation/ValidationSqliteUtil.java | 22 +- .../runtime/validation/ValidationTimer.java | 4 +- .../runtime/validation/package-info.java | 1 - .../runtime/walker/DefaultWalkObserver.java | 21 +- .../runtime/walker/RegexWalkFilter.java | 2 +- .../src/zserio/runtime/walker/WalkFilter.java | 2 +- .../zserio/runtime/walker/WalkObserver.java | 2 +- .../src/zserio/runtime/walker/Walker.java | 6 +- .../zserio/runtime/BitPositionUtilTest.java | 1 + .../runtime/BitSizeOfCalculatorTest.java | 53 +- .../zserio/runtime/BuiltInOperatorsTest.java | 9 +- .../zserio/runtime/DebugStringUtilTest.java | 41 +- .../test/zserio/runtime/FloatUtilTest.java | 152 +-- .../test/zserio/runtime/HashCodeUtilTest.java | 92 +- .../test/zserio/runtime/VarSizeUtilTest.java | 1 + .../test/zserio/runtime/array/ArrayTest.java | 284 +++--- .../creator/ZserioTreeCreatorTest.java | 2 +- .../test/zserio/runtime/io/BitBufferTest.java | 37 +- .../io/ByteArrayBitStreamReaderTest.java | 80 +- .../io/ByteArrayBitStreamStringTest.java | 8 +- .../runtime/io/ByteArrayBitStreamTest.java | 880 +++++++++--------- .../io/ByteArrayBitStreamVarIntTest.java | 3 +- .../io/ByteArrayBitStreamVarNumTest.java | 230 +++-- .../io/ByteArrayBitStreamVarUIntTest.java | 3 +- .../io/ByteArrayBitStreamWriterTest.java | 201 ++-- .../zserio/runtime/io/SerializeUtilTest.java | 46 +- .../zserio/runtime/json/JsonEncoderTest.java | 6 +- .../zserio/runtime/json/JsonParserTest.java | 9 +- .../zserio/runtime/json/JsonReaderTest.java | 631 ++++++------- .../zserio/runtime/json/JsonWriterTest.java | 134 ++- .../zserio/runtime/typeinfo/TypeInfoTest.java | 112 ++- .../runtime/typeinfo/TypeInfoUtilTest.java | 1 + .../ValidationBitStreamReaderTest.java | 5 +- .../validation/ValidationSqliteUtilTest.java | 69 +- .../validation/ValidationTimerTest.java | 7 +- .../runtime/walker/AndWalkFilterTest.java | 64 +- .../walker/ArrayLengthWalkFilterTest.java | 16 +- .../runtime/walker/DefaultWalkFilterTest.java | 18 +- .../walker/DefaultWalkObserverTest.java | 18 +- .../runtime/walker/RegexWalkFilterTest.java | 66 +- .../runtime/walker/TestObjectCreator.java | 6 +- .../runtime/walker/TestWalkObserver.java | 1 - .../zserio/runtime/walker/WalkerTest.java | 8 +- 87 files changed, 1982 insertions(+), 2056 deletions(-) diff --git a/compiler/extensions/java/runtime/build.xml b/compiler/extensions/java/runtime/build.xml index 9126dc0db..95ddc998d 100644 --- a/compiler/extensions/java/runtime/build.xml +++ b/compiler/extensions/java/runtime/build.xml @@ -17,6 +17,7 @@ relational.sqlite.jar_file - SQLite JDBC jar file. Default is "../../../../3rdparty/java/sqlitejdbc-3.39.4.jar". relational.validation - Flag whether the support for low level validation is included. Default is "yes". +clang_format.exe_file - Clang-format executable file. If not set, clang-format is not run. spotbugs.home_dir - Location of the spotbugs tool. If not set, spotbugs is not run. --> @@ -208,7 +209,22 @@ spotbugs.home_dir - Location of the spotbugs tool. If not set, spo overwrite="true"/> - + + +Command hints to reformat source using clang-format tool: + git clang-format + clang-format --style=file -i [SOURCE] + + + + + + + + + + + @@ -263,7 +279,23 @@ spotbugs.home_dir - Location of the spotbugs tool. If not set, spo - + + +Command hints to reformat source using clang-format tool: + git clang-format + clang-format --style=file -i [SOURCE] + + + + + + + + + + + diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/BitFieldUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/BitFieldUtil.java index 86d440438..0645301f7 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/BitFieldUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/BitFieldUtil.java @@ -16,8 +16,8 @@ public final class BitFieldUtil public static long getBitFieldLowerBound(int length, boolean isSigned) { if (length <= 0 || length > getMaxBitFieldSize(isSigned)) - throw new ZserioError("getBitFieldLowerBound: Asking for lower bound of bitfield with wrong " + - "length " + length + "."); + throw new ZserioError("getBitFieldLowerBound: Asking for lower bound of bitfield with wrong " + + "length " + length + "."); if (isSigned) return -(1L << (length - 1)); @@ -36,8 +36,8 @@ public static long getBitFieldLowerBound(int length, boolean isSigned) public static long getBitFieldUpperBound(int length, boolean isSigned) { if (length <= 0 || length > getMaxBitFieldSize(isSigned)) - throw new ZserioError("getBitFieldUpperBound: Asking for upper bound of bitfield with wrong " + - "length " + length + "."); + throw new ZserioError("getBitFieldUpperBound: Asking for upper bound of bitfield with wrong " + + "length " + length + "."); if (isSigned) return (1L << (length - 1)) - 1; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/BitPositionUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/BitPositionUtil.java index c5db93d16..e63ecf7ad 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/BitPositionUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/BitPositionUtil.java @@ -15,8 +15,9 @@ public final class BitPositionUtil */ public static long alignTo(int alignmentValue, long bitPosition) { - return (bitPosition > 0 && alignmentValue != 0) ? - (((bitPosition - 1) / alignmentValue) + 1) * alignmentValue : bitPosition; + return (bitPosition > 0 && alignmentValue != 0) + ? (((bitPosition - 1) / alignmentValue) + 1) * alignmentValue + : bitPosition; } /** diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/BitSizeOfCalculator.java b/compiler/extensions/java/runtime/src/zserio/runtime/BitSizeOfCalculator.java index 62695f855..046aae57e 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/BitSizeOfCalculator.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/BitSizeOfCalculator.java @@ -19,11 +19,11 @@ public final class BitSizeOfCalculator */ public static int getBitSizeOfVarInt16(short value) { - final short absoluteValue = (short) Math.abs(value); + final short absoluteValue = (short)Math.abs(value); if (absoluteValue >= (short)(1 << (6 + 8))) throw new ZserioError("BitSizeOfCalculator: Value '" + value + "' is out of range for varint16!"); - return (absoluteValue < (short) 1 << 6) ? 8 : 16; + return (absoluteValue < (short)1 << 6) ? 8 : 16; } /** @@ -405,8 +405,7 @@ private static int sizeOfString(final String str) size = str.getBytes("UTF-8").length; } catch (IOException e) - { - } + {} return size; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/BuiltInOperators.java b/compiler/extensions/java/runtime/src/zserio/runtime/BuiltInOperators.java index f60a03442..ed4ca0135 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/BuiltInOperators.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/BuiltInOperators.java @@ -24,10 +24,12 @@ public static boolean isSet(ZserioBitmask bitmaskValue, ZserioBitmask requiredMa { final Number bitmaskValueGeneric = bitmaskValue.getGenericValue(); final BigInteger bigBitmaskValue = bitmaskValueGeneric instanceof BigInteger - ? (BigInteger)bitmaskValueGeneric : BigInteger.valueOf(bitmaskValueGeneric.longValue()); + ? (BigInteger)bitmaskValueGeneric + : BigInteger.valueOf(bitmaskValueGeneric.longValue()); final Number requiredMaskGeneric = requiredMask.getGenericValue(); final BigInteger bigRequiredMask = requiredMaskGeneric instanceof BigInteger - ? (BigInteger)requiredMaskGeneric : BigInteger.valueOf(requiredMaskGeneric.longValue()); + ? (BigInteger)requiredMaskGeneric + : BigInteger.valueOf(requiredMaskGeneric.longValue()); return bigBitmaskValue.and(bigRequiredMask).equals(bigRequiredMask); } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/ConstraintError.java b/compiler/extensions/java/runtime/src/zserio/runtime/ConstraintError.java index 03d8883c5..7213e74ef 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/ConstraintError.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/ConstraintError.java @@ -42,5 +42,5 @@ public ConstraintError(final Throwable throwable) super(throwable); } - private static final long serialVersionUID = 921445202560692444L; + private static final long serialVersionUID = 921445202560692444L; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/DebugStringUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/DebugStringUtil.java index aaf6d21d7..8a2bdf000 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/DebugStringUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/DebugStringUtil.java @@ -1,11 +1,11 @@ package zserio.runtime; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Reader; @@ -258,10 +258,8 @@ public static String toJsonString(Object zserioObject) public static void toJsonFile(Object zserioObject, String fileName, int indent, WalkFilter walkFilter) throws IOException { - try ( - final OutputStream outputStream = new FileOutputStream(fileName); - final OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8); - ) + try (final OutputStream outputStream = new FileOutputStream(fileName); + final OutputStreamWriter writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8)) { toJsonStream(zserioObject, writer, indent, walkFilter); } @@ -523,8 +521,8 @@ private static TypeInfo getTypeInfo(Class zserioClass) catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - throw new ZserioError("DebugStringUtil: Zserio object must have type info enabled " + - "(see zserio option -withTypeInfoCode)!"); + throw new ZserioError("DebugStringUtil: Zserio object must have type info enabled " + + "(see zserio option -withTypeInfoCode)!"); } } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/FloatUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/FloatUtil.java index 006c89dbe..bc295e671 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/FloatUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/FloatUtil.java @@ -21,14 +21,14 @@ public final class FloatUtil public static float convertShortToFloat(short float16Value) { // decompose half precision float (float16) - final short sign16Shifted = (short) (float16Value & FLOAT16_SIGN_MASK); - final short exponent16 = (short) ((float16Value & FLOAT16_EXPONENT_MASK) >> - FLOAT16_EXPONENT_BIT_POSITION); - final short significand16 = (short) (float16Value & FLOAT16_SIGNIFICAND_MASK); + final short sign16Shifted = (short)(float16Value & FLOAT16_SIGN_MASK); + final short exponent16 = + (short)((float16Value & FLOAT16_EXPONENT_MASK) >> FLOAT16_EXPONENT_BIT_POSITION); + final short significand16 = (short)(float16Value & FLOAT16_SIGNIFICAND_MASK); // calculate significand for single precision float (float32) - int significand32 = ((int) significand16) << - (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS); + int significand32 = ((int)significand16) + << (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS); // calculate exponent for single precision float (float32) int exponent32; @@ -65,8 +65,8 @@ else if (exponent16 == FLOAT16_EXPONENT_INFINITY_NAN) } // compose single precision float (float32) - final int sign32Shifted = (int) (sign16Shifted) << (FLOAT32_SIGN_BIT_POSITION - - FLOAT16_SIGN_BIT_POSITION); + final int sign32Shifted = (int)(sign16Shifted) + << (FLOAT32_SIGN_BIT_POSITION - FLOAT16_SIGN_BIT_POSITION); final int exponent32Shifted = exponent32 << FLOAT32_EXPONENT_BIT_POSITION; final int float32Value = sign32Shifted | exponent32Shifted | significand32; @@ -91,8 +91,8 @@ public static short convertFloatToShort(float float32) final int significand32 = (float32Value & FLOAT32_SIGNIFICAND_MASK); // calculate significand for half precision float (float16) - short significand16 = (short) ((significand32 >> - (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS))); + short significand16 = + (short)((significand32 >> (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS))); // calculate exponent for half precision float (float16) boolean needsRounding = false; @@ -114,7 +114,7 @@ else if (exponent32 == FLOAT32_EXPONENT_INFINITY_NAN) else { // normal number - final short signedExponent16 = (short) (exponent32 - FLOAT32_EXPONENT_BIAS + FLOAT16_EXPONENT_BIAS); + final short signedExponent16 = (short)(exponent32 - FLOAT32_EXPONENT_BIAS + FLOAT16_EXPONENT_BIAS); if (signedExponent16 > FLOAT16_EXPONENT_INFINITY_NAN) { // exponent overflow, set infinity or NaN @@ -123,7 +123,7 @@ else if (exponent32 == FLOAT32_EXPONENT_INFINITY_NAN) else if (signedExponent16 <= 0) { // exponent underflow - if (signedExponent16 <= (short) (-FLOAT16_SIGNIFICAND_NUM_BITS)) + if (signedExponent16 <= (short)(-FLOAT16_SIGNIFICAND_NUM_BITS)) { // too big underflow, set to zero exponent16 = 0; @@ -135,31 +135,35 @@ else if (signedExponent16 <= 0) exponent16 = 0; final int fullSignificand32 = significand32 | (FLOAT32_SIGNIFICAND_MASK + 1); final int significandShift = 1 - signedExponent16; - significand16 = (short) (fullSignificand32 >> + significand16 = (short)(fullSignificand32 >> (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS + significandShift)); - needsRounding = ((fullSignificand32 >> (FLOAT32_SIGNIFICAND_NUM_BITS - - FLOAT16_SIGNIFICAND_NUM_BITS + significandShift - 1)) & 0x01) != 0; + needsRounding = + ((fullSignificand32 >> + (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS + + significandShift - 1)) & + 0x01) != 0; } } else { // exponent ok exponent16 = signedExponent16; - needsRounding = ((significand32 >> (FLOAT32_SIGNIFICAND_NUM_BITS - - FLOAT16_SIGNIFICAND_NUM_BITS - 1)) & 0x01) != 0; + needsRounding = + ((significand32 >> (FLOAT32_SIGNIFICAND_NUM_BITS - FLOAT16_SIGNIFICAND_NUM_BITS - 1)) & + 0x01) != 0; } } // compose half precision float (float16) - final short sign16Shifted = (short) (sign32Shifted >>> (FLOAT32_SIGN_BIT_POSITION - - FLOAT16_SIGN_BIT_POSITION)); - final short exponent16Shifted = (short) (exponent16 << FLOAT16_EXPONENT_BIT_POSITION); - short float16Value = (short) (sign16Shifted | exponent16Shifted | significand16); + final short sign16Shifted = + (short)(sign32Shifted >>> (FLOAT32_SIGN_BIT_POSITION - FLOAT16_SIGN_BIT_POSITION)); + final short exponent16Shifted = (short)(exponent16 << FLOAT16_EXPONENT_BIT_POSITION); + short float16Value = (short)(sign16Shifted | exponent16Shifted | significand16); // check rounding if (needsRounding) - float16Value += (short) 1; // might overflow to infinity + float16Value += (short)1; // might overflow to infinity return float16Value; } @@ -212,16 +216,16 @@ public static long convertDoubleToLong(double float64) return Double.doubleToLongBits(float64); } - private static final short FLOAT16_SIGN_MASK = (short) 0x8000; - private static final short FLOAT16_EXPONENT_MASK = (short) 0x7C00; - private static final short FLOAT16_SIGNIFICAND_MASK = (short) 0x03FF; + private static final short FLOAT16_SIGN_MASK = (short)0x8000; + private static final short FLOAT16_EXPONENT_MASK = (short)0x7C00; + private static final short FLOAT16_SIGNIFICAND_MASK = (short)0x03FF; private static final short FLOAT16_SIGN_BIT_POSITION = 15; private static final short FLOAT16_EXPONENT_BIT_POSITION = 10; private static final short FLOAT16_SIGNIFICAND_NUM_BITS = FLOAT16_EXPONENT_BIT_POSITION; - private static final short FLOAT16_EXPONENT_INFINITY_NAN = (short) 0x001F; + private static final short FLOAT16_EXPONENT_INFINITY_NAN = (short)0x001F; private static final short FLOAT16_EXPONENT_BIAS = 15; private static final int FLOAT32_SIGN_MASK = 0x80000000; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/VarSizeUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/VarSizeUtil.java index b470d2ea7..03ec8e76c 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/VarSizeUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/VarSizeUtil.java @@ -17,6 +17,6 @@ public static int convertBitBufferSizeToInt(long value) if (value > Integer.MAX_VALUE) throw new ZserioError("VarSizeUtil: Value '" + value + "' is out of bounds for conversion!"); - return (int) value; + return (int)value; } } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/ZserioError.java b/compiler/extensions/java/runtime/src/zserio/runtime/ZserioError.java index 0fcc91cab..f96f61af2 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/ZserioError.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/ZserioError.java @@ -42,5 +42,5 @@ public ZserioError(final Throwable throwable) super(throwable); } - private static final long serialVersionUID = 921445202560692775L; + private static final long serialVersionUID = 921445202560692775L; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/array/Array.java b/compiler/extensions/java/runtime/src/zserio/runtime/array/Array.java index c6edf087c..147effe4e 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/array/Array.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/array/Array.java @@ -124,7 +124,8 @@ public int bitSizeOf(long bitPosition) else { endBitPosition = BitPositionUtil.alignTo(Byte.SIZE, endBitPosition); - endBitPosition += elementSize + (size - 1) * BitPositionUtil.alignTo(Byte.SIZE, elementSize); + endBitPosition += + elementSize + (size - 1) * BitPositionUtil.alignTo(Byte.SIZE, elementSize); } } else @@ -169,8 +170,8 @@ public int bitSizeOfPacked(long bitPosition) if (offsetInitializer != null) endBitPosition = BitPositionUtil.alignTo(Byte.SIZE, endBitPosition); - endBitPosition += packedArrayTraits.bitSizeOf( - context, endBitPosition, rawArray.getElement(index)); + endBitPosition += + packedArrayTraits.bitSizeOf(context, endBitPosition, rawArray.getElement(index)); } } @@ -227,7 +228,7 @@ public long initializeOffsetsPacked(long bitPosition) for (int index = 0; index < size; ++index) packedArrayTraits.initContext(context, rawArray.getElement(index)); - for (int index= 0; index < size; ++index) + for (int index = 0; index < size; ++index) { if (offsetInitializer != null) { diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayElement.java b/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayElement.java index 57c907977..219e12971 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayElement.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayElement.java @@ -15,8 +15,7 @@ public interface ArrayElement /** * Interface for elements of integral arrays. */ - public static interface IntegralArrayElement extends ArrayElement - { + public static interface IntegralArrayElement extends ArrayElement { /** * Converts the element value to big integer. * diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayTraits.java b/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayTraits.java index 638c9d66e..6cc9a0b54 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayTraits.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/array/ArrayTraits.java @@ -4,14 +4,14 @@ import java.math.BigInteger; import zserio.runtime.BitSizeOfCalculator; -import zserio.runtime.SizeOf; import zserio.runtime.PackableSizeOf; +import zserio.runtime.SizeOf; import zserio.runtime.array.ArrayElement.IntegralArrayElement; import zserio.runtime.io.BitBuffer; import zserio.runtime.io.BitStreamReader; import zserio.runtime.io.BitStreamWriter; -import zserio.runtime.io.Writer; import zserio.runtime.io.PackableWriter; +import zserio.runtime.io.Writer; /** * Interface for array traits. @@ -79,8 +79,7 @@ public interface ArrayTraits /** * Interface for integral array traits. */ - public static interface IntegralArrayTraits extends ArrayTraits - { + public static interface IntegralArrayTraits extends ArrayTraits { /** * Creates integral array element from given big integer value. * @@ -1374,8 +1373,7 @@ public void write(BitStreamWriter writer, ArrayElement element) throws IOExcepti /** * Array traits for zserio object arrays (with writer part) which are mapped to Java zserio object array. */ - public static final class WriteObjectArrayTraits - extends ObjectArrayTraits + public static final class WriteObjectArrayTraits extends ObjectArrayTraits { /** * Constructor from element factory. diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/array/DeltaContext.java b/compiler/extensions/java/runtime/src/zserio/runtime/array/DeltaContext.java index 3e35d6539..96ed8c5eb 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/array/DeltaContext.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/array/DeltaContext.java @@ -200,7 +200,7 @@ private void writeUnpacked(IntegralArrayTraits arrayTraits, BitStreamWriter writ IntegralArrayElement element) throws IOException { previousElement = element.toBigInteger(); - arrayTraits.write(writer, element); + arrayTraits.write(writer, element); } private static byte bitLength(BigInteger element) diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/array/PackedArrayTraits.java b/compiler/extensions/java/runtime/src/zserio/runtime/array/PackedArrayTraits.java index e3322687b..ef56ef1b5 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/array/PackedArrayTraits.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/array/PackedArrayTraits.java @@ -175,13 +175,12 @@ public int bitSizeOf(PackingContext context, long bitPosition, ArrayElement elem @Override public long initializeOffsets(PackingContext context, long bitPosition, ArrayElement element) { - throw new UnsupportedOperationException("PackedArrayTraits: " + - "initializeOffsets is not implemented for read only PackedObjectArrayTraits!"); + throw new UnsupportedOperationException("PackedArrayTraits: " + + "initializeOffsets is not implemented for read only PackedObjectArrayTraits!"); } @Override - public ArrayElement read(PackingContext context, BitStreamReader reader, int index) - throws IOException + public ArrayElement read(PackingContext context, BitStreamReader reader, int index) throws IOException { return new ArrayElement.ObjectArrayElement<>(elementFactory.create(context, reader, index)); } @@ -217,8 +216,7 @@ public WriteObjectPackedArrayTraits(PackableElementFactory elementFactory) @Override public long initializeOffsets(PackingContext context, long bitPosition, ArrayElement element) { - return ((ArrayElement.ObjectArrayElement)element).get().initializeOffsets( - context, bitPosition); + return ((ArrayElement.ObjectArrayElement)element).get().initializeOffsets(context, bitPosition); } @SuppressWarnings("unchecked") diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/array/RawArray.java b/compiler/extensions/java/runtime/src/zserio/runtime/array/RawArray.java index 11d567e6d..7143bd3b7 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/array/RawArray.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/array/RawArray.java @@ -66,8 +66,7 @@ public static final class ByteRawArray implements RawArray * Empty constructor. */ public ByteRawArray() - { - } + {} /** * Constructor from raw array. @@ -82,8 +81,9 @@ public ByteRawArray(byte[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof ByteRawArray) ? Arrays.equals(rawArray, ((ByteRawArray)obj).rawArray) : - false; + return (obj instanceof ByteRawArray) + ? Arrays.equals(rawArray, ((ByteRawArray)obj).rawArray) + : false; } @Override @@ -135,8 +135,7 @@ public static final class ShortRawArray implements RawArray * Empty constructor. */ public ShortRawArray() - { - } + {} /** * Constructor from raw array. @@ -151,8 +150,9 @@ public ShortRawArray(short[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof ShortRawArray) ? Arrays.equals(rawArray, ((ShortRawArray)obj).rawArray) : - false; + return (obj instanceof ShortRawArray) + ? Arrays.equals(rawArray, ((ShortRawArray)obj).rawArray) + : false; } @Override @@ -204,8 +204,7 @@ public static final class IntRawArray implements RawArray * Empty constructor. */ public IntRawArray() - { - } + {} /** * Constructor from raw array. @@ -272,8 +271,7 @@ public static final class LongRawArray implements RawArray * Empty constructor. */ public LongRawArray() - { - } + {} /** * Constructor from raw array. @@ -288,8 +286,9 @@ public LongRawArray(long[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof LongRawArray) ? Arrays.equals(rawArray, ((LongRawArray)obj).rawArray) : - false; + return (obj instanceof LongRawArray) + ? Arrays.equals(rawArray, ((LongRawArray)obj).rawArray) + : false; } @Override @@ -341,8 +340,7 @@ public static final class BigIntegerRawArray implements RawArray * Empty constructor. */ public BigIntegerRawArray() - { - } + {} /** * Constructor from raw array. @@ -357,8 +355,9 @@ public BigIntegerRawArray(BigInteger[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof BigIntegerRawArray) ? - Arrays.equals(rawArray, ((BigIntegerRawArray)obj).rawArray) : false; + return (obj instanceof BigIntegerRawArray) + ? Arrays.equals(rawArray, ((BigIntegerRawArray)obj).rawArray) + : false; } @Override @@ -410,8 +409,7 @@ public static final class FloatRawArray implements RawArray * Empty constructor. */ public FloatRawArray() - { - } + {} /** * Constructor from raw array. @@ -426,8 +424,9 @@ public FloatRawArray(float[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof FloatRawArray) ? Arrays.equals(rawArray, ((FloatRawArray)obj).rawArray) : - false; + return (obj instanceof FloatRawArray) + ? Arrays.equals(rawArray, ((FloatRawArray)obj).rawArray) + : false; } @Override @@ -479,8 +478,7 @@ public static final class DoubleRawArray implements RawArray * Empty constructor. */ public DoubleRawArray() - { - } + {} /** * Constructor from raw array. @@ -495,8 +493,9 @@ public DoubleRawArray(double[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof DoubleRawArray) ? Arrays.equals(rawArray, ((DoubleRawArray)obj).rawArray) : - false; + return (obj instanceof DoubleRawArray) + ? Arrays.equals(rawArray, ((DoubleRawArray)obj).rawArray) + : false; } @Override @@ -548,8 +547,7 @@ public static final class BooleanRawArray implements RawArray * Empty constructor. */ public BooleanRawArray() - { - } + {} /** * Constructor from raw array. @@ -564,8 +562,9 @@ public BooleanRawArray(boolean[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof BooleanRawArray) ? Arrays.equals(rawArray, ((BooleanRawArray)obj).rawArray) : - false; + return (obj instanceof BooleanRawArray) + ? Arrays.equals(rawArray, ((BooleanRawArray)obj).rawArray) + : false; } @Override @@ -617,8 +616,7 @@ public static final class BytesRawArray implements RawArray * Empty constructor. */ public BytesRawArray() - { - } + {} /** * Constructor from raw array. @@ -633,8 +631,9 @@ public BytesRawArray(byte[][] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof BytesRawArray) ? Arrays.deepEquals(rawArray, ((BytesRawArray)obj).rawArray) : - false; + return (obj instanceof BytesRawArray) + ? Arrays.deepEquals(rawArray, ((BytesRawArray)obj).rawArray) + : false; } @Override @@ -687,8 +686,7 @@ public static final class StringRawArray implements RawArray * Empty constructor. */ public StringRawArray() - { - } + {} /** * Constructor from raw array. @@ -703,8 +701,9 @@ public StringRawArray(String[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof StringRawArray) ? Arrays.equals(rawArray, ((StringRawArray)obj).rawArray) : - false; + return (obj instanceof StringRawArray) + ? Arrays.equals(rawArray, ((StringRawArray)obj).rawArray) + : false; } @Override @@ -757,8 +756,7 @@ public static final class BitBufferRawArray implements RawArray * Empty constructor. */ public BitBufferRawArray() - { - } + {} /** * Constructor from raw array. @@ -850,8 +848,9 @@ public EnumRawArray(Class elementClass, E[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof EnumRawArray) ? - Arrays.equals(rawArray, ((EnumRawArray)obj).rawArray) : false; + return (obj instanceof EnumRawArray) + ? Arrays.equals(rawArray, ((EnumRawArray)obj).rawArray) + : false; } @Override @@ -928,8 +927,9 @@ public ObjectRawArray(Class elementClass, E[] rawArray) @Override public boolean equals(java.lang.Object obj) { - return (obj instanceof ObjectRawArray) ? - Arrays.equals(rawArray, ((ObjectRawArray)obj).rawArray) : false; + return (obj instanceof ObjectRawArray) + ? Arrays.equals(rawArray, ((ObjectRawArray)obj).rawArray) + : false; } @Override diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/creator/ZserioTreeCreator.java b/compiler/extensions/java/runtime/src/zserio/runtime/creator/ZserioTreeCreator.java index 52fbd5eef..be59889ed 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/creator/ZserioTreeCreator.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/creator/ZserioTreeCreator.java @@ -11,11 +11,11 @@ import java.util.Stack; import java.util.function.BiFunction; -import zserio.runtime.typeinfo.TypeInfo; -import zserio.runtime.typeinfo.TypeInfoUtil; import zserio.runtime.ZserioError; import zserio.runtime.typeinfo.FieldInfo; import zserio.runtime.typeinfo.ParameterInfo; +import zserio.runtime.typeinfo.TypeInfo; +import zserio.runtime.typeinfo.TypeInfoUtil; /** * Creator for zserio objects. @@ -80,8 +80,8 @@ public void beginArray(String name) final FieldInfo fieldInfo = findFieldInfo(parentTypeInfo, name); if (!fieldInfo.isArray()) { - throw new ZserioError("ZserioTreeCreator: Member '" + fieldInfo.getSchemaName() + - "' is not an array!"); + throw new ZserioError( + "ZserioTreeCreator: Member '" + fieldInfo.getSchemaName() + "' is not an array!"); } fieldInfoStack.push(fieldInfo); @@ -124,8 +124,8 @@ public void beginCompound(String name) if (!TypeInfoUtil.isCompound(fieldInfo.getTypeInfo().getSchemaType())) { - throw new ZserioError("ZserioTreeCreator: Member '" + fieldInfo.getSchemaName() + - "' is not a compound!"); + throw new ZserioError( + "ZserioTreeCreator: Member '" + fieldInfo.getSchemaName() + "' is not a compound!"); } final Object compound = createObject(fieldInfo, valueStack.peek()); @@ -169,15 +169,15 @@ public void setValue(String name, Object value) { if (fieldInfo.isArray()) { - throw new ZserioError("ZserioTreeCreator: Expecting array in field '" + - fieldInfo.getSchemaName() + "!"); + throw new ZserioError( + "ZserioTreeCreator: Expecting array in field '" + fieldInfo.getSchemaName() + "!"); } final TypeInfo typeInfo = fieldInfo.getTypeInfo(); final Class boxedFieldClass = toBoxedClass(typeInfo.getJavaClass()); if (!boxedFieldClass.isInstance(value)) - throw new ZserioError("ZserioTreeCreator: Unexpected value type '" + value.getClass() + "', " + - "expecting '" + typeInfo.getJavaClass() + "'!"); + throw new ZserioError("ZserioTreeCreator: Unexpected value type '" + value.getClass() + "', " + + "expecting '" + typeInfo.getJavaClass() + "'!"); } final TypeInfo parentTypeInfo = getTypeInfo(); @@ -212,8 +212,8 @@ public void beginCompoundElement() final FieldInfo fieldInfo = fieldInfoStack.peek(); if (!TypeInfoUtil.isCompound(fieldInfo.getTypeInfo().getSchemaType())) { - throw new ZserioError("ZserioTreeCreator: Member '" + fieldInfo.getSchemaName() + - "' is not a compound!"); + throw new ZserioError( + "ZserioTreeCreator: Member '" + fieldInfo.getSchemaName() + "' is not a compound!"); } final List list = (List)valueStack.peek(); @@ -231,7 +231,7 @@ public void endCompoundElement() if (state != State.IN_COMPOUND || fieldInfoStack.empty()) { throw new ZserioError("ZserioTreeCreator: Cannot end compound element in state '" + state + "'" + - (fieldInfoStack.empty() ? "(expecting endRoot)!" : "!")); + (fieldInfoStack.empty() ? "(expecting endRoot)!" : "!")); } final FieldInfo fieldInfo = fieldInfoStack.peek(); @@ -306,7 +306,7 @@ private static FieldInfo findFieldInfo(TypeInfo typeInfo, String fieldName) private static Object createObject(TypeInfo typeInfo, Object[] arguments) { final List parameters = typeInfo.getParameters(); - final Class[] parametersTypes = new Class[parameters.size()]; + final Class[] parametersTypes = new Class[ parameters.size() ]; for (int i = 0; i < parameters.size(); ++i) parametersTypes[i] = parameters.get(i).getTypeInfo().getJavaClass(); @@ -319,7 +319,8 @@ private static Object createObject(TypeInfo typeInfo, Object[] arguments) InvocationTargetException excpt) { throw new ZserioError("ZserioTreeCreator: Cannot call constructor of Zserio object '" + - typeInfo.getSchemaName() + "'!", excpt); + typeInfo.getSchemaName() + "'!", + excpt); } } @@ -372,7 +373,8 @@ else if (fieldInfo.isOptional()) InvocationTargetException | NoSuchMethodException excpt) { throw new ZserioError("ZserioTreeCreator: Cannot set field '" + fieldInfo.getSchemaName() + - "' in Zserio object '" + parentTypeInfo.getSchemaName() + "'!", excpt); + "' in Zserio object '" + parentTypeInfo.getSchemaName() + "'!", + excpt); } } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/BitBuffer.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/BitBuffer.java index c5053343e..0d513abc3 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/BitBuffer.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/BitBuffer.java @@ -1,9 +1,9 @@ package zserio.runtime.io; -import zserio.runtime.HashCodeUtil; - import java.nio.ByteBuffer; +import zserio.runtime.HashCodeUtil; + /** * Class which holds any bit sequence. * @@ -132,8 +132,9 @@ private byte getMaskedLastByte() final int roundedByteSize = (int)(bitSize / 8); final byte lastByteBits = (byte)(bitSize - (long)8 * roundedByteSize); - return (lastByteBits == 0) ? buffer[roundedByteSize - 1] : - (byte)(buffer[roundedByteSize] & (0xFF << (8 - lastByteBits))); + return (lastByteBits == 0) + ? buffer[roundedByteSize - 1] + : (byte)(buffer[roundedByteSize] & (0xFF << (8 - lastByteBits))); } private final byte[] buffer; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/BitStreamReader.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/BitStreamReader.java index e7a2d5879..efca598cb 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/BitStreamReader.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/BitStreamReader.java @@ -31,7 +31,8 @@ public interface BitStreamReader extends Closeable */ long readBits(final int numBits) throws IOException; - /** Reads the next signed byte (8 bits). + /** + * Reads the next signed byte (8 bits). * * @return Read signed byte value. * @@ -66,7 +67,6 @@ public interface BitStreamReader extends Closeable */ int readUnsignedShort() throws IOException; - /** * Reads the next signed integer (32 bits). * diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamBase.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamBase.java index c3e5fb9f6..7cbb96693 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamBase.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamBase.java @@ -60,8 +60,8 @@ public int getBitOffset() protected static void checkRange(final int numBits) throws IllegalArgumentException { if (numBits <= 0 || numBits > 64) - throw new IllegalArgumentException("ByteArrayBitStreamBase: Number of bits " + numBits + - " is out of range [1, 64]."); + throw new IllegalArgumentException( + "ByteArrayBitStreamBase: Number of bits " + numBits + " is out of range [1, 64]."); } /** diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamReader.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamReader.java index 8d8d0c8e9..ac11f5a95 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamReader.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamReader.java @@ -153,7 +153,7 @@ public short readShort() throws IOException } else { - result = (short) readBits(16); + result = (short)readBits(16); } return result; } @@ -609,8 +609,8 @@ public int readVarSize() throws IOException // byte 5 result = result << 8 | (int)readBits(8); if (result > VARSIZE_MAX_VALUE) - throw new IOException("ByteArrayBitStreamReader: Read value '" + result + - "' is out of range for varsize type!"); + throw new IOException( + "ByteArrayBitStreamReader: Read value '" + result + "' is out of range for varsize type!"); return (int)result; } @@ -780,7 +780,7 @@ private static long makeLong(final byte b7, final byte b6, final byte b5, final /** * Bit masks to mask appropriate bits during unaligned reading. */ - private static final int BIT_MASKS[] = { 0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01 }; + private static final int BIT_MASKS[] = {0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01}; /** Variable length integer sing bit mask for first byte. */ private static final short VARINT_SIGN_1 = 0x80; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamWriter.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamWriter.java index dd261a812..56d87044e 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamWriter.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/ByteArrayBitStreamWriter.java @@ -3,11 +3,12 @@ import java.io.EOFException; import java.io.IOException; import java.math.BigInteger; + +import zserio.runtime.BitFieldUtil; import zserio.runtime.BitSizeOfCalculator; import zserio.runtime.FloatUtil; -import zserio.runtime.BitFieldUtil; -import zserio.runtime.ZserioError; import zserio.runtime.VarSizeUtil; +import zserio.runtime.ZserioError; /** * A bit stream writer using byte array. @@ -47,8 +48,8 @@ public void writeSignedBits(final long value, final int numBits) throws IOExcept final long upperBound = BitFieldUtil.getBitFieldUpperBound(numBits, true); if (value < lowerBound || value > upperBound) - throw new IllegalArgumentException("ByteArrayBitStreamWriter: Value " + value + " does not " + - "fit into " + numBits + " bits."); + throw new IllegalArgumentException("ByteArrayBitStreamWriter: Value " + value + " does not " + + "fit into " + numBits + " bits."); } // else: all values are OK @@ -90,8 +91,8 @@ public void writeByte(final byte v) throws IOException public void writeUnsignedByte(final short value) throws IOException { if (value < 0) - throw new IllegalArgumentException("ByteArrayBitStreamWriter: Can't write unsigned byte. Value " + - value + " is negative."); + throw new IllegalArgumentException( + "ByteArrayBitStreamWriter: Can't write unsigned byte. Value " + value + " is negative."); writeBits(value, 8); } @@ -119,8 +120,8 @@ public void writeShort(final short v) throws IOException public void writeUnsignedShort(final int value) throws IOException { if (value < 0) - throw new IllegalArgumentException("ByteArrayBitStreamWriter: Can't write unsigned short. Value " + - value + " is negative."); + throw new IllegalArgumentException( + "ByteArrayBitStreamWriter: Can't write unsigned short. Value " + value + " is negative."); writeBits(value, 16); } @@ -152,8 +153,8 @@ public void writeInt(final int v) throws IOException public void writeUnsignedInt(final long value) throws IOException { if (value < 0) - throw new IllegalArgumentException("ByteArrayBitStreamWriter: Can't write unsigned integer. " + - "Value " + value + " is negative."); + throw new IllegalArgumentException("ByteArrayBitStreamWriter: Can't write unsigned integer. " + + "Value " + value + " is negative."); writeBits(value, 32); } @@ -733,8 +734,8 @@ private int nextUnsignedByte() throws IOException private byte nextByte() throws IOException { if (bytePosition >= buffer.length) - throw new EOFException("ByteArrayBitStreamWriter: Internal error, attemp to read beyond end of " + - "the buffer. Byte position is " + bytePosition + ". Buffer length is " + buffer.length + + throw new EOFException("ByteArrayBitStreamWriter: Internal error, attemp to read beyond end of " + + "the buffer. Byte position is " + bytePosition + ". Buffer length is " + buffer.length + "."); return buffer[bytePosition++]; @@ -759,8 +760,8 @@ private void growBuffer(final int minCapacity) if (newCapacity - MAX_BUFFER_SIZE > 0) { if (minCapacity < 0) - throw new OutOfMemoryError("ByteArrayBitStreamWriter: Reached maximum capacity of underlying " + - "buffer (" + MAX_BUFFER_SIZE + " bytes)."); + throw new OutOfMemoryError("ByteArrayBitStreamWriter: Reached maximum capacity of underlying " + + "buffer (" + MAX_BUFFER_SIZE + " bytes)."); newCapacity = MAX_BUFFER_SIZE; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/InitializeOffsetsWriter.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/InitializeOffsetsWriter.java index c27f9e2ca..16067e0d5 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/InitializeOffsetsWriter.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/InitializeOffsetsWriter.java @@ -9,8 +9,7 @@ * This interface has been moved to the {@link Writer} interface. This interface will be removed in the future. */ @Deprecated -public interface InitializeOffsetsWriter extends Writer -{ +public interface InitializeOffsetsWriter extends Writer { /** * Writes this objects to the given bit stream and optionally calls initializeOffsets. * diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/SerializeUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/SerializeUtil.java index 1ea76742c..888990375 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/SerializeUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/SerializeUtil.java @@ -281,8 +281,8 @@ private static void serializeToWriter(T object, BitStreamWrit object.write(writer); } - private static T deserializeFromReader(final Class clazz, BitStreamReader reader, - Object... arguments) + private static T deserializeFromReader( + final Class clazz, BitStreamReader reader, Object... arguments) { try { @@ -293,7 +293,7 @@ private static T deserializeFromReader(final Class clazz, BitStreamReader } else { - final Class[] ctorArgumentTypes = new Class[arguments.length + 1]; + final Class[] ctorArgumentTypes = new Class[ arguments.length + 1 ]; ctorArgumentTypes[0] = BitStreamReader.class; // please note that arguments are always boxed and object parameters are always unboxed for (int i = 0; i < arguments.length; ++i) diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/io/package-info.java b/compiler/extensions/java/runtime/src/zserio/runtime/io/package-info.java index 1ed9fbbcf..6af33f606 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/io/package-info.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/io/package-info.java @@ -2,4 +2,3 @@ * This package contains stream manipulation classes. */ package zserio.runtime.io; - diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonDecoder.java b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonDecoder.java index 482a6821e..128620123 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonDecoder.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonDecoder.java @@ -177,8 +177,8 @@ private static Result decodeString(String content, int pos) endOfStringPos += unicodeEscapeLen; if (endOfStringPos >= content.length()) return Result.failure(content.length() - pos); - final String subContent = content.substring(endOfStringPos - unicodeEscapeLen, - endOfStringPos); + final String subContent = + content.substring(endOfStringPos - unicodeEscapeLen, endOfStringPos); final String decodedUnicode = decodeUnicodeEscape(subContent); if (decodedUnicode != null) decodedString.append(decodedUnicode); diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParser.java b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParser.java index 1b5e1640e..ccdf2f332 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParser.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParser.java @@ -62,8 +62,7 @@ public int getColumn() /** * Json parser observer. */ - static interface Observer - { + static interface Observer { /** * Called when a JSON object begins - i.e. on '{'. */ diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParserError.java b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParserError.java index 4aec2b04d..9903d9d04 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParserError.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonParserError.java @@ -44,5 +44,5 @@ public JsonParserError(final Throwable throwable) super(throwable); } - private static final long serialVersionUID = 921445202560692333L; + private static final long serialVersionUID = 921445202560692333L; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonReader.java b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonReader.java index e489661e9..b61957fd1 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonReader.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonReader.java @@ -62,8 +62,8 @@ public Object read(TypeInfo typeInfo, Object... arguments) } catch (ZserioError excpt) { - throw new ZserioError(excpt.getMessage() + - " (JsonParser:" + parser.getLine() + ":" + parser.getColumn() + ")"); + throw new ZserioError( + excpt.getMessage() + " (JsonParser:" + parser.getLine() + ":" + parser.getColumn() + ")"); } return creatorAdapter.get(); @@ -185,10 +185,11 @@ else if (state == State.VISIT_VALUE_BITSIZE && value instanceof BigInteger) { bitSize = ((BigInteger)value).longValueExact(); } - catch (ArithmeticException excpt) + catch (ArithmeticException excpt) { throw new ZserioError("JsonReader: Cannot create long for Bit Buffer size from value '" + - value.toString() + "'!", excpt); + value.toString() + "'!", + excpt); } state = State.VISIT_KEY; } @@ -301,8 +302,8 @@ public void visitValue(Object value) final BigInteger intValue = (BigInteger)value; if (intValue.compareTo(BigInteger.ZERO) < 0 || intValue.compareTo(BigInteger.valueOf(255)) > 0) { - throw new ZserioError("JsonReader: Cannot create byte for bytes from value '" + - value.toString() + "'!"); + throw new ZserioError( + "JsonReader: Cannot create byte for bytes from value '" + value.toString() + "'!"); } buffer.add(((BigInteger)value).byteValue()); } @@ -600,7 +601,8 @@ private static Object createEnum(BigInteger value, TypeInfo typeInfo) InvocationTargetException | NoSuchMethodException excpt) { throw new ZserioError("JsonReader: Cannot create enum '" + typeInfo.getSchemaName() + - "' from value '" + value.toString() + "'!", excpt); + "' from value '" + value.toString() + "'!", + excpt); } } @@ -635,7 +637,7 @@ private static Object createBitmask(BigInteger value, TypeInfo typeInfo) final Class bitmaskClass = typeInfo.getJavaClass(); final TypeInfo bitmaskUnderlyingTypeInfo = typeInfo.getUnderlyingType(); final Class bitmaskUnderlyingClass = bitmaskUnderlyingTypeInfo.getJavaClass(); - final Class[] parameterType = new Class[] { bitmaskUnderlyingClass }; + final Class[] parameterType = new Class[] {bitmaskUnderlyingClass}; final Constructor constructor = bitmaskClass.getConstructor(parameterType); final JavaType bitmaskUnderlyingJavaType = bitmaskUnderlyingTypeInfo.getJavaType(); @@ -645,7 +647,8 @@ private static Object createBitmask(BigInteger value, TypeInfo typeInfo) IllegalArgumentException | InvocationTargetException | NoSuchMethodException excpt) { throw new ZserioError("JsonReader: Cannot create bitmask '" + typeInfo.getSchemaName() + - "' from value '" + value.toString() + "'!", excpt); + "' from value '" + value.toString() + "'!", + excpt); } } @@ -730,7 +733,8 @@ private static byte createByte(BigInteger value, TypeInfo typeInfo) catch (ArithmeticException excpt) { throw new ZserioError("JsonReader: Cannot create byte '" + typeInfo.getSchemaName() + - "' from value '" + value.toString() + "'!", excpt); + "' from value '" + value.toString() + "'!", + excpt); } } @@ -743,7 +747,8 @@ private static short createShort(BigInteger value, TypeInfo typeInfo) catch (ArithmeticException excpt) { throw new ZserioError("JsonReader: Cannot create short '" + typeInfo.getSchemaName() + - "' from value '" + value.toString() + "'!", excpt); + "' from value '" + value.toString() + "'!", + excpt); } } @@ -756,7 +761,8 @@ private static int createInt(BigInteger value, TypeInfo typeInfo) catch (ArithmeticException excpt) { throw new ZserioError("JsonReader: Cannot create int '" + typeInfo.getSchemaName() + - "' from value '" + value.toString() + "'!", excpt); + "' from value '" + value.toString() + "'!", + excpt); } } @@ -769,7 +775,8 @@ private static long createLong(BigInteger value, TypeInfo typeInfo) catch (ArithmeticException excpt) { throw new ZserioError("JsonReader: Cannot create long '" + typeInfo.getSchemaName() + - "' from value '" + value.toString() + "'!", excpt); + "' from value '" + value.toString() + "'!", + excpt); } } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonTokenizer.java b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonTokenizer.java index ff15e473c..6fd3bb443 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonTokenizer.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonTokenizer.java @@ -1,7 +1,7 @@ package zserio.runtime.json; -import java.io.Reader; import java.io.IOException; +import java.io.Reader; /** * Json Tokenizer used by Json Parser. @@ -222,8 +222,8 @@ private void setTokenValue() { if (!decoderResult.success()) { - throw new JsonParserError("JsonTokenizer:" + lineNumber + ":" + tokenColumnNumber + - ": Unknown token!"); + throw new JsonParserError( + "JsonTokenizer:" + lineNumber + ":" + tokenColumnNumber + ": Unknown token!"); } setToken(JsonToken.VALUE, decoderResult.getValue()); diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonWriter.java b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonWriter.java index 189b1e26b..c29c4e0ab 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonWriter.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/json/JsonWriter.java @@ -8,8 +8,8 @@ import zserio.runtime.ZserioEnum; import zserio.runtime.ZserioError; import zserio.runtime.io.BitBuffer; -import zserio.runtime.typeinfo.ItemInfo; import zserio.runtime.typeinfo.FieldInfo; +import zserio.runtime.typeinfo.ItemInfo; import zserio.runtime.typeinfo.TypeInfo; import zserio.runtime.walker.WalkObserver; import zserio.runtime.walker.WalkerConst; @@ -109,7 +109,8 @@ public enum EnumerableFormat * */ STRING - }; + } + ; /** * Sets preferred formatting for enumerable types. @@ -401,10 +402,11 @@ private void writeStringifiedBitmask(ZserioBitmask zserioBitmask, TypeInfo typeI else if (!bitmaskValue.equals(valueCheck)) { // partial match - stringValue = new StringBuilder(bitmaskValue.toString()) - .append(" /* partial match: ") - .append(stringValue.toString()) - .append(" */"); + stringValue = + new StringBuilder(bitmaskValue.toString()) + .append(" /* partial match: ") + .append(stringValue.toString()) + .append(" */"); } // else exact match diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/package-info.java b/compiler/extensions/java/runtime/src/zserio/runtime/package-info.java index 112a66b75..0597cca82 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/package-info.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/package-info.java @@ -2,4 +2,3 @@ * This package contains helper classes needed for code generated by Zserio. */ package zserio.runtime; - diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubCallback.java b/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubCallback.java index dfc1bb36f..a5e474907 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubCallback.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubCallback.java @@ -12,4 +12,4 @@ public interface PubsubCallback * @param message Message as a Zserio generated type - e.g. structure. */ public void invoke(String topic, T message); -}; +} diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubInterface.java b/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubInterface.java index 2e2e693c4..cdc84354d 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubInterface.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/PubsubInterface.java @@ -45,5 +45,5 @@ public interface Callback * @param data Message's data as a byte array. */ void invoke(String topic, byte[] data); - }; -}; + } +} diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/package-info.java b/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/package-info.java index 283daa9b6..227a8ebfa 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/package-info.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/pubsub/package-info.java @@ -2,4 +2,3 @@ * This package contains classes for Zserio Pub/Sub. */ package zserio.runtime.pubsub; - diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/service/ObjectServiceData.java b/compiler/extensions/java/runtime/src/zserio/runtime/service/ObjectServiceData.java index 302e21877..d6f7a9ef1 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/service/ObjectServiceData.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/service/ObjectServiceData.java @@ -2,9 +2,9 @@ import java.io.IOException; -import zserio.runtime.io.Writer; -import zserio.runtime.io.ByteArrayBitStreamWriter; import zserio.runtime.ZserioError; +import zserio.runtime.io.ByteArrayBitStreamWriter; +import zserio.runtime.io.Writer; /** ServiceData implementation based on generated Zserio objects. */ public final class ObjectServiceData implements ServiceData diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceClientInterface.java b/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceClientInterface.java index af691c479..36bcc09c9 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceClientInterface.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceClientInterface.java @@ -15,4 +15,4 @@ public interface ServiceClientInterface * @return Response data. */ public byte[] callMethod(String methodName, ServiceData request, Object context); -}; +} diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceInterface.java b/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceInterface.java index fefc12d42..83c0b9a36 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceInterface.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/service/ServiceInterface.java @@ -15,4 +15,4 @@ public interface ServiceInterface * @return Response service data. */ public ServiceData callMethod(String methodName, byte[] requestData, Object context); -}; +} diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/FieldInfo.java b/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/FieldInfo.java index fea0c6c90..fd1e27cf7 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/FieldInfo.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/FieldInfo.java @@ -39,8 +39,8 @@ public FieldInfo(String schemaName, String getterName, String setterName, TypeIn List> typeArguments, boolean isExtended, IntSupplier alignment, BiFunction offset, Supplier initializer, boolean isOptional, Predicate optionalCondition, String isUsedIndicatorName, String isSetIndicatorName, - Predicate constraint, boolean isArray, ToIntFunction arrayLength, - boolean isPacked, boolean isImplicit) + Predicate constraint, boolean isArray, ToIntFunction arrayLength, boolean isPacked, + boolean isImplicit) { this.schemaName = schemaName; this.getterName = getterName; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/MessageInfo.java b/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/MessageInfo.java index 29ff29800..0847f18c4 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/MessageInfo.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/MessageInfo.java @@ -14,8 +14,8 @@ public final class MessageInfo * @param isSubscribed Flag whether the message is subscribed. * @param topic Message topic definition. */ - public MessageInfo(String schemaName, TypeInfo typeInfo, - boolean isPublished, boolean isSubscribed, String topic) + public MessageInfo( + String schemaName, TypeInfo typeInfo, boolean isPublished, boolean isSubscribed, String topic) { this.schemaName = schemaName; this.typeInfo = typeInfo; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/TypeInfo.java b/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/TypeInfo.java index f0e8f49eb..ad7aab11d 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/TypeInfo.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/typeinfo/TypeInfo.java @@ -415,8 +415,7 @@ public static class BuiltinTypeInfo extends TypeInfoBase * @param javaType The Java type to be stored in type information. * @param javaClass The Java class object to be stored in type information. */ - public BuiltinTypeInfo(String schemaName, SchemaType schemaType, JavaType javaType, - Class javaClass) + public BuiltinTypeInfo(String schemaName, SchemaType schemaType, JavaType javaType, Class javaClass) { super(schemaName, schemaType, javaType, javaClass); } @@ -696,29 +695,29 @@ public static BuiltinTypeInfo getDynamicSignedBitField(byte maxBitSize) { if (maxBitSize <= 0 || maxBitSize > 64) { - throw new ZserioError("BuiltinTypeInfo.getDynamicSignedBitField: Invalid max bit size '" + - maxBitSize + "'!"); + throw new ZserioError( + "BuiltinTypeInfo.getDynamicSignedBitField: Invalid max bit size '" + maxBitSize + "'!"); } if (maxBitSize <= 8) { - return new BuiltinTypeInfo("int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.BYTE, - byte.class); + return new BuiltinTypeInfo( + "int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.BYTE, byte.class); } else if (maxBitSize <= 16) { - return new BuiltinTypeInfo("int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.SHORT, - short.class); + return new BuiltinTypeInfo( + "int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.SHORT, short.class); } else if (maxBitSize <= 32) { - return new BuiltinTypeInfo("int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.INT, - int.class); + return new BuiltinTypeInfo( + "int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.INT, int.class); } else { - return new BuiltinTypeInfo("int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.LONG, - long.class); + return new BuiltinTypeInfo( + "int<>", SchemaType.DYNAMIC_SIGNED_BITFIELD, JavaType.LONG, long.class); } } @@ -739,28 +738,28 @@ public static BuiltinTypeInfo getDynamicUnsignedBitField(byte maxBitSize) if (maxBitSize < 8) { - return new BuiltinTypeInfo("bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.BYTE, - byte.class); + return new BuiltinTypeInfo( + "bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.BYTE, byte.class); } else if (maxBitSize < 16) { - return new BuiltinTypeInfo("bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.SHORT, - short.class); + return new BuiltinTypeInfo( + "bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.SHORT, short.class); } else if (maxBitSize < 32) { - return new BuiltinTypeInfo("bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.INT, - int.class); + return new BuiltinTypeInfo( + "bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.INT, int.class); } else if (maxBitSize < 64) { - return new BuiltinTypeInfo("bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.LONG, - long.class); + return new BuiltinTypeInfo( + "bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.LONG, long.class); } else { - return new BuiltinTypeInfo("bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.BIG_INTEGER, - BigInteger.class); + return new BuiltinTypeInfo( + "bit<>", SchemaType.DYNAMIC_UNSIGNED_BITFIELD, JavaType.BIG_INTEGER, BigInteger.class); } } @@ -807,8 +806,8 @@ public static final class FixedSizeBuiltinTypeInfo extends BuiltinTypeInfo * @param javaClass The Java class object to be stored in type information. * @param bitSize The bit size of the fixed size integral schema type. */ - public FixedSizeBuiltinTypeInfo(String schemaName, SchemaType schemaType, JavaType javaType, - Class javaClass, byte bitSize) + public FixedSizeBuiltinTypeInfo( + String schemaName, SchemaType schemaType, JavaType javaType, Class javaClass, byte bitSize) { super(schemaName, schemaType, javaType, javaClass); @@ -952,30 +951,30 @@ public static FixedSizeBuiltinTypeInfo getFixedSignedBitField(byte bitSize) { if (bitSize <= 0 || bitSize > 64) { - throw new ZserioError("FixedSizeBuiltinTypeInfo.getFixedSignedBitField: Invalid bit size '" + - bitSize + "'!"); + throw new ZserioError( + "FixedSizeBuiltinTypeInfo.getFixedSignedBitField: Invalid bit size '" + bitSize + "'!"); } final String schemaName = "int:" + bitSize; if (bitSize <= 8) { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_SIGNED_BITFIELD, - JavaType.BYTE, byte.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_SIGNED_BITFIELD, JavaType.BYTE, byte.class, bitSize); } else if (bitSize <= 16) { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_SIGNED_BITFIELD, - JavaType.SHORT, short.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_SIGNED_BITFIELD, JavaType.SHORT, short.class, bitSize); } else if (bitSize <= 32) { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_SIGNED_BITFIELD, - JavaType.INT, int.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_SIGNED_BITFIELD, JavaType.INT, int.class, bitSize); } else // bitSize <= 64 { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_SIGNED_BITFIELD, - JavaType.LONG, long.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_SIGNED_BITFIELD, JavaType.LONG, long.class, bitSize); } } @@ -990,8 +989,8 @@ public static FixedSizeBuiltinTypeInfo getFixedUnsignedBitField(byte bitSize) { if (bitSize <= 0 || bitSize > 64) { - throw new ZserioError("FixedSizeBuiltinTypeInfo.getFixedSignedBitField: Invalid bit size '" + - bitSize + "'!"); + throw new ZserioError( + "FixedSizeBuiltinTypeInfo.getFixedSignedBitField: Invalid bit size '" + bitSize + "'!"); } final String schemaName = "bit:" + bitSize; @@ -1002,18 +1001,18 @@ public static FixedSizeBuiltinTypeInfo getFixedUnsignedBitField(byte bitSize) } else if (bitSize < 16) { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_UNSIGNED_BITFIELD, - JavaType.SHORT, short.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_UNSIGNED_BITFIELD, JavaType.SHORT, short.class, bitSize); } else if (bitSize < 32) { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_UNSIGNED_BITFIELD, - JavaType.INT, int.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_UNSIGNED_BITFIELD, JavaType.INT, int.class, bitSize); } else if (bitSize < 64) { - return new FixedSizeBuiltinTypeInfo(schemaName, SchemaType.FIXED_UNSIGNED_BITFIELD, - JavaType.LONG, long.class, bitSize); + return new FixedSizeBuiltinTypeInfo( + schemaName, SchemaType.FIXED_UNSIGNED_BITFIELD, JavaType.LONG, long.class, bitSize); } else // bitSize == 64 { @@ -1022,24 +1021,24 @@ else if (bitSize < 64) } } - private static final FixedSizeBuiltinTypeInfo BOOL = new FixedSizeBuiltinTypeInfo( - "bool", SchemaType.BOOL, JavaType.BOOLEAN, boolean.class, (byte)1); - - private static final FixedSizeBuiltinTypeInfo INT8 = new FixedSizeBuiltinTypeInfo( - "int8", SchemaType.INT8, JavaType.BYTE, byte.class, (byte)8); - private static final FixedSizeBuiltinTypeInfo INT16 = new FixedSizeBuiltinTypeInfo( - "int16", SchemaType.INT16, JavaType.SHORT, short.class, (byte)16); - private static final FixedSizeBuiltinTypeInfo INT32 = new FixedSizeBuiltinTypeInfo( - "int32", SchemaType.INT32, JavaType.INT, int.class, (byte)32); - private static final FixedSizeBuiltinTypeInfo INT64 = new FixedSizeBuiltinTypeInfo( - "int64", SchemaType.INT64, JavaType.LONG, long.class, (byte)64); - - private static final FixedSizeBuiltinTypeInfo UINT8 = new FixedSizeBuiltinTypeInfo( - "uint8", SchemaType.UINT8, JavaType.SHORT, short.class, (byte)8); - private static final FixedSizeBuiltinTypeInfo UINT16 = new FixedSizeBuiltinTypeInfo( - "uint16", SchemaType.UINT16, JavaType.INT, int.class, (byte)16); - private static final FixedSizeBuiltinTypeInfo UINT32 = new FixedSizeBuiltinTypeInfo( - "uint32", SchemaType.UINT32, JavaType.LONG, long.class, (byte)32); + private static final FixedSizeBuiltinTypeInfo BOOL = + new FixedSizeBuiltinTypeInfo("bool", SchemaType.BOOL, JavaType.BOOLEAN, boolean.class, (byte)1); + + private static final FixedSizeBuiltinTypeInfo INT8 = + new FixedSizeBuiltinTypeInfo("int8", SchemaType.INT8, JavaType.BYTE, byte.class, (byte)8); + private static final FixedSizeBuiltinTypeInfo INT16 = + new FixedSizeBuiltinTypeInfo("int16", SchemaType.INT16, JavaType.SHORT, short.class, (byte)16); + private static final FixedSizeBuiltinTypeInfo INT32 = + new FixedSizeBuiltinTypeInfo("int32", SchemaType.INT32, JavaType.INT, int.class, (byte)32); + private static final FixedSizeBuiltinTypeInfo INT64 = + new FixedSizeBuiltinTypeInfo("int64", SchemaType.INT64, JavaType.LONG, long.class, (byte)64); + + private static final FixedSizeBuiltinTypeInfo UINT8 = + new FixedSizeBuiltinTypeInfo("uint8", SchemaType.UINT8, JavaType.SHORT, short.class, (byte)8); + private static final FixedSizeBuiltinTypeInfo UINT16 = + new FixedSizeBuiltinTypeInfo("uint16", SchemaType.UINT16, JavaType.INT, int.class, (byte)16); + private static final FixedSizeBuiltinTypeInfo UINT32 = + new FixedSizeBuiltinTypeInfo("uint32", SchemaType.UINT32, JavaType.LONG, long.class, (byte)32); private static final FixedSizeBuiltinTypeInfo UINT64 = new FixedSizeBuiltinTypeInfo( "uint64", SchemaType.UINT64, JavaType.BIG_INTEGER, BigInteger.class, (byte)64); @@ -1068,8 +1067,8 @@ public static class TemplatableTypeInfoBase extends TypeInfoBase * @param templateName The full schema template name. * @param templateArguments The sequence of type informations for template arguments. */ - public TemplatableTypeInfoBase(String schemaName, SchemaType schemaType, - JavaType javaType, Class javaClass, String templateName, List templateArguments) + public TemplatableTypeInfoBase(String schemaName, SchemaType schemaType, JavaType javaType, + Class javaClass, String templateName, List templateArguments) { super(schemaName, schemaType, javaType, javaClass); @@ -1111,8 +1110,8 @@ public static abstract class CompoundTypeInfoBase extends TemplatableTypeInfoBas * @param parameters The sequence of type informations for parameters. * @param functions The sequence of type informations for functions. */ - public CompoundTypeInfoBase(String schemaName, SchemaType schemaType, - JavaType javaType, Class javaClass, String templateName, List templateArguments, + public CompoundTypeInfoBase(String schemaName, SchemaType schemaType, JavaType javaType, + Class javaClass, String templateName, List templateArguments, List fields, List parameters, List functions) { super(schemaName, schemaType, javaType, javaClass, templateName, templateArguments); @@ -1161,9 +1160,9 @@ public static final class StructTypeInfo extends CompoundTypeInfoBase * @param parameters The sequence of type informations for parameters. * @param functions The sequence of type informations for functions. */ - public StructTypeInfo(String schemaName, Class javaClass, - String templateName, List templateArguments, - List fields, List parameters, List functions) + public StructTypeInfo(String schemaName, Class javaClass, String templateName, + List templateArguments, List fields, List parameters, + List functions) { super(schemaName, SchemaType.STRUCT, JavaType.STRUCT, javaClass, templateName, templateArguments, fields, parameters, functions); @@ -1186,9 +1185,9 @@ public static final class UnionTypeInfo extends CompoundTypeInfoBase * @param parameters The sequence of type informations for parameters. * @param functions The sequence of type informations for functions. */ - public UnionTypeInfo(String schemaName, Class javaClass, - String templateName, List templateArguments, - List fields, List parameters, List functions) + public UnionTypeInfo(String schemaName, Class javaClass, String templateName, + List templateArguments, List fields, List parameters, + List functions) { super(schemaName, SchemaType.UNION, JavaType.UNION, javaClass, templateName, templateArguments, fields, parameters, functions); @@ -1213,10 +1212,9 @@ public static final class ChoiceTypeInfo extends CompoundTypeInfoBase * @param selector The selector expression. * @param cases The sequence of type informations for cases. */ - public ChoiceTypeInfo(String schemaName, Class javaClass, - String templateName, List templateArguments, - List fields, List parameters, List functions, - String selector, List cases) + public ChoiceTypeInfo(String schemaName, Class javaClass, String templateName, + List templateArguments, List fields, List parameters, + List functions, String selector, List cases) { super(schemaName, SchemaType.CHOICE, JavaType.CHOICE, javaClass, templateName, templateArguments, fields, parameters, functions); @@ -1256,13 +1254,12 @@ public static abstract class TypeInfoWithUnderlyingTypeBase extends TypeInfoBase * @param underlyingType The reference to type information of underlying zserio type. * @param underlyingTypeArguments The underlying zserio type arguments. */ - public TypeInfoWithUnderlyingTypeBase(String schemaName, SchemaType schemaType, - JavaType javaType, Class javaClass, - TypeInfo underlyingType, List> underlyingTypeArguments) + public TypeInfoWithUnderlyingTypeBase(String schemaName, SchemaType schemaType, JavaType javaType, + Class javaClass, TypeInfo underlyingType, List> underlyingTypeArguments) { super(schemaName, schemaType, javaType, javaClass); - this.underlyingType= underlyingType; + this.underlyingType = underlyingType; this.underlyingTypeArguments = underlyingTypeArguments; } @@ -1299,8 +1296,8 @@ public static final class EnumTypeInfo extends TypeInfoWithUnderlyingTypeBase public EnumTypeInfo(String schemaName, Class javaClass, TypeInfo underlyingType, List> underlyingTypeArguments, List enumItems) { - super(schemaName, SchemaType.ENUM, JavaType.ENUM, javaClass, - underlyingType, underlyingTypeArguments); + super(schemaName, SchemaType.ENUM, JavaType.ENUM, javaClass, underlyingType, + underlyingTypeArguments); this.enumItems = enumItems; } @@ -1331,8 +1328,8 @@ public static final class BitmaskTypeInfo extends TypeInfoWithUnderlyingTypeBase public BitmaskTypeInfo(String schemaName, Class javaClass, TypeInfo underlyingType, List> underlyingTypeArguments, List bitmaskValues) { - super(schemaName, SchemaType.BITMASK, JavaType.BITMASK, javaClass, - underlyingType, underlyingTypeArguments); + super(schemaName, SchemaType.BITMASK, JavaType.BITMASK, javaClass, underlyingType, + underlyingTypeArguments); this.bitmaskValues = bitmaskValues; } @@ -1363,13 +1360,12 @@ public static final class SqlTableTypeInfo extends TemplatableTypeInfoBase * @param virtualTableUsing The SQL virtual table using specification. * @param isWithoutRowId True if SQL table is without row id table, otherwise false. */ - public SqlTableTypeInfo(String schemaName, Class javaClass, - String templateName, List templateArguments, - List columns, String sqlConstraint, String virtualTableUsing, - boolean isWithoutRowId) + public SqlTableTypeInfo(String schemaName, Class javaClass, String templateName, + List templateArguments, List columns, String sqlConstraint, + String virtualTableUsing, boolean isWithoutRowId) { - super(schemaName, SchemaType.SQL_TABLE, JavaType.SQL_TABLE, javaClass, - templateName, templateArguments); + super(schemaName, SchemaType.SQL_TABLE, JavaType.SQL_TABLE, javaClass, templateName, + templateArguments); this.columns = columns; this.sqlConstraint = sqlConstraint; @@ -1500,8 +1496,7 @@ public static final class RecursiveTypeInfo implements TypeInfo /** * Type info getter. */ - public static interface TypeInfoGetter - { + public static interface TypeInfoGetter { /** * Gets the type info. * diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationBitStreamReader.java b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationBitStreamReader.java index 269c94801..cbffcbb7d 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationBitStreamReader.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationBitStreamReader.java @@ -1,6 +1,7 @@ package zserio.runtime.validation; import java.io.IOException; + import zserio.runtime.io.ByteArrayBitStreamReader; /** @@ -56,8 +57,8 @@ public byte[] toMaskedByteArray() // mask | 0x7F | 0x3F | 0x1F | 0x0F | 0x07 | 0x03 | 0x01 | final int mask = (1 << (8 - endBitOffset)) - 1; final int invalidMask = invalidMaskBuffer[endBytePosition] | mask; - maskedByteArray[endBytePosition] = (byte)(getBuffer()[endBytePosition] & ~invalidMask | - nanMaskBuffer[endBytePosition]); + maskedByteArray[endBytePosition] = + (byte)(getBuffer()[endBytePosition] & ~invalidMask | nanMaskBuffer[endBytePosition]); } return maskedByteArray; @@ -91,8 +92,8 @@ public void setBitPosition(long bitPosition) throws IOException { modifyMaskBuffer(endBytePosition, endBitOffset, startBytePosition, startBitOffset, invalidMaskBufferEraser); - modifyMaskBuffer(endBytePosition, endBitOffset, startBytePosition, startBitOffset, - nanMaskBufferEraser); + modifyMaskBuffer( + endBytePosition, endBitOffset, startBytePosition, startBitOffset, nanMaskBufferEraser); } } } @@ -162,15 +163,15 @@ public void modifyBits(int bytePosition, int bitOffset, int numBits) // mask | 0x00 | 0x01 | 0x03 | 0x07 | 0x0F | 0x1F | 0x3F | 0x7F | 0xFF | final int mask = (1 << numBits) - 1; maskBuffer[bytePosition] |= mask << (8 - bitOffset - numBits); - } + } - @Override + @Override public void modifyByte(int bytePosition) - { - maskBuffer[bytePosition] = (byte)0xFF; - } + { + maskBuffer[bytePosition] = (byte)0xFF; + } - private final byte[] maskBuffer; + private final byte[] maskBuffer; } private static class MaskBufferEraser implements MaskBufferAction @@ -199,10 +200,10 @@ public void modifyByte(int bytePosition) private final byte[] maskBuffer; } - private final byte[] invalidMaskBuffer; - private final MaskBufferEraser invalidMaskBufferEraser; - private final MaskBufferSetter invalidMaskBufferSetter; + private final byte[] invalidMaskBuffer; + private final MaskBufferEraser invalidMaskBufferEraser; + private final MaskBufferSetter invalidMaskBufferSetter; - private final byte[] nanMaskBuffer; - private final MaskBufferEraser nanMaskBufferEraser; + private final byte[] nanMaskBuffer; + private final MaskBufferEraser nanMaskBufferEraser; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationError.java b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationError.java index 9ff958e3c..6165fe1dd 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationError.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationError.java @@ -52,7 +52,7 @@ public enum Type * Comparing of read blob from SQL table to parsed blob written in bit stream failed. */ BLOB_COMPARE_FAILED - }; + } /** * Constructs a new validation error without primary key values. @@ -76,8 +76,8 @@ public ValidationError(String tableName, String fieldName, Type type, String mes * @param type Validation error type. * @param message Validation error message. */ - public ValidationError(String tableName, String fieldName, List rowKeyValues, Type type, - String message) + public ValidationError( + String tableName, String fieldName, List rowKeyValues, Type type, String message) { this.tableName = tableName; this.fieldName = fieldName; @@ -96,8 +96,8 @@ public ValidationError(String tableName, String fieldName, List rowKeyVa * @param type Validation error type. * @param exception Exception which occured during validation. */ - public ValidationError(String tableName, String fieldName, List rowKeyValues, Type type, - Throwable exception) + public ValidationError( + String tableName, String fieldName, List rowKeyValues, Type type, Throwable exception) { this.tableName = tableName; this.fieldName = fieldName; @@ -168,10 +168,10 @@ public StackTraceElement[] getStackTrace() return Arrays.copyOf(stackTrace, stackTrace.length); } - private final String tableName; - private final String fieldName; - private final List rowKeyValues; - private final Type type; - private final String message; - private final StackTraceElement[] stackTrace; + private final String tableName; + private final String fieldName; + private final List rowKeyValues; + private final Type type; + private final String message; + private final StackTraceElement[] stackTrace; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationReport.java b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationReport.java index 292557a72..fa0aa2957 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationReport.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationReport.java @@ -119,9 +119,9 @@ public void add(ValidationReport other) errors.addAll(other.errors); } - private int numberOfValidatedTables; - private int numberOfValidatedRows; - private long totalValidationTime; - private long totalParameterProviderTime; - private List errors; + private int numberOfValidatedTables; + private int numberOfValidatedRows; + private long totalValidationTime; + private long totalParameterProviderTime; + private List errors; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationSqliteUtil.java b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationSqliteUtil.java index 7108d2521..1feeeedc2 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationSqliteUtil.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationSqliteUtil.java @@ -74,10 +74,10 @@ public boolean isPrimaryKey() return isPrimaryKey; } - private final String name; - private final String type; - private final boolean isNotNull; - private final boolean isPrimaryKey; + private final String name; + private final String type; + private final boolean isNotNull; + private final boolean isPrimaryKey; }; /** @@ -91,8 +91,8 @@ public boolean isPrimaryKey() * * @throws SQLException Throws in case of any SQLite error. */ - public static Map getTableSchema(Connection connection, String attachedDbName, - String tableName) throws SQLException + public static Map getTableSchema( + Connection connection, String attachedDbName, String tableName) throws SQLException { Map columnTypes = new HashMap(); @@ -108,10 +108,8 @@ public static Map getTableSchema(Connection connectio sqlQuery.append(")"); // get table info - try ( - final PreparedStatement statement = connection.prepareStatement(sqlQuery.toString()); - final ResultSet resultSet = statement.executeQuery(); - ) + try (final PreparedStatement statement = connection.prepareStatement(sqlQuery.toString()); + final ResultSet resultSet = statement.executeQuery();) { while (resultSet.next()) { @@ -137,8 +135,8 @@ public static Map getTableSchema(Connection connectio * * @return true if hidden column exists in given SQLite table. */ - public static boolean isHiddenColumnInTable(Connection connection, String attachedDbName, String tableName, - String hiddenColumnName) + public static boolean isHiddenColumnInTable( + Connection connection, String attachedDbName, String tableName, String hiddenColumnName) { // prepare SQL query final StringBuilder sqlQuery = new StringBuilder("SELECT "); diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationTimer.java b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationTimer.java index 657578195..e8f6bbefa 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationTimer.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/validation/ValidationTimer.java @@ -41,6 +41,6 @@ public long getDuration() return duration; } - private long startMilliseconds; - private long duration; + private long startMilliseconds; + private long duration; } diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/validation/package-info.java b/compiler/extensions/java/runtime/src/zserio/runtime/validation/package-info.java index abb6426e3..62b444728 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/validation/package-info.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/validation/package-info.java @@ -2,4 +2,3 @@ * This package contains classes needed for validation code generated by Zserio. */ package zserio.runtime.validation; - diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/walker/DefaultWalkObserver.java b/compiler/extensions/java/runtime/src/zserio/runtime/walker/DefaultWalkObserver.java index 53862a0c2..b3ab4fb3e 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/walker/DefaultWalkObserver.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/walker/DefaultWalkObserver.java @@ -9,36 +9,29 @@ public final class DefaultWalkObserver implements WalkObserver { @Override public void beginRoot(Object compound) - { - } + {} @Override public void endRoot(Object compound) - { - } + {} @Override public void beginArray(Object array, FieldInfo fieldInfo) - { - } + {} @Override public void endArray(Object array, FieldInfo fieldInfo) - { - } + {} @Override public void beginCompound(Object compound, FieldInfo fieldInfo, int elementIndex) - { - } + {} @Override public void endCompound(Object compound, FieldInfo fieldInfo, int elementIndex) - { - } + {} @Override public void visitValue(Object value, FieldInfo fieldInfo, int elementIndex) - { - } + {} }; diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/walker/RegexWalkFilter.java b/compiler/extensions/java/runtime/src/zserio/runtime/walker/RegexWalkFilter.java index b441f546d..c26f4f7c7 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/walker/RegexWalkFilter.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/walker/RegexWalkFilter.java @@ -139,7 +139,7 @@ private static void popPathImpl(Stack currentPath, FieldInfo fieldInfo, if (elementIndex == WalkerConst.NOT_ELEMENT) currentPath.pop(); else - currentPath.set(currentPath.size() -1, fieldInfo.getSchemaName()); + currentPath.set(currentPath.size() - 1, fieldInfo.getSchemaName()); } /** diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkFilter.java b/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkFilter.java index 2f38b4e28..6c79ebc6e 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkFilter.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkFilter.java @@ -72,4 +72,4 @@ public interface WalkFilter * @return True when the walking should continue to a next sibling, false to return to the parent. */ public boolean afterValue(Object value, FieldInfo fieldInfo, int elementIndex); -}; +} diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkObserver.java b/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkObserver.java index acf2f5372..28e08a04e 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkObserver.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/walker/WalkObserver.java @@ -65,4 +65,4 @@ public interface WalkObserver * @param elementIndex Element index in array or NOT_ELEMENT if the compound is not in array. */ public void visitValue(Object value, FieldInfo fieldInfo, int elementIndex); -}; +} diff --git a/compiler/extensions/java/runtime/src/zserio/runtime/walker/Walker.java b/compiler/extensions/java/runtime/src/zserio/runtime/walker/Walker.java index 861fe6b28..34ccb1930 100644 --- a/compiler/extensions/java/runtime/src/zserio/runtime/walker/Walker.java +++ b/compiler/extensions/java/runtime/src/zserio/runtime/walker/Walker.java @@ -48,8 +48,8 @@ public void walk(Object zserioObject) final TypeInfo typeInfo = callTypeInfoMethod(zserioObject); if (!TypeInfoUtil.isCompound(typeInfo.getSchemaType())) { - throw new ZserioError("Walker: Root object '" + typeInfo.getSchemaName() + - "' is not a compound type!"); + throw new ZserioError( + "Walker: Root object '" + typeInfo.getSchemaName() + "' is not a compound type!"); } walkObserver.beginRoot(zserioObject); @@ -161,7 +161,7 @@ private boolean walkField(Object field, FieldInfo fieldInfo) walkObserver.beginArray(field, fieldInfo); final int length = Array.getLength(field); - for (int i = 0; i < length; i ++) + for (int i = 0; i < length; i++) { final Object element = Array.get(field, i); if (!walkFieldValue(element, fieldInfo, i)) diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/BitPositionUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/BitPositionUtilTest.java index 7f392ec17..1e334b282 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/BitPositionUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/BitPositionUtilTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; public class BitPositionUtilTest diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/BitSizeOfCalculatorTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/BitSizeOfCalculatorTest.java index f2b4314d8..6651c9769 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/BitSizeOfCalculatorTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/BitSizeOfCalculatorTest.java @@ -2,10 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; import java.math.BigInteger; +import org.junit.jupiter.api.Test; + import zserio.runtime.io.BitBuffer; public class BitSizeOfCalculatorTest @@ -18,7 +19,7 @@ public void getBitSizeOfVarInt16() assertEquals(16, BitSizeOfCalculator.getBitSizeOfVarInt16((short)-16383)); assertEquals(16, BitSizeOfCalculator.getBitSizeOfVarInt16((short)16383)); - assertThrows(ZserioError.class, () -> BitSizeOfCalculator.getBitSizeOfVarInt16((short) (1 << (6 + 8)))); + assertThrows(ZserioError.class, () -> BitSizeOfCalculator.getBitSizeOfVarInt16((short)(1 << (6 + 8)))); } @Test @@ -136,32 +137,32 @@ public void getBitSizeOfVarInt() public void getBitSizeOfVarUInt() { assertEquals(8, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ZERO)); - assertEquals(8, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(7).subtract(BigInteger.ONE))); + assertEquals(8, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(7).subtract(BigInteger.ONE))); assertEquals(16, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(7))); - assertEquals(16, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(14).subtract(BigInteger.ONE))); + assertEquals(16, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(14).subtract(BigInteger.ONE))); assertEquals(24, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(14))); - assertEquals(24, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(21).subtract(BigInteger.ONE))); + assertEquals(24, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(21).subtract(BigInteger.ONE))); assertEquals(32, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(21))); - assertEquals(32, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(28).subtract(BigInteger.ONE))); + assertEquals(32, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(28).subtract(BigInteger.ONE))); assertEquals(40, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(28))); - assertEquals(40, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(35).subtract(BigInteger.ONE))); + assertEquals(40, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(35).subtract(BigInteger.ONE))); assertEquals(48, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(35))); - assertEquals(48, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(42).subtract(BigInteger.ONE))); + assertEquals(48, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(42).subtract(BigInteger.ONE))); assertEquals(56, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(42))); - assertEquals(56, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(49).subtract(BigInteger.ONE))); + assertEquals(56, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(49).subtract(BigInteger.ONE))); assertEquals(64, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(49))); - assertEquals(64, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(56).subtract(BigInteger.ONE))); + assertEquals(64, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(56).subtract(BigInteger.ONE))); assertEquals(72, BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(56))); - assertEquals(72, BitSizeOfCalculator.getBitSizeOfVarUInt( - BigInteger.ONE.shiftLeft(64).subtract(BigInteger.ONE))); + assertEquals(72, + BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(64).subtract(BigInteger.ONE))); } @Test @@ -173,8 +174,8 @@ public void getBitSizeOfVarUIntNegative() @Test public void getBitSizeOfVarUIntTooBig() { - assertThrows(ZserioError.class, - () -> BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(64))); + assertThrows( + ZserioError.class, () -> BitSizeOfCalculator.getBitSizeOfVarUInt(BigInteger.ONE.shiftLeft(64))); } @Test @@ -224,16 +225,16 @@ public void getBitSizeOfString() @Test public void getBitSizeOfBitBuffer() { - final BitBuffer testBitBuffer1 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0x03}, 8); + final BitBuffer testBitBuffer1 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0x03}, 8); assertEquals(8 + 8, BitSizeOfCalculator.getBitSizeOfBitBuffer(testBitBuffer1)); - final BitBuffer testBitBuffer2 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0x03}, 11); + final BitBuffer testBitBuffer2 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0x03}, 11); assertEquals(8 + 11, BitSizeOfCalculator.getBitSizeOfBitBuffer(testBitBuffer2)); - final BitBuffer testBitBuffer3 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xCD}, 16); + final BitBuffer testBitBuffer3 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xCD}, 16); assertEquals(8 + 16, BitSizeOfCalculator.getBitSizeOfBitBuffer(testBitBuffer3)); - final BitBuffer testBitBuffer4 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xCD}); + final BitBuffer testBitBuffer4 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xCD}); assertEquals(8 + 16, BitSizeOfCalculator.getBitSizeOfBitBuffer(testBitBuffer4)); final BitBuffer testBitBuffer5 = new BitBuffer(new byte[16], 127); diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/BuiltInOperatorsTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/BuiltInOperatorsTest.java index 7e59b39c7..a6603db48 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/BuiltInOperatorsTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/BuiltInOperatorsTest.java @@ -1,12 +1,13 @@ package zserio.runtime; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.math.BigInteger; +import org.junit.jupiter.api.Test; + public class BuiltInOperatorsTest { private static class DummyBitmask implements ZserioBitmask @@ -44,8 +45,8 @@ public void isSet() assertTrue(BuiltInOperators.isSet(DummyBitmask.Values.CREATE, DummyBitmask.Values.READ)); assertTrue(BuiltInOperators.isSet(DummyBitmask.Values.CREATE, DummyBitmask.Values.WRITE)); assertTrue(BuiltInOperators.isSet(DummyBitmask.Values.CREATE, DummyBitmask.Values.CREATE)); - assertTrue(BuiltInOperators.isSet(DummyBitmask.Values.CREATE, - DummyBitmask.Values.READ.or(DummyBitmask.Values.WRITE))); + assertTrue(BuiltInOperators.isSet( + DummyBitmask.Values.CREATE, DummyBitmask.Values.READ.or(DummyBitmask.Values.WRITE))); assertFalse(BuiltInOperators.isSet(DummyBitmask.Values.READ, DummyBitmask.Values.WRITE)); assertFalse(BuiltInOperators.isSet(DummyBitmask.Values.READ, DummyBitmask.Values.CREATE)); } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/DebugStringUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/DebugStringUtilTest.java index 56b3c60c1..96219f8c4 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/DebugStringUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/DebugStringUtilTest.java @@ -146,8 +146,8 @@ public void fromJsonStreamTypeInfo() public void fromJsonStreamTypeInfoArguments() { final Reader reader = new StringReader("{\"text\": \"something\"}"); - final Object zserioObject = DebugStringUtil.fromJsonStream(ParameterizedDummyObject.typeInfo(), - reader, 10); + final Object zserioObject = + DebugStringUtil.fromJsonStream(ParameterizedDummyObject.typeInfo(), reader, 10); assertTrue(zserioObject != null); assertEquals(10, ((ParameterizedDummyObject)zserioObject).getParam()); assertEquals("something", ((ParameterizedDummyObject)zserioObject).getText()); @@ -185,8 +185,8 @@ public void fromJsonStringTypeInfo() public void fromJsonStringTypeInfoArguments() { final String jsonString = "{\"text\": \"something\"}"; - final Object zserioObject = DebugStringUtil.fromJsonString(ParameterizedDummyObject.typeInfo(), - jsonString, 10); + final Object zserioObject = + DebugStringUtil.fromJsonString(ParameterizedDummyObject.typeInfo(), jsonString, 10); assertTrue(zserioObject != null); assertEquals(10, ((ParameterizedDummyObject)zserioObject).getParam()); assertEquals("something", ((ParameterizedDummyObject)zserioObject).getText()); @@ -205,8 +205,8 @@ public void fromJsonStringClass() public void fromJsonStringClassArguments() { final String jsonString = "{\"text\": \"something\"}"; - final Object zserioObject = DebugStringUtil.fromJsonString(ParameterizedDummyObject.class, - jsonString, 10); + final Object zserioObject = + DebugStringUtil.fromJsonString(ParameterizedDummyObject.class, jsonString, 10); assertTrue(zserioObject != null); assertEquals(10, ((ParameterizedDummyObject)zserioObject).getParam()); assertEquals("something", ((ParameterizedDummyObject)zserioObject).getText()); @@ -231,8 +231,8 @@ public void fromJsonFileTypeInfoArguments() throws IOException content.add("{\"text\": \"something\"}"); Files.write(Paths.get(TEST_FILE_NAME), content, Charset.forName("UTF-8")); - final Object zserioObject = DebugStringUtil.fromJsonFile(ParameterizedDummyObject.typeInfo(), - TEST_FILE_NAME, 10); + final Object zserioObject = + DebugStringUtil.fromJsonFile(ParameterizedDummyObject.typeInfo(), TEST_FILE_NAME, 10); assertTrue(zserioObject != null); assertEquals(10, ((ParameterizedDummyObject)zserioObject).getParam()); assertEquals("something", ((ParameterizedDummyObject)zserioObject).getText()); @@ -257,8 +257,8 @@ public void fromJsonFileClassArguments() throws IOException content.add("{\"text\": \"something\"}"); Files.write(Paths.get(TEST_FILE_NAME), content, Charset.forName("UTF-8")); - final Object zserioObject = DebugStringUtil.fromJsonFile(ParameterizedDummyObject.class, - TEST_FILE_NAME, 10); + final Object zserioObject = + DebugStringUtil.fromJsonFile(ParameterizedDummyObject.class, TEST_FILE_NAME, 10); assertTrue(zserioObject != null); assertEquals(10, ((ParameterizedDummyObject)zserioObject).getParam()); assertEquals("something", ((ParameterizedDummyObject)zserioObject).getText()); @@ -272,8 +272,7 @@ private void assertJsonEquals(String expectedJson, String providedJson) private static final String TEST_FILE_NAME = "DebugStringTest.json"; private static final FieldInfo TEXT_FIELD_INFO = new FieldInfo( - "text", "getText", "setText", - BuiltinTypeInfo.getString(), + "text", "getText", "setText", BuiltinTypeInfo.getString(), new java.util.ArrayList>(), // typeArguments false, // isExtended null, // alignment @@ -290,16 +289,14 @@ private void assertJsonEquals(String expectedJson, String providedJson) false // isImplicit ); - private static final TypeInfo DUMMY_OBJECT_TYPE_INFO = new StructTypeInfo( - "DummyObject", DummyObject.class, "", new ArrayList(), - Arrays.asList(TEXT_FIELD_INFO), new ArrayList(), new ArrayList() - ); + private static final TypeInfo DUMMY_OBJECT_TYPE_INFO = new StructTypeInfo("DummyObject", DummyObject.class, + "", new ArrayList(), Arrays.asList(TEXT_FIELD_INFO), new ArrayList(), + new ArrayList()); public static class DummyObject { public DummyObject() - { - } + {} public DummyObject(String text) { @@ -324,14 +321,12 @@ public void setText(String text) private String text; } - private static final ParameterInfo PARAM_INFO = new ParameterInfo( - "param", // schemaName - TypeInfo.BuiltinTypeInfo.getUInt16() // typeInfo + private static final ParameterInfo PARAM_INFO = new ParameterInfo("param", // schemaName + TypeInfo.BuiltinTypeInfo.getUInt16() // typeInfo ); private static final TypeInfo PARAMETERIZED_DUMMY_OBJECT_TYPE_INFO = new StructTypeInfo( "ParameterizedDummyObject", ParameterizedDummyObject.class, "", new ArrayList(), - Arrays.asList(TEXT_FIELD_INFO), Arrays.asList(PARAM_INFO), new ArrayList() - ); + Arrays.asList(TEXT_FIELD_INFO), Arrays.asList(PARAM_INFO), new ArrayList()); public static class ParameterizedDummyObject { diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/FloatUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/FloatUtilTest.java index 78ff3a435..fa42bc4d9 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/FloatUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/FloatUtilTest.java @@ -1,6 +1,7 @@ package zserio.runtime; import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; public class FloatUtilTest @@ -9,57 +10,57 @@ public class FloatUtilTest public void convertShortToFloat() { // plus zero - final short float16ValuePlusZero = createFloat16Value((short) 0, (short) 0, (short) 0); // +0.0 + final short float16ValuePlusZero = createFloat16Value((short)0, (short)0, (short)0); // +0.0 checkFloat16ToFloat32Conversion(float16ValuePlusZero, 0.0f); // minus zero - final short float16ValueMinusZero = createFloat16Value((short) 1, (short) 0, (short) 0); // -0.0 + final short float16ValueMinusZero = createFloat16Value((short)1, (short)0, (short)0); // -0.0 checkFloat16ToFloat32Conversion(float16ValueMinusZero, -0.0f); // plus infinity - final short float16ValuePlusInfinity = createFloat16Value((short) 0, (short) 0x1F, (short) 0); // +INF + final short float16ValuePlusInfinity = createFloat16Value((short)0, (short)0x1F, (short)0); // +INF final int float32ValuePlusInfinity = createFloat32Value(0, 0xFF, 0); // +INF checkFloat16ToFloat32Conversion(float16ValuePlusInfinity, float32ValuePlusInfinity); // minus infinity - final short float16ValueMinusInfinity = createFloat16Value((short) 1, (short) 0x1F, (short) 0); // -INF + final short float16ValueMinusInfinity = createFloat16Value((short)1, (short)0x1F, (short)0); // -INF final int float32ValueMinusInfinity = createFloat32Value(1, 0xFF, 0); // -INF checkFloat16ToFloat32Conversion(float16ValueMinusInfinity, float32ValueMinusInfinity); // quiet NaN (Java uses only the 1st significand bit in NaN) - final short float16ValueQuietNan = createFloat16Value((short) 0, (short) 0x1F, (short) 0x3FF); // +NaN + final short float16ValueQuietNan = createFloat16Value((short)0, (short)0x1F, (short)0x3FF); // +NaN final int float32ValueQuietNan = createFloat32Value(0, 0xFF, 0x400000); // +NaN checkFloat16ToFloat32Conversion(float16ValueQuietNan, float32ValueQuietNan); // signaling NaN (Java uses only quiet NaN) - // -NaN - final short float16ValueSignalingNan = createFloat16Value((short) 1, (short) 0x1F, (short) 0x3FF); + // -NaN + final short float16ValueSignalingNan = createFloat16Value((short)1, (short)0x1F, (short)0x3FF); checkFloat16ToFloat32Conversion(float16ValueSignalingNan, float32ValueQuietNan); // normal numbers - final short float16ValueOne = createFloat16Value((short) 0, (short) 15, (short) 0); // 1.0 + final short float16ValueOne = createFloat16Value((short)0, (short)15, (short)0); // 1.0 checkFloat16ToFloat32Conversion(float16ValueOne, 1.0f); - // 1.0 + 2^-10 - final short float16ValueOnePlus = createFloat16Value((short) 0, (short) 15, (short) 0x01); - // 1.0 + 2^-10 + // 1.0 + 2^-10 + final short float16ValueOnePlus = createFloat16Value((short)0, (short)15, (short)0x01); + // 1.0 + 2^-10 final int float32ValueOnePlus = createFloat32Value(0, 127, 0x2000); checkFloat16ToFloat32Conversion(float16ValueOnePlus, float32ValueOnePlus); - // 2^15 (1 + 2^-1 + ... + 2^-10) - final short float16ValueMax = createFloat16Value((short) 0, (short) 30, (short) 0x3FF); + // 2^15 (1 + 2^-1 + ... + 2^-10) + final short float16ValueMax = createFloat16Value((short)0, (short)30, (short)0x3FF); checkFloat16ToFloat32Conversion(float16ValueMax, 65504.0f); // subnormal numbers - // 2^-14 (2^-10) - final short float16ValueMinSubnormal = createFloat16Value((short) 0, (short) 0, (short) 1); - // 2^-24 + // 2^-14 (2^-10) + final short float16ValueMinSubnormal = createFloat16Value((short)0, (short)0, (short)1); + // 2^-24 final int float32ValueMinSubnormal = createFloat32Value(0, 103, 0); checkFloat16ToFloat32Conversion(float16ValueMinSubnormal, float32ValueMinSubnormal); - // 2^-14 (2^-1 + ... + 2^-10) - final short float16ValueMaxSubnormal = createFloat16Value((short) 0, (short) 0, (short) 0x3FF); - // 2^-15 (1 + 2^-1 + ... + 2^-9) + // 2^-14 (2^-1 + ... + 2^-10) + final short float16ValueMaxSubnormal = createFloat16Value((short)0, (short)0, (short)0x3FF); + // 2^-15 (1 + 2^-1 + ... + 2^-9) final int float32ValueMaxSubnormal = createFloat32Value(0, 112, 0x7FC000); checkFloat16ToFloat32Conversion(float16ValueMaxSubnormal, float32ValueMaxSubnormal); } @@ -68,26 +69,26 @@ public void convertShortToFloat() public void convertFloatToShort() { // plus zero - final short float16ValuePlusZero = createFloat16Value((short) 0, (short) 0, (short) 0); // +0.0 + final short float16ValuePlusZero = createFloat16Value((short)0, (short)0, (short)0); // +0.0 checkFloat32ToFloat16Conversion(0.0f, float16ValuePlusZero); // minus zero - final short float16ValueMinusZero = createFloat16Value((short) 1, (short) 0, (short) 0); // -0.0 + final short float16ValueMinusZero = createFloat16Value((short)1, (short)0, (short)0); // -0.0 checkFloat32ToFloat16Conversion(-0.0f, float16ValueMinusZero); // plus infinity final int float32ValuePlusInfinity = createFloat32Value(0, 0xFF, 0); // +INF - final short float16ValuePlusInfinity = createFloat16Value((short) 0, (short) 0x1F, (short) 0); // +INF + final short float16ValuePlusInfinity = createFloat16Value((short)0, (short)0x1F, (short)0); // +INF checkFloat32ToFloat16Conversion(float32ValuePlusInfinity, float16ValuePlusInfinity); // minus infinity final int float32ValueMinusInfinity = createFloat32Value(1, 0xFF, 0); // -INF - final short float16ValueMinusInfinity = createFloat16Value((short) 1, (short) 0x1F, (short) 0); // -INF + final short float16ValueMinusInfinity = createFloat16Value((short)1, (short)0x1F, (short)0); // -INF checkFloat32ToFloat16Conversion(float32ValueMinusInfinity, float16ValueMinusInfinity); // quiet NaN (Java uses only the 1st significand bit in NaN) final int float32ValueQuietNan = createFloat32Value(0, 0xFF, 0x7FE000); // +NaN - final short float16ValueQuietNan = createFloat16Value((short) 0, (short) 0x1F, (short) 0x200); // +NaN + final short float16ValueQuietNan = createFloat16Value((short)0, (short)0x1F, (short)0x200); // +NaN checkFloat32ToFloat16Conversion(float32ValueQuietNan, float16ValueQuietNan); // signaling NaN (Java uses only quiet NaN) @@ -95,14 +96,15 @@ public void convertFloatToShort() checkFloat32ToFloat16Conversion(float32ValueSignalingNan, float16ValueQuietNan); // normal numbers - final short float16ValueOne = createFloat16Value((short) 0, (short) 15, (short) 0); // 1.0 + final short float16ValueOne = createFloat16Value((short)0, (short)15, (short)0); // 1.0 checkFloat32ToFloat16Conversion(1.0f, float16ValueOne); final int float32ValueOnePlus = createFloat32Value(0, 127, 0x2000); // 1.0 + 2^-10 - final short float16ValueOnePlus = createFloat16Value((short) 0, (short) 15, (short) 0x01); // 1.0 + 2^-10 + final short float16ValueOnePlus = createFloat16Value((short)0, (short)15, (short)0x01); // 1.0 + 2^-10 checkFloat32ToFloat16Conversion(float32ValueOnePlus, float16ValueOnePlus); - final short float16ValueMax = createFloat16Value((short) 0, (short) 30, (short) 0x3FF); // 2^15 (1 + 2^-1 + ... + 2^-10) + final short float16ValueMax = + createFloat16Value((short)0, (short)30, (short)0x3FF); // 2^15 (1 + 2^-1 + ... + 2^-10) checkFloat32ToFloat16Conversion(65504.0f, float16ValueMax); // normal numbers converted to zero @@ -110,13 +112,14 @@ public void convertFloatToShort() checkFloat32ToFloat16Conversion(float32ValueUnderflow, float16ValuePlusZero); // normal numbers converted to subnormal numbers - final int float32ValueMinUnderflow = createFloat32Value(0, 103, 1); // 2^-24 (1 + 2^-23) - final short float16ValueMinSubnormal = createFloat16Value((short) 0, (short) 0, (short) 1); // 2^-24 + final int float32ValueMinUnderflow = createFloat32Value(0, 103, 1); // 2^-24 (1 + 2^-23) + final short float16ValueMinSubnormal = createFloat16Value((short)0, (short)0, (short)1); // 2^-24 checkFloat32ToFloat16Conversion(float32ValueMinUnderflow, float16ValueMinSubnormal); // normal numbers converted to subnormal numbers with rounding final int float32ValueMinUnderflowRounding = createFloat32Value(0, 104, 0x200000); // 2^-23 (1 + 2^-2) - final short float16ValueMinSubnormalRounding = createFloat16Value((short) 0, (short) 0, (short) 0x3); // 2^-14 (2^-9 + 2^-10) + final short float16ValueMinSubnormalRounding = + createFloat16Value((short)0, (short)0, (short)0x3); // 2^-14 (2^-9 + 2^-10) checkFloat32ToFloat16Conversion(float32ValueMinUnderflowRounding, float16ValueMinSubnormalRounding); // normal numbers converted to infinity @@ -125,14 +128,15 @@ public void convertFloatToShort() // normal numbers converted with rounding final int float32ValueRounding = createFloat32Value(0, 127, 0x401000); // 1 + 2^-1 + 2^-11 - final short float16ValueRounding = createFloat16Value((short) 0, (short) 15, (short) 0x201); // 1 + 2^-1 + 2^-10 + final short float16ValueRounding = + createFloat16Value((short)0, (short)15, (short)0x201); // 1 + 2^-1 + 2^-10 checkFloat32ToFloat16Conversion(float32ValueRounding, float16ValueRounding); // subnormal numbers final int float32ValueMinSubnormal = createFloat32Value(0, 0, 1); // 2^-126 (2^-23) checkFloat32ToFloat16Conversion(float32ValueMinSubnormal, float16ValuePlusZero); - // 2^-126 (2^-1 + ... + 2^-23) + // 2^-126 (2^-1 + ... + 2^-23) final int float32ValueMaxSubnormal = createFloat32Value(0, 0, 0x007FFFFF); checkFloat32ToFloat16Conversion(float32ValueMaxSubnormal, float16ValuePlusZero); } @@ -142,8 +146,8 @@ public void convertIntToFloat() { for (TestFloat32Element testElement : TEST_FLOAT32_DATA) { - final int float32Value = createFloat32Value(testElement.sign, testElement.exponent, - testElement.significand); + final int float32Value = + createFloat32Value(testElement.sign, testElement.exponent, testElement.significand); final float convertedFloat = FloatUtil.convertIntToFloat(float32Value); assertEquals(Float.toString(testElement.expectedFloat), Float.toString(convertedFloat)); @@ -156,8 +160,8 @@ public void convertFloatToInt() for (TestFloat32Element testElement : TEST_FLOAT32_DATA) { final int convertedFloatValue = FloatUtil.convertFloatToInt(testElement.expectedFloat); - final int expectedFloatValue = createFloat32Value(testElement.sign, testElement.exponent, - testElement.significand); + final int expectedFloatValue = + createFloat32Value(testElement.sign, testElement.exponent, testElement.significand); assertEquals(expectedFloatValue, convertedFloatValue); } @@ -168,8 +172,8 @@ public void convertLongToDouble() { for (TestFloat64Element testElement : TEST_FLOAT64_DATA) { - final long float64Value = createFloat64Value(testElement.sign, testElement.exponent, - testElement.significand); + final long float64Value = + createFloat64Value(testElement.sign, testElement.exponent, testElement.significand); final double convertedDouble = FloatUtil.convertLongToDouble(float64Value); assertEquals(Double.toString(testElement.expectedDouble), Double.toString(convertedDouble)); @@ -182,8 +186,8 @@ public void convertDoubleToLong() for (TestFloat64Element testElement : TEST_FLOAT64_DATA) { final long convertedDoubleValue = FloatUtil.convertDoubleToLong(testElement.expectedDouble); - final long expectedDoubleValue = createFloat64Value(testElement.sign, testElement.exponent, - testElement.significand); + final long expectedDoubleValue = + createFloat64Value(testElement.sign, testElement.exponent, testElement.significand); assertEquals(expectedDoubleValue, convertedDoubleValue); } @@ -191,7 +195,7 @@ public void convertDoubleToLong() private static short createFloat16Value(short sign, short exponent, short significand) { - return (short) ((sign << FLOAT16_SIGN_BIT_POSITION) | (exponent << FLOAT16_EXPONENT_BIT_POSITION) | + return (short)((sign << FLOAT16_SIGN_BIT_POSITION) | (exponent << FLOAT16_EXPONENT_BIT_POSITION) | significand); } @@ -215,8 +219,8 @@ private static void checkFloat16ToFloat32Conversion(short float16Value, int expe private static void checkFloat16ToFloat32Conversion(short float16Value, float expectedFloat32) { - assertEquals(Float.toString(expectedFloat32), - Float.toString(FloatUtil.convertShortToFloat(float16Value))); + assertEquals( + Float.toString(expectedFloat32), Float.toString(FloatUtil.convertShortToFloat(float16Value))); } private static void checkFloat32ToFloat16Conversion(int float32Value, short expectedFloat16Value) @@ -240,10 +244,10 @@ public TestFloat32Element(int sign, int exponent, int significand, float expecte this.expectedFloat = expectedFloat; } - public int sign; - public int exponent; - public int significand; - public float expectedFloat; + public int sign; + public int exponent; + public int significand; + public float expectedFloat; }; private static class TestFloat64Element @@ -256,34 +260,40 @@ public TestFloat64Element(long sign, long exponent, long significand, double exp this.expectedDouble = expectedDouble; } - public long sign; - public long exponent; - public long significand; - public double expectedDouble; + public long sign; + public long exponent; + public long significand; + public double expectedDouble; }; - private static final TestFloat32Element TEST_FLOAT32_DATA[] = - { - new TestFloat32Element(0, 0, 0, 0.0f), - new TestFloat32Element(1, 0, 0, -0.0f), - new TestFloat32Element(0, 127, 0, +1.0f), - new TestFloat32Element(1, 127, 0, -1.0f), - new TestFloat32Element(0, 128, 0x600000, 3.5f), // 2^1 (1 + 2^-1 + 2^-2) - new TestFloat32Element(0, 126, 0x600000, 0.875f), // 2^-1 (1 + 2^-1 + 2^-2) - new TestFloat32Element(0, 130, 0x1E0000, 9.875f), // 2^3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) - new TestFloat32Element(0, 126, 0x1E0000, 0.6171875f) // 2^-3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) + private static final TestFloat32Element TEST_FLOAT32_DATA[] = { + new TestFloat32Element(0, 0, 0, 0.0f), + new TestFloat32Element(1, 0, 0, -0.0f), + new TestFloat32Element(0, 127, 0, +1.0f), + new TestFloat32Element(1, 127, 0, -1.0f), + // 2^1 (1 + 2^-1 + 2^-2) + new TestFloat32Element(0, 128, 0x600000, 3.5f), + // 2^-1 (1 + 2^-1 + 2^-2) + new TestFloat32Element(0, 126, 0x600000, 0.875f), + // 2^3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) + new TestFloat32Element(0, 130, 0x1E0000, 9.875f), + // 2^-3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) + new TestFloat32Element(0, 126, 0x1E0000, 0.6171875f), }; - private static final TestFloat64Element TEST_FLOAT64_DATA[] = - { - new TestFloat64Element(0, 0, 0, 0.0), - new TestFloat64Element(1, 0, 0, -0.0), - new TestFloat64Element(0, 1023, 0, +1.0f), - new TestFloat64Element(1, 1023, 0, -1.0f), - new TestFloat64Element(0, 1024, 0xC000000000000L, 3.5f), // 2^1 (1 + 2^-1 + 2^-2) - new TestFloat64Element(0, 1022, 0xC000000000000L, 0.875f), // 2^-1 (1 + 2^-1 + 2^-2) - new TestFloat64Element(0, 1026, 0x3C00000000000L, 9.875f), // 2^3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) - new TestFloat64Element(0, 1022, 0x3C00000000000L, 0.6171875f) // 2^-3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) + private static final TestFloat64Element TEST_FLOAT64_DATA[] = { + new TestFloat64Element(0, 0, 0, 0.0), + new TestFloat64Element(1, 0, 0, -0.0), + new TestFloat64Element(0, 1023, 0, +1.0f), + new TestFloat64Element(1, 1023, 0, -1.0f), + // 2^1 (1 + 2^-1 + 2^-2) + new TestFloat64Element(0, 1024, 0xC000000000000L, 3.5f), + // 2^-1 (1 + 2^-1 + 2^-2) + new TestFloat64Element(0, 1022, 0xC000000000000L, 0.875f), + // 2^3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) + new TestFloat64Element(0, 1026, 0x3C00000000000L, 9.875f), + // 2^-3 (1 + 2^-3 + 2^-4 + 2^-5 + 2^-6) + new TestFloat64Element(0, 1022, 0x3C00000000000L, 0.6171875f), }; private static final short FLOAT16_SIGN_BIT_POSITION = 15; diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/HashCodeUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/HashCodeUtilTest.java index f0d13a593..5dbb8a86b 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/HashCodeUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/HashCodeUtilTest.java @@ -1,15 +1,16 @@ package zserio.runtime; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; import java.math.BigInteger; -import zserio.runtime.io.BitBuffer; +import org.junit.jupiter.api.Test; + import zserio.runtime.array.Array; import zserio.runtime.array.ArrayTraits; import zserio.runtime.array.ArrayType; import zserio.runtime.array.RawArray; +import zserio.runtime.io.BitBuffer; public class HashCodeUtilTest { @@ -66,8 +67,8 @@ public void simpleType() final double doubleValue = 10.0; final long doubleValueAsLong = FloatUtil.convertDoubleToLong(doubleValue); - final int expectedDoubleHashCode = HashCodeUtil.HASH_PRIME_NUMBER + - (int)(doubleValueAsLong ^ (doubleValueAsLong >>> 32)); + final int expectedDoubleHashCode = + HashCodeUtil.HASH_PRIME_NUMBER + (int)(doubleValueAsLong ^ (doubleValueAsLong >>> 32)); assertEquals(expectedDoubleHashCode, HashCodeUtil.calcHashCode(hashSeed, doubleValue)); final Double doubleValueBoxed = Double.valueOf(10.0); @@ -80,8 +81,8 @@ public void stringType() { final int hashSeed = 1; final String stringValue = String.valueOf('0'); - assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + (int)'0', - HashCodeUtil.calcHashCode(hashSeed, stringValue)); + assertEquals( + HashCodeUtil.HASH_PRIME_NUMBER + (int)'0', HashCodeUtil.calcHashCode(hashSeed, stringValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (String)null)); } @@ -102,16 +103,16 @@ public void enumType() { final int hashSeed = 1; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.NONE.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.NONE.getValue()), HashCodeUtil.calcHashCode(hashSeed, Color.NONE)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.RED.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.RED.getValue()), HashCodeUtil.calcHashCode(hashSeed, Color.RED)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.BLUE.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.BLUE.getValue()), HashCodeUtil.calcHashCode(hashSeed, Color.BLUE)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.BLACK.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.BLACK.getValue()), HashCodeUtil.calcHashCode(hashSeed, Color.BLACK)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (Color)null)); @@ -122,14 +123,16 @@ public void bitmaskType() { final int hashSeed = 1; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Permissions.Values.READ.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + + Permissions.Values.READ.getValue()), HashCodeUtil.calcHashCode(hashSeed, Permissions.Values.READ)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Permissions.Values.WRITE.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + + Permissions.Values.WRITE.getValue()), HashCodeUtil.calcHashCode(hashSeed, Permissions.Values.WRITE)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + - Permissions.Values.CREATE.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + + Permissions.Values.CREATE.getValue()), HashCodeUtil.calcHashCode(hashSeed, Permissions.Values.CREATE)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (Permissions)null)); @@ -149,12 +152,11 @@ public void objectType() public void arrayType() { final int hashSeed = 1; - final Array arrayValue = new Array( - new RawArray.IntRawArray(new int[] { 3, 7}), - new ArrayTraits.SignedBitFieldIntArrayTraits(32), - ArrayType.NORMAL); - final int rawArrayHashCode = (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + 3) * - HashCodeUtil.HASH_PRIME_NUMBER + 7; + final Array arrayValue = new Array(new RawArray.IntRawArray(new int[] {3, 7}), + new ArrayTraits.SignedBitFieldIntArrayTraits(32), ArrayType.NORMAL); + final int rawArrayHashCode = + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + 3) * HashCodeUtil.HASH_PRIME_NUMBER + + 7; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + rawArrayHashCode, HashCodeUtil.calcHashCode(hashSeed, arrayValue)); @@ -166,40 +168,40 @@ public void simpleArrayType() { final int hashSeed = 1; - final int expectedBooleanHashCode = (HashCodeUtil.HASH_PRIME_NUMBER + 0) * - HashCodeUtil.HASH_PRIME_NUMBER + 1; - final boolean[] boolArrayValue = new boolean[] { false, true }; + final int expectedBooleanHashCode = + (HashCodeUtil.HASH_PRIME_NUMBER + 0) * HashCodeUtil.HASH_PRIME_NUMBER + 1; + final boolean[] boolArrayValue = new boolean[] {false, true}; assertEquals(expectedBooleanHashCode, HashCodeUtil.calcHashCode(hashSeed, boolArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (boolean[])null)); - final int expectedIntegralHashCode = (HashCodeUtil.HASH_PRIME_NUMBER + 3) * - HashCodeUtil.HASH_PRIME_NUMBER + 7; + final int expectedIntegralHashCode = + (HashCodeUtil.HASH_PRIME_NUMBER + 3) * HashCodeUtil.HASH_PRIME_NUMBER + 7; - final byte[] byteArrayValue = new byte[] { 3, 7 }; + final byte[] byteArrayValue = new byte[] {3, 7}; assertEquals(expectedIntegralHashCode, HashCodeUtil.calcHashCode(hashSeed, byteArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (byte[])null)); - final short[] shortArrayValue = new short[] { 3, 7 }; + final short[] shortArrayValue = new short[] {3, 7}; assertEquals(expectedIntegralHashCode, HashCodeUtil.calcHashCode(hashSeed, shortArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (short[])null)); - final int[] intArrayValue = new int[] { 3, 7 }; + final int[] intArrayValue = new int[] {3, 7}; assertEquals(expectedIntegralHashCode, HashCodeUtil.calcHashCode(hashSeed, intArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (int[])null)); - final long[] longArrayValue = new long[] { 3, 7 }; + final long[] longArrayValue = new long[] {3, 7}; assertEquals(expectedIntegralHashCode, HashCodeUtil.calcHashCode(hashSeed, longArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (long[])null)); - final float[] floatArrayValue = new float[] { 10.0f }; + final float[] floatArrayValue = new float[] {10.0f}; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + FloatUtil.convertFloatToInt(floatArrayValue[0]), HashCodeUtil.calcHashCode(hashSeed, floatArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (float[])null)); - final double[] doubleArrayValue = new double[] { 10.0 }; + final double[] doubleArrayValue = new double[] {10.0}; final long doubleValueAsLong = FloatUtil.convertDoubleToLong(doubleArrayValue[0]); - final int expectedDoubleArrayHashCode = HashCodeUtil.HASH_PRIME_NUMBER + - (int)(doubleValueAsLong ^ (doubleValueAsLong >>> 32)); + final int expectedDoubleArrayHashCode = + HashCodeUtil.HASH_PRIME_NUMBER + (int)(doubleValueAsLong ^ (doubleValueAsLong >>> 32)); assertEquals(expectedDoubleArrayHashCode, HashCodeUtil.calcHashCode(hashSeed, doubleArrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (double[])null)); } @@ -208,7 +210,7 @@ public void simpleArrayType() public void bigIntegerArrayType() { final int hashSeed = 1; - final BigInteger[] arrayValue = new BigInteger[] { BigInteger.valueOf(3), BigInteger.valueOf(7) }; + final BigInteger[] arrayValue = new BigInteger[] {BigInteger.valueOf(3), BigInteger.valueOf(7)}; final int expectedHashCode = (HashCodeUtil.HASH_PRIME_NUMBER + 3) * HashCodeUtil.HASH_PRIME_NUMBER + 7; assertEquals(expectedHashCode, HashCodeUtil.calcHashCode(hashSeed, arrayValue)); @@ -219,9 +221,9 @@ public void bigIntegerArrayType() public void stringArrayType() { final int hashSeed = 1; - final String[] arrayValue = new String[] { String.valueOf('0') }; - assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + (int)'0', - HashCodeUtil.calcHashCode(hashSeed, arrayValue)); + final String[] arrayValue = new String[] {String.valueOf('0')}; + assertEquals( + HashCodeUtil.HASH_PRIME_NUMBER + (int)'0', HashCodeUtil.calcHashCode(hashSeed, arrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (String[])null)); } @@ -230,7 +232,7 @@ public void stringArrayType() public void bitBufferArrayType() { final int hashSeed = 1; - final BitBuffer[] arrayValue = new BitBuffer[] { new BitBuffer(new byte[] {}) }; + final BitBuffer[] arrayValue = new BitBuffer[] {new BitBuffer(new byte[] {})}; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + HashCodeUtil.HASH_SEED, HashCodeUtil.calcHashCode(hashSeed, arrayValue)); @@ -241,9 +243,9 @@ public void bitBufferArrayType() public void enumArrayType() { final int hashSeed = 1; - final Color[] arrayValue = new Color[] { Color.NONE }; + final Color[] arrayValue = new Color[] {Color.NONE}; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.NONE.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Color.NONE.getValue()), HashCodeUtil.calcHashCode(hashSeed, arrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (Color[])null)); @@ -253,9 +255,10 @@ public void enumArrayType() public void bitmaskArrayType() { final int hashSeed = 1; - final Permissions[] arrayValue = new Permissions[] { Permissions.Values.READ }; + final Permissions[] arrayValue = new Permissions[] {Permissions.Values.READ}; assertEquals(HashCodeUtil.HASH_PRIME_NUMBER + - (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + Permissions.Values.READ.getValue()), + (HashCodeUtil.HASH_PRIME_NUMBER * HashCodeUtil.HASH_SEED + + Permissions.Values.READ.getValue()), HashCodeUtil.calcHashCode(hashSeed, arrayValue)); assertEquals(HashCodeUtil.HASH_PRIME_NUMBER, HashCodeUtil.calcHashCode(hashSeed, (Permissions[])null)); @@ -265,7 +268,7 @@ public void bitmaskArrayType() public void objectArrayType() { final int hashSeed = 1; - final DummyObject[] arrayValue = new DummyObject[] { new DummyObject(3), new DummyObject(7) }; + final DummyObject[] arrayValue = new DummyObject[] {new DummyObject(3), new DummyObject(7)}; assertEquals((HashCodeUtil.HASH_PRIME_NUMBER + 3) * HashCodeUtil.HASH_PRIME_NUMBER + 7, HashCodeUtil.calcHashCode(hashSeed, arrayValue)); @@ -273,8 +276,7 @@ public void objectArrayType() } // enum - private static enum Color implements ZserioEnum, SizeOf - { + private static enum Color implements ZserioEnum, SizeOf { NONE(0), RED(2), BLUE(3), diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/VarSizeUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/VarSizeUtilTest.java index f150a1224..9007265a3 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/VarSizeUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/VarSizeUtilTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; + import org.junit.jupiter.api.Test; public class VarSizeUtilTest diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/array/ArrayTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/array/ArrayTest.java index 48f66a16f..3bf2c5d93 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/array/ArrayTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/array/ArrayTest.java @@ -1,22 +1,23 @@ package zserio.runtime.array; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.math.BigInteger; +import org.junit.jupiter.api.Test; + import zserio.runtime.BitPositionUtil; import zserio.runtime.BitSizeOfCalculator; -import zserio.runtime.io.ByteArrayBitStreamReader; -import zserio.runtime.io.ByteArrayBitStreamWriter; import zserio.runtime.io.BitBuffer; import zserio.runtime.io.BitStreamReader; +import zserio.runtime.io.ByteArrayBitStreamReader; +import zserio.runtime.io.ByteArrayBitStreamWriter; import test_object.ArrayBitmask; import test_object.ArrayEnum; @@ -167,12 +168,12 @@ public void bitFieldLongArray() throws IOException @Test public void bitFieldBigIntegerArray() throws IOException { - final RawArray rawArray1 = new RawArray.BigIntegerRawArray(new BigInteger[] { - BigInteger.valueOf(8589934592L), BigInteger.valueOf(8589934593L)}); + final RawArray rawArray1 = new RawArray.BigIntegerRawArray( + new BigInteger[] {BigInteger.valueOf(8589934592L), BigInteger.valueOf(8589934593L)}); final int array1BitSizeOf = 2 * 64; final int array1AlignedBitSizeOf = array1BitSizeOf; - final RawArray rawArray2 = new RawArray.BigIntegerRawArray(new BigInteger[] { - BigInteger.valueOf(8589934594L), BigInteger.valueOf(8589934595L)}); + final RawArray rawArray2 = new RawArray.BigIntegerRawArray( + new BigInteger[] {BigInteger.valueOf(8589934594L), BigInteger.valueOf(8589934595L)}); final RawArray emptyRawArray = new RawArray.BigIntegerRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.BitFieldBigIntegerArrayTraits(64); testArray(rawArray1, array1BitSizeOf, array1AlignedBitSizeOf, rawArray2, emptyRawArray, arrayTraits); @@ -305,12 +306,12 @@ public void varUInt64Array() throws IOException @Test public void varUIntArray() throws IOException { - final RawArray rawArray1 = new RawArray.BigIntegerRawArray(new BigInteger[] { - BigInteger.valueOf(1), BigInteger.valueOf(1073741824L)}); + final RawArray rawArray1 = new RawArray.BigIntegerRawArray( + new BigInteger[] {BigInteger.valueOf(1), BigInteger.valueOf(1073741824L)}); final int array1BitSizeOf = 8 + 40; final int array1AlignedBitSizeOf = array1BitSizeOf; - final RawArray rawArray2 = new RawArray.BigIntegerRawArray(new BigInteger[] { - BigInteger.valueOf(1), BigInteger.valueOf(2147483648L)}); + final RawArray rawArray2 = new RawArray.BigIntegerRawArray( + new BigInteger[] {BigInteger.valueOf(1), BigInteger.valueOf(2147483648L)}); final RawArray emptyRawArray = new RawArray.BigIntegerRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarUIntArrayTraits(); testArray(rawArray1, array1BitSizeOf, array1AlignedBitSizeOf, rawArray2, emptyRawArray, arrayTraits); @@ -393,11 +394,11 @@ public void float64Array() throws IOException public void bytesArray() throws IOException { final RawArray rawArray1 = new RawArray.BytesRawArray( - new byte[][] { new byte[] {(byte)1, (byte)255}, new byte[] {(byte)127, (byte)128} }); + new byte[][] {new byte[] {(byte)1, (byte)255}, new byte[] {(byte)127, (byte)128}}); final int array1BitSizeOf = 2 * (1 + 2) * 8; final int array1AlignedBitSizeOf = array1BitSizeOf; final RawArray rawArray2 = new RawArray.BytesRawArray( - new byte[][] { new byte[] {(byte)0, (byte)0}, new byte[] {(byte)255, (byte)255} }); + new byte[][] {new byte[] {(byte)0, (byte)0}, new byte[] {(byte)255, (byte)255}}); final RawArray emptyRawArray = new RawArray.BytesRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.BytesArrayTraits(); testArray(rawArray1, array1BitSizeOf, array1AlignedBitSizeOf, rawArray2, emptyRawArray, arrayTraits); @@ -411,10 +412,10 @@ public void bytesArray() throws IOException @Test public void stringArray() throws IOException { - final RawArray rawArray1 = new RawArray.StringRawArray(new String[] { "Text1", "Text2"}); + final RawArray rawArray1 = new RawArray.StringRawArray(new String[] {"Text1", "Text2"}); final int array1BitSizeOf = 2 * (1 + 5) * 8; final int array1AlignedBitSizeOf = array1BitSizeOf; - final RawArray rawArray2 = new RawArray.StringRawArray(new String[] { "Text1", "Text3"}); + final RawArray rawArray2 = new RawArray.StringRawArray(new String[] {"Text1", "Text3"}); final RawArray emptyRawArray = new RawArray.StringRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.StringArrayTraits(); testArray(rawArray1, array1BitSizeOf, array1AlignedBitSizeOf, rawArray2, emptyRawArray, arrayTraits); @@ -469,12 +470,12 @@ public void bitBufferArray() throws IOException @Test public void bitmaskArray() throws IOException { - final RawArray rawArray1 = new RawArray.ObjectRawArray(ArrayBitmask.class, - new ArrayBitmask[] {ArrayBitmask.Values.CREATE, ArrayBitmask.Values.READ}); + final RawArray rawArray1 = new RawArray.ObjectRawArray( + ArrayBitmask.class, new ArrayBitmask[] {ArrayBitmask.Values.CREATE, ArrayBitmask.Values.READ}); final int array1BitSizeOf = 2 * 8; final int array1AlignedBitSizeOf = array1BitSizeOf; - final RawArray rawArray2 = new RawArray.ObjectRawArray(ArrayBitmask.class, - new ArrayBitmask[] {ArrayBitmask.Values.CREATE, ArrayBitmask.Values.WRITE}); + final RawArray rawArray2 = new RawArray.ObjectRawArray( + ArrayBitmask.class, new ArrayBitmask[] {ArrayBitmask.Values.CREATE, ArrayBitmask.Values.WRITE}); final RawArray emptyRawArray = new RawArray.ObjectRawArray(ArrayBitmask.class); final ArrayTraits arrayTraits = new ArrayTraits.WritePackableObjectArrayTraits( new PackableArrayBitmaskElementFactory()); @@ -489,12 +490,12 @@ public void bitmaskArray() throws IOException @Test public void enumArray() throws IOException { - final RawArray rawArray1 = new RawArray.EnumRawArray(ArrayEnum.class, - new ArrayEnum[] {ArrayEnum.VALUE1, ArrayEnum.VALUE2}); + final RawArray rawArray1 = new RawArray.EnumRawArray( + ArrayEnum.class, new ArrayEnum[] {ArrayEnum.VALUE1, ArrayEnum.VALUE2}); final int array1BitSizeOf = 2 * 8; final int array1AlignedBitSizeOf = array1BitSizeOf; - final RawArray rawArray2 = new RawArray.EnumRawArray(ArrayEnum.class, - new ArrayEnum[] {ArrayEnum.VALUE1, ArrayEnum.VALUE3}); + final RawArray rawArray2 = new RawArray.EnumRawArray( + ArrayEnum.class, new ArrayEnum[] {ArrayEnum.VALUE1, ArrayEnum.VALUE3}); final RawArray emptyRawArray = new RawArray.EnumRawArray(ArrayEnum.class); final ArrayTraits arrayTraits = new ArrayTraits.WritePackableObjectArrayTraits( new PackableArrayEnumElementFactory()); @@ -509,15 +510,15 @@ public void enumArray() throws IOException @Test public void writeObjectArray() throws IOException { - final RawArray rawArray1 = new RawArray.ObjectRawArray(ArrayObject.class, - new ArrayObject[] {new ArrayObject((byte)1), new ArrayObject((byte)2)}); + final RawArray rawArray1 = new RawArray.ObjectRawArray( + ArrayObject.class, new ArrayObject[] {new ArrayObject((byte)1), new ArrayObject((byte)2)}); final int array1BitSizeOf = 2 * 31; final int array1AlignedBitSizeOf = 31 + 1 + 31; - final RawArray rawArray2 = new RawArray.ObjectRawArray(ArrayObject.class, - new ArrayObject[] {new ArrayObject((byte)1), new ArrayObject((byte)3)}); + final RawArray rawArray2 = new RawArray.ObjectRawArray( + ArrayObject.class, new ArrayObject[] {new ArrayObject((byte)1), new ArrayObject((byte)3)}); final RawArray emptyRawArray = new RawArray.ObjectRawArray(ArrayObject.class); - final ArrayTraits arrayTraits = new ArrayTraits.WriteObjectArrayTraits( - new PackableArrayObjectElementFactory()); + final ArrayTraits arrayTraits = + new ArrayTraits.WriteObjectArrayTraits(new PackableArrayObjectElementFactory()); testArray(rawArray1, array1BitSizeOf, array1AlignedBitSizeOf, rawArray2, emptyRawArray, arrayTraits); final Array normalArray1 = new Array(rawArray1, arrayTraits, ArrayType.NORMAL); @@ -526,8 +527,10 @@ public void writeObjectArray() throws IOException assertEquals(expectedRawArray.length, normalArray1.size()); // check that the array is not packable - assertThrows(UnsupportedOperationException.class, () -> testPackedArray(rawArray1, emptyRawArray, - arrayTraits, array1BitSizeOf, array1AlignedBitSizeOf)); + assertThrows(UnsupportedOperationException.class, + () + -> testPackedArray(rawArray1, emptyRawArray, arrayTraits, array1BitSizeOf, + array1AlignedBitSizeOf)); } @Test @@ -538,12 +541,12 @@ public void signedBitFieldBytePackedArray() throws IOException final ArrayTraits arrayTraits = new ArrayTraits.SignedBitFieldByteArrayTraits(elementBitSize); // none-zero delta - final RawArray rawArray1 = new RawArray.ByteRawArray(new byte[] { - -10, -8, -6, -7, -4, -1, 0, 2, 4, 6, 9}); + final RawArray rawArray1 = + new RawArray.ByteRawArray(new byte[] {-10, -8, -6, -7, -4, -1, 0, 2, 4, 6, 9}); final int array1MaxDeltaBitSize = 2; final int array1BitSizeOf = calcPackedBitSize(elementBitSize, rawArray1.size(), array1MaxDeltaBitSize); - final int array1AlignedBitSizeOf = calcAlignedPackedBitSize(elementBitSize, rawArray1.size(), - array1MaxDeltaBitSize); + final int array1AlignedBitSizeOf = + calcAlignedPackedBitSize(elementBitSize, rawArray1.size(), array1MaxDeltaBitSize); testPackedArray(rawArray1, emptyRawArray, arrayTraits, array1BitSizeOf, array1AlignedBitSizeOf); // zero delta @@ -568,16 +571,16 @@ public void signedBitFieldBytePackedArray() throws IOException @Test public void signedBitFieldShortPackedArray() throws IOException { - final RawArray rawArray1 = new RawArray.ShortRawArray(new short[] { - -512, -481, -422, -389, -350, -300, -267, -250}); + final RawArray rawArray1 = + new RawArray.ShortRawArray(new short[] {-512, -481, -422, -389, -350, -300, -267, -250}); final RawArray emptyRawArray = new RawArray.ShortRawArray(); final ArrayTraits arrayTraits13 = new ArrayTraits.SignedBitFieldShortArrayTraits(13); testPackedArray(rawArray1, emptyRawArray, arrayTraits13); // will not be packed because unpacked 16bit values will be more efficient // (6 bits more are needed to store max_bit_number in descriptor if packing was enabled) - final RawArray rawArray2 = new RawArray.ShortRawArray(new short[] { - Short.MIN_VALUE, -1, 10, 20, 30, 40}); // max_bit_number 15, delta needs 16 bits + final RawArray rawArray2 = new RawArray.ShortRawArray( + new short[] {Short.MIN_VALUE, -1, 10, 20, 30, 40}); // max_bit_number 15, delta needs 16 bits final ArrayTraits arrayTraits16 = new ArrayTraits.SignedBitFieldShortArrayTraits(16); final int unpackedBitSizeOf = 1 + 6 * 16; final int unpackedAlignedBitSizeOf = 1 + 16 + 7 + 5 * 16; @@ -587,8 +590,8 @@ public void signedBitFieldShortPackedArray() throws IOException @Test public void signedBitFieldIntPackedArray() throws IOException { - final RawArray rawArray = new RawArray.IntRawArray(new int[] {-131072, -131000, -130000, -121111, - -112345, -109873}); + final RawArray rawArray = + new RawArray.IntRawArray(new int[] {-131072, -131000, -130000, -121111, -112345, -109873}); final RawArray emptyRawArray = new RawArray.IntRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.SignedBitFieldIntArrayTraits(29); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -597,8 +600,8 @@ public void signedBitFieldIntPackedArray() throws IOException @Test public void signedBitFieldLongPackedArray() throws IOException { - final RawArray rawArray1 = new RawArray.LongRawArray(new long[] {-8589934592L, -8589934500L, - -8589934000L, -8589933592L, -8589933000L, -8589931234L}); + final RawArray rawArray1 = new RawArray.LongRawArray(new long[] { + -8589934592L, -8589934500L, -8589934000L, -8589933592L, -8589933000L, -8589931234L}); final RawArray emptyRawArray = new RawArray.LongRawArray(); final ArrayTraits arrayTraits1 = new ArrayTraits.SignedBitFieldLongArrayTraits(61); testPackedArray(rawArray1, emptyRawArray, arrayTraits1); @@ -622,12 +625,12 @@ public void bitFieldBytePackedArray() throws IOException final ArrayTraits arrayTraits = new ArrayTraits.BitFieldByteArrayTraits(5); // none-zero delta - final RawArray rawArray1 = new RawArray.ByteRawArray(new byte[] { - 1, 2, 5, 4, 7, 10, 12, 15, 18, 20, 22, 23}); + final RawArray rawArray1 = + new RawArray.ByteRawArray(new byte[] {1, 2, 5, 4, 7, 10, 12, 15, 18, 20, 22, 23}); final int array1MaxDeltaBitSize = 2; final int array1BitSizeOf = calcPackedBitSize(elementBitSize, rawArray1.size(), array1MaxDeltaBitSize); - final int array1AlignedBitSizeOf = calcAlignedPackedBitSize(elementBitSize, rawArray1.size(), - array1MaxDeltaBitSize); + final int array1AlignedBitSizeOf = + calcAlignedPackedBitSize(elementBitSize, rawArray1.size(), array1MaxDeltaBitSize); testPackedArray(rawArray1, emptyRawArray, arrayTraits, array1BitSizeOf, array1AlignedBitSizeOf); // zero delta @@ -652,8 +655,8 @@ public void bitFieldBytePackedArray() throws IOException @Test public void bitFieldShortPackedArray() throws IOException { - final RawArray rawArray1 = new RawArray.ShortRawArray(new short[] {512, 500, 459, 400, 333, 300, 222, - 200, 201}); + final RawArray rawArray1 = + new RawArray.ShortRawArray(new short[] {512, 500, 459, 400, 333, 300, 222, 200, 201}); final RawArray emptyRawArray = new RawArray.ShortRawArray(); final ArrayTraits arrayTraits13 = new ArrayTraits.BitFieldShortArrayTraits(13); testPackedArray(rawArray1, emptyRawArray, arrayTraits13); @@ -661,16 +664,16 @@ public void bitFieldShortPackedArray() throws IOException final ArrayTraits arrayTraits8 = new ArrayTraits.BitFieldShortArrayTraits(8); // will not be packed because unpacked 8bit values will be more efficient - final RawArray rawArray2 = new RawArray.ShortRawArray(new short[] { - 255, 0, 10, 20, 30, 40}); // max_bit_number 8, delta needs 9 bits + final RawArray rawArray2 = new RawArray.ShortRawArray( + new short[] {255, 0, 10, 20, 30, 40}); // max_bit_number 8, delta needs 9 bits final int array2BitSizeOf = 1 + 6 * 8; final int array2AlignedBitSizeOf = 1 + 8 + 7 + 5 * 8; testPackedArray(rawArray2, emptyRawArray, arrayTraits8, array2BitSizeOf, array2AlignedBitSizeOf); // will not be packed because unpacked 8bit values will be more efficient // (6 bits more are needed to store max_bit_number in descriptor if packing was enabled) - final RawArray rawArray3 = new RawArray.ShortRawArray(new short[] { - 255, 128, 10, 20, 30, 40}); // max_bit_number 7, delta needs 8 bits + final RawArray rawArray3 = new RawArray.ShortRawArray( + new short[] {255, 128, 10, 20, 30, 40}); // max_bit_number 7, delta needs 8 bits final int array3BitSizeOf = 1 + 6 * 8; final int array3AlignedBitSizeOf = 1 + 8 + 7 + 5 * 8; testPackedArray(rawArray3, emptyRawArray, arrayTraits8, array3BitSizeOf, array3AlignedBitSizeOf); @@ -679,8 +682,8 @@ public void bitFieldShortPackedArray() throws IOException @Test public void bitFieldIntPackedArray() throws IOException { - final RawArray rawArray = new RawArray.IntRawArray(new int[] {131072, 131000, 130123, 129123, - 128123, 120124}); + final RawArray rawArray = + new RawArray.IntRawArray(new int[] {131072, 131000, 130123, 129123, 128123, 120124}); final RawArray emptyRawArray = new RawArray.IntRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.BitFieldIntArrayTraits(29); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -689,8 +692,8 @@ public void bitFieldIntPackedArray() throws IOException @Test public void bitFieldLongPackedArray() throws IOException { - final RawArray rawArray = new RawArray.LongRawArray(new long[] {8589934592L, 8589934000L, 8589933592L, - 8589933000L, 8589932000L, 8589932001L}); + final RawArray rawArray = new RawArray.LongRawArray( + new long[] {8589934592L, 8589934000L, 8589933592L, 8589933000L, 8589932000L, 8589932001L}); final RawArray emptyRawArray = new RawArray.LongRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.BitFieldLongArrayTraits(61); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -700,12 +703,9 @@ public void bitFieldLongPackedArray() throws IOException public void bitFieldBigIntegerPackedArray() throws IOException { final RawArray rawArray = new RawArray.BigIntegerRawArray(new BigInteger[] { - BigInteger.valueOf(8589934592L), - BigInteger.valueOf(8589934000L), - BigInteger.valueOf(8589933592L), - BigInteger.valueOf(8589933000L), - BigInteger.valueOf(8589932000L), - BigInteger.valueOf(8589932001L)}); + BigInteger.valueOf(8589934592L), BigInteger.valueOf(8589934000L), + BigInteger.valueOf(8589933592L), BigInteger.valueOf(8589933000L), + BigInteger.valueOf(8589932000L), BigInteger.valueOf(8589932001L)}); final RawArray emptyRawArray = new RawArray.BigIntegerRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.BitFieldBigIntegerArrayTraits(64); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -732,8 +732,8 @@ public void varInt32PackedArray() throws IOException @Test public void varInt64PackedArray() throws IOException { - final RawArray rawArray = new RawArray.LongRawArray(new long[] {-1, 10737412L, 10737414L, 10737416L, - 10737418L, 107374182L}); + final RawArray rawArray = new RawArray.LongRawArray( + new long[] {-1, 10737412L, 10737414L, 10737416L, 10737418L, 107374182L}); final RawArray emptyRawArray = new RawArray.LongRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarInt64ArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -742,8 +742,8 @@ public void varInt64PackedArray() throws IOException @Test public void varIntPackedArray() throws IOException { - final RawArray rawArray = new RawArray.LongRawArray(new long[] {-1, 10737412L, 10737414L, 10737416L, - 10737418L, 107374182L}); + final RawArray rawArray = new RawArray.LongRawArray( + new long[] {-1, 10737412L, 10737414L, 10737416L, 10737418L, 107374182L}); final RawArray emptyRawArray = new RawArray.LongRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarIntArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -752,8 +752,8 @@ public void varIntPackedArray() throws IOException @Test public void varUInt16PackedArray() throws IOException { - final RawArray rawArray = new RawArray.ShortRawArray(new short[] {1, 234, 453, 700, 894, 999, - 900, 1024}); + final RawArray rawArray = + new RawArray.ShortRawArray(new short[] {1, 234, 453, 700, 894, 999, 900, 1024}); final RawArray emptyRawArray = new RawArray.ShortRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarUInt16ArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -762,8 +762,8 @@ public void varUInt16PackedArray() throws IOException @Test public void varUInt32PackedArray() throws IOException { - final RawArray rawArray = new RawArray.IntRawArray(new int[] {1, 1000, 4444, 2222, 6666, 9999, - 11111, 12345, 16384}); + final RawArray rawArray = + new RawArray.IntRawArray(new int[] {1, 1000, 4444, 2222, 6666, 9999, 11111, 12345, 16384}); final RawArray emptyRawArray = new RawArray.IntRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarUInt32ArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -772,8 +772,8 @@ public void varUInt32PackedArray() throws IOException @Test public void varUInt64PackedArray() throws IOException { - final RawArray rawArray = new RawArray.LongRawArray(new long[] {1L, 374182L, 107374182L, 10737418L, - 73741824L, 573741824L, 1073741824L}); + final RawArray rawArray = new RawArray.LongRawArray( + new long[] {1L, 374182L, 107374182L, 10737418L, 73741824L, 573741824L, 1073741824L}); final RawArray emptyRawArray = new RawArray.LongRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarUInt64ArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -781,20 +781,16 @@ public void varUInt64PackedArray() throws IOException final RawArray unpackedRawArray = new RawArray.LongRawArray(new long[] {5000000L, 0, 0, 0, 0, 0, 0}); final int unpackedBitSizeOf = 1 + 32 + 6 * 8; final int unpackedAlignedBitSizeOf = 1 + 32 + 7 + 6 * 8; - testPackedArray(unpackedRawArray, emptyRawArray, arrayTraits, - unpackedBitSizeOf, unpackedAlignedBitSizeOf); + testPackedArray( + unpackedRawArray, emptyRawArray, arrayTraits, unpackedBitSizeOf, unpackedAlignedBitSizeOf); } @Test public void varUIntPackedArray() throws IOException { final RawArray rawArray = new RawArray.BigIntegerRawArray(new BigInteger[] { - BigInteger.valueOf(10737412L), - BigInteger.valueOf(10737414L), - BigInteger.valueOf(10737416L), - BigInteger.valueOf(10737418L), - BigInteger.valueOf(107374182L), - BigInteger.valueOf(107374185L)}); + BigInteger.valueOf(10737412L), BigInteger.valueOf(10737414L), BigInteger.valueOf(10737416L), + BigInteger.valueOf(10737418L), BigInteger.valueOf(107374182L), BigInteger.valueOf(107374185L)}); final RawArray emptyRawArray = new RawArray.BigIntegerRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarUIntArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -803,8 +799,8 @@ public void varUIntPackedArray() throws IOException @Test public void varSizePackedArray() throws IOException { - final RawArray rawArray = new RawArray.IntRawArray(new int[] {1, 4000, 2000, 5600, 11111, 13333, - 15432, 16384}); + final RawArray rawArray = + new RawArray.IntRawArray(new int[] {1, 4000, 2000, 5600, 11111, 13333, 15432, 16384}); final RawArray emptyRawArray = new RawArray.IntRawArray(); final ArrayTraits arrayTraits = new ArrayTraits.VarSizeArrayTraits(); testPackedArray(rawArray, emptyRawArray, arrayTraits); @@ -814,12 +810,8 @@ public void varSizePackedArray() throws IOException public void bitmaskPackedArray() throws IOException { final RawArray rawArray = new RawArray.ObjectRawArray(ArrayBitmask.class, - new ArrayBitmask[] { - ArrayBitmask.Values.CREATE, - ArrayBitmask.Values.READ, - ArrayBitmask.Values.WRITE, - ArrayBitmask.Values.READ, - ArrayBitmask.Values.WRITE}); + new ArrayBitmask[] {ArrayBitmask.Values.CREATE, ArrayBitmask.Values.READ, + ArrayBitmask.Values.WRITE, ArrayBitmask.Values.READ, ArrayBitmask.Values.WRITE}); final RawArray emptyRawArray = new RawArray.ObjectRawArray(ArrayBitmask.class); final ArrayTraits arrayTraits = new ArrayTraits.WritePackableObjectArrayTraits( new PackableArrayBitmaskElementFactory()); @@ -830,11 +822,7 @@ public void bitmaskPackedArray() throws IOException public void enumPackedArray() throws IOException { final RawArray rawArray = new RawArray.EnumRawArray(ArrayEnum.class, - new ArrayEnum[] { - ArrayEnum.VALUE1, - ArrayEnum.VALUE2, - ArrayEnum.VALUE3, - ArrayEnum.VALUE2, + new ArrayEnum[] {ArrayEnum.VALUE1, ArrayEnum.VALUE2, ArrayEnum.VALUE3, ArrayEnum.VALUE2, ArrayEnum.VALUE1}); final RawArray emptyRawArray = new RawArray.EnumRawArray(ArrayEnum.class); final ArrayTraits arrayTraits = new ArrayTraits.WritePackableObjectArrayTraits( @@ -846,12 +834,8 @@ public void enumPackedArray() throws IOException public void writeObjectPackedArray() throws IOException { final RawArray rawArray = new RawArray.ObjectRawArray(ArrayObject.class, - new ArrayObject[] { - new ArrayObject((byte)0), - new ArrayObject((byte)1), - new ArrayObject((byte)2), - new ArrayObject((byte)3), - new ArrayObject((byte)4)}); + new ArrayObject[] {new ArrayObject((byte)0), new ArrayObject((byte)1), new ArrayObject((byte)2), + new ArrayObject((byte)3), new ArrayObject((byte)4)}); final RawArray emptyRawArray = new RawArray.ObjectRawArray(ArrayObject.class); final ArrayTraits arrayTraits = new ArrayTraits.WritePackableObjectArrayTraits( new PackableArrayObjectElementFactory()); @@ -925,16 +909,14 @@ private static class ArrayTestOffsetChecker implements OffsetChecker { @Override public void checkOffset(int index, long byteOffset) - { - } + {} }; private static class ArrayTestOffsetInitializer implements OffsetInitializer { @Override public void setOffset(int index, long byteOffset) - { - } + {} }; private static void testArray(RawArray rawArray1, int array1BitSizeOf, int array1AlignedBitSizeOf, @@ -946,14 +928,14 @@ private static void testArray(RawArray rawArray1, int array1BitSizeOf, int array testArray(rawArray1, array1BitSizeOf, array1AlignedBitSizeOf, emptyRawArray, arrayTraits); } - private static void testArraySize(RawArray rawArray1, RawArray rawArray2, RawArray emptyRawArray, - ArrayTraits arrayTraits) + private static void testArraySize( + RawArray rawArray1, RawArray rawArray2, RawArray emptyRawArray, ArrayTraits arrayTraits) { final Array normalArray1 = new Array(rawArray1, arrayTraits, ArrayType.NORMAL); final Array autoArray1 = new Array(rawArray1, arrayTraits, ArrayType.AUTO); final Array implicitArray1 = new Array(rawArray1, arrayTraits, ArrayType.IMPLICIT); - final Array alignedNormalArray1 = new Array(rawArray1, arrayTraits, ArrayType.NORMAL, - new ArrayTestOffsetChecker()); + final Array alignedNormalArray1 = + new Array(rawArray1, arrayTraits, ArrayType.NORMAL, new ArrayTestOffsetChecker()); final Array normalArray2 = new Array(rawArray2, arrayTraits, ArrayType.NORMAL); final Array autoArray2 = new Array(rawArray2, arrayTraits, ArrayType.AUTO); final Array autoEmptyArray = new Array(emptyRawArray, arrayTraits, ArrayType.AUTO); @@ -967,8 +949,8 @@ private static void testArraySize(RawArray rawArray1, RawArray rawArray2, RawArr assertEquals(emptyRawArray.size(), autoEmptyArray.size()); } - private static void testArrayEquals(RawArray rawArray1, RawArray rawArray2, RawArray emptyRawArray, - ArrayTraits arrayTraits) + private static void testArrayEquals( + RawArray rawArray1, RawArray rawArray2, RawArray emptyRawArray, ArrayTraits arrayTraits) { final Array normalArray1 = new Array(rawArray1, arrayTraits, ArrayType.NORMAL); final Array autoArray1 = new Array(rawArray1, arrayTraits, ArrayType.AUTO); @@ -990,8 +972,8 @@ private static void testArrayEquals(RawArray rawArray1, RawArray rawArray2, RawA assertFalse(normalArray1.equals(null)); } - private static void testArrayHashCode(RawArray rawArray1, RawArray rawArray2, RawArray emptyRawArray, - ArrayTraits arrayTraits) + private static void testArrayHashCode( + RawArray rawArray1, RawArray rawArray2, RawArray emptyRawArray, ArrayTraits arrayTraits) { final Array normalArray1 = new Array(rawArray1, arrayTraits, ArrayType.NORMAL); final Array autoArray1 = new Array(rawArray1, arrayTraits, ArrayType.AUTO); @@ -1010,8 +992,8 @@ private static void testArrayHashCode(RawArray rawArray1, RawArray rawArray2, Ra assertNotEquals(normalArray1.hashCode(), autoEmptyArray.hashCode()); } - private static void testArray(RawArray rawArray1, int array1BitSizeOf, - int array1AlignedBitSizeOf, RawArray readRawArray, ArrayTraits arrayTraits) throws IOException + private static void testArray(RawArray rawArray1, int array1BitSizeOf, int array1AlignedBitSizeOf, + RawArray readRawArray, ArrayTraits arrayTraits) throws IOException { testArrayNormal(rawArray1, readRawArray, arrayTraits, array1BitSizeOf); final int autoArray1SizeBitSizeOf = BitSizeOfCalculator.getBitSizeOfVarSize(rawArray1.size()); @@ -1020,8 +1002,8 @@ private static void testArray(RawArray rawArray1, int array1BitSizeOf, final OffsetChecker offsetChecker = new ArrayTestOffsetChecker(); final OffsetInitializer offsetInitializer = new ArrayTestOffsetInitializer(); - testArrayAligned(rawArray1, readRawArray, arrayTraits, offsetChecker, offsetInitializer, - array1AlignedBitSizeOf); + testArrayAligned( + rawArray1, readRawArray, arrayTraits, offsetChecker, offsetInitializer, array1AlignedBitSizeOf); testArrayAlignedAuto(rawArray1, readRawArray, arrayTraits, offsetChecker, offsetInitializer, autoArray1SizeBitSizeOf + array1AlignedBitSizeOf); } @@ -1132,17 +1114,17 @@ private static void testArrayImplicit(RawArray rawArray, RawArray readRawArray, private static void testArrayAligned(RawArray rawArray, RawArray readRawArray, ArrayTraits arrayTraits, OffsetChecker offsetChecker, OffsetInitializer offsetInitializer, int expectedBitSizeOf) - throws IOException + throws IOException { - final Array array = new Array(rawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, - offsetInitializer); + final Array array = + new Array(rawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, offsetInitializer); for (int bitPosition = 0; bitPosition < 8; ++bitPosition) { final int bitSizeOf = array.bitSizeOf(bitPosition); if (array.size() > 0) { - final int alignedExpectedBitSizeOf = expectedBitSizeOf + - (int)BitPositionUtil.alignTo(8, bitPosition) - bitPosition; + final int alignedExpectedBitSizeOf = + expectedBitSizeOf + (int)BitPositionUtil.alignTo(8, bitPosition) - bitPosition; assertEquals(alignedExpectedBitSizeOf, bitSizeOf); } assertEquals(bitPosition + bitSizeOf, array.initializeOffsets(bitPosition)); @@ -1161,8 +1143,8 @@ private static void testArrayAligned(RawArray rawArray, RawArray readRawArray, A { if (bitPosition > 0) assertEquals(0, reader.readBits(bitPosition)); - final Array readArray = new Array(readRawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, - offsetInitializer); + final Array readArray = new Array( + readRawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, offsetInitializer); readArray.read(reader, rawArray.size()); assertEquals(array, readArray); } @@ -1172,7 +1154,7 @@ private static void testArrayAligned(RawArray rawArray, RawArray readRawArray, A private static void testArrayAlignedAuto(RawArray rawArray, RawArray readRawArray, ArrayTraits arrayTraits, OffsetChecker offsetChecker, OffsetInitializer offsetInitializer, int expectedBitSizeOf) - throws IOException + throws IOException { final Array array = new Array(rawArray, arrayTraits, ArrayType.AUTO, offsetChecker, offsetInitializer); for (int bitPosition = 0; bitPosition < 8; ++bitPosition) @@ -1180,8 +1162,8 @@ private static void testArrayAlignedAuto(RawArray rawArray, RawArray readRawArra final int bitSizeOf = array.bitSizeOf(bitPosition); if (array.size() > 0) { - final int alignedExpectedBitSizeOf = expectedBitSizeOf + - (int)BitPositionUtil.alignTo(8, bitPosition) - bitPosition; + final int alignedExpectedBitSizeOf = + expectedBitSizeOf + (int)BitPositionUtil.alignTo(8, bitPosition) - bitPosition; assertEquals(alignedExpectedBitSizeOf, bitSizeOf); } assertEquals(bitPosition + bitSizeOf, array.initializeOffsets(bitPosition)); @@ -1200,8 +1182,8 @@ private static void testArrayAlignedAuto(RawArray rawArray, RawArray readRawArra { if (bitPosition > 0) assertEquals(0, reader.readBits(bitPosition)); - final Array readArray = new Array(readRawArray, arrayTraits, ArrayType.AUTO, offsetChecker, - offsetInitializer); + final Array readArray = new Array( + readRawArray, arrayTraits, ArrayType.AUTO, offsetChecker, offsetInitializer); readArray.read(reader); assertEquals(array, readArray); } @@ -1220,23 +1202,23 @@ private static void testPackedArray(RawArray rawArray, RawArray readRawArray, Ar { testPackedArrayNormal(rawArray, readRawArray, arrayTraits, bitSizeOf); final int autoSizeBitSizeOf = BitSizeOfCalculator.getBitSizeOfVarSize(rawArray.size()); - final int autoBitSizeOf = (bitSizeOf != UNKNOWN_BITSIZE) ? - autoSizeBitSizeOf + bitSizeOf : UNKNOWN_BITSIZE; + final int autoBitSizeOf = + (bitSizeOf != UNKNOWN_BITSIZE) ? autoSizeBitSizeOf + bitSizeOf : UNKNOWN_BITSIZE; testPackedArrayAuto(rawArray, readRawArray, arrayTraits, autoBitSizeOf); testPackedArrayImplicit(rawArray, readRawArray, arrayTraits); final OffsetChecker offsetChecker = new ArrayTestOffsetChecker(); final OffsetInitializer offsetInitializer = new ArrayTestOffsetInitializer(); - testPackedArrayAligned(rawArray, readRawArray, arrayTraits, offsetChecker, offsetInitializer, - alignedBitSizeOf); - final int autoAlignedBitSizeOf = (alignedBitSizeOf != UNKNOWN_BITSIZE) ? - autoSizeBitSizeOf + alignedBitSizeOf : UNKNOWN_BITSIZE; - testPackedArrayAlignedAuto(rawArray, readRawArray, arrayTraits, offsetChecker, offsetInitializer, - autoAlignedBitSizeOf); + testPackedArrayAligned( + rawArray, readRawArray, arrayTraits, offsetChecker, offsetInitializer, alignedBitSizeOf); + final int autoAlignedBitSizeOf = + (alignedBitSizeOf != UNKNOWN_BITSIZE) ? autoSizeBitSizeOf + alignedBitSizeOf : UNKNOWN_BITSIZE; + testPackedArrayAlignedAuto( + rawArray, readRawArray, arrayTraits, offsetChecker, offsetInitializer, autoAlignedBitSizeOf); } - private static void testPackedArrayNormal(RawArray rawArray, RawArray readRawArray, - ArrayTraits arrayTraits, int expectedBitSizeOf) throws IOException + private static void testPackedArrayNormal(RawArray rawArray, RawArray readRawArray, ArrayTraits arrayTraits, + int expectedBitSizeOf) throws IOException { final Array array = new Array(rawArray, arrayTraits, ArrayType.NORMAL); for (int bitPosition = 0; bitPosition < 8; ++bitPosition) @@ -1301,8 +1283,8 @@ private static void testPackedArrayAuto(RawArray rawArray, RawArray readRawArray } } - private static void testPackedArrayImplicit(RawArray rawArray, RawArray readRawArray, - ArrayTraits arrayTraits) throws IOException + private static void testPackedArrayImplicit( + RawArray rawArray, RawArray readRawArray, ArrayTraits arrayTraits) throws IOException { final Array array = new Array(rawArray, arrayTraits, ArrayType.IMPLICIT); @@ -1315,7 +1297,7 @@ private static void testPackedArrayImplicit(RawArray rawArray, RawArray readRawA assertThrows(UnsupportedOperationException.class, () -> array.writePacked(writer)); } - try (final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(new byte[]{})) + try (final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(new byte[] {})) { assertThrows(UnsupportedOperationException.class, () -> array.readPacked(reader, rawArray.size())); } @@ -1325,8 +1307,8 @@ private static void testPackedArrayAligned(RawArray rawArray, RawArray readRawAr ArrayTraits arrayTraits, OffsetChecker offsetChecker, OffsetInitializer offsetInitializer, int expectedBitSizeOf) throws IOException { - final Array array = new Array(rawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, - offsetInitializer); + final Array array = + new Array(rawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, offsetInitializer); for (int bitPosition = 0; bitPosition < 8; ++bitPosition) { final int bitSizeOf = array.bitSizeOfPacked(bitPosition); @@ -1348,8 +1330,8 @@ private static void testPackedArrayAligned(RawArray rawArray, RawArray readRawAr { if (bitPosition > 0) assertEquals(0, reader.readBits(bitPosition)); - final Array readArray = new Array(readRawArray, arrayTraits, ArrayType.NORMAL, - offsetChecker, offsetInitializer); + final Array readArray = new Array( + readRawArray, arrayTraits, ArrayType.NORMAL, offsetChecker, offsetInitializer); readArray.readPacked(reader, rawArray.size()); assertEquals(array, readArray); } @@ -1383,8 +1365,8 @@ private static void testPackedArrayAlignedAuto(RawArray rawArray, RawArray readR { if (bitPosition > 0) assertEquals(0, reader.readBits(bitPosition)); - final Array readArray = new Array(readRawArray, arrayTraits, ArrayType.AUTO, - offsetChecker, offsetInitializer); + final Array readArray = new Array( + readRawArray, arrayTraits, ArrayType.AUTO, offsetChecker, offsetInitializer); readArray.readPacked(reader); assertEquals(array, readArray); } @@ -1403,8 +1385,8 @@ private static int calcAlignedPackedBitSize(int elementBitSize, int arraySize, i final int firstAlignedElementWithDescriptorBitSize = (firstElementWithDescriptorBitSize + 7) / 8 * 8; final int alignedMaxDeltaBitSize = (maxDeltaBitSize + 1 + 7) / 8 * 8; - return firstAlignedElementWithDescriptorBitSize + - (arraySize - 2) * alignedMaxDeltaBitSize + (maxDeltaBitSize + 1); + return firstAlignedElementWithDescriptorBitSize + (arraySize - 2) * alignedMaxDeltaBitSize + + (maxDeltaBitSize + 1); } private static int PACKING_DESCRIPTOR_BITSIZE = 1 + 6; diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/creator/ZserioTreeCreatorTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/creator/ZserioTreeCreatorTest.java index 9412f99f4..52b21cc6a 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/creator/ZserioTreeCreatorTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/creator/ZserioTreeCreatorTest.java @@ -1,10 +1,10 @@ package zserio.runtime.creator; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.Assert.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/BitBufferTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/BitBufferTest.java index e528a185b..9f092b1f1 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/BitBufferTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/BitBufferTest.java @@ -2,8 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.Test; public class BitBufferTest @@ -44,23 +45,23 @@ public void bufferBitSizeConstructor() public void equalsMethod() { final long bitSize = 11; - final BitBuffer bitBuffer1 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xE0}, bitSize); - final BitBuffer bitBuffer2 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xF0}, bitSize); + final BitBuffer bitBuffer1 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xE0}, bitSize); + final BitBuffer bitBuffer2 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xF0}, bitSize); assertTrue(bitBuffer1.equals(bitBuffer2)); - final BitBuffer bitBuffer3 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xFF}, bitSize); + final BitBuffer bitBuffer3 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xFF}, bitSize); assertTrue(bitBuffer1.equals(bitBuffer3)); - final BitBuffer bitBuffer4 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xC0}, bitSize); + final BitBuffer bitBuffer4 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xC0}, bitSize); assertFalse(bitBuffer1.equals(bitBuffer4)); - final BitBuffer bitBuffer5 = new BitBuffer(new byte[]{(byte)0xBA, (byte)0xE0}, bitSize); + final BitBuffer bitBuffer5 = new BitBuffer(new byte[] {(byte)0xBA, (byte)0xE0}, bitSize); assertFalse(bitBuffer1.equals(bitBuffer5)); - final BitBuffer bitBuffer6 = new BitBuffer(new byte[]{(byte)0xAB}); + final BitBuffer bitBuffer6 = new BitBuffer(new byte[] {(byte)0xAB}); assertFalse(bitBuffer1.equals(bitBuffer6)); - final BitBuffer bitBuffer7 = new BitBuffer(new byte[]{}); + final BitBuffer bitBuffer7 = new BitBuffer(new byte[] {}); assertFalse(bitBuffer1.equals(bitBuffer7)); } @@ -68,23 +69,23 @@ public void equalsMethod() public void hashCodeMethod() { final long bitSize = 11; - final BitBuffer bitBuffer1 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xE0}, bitSize); - final BitBuffer bitBuffer2 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xF0}, bitSize); + final BitBuffer bitBuffer1 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xE0}, bitSize); + final BitBuffer bitBuffer2 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xF0}, bitSize); assertTrue(bitBuffer1.hashCode() == bitBuffer2.hashCode()); - final BitBuffer bitBuffer3 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xFF}, bitSize); + final BitBuffer bitBuffer3 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xFF}, bitSize); assertTrue(bitBuffer1.hashCode() == bitBuffer3.hashCode()); - final BitBuffer bitBuffer4 = new BitBuffer(new byte[]{(byte)0xAB, (byte)0xC0}, bitSize); + final BitBuffer bitBuffer4 = new BitBuffer(new byte[] {(byte)0xAB, (byte)0xC0}, bitSize); assertFalse(bitBuffer1.hashCode() == bitBuffer4.hashCode()); - final BitBuffer bitBuffer5 = new BitBuffer(new byte[]{(byte)0xBA, (byte)0xE0}, bitSize); + final BitBuffer bitBuffer5 = new BitBuffer(new byte[] {(byte)0xBA, (byte)0xE0}, bitSize); assertFalse(bitBuffer1.hashCode() == bitBuffer5.hashCode()); - final BitBuffer bitBuffer6 = new BitBuffer(new byte[]{(byte)0xAB}); + final BitBuffer bitBuffer6 = new BitBuffer(new byte[] {(byte)0xAB}); assertFalse(bitBuffer1.hashCode() == bitBuffer6.hashCode()); - final BitBuffer bitBuffer7 = new BitBuffer(new byte[]{}); + final BitBuffer bitBuffer7 = new BitBuffer(new byte[] {}); assertFalse(bitBuffer1.hashCode() == bitBuffer7.hashCode()); } @@ -92,7 +93,7 @@ public void hashCodeMethod() public void getBuffer() { final long bitSize = 11; - final byte[] buffer = new byte[]{(byte)0xAB, (byte)0xE0}; + final byte[] buffer = new byte[] {(byte)0xAB, (byte)0xE0}; final BitBuffer bitBuffer = new BitBuffer(buffer, bitSize); assertTrue(java.util.Arrays.equals(buffer, bitBuffer.getBuffer())); } @@ -101,7 +102,7 @@ public void getBuffer() public void getBitSize() { final long bitSize = 11; - final byte[] buffer = new byte[]{(byte)0xAB, (byte)0xE0}; + final byte[] buffer = new byte[] {(byte)0xAB, (byte)0xE0}; final BitBuffer bitBuffer = new BitBuffer(buffer, bitSize); assertEquals(bitSize, bitBuffer.getBitSize()); } @@ -110,7 +111,7 @@ public void getBitSize() public void getByteSize() { final long bitSize = 11; - final byte[] buffer = new byte[]{(byte)0xAB, (byte)0xE0}; + final byte[] buffer = new byte[] {(byte)0xAB, (byte)0xE0}; final int byteSize = buffer.length; final BitBuffer bitBuffer = new BitBuffer(buffer, bitSize); assertEquals(byteSize, bitBuffer.getByteSize()); diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamReaderTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamReaderTest.java index 6601f0e99..16ed1ec51 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamReaderTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamReaderTest.java @@ -1,9 +1,8 @@ package zserio.runtime.io; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -11,12 +10,14 @@ import javax.imageio.stream.ImageOutputStream; import javax.imageio.stream.MemoryCacheImageOutputStream; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamReaderTest { @Test public void bitBufferConstructor() throws IOException { - final BitBuffer bitBuffer = new BitBuffer(new byte[]{(byte)0xAE, (byte)0xEA, (byte)0x80}, 17); + final BitBuffer bitBuffer = new BitBuffer(new byte[] {(byte)0xAE, (byte)0xEA, (byte)0x80}, 17); try (final BitStreamReader reader = new ByteArrayBitStreamReader(bitBuffer)) { @@ -33,7 +34,7 @@ public void bitBufferConstructor() throws IOException @Test public void bitBufferConstructorOverflow() throws IOException { - final BitBuffer bitBuffer = new BitBuffer(new byte[]{(byte)0xFF, (byte)0xFF, (byte)0xF0}, 19); + final BitBuffer bitBuffer = new BitBuffer(new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xF0}, 19); try (final BitStreamReader reader = new ByteArrayBitStreamReader(bitBuffer)) { assertEquals(bitBuffer.getBitSize(), reader.getBufferBitSize()); @@ -46,7 +47,7 @@ public void bitBufferConstructorOverflow() throws IOException public void bitConstructor() throws IOException { final long bitSize = 17; - final byte[] buffer = new byte[]{(byte)0xAE, (byte)0xEA, (byte)0x80}; + final byte[] buffer = new byte[] {(byte)0xAE, (byte)0xEA, (byte)0x80}; try (final BitStreamReader reader = new ByteArrayBitStreamReader(buffer, bitSize)) { @@ -64,7 +65,7 @@ public void bitConstructor() throws IOException public void bitConstructorOverflow() throws IOException { final long bitSize = 19; - final byte[] buffer = new byte[]{(byte)0xFF, (byte)0xFF, (byte)0xF0}; + final byte[] buffer = new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xF0}; try (final BitStreamReader reader = new ByteArrayBitStreamReader(buffer, bitSize)) { assertEquals(bitSize, reader.getBufferBitSize()); @@ -109,7 +110,7 @@ public void readUnalignedData() throws IOException @Test public void rangeMinException() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -124,7 +125,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void rangeMaxException() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -139,7 +140,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void bitOffset() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -151,7 +152,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readByte() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -185,7 +186,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readUnsignedByte() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -215,7 +216,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readUnsignedInt1() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -230,7 +231,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readUnsignedShort() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -245,7 +246,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void bitStreamReader() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -288,7 +289,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readByteNotAligned() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -311,7 +312,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void setBitPosition() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -357,7 +358,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void signedBitfield1() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException { @@ -400,16 +401,14 @@ public void signedBitfield2() throws IOException @Test public void signedBitfield3() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException - { - } + {} @Override public void read(ByteArrayBitStreamReader reader) throws IOException - { - } + {} }); try (final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter()) @@ -445,7 +444,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void alignTo() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -461,7 +460,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void skipBits() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -475,7 +474,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readLong() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException { @@ -495,7 +494,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readInt() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException { @@ -515,7 +514,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readString() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException { @@ -542,19 +541,14 @@ private void writeString(ImageOutputStream writer, String s) throws IOException writer.write(s.getBytes("UTF8")); } - private /*static*/ final String DATA[] = - { - "", - "tmp", - "test" - }; + private /*static*/ final String DATA[] = {"", "tmp", "test"}; }); } @Test public void readBool() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException { @@ -579,19 +573,14 @@ private void writeBool(ImageOutputStream writer, boolean value) throws IOExcepti writer.writeBit(value ? 1 : 0); } - private /*static*/ final boolean DATA[] = - { - false, - false, - true - }; + private /*static*/ final boolean DATA[] = {false, false, true}; }); } @Test public void readBigInteger() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ImageOutputStream writer) throws IOException { @@ -611,7 +600,7 @@ public void read(ByteArrayBitStreamReader reader) throws IOException @Test public void readSignedBigInteger() throws IOException { - writeReadTest(new SampleWriteReadTest(){ + writeReadTest(new SampleWriteReadTest() { @Override public void read(ByteArrayBitStreamReader reader) throws IOException { @@ -668,11 +657,8 @@ public void readTooMuch() throws IOException @Test public void readUnaligned63Bits() throws IOException { - final byte[] data = - { - (byte)0x0f, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, - (byte)0xe0 - }; + final byte[] data = {(byte)0x0f, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, + (byte)0xff, (byte)0xe0}; try (final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(data)) { diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamStringTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamStringTest.java index 8ed50ce5f..50c50387f 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamStringTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamStringTest.java @@ -1,7 +1,6 @@ package zserio.runtime.io; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -10,6 +9,8 @@ import java.io.PrintStream; import java.io.Reader; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamStringTest { @Test @@ -90,7 +91,7 @@ private void writeZserioAndReadJdk(final String s1, final String s2, final Strin writer.writeString(s3); try (final Reader fileReader = new InputStreamReader( - new ByteArrayInputStream(writer.toByteArray()), "UTF-8")) + new ByteArrayInputStream(writer.toByteArray()), "UTF-8")) { numChars = fileReader.read(charBuffer); } @@ -132,7 +133,8 @@ private void writeZserioAndReadZserio(final String s1, final String s2, final St } } - private void writeZserioAndReadZserioUnaligned(final String s1, final String s2, final String s3) throws IOException + private void writeZserioAndReadZserioUnaligned(final String s1, final String s2, final String s3) + throws IOException { try (final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter()) { diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamTest.java index b339e8d34..73f86a4a4 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamTest.java @@ -1,14 +1,15 @@ package zserio.runtime.io; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.reflect.*; import java.math.BigInteger; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamTest { @Test @@ -22,17 +23,16 @@ public void unsignedBits() throws Exception { // max value and some smaller values final long maxValue = (1L << numBits) - 1; - final Long data[] = - { - maxValue, - maxValue >> 1, - maxValue >> 2, - 1L, - 0L, - 1L, - maxValue >> 2, - maxValue >> 1, - maxValue + final Long data[] = { + maxValue, + maxValue >> 1, + maxValue >> 2, + 1L, + 0L, + 1L, + maxValue >> 2, + maxValue >> 1, + maxValue, }; testBitsImpl(writeMethod, readMethod, data, numBits); @@ -51,21 +51,20 @@ public void signedBits() throws Exception // min and max values and some smaller values final long minValue = -1L << (numBits - 1); final long maxValue = (1L << (numBits - 1)) - 1; - final Long data[] = - { - minValue, - maxValue, - minValue >> 1, - maxValue >> 1, - minValue >> 2, - maxValue >> 2, - 0L, - maxValue >> 2, - minValue >> 2, - maxValue >> 1, - minValue >> 1, - maxValue, - minValue + final Long data[] = { + minValue, + maxValue, + minValue >> 1, + maxValue >> 1, + minValue >> 2, + maxValue >> 2, + 0L, + maxValue >> 2, + minValue >> 2, + maxValue >> 1, + minValue >> 1, + maxValue, + minValue, }; testBitsImpl(writeMethod, readMethod, data, numBits); @@ -76,19 +75,18 @@ public void signedBits() throws Exception public void unsignedInt() throws Exception { long maxValue = (1L << 32) - 1; - Long values[] = - { - maxValue, - maxValue >> 8, - maxValue >> 16, - maxValue >> 24, - 1L, - 0L, - 1L, - maxValue >> 24, - maxValue >> 16, - maxValue >> 8, - maxValue + Long values[] = { + maxValue, + maxValue >> 8, + maxValue >> 16, + maxValue >> 24, + 1L, + 0L, + 1L, + maxValue >> 24, + maxValue >> 16, + maxValue >> 8, + maxValue, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeUnsignedInt", long.class); @@ -101,29 +99,28 @@ public void signedInt() throws Exception { int minValue = Integer.MIN_VALUE; int maxValue = Integer.MAX_VALUE; - Integer values[] = - { - minValue, - maxValue, - minValue >> 8, - maxValue >> 8, - minValue >> 16, - maxValue >> 16, - minValue >> 24, - maxValue >> 24, - -1, - 1, - 0, - 1, - -1, - maxValue >> 24, - minValue >> 24, - maxValue >> 16, - minValue >> 16, - maxValue >> 8, - minValue >> 8, - maxValue, - minValue + Integer values[] = { + minValue, + maxValue, + minValue >> 8, + maxValue >> 8, + minValue >> 16, + maxValue >> 16, + minValue >> 24, + maxValue >> 24, + -1, + 1, + 0, + 1, + -1, + maxValue >> 24, + minValue >> 24, + maxValue >> 16, + minValue >> 16, + maxValue >> 8, + minValue >> 8, + maxValue, + minValue, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeInt", int.class); @@ -135,15 +132,14 @@ public void signedInt() throws Exception public void unsignedShort() throws Exception { int maxValue = (1 << 16) - 1; - Integer values[] = - { - maxValue, - maxValue >> 8, - 1, - 0, - 1, - maxValue >> 8, - maxValue + Integer values[] = { + maxValue, + maxValue >> 8, + 1, + 0, + 1, + maxValue >> 8, + maxValue, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeUnsignedShort", int.class); @@ -156,21 +152,20 @@ public void signedShort() throws Exception { short minValue = Short.MIN_VALUE; short maxValue = Short.MAX_VALUE; - Short values[] = - { - minValue, - maxValue, - (short)(minValue >> 8), - (short)(maxValue >> 8), - -1, - 1, - 0, - 1, - -1, - (short)(maxValue >> 8), - (short)(minValue >> 8), - maxValue, - minValue + Short values[] = { + minValue, + maxValue, + (short)(minValue >> 8), + (short)(maxValue >> 8), + -1, + 1, + 0, + 1, + -1, + (short)(maxValue >> 8), + (short)(minValue >> 8), + maxValue, + minValue, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeShort", short.class); @@ -182,15 +177,14 @@ public void signedShort() throws Exception public void unsignedByte() throws Exception { short maxValue = (1 << 8) - 1; - Short values[] = - { - maxValue, - (short)(maxValue >> 4), - 1, - 0, - 1, - (short)(maxValue >> 4), - maxValue + Short values[] = { + maxValue, + (short)(maxValue >> 4), + 1, + 0, + 1, + (short)(maxValue >> 4), + maxValue, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeUnsignedByte", short.class); @@ -203,21 +197,20 @@ public void signedByte() throws Exception { byte minValue = Byte.MIN_VALUE; byte maxValue = Byte.MAX_VALUE; - Byte values[] = - { - minValue, - maxValue, - (byte)(minValue >> 4), - (byte)(maxValue >> 4), - -1, - 1, - 0, - 1, - -1, - (byte)(maxValue >> 4), - (byte)(minValue >> 4), - maxValue, - minValue + Byte values[] = { + minValue, + maxValue, + (byte)(minValue >> 4), + (byte)(maxValue >> 4), + -1, + 1, + 0, + 1, + -1, + (byte)(maxValue >> 4), + (byte)(minValue >> 4), + maxValue, + minValue, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeByte", byte.class); @@ -229,34 +222,33 @@ public void signedByte() throws Exception public void bigInteger() throws Exception { // single method for both signed and unsigned writing - Method writeMethod = ByteArrayBitStreamWriter.class.getMethod( - "writeBigInteger", BigInteger.class, int.class); + Method writeMethod = + ByteArrayBitStreamWriter.class.getMethod("writeBigInteger", BigInteger.class, int.class); Method readMethod = ByteArrayBitStreamReader.class.getMethod("readBigInteger", int.class); // all possible numBits for (int numBits = 1; numBits < 65; ++numBits) { BigInteger maxValue = BigInteger.ONE.shiftLeft(numBits).subtract(BigInteger.ONE); - BigInteger values[] = - { - maxValue, - maxValue.shiftRight(8), - maxValue.shiftRight(16), - maxValue.shiftRight(24), - maxValue.shiftRight(32), - maxValue.shiftRight(40), - maxValue.shiftRight(48), - maxValue.shiftRight(56), - BigInteger.ONE, - BigInteger.ZERO, - BigInteger.ONE, - maxValue.shiftRight(56), - maxValue.shiftRight(48), - maxValue.shiftRight(40), - maxValue.shiftRight(32), - maxValue.shiftRight(24), - maxValue.shiftRight(16), - maxValue.shiftRight(8) + BigInteger values[] = { + maxValue, + maxValue.shiftRight(8), + maxValue.shiftRight(16), + maxValue.shiftRight(24), + maxValue.shiftRight(32), + maxValue.shiftRight(40), + maxValue.shiftRight(48), + maxValue.shiftRight(56), + BigInteger.ONE, + BigInteger.ZERO, + BigInteger.ONE, + maxValue.shiftRight(56), + maxValue.shiftRight(48), + maxValue.shiftRight(40), + maxValue.shiftRight(32), + maxValue.shiftRight(24), + maxValue.shiftRight(16), + maxValue.shiftRight(8), }; testBitsImpl(writeMethod, readMethod, values, numBits); @@ -267,8 +259,8 @@ public void bigInteger() throws Exception public void signedBigInteger() throws Exception { // single method for both signed and unsigned writing - Method writeMethod = ByteArrayBitStreamWriter.class.getMethod( - "writeBigInteger", BigInteger.class, int.class); + Method writeMethod = + ByteArrayBitStreamWriter.class.getMethod("writeBigInteger", BigInteger.class, int.class); Method readMethod = ByteArrayBitStreamReader.class.getMethod("readSignedBigInteger", int.class); // all possible numBits @@ -276,39 +268,38 @@ public void signedBigInteger() throws Exception { BigInteger maxValue = BigInteger.ONE.shiftLeft(numBits - 1).subtract(BigInteger.ONE); BigInteger minValue = maxValue.negate(); - BigInteger values[] = - { - minValue, - maxValue, - minValue.shiftRight(8), - maxValue.shiftRight(8), - minValue.shiftRight(16), - maxValue.shiftRight(16), - minValue.shiftRight(24), - maxValue.shiftRight(24), - minValue.shiftRight(32), - maxValue.shiftRight(32), - minValue.shiftRight(40), - maxValue.shiftRight(40), - minValue.shiftRight(48), - maxValue.shiftRight(48), - minValue.shiftRight(56), - maxValue.shiftRight(56), - BigInteger.ZERO, - maxValue.shiftRight(56), - minValue.shiftRight(56), - maxValue.shiftRight(48), - minValue.shiftRight(48), - maxValue.shiftRight(40), - minValue.shiftRight(40), - maxValue.shiftRight(32), - minValue.shiftRight(32), - maxValue.shiftRight(24), - minValue.shiftRight(24), - maxValue.shiftRight(16), - minValue.shiftRight(16), - maxValue.shiftRight(8), - minValue.shiftRight(8) + BigInteger values[] = { + minValue, + maxValue, + minValue.shiftRight(8), + maxValue.shiftRight(8), + minValue.shiftRight(16), + maxValue.shiftRight(16), + minValue.shiftRight(24), + maxValue.shiftRight(24), + minValue.shiftRight(32), + maxValue.shiftRight(32), + minValue.shiftRight(40), + maxValue.shiftRight(40), + minValue.shiftRight(48), + maxValue.shiftRight(48), + minValue.shiftRight(56), + maxValue.shiftRight(56), + BigInteger.ZERO, + maxValue.shiftRight(56), + minValue.shiftRight(56), + maxValue.shiftRight(48), + minValue.shiftRight(48), + maxValue.shiftRight(40), + minValue.shiftRight(40), + maxValue.shiftRight(32), + minValue.shiftRight(32), + maxValue.shiftRight(24), + minValue.shiftRight(24), + maxValue.shiftRight(16), + minValue.shiftRight(16), + maxValue.shiftRight(8), + minValue.shiftRight(8), }; testBitsImpl(writeMethod, readMethod, values, numBits); @@ -318,16 +309,15 @@ public void signedBigInteger() throws Exception @Test public void float16() throws Exception { - Float values[] = - { - -42.5f, - -2.0f, - 0.0f, - 0.6171875f, - 0.875f, - 2.0f, - 9.875f, - 42.5f + Float values[] = { + -42.5f, + -2.0f, + 0.0f, + 0.6171875f, + 0.875f, + 2.0f, + 9.875f, + 42.5f, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeFloat16", float.class); @@ -338,16 +328,15 @@ public void float16() throws Exception @Test public void float32() throws Exception { - Float values[] = - { - -42.5f, - -2.0f, - 0.0f, - 0.6171875f, - 0.875f, - 2.0f, - 9.875f, - 42.5f + Float values[] = { + -42.5f, + -2.0f, + 0.0f, + 0.6171875f, + 0.875f, + 2.0f, + 9.875f, + 42.5f, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeFloat32", float.class); @@ -358,16 +347,15 @@ public void float32() throws Exception @Test public void float64() throws Exception { - Double values[] = - { - -42.5, - -2.0, - 0.0, - 0.6171875, - 0.875, - 2.0, - 9.875, - 42.5 + Double values[] = { + -42.5, + -2.0, + 0.0, + 0.6171875, + 0.875, + 2.0, + 9.875, + 42.5, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeFloat64", double.class); @@ -378,10 +366,9 @@ public void float64() throws Exception @Test public void bitBuffer() throws Exception { - BitBuffer values[] = - { - new BitBuffer(new byte[]{(byte)0xAB, (byte)0x07}, 11), - new BitBuffer(new byte[]{(byte)0xAB, (byte)0xCD, (byte)0x7F}, 23) + BitBuffer values[] = { + new BitBuffer(new byte[] {(byte)0xAB, (byte)0x07}, 11), + new BitBuffer(new byte[] {(byte)0xAB, (byte)0xCD, (byte)0x7F}, 23), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeBitBuffer", BitBuffer.class); @@ -392,14 +379,11 @@ public void bitBuffer() throws Exception @Test public void string() throws Exception { - String values[] = - { - "Hello World", - "\n\t%^@(*aAzZ01234569$%^!?<>[]](){}-=+~:;/|\\\"\'Hello World2\0nonWrittenPart", - "Price: " + - new String(new byte[] { (byte)0xE2, (byte)0x82, (byte)0x93 }, "UTF-8") + - " 3 what's this? -> " + - new String(new byte[] { (byte)0xC2, (byte)0xA2 }, "UTF-8") + String values[] = { + "Hello World", + "\n\t%^@(*aAzZ01234569$%^!?<>[]](){}-=+~:;/|\\\"\'Hello World2\0nonWrittenPart", + "Price: " + new String(new byte[] {(byte)0xE2, (byte)0x82, (byte)0x93}, "UTF-8") + + " 3 what's this? -> " + new String(new byte[] {(byte)0xC2, (byte)0xA2}, "UTF-8"), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeString", String.class); @@ -410,10 +394,9 @@ public void string() throws Exception @Test public void bytes() throws Exception { - byte values[][] = - { - {(byte)0, (byte)255}, - {(byte)1, (byte)127, (byte)128, (byte)254} + byte values[][] = { + {(byte)0, (byte)255}, + {(byte)1, (byte)127, (byte)128, (byte)254}, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeBytes", byte[].class); @@ -424,21 +407,20 @@ public void bytes() throws Exception @Test public void bool() throws Exception { - Boolean values[] = - { - false, - true, - true, - false, - false, - true, - false, - true, - false, - false, - true, - true, - false + Boolean values[] = { + false, + true, + true, + false, + false, + true, + false, + true, + false, + false, + true, + true, + false, }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeBool", boolean.class); @@ -449,19 +431,18 @@ public void bool() throws Exception @Test public void varInt16() throws Exception { - Short values[] = - { - // 1 byte - (short)0, - -(short)1, - +(short)1, - -(short)((1 << (6)) - 1), - +(short)((1 << (6)) - 1), - // 2 bytes - -(short)((1 << (6))), - +(short)((1 << (6))), - -(short)((1 << (6 + 8)) - 1), - +(short)((1 << (6 + 8)) - 1), + Short values[] = { + // 1 byte + (short)0, + -(short)1, + +(short)1, + -(short)((1 << (6)) - 1), + +(short)((1 << (6)) - 1), + // 2 bytes + -(short)((1 << (6))), + +(short)((1 << (6))), + -(short)((1 << (6 + 8)) - 1), + +(short)((1 << (6 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarInt16", short.class); @@ -472,29 +453,28 @@ public void varInt16() throws Exception @Test public void varInt32() throws Exception { - Integer values[] = - { - // 1 byte - 0, - -((1)), - +((1)), - -((1 << (6)) - 1), - +((1 << (6)) - 1), - // 2 bytes - -((1 << (6))), - +((1 << (6))), - -((1 << (6 + 7)) - 1), - +((1 << (6 + 7)) - 1), - // 3 bytes - -((1 << (6 + 7))), - +((1 << (6 + 7))), - -((1 << (6 + 7 + 7)) - 1), - +((1 << (6 + 7 + 7)) - 1), - // 4 bytes - -((1 << (6 + 7 + 7))), - +((1 << (6 + 7 + 7))), - -((1 << (6 + 7 + 7 + 8)) - 1), - +((1 << (6 + 7 + 7 + 8)) - 1) + Integer values[] = { + // 1 byte + 0, + -((1)), + +((1)), + -((1 << (6)) - 1), + +((1 << (6)) - 1), + // 2 bytes + -((1 << (6))), + +((1 << (6))), + -((1 << (6 + 7)) - 1), + +((1 << (6 + 7)) - 1), + // 3 bytes + -((1 << (6 + 7))), + +((1 << (6 + 7))), + -((1 << (6 + 7 + 7)) - 1), + +((1 << (6 + 7 + 7)) - 1), + // 4 bytes + -((1 << (6 + 7 + 7))), + +((1 << (6 + 7 + 7))), + -((1 << (6 + 7 + 7 + 8)) - 1), + +((1 << (6 + 7 + 7 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarInt32", int.class); @@ -505,49 +485,48 @@ public void varInt32() throws Exception @Test public void varInt64() throws Exception { - Long values[] = - { - // 1 byte - 0L, - -((1L)), - +((1L)), - -((1L << (6)) - 1), - +((1L << (6)) - 1), - // 2 bytes - -((1L << (6))), - +((1L << (6))), - -((1L << (6 + 7)) - 1), - +((1L << (6 + 7)) - 1), - // 3 bytes - -((1L << (6 + 7))), - +((1L << (6 + 7))), - -((1L << (6 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7)) - 1), - // 4 bytes - -((1L << (6 + 7 + 7))), - +((1L << (6 + 7 + 7))), - -((1L << (6 + 7 + 7 + 8)) - 1), - +((1L << (6 + 7 + 7 + 8)) - 1) - // 5 bytes - -((1L << (6 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7)) - 1), - // 6 bytes - -((1L << (6 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), - // 7 bytes - -((1L << (6 + 7 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - // 8 bytes - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), + Long values[] = { + // 1 byte + 0L, + -((1L)), + +((1L)), + -((1L << (6)) - 1), + +((1L << (6)) - 1), + // 2 bytes + -((1L << (6))), + +((1L << (6))), + -((1L << (6 + 7)) - 1), + +((1L << (6 + 7)) - 1), + // 3 bytes + -((1L << (6 + 7))), + +((1L << (6 + 7))), + -((1L << (6 + 7 + 7)) - 1), + +((1L << (6 + 7 + 7)) - 1), + // 4 bytes + -((1L << (6 + 7 + 7))), + +((1L << (6 + 7 + 7))), + -((1L << (6 + 7 + 7 + 8)) - 1), + +((1L << (6 + 7 + 7 + 8)) - 1) + // 5 bytes + - ((1L << (6 + 7 + 7 + 7))), + +((1L << (6 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7)) - 1), + +((1L << (6 + 7 + 7 + 7 + 7)) - 1), + // 6 bytes + -((1L << (6 + 7 + 7 + 7 + 7))), + +((1L << (6 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), + +((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), + // 7 bytes + -((1L << (6 + 7 + 7 + 7 + 7 + 7))), + +((1L << (6 + 7 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), + +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), + // 8 bytes + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), + +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), + +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarInt64", long.class); @@ -558,15 +537,14 @@ public void varInt64() throws Exception @Test public void varUInt16() throws Exception { - Short values[] = - { - // 1 byte - (short)0, - (short)1, - (short)((1 << (7)) - 1), - // 2 bytes - (short)((1 << (7))), - (short)((1 << (7 + 8)) - 1), + Short values[] = { + // 1 byte + (short)0, + (short)1, + (short)((1 << (7)) - 1), + // 2 bytes + (short)((1 << (7))), + (short)((1 << (7 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarUInt16", short.class); @@ -577,21 +555,20 @@ public void varUInt16() throws Exception @Test public void varUInt32() throws Exception { - Integer values[] = - { - // 1 byte - ((0)), - ((1)), - ((1 << (7)) - 1), - // 2 bytes - ((1 << (7))), - ((1 << (7 + 7)) - 1), - // 3 bytes - ((1 << (7 + 7))), - ((1 << (7 + 7 + 7)) - 1), - // 4 bytes - ((1 << (7 + 7 + 7))), - ((1 << (7 + 7 + 7 + 8)) - 1) + Integer values[] = { + // 1 byte + ((0)), + ((1)), + ((1 << (7)) - 1), + // 2 bytes + ((1 << (7))), + ((1 << (7 + 7)) - 1), + // 3 bytes + ((1 << (7 + 7))), + ((1 << (7 + 7 + 7)) - 1), + // 4 bytes + ((1 << (7 + 7 + 7))), + ((1 << (7 + 7 + 7 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarUInt32", int.class); @@ -602,33 +579,32 @@ public void varUInt32() throws Exception @Test public void varUInt64() throws Exception { - Long values[] = - { - // 1 byte - ((0L)), - ((1L)), - ((1L << (7)) - 1), - // 2 bytes - ((1L << (7))), - ((1L << (7 + 7)) - 1), - // 3 bytes - ((1L << (7 + 7))), - ((1L << (7 + 7 + 7)) - 1), - // 4 bytes - ((1L << (7 + 7 + 7))), - ((1L << (7 + 7 + 7 + 8)) - 1), - // 5 bytes - ((1L << (7 + 7 + 7 + 7))), - ((1L << (7 + 7 + 7 + 7 + 7)) - 1), - // 6 bytes - ((1L << (7 + 7 + 7 + 7 + 7))), - ((1L << (7 + 7 + 7 + 7 + 7 + 7)) - 1), - // 7 bytes - ((1L << (7 + 7 + 7 + 7 + 7 + 7))), - ((1L << (7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - // 8 bytes - ((1L << (7 + 7 + 7 + 7 + 7 + 7 + 7))), - ((1L << (7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), + Long values[] = { + // 1 byte + ((0L)), + ((1L)), + ((1L << (7)) - 1), + // 2 bytes + ((1L << (7))), + ((1L << (7 + 7)) - 1), + // 3 bytes + ((1L << (7 + 7))), + ((1L << (7 + 7 + 7)) - 1), + // 4 bytes + ((1L << (7 + 7 + 7))), + ((1L << (7 + 7 + 7 + 8)) - 1), + // 5 bytes + ((1L << (7 + 7 + 7 + 7))), + ((1L << (7 + 7 + 7 + 7 + 7)) - 1), + // 6 bytes + ((1L << (7 + 7 + 7 + 7 + 7))), + ((1L << (7 + 7 + 7 + 7 + 7 + 7)) - 1), + // 7 bytes + ((1L << (7 + 7 + 7 + 7 + 7 + 7))), + ((1L << (7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), + // 8 bytes + ((1L << (7 + 7 + 7 + 7 + 7 + 7 + 7))), + ((1L << (7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarUInt64", long.class); @@ -639,56 +615,35 @@ public void varUInt64() throws Exception @Test public void varInt() throws Exception { - Long values[] = - { - // 1 byte - 0L, - -((1L)), - +((1L)), - -((1L << (6)) - 1), - +((1L << (6)) - 1), - // 2 bytes - -((1L << (6))), - +((1L << (6))), - -((1L << (6 + 7)) - 1), - +((1L << (6 + 7)) - 1), - // 3 bytes - -((1L << (6 + 7))), - +((1L << (6 + 7))), - -((1L << (6 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7)) - 1), - // 4 bytes - -((1L << (6 + 7 + 7))), - +((1L << (6 + 7 + 7))), - -((1L << (6 + 7 + 7 + 8)) - 1), - +((1L << (6 + 7 + 7 + 8)) - 1) - // 5 bytes - -((1L << (6 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7)) - 1), - // 6 bytes - -((1L << (6 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), - // 7 bytes - -((1L << (6 + 7 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - // 8 bytes - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), - // 9 bytes - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7))), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7))), - -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), - +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), - // 1 byte - Long.MIN_VALUE // special case, encoded as -0 + Long values[] = { + // 1 byte + 0L, -((1L)), +((1L)), -((1L << (6)) - 1), +((1L << (6)) - 1), + // 2 bytes + -((1L << (6))), +((1L << (6))), -((1L << (6 + 7)) - 1), +((1L << (6 + 7)) - 1), + // 3 bytes + -((1L << (6 + 7))), +((1L << (6 + 7))), -((1L << (6 + 7 + 7)) - 1), +((1L << (6 + 7 + 7)) - 1), + // 4 bytes + -((1L << (6 + 7 + 7))), +((1L << (6 + 7 + 7))), -((1L << (6 + 7 + 7 + 8)) - 1), + +((1L << (6 + 7 + 7 + 8)) - 1) + // 5 bytes + - ((1L << (6 + 7 + 7 + 7))), + +((1L << (6 + 7 + 7 + 7))), -((1L << (6 + 7 + 7 + 7 + 7)) - 1), + +((1L << (6 + 7 + 7 + 7 + 7)) - 1), + // 6 bytes + -((1L << (6 + 7 + 7 + 7 + 7))), +((1L << (6 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), +((1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1), + // 7 bytes + -((1L << (6 + 7 + 7 + 7 + 7 + 7))), +((1L << (6 + 7 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), + // 8 bytes + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1), + // 9 bytes + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7))), +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7))), + -((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), + +((1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1), + // 1 byte + Long.MIN_VALUE, // special case, encoded as -0 }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarInt", long.class); @@ -699,36 +654,35 @@ public void varInt() throws Exception @Test public void varUInt() throws Exception { - BigInteger values[] = - { - // 1 byte - BigInteger.ZERO, - BigInteger.ONE, - BigInteger.ONE.shiftLeft(7).subtract(BigInteger.ONE), - // 2 bytes - BigInteger.ONE.shiftLeft(7), - BigInteger.ONE.shiftLeft(7 + 7).subtract(BigInteger.ONE), - // 3 bytes - BigInteger.ONE.shiftLeft(7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7).subtract(BigInteger.ONE), - // 4 bytes - BigInteger.ONE.shiftLeft(7 + 7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7).subtract(BigInteger.ONE), - // 5 bytes - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), - // 6 bytes - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), - // 7 bytes - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), - // 8 bytes - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), - // 9 bytes - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7 + 7), - BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8).subtract(BigInteger.ONE) + BigInteger values[] = { + // 1 byte + BigInteger.ZERO, + BigInteger.ONE, + BigInteger.ONE.shiftLeft(7).subtract(BigInteger.ONE), + // 2 bytes + BigInteger.ONE.shiftLeft(7), + BigInteger.ONE.shiftLeft(7 + 7).subtract(BigInteger.ONE), + // 3 bytes + BigInteger.ONE.shiftLeft(7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7).subtract(BigInteger.ONE), + // 4 bytes + BigInteger.ONE.shiftLeft(7 + 7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7).subtract(BigInteger.ONE), + // 5 bytes + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), + // 6 bytes + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), + // 7 bytes + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), + // 8 bytes + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7 + 7).subtract(BigInteger.ONE), + // 9 bytes + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7 + 7), + BigInteger.ONE.shiftLeft(7 + 7 + 7 + 7 + 7 + 7 + 7 + 7 + 8).subtract(BigInteger.ONE), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarUInt", BigInteger.class); @@ -739,24 +693,23 @@ public void varUInt() throws Exception @Test public void varSize() throws Exception { - Integer values[] = - { - // 1 byte - ((0)), - ((1)), - ((1 << (7)) - 1), - // 2 bytes - ((1 << (7))), - ((1 << (7 + 7)) - 1), - // 3 bytes - ((1 << (7 + 7))), - ((1 << (7 + 7 + 7)) - 1), - // 4 bytes - ((1 << (7 + 7 + 7))), - ((1 << (7 + 7 + 7 + 7)) - 1), - // 5 bytes - ((1 << (7 + 7 + 7 + 7))), - ((1 << (2 + 7 + 7 + 7 + 8)) - 1) + Integer values[] = { + // 1 byte + ((0)), + ((1)), + ((1 << (7)) - 1), + // 2 bytes + ((1 << (7))), + ((1 << (7 + 7)) - 1), + // 3 bytes + ((1 << (7 + 7))), + ((1 << (7 + 7 + 7)) - 1), + // 4 bytes + ((1 << (7 + 7 + 7))), + ((1 << (7 + 7 + 7 + 7)) - 1), + // 5 bytes + ((1 << (7 + 7 + 7 + 7))), + ((1 << (2 + 7 + 7 + 7 + 8)) - 1), }; Method writeMethod = ByteArrayBitStreamWriter.class.getMethod("writeVarSize", int.class); @@ -842,8 +795,8 @@ public void alignTo() throws IOException } } - private void testImpl(Method writeMethod, Method readMethod, Object[] values, - int maxStartBitPos) throws Exception + private void testImpl(Method writeMethod, Method readMethod, Object[] values, int maxStartBitPos) + throws Exception { try { @@ -875,8 +828,7 @@ private void testImpl(Method writeMethod, Method readMethod, Object[] values, } catch (AssertionError e) { - throw new AssertionError( - "[bitPos=" + bitPos + "]: " + e.getMessage()); + throw new AssertionError("[bitPos=" + bitPos + "]: " + e.getMessage()); } } } @@ -886,8 +838,8 @@ private void testImpl(Method writeMethod, Method readMethod, Object[] values, } } - private void testBitsImpl(Method writeMethod, Method readMethod, - Object[] values, int numBits) throws Exception + private void testBitsImpl(Method writeMethod, Method readMethod, Object[] values, int numBits) + throws Exception { try { diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarIntTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarIntTest.java index 291cd3eba..4d7d1fb6d 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarIntTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarIntTest.java @@ -1,10 +1,11 @@ package zserio.runtime.io; import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Test; import java.io.IOException; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamVarIntTest { @Test diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarNumTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarNumTest.java index 78040b520..8548aa8aa 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarNumTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarNumTest.java @@ -1,89 +1,90 @@ package zserio.runtime.io; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.allOf; -import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.CoreMatchers.endsWith; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; import java.io.IOException; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamVarNumTest { @Test public void varOutOfRange() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(BitStreamWriter writer) throws IOException { // make sure writer is working writeSentinel(writer); - IOException thrown = assertThrows(IOException.class, - () -> writer.writeVarUInt16((short)(((short)1) << (7 + 8)))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varuint16!"))); + IOException thrown = assertThrows( + IOException.class, () -> writer.writeVarUInt16((short)(((short)1) << (7 + 8)))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varuint16!"))); thrown = assertThrows(IOException.class, () -> writer.writeVarUInt32(1 << (7 + 7 + 7 + 8))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varuint32!"))); - - thrown = assertThrows(IOException.class, - () -> writer.writeVarUInt64(1L << (7 + 7 + 7 + 7 + 7 + 7 + 7 + 8))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varuint64!"))); - - thrown = assertThrows(IOException.class, - () -> writer.writeVarInt16((short)(((short)1) << (6 + 8)))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varint16!"))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varuint32!"))); + + thrown = assertThrows( + IOException.class, () -> writer.writeVarUInt64(1L << (7 + 7 + 7 + 7 + 7 + 7 + 7 + 8))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varuint64!"))); + + thrown = assertThrows( + IOException.class, () -> writer.writeVarInt16((short)(((short)1) << (6 + 8)))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varint16!"))); thrown = assertThrows(IOException.class, () -> writer.writeVarInt32(1 << (6 + 7 + 7 + 8))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varint32!"))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varint32!"))); - thrown = assertThrows(IOException.class, - () -> writer.writeVarInt64(1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varint64!"))); + thrown = assertThrows( + IOException.class, () -> writer.writeVarInt64(1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varint64!"))); thrown = assertThrows(IOException.class, () -> writer.writeVarSize(1 << (2 + 7 + 7 + 7 + 8))); - assertThat(thrown.getMessage(), allOf( - startsWith("BitSizeOfCalculator: Value '"), - endsWith("' is out of range for varsize!"))); + assertThat(thrown.getMessage(), + allOf(startsWith("BitSizeOfCalculator: Value '"), + endsWith("' is out of range for varsize!"))); { // overflow, 2^32 - 1 is too much ({ 0x83, 0xFF, 0xFF, 0xFF, 0xFF } is the maximum) - final byte[] buffer = new byte[] { (byte) 0x8F, (byte)0xFF, (byte)0xFF, (byte)0xFF, - (byte)0xFF }; + final byte[] buffer = + new byte[] {(byte)0x8F, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF}; try (final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(buffer)) { thrown = assertThrows(IOException.class, () -> reader.readVarSize()); - assertThat(thrown.getMessage(), allOf( - startsWith("ByteArrayBitStreamReader: Read value '"), - endsWith("' is out of range for varsize type!"))); + assertThat(thrown.getMessage(), + allOf(startsWith("ByteArrayBitStreamReader: Read value '"), + endsWith("' is out of range for varsize type!"))); } } { // overflow, 2^36 - 1 is too much ({ 0x83, 0xFF, 0xFF, 0xFF, 0xFF } is the maximum) - final byte[] buffer = new byte[] { (byte) 0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, - (byte)0xFF }; + final byte[] buffer = + new byte[] {(byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF, (byte)0xFF}; try (final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(buffer)) { thrown = assertThrows(IOException.class, () -> reader.readVarSize()); - assertThat(thrown.getMessage(), allOf( - startsWith("ByteArrayBitStreamReader: Read value '"), - endsWith("' is out of range for varsize type!"))); + assertThat(thrown.getMessage(), + allOf(startsWith("ByteArrayBitStreamReader: Read value '"), + endsWith("' is out of range for varsize type!"))); } } } @@ -99,16 +100,23 @@ public void read(BitStreamReader reader) throws IOException @Test public void varInt64() throws IOException { - final long varInt64Limits[] = - { - (1L << 0), (1L << 6) - 1, - (1L << 6), (1L << (6 + 7)) - 1, - (1L << (6 + 7)), (1L << (6 + 7 + 7)) - 1, - (1L << (6 + 7 + 7)), (1L << (6 + 7 + 7 + 7)) - 1, - (1L << (6 + 7 + 7 + 7)), (1L << (6 + 7 + 7 + 7 + 7)) - 1, - (1L << (6 + 7 + 7 + 7 + 7)), (1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1, - (1L << (6 + 7 + 7 + 7 + 7 + 7)), (1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1, - (1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)), (1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1, + final long varInt64Limits[] = { + (1L << 0), + (1L << 6) - 1, + (1L << 6), + (1L << (6 + 7)) - 1, + (1L << (6 + 7)), + (1L << (6 + 7 + 7)) - 1, + (1L << (6 + 7 + 7)), + (1L << (6 + 7 + 7 + 7)) - 1, + (1L << (6 + 7 + 7 + 7)), + (1L << (6 + 7 + 7 + 7 + 7)) - 1, + (1L << (6 + 7 + 7 + 7 + 7)), + (1L << (6 + 7 + 7 + 7 + 7 + 7)) - 1, + (1L << (6 + 7 + 7 + 7 + 7 + 7)), + (1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)) - 1, + (1L << (6 + 7 + 7 + 7 + 7 + 7 + 7)), + (1L << (6 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1, }; writeReadTest(new WriteReadTestable() { @@ -157,12 +165,15 @@ public void read(BitStreamReader reader) throws IOException @Test public void varInt32() throws IOException { - final int varInt32Limits[] = - { - (1 << 0), (1 << 6) - 1, - (1 << 6), (1 << (6 + 7)) - 1, - (1 << (6 + 7)), (1 << (6 + 7 + 7)) - 1, - (1 << (6 + 7 + 7)), (1 << (6 + 7 + 7 + 8)) - 1, + final int varInt32Limits[] = { + (1 << 0), + (1 << 6) - 1, + (1 << 6), + (1 << (6 + 7)) - 1, + (1 << (6 + 7)), + (1 << (6 + 7 + 7)) - 1, + (1 << (6 + 7 + 7)), + (1 << (6 + 7 + 7 + 8)) - 1, }; writeReadTest(new WriteReadTestable() { @@ -211,13 +222,14 @@ public void read(BitStreamReader reader) throws IOException @Test public void varInt16() throws IOException { - final short varInt16Limits[] = - { - (((short)1) << 0), (((short)1) << 6) - 1, - (((short)1) << 6), (((short)1) << (6 + 8)) - 1 + final short varInt16Limits[] = { + (((short)1) << 0), + (((short)1) << 6) - 1, + (((short)1) << 6), + (((short)1) << (6 + 8)) - 1, }; - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(BitStreamWriter writer) throws IOException { @@ -225,14 +237,14 @@ public void write(BitStreamWriter writer) throws IOException { writeSentinel(writer); writer.writeVarInt16(sanityVarNums[i]); - writer.writeVarInt16((short) - sanityVarNums[i]); + writer.writeVarInt16((short)-sanityVarNums[i]); } for (int i = 0; i < varInt16Limits.length; i++) { writeSentinel(writer); writer.writeVarInt16(varInt16Limits[i]); - writer.writeVarInt16((short) -varInt16Limits[i]); + writer.writeVarInt16((short)-varInt16Limits[i]); } writeSentinel(writer); @@ -263,19 +275,26 @@ public void read(BitStreamReader reader) throws IOException @Test public void varUInt64() throws IOException { - final long varUInt64Limits[] = - { - (1L << 0), (1L << 7) - 1, - (1L << 7), (1L << (7 + 7)) - 1, - (1L << (7 + 7)), (1L << (7 + 7 + 7)) - 1, - (1L << (7 + 7 + 7)), (1L << (7 + 7 + 7 + 7)) - 1, - (1L << (7 + 7 + 7 + 7)), (1L << (7 + 7 + 7 + 7 + 7)) - 1, - (1L << (7 + 7 + 7 + 7 + 7)), (1L << (7 + 7 + 7 + 7 + 7 + 7)) - 1, - (1L << (7 + 7 + 7 + 7 + 7 + 7)), (1L << (7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1, - (1L << (7 + 7 + 7 + 7 + 7 + 7 + 7)), (1L << (7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1, + final long varUInt64Limits[] = { + (1L << 0), + (1L << 7) - 1, + (1L << 7), + (1L << (7 + 7)) - 1, + (1L << (7 + 7)), + (1L << (7 + 7 + 7)) - 1, + (1L << (7 + 7 + 7)), + (1L << (7 + 7 + 7 + 7)) - 1, + (1L << (7 + 7 + 7 + 7)), + (1L << (7 + 7 + 7 + 7 + 7)) - 1, + (1L << (7 + 7 + 7 + 7 + 7)), + (1L << (7 + 7 + 7 + 7 + 7 + 7)) - 1, + (1L << (7 + 7 + 7 + 7 + 7 + 7)), + (1L << (7 + 7 + 7 + 7 + 7 + 7 + 7)) - 1, + (1L << (7 + 7 + 7 + 7 + 7 + 7 + 7)), + (1L << (7 + 7 + 7 + 7 + 7 + 7 + 7 + 8)) - 1, }; - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(BitStreamWriter writer) throws IOException { @@ -317,15 +336,18 @@ public void read(BitStreamReader reader) throws IOException @Test public void varUInt32() throws IOException { - final int varUInt32Limits[] = - { - (1 << 0), (1 << 7) - 1, - (1 << 7), (1 << (7 + 7)) - 1, - (1 << (7 + 7)), (1 << (7 + 7 + 7)) - 1, - (1 << (7 + 7 + 7)), (1 << (7 + 7 + 7 + 8)) - 1 + final int varUInt32Limits[] = { + (1 << 0), + (1 << 7) - 1, + (1 << 7), + (1 << (7 + 7)) - 1, + (1 << (7 + 7)), + (1 << (7 + 7 + 7)) - 1, + (1 << (7 + 7 + 7)), + (1 << (7 + 7 + 7 + 8)) - 1, }; - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(BitStreamWriter writer) throws IOException { @@ -367,13 +389,14 @@ public void read(BitStreamReader reader) throws IOException @Test public void varUInt16() throws IOException { - final short varUInt16Limits[] = - { - (((short)1) << 0), (((short)1) << 7) - 1, - (((short)1) << 7), (((short)1) << (7 + 8)) - 1 + final short varUInt16Limits[] = { + (((short)1) << 0), + (((short)1) << 7) - 1, + (((short)1) << 7), + (((short)1) << (7 + 8)) - 1, }; - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(BitStreamWriter writer) throws IOException { @@ -414,16 +437,20 @@ public void read(BitStreamReader reader) throws IOException @Test public void varSize() throws IOException { - final int varSizeLimits[] = - { - (1 << 0), (1 << 7) - 1, - (1 << 7), (1 << (7 + 7)) - 1, - (1 << (7 + 7)), (1 << (7 + 7 + 7)) - 1, - (1 << (7 + 7 + 7)), (1 << (7 + 7 + 7 + 7)) - 1, - (1 << (7 + 7 + 7 + 7)), (1 << (2 + 7 + 7 + 7 + 8)) - 1, + final int varSizeLimits[] = { + (1 << 0), + (1 << 7) - 1, + (1 << 7), + (1 << (7 + 7)) - 1, + (1 << (7 + 7)), + (1 << (7 + 7 + 7)) - 1, + (1 << (7 + 7 + 7)), + (1 << (7 + 7 + 7 + 7)) - 1, + (1 << (7 + 7 + 7 + 7)), + (1 << (2 + 7 + 7 + 7 + 8)) - 1, }; - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(BitStreamWriter writer) throws IOException { @@ -496,8 +523,5 @@ private static void readSentinel(BitStreamReader reader) throws IOException assertEquals((byte)0x00, reader.readByte()); } - private static short sanityVarNums[] = - { - 0, 10, 100 - }; + private static short sanityVarNums[] = {0, 10, 100}; } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarUIntTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarUIntTest.java index a24ef77ad..8cb21bcf2 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarUIntTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamVarUIntTest.java @@ -2,11 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.math.BigInteger; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamVarUIntTest { @Test diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamWriterTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamWriterTest.java index df37e9f77..b34b95599 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamWriterTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/ByteArrayBitStreamWriterTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -10,12 +9,14 @@ import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; +import org.junit.jupiter.api.Test; + public class ByteArrayBitStreamWriterTest { @Test public void test1() throws Exception { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -35,18 +36,18 @@ public void read(ImageInputStream reader) throws IOException } private final int[] DATA = { - 0x6, - 0x7, - 0x8, - 0x9, - 0x1, - 0x2, - 0x3, - 0x4, - 0xc, - 0xd, - 0xe, - 0xf + 0x6, + 0x7, + 0x8, + 0x9, + 0x1, + 0x2, + 0x3, + 0x4, + 0xc, + 0xd, + 0xe, + 0xf, }; }); } @@ -54,7 +55,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void test2() throws Exception { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -91,7 +92,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void test3() throws Exception { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -171,7 +172,7 @@ public void writeUnalignedData() throws IOException @Test public void writeByte() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -190,13 +191,12 @@ public void read(ImageInputStream reader) throws IOException } } - private final byte[] DATA = - { - 0, - 1, - -1, - Byte.MAX_VALUE, - Byte.MIN_VALUE + private final byte[] DATA = { + 0, + 1, + -1, + Byte.MAX_VALUE, + Byte.MIN_VALUE, }; }); } @@ -204,7 +204,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeShort() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -223,13 +223,12 @@ public void read(ImageInputStream reader) throws IOException } } - private final short[] DATA = - { - 0, - 1, - -1, - Short.MAX_VALUE, - Short.MIN_VALUE + private final short[] DATA = { + 0, + 1, + -1, + Short.MAX_VALUE, + Short.MIN_VALUE, }; }); } @@ -237,7 +236,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeInt() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -256,15 +255,14 @@ public void read(ImageInputStream reader) throws IOException } } - private final int[] DATA = - { - 0, - 1, - -1, - Integer.MIN_VALUE, - Integer.MAX_VALUE, - 127, - 137 + private final int[] DATA = { + 0, + 1, + -1, + Integer.MIN_VALUE, + Integer.MAX_VALUE, + 127, + 137, }; }); } @@ -272,7 +270,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeLong() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -291,15 +289,14 @@ public void read(ImageInputStream reader) throws IOException } } - private final long[] DATA = - { - 0, - 1, - -1, - Long.MAX_VALUE, - Long.MIN_VALUE, - 1111111111L, - 1212121212L + private final long[] DATA = { + 0, + 1, + -1, + Long.MAX_VALUE, + Long.MIN_VALUE, + 1111111111L, + 1212121212L, }; }); } @@ -307,7 +304,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeUnsignedInt() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -326,11 +323,10 @@ public void read(ImageInputStream reader) throws IOException } } - private final long[] DATA = - { - 0, - 1, - Integer.MAX_VALUE + private final long[] DATA = { + 0, + 1, + Integer.MAX_VALUE, }; }); } @@ -338,7 +334,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeUnsignedByte() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -357,10 +353,9 @@ public void read(ImageInputStream reader) throws IOException } } - private final short[] DATA = - { - 5, - Byte.MAX_VALUE + private final short[] DATA = { + 5, + Byte.MAX_VALUE, }; }); } @@ -368,7 +363,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeBigInteger() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -384,11 +379,22 @@ public void write(ByteArrayBitStreamWriter writer) throws IOException public void read(ImageInputStream reader) throws IOException { final int[] expectedBytes = { - 0x17, // 0x1, 0x7 nibbles combined - 0x7f, - 0x7f, 0xff, - 0x7f, 0xff, 0xff, 0xff, - 0x7f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff + 0x17, // 0x1, 0x7 nibbles combined + 0x7f, + 0x7f, + 0xff, + 0x7f, + 0xff, + 0xff, + 0xff, + 0x7f, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, + 0xff, }; for (int value : expectedBytes) { @@ -401,7 +407,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeFloat16() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -466,7 +472,7 @@ public void capacity() throws IOException @Test public void writeBool() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -486,10 +492,9 @@ public void read(ImageInputStream reader) throws IOException assertEquals(DATA.length, getBitOffset(reader)); } - private final boolean[] DATA = - { - true, - false + private final boolean[] DATA = { + true, + false, }; }); } @@ -517,7 +522,7 @@ public void writeBitsInvalidNumException() throws IOException { try (final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter()) { - final int numBits[] = { -1, 0, 65 }; + final int numBits[] = {-1, 0, 65}; for (int i = 0; i < numBits.length; ++i) { final int numBitsArg = numBits[i]; @@ -533,21 +538,24 @@ public void writeBitsIllegalArgumentException() throws IOException { for (int i = 1; i < 64; i++) { - final long minSigned = -(1L << (i-1)); - final long maxUnsigned = (1L << (i )) - 1; + final long minSigned = -(1L << (i - 1)); + final long maxUnsigned = (1L << (i)) - 1; - final long minSignedViolation = minSigned - 1; + final long minSignedViolation = minSigned - 1; final long maxUnsignedViolation = maxUnsigned + 1; - writer.writeBits(maxUnsigned, i); writer.writeSignedBits(minSigned, i); final int iArg = i; - assertThrows(IllegalArgumentException.class, () -> writer.writeSignedBits(minSignedViolation, iArg), + assertThrows(IllegalArgumentException.class, + () + -> writer.writeSignedBits(minSignedViolation, iArg), "unexpected success writeBits: " + minSignedViolation + " # " + i); - assertThrows(IllegalArgumentException.class, () -> writer.writeBits(maxUnsignedViolation, iArg), + assertThrows(IllegalArgumentException.class, + () + -> writer.writeBits(maxUnsignedViolation, iArg), "unexpected success writeBits: " + maxUnsignedViolation + " # " + i); } // for numBits } @@ -577,7 +585,7 @@ public void writeIllegalArgumentException() throws IOException @Test public void writeVarInt16() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -613,7 +621,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeVarInt32() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -673,7 +681,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeVarUInt16() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -690,8 +698,8 @@ public void write(ByteArrayBitStreamWriter writer) throws IOException public void read(ImageInputStream reader) throws IOException { // 1 byte - assertEquals(0x00, reader.readBits(8)); // 0 - assertEquals(0x7f, reader.readBits(8)); // 1111111b = 0x7f + assertEquals(0x00, reader.readBits(8)); // 0 + assertEquals(0x7f, reader.readBits(8)); // 1111111b = 0x7f // 2 bytes assertEquals(0x80ff, reader.readBits(16)); // 0b11111111 = 0xff @@ -703,7 +711,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeVarUInt32() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -728,8 +736,8 @@ public void write(ByteArrayBitStreamWriter writer) throws IOException public void read(ImageInputStream reader) throws IOException { // 1 byte - assertEquals(0x00, reader.readBits(8)); // 0 - assertEquals(0x7f, reader.readBits(8)); // 1111111b = 0x7f + assertEquals(0x00, reader.readBits(8)); // 0 + assertEquals(0x7f, reader.readBits(8)); // 1111111b = 0x7f // 2 bytes assertEquals(0x817f, reader.readBits(16)); @@ -749,7 +757,7 @@ public void read(ImageInputStream reader) throws IOException @Test public void writeVarSize() throws IOException { - writeReadTest(new WriteReadTestable(){ + writeReadTest(new WriteReadTestable() { @Override public void write(ByteArrayBitStreamWriter writer) throws IOException { @@ -778,8 +786,8 @@ public void write(ByteArrayBitStreamWriter writer) throws IOException public void read(ImageInputStream reader) throws IOException { // 1 byte - assertEquals(0x00, reader.readBits(8)); // 0 - assertEquals(0x7f, reader.readBits(8)); // 1111111b = 0x7f + assertEquals(0x00, reader.readBits(8)); // 0 + assertEquals(0x7f, reader.readBits(8)); // 1111111b = 0x7f // 2 bytes assertEquals(0x817f, reader.readBits(16)); @@ -840,10 +848,9 @@ private void writeReadTest(WriteReadTestable writeReadTest) throws IOException final byte[] data = writer.toByteArray(); if (method == TestMethod.UNALIGNED) trimBitFromLeft(data); - try ( - final ByteArrayInputStream inputStream = new ByteArrayInputStream(data); - final MemoryCacheImageInputStream reader = new MemoryCacheImageInputStream(inputStream); - ) + try (final ByteArrayInputStream inputStream = new ByteArrayInputStream(data); + final MemoryCacheImageInputStream reader = + new MemoryCacheImageInputStream(inputStream);) { writeReadTest.read(reader); } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/io/SerializeUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/io/SerializeUtilTest.java index 5cbb47387..85fb1b152 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/io/SerializeUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/io/SerializeUtilTest.java @@ -5,11 +5,11 @@ import org.junit.jupiter.api.Test; +import zserio.runtime.ZserioError; + import test_object.SerializeEnum; -import test_object.SerializeObject; import test_object.SerializeNested; - -import zserio.runtime.ZserioError; +import test_object.SerializeObject; public class SerializeUtilTest { @@ -62,7 +62,7 @@ public void serializeObject() @Test public void deserializeEnum() { - final BitBuffer bitBuffer = new BitBuffer(new byte[] { (byte)0x02 }, 8); + final BitBuffer bitBuffer = new BitBuffer(new byte[] {(byte)0x02}, 8); final SerializeEnum serializeEnum = SerializeUtil.deserialize(SerializeEnum.class, bitBuffer); assertEquals(SerializeEnum.VALUE3, serializeEnum); } @@ -70,28 +70,26 @@ public void deserializeEnum() @Test public void deserializeParameterizedObject() { - final BitBuffer bitBuffer = new BitBuffer(new byte[] { - (byte)0x01, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}, 40); + final BitBuffer bitBuffer = + new BitBuffer(new byte[] {(byte)0x01, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}, 40); final byte param = 0x12; - assertThrows(ZserioError.class, - () -> SerializeUtil.deserialize(SerializeNested.class, bitBuffer)); - final SerializeNested serializeNested = SerializeUtil.deserialize(SerializeNested.class, bitBuffer, - param); + assertThrows(ZserioError.class, () -> SerializeUtil.deserialize(SerializeNested.class, bitBuffer)); + final SerializeNested serializeNested = + SerializeUtil.deserialize(SerializeNested.class, bitBuffer, param); assertEquals(param, serializeNested.getParam()); assertEquals(0x01, serializeNested.getOffset()); assertEquals(0xDEADCAFEL, serializeNested.getOptionalValue()); - final BitBuffer wrongBitBuffer = new BitBuffer(new byte[] { - (byte)0x01, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}, 39); - assertThrows(ZserioError.class, - () -> SerializeUtil.deserialize(SerializeNested.class, wrongBitBuffer)); + final BitBuffer wrongBitBuffer = + new BitBuffer(new byte[] {(byte)0x01, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}, 39); + assertThrows(ZserioError.class, () -> SerializeUtil.deserialize(SerializeNested.class, wrongBitBuffer)); } @Test public void deserializeObject() { - final BitBuffer bitBuffer = new BitBuffer(new byte[] { - (byte)0x12, (byte)0x02, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}, 48); + final BitBuffer bitBuffer = new BitBuffer( + new byte[] {(byte)0x12, (byte)0x02, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}, 48); final SerializeObject serializeObject = SerializeUtil.deserialize(SerializeObject.class, bitBuffer); assertEquals(0x12, serializeObject.getParam()); final SerializeNested serializeNested = serializeObject.getNested(); @@ -146,7 +144,7 @@ public void serializeObjectToBytes() @Test public void deserializeEnumFromBytes() { - final byte[] buffer = new byte[] { (byte)0x02 }; + final byte[] buffer = new byte[] {(byte)0x02}; final SerializeEnum serializeEnum = SerializeUtil.deserializeFromBytes(SerializeEnum.class, buffer); assertEquals(SerializeEnum.VALUE3, serializeEnum); } @@ -156,15 +154,15 @@ public void deserializeParameterizedObjectFromBytes() { final byte[] buffer = new byte[] {(byte)0x01, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}; final byte param = 0x12; - assertThrows(ZserioError.class, - () -> SerializeUtil.deserializeFromBytes(SerializeNested.class, buffer)); + assertThrows( + ZserioError.class, () -> SerializeUtil.deserializeFromBytes(SerializeNested.class, buffer)); final SerializeNested serializeNested = SerializeUtil.deserializeFromBytes(SerializeNested.class, buffer, param); assertEquals(param, serializeNested.getParam()); assertEquals(0x01, serializeNested.getOffset()); assertEquals(0xDEADCAFEL, serializeNested.getOptionalValue()); - final byte[] wrongBuffer = new byte[] { (byte)0x00, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE }; + final byte[] wrongBuffer = new byte[] {(byte)0x00, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}; assertThrows(ZserioError.class, () -> SerializeUtil.deserializeFromBytes(SerializeNested.class, wrongBuffer)); } @@ -172,8 +170,8 @@ public void deserializeParameterizedObjectFromBytes() @Test public void deserializeObjectFromBytes() { - final byte[] buffer = new byte[] {(byte)0x12, (byte)0x02, (byte)0xDE, (byte)0xAD, (byte)0xCA, - (byte)0xFE}; + final byte[] buffer = + new byte[] {(byte)0x12, (byte)0x02, (byte)0xDE, (byte)0xAD, (byte)0xCA, (byte)0xFE}; final SerializeObject serializeObject = SerializeUtil.deserializeFromBytes(SerializeObject.class, buffer); assertEquals(0x12, serializeObject.getParam()); @@ -193,8 +191,8 @@ public void serializeToFileFromFile() final SerializeObject serializeObject = new SerializeObject(param, serializeNested); final String fileName = "SerializationTest.bin"; SerializeUtil.serializeToFile(serializeObject, fileName); - final SerializeObject readSerializeObject = SerializeUtil.deserializeFromFile(SerializeObject.class, - fileName); + final SerializeObject readSerializeObject = + SerializeUtil.deserializeFromFile(SerializeObject.class, fileName); assertEquals(serializeObject, readSerializeObject); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonEncoderTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonEncoderTest.java index 62cec938e..ecb26b5a3 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonEncoderTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonEncoderTest.java @@ -192,14 +192,14 @@ public void encodeString() assertEquals("\"\\t\"", stringWriter.toString()); stringWriter.getBuffer().setLength(0); - JsonEncoder.encodeString(printWriter, - "\n\t%^@(*aAzZ01234569$%^!?<>[]](){}-=+~:;/|\\\"\'Hello World2"); + JsonEncoder.encodeString( + printWriter, "\n\t%^@(*aAzZ01234569$%^!?<>[]](){}-=+~:;/|\\\"\'Hello World2"); assertEquals("\"\\n\\t%^@(*aAzZ01234569$%^!?<>[]](){}-=+~:;/|\\\\\\\"'Hello World2\"", stringWriter.toString()); // <= 0x1F -> unicode escape stringWriter.getBuffer().setLength(0); - JsonEncoder.encodeString(printWriter, new String(new byte[]{0x1F}, StandardCharsets.UTF_8)); + JsonEncoder.encodeString(printWriter, new String(new byte[] {0x1F}, StandardCharsets.UTF_8)); assertEquals("\"\\u001f\"", stringWriter.toString()); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonParserTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonParserTest.java index 383c7d4fb..d1bcec2dc 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonParserTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonParserTest.java @@ -165,8 +165,9 @@ public void unexpectedElementToken() throws IOException final JsonParser jsonParser = new JsonParser(reader, observer); final JsonParserError exception = assertThrows(JsonParserError.class, () -> jsonParser.parse()); - assertEquals("JsonParser:2:8: Unexpected token: END_OBJECT ('}'), expecting one of " + - "[BEGIN_OBJECT, BEGIN_ARRAY, VALUE]!", exception.getMessage()); + assertEquals("JsonParser:2:8: Unexpected token: END_OBJECT ('}'), expecting one of " + + "[BEGIN_OBJECT, BEGIN_ARRAY, VALUE]!", + exception.getMessage()); assertEquals(2, observer.getReport().size()); assertEquals("beginObject", observer.getReport().get(0)); assertEquals("visitKey: item", observer.getReport().get(1)); @@ -182,8 +183,8 @@ public void missingArrayElementSeparator() throws IOException final JsonParser jsonParser = new JsonParser(reader, observer); final JsonParserError exception = assertThrows(JsonParserError.class, () -> jsonParser.parse()); - assertEquals("JsonParser:4:1: Unexpected token: VALUE ('20'), expecting END_ARRAY!", - exception.getMessage()); + assertEquals( + "JsonParser:4:1: Unexpected token: VALUE ('20'), expecting END_ARRAY!", exception.getMessage()); assertEquals(4, observer.getReport().size()); assertEquals("beginObject", observer.getReport().get(0)); assertEquals("visitKey: array", observer.getReport().get(1)); diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonReaderTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonReaderTest.java index a57195fa8..95edccc4e 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonReaderTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonReaderTest.java @@ -1,8 +1,8 @@ package zserio.runtime.json; import static org.junit.Assert.assertTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.IOException; @@ -23,75 +23,73 @@ public class JsonReaderTest @Test public void readObject() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 13,\n" + - " \"nested\": {\n" + - " \"value\": 10,\n" + - " \"text\": \"nested\",\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 203,\n" + - " 240\n" + - " ],\n" + - " \"bitSize\": 12\n" + - " },\n" + - " \"bytesData\": {\n" + - " \"buffer\": [\n" + - " 202,\n" + - " 254\n" + - " ]\n" + - " },\n" + - " \"creatorEnum\": 0,\n" + - " \"creatorBitmask\": 1\n" + - " },\n" + - " \"text\": \"test\",\n" + - " \"nestedArray\": [\n" + - " {\n" + - " \"value\": 5,\n" + - " \"text\": \"nestedArray\",\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 202,\n" + - " 254\n" + - " ]," + - " \"bitSize\": 15\n" + - " },\n" + - " \"bytesData\": {\n" + - " \"buffer\": [\n" + - " 203,\n" + - " 240\n" + - " ]\n" + - " },\n" + - " \"creatorEnum\": 1,\n" + - " \"creatorBitmask\": 2\n" + - " }\n" + - " ],\n" + - " \"textArray\": [\n" + - " \"this\",\n" + - " \"is\",\n" + - " \"text\",\n" + - " \"array\"\n" + - " ],\n" + - " \"externArray\": [\n" + - " {\n" + - " \"buffer\": [\n" + - " 222,\n" + - " 209\n" + - " ]," + - " \"bitSize\": 13\n" + - " }\n" + - " ],\n" + - " \"bytesArray\": [\n" + - " {\n" + - " \"buffer\": [\n" + - " 0\n" + - " ]\n" + - " }\n" + - " ],\n" + - " \"optionalBool\": null\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 13,\n" + + " \"nested\": {\n" + + " \"value\": 10,\n" + + " \"text\": \"nested\",\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 203,\n" + + " 240\n" + + " ],\n" + + " \"bitSize\": 12\n" + + " },\n" + + " \"bytesData\": {\n" + + " \"buffer\": [\n" + + " 202,\n" + + " 254\n" + + " ]\n" + + " },\n" + + " \"creatorEnum\": 0,\n" + + " \"creatorBitmask\": 1\n" + + " },\n" + + " \"text\": \"test\",\n" + + " \"nestedArray\": [\n" + + " {\n" + + " \"value\": 5,\n" + + " \"text\": \"nestedArray\",\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 202,\n" + + " 254\n" + + " ]," + + " \"bitSize\": 15\n" + + " },\n" + + " \"bytesData\": {\n" + + " \"buffer\": [\n" + + " 203,\n" + + " 240\n" + + " ]\n" + + " },\n" + + " \"creatorEnum\": 1,\n" + + " \"creatorBitmask\": 2\n" + + " }\n" + + " ],\n" + + " \"textArray\": [\n" + + " \"this\",\n" + + " \"is\",\n" + + " \"text\",\n" + + " \"array\"\n" + + " ],\n" + + " \"externArray\": [\n" + + " {\n" + + " \"buffer\": [\n" + + " 222,\n" + + " 209\n" + + " ]," + + " \"bitSize\": 13\n" + + " }\n" + + " ],\n" + + " \"bytesArray\": [\n" + + " {\n" + + " \"buffer\": [\n" + + " 0\n" + + " ]\n" + + " }\n" + + " ],\n" + + " \"optionalBool\": null\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); final Object zserioObject = jsonReader.read(CreatorObject.typeInfo()); @@ -114,7 +112,8 @@ public void readObject() throws IOException assertEquals("nestedArray", creatorObject.getNestedArray()[0].getText()); assertEquals(new BitBuffer(new byte[] {(byte)0xCA, (byte)0xFE}, 15), creatorObject.getNestedArray()[0].getExternData()); - assertArrayEquals(new byte[] {(byte)0xCB, (byte)0xF0}, creatorObject.getNestedArray()[0].getBytesData()); + assertArrayEquals( + new byte[] {(byte)0xCB, (byte)0xF0}, creatorObject.getNestedArray()[0].getBytesData()); assertEquals(CreatorEnum.TWO, creatorObject.getNestedArray()[0].getCreatorEnum()); assertEquals(CreatorBitmask.Values.WRITE, creatorObject.getNestedArray()[0].getCreatorBitmask()); assertEquals(4, creatorObject.getTextArray().length); @@ -133,10 +132,8 @@ public void readObject() throws IOException @Test public void readTwoObjects() throws IOException { - final Reader reader = new StringReader( - "{\"value\": 13}\n" + - "{\"value\": 42, \"text\": \"test\"}\n" - ); + final Reader reader = new StringReader("{\"value\": 13}\n" + + "{\"value\": 42, \"text\": \"test\"}\n"); final JsonReader jsonReader = new JsonReader(reader); final Object zserioObject1 = jsonReader.read(CreatorObject.typeInfo()); @@ -159,30 +156,28 @@ public void readTwoObjects() throws IOException @Test public void readUnonrderedBitBuffer() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 13,\n" + - " \"nested\": {\n" + - " \"value\": 10,\n" + - " \"text\": \"nested\",\n" + - " \"externData\": {\n" + - " \"bitSize\": 12,\n" + - " \"buffer\": [\n" + - " 203,\n" + - " 240\n" + - " ]\n" + - " },\n" + - " \"bytesData\": {\n" + - " \"buffer\": [\n" + - " 202,\n" + - " 254\n" + - " ]\n" + - " },\n" + - " \"creatorEnum\": -1,\n" + - " \"creatorBitmask\": 1\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 13,\n" + + " \"nested\": {\n" + + " \"value\": 10,\n" + + " \"text\": \"nested\",\n" + + " \"externData\": {\n" + + " \"bitSize\": 12,\n" + + " \"buffer\": [\n" + + " 203,\n" + + " 240\n" + + " ]\n" + + " },\n" + + " \"bytesData\": {\n" + + " \"buffer\": [\n" + + " 202,\n" + + " 254\n" + + " ]\n" + + " },\n" + + " \"creatorEnum\": -1,\n" + + " \"creatorBitmask\": 1\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); final Object zserioObject = jsonReader.read(CreatorObject.typeInfo()); @@ -208,20 +203,20 @@ public void readStringifiedEnum() throws IOException checkReadStringifiedEnum("ONE", CreatorEnum.ONE); checkReadStringifiedEnum("MinusOne", CreatorEnum.MinusOne); checkReadStringifiedEnumThrows("NONEXISTING", - "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + - "from string value 'NONEXISTING'! (JsonParser:3:24)"); + "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + + "from string value 'NONEXISTING'! (JsonParser:3:24)"); checkReadStringifiedEnumThrows("***", - "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + - "from string value '***'! (JsonParser:3:24)"); + "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + + "from string value '***'! (JsonParser:3:24)"); checkReadStringifiedEnumThrows("10 /* no match */", - "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + - "from string value '10 /* no match */'! (JsonParser:3:24)"); + "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + + "from string value '10 /* no match */'! (JsonParser:3:24)"); checkReadStringifiedEnumThrows("-10 /* no match */", - "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + - "from string value '-10 /* no match */'! (JsonParser:3:24)"); + "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + + "from string value '-10 /* no match */'! (JsonParser:3:24)"); checkReadStringifiedEnumThrows("", - "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + - "from string value ''! (JsonParser:3:24)"); + "JsonReader: Cannot create enum 'test_object.CreatorEnum' " + + "from string value ''! (JsonParser:3:24)"); } @Test @@ -230,38 +225,36 @@ public void readStringifiedBitmask() throws IOException checkReadStringifiedBitmask("READ", CreatorBitmask.Values.READ); checkReadStringifiedBitmask("READ | WRITE", CreatorBitmask.Values.READ.or(CreatorBitmask.Values.WRITE)); checkReadStringifiedBitmaskThrows("NONEXISTING", - "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + - "from string value 'NONEXISTING'! (JsonParser:3:27)"); + "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + + "from string value 'NONEXISTING'! (JsonParser:3:27)"); checkReadStringifiedBitmaskThrows("READ | NONEXISTING", - "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + - "from string value 'READ | NONEXISTING'! (JsonParser:3:27)"); + "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + + "from string value 'READ | NONEXISTING'! (JsonParser:3:27)"); checkReadStringifiedBitmaskThrows("READ * NONEXISTING", - "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + - "from string value 'READ * NONEXISTING'! (JsonParser:3:27)"); + "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + + "from string value 'READ * NONEXISTING'! (JsonParser:3:27)"); checkReadStringifiedBitmask("7 /* READ | WRITE */", new CreatorBitmask((short)7)); checkReadStringifiedBitmask("15 /* READ | WRITE */", new CreatorBitmask((short)15)); checkReadStringifiedBitmask("4 /* no match */", new CreatorBitmask((short)4)); checkReadStringifiedBitmaskThrows("", - "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + - "from string value ''! (JsonParser:3:27)"); + "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + + "from string value ''! (JsonParser:3:27)"); checkReadStringifiedBitmaskThrows(" ", - "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + - "from string value ' '! (JsonParser:3:27)"); + "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + + "from string value ' '! (JsonParser:3:27)"); checkReadStringifiedBitmaskThrows(" | ", - "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + - "from string value ' | '! (JsonParser:3:27)"); + "JsonReader: Cannot create bitmask 'test_object.CreatorBitmask' " + + "from string value ' | '! (JsonParser:3:27)"); } @Test public void jsonParserException() throws IOException { - final Reader reader = new StringReader( - "{\"value\"\n\"value\"" - ); + final Reader reader = new StringReader("{\"value\"\n\"value\""); final JsonReader jsonReader = new JsonReader(reader); - final JsonParserError exception = assertThrows(JsonParserError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final JsonParserError exception = + assertThrows(JsonParserError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonParser:2:1: Unexpected token: VALUE ('value'), expecting KEY_SEPARATOR!", exception.getMessage()); jsonReader.close(); @@ -270,57 +263,53 @@ public void jsonParserException() throws IOException @Test public void wrongKeyException() throws IOException { - final Reader reader = new StringReader( - "{\"value\": 13,\n\"nonexisting\": 10}" - ); + final Reader reader = new StringReader("{\"value\": 13,\n\"nonexisting\": 10}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("ZserioTreeCreator: Field 'nonexisting' not found in " + - "'test_object.CreatorObject'! (JsonParser:2:16)", exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals("ZserioTreeCreator: Field 'nonexisting' not found in " + + "'test_object.CreatorObject'! (JsonParser:2:16)", + exception.getMessage()); jsonReader.close(); } @Test public void wrongValueTypeException() throws IOException { - final Reader reader = new StringReader( - "{\n \"value\": \"13\"\n}" - ); + final Reader reader = new StringReader("{\n \"value\": \"13\"\n}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("ZserioTreeCreator: Unexpected value type 'class java.lang.String', expecting 'long'! " + - "(JsonParser:2:12)", exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals("ZserioTreeCreator: Unexpected value type 'class java.lang.String', expecting 'long'! " + + "(JsonParser:2:12)", + exception.getMessage()); jsonReader.close(); } @Test public void wrongBitBufferException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 13,\n" + - " \"nested\": {\n" + - " \"value\": 10,\n" + - " \"text\": \"nested\",\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 203,\n" + - " 240\n" + - " ],\n" + - " \"bitSize\": {\n" + - " }\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 13,\n" + + " \"nested\": {\n" + + " \"value\": 10,\n" + + " \"text\": \"nested\",\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 203,\n" + + " 240\n" + + " ],\n" + + " \"bitSize\": {\n" + + " }\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonReader: Unexpected begin object in Bit Buffer! (JsonParser:11:25)", exception.getMessage()); jsonReader.close(); @@ -329,25 +318,23 @@ public void wrongBitBufferException() throws IOException @Test public void partialBitBufferException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 13,\n" + - " \"nested\": {\n" + - " \"value\": 10,\n" + - " \"text\": \"nested\",\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 203,\n" + - " 240\n" + - " ]\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 13,\n" + + " \"nested\": {\n" + + " \"value\": 10,\n" + + " \"text\": \"nested\",\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 203,\n" + + " 240\n" + + " ]\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonReader: Unexpected end in Bit Buffer! (JsonParser:12:5)", exception.getMessage()); jsonReader.close(); } @@ -355,117 +342,107 @@ public void partialBitBufferException() throws IOException @Test public void wrongBytesException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 13,\n" + - " \"nested\": {\n" + - " \"value\": 10,\n" + - " \"text\": \"nested\",\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 203,\n" + - " 240\n" + - " ],\n" + - " \"bitSize\": 12\n" + - " },\n" + - " \"bytesData\": {\n" + - " \"buffer\": {}\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 13,\n" + + " \"nested\": {\n" + + " \"value\": 10,\n" + + " \"text\": \"nested\",\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 203,\n" + + " 240\n" + + " ],\n" + + " \"bitSize\": 12\n" + + " },\n" + + " \"bytesData\": {\n" + + " \"buffer\": {}\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("JsonReader: Unexpected begin object in bytes! (JsonParser:14:23)", - exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals( + "JsonReader: Unexpected begin object in bytes! (JsonParser:14:23)", exception.getMessage()); jsonReader.close(); } @Test public void jsonArrayException() throws IOException { - final Reader reader = new StringReader( - "[1, 2]" - ); + final Reader reader = new StringReader("[1, 2]"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("JsonReader: ZserioTreeCreator expects json object! (JsonParser:1:1)", - exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals( + "JsonReader: ZserioTreeCreator expects json object! (JsonParser:1:1)", exception.getMessage()); jsonReader.close(); } @Test public void jsonValueException() throws IOException { - final Reader reader = new StringReader( - "\"text\"" - ); + final Reader reader = new StringReader("\"text\""); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("JsonReader: ZserioTreeCreator expects json object! (JsonParser:1:1)", - exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals( + "JsonReader: ZserioTreeCreator expects json object! (JsonParser:1:1)", exception.getMessage()); jsonReader.close(); } @Test public void bigLongValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 9223372036854775808\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 9223372036854775808\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("JsonReader: Cannot create long 'uint32' from value '9223372036854775808'! " + - "(JsonParser:2:14)", exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals("JsonReader: Cannot create long 'uint32' from value '9223372036854775808'! " + + "(JsonParser:2:14)", + exception.getMessage()); jsonReader.close(); } @Test public void floatLongValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"value\": 1.234\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"value\": 1.234\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("ZserioTreeCreator: Unexpected value type 'class java.lang.Double', expecting 'long'! " + - "(JsonParser:2:14)", exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals("ZserioTreeCreator: Unexpected value type 'class java.lang.Double', expecting 'long'! " + + "(JsonParser:2:14)", + exception.getMessage()); jsonReader.close(); } @Test public void bigBitBufferByteValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 256\n" + - " ],\n" + - " \"bitSize\": 7\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 256\n" + + " ],\n" + + " \"bitSize\": 7\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonReader: Cannot create byte for Bit Buffer from value '256'! (JsonParser:5:18)", exception.getMessage()); jsonReader.close(); @@ -474,22 +451,20 @@ public void bigBitBufferByteValueException() throws IOException @Test public void negativeBitBufferByteValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " -1\n" + - " ],\n" + - " \"bitSize\": 7\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " -1\n" + + " ],\n" + + " \"bitSize\": 7\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonReader: Cannot create byte for Bit Buffer from value '-1'! (JsonParser:5:18)", exception.getMessage()); jsonReader.close(); @@ -498,45 +473,42 @@ public void negativeBitBufferByteValueException() throws IOException @Test public void wrongBitBufferSizeValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"externData\": {\n" + - " \"buffer\": [\n" + - " 255\n" + - " ],\n" + - " \"bitSize\": 9223372036854775808\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"externData\": {\n" + + " \"buffer\": [\n" + + " 255\n" + + " ],\n" + + " \"bitSize\": 9223372036854775808\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); - assertEquals("JsonReader: Cannot create long for Bit Buffer size from value '9223372036854775808'! " + - "(JsonParser:7:25)", exception.getMessage()); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); + assertEquals("JsonReader: Cannot create long for Bit Buffer size from value '9223372036854775808'! " + + "(JsonParser:7:25)", + exception.getMessage()); jsonReader.close(); } @Test public void bigBytesByteValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"bytesData\": {\n" + - " \"buffer\": [\n" + - " 256\n" + - " ]\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"bytesData\": {\n" + + " \"buffer\": [\n" + + " 256\n" + + " ]\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonReader: Cannot create byte for bytes from value '256'! (JsonParser:5:18)", exception.getMessage()); jsonReader.close(); @@ -545,21 +517,19 @@ public void bigBytesByteValueException() throws IOException @Test public void negativeBytesByteValueException() throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"bytesData\": {\n" + - " \"buffer\": [\n" + - " -1\n" + - " ]\n" + - " }\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"bytesData\": {\n" + + " \"buffer\": [\n" + + " -1\n" + + " ]\n" + + " }\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals("JsonReader: Cannot create byte for bytes from value '-1'! (JsonParser:5:18)", exception.getMessage()); jsonReader.close(); @@ -567,13 +537,11 @@ public void negativeBytesByteValueException() throws IOException private void checkReadStringifiedEnum(String stringValue, CreatorEnum expectedValue) throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"creatorEnum\": \"" + stringValue + "\"\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"creatorEnum\": \"" + stringValue + "\"\n" + + " }\n" + + "}"); try (final JsonReader jsonReader = new JsonReader(reader)) { @@ -587,30 +555,27 @@ private void checkReadStringifiedEnum(String stringValue, CreatorEnum expectedVa private void checkReadStringifiedEnumThrows(String stringValue, String expectedMessage) throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"creatorEnum\": \"" + stringValue + "\"\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"creatorEnum\": \"" + stringValue + "\"\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals(expectedMessage, exception.getMessage()); jsonReader.close(); } - private void checkReadStringifiedBitmask(String stringValue, CreatorBitmask expectedValue) throws IOException + private void checkReadStringifiedBitmask(String stringValue, CreatorBitmask expectedValue) + throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"creatorBitmask\": \"" + stringValue + "\"\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"creatorBitmask\": \"" + stringValue + "\"\n" + + " }\n" + + "}"); try (final JsonReader jsonReader = new JsonReader(reader)) { @@ -625,17 +590,15 @@ private void checkReadStringifiedBitmask(String stringValue, CreatorBitmask expe private void checkReadStringifiedBitmaskThrows(String stringValue, String expectedMessage) throws IOException { - final Reader reader = new StringReader( - "{\n" + - " \"nested\": {\n" + - " \"creatorBitmask\": \"" + stringValue + "\"\n" + - " }\n" + - "}" - ); + final Reader reader = new StringReader("{\n" + + " \"nested\": {\n" + + " \"creatorBitmask\": \"" + stringValue + "\"\n" + + " }\n" + + "}"); final JsonReader jsonReader = new JsonReader(reader); - final ZserioError exception = assertThrows(ZserioError.class, - () -> jsonReader.read(CreatorObject.typeInfo())); + final ZserioError exception = + assertThrows(ZserioError.class, () -> jsonReader.read(CreatorObject.typeInfo())); assertEquals(expectedMessage, exception.getMessage()); jsonReader.close(); } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonWriterTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonWriterTest.java index 634ece113..b56f983a0 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonWriterTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/json/JsonWriterTest.java @@ -14,13 +14,13 @@ import zserio.runtime.io.BitBuffer; import zserio.runtime.typeinfo.FieldInfo; import zserio.runtime.typeinfo.FunctionInfo; -import zserio.runtime.typeinfo.TypeInfo.BuiltinTypeInfo; -import zserio.runtime.typeinfo.TypeInfo.EnumTypeInfo; -import zserio.runtime.typeinfo.TypeInfo.BitmaskTypeInfo; -import zserio.runtime.typeinfo.TypeInfo.StructTypeInfo; import zserio.runtime.typeinfo.ItemInfo; import zserio.runtime.typeinfo.ParameterInfo; import zserio.runtime.typeinfo.TypeInfo; +import zserio.runtime.typeinfo.TypeInfo.BitmaskTypeInfo; +import zserio.runtime.typeinfo.TypeInfo.BuiltinTypeInfo; +import zserio.runtime.typeinfo.TypeInfo.EnumTypeInfo; +import zserio.runtime.typeinfo.TypeInfo.StructTypeInfo; import zserio.runtime.walker.WalkObserver; import zserio.runtime.walker.WalkerConst; @@ -158,11 +158,11 @@ public Number getGenericValue() jsonWriter.visitValue(new DummyEnum((byte)-1), ENUM_FIELD_INFO, WalkerConst.NOT_ELEMENT); // note that this is not valid json - assertJsonEquals( - "\"enumField\": \"ZERO\", " + - "\"enumField\": \"One\", " + - "\"enumField\": \"2 /* no match */\", " + - "\"enumField\": \"MINUS_ONE\"", stringWriter.toString()); + assertJsonEquals("\"enumField\": \"ZERO\", " + + "\"enumField\": \"One\", " + + "\"enumField\": \"2 /* no match */\", " + + "\"enumField\": \"MINUS_ONE\"", + stringWriter.toString()); } } @@ -176,8 +176,8 @@ public Number getGenericValue() jsonWriter.visitValue(new DummyEnum((byte)-1), ENUM_FIELD_INFO, WalkerConst.NOT_ELEMENT); // note that this is not valid json - assertJsonEquals("\"enumField\": 0, \"enumField\": 2, \"enumField\": -1", - stringWriter.toString()); + assertJsonEquals( + "\"enumField\": 0, \"enumField\": 2, \"enumField\": -1", stringWriter.toString()); } } } @@ -251,12 +251,12 @@ public Number getGenericValue() jsonWriter.visitValue(new DummyBitmask((short)7), BITMASK_FIELD_INFO, WalkerConst.NOT_ELEMENT); // note that this is not valid json - assertJsonEquals( - "\"bitmaskField\": \"ZERO\", " + - "\"bitmaskField\": \"TWO\", " + - "\"bitmaskField\": \"One | TWO\", " + - "\"bitmaskField\": \"4 /* no match */\", " + - "\"bitmaskField\": \"7 /* partial match: One | TWO */\"", stringWriter.toString()); + assertJsonEquals("\"bitmaskField\": \"ZERO\", " + + "\"bitmaskField\": \"TWO\", " + + "\"bitmaskField\": \"One | TWO\", " + + "\"bitmaskField\": \"4 /* no match */\", " + + "\"bitmaskField\": \"7 /* partial match: One | TWO */\"", + stringWriter.toString()); } } @@ -292,8 +292,8 @@ public Number getGenericValue() StringWriter stringWriter = new StringWriter(); try (final JsonWriter jsonWriter = new JsonWriter(stringWriter)) { - jsonWriter.visitValue(new UInt64MaxDummyBitmask(), BITMASK64_FIELD_INFO, - WalkerConst.NOT_ELEMENT); + jsonWriter.visitValue( + new UInt64MaxDummyBitmask(), BITMASK64_FIELD_INFO, WalkerConst.NOT_ELEMENT); // note that this is not valid json assertJsonEquals("\"bitmask64Field\": \"UINT64_MAX\"", stringWriter.toString()); @@ -305,8 +305,8 @@ public Number getGenericValue() try (final JsonWriter jsonWriter = new JsonWriter(stringWriter)) { jsonWriter.setEnumerableFormat(JsonWriter.EnumerableFormat.NUMBER); - jsonWriter.visitValue(new UInt64MaxDummyBitmask(), BITMASK64_FIELD_INFO, - WalkerConst.NOT_ELEMENT); + jsonWriter.visitValue( + new UInt64MaxDummyBitmask(), BITMASK64_FIELD_INFO, WalkerConst.NOT_ELEMENT); // note that this is not valid json assertJsonEquals("\"bitmask64Field\": " + uint64Max.toString(), stringWriter.toString()); @@ -325,13 +325,14 @@ public void compound() jsonWriter.visitValue("test", TEXT_FIELD_INFO, WalkerConst.NOT_ELEMENT); jsonWriter.visitValue(new BitBuffer(new byte[] {(byte)0xFF, 0x1F}, (long)13), DATA_FIELD_INFO, WalkerConst.NOT_ELEMENT); - jsonWriter.visitValue(new byte[] {(byte)0xCA, (byte)0xFE}, BYTES_DATA_FIELD_INFO, - WalkerConst.NOT_ELEMENT); + jsonWriter.visitValue( + new byte[] {(byte)0xCA, (byte)0xFE}, BYTES_DATA_FIELD_INFO, WalkerConst.NOT_ELEMENT); jsonWriter.endRoot(null); - assertJsonEquals("{\"identifier\": 13, \"text\": \"test\", " + - "\"data\": {\"buffer\": [255, 31], \"bitSize\": 13}, " + - "\"bytesData\": {\"buffer\": [202, 254]}}", stringWriter.toString()); + assertJsonEquals("{\"identifier\": 13, \"text\": \"test\", " + + "\"data\": {\"buffer\": [255, 31], \"bitSize\": 13}, " + + "\"bytesData\": {\"buffer\": [202, 254]}}", + stringWriter.toString()); } } @@ -379,8 +380,8 @@ public void emptyIndent() { walkNested(jsonWriter); - assertJsonEquals("{\n\"identifier\": 13,\n\"nested\": {\n\"text\": \"test\"\n}\n}", - stringWriter.toString()); + assertJsonEquals( + "{\n\"identifier\": 13,\n\"nested\": {\n\"text\": \"test\"\n}\n}", stringWriter.toString()); } } @@ -450,8 +451,7 @@ private void walkArray(WalkObserver observer) observer.endRoot(null); } - private static final FieldInfo TEXT_FIELD_INFO = new FieldInfo( - "text", // schemaName + private static final FieldInfo TEXT_FIELD_INFO = new FieldInfo("text", // schemaName "getText", // getterName "setText", // setterName BuiltinTypeInfo.getString(), // typeInfo @@ -471,8 +471,7 @@ private void walkArray(WalkObserver observer) false // isImplicit ); - private static final FieldInfo BOOL_FIELD_INFO = new FieldInfo( - "boolField", // schemaName + private static final FieldInfo BOOL_FIELD_INFO = new FieldInfo("boolField", // schemaName "getBoolField", // getterName "setBoolField", // setterName BuiltinTypeInfo.getBool(), // typeInfo @@ -492,8 +491,7 @@ private void walkArray(WalkObserver observer) false // isImplicit ); - private static final FieldInfo INT32_FIELD_INFO = new FieldInfo( - "int32Field", // schemaName + private static final FieldInfo INT32_FIELD_INFO = new FieldInfo("int32Field", // schemaName "getInt32Field", // getterName "setInt32Field", // setterName BuiltinTypeInfo.getInt32(), // typeInfo @@ -513,8 +511,7 @@ private void walkArray(WalkObserver observer) false // isImplicit ); - private static final FieldInfo UINT64_FIELD_INFO = new FieldInfo( - "uint64Field", // schemaName + private static final FieldInfo UINT64_FIELD_INFO = new FieldInfo("uint64Field", // schemaName "getUint64Field", // getterName "setUint64Field", // setterName BuiltinTypeInfo.getUInt64(), // typeInfo @@ -534,8 +531,7 @@ private void walkArray(WalkObserver observer) false // isImplicit ); - private static final FieldInfo FLOAT_FIELD_INFO = new FieldInfo( - "floatField", // schemaName + private static final FieldInfo FLOAT_FIELD_INFO = new FieldInfo("floatField", // schemaName "getFloatField", // getterName "setFloatField", // setterName BuiltinTypeInfo.getFloat32(), // typeInfo @@ -555,8 +551,7 @@ private void walkArray(WalkObserver observer) false // isImplicit ); - private static final FieldInfo DOUBLE_FIELD_INFO = new FieldInfo( - "doubleField", // schemaName + private static final FieldInfo DOUBLE_FIELD_INFO = new FieldInfo("doubleField", // schemaName "getDoubleField", // getterName "setDoubleField", // setterName BuiltinTypeInfo.getFloat64(), // typeInfo @@ -585,21 +580,17 @@ public Number getGenericValue() } } - private static final FieldInfo ENUM_FIELD_INFO = new FieldInfo( - "enumField", // schemaName + private static final FieldInfo ENUM_FIELD_INFO = new FieldInfo("enumField", // schemaName "getEnumField", // getterName "setEnumField", // setterName - new EnumTypeInfo( - "DummyEnum", // schemaName + new EnumTypeInfo("DummyEnum", // schemaName DummyEnumForClass.class, // javaClass BuiltinTypeInfo.getInt8(), // underlyingType new ArrayList>(), // underlyingTypeArguments Arrays.asList( // enumItems new ItemInfo("ZERO", BigInteger.valueOf(0), false, false), new ItemInfo("One", BigInteger.valueOf(1), false, false), - new ItemInfo("MINUS_ONE", BigInteger.valueOf(-1), false, false) - ) - ), + new ItemInfo("MINUS_ONE", BigInteger.valueOf(-1), false, false))), new java.util.ArrayList>(), // typeArguments false, // isExtended null, // alignment @@ -616,18 +607,15 @@ public Number getGenericValue() false // isImplicit ); - private static final FieldInfo ENUM64_FIELD_INFO = new FieldInfo( - "enum64Field", // schemaName + private static final FieldInfo ENUM64_FIELD_INFO = new FieldInfo("enum64Field", // schemaName "getEnum64Field", // getterName "setEnum64Field", // setterName - new EnumTypeInfo( - "DummyEnum", // schemaName + new EnumTypeInfo("DummyEnum", // schemaName DummyEnumForClass.class, // javaClass BuiltinTypeInfo.getUInt64(), // underlyingType new ArrayList>(), // underlyingTypeArguments Arrays.asList( // enumItems - new ItemInfo("UINT64_MAX", new BigInteger("18446744073709551615"), false, false)) - ), + new ItemInfo("UINT64_MAX", new BigInteger("18446744073709551615"), false, false))), new java.util.ArrayList>(), // typeArguments false, // isExtended null, // alignment @@ -653,21 +641,17 @@ public Number getGenericValue() } } - private static final FieldInfo BITMASK_FIELD_INFO = new FieldInfo( - "bitmaskField", // schemaName + private static final FieldInfo BITMASK_FIELD_INFO = new FieldInfo("bitmaskField", // schemaName "getBitmaskField", // getterName "setBitmaskField", // setterName - new BitmaskTypeInfo( - "DummyBitmask", // schemaName + new BitmaskTypeInfo("DummyBitmask", // schemaName DummyBitmaskForClass.class, // javaClass BuiltinTypeInfo.getInt8(), // underlyingType new ArrayList>(), // underlyingTypeArguments Arrays.asList( // bitmaskValues new ItemInfo("ZERO", BigInteger.valueOf(0), false, false), new ItemInfo("One", BigInteger.valueOf(1), false, false), - new ItemInfo("TWO", BigInteger.valueOf(2), false, false) - ) - ), + new ItemInfo("TWO", BigInteger.valueOf(2), false, false))), new java.util.ArrayList>(), // typeArguments false, // isExtended null, // alignment @@ -684,18 +668,15 @@ public Number getGenericValue() false // isImplicit ); - private static final FieldInfo BITMASK64_FIELD_INFO = new FieldInfo( - "bitmask64Field", // schemaName + private static final FieldInfo BITMASK64_FIELD_INFO = new FieldInfo("bitmask64Field", // schemaName "getBitmask64Field", // getterName "setBitmask64Field", // setterName - new BitmaskTypeInfo( - "DummyBitmask", // schemaName + new BitmaskTypeInfo("DummyBitmask", // schemaName DummyBitmaskForClass.class, // javaClass BuiltinTypeInfo.getUInt64(), // underlyingType new ArrayList>(), // underlyingTypeArguments Arrays.asList( // bitmaskValues - new ItemInfo("UINT64_MAX", new BigInteger("18446744073709551615"), false, false)) - ), + new ItemInfo("UINT64_MAX", new BigInteger("18446744073709551615"), false, false))), new java.util.ArrayList>(), // typeArguments false, // isExtended null, // alignment @@ -712,8 +693,7 @@ public Number getGenericValue() false // isImplicit ); - private static final FieldInfo IDENTIFIER_FIELD_INFO = new FieldInfo( - "identifier", // schemaName + private static final FieldInfo IDENTIFIER_FIELD_INFO = new FieldInfo("identifier", // schemaName "getIdentifier", // getterName "setIdentifier", // setterName BuiltinTypeInfo.getUInt32(), // typeInfo @@ -733,8 +713,7 @@ public Number getGenericValue() false // isImplicit ); - private static final FieldInfo DATA_FIELD_INFO = new FieldInfo( - "data", // schemaName + private static final FieldInfo DATA_FIELD_INFO = new FieldInfo("data", // schemaName "getData", // getterName "setData", // setterName BuiltinTypeInfo.getBitBuffer(), // typeInfo @@ -754,8 +733,7 @@ public Number getGenericValue() false // isImplicit ); - private static final FieldInfo BYTES_DATA_FIELD_INFO = new FieldInfo( - "bytesData", // schemaName + private static final FieldInfo BYTES_DATA_FIELD_INFO = new FieldInfo("bytesData", // schemaName "getBytesData", // getterName "setBytesData", // setterName BuiltinTypeInfo.getBytes(), // typeInfo @@ -776,11 +754,9 @@ public Number getGenericValue() ); private static class Dummy - { - } + {} - private static final TypeInfo DUMMY_TYPE_INFO = new StructTypeInfo( - "Dummy", // schemaName + private static final TypeInfo DUMMY_TYPE_INFO = new StructTypeInfo("Dummy", // schemaName Dummy.class, // javaClass "", // templateName new ArrayList(), // templateArguments @@ -789,8 +765,7 @@ private static class Dummy new ArrayList() // functions ); - private static final FieldInfo NESTED_FIELD_INFO = new FieldInfo( - "nested", // schemaName + private static final FieldInfo NESTED_FIELD_INFO = new FieldInfo("nested", // schemaName "getNested", // getterName "setNested", // setterName DUMMY_TYPE_INFO, // typeInfo @@ -810,8 +785,7 @@ private static class Dummy false // isImplicit ); - private static final FieldInfo ARRAY_FIELD_INFO = new FieldInfo( - "array", // schemaName + private static final FieldInfo ARRAY_FIELD_INFO = new FieldInfo("array", // schemaName "getArray", // getterName "setArray", // setterName BuiltinTypeInfo.getUInt32(), // typeInfo diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoTest.java index 410c3021f..2c5e395fa 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; import java.math.BigInteger; import java.util.ArrayList; @@ -12,6 +11,8 @@ import java.util.function.BiFunction; import java.util.function.Supplier; +import org.junit.jupiter.api.Test; + import zserio.runtime.ZserioError; import zserio.runtime.typeinfo.TypeInfo.BitmaskTypeInfo; import zserio.runtime.typeinfo.TypeInfo.BuiltinTypeInfo; @@ -40,8 +41,8 @@ public void builtinTypeInfo() checkBuiltinTypeInfo(BuiltinTypeInfo.getUInt8(), "uint8", SchemaType.UINT8, JavaType.SHORT, 8); checkBuiltinTypeInfo(BuiltinTypeInfo.getUInt16(), "uint16", SchemaType.UINT16, JavaType.INT, 16); checkBuiltinTypeInfo(BuiltinTypeInfo.getUInt32(), "uint32", SchemaType.UINT32, JavaType.LONG, 32); - checkBuiltinTypeInfo(BuiltinTypeInfo.getUInt64(), - "uint64", SchemaType.UINT64, JavaType.BIG_INTEGER, 64); + checkBuiltinTypeInfo( + BuiltinTypeInfo.getUInt64(), "uint64", SchemaType.UINT64, JavaType.BIG_INTEGER, 64); checkBuiltinTypeInfo(BuiltinTypeInfo.getVarInt16(), "varint16", SchemaType.VARINT16, JavaType.SHORT); checkBuiltinTypeInfo(BuiltinTypeInfo.getVarInt32(), "varint32", SchemaType.VARINT32, JavaType.INT); @@ -49,10 +50,8 @@ public void builtinTypeInfo() checkBuiltinTypeInfo(BuiltinTypeInfo.getVarInt(), "varint", SchemaType.VARINT, JavaType.LONG); checkBuiltinTypeInfo(BuiltinTypeInfo.getVarUInt16(), "varuint16", SchemaType.VARUINT16, JavaType.SHORT); checkBuiltinTypeInfo(BuiltinTypeInfo.getVarUInt32(), "varuint32", SchemaType.VARUINT32, JavaType.INT); - checkBuiltinTypeInfo(BuiltinTypeInfo.getVarUInt64(), - "varuint64", SchemaType.VARUINT64, JavaType.LONG); - checkBuiltinTypeInfo(BuiltinTypeInfo.getVarUInt(), - "varuint", SchemaType.VARUINT, JavaType.BIG_INTEGER); + checkBuiltinTypeInfo(BuiltinTypeInfo.getVarUInt64(), "varuint64", SchemaType.VARUINT64, JavaType.LONG); + checkBuiltinTypeInfo(BuiltinTypeInfo.getVarUInt(), "varuint", SchemaType.VARUINT, JavaType.BIG_INTEGER); checkBuiltinTypeInfo(BuiltinTypeInfo.getVarSize(), "varsize", SchemaType.VARSIZE, JavaType.INT); checkBuiltinTypeInfo(BuiltinTypeInfo.getFloat16(), "float16", SchemaType.FLOAT16, JavaType.FLOAT, 16); @@ -96,7 +95,7 @@ public void builtinTypeInfo() // fixed unsigned bit fields assertThrows(ZserioError.class, () -> BuiltinTypeInfo.getFixedUnsignedBitField((byte)0)); bitSize = 0; - for (++bitSize ; bitSize < 8; ++bitSize) + for (++bitSize; bitSize < 8; ++bitSize) { checkBuiltinTypeInfo(BuiltinTypeInfo.getFixedUnsignedBitField((byte)bitSize), "bit:" + bitSize, SchemaType.FIXED_UNSIGNED_BITFIELD, JavaType.BYTE, bitSize); @@ -274,8 +273,8 @@ public void unionTypeInfo() public void choiceTypeInfo() { final ChoiceTypeInfo choiceTypeInfo = new ChoiceTypeInfo("", null, "", new ArrayList(), - new ArrayList(), new ArrayList(), new ArrayList(), - "", new ArrayList()); + new ArrayList(), new ArrayList(), new ArrayList(), "", + new ArrayList()); assertEquals("", choiceTypeInfo.getSchemaName()); assertEquals(SchemaType.CHOICE, choiceTypeInfo.getSchemaType()); assertEquals(JavaType.CHOICE, choiceTypeInfo.getJavaType()); @@ -312,8 +311,8 @@ public void choiceTypeInfo() @Test public void sqlTableTypeInfo() { - final SqlTableTypeInfo sqlTableTypeInfo = new SqlTableTypeInfo("", null, "", new ArrayList(), - new ArrayList(), "", "", false); + final SqlTableTypeInfo sqlTableTypeInfo = new SqlTableTypeInfo( + "", null, "", new ArrayList(), new ArrayList(), "", "", false); assertEquals("", sqlTableTypeInfo.getSchemaName()); assertEquals(SchemaType.SQL_TABLE, sqlTableTypeInfo.getSchemaType()); assertEquals(JavaType.SQL_TABLE, sqlTableTypeInfo.getJavaType()); @@ -350,8 +349,8 @@ public void sqlTableTypeInfo() @Test public void sqlDatabaseTypeInfo() { - final SqlDatabaseTypeInfo sqlDatabaseTypeInfo = new SqlDatabaseTypeInfo("", null, - new ArrayList()); + final SqlDatabaseTypeInfo sqlDatabaseTypeInfo = + new SqlDatabaseTypeInfo("", null, new ArrayList()); assertEquals("", sqlDatabaseTypeInfo.getSchemaName()); assertEquals(SchemaType.SQL_DATABASE, sqlDatabaseTypeInfo.getSchemaType()); assertEquals(JavaType.SQL_DATABASE, sqlDatabaseTypeInfo.getJavaType()); @@ -389,9 +388,9 @@ public void sqlDatabaseTypeInfo() public void enumTypeInfo() { final TypeInfo underlyingTypeInfo = BuiltinTypeInfo.getInt8(); - final EnumTypeInfo enumTypeInfo = new EnumTypeInfo("", null, - underlyingTypeInfo, new ArrayList>(), Arrays.asList( - new ItemInfo("ONE", BigInteger.ONE, false, false))); + final EnumTypeInfo enumTypeInfo = new EnumTypeInfo("", null, underlyingTypeInfo, + new ArrayList>(), + Arrays.asList(new ItemInfo("ONE", BigInteger.ONE, false, false))); assertEquals("", enumTypeInfo.getSchemaName()); assertEquals(SchemaType.ENUM, enumTypeInfo.getSchemaType()); assertEquals(JavaType.ENUM, enumTypeInfo.getJavaType()); @@ -433,9 +432,9 @@ public void enumTypeInfo() public void bitmaskTypeInfo() { final TypeInfo underlyingTypeInfo = BuiltinTypeInfo.getInt8(); - final BitmaskTypeInfo bitmaskTypeInfo = new BitmaskTypeInfo("", null, - underlyingTypeInfo, new ArrayList>(), Arrays.asList( - new ItemInfo("FIRST_BIT", BigInteger.ONE, false, false))); + final BitmaskTypeInfo bitmaskTypeInfo = new BitmaskTypeInfo("", null, underlyingTypeInfo, + new ArrayList>(), + Arrays.asList(new ItemInfo("FIRST_BIT", BigInteger.ONE, false, false))); assertEquals("", bitmaskTypeInfo.getSchemaName()); assertEquals(SchemaType.BITMASK, bitmaskTypeInfo.getSchemaType()); assertEquals(JavaType.BITMASK, bitmaskTypeInfo.getJavaType()); @@ -585,14 +584,14 @@ public void recursiveTypeInfo() assertThrows(ZserioError.class, () -> recursiveTypeInfo.getMethods()); } - private void checkBuiltinTypeInfo(TypeInfo typeInfo, - String schemaName, SchemaType schemaType, JavaType javaType) + private void checkBuiltinTypeInfo( + TypeInfo typeInfo, String schemaName, SchemaType schemaType, JavaType javaType) { checkBuiltinTypeInfo(typeInfo, schemaName, schemaType, javaType, 0); } - private void checkBuiltinTypeInfo(TypeInfo typeInfo, - String schemaName, SchemaType schemaType, JavaType javaType, int bitSize) + private void checkBuiltinTypeInfo( + TypeInfo typeInfo, String schemaName, SchemaType schemaType, JavaType javaType, int bitSize) { assertEquals(schemaName, typeInfo.getSchemaName()); assertEquals(schemaType, typeInfo.getSchemaType()); @@ -633,40 +632,37 @@ private static class RecursiveObject { public static TypeInfo typeInfo() { - class RecursiveTypeInfoGetter implements RecursiveTypeInfo.TypeInfoGetter - { - @Override - public TypeInfo get() - { - return RecursiveObject.typeInfo(); - } - } - - final List fields = Arrays.asList( - new FieldInfo( - "recursive", // schemaName - "getRecursive", // getterName - "setRecursive", // setterName - new RecursiveTypeInfo(new RecursiveTypeInfoGetter()), // typeInfo - new ArrayList>(), // typeArguments - false, // isExtended - null, // alignment - null, // offset - null, // initializer - true, // isOptional - null, // optionalCondition - "isRecursiveUsed", // isUsedindicatorName - "isRecursiveSet", // isSetindicatorName - null, // constraint - false, // isArray - null, // arrayLength - false, // isPacked - false // isImplicit - ) - ); - - return new StructTypeInfo("RecursiveObject", null, "", new ArrayList(), - fields, new ArrayList(), new ArrayList()); + class RecursiveTypeInfoGetter implements RecursiveTypeInfo.TypeInfoGetter + { + @Override + public TypeInfo get() + { + return RecursiveObject.typeInfo(); + } + } + + final List fields = Arrays.asList(new FieldInfo("recursive", // schemaName + "getRecursive", // getterName + "setRecursive", // setterName + new RecursiveTypeInfo(new RecursiveTypeInfoGetter()), // typeInfo + new ArrayList>(), // typeArguments + false, // isExtended + null, // alignment + null, // offset + null, // initializer + true, // isOptional + null, // optionalCondition + "isRecursiveUsed", // isUsedindicatorName + "isRecursiveSet", // isSetindicatorName + null, // constraint + false, // isArray + null, // arrayLength + false, // isPacked + false // isImplicit + )); + + return new StructTypeInfo("RecursiveObject", null, "", new ArrayList(), fields, + new ArrayList(), new ArrayList()); } } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoUtilTest.java index a78144a2a..549a3772b 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/typeinfo/TypeInfoUtilTest.java @@ -1,6 +1,7 @@ package zserio.runtime.typeinfo; import static org.junit.jupiter.api.Assertions.assertEquals; + import org.junit.jupiter.api.Test; public class TypeInfoUtilTest diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationBitStreamReaderTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationBitStreamReaderTest.java index 51c665475..e4918afcc 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationBitStreamReaderTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationBitStreamReaderTest.java @@ -2,15 +2,16 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; +import org.junit.jupiter.api.Test; + import zserio.runtime.array.Array; -import zserio.runtime.array.RawArray; import zserio.runtime.array.ArrayTraits; import zserio.runtime.array.ArrayType; +import zserio.runtime.array.RawArray; import zserio.runtime.io.ByteArrayBitStreamWriter; public class ValidationBitStreamReaderTest diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java index 9f388a84e..112ae2823 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationSqliteUtilTest.java @@ -1,12 +1,11 @@ package zserio.runtime.validation; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.sql.Connection; import java.sql.DriverManager; @@ -18,6 +17,8 @@ import java.util.Map; import java.util.Properties; +import org.junit.jupiter.api.Test; + import zserio.runtime.SqlDatabaseReader; public class ValidationSqliteUtilTest @@ -75,12 +76,12 @@ public void isHiddenColumnInTable() throws SQLException try (final TestSqlDatabase testDatabase = new TestSqlDatabase()) { - testDatabase.executeUpdate("CREATE VIRTUAL TABLE " + TABLE_NAME + " USING fts4 " + - "(substitutionId TEXT NOT NULL);"); - assertTrue(ValidationSqliteUtil.isHiddenColumnInTable(testDatabase.connection(), null, TABLE_NAME, - "docId")); - assertFalse(ValidationSqliteUtil.isHiddenColumnInTable(testDatabase.connection(), null, TABLE_NAME, - "languageCode")); + testDatabase.executeUpdate("CREATE VIRTUAL TABLE " + TABLE_NAME + " USING fts4 " + + "(substitutionId TEXT NOT NULL);"); + assertTrue(ValidationSqliteUtil.isHiddenColumnInTable( + testDatabase.connection(), null, TABLE_NAME, "docId")); + assertFalse(ValidationSqliteUtil.isHiddenColumnInTable( + testDatabase.connection(), null, TABLE_NAME, "languageCode")); } } @@ -90,23 +91,21 @@ public void sqlTypeToSqliteType() throws SQLException final String tableName = "sqlTypeToSqliteTypeTable"; try (final TestSqlDatabase testDatabase = new TestSqlDatabase()) { - testDatabase.executeUpdate("CREATE TABLE " + tableName + "(id INTEGER PRIMARY KEY, " + - "integerCol INTEGER, realCol REAL, textCol TEXT, blobCol BLOB)"); + testDatabase.executeUpdate("CREATE TABLE " + tableName + "(id INTEGER PRIMARY KEY, " + + "integerCol INTEGER, realCol REAL, textCol TEXT, blobCol BLOB)"); testDatabase.executeUpdate("INSERT INTO " + tableName + " VALUES (0, NULL, NULL, NULL, NULL)"); testDatabase.executeUpdate("INSERT INTO " + tableName + " VALUES (1, 13, 1.3, 'STRING', x'00')"); testDatabase.executeUpdate("INSERT INTO " + tableName + " VALUES (2, 1.3, 'STRING', x'00', 13)"); - try ( - final Statement stmt = testDatabase.connection().createStatement(); - final ResultSet resultSet = stmt.executeQuery("SELECT * FROM " + tableName); - ) + try (final Statement stmt = testDatabase.connection().createStatement(); + final ResultSet resultSet = stmt.executeQuery("SELECT * FROM " + tableName);) { // first row checks NULL values // note that different versions of Xerial JDBC returns different types assertTrue(resultSet.next()); ResultSetMetaData metaData = resultSet.getMetaData(); - assertEquals(Types.INTEGER, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(1))); + assertEquals( + Types.INTEGER, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(1))); assertThat(ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(2)), anyOf(is(Types.INTEGER), is(Types.NULL))); assertThat(ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(3)), @@ -119,30 +118,26 @@ public void sqlTypeToSqliteType() throws SQLException // second row checks correct values assertTrue(resultSet.next()); metaData = resultSet.getMetaData(); - assertEquals(Types.INTEGER, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(1))); - assertEquals(Types.INTEGER, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(2))); - assertEquals(Types.REAL, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(3))); - assertEquals(Types.VARCHAR, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(4))); - assertEquals(Types.BLOB, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(5))); + assertEquals( + Types.INTEGER, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(1))); + assertEquals( + Types.INTEGER, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(2))); + assertEquals(Types.REAL, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(3))); + assertEquals( + Types.VARCHAR, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(4))); + assertEquals(Types.BLOB, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(5))); // third row checks types mismatch - i.e. checks dynamic typing in SQLite assertTrue(resultSet.next()); metaData = resultSet.getMetaData(); - assertEquals(Types.INTEGER, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(1))); - assertEquals(Types.REAL, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(2))); - assertEquals(Types.VARCHAR, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(3))); - assertEquals(Types.BLOB, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(4))); - assertEquals(Types.INTEGER, - ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(5))); + assertEquals( + Types.INTEGER, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(1))); + assertEquals(Types.REAL, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(2))); + assertEquals( + Types.VARCHAR, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(3))); + assertEquals(Types.BLOB, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(4))); + assertEquals( + Types.INTEGER, ValidationSqliteUtil.sqlTypeToSqliteType(metaData.getColumnType(5))); } } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationTimerTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationTimerTest.java index 6a724d522..2c7c8c87d 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationTimerTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/validation/ValidationTimerTest.java @@ -1,6 +1,7 @@ package zserio.runtime.validation; import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.Test; public class ValidationTimerTest @@ -15,9 +16,7 @@ public void oneSecondTimer() throws InterruptedException final long minTolerance = 900; final long maxTolerance = 1100; final long duration = validationTimer.getDuration(); - assertTrue(duration >= minTolerance, - "Duration '" + duration + "' should be >= '" + minTolerance + "'"); - assertTrue(duration <= maxTolerance, - "Duration '" + duration + "' should be <= '" + maxTolerance + "'"); + assertTrue(duration >= minTolerance, "Duration '" + duration + "' should be >= '" + minTolerance + "'"); + assertTrue(duration <= maxTolerance, "Duration '" + duration + "' should be <= '" + maxTolerance + "'"); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/AndWalkFilterTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/AndWalkFilterTest.java index c5a9122cf..7f1a507ec 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/AndWalkFilterTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/AndWalkFilterTest.java @@ -24,14 +24,14 @@ public void empty() assertTrue(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertTrue(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertTrue(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } @Test @@ -48,14 +48,14 @@ public void trueTrue() assertTrue(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertTrue(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertTrue(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } @Test @@ -86,14 +86,14 @@ public void falseFalse() assertFalse(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertFalse(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertFalse(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertFalse(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertFalse(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertFalse(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertFalse(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertFalse(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertFalse( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertFalse( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } @Test @@ -118,13 +118,13 @@ public void trueFalse() assertFalse(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertFalse(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertFalse(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertFalse(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertFalse(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertFalse(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertFalse(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertFalse(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertFalse( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertFalse( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/ArrayLengthWalkFilterTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/ArrayLengthWalkFilterTest.java index e80ce0cfd..e63103cf7 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/ArrayLengthWalkFilterTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/ArrayLengthWalkFilterTest.java @@ -27,17 +27,17 @@ public void length0() assertFalse(walkFilter.afterValue(walkerObject.getUnionArray()[1], walkerArrayFieldInfo, 1)); assertTrue(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertTrue(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); assertTrue(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertFalse(walkFilter.beforeValue(walkerObject.getUnionArray()[0], walkerArrayFieldInfo, 0)); assertFalse(walkFilter.afterValue(walkerObject.getUnionArray()[0], walkerArrayFieldInfo, 0)); assertTrue(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertTrue(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkFilterTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkFilterTest.java index bb442a4cd..2c944fdfc 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkFilterTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkFilterTest.java @@ -22,14 +22,14 @@ public void allMethods() assertTrue(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertTrue(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertTrue(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - - assertTrue(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + + assertTrue( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkObserverTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkObserverTest.java index c4c2cee34..c567d0bf3 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkObserverTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/DefaultWalkObserverTest.java @@ -23,11 +23,17 @@ public void allMethods() assertDoesNotThrow(() -> walkObserver.endRoot(walkerObject)); assertDoesNotThrow(() -> walkObserver.beginArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertDoesNotThrow(() -> walkObserver.endArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertDoesNotThrow(() -> walkObserver.beginCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertDoesNotThrow(() -> walkObserver.endCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertDoesNotThrow(() -> walkObserver.visitValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertDoesNotThrow( + () + -> walkObserver.beginCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertDoesNotThrow( + () + -> walkObserver.endCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertDoesNotThrow( + () + -> walkObserver.visitValue( + walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/RegexWalkFilterTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/RegexWalkFilterTest.java index 7ba520c70..fda3d6c20 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/RegexWalkFilterTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/RegexWalkFilterTest.java @@ -8,9 +8,9 @@ import zserio.runtime.typeinfo.FieldInfo; -import test_object.WalkerUnion; import test_object.WalkerNested; import test_object.WalkerObject; +import test_object.WalkerUnion; public class RegexWalkFilterTest { @@ -25,14 +25,14 @@ public void regexAllMatch() assertTrue(walkFilter.beforeArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); assertTrue(walkFilter.afterArray(walkerObject.getUnionArray(), walkerArrayFieldInfo)); - assertTrue(walkFilter.beforeCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterCompound(walkerObject.getNested(), walkerCompoundFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterCompound( + walkerObject.getNested(), walkerCompoundFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.beforeValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.afterValue(walkerObject.getIdentifier(), walkerFieldInfo, WalkerConst.NOT_ELEMENT)); } @Test @@ -42,21 +42,21 @@ public void regexPrefixMatch() final WalkerObject walkerObject = TestObjectCreator.createWalkerObject(); final FieldInfo identifierFieldInfo = WalkerObject.typeInfo().getFields().get(0); - assertFalse(walkFilter.beforeValue(walkerObject.getIdentifier(), identifierFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getIdentifier(), identifierFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertFalse(walkFilter.beforeValue( + walkerObject.getIdentifier(), identifierFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterValue( + walkerObject.getIdentifier(), identifierFieldInfo, WalkerConst.NOT_ELEMENT)); final FieldInfo nestedFieldInfo = WalkerObject.typeInfo().getFields().get(1); - assertTrue(walkFilter.beforeCompound(walkerObject.getNested(), nestedFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.beforeCompound(walkerObject.getNested(), nestedFieldInfo, WalkerConst.NOT_ELEMENT)); final FieldInfo textFieldInfo = nestedFieldInfo.getTypeInfo().getFields().get(0); - assertTrue(walkFilter.beforeValue(walkerObject.getNested().getText(), textFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getNested().getText(), textFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterCompound(walkerObject.getNested(), nestedFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeValue( + walkerObject.getNested().getText(), textFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterValue( + walkerObject.getNested().getText(), textFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue( + walkFilter.afterCompound(walkerObject.getNested(), nestedFieldInfo, WalkerConst.NOT_ELEMENT)); // ignore text @@ -91,10 +91,10 @@ public void regexArrayNoMatch() { final RegexWalkFilter walkFilter = new RegexWalkFilter("^unionArray\\[\\d*\\]\\.te.*"); - final WalkerUnion[] unionArray = new WalkerUnion[] { new WalkerUnion() }; - unionArray[0].setNestedArray(new WalkerNested[] { new WalkerNested("nestedArray") }); - final WalkerObject walkerObject = new WalkerObject( - 13, new WalkerNested("nested"), "test", unionArray, null); + final WalkerUnion[] unionArray = new WalkerUnion[] {new WalkerUnion()}; + unionArray[0].setNestedArray(new WalkerNested[] {new WalkerNested("nestedArray")}); + final WalkerObject walkerObject = + new WalkerObject(13, new WalkerNested("nested"), "test", unionArray, null); final FieldInfo unionArrayFieldInfo = WalkerObject.typeInfo().getFields().get(3); assertFalse(walkFilter.beforeArray(walkerObject.getUnionArray(), unionArrayFieldInfo)); @@ -136,10 +136,10 @@ public void regexNullArrayMatch() final FieldInfo optionalUnionArrayFieldInfo = WalkerObject.typeInfo().getFields().get(4); assertEquals(null, walkerObject.getOptionalUnionArray()); // note that the null arrays are processed as values! - assertTrue(walkFilter.beforeValue(walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.beforeValue( + walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterValue( + walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, WalkerConst.NOT_ELEMENT)); } @Test @@ -152,9 +152,9 @@ public void regexNullArrayNoMatch() final FieldInfo optionalUnionArrayFieldInfo = WalkerObject.typeInfo().getFields().get(4); assertEquals(null, walkerObject.getOptionalUnionArray()); // note that the null arrays are processed as values! - assertFalse(walkFilter.beforeValue(walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, - WalkerConst.NOT_ELEMENT)); - assertTrue(walkFilter.afterValue(walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, - WalkerConst.NOT_ELEMENT)); + assertFalse(walkFilter.beforeValue( + walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, WalkerConst.NOT_ELEMENT)); + assertTrue(walkFilter.afterValue( + walkerObject.getOptionalUnionArray(), optionalUnionArrayFieldInfo, WalkerConst.NOT_ELEMENT)); } } diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestObjectCreator.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestObjectCreator.java index 6f5dedb7a..6c2b0c68f 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestObjectCreator.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestObjectCreator.java @@ -1,8 +1,8 @@ package zserio.runtime.walker; import test_object.WalkerNested; -import test_object.WalkerUnion; import test_object.WalkerObject; +import test_object.WalkerUnion; public class TestObjectCreator { @@ -13,8 +13,8 @@ public static WalkerObject createWalkerObject() public static WalkerObject createWalkerObject(long identifier, boolean createNested) { - final WalkerUnion[] unionArray = new WalkerUnion[] {new WalkerUnion(), new WalkerUnion(), - new WalkerUnion()}; + final WalkerUnion[] unionArray = + new WalkerUnion[] {new WalkerUnion(), new WalkerUnion(), new WalkerUnion()}; unionArray[0].setText("1"); unionArray[1].setValue(2); unionArray[2].setNestedArray(new WalkerNested[] {new WalkerNested("nestedArray")}); diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestWalkObserver.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestWalkObserver.java index d48c7d992..7679bb2ab 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestWalkObserver.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/TestWalkObserver.java @@ -31,7 +31,6 @@ public void beginRoot(Object compound) public void endRoot(Object compound) { captures.get("endRoot").add(compound); - } @Override diff --git a/compiler/extensions/java/runtime/test/zserio/runtime/walker/WalkerTest.java b/compiler/extensions/java/runtime/test/zserio/runtime/walker/WalkerTest.java index 8bb5a9b32..7610eb9ef 100644 --- a/compiler/extensions/java/runtime/test/zserio/runtime/walker/WalkerTest.java +++ b/compiler/extensions/java/runtime/test/zserio/runtime/walker/WalkerTest.java @@ -37,8 +37,8 @@ public void walk() assertEquals(2, observer.getCaptures("beginArray").size()); assertEquals(walkerObject.getUnionArray(), observer.getCaptures("beginArray").get(0)); - assertEquals(walkerObject.getUnionArray()[2].getNestedArray(), - observer.getCaptures("beginArray").get(1)); + assertEquals( + walkerObject.getUnionArray()[2].getNestedArray(), observer.getCaptures("beginArray").get(1)); assertEquals(2, observer.getCaptures("endArray").size()); assertEquals(walkerObject.getUnionArray()[2].getNestedArray(), observer.getCaptures("endArray").get(0)); @@ -85,8 +85,8 @@ public void walkWrongOptionalCondition() assertEquals(2, observer.getCaptures("beginArray").size()); assertEquals(walkerObject.getUnionArray(), observer.getCaptures("beginArray").get(0)); - assertEquals(walkerObject.getUnionArray()[2].getNestedArray(), - observer.getCaptures("beginArray").get(1)); + assertEquals( + walkerObject.getUnionArray()[2].getNestedArray(), observer.getCaptures("beginArray").get(1)); assertEquals(2, observer.getCaptures("endArray").size()); assertEquals(walkerObject.getUnionArray()[2].getNestedArray(), observer.getCaptures("endArray").get(0));