id
stringlengths 33
68
| content
stringlengths 657
500k
| max_stars_repo_path
stringlengths 118
258
|
|---|---|---|
gitbug-java_data_traccar-traccar.json_17 | diff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
index 5c5ba4b..3acd87b 100644
--- a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -553,6 +553,11 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // alarm type
buf.skipBytes(length - 2);
break;
+ case 0xFEA8:
+ buf.readUnsignedByte(); // battery status
+ position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+ buf.readUnsignedByte(); // battery alert
+ break;
default:
buf.skipBytes(length);
break;
diff --git a/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java
index 419eddf..8533455 100644
--- a/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java
@@ -12,6 +12,10 @@ public class MeitrackProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new MeitrackProtocolDecoder(null));
verifyAttribute(decoder, binary(
+ "2424663137302c3836353431333035303839313733372c4343452c00000000010088001800050501060907101400150008080000091c000a18000b1e001606001a0000402300fe9000000602d5fe5ffe038f2a1f0904102c8d2b0cd23f02000df03203001c01000000050e0cf90101003170017ac80892ff4b16010113464444204c5445284c54452042414e44203329fea50601ffffff7ffffea807024d0000000000feb20501010000002a36430d0a"),
+ Position.KEY_BATTERY_LEVEL, 77);
+
+ verifyAttribute(decoder, binary(
"24245b3131342c3836343630363034343939333938372c4343452c0000000001005000130006012305000600070f1b004702060800000900000a00000b0000199d011a00000602d179570103b25ccc0604cf04862b0cc65b01000da4090d001c01000000010e0ccc010000b627be11000000002a41300d0a"),
Position.KEY_LOCK, true);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_18 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index d0bbeeb..f79641b 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -847,7 +847,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
case 0x03:
count = buf.readUnsignedByte();
for (int i = 0; i < count; i++) {
- int id = buf.readUnsignedShort();
+ int id = buf.readUnsignedByte();
int length = buf.readUnsignedByte();
switch (id) {
case 0x1A:
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index e91c84d..04c3a8c 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,9 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyPosition(decoder, binary(
+ "7e0900001f4f07788ef87d000cf0230223150215010203013800000c000b029dc58c04b99b60230223171822507e"));
+
+ verifyPosition(decoder, binary(
"7e0200004107904226220608ca0000010000000010031dac0d004864f30000000000002212291003220104000179a7300107310100eb17000300e151000300e304000b00d801041edf340000306b007e"));
verifyPosition(decoder, binary(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_19 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index d6deafe..d3336b6 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -753,6 +753,22 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_STATUS, status);
+ while (buf.readableBytes() > 2) {
+ int id = buf.readUnsignedByte();
+ int length = buf.readUnsignedByte();
+ switch (id) {
+ case 0x02:
+ position.setAltitude(buf.readShort());
+ break;
+ case 0x0C:
+ position.set("gyro", ByteBufUtil.hexDump(buf.readSlice(6)));
+ break;
+ default:
+ buf.skipBytes(length);
+ break;
+ }
+ }
+
return position;
}
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 95abc43..9590f77 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -14,6 +14,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
+ verifyAttribute(decoder, binary(
+ "7e55019c3b8571110003399a07032310302029538631031015370500001a0c000000265700440001233703080000001001020202000a0a04028f000af401040c06ff98ffa8007e707e"),
+ "gyro", "ff98ffa8007e");
+
verifyPosition(decoder, binary(
"7e0900001f4f07788ef87d000cf0230223150215010203013800000c000b029dc58c04b99b60230223171822507e"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_20 | diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
index 0b08bad..aa43a60 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
@@ -277,6 +277,10 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
i += 1;
}
break;
+ case 0x37:
+ buf.readUnsignedIntLE(); // timestamp
+ position.set("barkCount", BitUtil.to(buf.readUnsignedIntLE(), 31));
+ break;
case 0x40:
buf.readUnsignedIntLE(); // timestamp
int heartRate = buf.readUnsignedByte();
diff --git a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
index 2013fa8..693a11f 100644
--- a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class Minifinder2ProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Minifinder2ProtocolDecoder(null));
verifyAttribute(decoder, binary(
+ "ab101c00d6f61e000110013836333932313033393939363038300937efd201640c000000"),
+ "barkCount", 12L);
+
+ verifyAttribute(decoder, binary(
"ab102600080f1400011001383633393231303339393833343736092429b347633003a96409020000008027b34763"),
"bark", true);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_21 | diff --git a/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java
index b343c3b..2b50e55 100644
--- a/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 - 2022 Anton Tananaev ([email protected])
+ * Copyright 2012 - 2023 Anton Tananaev ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,8 +15,11 @@
*/
package org.traccar.protocol;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.DataConverter;
import org.traccar.session.DeviceSession;
import org.traccar.NetworkMessage;
import org.traccar.Protocol;
@@ -448,6 +451,63 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
return position;
}
+ private Position decodeBms(Channel channel, SocketAddress remoteAddress, String sentence) {
+ String id = sentence.substring(1, 13);
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, id);
+ if (deviceSession == null) {
+ return null;
+ }
+
+ Position position = new Position(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ getLastLocation(position, null);
+
+ ByteBuf buf = Unpooled.wrappedBuffer(
+ DataConverter.parseHex(sentence.substring(1 + 12 + 4, sentence.length() - 1)));
+
+ buf.readUnsignedByte();
+ buf.readUnsignedByte();
+ buf.readUnsignedByte(); // header
+
+ int batteryCount = buf.readUnsignedByte();
+ for (int i = 1; i <= 24; i++) {
+ int voltage = buf.readUnsignedShortLE();
+ if (i <= batteryCount) {
+ position.set("battery" + i, voltage * 0.001);
+ }
+ }
+
+ position.set(Position.KEY_CHARGE, buf.readUnsignedByte() == 0);
+ position.set("current", buf.readUnsignedShortLE() * 0.1);
+ position.set(Position.KEY_BATTERY, buf.readUnsignedShortLE() * 0.01);
+ position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+ position.set("batteryOverheat", buf.readUnsignedByte() > 0);
+ position.set("chargeProtection", buf.readUnsignedByte() > 0);
+ position.set("dischargeProtection", buf.readUnsignedByte() > 0);
+ buf.readUnsignedByte(); // drop line
+ buf.readUnsignedByte(); // balanced
+ position.set("cycles", buf.readUnsignedShortLE());
+ position.set("faultAlarm", buf.readUnsignedByte());
+
+ buf.skipBytes(6);
+
+ int temperatureCount = buf.readUnsignedByte();
+ position.set("powerTemp", buf.readUnsignedByte() - 40);
+ position.set("equilibriumTemp", buf.readUnsignedByte() - 40);
+ for (int i = 1; i <= 7; i++) {
+ int temperature = buf.readUnsignedByte() - 40;
+ if (i <= temperatureCount) {
+ position.set("batteryTemp" + i, temperature);
+ }
+ }
+
+ position.set("calibrationCapacity", buf.readUnsignedShortLE() * 0.01);
+ position.set("dischargeCapacity", buf.readUnsignedIntLE());
+
+ return position;
+ }
+
@Override
protected Object decode(
Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
@@ -477,6 +537,8 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
return decodeLbsWifi(channel, remoteAddress, sentence);
} else if (sentence.contains("BV00")) {
return decodeVin(channel, remoteAddress, sentence);
+ } else if (sentence.contains("BS50")) {
+ return decodeBms(channel, remoteAddress, sentence);
}
Parser parser = new Parser(PATTERN, sentence);
diff --git a/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java
index 9fc8b81..1631ab0 100644
--- a/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Tk103ProtocolDecoder(null));
+ verifyAttribute(decoder, text(
+ "(352602014867BS500064FF0EF10FF10FF00FF20FF30FF20FF20FF40FF20FF40FF40FF20FF30FF20F0000000000000000000000000000000000000000000000001663000000010004000000000000000002444444420000000000A00FA000000000000000200000000315E2000000)"),
+ "batteryTemp2", 26);
+
verifyAttributes(decoder, text(
"(027046434858BZ00,{460,0,20949,58711}\n{460,0,20494,54003}\n{460,0,20951,19569}\n,01000000)"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_22 | diff --git a/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java b/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java
index 8e84a67..ba9b416 100644
--- a/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java
@@ -204,30 +204,39 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
}
- private void decodeTags(Position position, ByteBuf buf) {
+ private void decodeTags(Position position, ByteBuf buf, int hardware) {
int blockLength = buf.readUnsignedShort();
int blockEnd = buf.readerIndex() + blockLength;
if (blockLength > 0) {
- buf.readUnsignedByte(); // tag type
+ int type = buf.readUnsignedByte();
- int count = buf.readUnsignedByte();
- int tagLength = buf.readUnsignedByte();
+ if (hardware != 0x153 || type >= 2) {
- for (int i = 1; i <= count; i++) {
- int tagEnd = buf.readerIndex() + tagLength;
+ int count = buf.readUnsignedByte();
+ int tagLength = buf.readUnsignedByte();
+
+ for (int i = 1; i <= count; i++) {
+ int tagEnd = buf.readerIndex() + tagLength;
+
+ buf.readUnsignedByte(); // status
+ buf.readUnsignedShortLE(); // battery voltage
- buf.readUnsignedByte(); // status
- buf.readUnsignedShortLE(); // battery voltage
+ position.set(Position.PREFIX_TEMP + i, (buf.readShortLE() & 0x3fff) * 0.1);
+
+ buf.readUnsignedByte(); // humidity
+ buf.readUnsignedByte(); // rssi
+
+ buf.readerIndex(tagEnd);
+ }
- position.set(Position.PREFIX_TEMP + i, (buf.readShortLE() & 0x3fff) * 0.1);
+ } else if (type == 1) {
- buf.readUnsignedByte(); // humidity
- buf.readUnsignedByte(); // rssi
+ position.set("driverLicense", buf.readCharSequence(
+ blockEnd - buf.readerIndex(), StandardCharsets.UTF_8).toString());
- buf.readerIndex(tagEnd);
}
}
@@ -364,9 +373,9 @@ public class TzoneProtocolDecoder extends BaseProtocolDecoder {
}
- if (hardware == 0x406) {
+ if (hardware == 0x153 || hardware == 0x406) {
- decodeTags(position, buf);
+ decodeTags(position, buf, hardware);
}
diff --git a/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java
index 4813021..8fdc8c2 100644
--- a/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/TzoneProtocolDecoderTest.java
@@ -10,6 +10,10 @@ public class TzoneProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new TzoneProtocolDecoder(null));
+ verifyAttribute(decoder, binary(
+ "545a00d424240153011300000863835029944118170316023b180016040485c73d2479187e170316023b1800000000060c000000000d1cc0406303019904aa00000000008a012520205e544f4e474c4f4d245049544f4f4e244d522e5e5e3f3b363030373634333132303130303134323234323d3139303631393538313032363d3f2b2020202020202020202020202032322020202020202020202020203120202020202020202020202030303234363238202031303730302020202020202020202020202020202020202020203f00030080000006e80e0d0a"),
+ "driverLicense", "% ^TONGLOM$PITOON$MR.^^?;6007643120100142242=190619581026=?+ 22 1 0024628 10700 ?");
+
verifyAttributes(decoder, binary(
"545a003724240407020200000180322000001610160b151019100000000c010a07320101088600007dca000baa102837016a0114025500000169e80d0a"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java b/src/main/java/org/traccar/protocol/TzoneProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_23 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index d3336b6..22c39c2 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -761,7 +761,19 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.setAltitude(buf.readShort());
break;
case 0x0C:
- position.set("gyro", ByteBufUtil.hexDump(buf.readSlice(6)));
+ int x = buf.readUnsignedShort();
+ if (x > 0x8000) {
+ x -= 0x10000;
+ }
+ int y = buf.readUnsignedShort();
+ if (y > 0x8000) {
+ y -= 0x10000;
+ }
+ int z = buf.readUnsignedShort();
+ if (z > 0x8000) {
+ z -= 0x10000;
+ }
+ position.set("tilt", String.format("[%d,%d,%d]", x, y, z));
break;
default:
buf.skipBytes(length);
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 9590f77..1737593 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -16,7 +16,7 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
verifyAttribute(decoder, binary(
"7e55019c3b8571110003399a07032310302029538631031015370500001a0c000000265700440001233703080000001001020202000a0a04028f000af401040c06ff98ffa8007e707e"),
- "gyro", "ff98ffa8007e");
+ "tilt", "[-104,-88,126]");
verifyPosition(decoder, binary(
"7e0900001f4f07788ef87d000cf0230223150215010203013800000c000b029dc58c04b99b60230223171822507e"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_24 | diff --git a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java
index ffa4472..4d1b34d 100644
--- a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java
@@ -63,8 +63,9 @@ public class WialonProtocolDecoder extends BaseProtocolDecoder {
.number("(?:NA|(d+));") // outputs
.expression("(?:NA|([^;]*));") // adc
.expression("(?:NA|([^;]*));") // ibutton
- .expression("(?:NA|(.*))") // params
+ .expression("(?:NA|([^;]*))") // params
.groupEnd("?")
+ .any()
.compile();
private void sendResponse(Channel channel, SocketAddress remoteAddress, String type, Integer number) {
diff --git a/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java
index e67a798..b7c4224 100644
--- a/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/WialonProtocolDecoderTest.java
@@ -13,6 +13,10 @@ public class WialonProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, text(
"#L#2.0;42001300083;;CE45"));
+ verifyAttribute(decoder, text(
+ "#D#220323;114150;2234.80479;N;11354.87786;E;0;NA;59;11;NA;NA;NA;;NA;d_battr:1:94,d_csq:1:21,di_light:1:1;E7C9"),
+ "di_light", 1.0);
+
verifyAttributes(decoder, text(
"#D#NA;NA;5429.681944502211763;N;02654.60403650999069;E;NA;NA;NA;NA;NA;NA;NA;1.0;NA;m1:1:9196679,d1:1:15397,t1:1:20,b1:1:162,fuel1:2:21588.0,pv1:2:35.98,finish:1:1;0x9b0"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java b/src/main/java/org/traccar/protocol/WialonProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_25 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index ddc3192..7227c55 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -457,6 +457,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
int subtype = buf.readUnsignedByte();
int length = buf.readUnsignedByte();
int endIndex = buf.readerIndex() + length;
+ String stringValue;
switch (subtype) {
case 0x01:
position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 100);
@@ -474,9 +475,9 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
break;
case 0x33:
- String sentence = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
- if (sentence.startsWith("*M00")) {
- String lockStatus = sentence.substring(8, 8 + 7);
+ stringValue = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+ if (stringValue.startsWith("*M00")) {
+ String lockStatus = stringValue.substring(8, 8 + 7);
position.set(Position.KEY_BATTERY, Integer.parseInt(lockStatus.substring(2, 5)) * 0.01);
}
break;
@@ -501,8 +502,8 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
break;
case 0x94:
if (length > 0) {
- position.set(
- Position.KEY_VIN, buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
+ stringValue = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+ position.set(Position.KEY_VIN, stringValue);
}
break;
case 0xA7:
@@ -512,6 +513,14 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
case 0xAC:
position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
break;
+ case 0xBC:
+ stringValue = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+ position.set("driver", stringValue.trim());
+ break;
+ case 0xBD:
+ stringValue = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+ position.set(Position.KEY_DRIVER_UNIQUE_ID, stringValue);
+ break;
case 0xD0:
long userStatus = buf.readUnsignedInt();
if (BitUtil.check(userStatus, 3)) {
@@ -598,8 +607,8 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
}
break;
case 0xED:
- String license = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString().trim();
- position.set("driverLicense", license);
+ stringValue = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString();
+ position.set("driverLicense", stringValue.trim());
break;
case 0xEE:
position.set(Position.KEY_RSSI, buf.readUnsignedByte());
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 1737593..4541185 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyAttribute(decoder, binary(
+ "7E02000079013653183645009E00000000000C0C030158BF0006C926670000004000CE22120904274201040000005DBC3244524956494E47204C4943454E53452454455354244D522E0000000000000000000000000000000000000000000000000000BD0F323431393939393935383030313030E3060000050500007102000C30011F310108987E"),
+ "driver", "DRIVING LICENSE$TEST$MR.");
+
+ verifyAttribute(decoder, binary(
"7e55019c3b8571110003399a07032310302029538631031015370500001a0c000000265700440001233703080000001001020202000a0a04028f000af401040c06ff98ffa8007e707e"),
"tilt", "[-104,-88,126]");
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_26 | diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocol.java b/src/main/java/org/traccar/protocol/HuaShengProtocol.java
index 4a0ebe5..1f8bafc 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocol.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocol.java
@@ -29,6 +29,7 @@ public class HuaShengProtocol extends BaseProtocol {
public HuaShengProtocol(Config config) {
setSupportedDataCommands(
Command.TYPE_POSITION_PERIODIC,
+ Command.TYPE_OUTPUT_CONTROL,
Command.TYPE_ALARM_ARM,
Command.TYPE_ALARM_DISARM,
Command.TYPE_SET_SPEED_LIMIT);
diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 993e369..2d952c7 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -50,6 +50,8 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
public static final int MSG_HSO_RSP = 0x0003;
public static final int MSG_SET_REQ = 0xAA04;
public static final int MSG_SET_RSP = 0xFF05;
+ public static final int MSG_CTRL_REQ = 0xAA16;
+ public static final int MSG_CTRL_RSP = 0xFF17;
private void sendResponse(Channel channel, int type, int index, ByteBuf content) {
if (channel != null) {
diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolEncoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolEncoder.java
index 636196e..dc34f7b 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolEncoder.java
@@ -27,13 +27,13 @@ public class HuaShengProtocolEncoder extends BaseProtocolEncoder {
super(protocol);
}
- private ByteBuf encodeContent(ByteBuf content) {
+ private ByteBuf encodeContent(int type, ByteBuf content) {
ByteBuf buf = Unpooled.buffer();
buf.writeByte(0xC0);
buf.writeShort(0x0000); // flag and version
buf.writeShort(12 + content.readableBytes());
- buf.writeShort(HuaShengProtocolDecoder.MSG_SET_REQ);
+ buf.writeShort(type);
buf.writeShort(0); // checksum
buf.writeInt(1); // index
buf.writeBytes(content);
@@ -52,17 +52,31 @@ public class HuaShengProtocolEncoder extends BaseProtocolEncoder {
content.writeShort(0x0002);
content.writeShort(6); // length
content.writeShort(command.getInteger(Command.KEY_FREQUENCY));
- return encodeContent(content);
+ return encodeContent(HuaShengProtocolDecoder.MSG_SET_REQ, content);
+ case Command.TYPE_OUTPUT_CONTROL:
+ /*
+0x01: Lock the relay1; //relay on
+0x02: Unlock the relay1; //relay off
+0x03: Lock the relay2; //relay2 on
+0x04: Unlock the relay2; //relay2 off
+0x05: Lock the relay3; //relay3 on
+0x06: Unlock the relay3; //realy3 off
+ */
+ content.writeByte(
+ (command.getInteger(Command.KEY_INDEX) - 1) * 2
+ + (2 - command.getInteger(Command.KEY_DATA)));
+ return encodeContent(HuaShengProtocolDecoder.MSG_CTRL_REQ, content);
case Command.TYPE_ALARM_ARM:
case Command.TYPE_ALARM_DISARM:
content.writeShort(0x0001);
content.writeShort(5); // length
content.writeByte(command.getType().equals(Command.TYPE_ALARM_ARM) ? 1 : 0);
+ return encodeContent(HuaShengProtocolDecoder.MSG_SET_REQ, content);
case Command.TYPE_SET_SPEED_LIMIT:
content.writeShort(0x0004);
content.writeShort(6); // length
content.writeShort(command.getInteger(Command.KEY_DATA));
- return encodeContent(content);
+ return encodeContent(HuaShengProtocolDecoder.MSG_SET_REQ, content);
default:
return null;
}
diff --git a/src/test/java/org/traccar/protocol/HuaShengProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolEncoderTest.java
index b44f6e8..c320d4a 100644
--- a/src/test/java/org/traccar/protocol/HuaShengProtocolEncoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuaShengProtocolEncoderTest.java
@@ -11,7 +11,17 @@ public class HuaShengProtocolEncoderTest extends ProtocolTest {
var encoder = inject(new HuaShengProtocolEncoder(null));
- Command command = new Command();
+ Command command;
+
+ command = new Command();
+ command.setDeviceId(1);
+ command.setType(Command.TYPE_OUTPUT_CONTROL);
+ command.set(Command.KEY_INDEX, 1);
+ command.set(Command.KEY_DATA, "1");
+
+ verifyCommand(encoder, command, binary("c00000000daa1600000000000101c0"));
+
+ command = new Command();
command.setDeviceId(1);
command.setType(Command.TYPE_POSITION_PERIODIC);
command.set(Command.KEY_FREQUENCY, 60);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuaShengProtocol.java b/src/main/java/org/traccar/protocol/HuaShengProtocol.java |
gitbug-java_data_traccar-traccar.json_27 | diff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
index 3f1f7f5..0f0d220 100644
--- a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java
@@ -554,15 +554,14 @@ public class MeitrackProtocolDecoder extends BaseProtocolDecoder {
buf.skipBytes(length - 2);
break;
case 0xFEA8:
- if (buf.readUnsignedByte() > 0) {
- position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
- } else {
- buf.readUnsignedByte();
+ for (int k = 1; k <= 3; k++) {
+ if (buf.readUnsignedByte() > 0) {
+ String key = k == 1 ? Position.KEY_BATTERY_LEVEL : "battery" + k + "Level";
+ position.set(key, buf.readUnsignedByte());
+ } else {
+ buf.readUnsignedByte();
+ }
}
- buf.readUnsignedByte(); // battery 2 status
- buf.readUnsignedByte(); // battery 2 level
- buf.readUnsignedByte(); // battery 3 status
- buf.readUnsignedByte(); // battery 3 level
buf.readUnsignedByte(); // battery alert
break;
default:
diff --git a/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java
index 1697fc9..8d2aee5 100644
--- a/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/MeitrackProtocolDecoderTest.java
@@ -12,6 +12,10 @@ public class MeitrackProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new MeitrackProtocolDecoder(null));
verifyAttribute(decoder, binary(
+ "2424683136342C3836363334343035333039353238322C4343452C000000000100820018000505000600070B14001500080800000900000A00000B00001606001A0000402300FE90000006022E79570103E55CCC0604E1FDB32B0CC32C00000D58EB02001C01000000050E0CCC010000B627BF11000000004B1001010D475052532847534D2039303029FEA50601FFFFFF7FFFFEA80701010258023800FEB20501010000002A41360D0A"),
+ "battery2Level", 88);
+
+ verifyAttribute(decoder, binary(
"2424593434312c3836353431333035303839313733372c4343452c00000000030088001800050501061607191400150008080000098e000a05000b0c001608001a0000402300fe9000000602c3fe5ffe03e22a1f0904e6688d2b0cd94002000d5f6f03001c01000000050e0cf901010032700298c80899ff4b16010113464444204c5445284c54452042414e44203329fea50601ffffff7ffffea807024d0000000000feb205010000000083001700050501061607191400150008080000098e000a05000b0c001608001a0000405100fe9000000502c3fe5ffe03e22a1f0904e6688d2b0cd94002000d606f0300050e0cf901010032700298c80899ff4b16010113464444204c5445284c54452042414e44203329fea50601ffffff7ffffea807024d0000000000feb205010000000088001800050501061607151400150008080000098e000a05000b0c001607001a0000402300fe9000000602c3fe5ffe03e22a1f0904f0688d2b0cd94002000d696f03001c01000000050e0cf901010032700298c80897ff4b16010113464444204c5445284c54452042414e44203329fea50601ffffff7ffffea807024d0000000000feb20501000000002a36320d0a"),
Position.KEY_BATTERY_LEVEL, 77);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/MeitrackProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_28 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index f132991..1aebba4 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -538,6 +538,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
break;
case 0xD4:
+ case 0xE1:
position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
break;
case 0xD5:
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 4541185..67f2145 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyAttribute(decoder, binary(
+ "7e0200002f017028775424038d000000000000000a0189dbeb04ca653a00000012014723040700074401040000000030011b31010ee1012dea020001dc7e"),
+ Position.KEY_BATTERY_LEVEL, 45);
+
+ verifyAttribute(decoder, binary(
"7E02000079013653183645009E00000000000C0C030158BF0006C926670000004000CE22120904274201040000005DBC3244524956494E47204C4943454E53452454455354244D522E0000000000000000000000000000000000000000000000000000BD0F323431393939393935383030313030E3060000050500007102000C30011F310108987E"),
"driver", "DRIVING LICENSE$TEST$MR.");
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_29 | diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index ead6578..4968ed0 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -610,8 +610,12 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
int length = buf.readInt() - 4;
getLastLocation(position, new Date(buf.readUnsignedInt() * 1000));
if (isPrintable(buf, length)) {
- position.set(Position.KEY_RESULT,
- buf.readCharSequence(length, StandardCharsets.US_ASCII).toString().trim());
+ String data = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString().trim();
+ if (data.startsWith("GTSL")) {
+ position.set(Position.KEY_DRIVER_UNIQUE_ID, data.split("\\|")[4]);
+ } else {
+ position.set(Position.KEY_RESULT, data);
+ }
} else {
position.set(Position.KEY_RESULT,
ByteBufUtil.hexDump(buf.readSlice(length)));
diff --git a/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
index 60b58f6..0b4f1d2 100644
--- a/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
@@ -3,6 +3,7 @@ package org.traccar.protocol;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.traccar.ProtocolTest;
+import org.traccar.model.Position;
public class TeltonikaProtocolDecoderTest extends ProtocolTest {
@@ -14,6 +15,10 @@ public class TeltonikaProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"000F313233343536373839303132333435"));
+ verifyAttribute(decoder, binary(
+ "00000000000000240d01060000001c642b3ad14754534c7c367c317c307c31323734393838347c317c0d0a010000ec11"),
+ Position.KEY_DRIVER_UNIQUE_ID, "12749884");
+
verifyPositions(decoder, binary(
"00000000000000a28e0100000183ac617e3001123eb99b1e142db4000000000000000000001d000900f000005000001503004500011e1801212d01242a012722012a18001100b5000000b600000018000000cd151000431c2d011f6981012047d701226981012347d901256981012647d8012869810129e6f304b0000304b1000304b2000304b30003000100f10000639d0002000b0000000214bf12fe000e0000000029d18c95000001000051b6"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_30 | diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
index 37e86e2..f660f2e 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
@@ -48,6 +48,8 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
public static final int MSG_DATA = 0x01;
public static final int MSG_CONFIGURATION = 0x02;
public static final int MSG_SERVICES = 0x03;
+ public static final int MSG_SYSTEM_CONTROL = 0x04;
+ public static final int MSG_FIRMWARE = 0x7E;
public static final int MSG_RESPONSE = 0x7F;
private String decodeAlarm(long code) {
diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolEncoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolEncoder.java
index ce7de6d..fab3c3a 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolEncoder.java
@@ -53,6 +53,7 @@ public class Minifinder2ProtocolEncoder extends BaseProtocolEncoder {
ByteBuf content = Unpooled.buffer();
if (command.getType().equals(Command.TYPE_FIRMWARE_UPDATE)) {
String url = command.getString(Command.KEY_DATA);
+ content.writeByte(Minifinder2ProtocolDecoder.MSG_SYSTEM_CONTROL);
content.writeByte(1 + url.length());
content.writeByte(0x30); // type
content.writeCharSequence(url, StandardCharsets.US_ASCII);
diff --git a/src/test/java/org/traccar/protocol/Minifinder2ProtocolEncoderTest.java b/src/test/java/org/traccar/protocol/Minifinder2ProtocolEncoderTest.java
index a3477bf..ef6ff6d 100644
--- a/src/test/java/org/traccar/protocol/Minifinder2ProtocolEncoderTest.java
+++ b/src/test/java/org/traccar/protocol/Minifinder2ProtocolEncoderTest.java
@@ -22,7 +22,7 @@ public class Minifinder2ProtocolEncoderTest extends ProtocolTest {
command.setType(Command.TYPE_FIRMWARE_UPDATE);
command.set(Command.KEY_DATA, "https://example.com");
- verifyCommand(encoder, command, binary("ab00150018750100143068747470733a2f2f6578616d706c652e636f6d"));
+ verifyCommand(encoder, command, binary("ab00160059d2010004143068747470733a2f2f6578616d706c652e636f6d"));
}
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_31 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index fcbb550..05e2fb8 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -913,6 +913,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
}
getLastLocation(position, time);
decodeCoordinates(position, buf);
+ position.setTime(time);
break;
case 0x02:
count = buf.readUnsignedByte();
@@ -925,6 +926,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
}
getLastLocation(position, time);
decodeCoordinates(position, buf);
+ position.setTime(time);
break;
case 0x03:
count = buf.readUnsignedByte();
@@ -956,6 +958,7 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
}
getLastLocation(position, time);
decodeCoordinates(position, buf);
+ position.setTime(time);
break;
case 0x0B:
if (buf.readUnsignedByte() > 0) {
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_32 | diff --git a/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java
index 2b50e55..6c926da 100644
--- a/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java
@@ -463,47 +463,90 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
getLastLocation(position, null);
- ByteBuf buf = Unpooled.wrappedBuffer(
- DataConverter.parseHex(sentence.substring(1 + 12 + 4, sentence.length() - 1)));
-
- buf.readUnsignedByte();
- buf.readUnsignedByte();
- buf.readUnsignedByte(); // header
-
- int batteryCount = buf.readUnsignedByte();
- for (int i = 1; i <= 24; i++) {
- int voltage = buf.readUnsignedShortLE();
- if (i <= batteryCount) {
- position.set("battery" + i, voltage * 0.001);
+ String payload = sentence.substring(1 + 12 + 4, sentence.length() - 1);
+
+ if (sentence.startsWith("BS50", 1 + 12)) {
+
+ ByteBuf buf = Unpooled.wrappedBuffer(DataConverter.parseHex(payload));
+
+ buf.readUnsignedByte();
+ buf.readUnsignedByte();
+ buf.readUnsignedByte(); // header
+
+ int batteryCount = buf.readUnsignedByte();
+ for (int i = 1; i <= 24; i++) {
+ int voltage = buf.readUnsignedShortLE();
+ if (i <= batteryCount) {
+ position.set("battery" + i, voltage * 0.001);
+ }
}
- }
- position.set(Position.KEY_CHARGE, buf.readUnsignedByte() == 0);
- position.set("current", buf.readUnsignedShortLE() * 0.1);
- position.set(Position.KEY_BATTERY, buf.readUnsignedShortLE() * 0.01);
- position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
- position.set("batteryOverheat", buf.readUnsignedByte() > 0);
- position.set("chargeProtection", buf.readUnsignedByte() > 0);
- position.set("dischargeProtection", buf.readUnsignedByte() > 0);
- buf.readUnsignedByte(); // drop line
- buf.readUnsignedByte(); // balanced
- position.set("cycles", buf.readUnsignedShortLE());
- position.set("faultAlarm", buf.readUnsignedByte());
-
- buf.skipBytes(6);
-
- int temperatureCount = buf.readUnsignedByte();
- position.set("powerTemp", buf.readUnsignedByte() - 40);
- position.set("equilibriumTemp", buf.readUnsignedByte() - 40);
- for (int i = 1; i <= 7; i++) {
- int temperature = buf.readUnsignedByte() - 40;
- if (i <= temperatureCount) {
- position.set("batteryTemp" + i, temperature);
+ position.set(Position.KEY_CHARGE, buf.readUnsignedByte() == 0);
+ position.set("current", buf.readUnsignedShortLE() * 0.1);
+ position.set(Position.KEY_BATTERY, buf.readUnsignedShortLE() * 0.01);
+ position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+ position.set("batteryOverheat", buf.readUnsignedByte() > 0);
+ position.set("chargeProtection", buf.readUnsignedByte() > 0);
+ position.set("dischargeProtection", buf.readUnsignedByte() > 0);
+ buf.readUnsignedByte(); // drop line
+ buf.readUnsignedByte(); // balanced
+ position.set("cycles", buf.readUnsignedShortLE());
+ position.set("faultAlarm", buf.readUnsignedByte());
+
+ buf.skipBytes(6);
+
+ int temperatureCount = buf.readUnsignedByte();
+ position.set("powerTemp", buf.readUnsignedByte() - 40);
+ position.set("equilibriumTemp", buf.readUnsignedByte() - 40);
+ for (int i = 1; i <= 7; i++) {
+ int temperature = buf.readUnsignedByte() - 40;
+ if (i <= temperatureCount) {
+ position.set("batteryTemp" + i, temperature);
+ }
}
- }
- position.set("calibrationCapacity", buf.readUnsignedShortLE() * 0.01);
- position.set("dischargeCapacity", buf.readUnsignedIntLE());
+ position.set("calibrationCapacity", buf.readUnsignedShortLE() * 0.01);
+ position.set("dischargeCapacity", buf.readUnsignedIntLE());
+
+ } else {
+
+ String[] values = payload.split(",");
+ for (String value : values) {
+ String[] pair = value.split(":");
+ int key = Integer.parseInt(pair[0], 16);
+ ByteBuf buf = Unpooled.wrappedBuffer(DataConverter.parseHex(pair[1]));
+ switch (key) {
+ case 0x90:
+ position.set("cumulativeVoltage", buf.readUnsignedShortLE() * 0.1);
+ position.set("gatherVoltage", buf.readUnsignedShortLE() * 0.1);
+ position.set("current", (buf.readUnsignedShortLE() - 30000) * 0.1);
+ position.set("soc", buf.readUnsignedShortLE() * 0.1);
+ break;
+ case 0x91:
+ position.set("maxCellVoltage", buf.readUnsignedShortLE() * 0.001);
+ position.set("maxCellVoltageCount", buf.readUnsignedByte());
+ position.set("minCellVoltage", buf.readUnsignedShortLE() * 0.001);
+ position.set("minCellVoltageCount", buf.readUnsignedByte());
+ break;
+ case 0x92:
+ position.set("maxTemp", buf.readUnsignedByte() - 40);
+ position.set("maxTempCount", buf.readUnsignedByte());
+ position.set("minTemp", buf.readUnsignedByte() - 40);
+ position.set("minTempCount", buf.readUnsignedByte());
+ break;
+ case 0x96:
+ buf.readUnsignedByte(); // frame
+ while (buf.isReadable()) {
+ position.set("cellTemp" + buf.readerIndex(), buf.readUnsignedByte() - 40);
+ }
+ break;
+ default:
+ break;
+ }
+
+ }
+
+ }
return position;
}
@@ -537,7 +580,7 @@ public class Tk103ProtocolDecoder extends BaseProtocolDecoder {
return decodeLbsWifi(channel, remoteAddress, sentence);
} else if (sentence.contains("BV00")) {
return decodeVin(channel, remoteAddress, sentence);
- } else if (sentence.contains("BS50")) {
+ } else if (sentence.contains("BS50") || sentence.contains("BS51")) {
return decodeBms(channel, remoteAddress, sentence);
}
diff --git a/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java
index 1631ab0..a3b3fa8 100644
--- a/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Tk103ProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class Tk103ProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Tk103ProtocolDecoder(null));
+ verifyAttributes(decoder, text(
+ "(007030201454BS5190:02150000753001DC,91:0EE8060EDC0A01DC,92:42014201DC0A01DC,93:00010127000037C8,94:0E01000002000000,95:020EE10EE20EE800030EE40EE00EE700040EDD0EE40EE400050EDC0EDF0EE400,96:0142000000000000,97:0000000000000000,98:0000000000000000)"));
+
verifyAttribute(decoder, text(
"(352602014867BS500064FF0EF10FF10FF00FF20FF30FF20FF20FF40FF20FF40FF40FF20FF30FF20F0000000000000000000000000000000000000000000000001663000000010004000000000000000002444444420000000000A00FA000000000000000200000000315E2000000)"),
"batteryTemp2", 26);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Tk103ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_33 | diff --git a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
index 3406417..aa19e9e 100644
--- a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -429,6 +429,191 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
case "MP":
buf.readUnsignedByte(); // manifold absolute pressure
break;
+ case "EO":
+ position.set(Position.KEY_ODOMETER, UnitsConverter.metersFromMiles(buf.readUnsignedInt()));
+ break;
+ case "EH":
+ position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 360000);
+ break;
+ case "ZO1":
+ buf.readUnsignedByte(); // brake stroke status
+ break;
+ case "ZO2":
+ buf.readUnsignedByte(); // warning indicator status
+ break;
+ case "ZO3":
+ buf.readUnsignedByte(); // abs control status
+ break;
+ case "ZO4":
+ position.set(Position.KEY_THROTTLE, buf.readUnsignedByte() * 0.4);
+ break;
+ case "ZO5":
+ buf.readUnsignedByte(); // parking brake status
+ break;
+ case "ZO6":
+ position.set(Position.KEY_OBD_SPEED, buf.readUnsignedByte() * 0.805);
+ break;
+ case "ZO7":
+ buf.readUnsignedByte(); // cruise control status
+ break;
+ case "ZO8":
+ buf.readUnsignedByte(); // accelector pedal position
+ break;
+ case "ZO9":
+ position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte() * 0.5);
+ break;
+ case "ZO10":
+ position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.5);
+ break;
+ case "ZO11":
+ buf.readUnsignedByte(); // engine oil pressure
+ break;
+ case "ZO12":
+ buf.readUnsignedByte(); // boost pressure
+ break;
+ case "ZO13":
+ buf.readUnsignedByte(); // intake temperature
+ break;
+ case "ZO14":
+ position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte());
+ break;
+ case "ZO15":
+ buf.readUnsignedByte(); // brake application pressure
+ break;
+ case "ZO16":
+ buf.readUnsignedByte(); // brake primary pressure
+ break;
+ case "ZO17":
+ buf.readUnsignedByte(); // brake secondary pressure
+ break;
+ case "ZH1":
+ buf.readUnsignedShort(); // cargo weight
+ break;
+ case "ZH2":
+ position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 16.428 / 3600);
+ break;
+ case "ZH3":
+ position.set(Position.KEY_RPM, buf.readUnsignedShort() * 0.25);
+ break;
+ case "ZL1":
+ buf.readUnsignedInt(); // fuel used (natural gas)
+ break;
+ case "ZL2":
+ position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 161);
+ break;
+ case "ZL3":
+ buf.readUnsignedInt(); // vehicle hours
+ break;
+ case "ZL4":
+ position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 5 * 36000);
+ break;
+ case "ZS1":
+ position.set(Position.KEY_VIN, readString(buf));
+ break;
+ case "JO1":
+ buf.readUnsignedByte(); // pedals
+ break;
+ case "JO2":
+ buf.readUnsignedByte(); // power takeoff device
+ break;
+ case "JO3":
+ buf.readUnsignedByte(); // accelector pedal position
+ break;
+ case "JO4":
+ position.set(Position.KEY_ENGINE_LOAD, buf.readUnsignedByte());
+ break;
+ case "JO5":
+ position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.4);
+ break;
+ case "JO6":
+ buf.readUnsignedByte(); // fms vehicle interface
+ break;
+ case "JO7":
+ buf.readUnsignedByte(); // driver 2
+ break;
+ case "JO8":
+ buf.readUnsignedByte(); // driver 1
+ break;
+ case "JO9":
+ buf.readUnsignedByte(); // drivers
+ break;
+ case "JO10":
+ buf.readUnsignedByte(); // system information
+ break;
+ case "JO11":
+ position.set(Position.KEY_COOLANT_TEMP, buf.readUnsignedByte() - 40);
+ break;
+ case "JO12":
+ buf.readUnsignedByte(); // pto engaged
+ break;
+ case "JH1":
+ position.set(Position.KEY_OBD_SPEED, buf.readUnsignedShort() / 256.0);
+ break;
+ case "JH2":
+ position.set(Position.KEY_RPM, buf.readUnsignedShort() * 0.125);
+ break;
+ case "JH3":
+ case "JH4":
+ case "JH5":
+ case "JH6":
+ case "JH7":
+ int index = Integer.parseInt(key.substring(2)) - 2;
+ position.set("axleWeight" + index, buf.readUnsignedShort() * 0.5);
+ break;
+ case "JH8":
+ position.set(Position.KEY_ODOMETER_SERVICE, buf.readUnsignedShort() * 5);
+ break;
+ case "JH9":
+ buf.readUnsignedShort(); // tachograph speed
+ break;
+ case "JH10":
+ buf.readUnsignedShort(); // ambient air temperature
+ break;
+ case "JH11":
+ position.set(Position.KEY_FUEL_CONSUMPTION, buf.readUnsignedShort() * 0.05);
+ break;
+ case "JH12":
+ buf.readUnsignedShort(); // fuel economy
+ break;
+ case "JL1":
+ position.set(Position.KEY_FUEL_USED, buf.readUnsignedInt() * 0.5);
+ break;
+ case "JL2":
+ position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 5 * 36000);
+ break;
+ case "JL3":
+ position.set(Position.KEY_ODOMETER, buf.readUnsignedInt() * 1000);
+ break;
+ case "JL4":
+ position.set(Position.KEY_FUEL_USED, buf.readUnsignedInt() * 0.001);
+ break;
+ case "JS1":
+ position.set(Position.KEY_VIN, readString(buf));
+ break;
+ case "JS2":
+ readString(buf); // fms version supported
+ break;
+ case "JS3":
+ position.set("driver1", readString(buf));
+ break;
+ case "JS4":
+ position.set("driver2", readString(buf));
+ break;
+ case "JN1":
+ buf.readUnsignedInt(); // cruise control distance
+ break;
+ case "JN2":
+ buf.readUnsignedInt(); // excessive idling time
+ break;
+ case "JN3":
+ buf.readUnsignedInt(); // excessive idling fuel
+ break;
+ case "JN4":
+ buf.readUnsignedInt(); // pto time
+ break;
+ case "JN5":
+ buf.readUnsignedInt(); // pto fuel
+ break;
default:
break;
}
diff --git a/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java
index dfdd3e5..32000c4 100644
--- a/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java
@@ -43,6 +43,9 @@ public class AtrackProtocolDecoderTest extends ProtocolTest {
decoder.setCustom(true);
+ verifyPositions(decoder, binary(
+ "405099280272000300014399e3f93d136438abdf644083f56440842afb2711c701b9eaee0067020003e0bb03de0000000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c3400000000000000000000000000000000000000000000930025000000000000000000000000000000006438abdf644083f76440842afb2711c701b9eaee0067710003e0bb03de0100000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c3400000000000000000000000000000000000000000000950025000000000000000000000000000000006438abdf644083f76440842afb2711c701b9eaee0067840003e0bb03de0100000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c3400000000000000000000000000000000000000000000950025000000000000000000000000000000006438abdf644083f86440842afb2711c701b9eaee0067760003e0bb03de0100000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c340000000000000000000000000000000000000000000095002500000000000000000000000000000000"));
+
verifyPositions(decoder, buffer(
"@P,7A66,153,9022,863003048505515,20210207000103,20210207000103,20210207000103,103939276,1348903,97,2,5628,8,0,0,0,0,,2000,2000,\u001a,%CI%BC,3:224:F128833445E6002C09C6\r\n"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_34 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 02a6291..7013533 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -1028,6 +1028,29 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.PREFIX_ADC + 1, buf.readUnsignedShort() * 0.01);
return position;
+ } else if (subType == 0x04) {
+
+ CharSequence content = buf.readCharSequence(buf.readableBytes() - 4 - 2, StandardCharsets.US_ASCII);
+ String[] values = content.toString().split(";");
+ for (String value : values) {
+ String[] pair = value.split("=");
+ switch (pair[0]) {
+ case "ALM1":
+ case "ALM2":
+ case "ALM3":
+ position.set("alarm" + pair[0].charAt(3) + "Status", Integer.parseInt(pair[1], 16));
+ case "STA1":
+ position.set("otherStatus", Integer.parseInt(pair[1], 16));
+ break;
+ case "DYD":
+ position.set("engineStatus", Integer.parseInt(pair[1], 16));
+ break;
+ default:
+ break;
+ }
+ }
+ return position;
+
} else if (subType == 0x05) {
if (buf.readableBytes() >= 6 + 1 + 6) {
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 5dc6b80..8f2c97f 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780D01086471700328358100093F040D0A"));
+ verifyAttributes(decoder, binary(
+ "797900849404414c4d313d43353b414c4d323d43433b414c4d333d35433b535441313d43303b4459443d30313b534f533d303133323838333730302c2c3b43454e5445523d303133323838333730303b46454e43453d46656e63652c4f46462c302c302e3030303030302c302e3030303030302c3330302c494e206f72204f55542c313b00b79d120d0a"));
+
verifyAttribute(decoder, binary(
"78782912170316053b3bcf015b51220af1201105d56100000000000000000000869c0130010000000238d1af0d0a"),
Position.KEY_DRIVING_TIME, 0);
@@ -190,7 +193,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyAttributes(decoder, binary(
"79790008940000ed0289d6860d0a"));
- verifyNull(decoder, binary(
+ verifyAttributes(decoder, binary(
"797900a59404414c4d313d34353b414c4d323d44353b414c4d333d35353b535441313d34303b4459443d30313b534f533d303538353036313536372c2c3b43454e5445523d3b46454e43453d46656e63652c4f46462c302c302e3030303030302c302e3030303030302c3330302c494e206f72204f55542c303b49434349443d38393937313033313031303038393539303432463b4d4f44453d4d4f44452c312c3138303b0008f65e0d0a"));
verifyPosition(decoder, binary(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_35 | diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index c7713bd..0135e78 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -978,7 +978,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
index += 1; // device type
if (BitUtil.check(mask, 0)) {
- index += 1; // digital fuel sensor data
+ position.set(Position.KEY_FUEL_LEVEL, Integer.parseInt(data[index++], 16));
}
if (BitUtil.check(mask, 1)) {
diff --git a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
index 515c149..4b0edfd 100644
--- a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Gl200TextProtocolDecoder(null));
+ verifyAttribute(decoder, buffer(
+ "+BUFF:GTERI,410502,864802030794634,,00000001,,10,1,1,0.0,0,3027.8,-78.706612,-0.955699,20230418170736,0740,0002,A08C,2AB72D,00,0.0,,,,100,110000,1,0099,20230418171004,8B98$"),
+ Position.KEY_FUEL_LEVEL, 153);
+
verifyPositions(decoder, false, buffer(
"+BUFF:GTFRI,2E0503,861106050005423,,,0,1,,,,,,,,,,,,0,0,,98,1,0,,,20200101000001,0083$"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_36 | diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 2d952c7..2fb7c6e 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -236,6 +236,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
while (buf.readableBytes() > 4) {
int subtype = buf.readUnsignedShort();
int length = buf.readUnsignedShort() - 4;
+ int endIndex = buf.readerIndex() + length;
switch (subtype) {
case 0x0001:
int coolantTemperature = buf.readUnsignedByte() - 40;
@@ -253,6 +254,9 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
position.set(Position.KEY_FUEL_LEVEL, buf.readUnsignedByte() * 0.4);
buf.readUnsignedInt(); // trip id
+ if (buf.readerIndex() < endIndex) {
+ position.set("adBlueLevel", buf.readUnsignedByte() * 0.4);
+ }
break;
case 0x0005:
position.set(Position.KEY_RSSI, buf.readUnsignedByte());
@@ -295,6 +299,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
buf.skipBytes(length);
break;
}
+ buf.readerIndex(endIndex);
}
if (network.getCellTowers() != null || network.getWifiAccessPoints() != null) {
diff --git a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
index ee6c3fa..fe4b077 100644
--- a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
@@ -20,6 +20,9 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"c000000077aa0200000000000e000100143347315f48312e315f56312e30372e54000300133335353835353035303434303635380004000b3531323030303000050005010006000400070004000800050000090018383936313032353431343533333239313833360d000a000f796573696e7465726e6574c0"));
+ verifyNotNull(decoder, binary(
+ "c0000000b9aa00000000000013c800001132333035303431343537323600186bc30045e5b8002a008b0077002d000100187f0c4b2600d906ec000005938800000000000e0000040009110000000e0005000a1d0400000079000900154646464646464646464646464646464646000f00133836323230353035353339313733360010000c302e30303030303000110008000000000014000bf81b204901b52a001500060000002000153231394030324030403130343438393139c0"));
+
verifyAttribute(decoder, binary(
"C00000001CAA120000000000020001001001000200030043008200C100C0"),
Position.KEY_DTCS, "P0100 P0200 P0300 C0300 B0200 U0100");
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_37 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index 05e2fb8..ed71861 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -333,10 +333,6 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // power level
position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
break;
- case 0x60:
- position.set(Position.KEY_EVENT, buf.readUnsignedShort());
- buf.skipBytes(length - 2);
- break;
case 0x61:
position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
break;
@@ -488,6 +484,10 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_BATTERY, Integer.parseInt(lockStatus.substring(2, 5)) * 0.01);
}
break;
+ case 0x60:
+ position.set(Position.KEY_EVENT, buf.readUnsignedShort());
+ buf.skipBytes(length - 2);
+ break;
case 0x80:
buf.readUnsignedByte(); // content
endIndex = buf.writerIndex() - 2;
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 67f2145..32c6323 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyAttribute(decoder, binary(
+ "7e02000071768060874297002d0000000000208022015a30b006c869f8000000000000230505062034600b0004003930303235343939660b01cc0000000c40f89f27b067083133323134333232690201936a01116b01006c0f34363030383138353937303632343071143839383630343938313032313930353835373430607e"),
+ Position.KEY_EVENT, 4);
+
+ verifyAttribute(decoder, binary(
"7e0200002f017028775424038d000000000000000a0189dbeb04ca653a00000012014723040700074401040000000030011b31010ee1012dea020001dc7e"),
Position.KEY_BATTERY_LEVEL, 45);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_38 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index e6980dc..4beee76 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -488,6 +488,9 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_EVENT, buf.readUnsignedShort());
buf.skipBytes(length - 2);
break;
+ case 0x69:
+ position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.01);
+ break;
case 0x80:
buf.readUnsignedByte(); // content
endIndex = buf.writerIndex() - 2;
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 32c6323..2f317d0 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyAttribute(decoder, binary(
+ "7e0200006476806111898300710000000000100046005d3156065f7128000000000000230511165956660b01fe000001031a5d1a8101670831333231343332326902018b6a01166b01006c0f323034303830393230373533363735711438393434343738383030303030323131303030464b7e"),
+ Position.KEY_BATTERY, 3.95);
+
+ verifyAttribute(decoder, binary(
"7e02000071768060874297002d0000000000208022015a30b006c869f8000000000000230505062034600b0004003930303235343939660b01cc0000000c40f89f27b067083133323134333232690201936a01116b01006c0f34363030383138353937303632343071143839383630343938313032313930353835373430607e"),
Position.KEY_EVENT, 4);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_39 | diff --git a/src/main/java/org/traccar/api/MediaFilter.java b/src/main/java/org/traccar/api/MediaFilter.java
index ab75bdc..e655618 100644
--- a/src/main/java/org/traccar/api/MediaFilter.java
+++ b/src/main/java/org/traccar/api/MediaFilter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2018 - 2022 Anton Tananaev ([email protected])
+ * Copyright 2018 - 2023 Anton Tananaev ([email protected])
* Copyright 2018 Andrey Kunitsyn ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,7 +32,6 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -58,10 +57,6 @@ public class MediaFilter implements Filter {
}
@Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
-
- @Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
@@ -99,8 +94,4 @@ public class MediaFilter implements Filter {
}
}
- @Override
- public void destroy() {
- }
-
}
diff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java
index 7a61eda..6a4f502 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -89,14 +89,18 @@ public class ExtendedModel extends BaseModel {
}
}
- public String getString(String key) {
+ public String getString(String key, String defaultValue) {
if (attributes.containsKey(key)) {
return attributes.get(key).toString();
} else {
- return null;
+ return defaultValue;
}
}
+ public String getString(String key) {
+ return getString(key, null);
+ }
+
public double getDouble(String key) {
if (attributes.containsKey(key)) {
Object value = attributes.get(key);
diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index 4beee76..ee5ab19 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -919,14 +919,19 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.setTime(time);
break;
case 0x02:
- count = buf.readUnsignedByte();
+ List<String> codes = new LinkedList<>();
+ count = buf.readUnsignedShort();
for (int i = 0; i < count; i++) {
buf.readUnsignedInt(); // system id
int codeCount = buf.readUnsignedShort();
for (int j = 0; j < codeCount; j++) {
- buf.skipBytes(16); // code
+ buf.readUnsignedInt(); // dtc
+ buf.readUnsignedInt(); // status
+ codes.add(buf.readCharSequence(
+ buf.readUnsignedShort(), StandardCharsets.US_ASCII).toString().trim());
}
}
+ position.set(Position.KEY_DTCS, String.join(" ", codes));
getLastLocation(position, time);
decodeCoordinates(position, buf);
position.setTime(time);
diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index fc18424..2f378f3 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -232,6 +232,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
register(27, null, (p, b) -> p.set("bleTemp3", b.readShort() * 0.01));
register(28, null, (p, b) -> p.set("bleTemp4", b.readShort() * 0.01));
register(30, fmbXXX, (p, b) -> p.set("faultCount", b.readUnsignedByte()));
+ register(32, fmbXXX, (p, b) -> p.set(Position.KEY_COOLANT_TEMP, b.readByte()));
register(66, null, (p, b) -> p.set(Position.KEY_POWER, b.readUnsignedShort() * 0.001));
register(67, null, (p, b) -> p.set(Position.KEY_BATTERY, b.readUnsignedShort() * 0.001));
register(68, fmbXXX, (p, b) -> p.set("batteryCurrent", b.readUnsignedShort() * 0.001));
@@ -247,7 +248,6 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
});
register(80, fmbXXX, (p, b) -> p.set("dataMode", b.readUnsignedByte()));
register(90, null, (p, b) -> p.set(Position.KEY_DOOR, b.readUnsignedShort()));
- register(115, fmbXXX, (p, b) -> p.set(Position.KEY_COOLANT_TEMP, b.readShort() * 0.1));
register(179, null, (p, b) -> p.set(Position.PREFIX_OUT + 1, b.readUnsignedByte() > 0));
register(180, null, (p, b) -> p.set(Position.PREFIX_OUT + 2, b.readUnsignedByte() > 0));
register(181, null, (p, b) -> p.set(Position.KEY_PDOP, b.readUnsignedShort() * 0.1));
diff --git a/src/main/java/org/traccar/web/CharResponseWrapper.java b/src/main/java/org/traccar/web/CharResponseWrapper.java
new file mode 100644
index 0000000..477fe79
--- a/src/main/java/org/traccar/web/CharResponseWrapper.java
+++ b/src/main/java/org/traccar/web/CharResponseWrapper.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2023 Anton Tananaev ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class CharResponseWrapper extends HttpServletResponseWrapper {
+
+ private final ByteArrayOutputStream capture;
+ private ServletOutputStream output;
+
+ public CharResponseWrapper(HttpServletResponse response) {
+ super(response);
+ capture = new ByteArrayOutputStream(response.getBufferSize());
+ }
+
+ @Override
+ public ServletOutputStream getOutputStream() {
+ if (output == null) {
+ output = new ServletOutputStream() {
+ @Override
+ public boolean isReady() {
+ return true;
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListener) {
+ }
+
+ @Override
+ public void write(int b) {
+ capture.write(b);
+ }
+
+ @Override
+ public void flush() throws IOException {
+ capture.flush();
+ }
+
+ @Override
+ public void close() throws IOException {
+ capture.close();
+ }
+ };
+ }
+ return output;
+ }
+
+ @Override
+ public void flushBuffer() throws IOException {
+ super.flushBuffer();
+ if (output != null) {
+ output.flush();
+ }
+ }
+
+ public byte[] getCapture() throws IOException {
+ if (output != null) {
+ output.close();
+ }
+ return capture.toByteArray();
+ }
+
+}
diff --git a/src/main/java/org/traccar/web/ModernDefaultServlet.java b/src/main/java/org/traccar/web/ModernDefaultServlet.java
new file mode 100644
index 0000000..bae089d
--- a/src/main/java/org/traccar/web/ModernDefaultServlet.java
+++ b/src/main/java/org/traccar/web/ModernDefaultServlet.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Anton Tananaev ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web;
+
+import org.eclipse.jetty.servlet.DefaultServlet;
+import org.eclipse.jetty.util.resource.Resource;
+
+public class ModernDefaultServlet extends DefaultServlet {
+
+ @Override
+ public Resource getResource(String pathInContext) {
+ return super.getResource(pathInContext.indexOf('.') < 0 ? "/" : pathInContext);
+ }
+
+ @Override
+ public String getWelcomeFile(String pathInContext) {
+ return super.getWelcomeFile("/");
+ }
+
+}
diff --git a/src/main/java/org/traccar/web/OverrideFilter.java b/src/main/java/org/traccar/web/OverrideFilter.java
new file mode 100644
index 0000000..708632b
--- a/src/main/java/org/traccar/web/OverrideFilter.java
+++ b/src/main/java/org/traccar/web/OverrideFilter.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2023 Anton Tananaev ([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.web;
+
+import com.google.inject.Provider;
+import org.traccar.api.security.PermissionsService;
+import org.traccar.model.Server;
+import org.traccar.storage.StorageException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Singleton
+public class OverrideFilter implements Filter {
+
+ private final Provider<PermissionsService> permissionsServiceProvider;
+
+ @Inject
+ public OverrideFilter(Provider<PermissionsService> permissionsServiceProvider) {
+ this.permissionsServiceProvider = permissionsServiceProvider;
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+
+ CharResponseWrapper wrappedResponse = new CharResponseWrapper((HttpServletResponse) response);
+
+ chain.doFilter(request, wrappedResponse);
+
+ byte[] bytes = wrappedResponse.getCapture();
+ if (wrappedResponse.getContentType().contains("text/html")
+ || ((HttpServletRequest) request).getPathInfo().endsWith("manifest.json")) {
+
+ Server server;
+ try {
+ server = permissionsServiceProvider.get().getServer();
+ } catch (StorageException e) {
+ throw new RuntimeException(e);
+ }
+
+ String title = server.getString("title", "Traccar");
+ String description = server.getString("description", "Traccar GPS Tracking System");
+ String colorPrimary = server.getString("colorPrimary", "#1a237e");
+
+ String alteredContent = new String(wrappedResponse.getCapture())
+ .replace("${title}", title)
+ .replace("${description}", description)
+ .replace("${colorPrimary}", colorPrimary);
+
+ response.setContentLength(alteredContent.length());
+ response.getOutputStream().write(alteredContent.getBytes());
+
+ } else {
+ response.getOutputStream().write(bytes);
+ }
+ }
+
+}
diff --git a/src/main/java/org/traccar/web/WebModule.java b/src/main/java/org/traccar/web/WebModule.java
index 0722c5d..a32a6f4 100644
--- a/src/main/java/org/traccar/web/WebModule.java
+++ b/src/main/java/org/traccar/web/WebModule.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2022 Anton Tananaev ([email protected])
+ * Copyright 2022 - 2023 Anton Tananaev ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@ public class WebModule extends ServletModule {
@Override
protected void configureServlets() {
+ filter("/*").through(OverrideFilter.class);
filter("/api/*").through(ThrottlingFilter.class);
filter("/api/media/*").through(MediaFilter.class);
serve("/api/socket").with(AsyncSocketServlet.class);
diff --git a/src/main/java/org/traccar/web/WebServer.java b/src/main/java/org/traccar/web/WebServer.java
index 79d19cc..ce12201 100644
--- a/src/main/java/org/traccar/web/WebServer.java
+++ b/src/main/java/org/traccar/web/WebServer.java
@@ -62,9 +62,6 @@ import java.io.File;
import java.io.IOException;
import java.io.Writer;
import java.net.InetSocketAddress;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.EnumSet;
public class WebServer implements LifecycleObject {
@@ -103,14 +100,8 @@ public class WebServer implements LifecycleObject {
@Override
protected void handleErrorPage(
HttpServletRequest request, Writer writer, int code, String message) throws IOException {
- Path index = Paths.get(config.getString(Keys.WEB_PATH), "index.html");
- if (code == HttpStatus.NOT_FOUND_404
- && !request.getPathInfo().startsWith("/api/") && Files.exists(index)) {
- writer.write(Files.readString(index));
- } else {
- writer.write("<!DOCTYPE><html><head><title>Error</title></head><html><body>"
- + code + " - " + HttpStatus.getMessage(code) + "</body></html>");
- }
+ writer.write("<!DOCTYPE><html><head><title>Error</title></head><html><body>"
+ + code + " - " + HttpStatus.getMessage(code) + "</body></html>");
}
});
@@ -150,7 +141,7 @@ public class WebServer implements LifecycleObject {
}
private void initWebApp(ServletContextHandler servletHandler) {
- ServletHolder servletHolder = new ServletHolder(DefaultServlet.class);
+ ServletHolder servletHolder = new ServletHolder(ModernDefaultServlet.class);
servletHolder.setInitParameter("resourceBase", new File(config.getString(Keys.WEB_PATH)).getAbsolutePath());
servletHolder.setInitParameter("dirAllowed", "false");
if (config.getBoolean(Keys.WEB_DEBUG)) {
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 2f317d0..5fd9ed8 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyAttribute(decoder, binary(
+ "7e090000344f07788ef87d0138f02305151230460102020001ffffffff000100001457000000020006503134353700000c000a029dc63004b99a98230515132726787e"),
+ Position.KEY_DTCS, "P1457");
+
+ verifyAttribute(decoder, binary(
"7e0200006476806111898300710000000000100046005d3156065f7128000000000000230511165956660b01fe000001031a5d1a8101670831333231343332326902018b6a01166b01006c0f323034303830393230373533363735711438393434343738383030303030323131303030464b7e"),
Position.KEY_BATTERY, 3.95);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/api/MediaFilter.java b/src/main/java/org/traccar/api/MediaFilter.java |
gitbug-java_data_traccar-traccar.json_40 | diff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java
index 0a0923b..d5cd094 100644
--- a/src/main/java/org/traccar/model/ExtendedModel.java
+++ b/src/main/java/org/traccar/model/ExtendedModel.java
@@ -91,7 +91,7 @@ public class ExtendedModel extends BaseModel {
public String getString(String key, String defaultValue) {
if (attributes.containsKey(key)) {
- Object value = attributes.containsKey(key);
+ Object value = attributes.get(key);
return value != null ? value.toString() : null;
} else {
return defaultValue;
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/model/ExtendedModel.java b/src/main/java/org/traccar/model/ExtendedModel.java |
gitbug-java_data_traccar-traccar.json_41 | diff --git a/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java
index 77649a0..f17ea0e 100644
--- a/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java
@@ -93,14 +93,14 @@ public class GoSafeProtocolDecoder extends BaseProtocolDecoder {
position.setSpeed(UnitsConverter.knotsFromKph(Integer.parseInt(values[index - 1])));
}
position.setCourse(Integer.parseInt(values[index++]));
- if (index < values.length) {
- position.setAltitude(Integer.parseInt(values[index++]));
+ if (index < values.length && !values[index++].isEmpty()) {
+ position.setAltitude(Integer.parseInt(values[index - 1]));
}
- if (index < values.length) {
- position.set(Position.KEY_HDOP, Double.parseDouble(values[index++]));
+ if (index < values.length && !values[index++].isEmpty()) {
+ position.set(Position.KEY_HDOP, Double.parseDouble(values[index - 1]));
}
- if (index < values.length) {
- position.set(Position.KEY_VDOP, Double.parseDouble(values[index++]));
+ if (index < values.length && !values[index++].isEmpty()) {
+ position.set(Position.KEY_VDOP, Double.parseDouble(values[index - 1]));
}
break;
case "GSM":
diff --git a/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java
index ad944d7..3e1349a 100644
--- a/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/GoSafeProtocolDecoderTest.java
@@ -14,6 +14,9 @@ public class GoSafeProtocolDecoderTest extends ProtocolTest {
verifyPositions(decoder, false, text(
"*GS06,357330050846344,RST#"));
+ verifyPositions(decoder, text(
+ "*GS06,353218073585128,181255300523,,SYS:Smart Track;V9.31;V1.1.5,GPS:A;5;N31.551856;E74.366920;0;0;;2.15;2.64,COT:0,ADC:10.78;0.02,DTT:4002;E1;0;0;0;1$181325300523,,SYS:Smart Track;V9.31;V1.1.5,GPS:A;6;N31.551856;E74.366920;0;0;;2.05;2.13,COT:0,ADC:10.79;0.02,DTT:4002;E1;0;0;0;1#"));
+
verifyAttribute(decoder, text(
"*GS06,356449068350122,013519070819,,SYS:G6S;V3.37;V1.1.8,GPS:A;12;N23.169866;E113.450728;0;255;54;0.79,COT:18779;,ADC:12.66;0.58,DTT:4084;E1;0;0;0;1,IWD:0;1;ad031652643fff28;23.2;1;1;86031652504fff28;24.3;2;1;e603165252a5ff28;24.2;3;1;bb0416557da6ff28;24.0#"),
Position.PREFIX_TEMP + 3, 24.0);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java b/src/main/java/org/traccar/protocol/GoSafeProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_42 | diff --git a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java
index 4e5200f..4d8e7e7 100644
--- a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java
@@ -153,7 +153,7 @@ public class FreematicsProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_RSSI, Integer.parseInt(value));
break;
case 0x82:
- position.set(Position.KEY_DEVICE_TEMP, Integer.parseInt(value) * 0.1);
+ position.set(Position.KEY_DEVICE_TEMP, Double.parseDouble(value) * 0.1);
break;
case 0x104:
position.set(Position.KEY_ENGINE_LOAD, Integer.parseInt(value));
diff --git a/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java
index dae3815..53ed07d 100644
--- a/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/FreematicsProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class FreematicsProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new FreematicsProtocolDecoder(null));
verifyPositions(decoder, text(
+ "UCFLFAYM#0:33770,24:300,82:53.000000,*F9"));
+
+ verifyPositions(decoder, text(
"M0ZR4X0#0:204391,11:140221,10:8445000,A:49.215920,B:18.737755,C:410,D:0,E:208,24:1252,20:0;0;0,82:47*B5"));
verifyNull(decoder, text(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java b/src/main/java/org/traccar/protocol/FreematicsProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_43 | diff --git a/src/main/java/org/traccar/protocol/WatchFrameDecoder.java b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java
index f99bd52..ec67aa3 100644
--- a/src/main/java/org/traccar/protocol/WatchFrameDecoder.java
+++ b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 - 2018 Anton Tananaev ([email protected])
+ * Copyright 2017 - 2023 Anton Tananaev ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,7 +27,14 @@ public class WatchFrameDecoder extends BaseFrameDecoder {
protected Object decode(
ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
- int endIndex = buf.indexOf(buf.readerIndex(), buf.writerIndex(), (byte) ']') + 1;
+ int endIndex = -1;
+ for (int i = buf.writerIndex() - 1; i >= buf.readerIndex(); i--) {
+ if (buf.getByte(i) == ']') {
+ endIndex = i + 1;
+ break;
+ }
+ }
+
if (endIndex > 0) {
ByteBuf frame = Unpooled.buffer();
while (buf.readerIndex() < endIndex) {
diff --git a/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java b/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java
index 8b04863..bf21254 100644
--- a/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java
@@ -11,6 +11,10 @@ public class WatchFrameDecoderTest extends ProtocolTest {
var decoder = inject(new WatchFrameDecoder());
verifyFrame(
+ binary("5b33472a3838303930303234322a303133442a55442c3132303632332c3134303032302c412c34382e3934393237332c4e2c20342e333738333036302c452c31382e35362c34332e382c302e302c31322c3130302c37362c3232363132302c302c30303030303030302c322c3235352c3230342c382c333131302c35353032352c3134362c333133302c34393239372c3132342c352c42616e67696e67576966692c33343a61313a65643a65313a39313a34662c2d37312c42415220576946692c33363a61323a65313a65643a61313a64652c2d37322c4e6574776f726b576966692c32363a64653a61313a65643a65313a61302c2d37332c46696265722c33363a61313a65643a65313a39313a34662c2d37352c5b4c475f57616c6c2d4d6f756e7420412f435d653732352c36363a61313a65643a65313a65373a32352c2d38322c31352e305d"),
+ decoder.decode(null, null, binary("5b33472a3838303930303234322a303133442a55442c3132303632332c3134303032302c412c34382e3934393237332c4e2c20342e333738333036302c452c31382e35362c34332e382c302e302c31322c3130302c37362c3232363132302c302c30303030303030302c322c3235352c3230342c382c333131302c35353032352c3134362c333133302c34393239372c3132342c352c42616e67696e67576966692c33343a61313a65643a65313a39313a34662c2d37312c42415220576946692c33363a61323a65313a65643a61313a64652c2d37322c4e6574776f726b576966692c32363a64653a61313a65643a65313a61302c2d37332c46696265722c33363a61313a65643a65313a39313a34662c2d37352c5b4c475f57616c6c2d4d6f756e7420412f435d653732352c36363a61313a65643a65313a65373a32352c2d38322c31352e305d")));
+
+ verifyFrame(
binary("5b33472a3335323636313039303134333135302a303030412a4c4b2c302c302c3130305d"),
decoder.decode(null, null, binary("5b33472a3335323636313039303134333135302a303030412a4c4b2c302c302c3130305d")));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/WatchFrameDecoder.java b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java |
gitbug-java_data_traccar-traccar.json_44 | diff --git a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
index aa19e9e..8896dcf 100644
--- a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java
@@ -614,6 +614,23 @@ public class AtrackProtocolDecoder extends BaseProtocolDecoder {
case "JN5":
buf.readUnsignedInt(); // pto fuel
break;
+ case "IN0":
+ position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
+ break;
+ case "IN1":
+ case "IN2":
+ case "IN3":
+ position.set(Position.PREFIX_IN + key.charAt(2), buf.readUnsignedByte() > 0);
+ break;
+ case "HA":
+ position.set(Position.KEY_ALARM, buf.readUnsignedByte() > 0 ? Position.ALARM_ACCELERATION : null);
+ break;
+ case "HB":
+ position.set(Position.KEY_ALARM, buf.readUnsignedByte() > 0 ? Position.ALARM_BRAKING : null);
+ break;
+ case "HC":
+ position.set(Position.KEY_ALARM, buf.readUnsignedByte() > 0 ? Position.ALARM_CORNERING : null);
+ break;
default:
break;
}
diff --git a/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java
index 32000c4..be6fb5c 100644
--- a/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/AtrackProtocolDecoderTest.java
@@ -44,6 +44,9 @@ public class AtrackProtocolDecoderTest extends ProtocolTest {
decoder.setCustom(true);
verifyPositions(decoder, binary(
+ "4050d78502e01d29000312fa45441d6d647d8e67647d8e67647eef190205437c021846e6001a020002d7f000070000000000000007d007d000254349254d5625525025564e254d4625454c25545225455425464c254d4c25464325534d25494e3025484125484225484325415400010c0000000000000000000000000000000000000000000000000e647d8e85647d8e86647eef190205437c021846e60019020002d7f000070000000000000007d007d000254349254d5625525025564e254d4625454c25545225455425464c254d4c25464325534d25494e3025484125484225484325415400010c0000000000000000000000000000000000000000000000000e647d8ea3647d8ea4647eef190205437c021846e60019020002d7f000070000000000000007d007d000254349254d5625525025564e254d4625454c25545225455425464c254d4c25464325534d25494e3025484125484225484325415400010b0000000000000000000000000000000000000000000000000e647d8ec1647d8ec2647eef190205437c021846e60019020002d7f000070000000000000007d007d000254349254d5625525025564e254d4625454c25545225455425464c254d4c25464325534d25494e3025484125484225484325415400010a0000000000000000000000000000000000000000000000000e647d8edf647d8ee0647eef190205437c021846e60019020002d7f000070000000000000007d007d000254349254d5625525025564e254d4625454c25545225455425464c254d4c25464325534d25494e3025484125484225484325415400010a0000000000000000000000000000000000000000000000000e647d8efd647d8efe647eef190205437c021846e60019020002d7f000070000000000000007d007d000254349254d5625525025564e254d4625454c25545225455425464c254d4c25464325534d25494e3025484125484225484325415400010a0000000000000000000000000000000000000000000000000e"));
+
+ verifyPositions(decoder, binary(
"405099280272000300014399e3f93d136438abdf644083f56440842afb2711c701b9eaee0067020003e0bb03de0000000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c3400000000000000000000000000000000000000000000930025000000000000000000000000000000006438abdf644083f76440842afb2711c701b9eaee0067710003e0bb03de0100000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c3400000000000000000000000000000000000000000000950025000000000000000000000000000000006438abdf644083f76440842afb2711c701b9eaee0067840003e0bb03de0100000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c3400000000000000000000000000000000000000000000950025000000000000000000000000000000006438abdf644083f86440842afb2711c701b9eaee0067760003e0bb03de0100000000000007d007d00025434925454c25455425464325464c255250254d4c25534d25545225494125454f25564e254d56254256254548255a4c33255a4f3134255a4f3131255a4f3130255a4f32255a4c340000000000000000000000000000000000000000000095002500000000000000000000000000000000"));
verifyPositions(decoder, buffer(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/AtrackProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_45 | diff --git a/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java b/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java
index c23d26c..d90e482 100644
--- a/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java
+++ b/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 - 2018 Anton Tananaev ([email protected])
+ * Copyright 2013 - 2023 Anton Tananaev ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import org.traccar.BaseFrameDecoder;
public class GalileoFrameDecoder extends BaseFrameDecoder {
- private static final int MESSAGE_MINIMUM_LENGTH = 5;
+ private static final int MESSAGE_MINIMUM_LENGTH = 6;
@Override
protected Object decode(
@@ -32,9 +32,15 @@ public class GalileoFrameDecoder extends BaseFrameDecoder {
return null;
}
- int length = buf.getUnsignedShortLE(buf.readerIndex() + 1) & 0x7fff;
- if (buf.readableBytes() >= (length + MESSAGE_MINIMUM_LENGTH)) {
- return buf.readRetainedSlice(length + MESSAGE_MINIMUM_LENGTH);
+ int length;
+ if (buf.getByte(buf.readerIndex()) == 0x01 && buf.getUnsignedMedium(buf.readerIndex() + 3) == 0x01001c) {
+ length = 3 + buf.getUnsignedShort(buf.readerIndex() + 1);
+ } else {
+ length = 5 + (buf.getUnsignedShortLE(buf.readerIndex() + 1) & 0x7fff);
+ }
+
+ if (buf.readableBytes() >= length) {
+ return buf.readRetainedSlice(length);
}
return null;
diff --git a/src/test/java/org/traccar/protocol/GalileoFrameDecoderTest.java b/src/test/java/org/traccar/protocol/GalileoFrameDecoderTest.java
index 2565174..530f093 100644
--- a/src/test/java/org/traccar/protocol/GalileoFrameDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/GalileoFrameDecoderTest.java
@@ -13,6 +13,10 @@ public class GalileoFrameDecoderTest extends ProtocolTest {
var decoder = inject(new GalileoFrameDecoder());
assertEquals(
+ binary("01003f01001c475b166133303035333430363431383437393000001d000064897bb003000b0221c20512a60a0000000802000f209d7b8964300f2536fbfd103c1d01"),
+ decoder.decode(null, null, binary("01003f01001c475b166133303035333430363431383437393000001d000064897bb003000b0221c20512a60a0000000802000f209d7b8964300f2536fbfd103c1d01")));
+
+ assertEquals(
binary("011780011102e603383633353931303238393630323437043200801c"),
decoder.decode(null, null, binary("011780011102e603383633353931303238393630323437043200801c")));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java b/src/main/java/org/traccar/protocol/GalileoFrameDecoder.java |
gitbug-java_data_traccar-traccar.json_46 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index 3adfa7d..beb1ec4 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -484,6 +484,10 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_BATTERY, Integer.parseInt(lockStatus.substring(2, 5)) * 0.01);
}
break;
+ case 0x56:
+ position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte() * 10);
+ buf.readUnsignedByte(); // reserved
+ break;
case 0x60:
position.set(Position.KEY_EVENT, buf.readUnsignedShort());
buf.skipBytes(length - 2);
@@ -692,6 +696,8 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
case 0xFE:
if (length == 1) {
position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+ } else if (length == 2) {
+ position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
} else {
int mark = buf.readUnsignedByte();
if (mark == 0x7C) {
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 5fd9ed8..9c3fc16 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -15,6 +15,10 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
verifyAttribute(decoder, binary(
+ "7e0200003f014501643822000300020000000c000c0000000000000000000000000000230615143903300111310100530901027f0300456f073e56020900fe02001e57080002000200000000df7e"),
+ Position.KEY_BATTERY_LEVEL, 90);
+
+ verifyAttribute(decoder, binary(
"7e090000344f07788ef87d0138f02305151230460102020001ffffffff000100001457000000020006503134353700000c000a029dc63004b99a98230515132726787e"),
Position.KEY_DTCS, "P1457");
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_47 | diff --git a/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java
index 14b33b6..c30398d 100644
--- a/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java
@@ -235,8 +235,8 @@ public class FifotrackProtocolDecoder extends BaseProtocolDecoder {
position.setValid(parser.next().equals("A"));
position.setFixTime(position.getDeviceTime());
- position.set(Position.KEY_SATELLITES, parser.nextInt());
position.setSpeed(UnitsConverter.knotsFromKph(parser.nextInt()));
+ position.set(Position.KEY_SATELLITES, parser.nextInt());
position.setLatitude(parser.nextDouble());
position.setLongitude(parser.nextDouble());
diff --git a/src/test/java/org/traccar/protocol/FifotrackProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/FifotrackProtocolDecoderTest.java
index 518eada..cbfc467 100644
--- a/src/test/java/org/traccar/protocol/FifotrackProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/FifotrackProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class FifotrackProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new FifotrackProtocolDecoder(null));
+ verifyAttribute(decoder, buffer(
+ "$$99,865413050150407,7F,A03,,230626072722,460|0|25FC|AC2AB0B,3.74,52,0019,0,A,0,13,22.643466,114.018211*74"),
+ Position.KEY_SATELLITES, 13);
+
verifyPosition(decoder, buffer(
"$$95,866104023192332,1,A03,,210414055249,460|0|25FC|104C,4.18,100,000F,0,A,2,9,22.643175,114.018150*75"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java b/src/main/java/org/traccar/protocol/FifotrackProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_48 | diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
index f8b0c34..cd8d8e0 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
@@ -151,7 +151,7 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
sendResponse(channel, remoteAddress, index, type, buf);
}
- if (type == MSG_DATA) {
+ if (type == MSG_DATA || type == MSG_SERVICES) {
List<Position> positions = new LinkedList<>();
Set<Integer> keys = new HashSet<>();
diff --git a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
index 693a11f..587a520 100644
--- a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
@@ -24,10 +24,10 @@ public class Minifinder2ProtocolDecoderTest extends ProtocolTest {
verifyPositions(decoder, binary(
"ab10350015ae59010110013836333932313033333836353231360924723a12610042535a182ac0f6b4f2923100c900af02215c2b9bfb5461736b4c4d53"));
- verifyNull(decoder, binary(
+ verifyPositions(decoder, false, binary(
"ab10150076f1320003100133353534363530373130323933303602105a"));
- verifyNull(decoder, binary(
+ verifyPositions(decoder, false, binary(
"AB101400594A01000310013836333932323033343437333734350112"));
verifyPositions(decoder, binary(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_49 | diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index 0135e78..bcff1c5 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -15,7 +15,9 @@
*/
package org.traccar.protocol;
+import io.netty.buffer.Unpooled;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.DataConverter;
import org.traccar.session.DeviceSession;
import org.traccar.NetworkMessage;
import org.traccar.Protocol;
@@ -368,6 +370,21 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
.text("$").optional()
.compile();
+ private static final Pattern PATTERN_DTT = new PatternBuilder()
+ .text("+RESP:GTDTT,")
+ .number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version
+ .number("(d{15}|x{14}),") // imei
+ .expression("[^,]*,,,") // device name
+ .number("d,") // data type
+ .number("d+,") // data length
+ .number("(x+),") // data
+ .number("(dddd)(dd)(dd)") // date (yyyymmdd)
+ .number("(dd)(dd)(dd)").optional(2) // time (hhmmss)
+ .text(",")
+ .number("(xxxx)") // count number
+ .text("$").optional()
+ .compile();
+
private static final Pattern PATTERN = new PatternBuilder()
.text("+").expression("(?:RESP|BUFF):GT...,")
.number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version
@@ -1165,6 +1182,34 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
return position;
}
+ private Object decodeDtt(Channel channel, SocketAddress remoteAddress, String sentence) {
+ Parser parser = new Parser(PATTERN_DTT, sentence);
+ Position position = initPosition(parser, channel, remoteAddress);
+ if (position == null) {
+ return null;
+ }
+
+ getLastLocation(position, null);
+
+ /*
+ Ecuatrack
+COMB,0,94.0,-1.0,,,HDC
+ */
+
+ String data = Unpooled.wrappedBuffer(DataConverter.parseHex(parser.next()))
+ .toString(StandardCharsets.US_ASCII);
+ if (data.contains("COMB")) {
+ String[] values = data.split(",");
+ position.set(Position.KEY_FUEL_LEVEL, Double.parseDouble(values[2]));
+ } else {
+ position.set(Position.KEY_RESULT, data);
+ }
+
+ decodeDeviceTime(position, parser);
+
+ return position;
+ }
+
private Object decodeOther(Channel channel, SocketAddress remoteAddress, String sentence, String type) {
Parser parser = new Parser(PATTERN, sentence);
Position position = initPosition(parser, channel, remoteAddress);
@@ -1359,6 +1404,9 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
case "DAR":
result = decodeDar(channel, remoteAddress, sentence);
break;
+ case "DTT":
+ result = decodeDtt(channel, remoteAddress, sentence);
+ break;
default:
result = decodeOther(channel, remoteAddress, sentence, type);
break;
diff --git a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
index a731275..760671c 100644
--- a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
@@ -11,6 +11,10 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Gl200TextProtocolDecoder(null));
+ verifyAttribute(decoder, buffer(
+ "+RESP:GTDTT,410502,864802030541621,,,,1,35,45637561747261636b0d0a434f4d422c302c39342e302c2d312e302c2c2c4844430d0a,20230421034626,EA2E$"),
+ Position.KEY_FUEL_LEVEL, 94.0);
+
verifyNull(decoder, buffer(
"+RESP:GTFRI,5E0100,862061048023666,,,12940,10,1,1,0.0,97,179.8,-90.366478,38.735379,20230616183231,0310,0410,6709,03ADF710,00,6223.7,,,,,110000,,,,202306161834$"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_50 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 7013533..38c2219 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -828,6 +828,11 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
}
}
+ if (type == MSG_STATUS && variant == Variant.VXT01) {
+ position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
+ position.set(Position.KEY_RSSI, buf.readUnsignedByte());
+ }
+
if (type == MSG_GPS_LBS_1) {
if (variant == Variant.GT06E_CARD) {
position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
@@ -1408,6 +1413,8 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
variant = Variant.VXT01;
} else if (header == 0x7878 && type == MSG_GPS_LBS_STATUS_1 && length == 0x24) {
variant = Variant.VXT01;
+ } else if (header == 0x7878 && type == MSG_STATUS && length == 0x0a) {
+ variant = Variant.VXT01;
} else if (header == 0x7878 && type == MSG_LBS_MULTIPLE_3 && length == 0x31) {
variant = Variant.WANWAY_S20;
} else if (header == 0x7878 && type == MSG_LBS_MULTIPLE_3 && length == 0x2e) {
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 8f2c97f..937c7ec 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780D01086471700328358100093F040D0A"));
+ verifyAttribute(decoder, binary(
+ "78780a130604ea04000006bc8a0d0a"),
+ Position.KEY_POWER, 0.0);
+
verifyAttributes(decoder, binary(
"797900849404414c4d313d43353b414c4d323d43433b414c4d333d35433b535441313d43303b4459443d30313b534f533d303133323838333730302c2c3b43454e5445523d303133323838333730303b46454e43453d46656e63652c4f46462c302c302e3030303030302c302e3030303030302c3330302c494e206f72204f55542c313b00b79d120d0a"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_51 | diff --git a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
index f0753cb..de039a2 100644
--- a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java
@@ -231,6 +231,9 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
if (device != null) {
deviceModel = device.getModel();
}
+ if (deviceModel == null) {
+ deviceModel = "";
+ }
Position position = new Position(getProtocolName());
@@ -261,6 +264,8 @@ public class LaipacProtocolDecoder extends BaseProtocolDecoder {
if ("AVL110".equals(deviceModel) || "AVL120".equals(deviceModel)) {
position.set(Position.PREFIX_ADC + 2, parser.nextDouble() * 0.001);
+ } else {
+ parser.next();
}
Integer lac = parser.nextHexInt();
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java b/src/main/java/org/traccar/protocol/LaipacProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_52 | diff --git a/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java
index f2e5eb9..1fdb1ec 100644
--- a/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java
@@ -143,7 +143,7 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
}
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
- if (deviceSession == null || !sentence.matches("![35A-D],.*")) {
+ if (deviceSession == null || !sentence.matches("![345A-D],.*")) {
return null;
}
@@ -161,6 +161,20 @@ public class MiniFinderProtocolDecoder extends BaseProtocolDecoder {
return position;
+ } else if (type.equals("4")) {
+
+ String[] values = sentence.split(",");
+
+ getLastLocation(position, null);
+
+ for (int i = 1; i <= 3; i++) {
+ if (!values[i + 1].isEmpty()) {
+ position.set("phone" + i, values[i + 1]);
+ }
+ }
+
+ return position;
+
} else if (type.equals("5")) {
String[] values = sentence.split(",");
diff --git a/src/test/java/org/traccar/protocol/MiniFinderProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
index d955d8e..712d59d 100644
--- a/src/test/java/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/MiniFinderProtocolDecoderTest.java
@@ -21,6 +21,10 @@ public class MiniFinderProtocolDecoderTest extends ProtocolTest {
"!1,123456789012345"));
verifyAttribute(decoder, text(
+ "!4,10,040123,,,1.0,110,0,0S,33"),
+ "phone1", "040123");
+
+ verifyAttribute(decoder, text(
"!5,17,V,50"),
Position.KEY_BATTERY_LEVEL, 50);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java b/src/main/java/org/traccar/protocol/MiniFinderProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_53 | diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index e33093d..bfd0a4c 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -1154,6 +1154,104 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
return position;
}
+ private static final Pattern PATTERN_BAA = new PatternBuilder()
+ .text("+RESP:GTBAA,")
+ .number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version
+ .number("(d{15}|x{14}),") // imei
+ .expression("[^,]*,") // device name
+ .number("x+,") // index
+ .number("d,") // accessory type
+ .number("d,") // accessory model
+ .number("x+,") // alarm type
+ .number("(x{4}),") // append mask
+ .expression("((?:[^,]+,){0,6})") // accessory optionals
+ .expression(PATTERN_LOCATION.pattern())
+ .any()
+ .number("(dddd)(dd)(dd)") // date (yyyymmdd)
+ .number("(dd)(dd)(dd)").optional(2) // time (hhmmss)
+ .text(",")
+ .number("(xxxx)") // count number
+ .text("$").optional()
+ .compile();
+
+ private Object decodeBaa(Channel channel, SocketAddress remoteAddress, String sentence) {
+ Parser parser = new Parser(PATTERN_BAA, sentence);
+ Position position = initPosition(parser, channel, remoteAddress);
+ if (position == null) {
+ return null;
+ }
+
+ int mask = parser.nextHexInt();
+ String[] values = parser.next().split(",");
+ int index = 0;
+ if (BitUtil.check(mask, 0)) {
+ position.set("accessoryName", values[index++]);
+ }
+ if (BitUtil.check(mask, 1)) {
+ position.set("accessoryMac", values[index++]);
+ }
+ if (BitUtil.check(mask, 2)) {
+ position.set("accessoryStatus", Integer.parseInt(values[index++]));
+ }
+ if (BitUtil.check(mask, 3)) {
+ position.set("accessoryVoltage", Integer.parseInt(values[index++]) * 0.001);
+ }
+ if (BitUtil.check(mask, 4)) {
+ position.set("accessoryTemp", Integer.parseInt(values[index++]));
+ }
+ if (BitUtil.check(mask, 5)) {
+ position.set("accessoryHumidity", Integer.parseInt(values[index]));
+ }
+
+ decodeLocation(position, parser);
+
+ decodeDeviceTime(position, parser);
+
+ return position;
+ }
+
+ private static final Pattern PATTERN_BID = new PatternBuilder()
+ .text("+RESP:GTBID,")
+ .number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version
+ .number("(d{15}|x{14}),") // imei
+ .expression("[^,]*,") // device name
+ .number("d,") // count
+ .number("d,") // accessory model
+ .number("(x{4}),") // append mask
+ .expression("((?:[^,]+,){0,2})") // accessory optionals
+ .expression(PATTERN_LOCATION.pattern())
+ .any()
+ .number("(dddd)(dd)(dd)") // date (yyyymmdd)
+ .number("(dd)(dd)(dd)").optional(2) // time (hhmmss)
+ .text(",")
+ .number("(xxxx)") // count number
+ .text("$").optional()
+ .compile();
+
+ private Object decodeBid(Channel channel, SocketAddress remoteAddress, String sentence) {
+ Parser parser = new Parser(PATTERN_BID, sentence);
+ Position position = initPosition(parser, channel, remoteAddress);
+ if (position == null) {
+ return null;
+ }
+
+ int mask = parser.nextHexInt();
+ String[] values = parser.next().split(",");
+ int index = 0;
+ if (BitUtil.check(mask, 1)) {
+ position.set("accessoryMac", values[index++]);
+ }
+ if (BitUtil.check(mask, 3)) {
+ position.set("accessoryVoltage", Integer.parseInt(values[index]) * 0.001);
+ }
+
+ decodeLocation(position, parser);
+
+ decodeDeviceTime(position, parser);
+
+ return position;
+ }
+
private static final Pattern PATTERN = new PatternBuilder()
.text("+").expression("(?:RESP|BUFF):GT...,")
.number("(?:[0-9A-Z]{2}xxxx)?,") // protocol version
@@ -1402,6 +1500,12 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
case "DTT":
result = decodeDtt(channel, remoteAddress, sentence);
break;
+ case "BAA":
+ result = decodeBaa(channel, remoteAddress, sentence);
+ break;
+ case "BID":
+ result = decodeBid(channel, remoteAddress, sentence);
+ break;
default:
result = decodeOther(channel, remoteAddress, sentence, type);
break;
diff --git a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
index 760671c..fcd2c6b 100644
--- a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
@@ -12,6 +12,14 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Gl200TextProtocolDecoder(null));
verifyAttribute(decoder, buffer(
+ "+RESP:GTBAA,F1040C,862599050497393,GV350M,FF,3,0,04,000A,780541256AE9,3065,0,0.0,213,2908.3,-78.691944,-0.951426,20230511173150,,,,,,20230511175001,0159$"),
+ "accessoryVoltage", 3.065);
+
+ verifyAttribute(decoder, buffer(
+ "+RESP:GTBID,C20105,866833040163013,GV350M,1,0,000A,B80EA11FF800,2934,0,0.0,0,1506.5,-99.192686,18.932709,20221026025339,0334,0020,0232,029D4E02,,20221026181026,9F1D$"),
+ "accessoryVoltage", 2.934);
+
+ verifyAttribute(decoder, buffer(
"+RESP:GTDTT,410502,864802030541621,,,,1,35,45637561747261636b0d0a434f4d422c302c39342e302c2d312e302c2c2c4844430d0a,20230421034626,EA2E$"),
Position.KEY_FUEL_LEVEL, 94.0);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_54 | diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index d08bb92..9c749c8 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
@@ -72,12 +72,10 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
.number("(x+)") // battery
.expression("([^,]+)?") // adc
.groupBegin()
- .text(",")
- .number("d,") // extended
- .expression("([^,]+)?") // fuel
+ .number(",d+") // extended
+ .expression(",([^,]+)?") // fuel
.groupBegin()
- .text(",")
- .expression("([^,]+)?") // temperature
+ .expression(",([^,]+)?") // temperature
.groupBegin()
.text(",")
.groupBegin()
@@ -91,9 +89,11 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
.number("(d+)?|") // instant fuel
.number("(d+)[%L]").optional() // fuel level
.groupEnd("?")
+ .number(",(d+)").optional() // hours
.groupEnd("?")
.groupEnd("?")
.groupEnd("?")
+ .any()
.compile();
private String decodeAlarm(int value) {
@@ -224,7 +224,7 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
}
}
- if (parser.hasNextAny(6)) {
+ if (parser.hasNextAny(9)) {
position.set(Position.KEY_RPM, parser.nextInt());
position.set(Position.KEY_ENGINE_LOAD, parser.nextInt());
position.set("airFlow", parser.nextInt());
@@ -242,6 +242,10 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_FUEL_LEVEL, parser.nextInt());
}
+ if (parser.hasNext()) {
+ position.set(Position.KEY_HOURS, parser.nextInt() * 1000L);
+ }
+
return position;
}
diff --git a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
index 361e6e6..9b1362f 100644
--- a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
@@ -12,6 +12,10 @@ public class StartekProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new StartekProtocolDecoder(null));
verifyAttribute(decoder, text(
+ "&&s148,868703050178631,000,37,,230704040211,A,22.678565,114.046011,31,0.5,0,339,77,8,460|0|249F|0AC2620D,27,0000001D,02,00,04F2|01A1|0000|0000,129,,,,949037"),
+ Position.KEY_HOURS, 9490000L);
+
+ verifyAttribute(decoder, text(
"&&x164,869926040743375,000,0,,220705205955,A,33.326001,44.445318,10,1.2,0,57,8,925,418|40|038C|000083CD,31,00000015,00,00,0016|016A|0000|0000,1,,,686|33||44|99|14|124|11|8D"),
Position.KEY_FUEL_CONSUMPTION, 1.1);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_55 | diff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
index bfd0a4c..911af8d 100644
--- a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java
@@ -400,7 +400,7 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, values[index++]);
position.setDeviceId(deviceSession.getDeviceId());
- index += 1; // device name
+ String deviceName = values[index++];
index += 1; // report type
index += 1; // canbus state
long reportMask = Long.parseLong(values[index++], 16);
@@ -442,11 +442,11 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
if (BitUtil.check(reportMask, 11) && !values[index++].isEmpty()) {
position.set(Position.KEY_HOURS, UnitsConverter.msFromHours(Double.parseDouble(values[index - 1])));
}
- if (BitUtil.check(reportMask, 12)) {
- position.set(Position.KEY_DRIVING_TIME, Double.parseDouble(values[index++]));
+ if (BitUtil.check(reportMask, 12) && !values[index++].isEmpty()) {
+ position.set(Position.KEY_DRIVING_TIME, Double.parseDouble(values[index - 1]));
}
- if (BitUtil.check(reportMask, 13)) {
- position.set("idleHours", Double.parseDouble(values[index++]));
+ if (BitUtil.check(reportMask, 13) && !values[index++].isEmpty()) {
+ position.set("idleHours", Double.parseDouble(values[index - 1]));
}
if (BitUtil.check(reportMask, 14) && !values[index++].isEmpty()) {
position.set("idleFuelConsumption", Double.parseDouble(values[index - 1]));
@@ -472,8 +472,19 @@ public class Gl200TextProtocolDecoder extends BaseProtocolDecoder {
if (BitUtil.check(reportMask, 21) && !values[index++].isEmpty()) {
position.set("engineOverspeed", Double.parseDouble(values[index - 1]));
}
- if (BitUtil.check(reportMask, 29)) {
- reportMaskExt = Long.parseLong(values[index++], 16);
+ if ("GV350M".equals(deviceName)) {
+ if (BitUtil.check(reportMask, 22)) {
+ index += 1; // impulse distance
+ }
+ if (BitUtil.check(reportMask, 23)) {
+ index += 1; // gross vehicle weight
+ }
+ if (BitUtil.check(reportMask, 24)) {
+ index += 1; // catalyst liquid level
+ }
+ }
+ if (BitUtil.check(reportMask, 29) && !values[index++].isEmpty()) {
+ reportMaskExt = Long.parseLong(values[index - 1], 16);
}
if (BitUtil.check(reportMaskExt, 0) && !values[index++].isEmpty()) {
position.set("adBlueLevel", Integer.parseInt(values[index - 1]));
diff --git a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
index fcd2c6b..f0dd107 100644
--- a/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gl200TextProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class Gl200TextProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new Gl200TextProtocolDecoder(null));
+ verifyAttributes(decoder, buffer(
+ "+RESP:GTCAN,F1040C,862599050497393,GV350M,0,0,FFFFFFFF,,1,,,,,,,,,,,,,,,,,,,,,,,0,,,1,0.0,70,2961.6,-78.691750,-0.951135,20230703191659,,,,,,20230703191659,5A4A$"));
+
verifyAttribute(decoder, buffer(
"+RESP:GTBAA,F1040C,862599050497393,GV350M,FF,3,0,04,000A,780541256AE9,3065,0,0.0,213,2908.3,-78.691944,-0.951426,20230511173150,,,,,,20230511175001,0159$"),
"accessoryVoltage", 3.065);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gl200TextProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_56 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 38c2219..5db06fc 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -806,7 +806,11 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
}
if (hasLbs(type) && buf.readableBytes() > 6) {
- decodeLbs(position, buf, type, hasStatus(type) && type != MSG_LBS_ALARM && type != MSG_LBS_STATUS);
+ boolean hasLength = hasStatus(type)
+ && type != MSG_LBS_STATUS
+ && type != MSG_LBS_ALARM
+ && (type != MSG_GPS_LBS_STATUS_1 || variant != Variant.VXT01);
+ decodeLbs(position, buf, type, hasLength);
}
if (hasStatus(type)) {
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 937c7ec..04f41a5 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -18,6 +18,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
+ "78782416160501000221c0027c5e180c2b9c8d00150301cc002503002bde20050f01000004bd320d0a"),
+ Position.KEY_ALARM, Position.ALARM_SOS);
+
+ verifyAttribute(decoder, binary(
"78780a130604ea04000006bc8a0d0a"),
Position.KEY_POWER, 0.0);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_57 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 5db06fc..383d4cb 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -828,7 +828,10 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
} else {
position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte() * 100 / 6);
position.set(Position.KEY_RSSI, buf.readUnsignedByte());
- position.set(Position.KEY_ALARM, decodeAlarm(buf.readUnsignedByte()));
+ short alarmExtension = buf.readUnsignedByte();
+ if (variant != Variant.VXT01) {
+ position.set(Position.KEY_ALARM, decodeAlarm(alarmExtension));
+ }
}
}
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 04f41a5..fac92d7 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -18,7 +18,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
- "78782416160501000221c0027c5e180c2b9c8d00150301cc002503002bde20050f01000004bd320d0a"),
+ "7878241617070a150e24ca01fba0040780e177005c0001720253360027db6204e40400004bf1e90d0a"),
Position.KEY_ALARM, Position.ALARM_SOS);
verifyAttribute(decoder, binary(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_58 | diff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
index 85589b0..6289bd2 100644
--- a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java
@@ -324,6 +324,23 @@ public class Minifinder2ProtocolDecoder extends BaseProtocolDecoder {
return positions;
+ } else if (type == MSG_RESPONSE) {
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress);
+ if (deviceSession == null) {
+ return null;
+ }
+
+ Position position = new Position(getProtocolName());
+ position.setDeviceId(deviceSession.getDeviceId());
+
+ getLastLocation(position, null);
+
+ buf.readUnsignedByte(); // length
+ position.set(Position.KEY_RESULT, String.valueOf(buf.readUnsignedByte()));
+
+ return position;
+
}
return null;
diff --git a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
index 587a520..64d245a 100644
--- a/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Minifinder2ProtocolDecoderTest.java
@@ -2,6 +2,7 @@ package org.traccar.protocol;
import org.junit.jupiter.api.Test;
import org.traccar.ProtocolTest;
+import org.traccar.model.Position;
public class Minifinder2ProtocolDecoderTest extends ProtocolTest {
@@ -15,6 +16,10 @@ public class Minifinder2ProtocolDecoderTest extends ProtocolTest {
"barkCount", 12L);
verifyAttribute(decoder, binary(
+ "ab00030008c700007f0100"),
+ Position.KEY_RESULT, "0");
+
+ verifyAttribute(decoder, binary(
"ab102600080f1400011001383633393231303339393833343736092429b347633003a96409020000008027b34763"),
"bark", true);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Minifinder2ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_59 | diff --git a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java
index a1d5481..b5dd3c4 100644
--- a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java
@@ -48,7 +48,11 @@ public class TopinProtocolDecoder extends BaseProtocolDecoder {
public static final int MSG_GPS = 0x10;
public static final int MSG_GPS_OFFLINE = 0x11;
public static final int MSG_STATUS = 0x13;
+ public static final int MSG_SLEEP = 0x14;
+ public static final int MSG_FACTORY_RESET = 0x15;
public static final int MSG_WIFI_OFFLINE = 0x17;
+ public static final int MSG_LBS_WIFI = 0x18;
+ public static final int MSG_LBS_WIFI_OFFLINE = 0x19;
public static final int MSG_TIME_UPDATE = 0x30;
public static final int MSG_SOS_NUMBER = 0x41;
public static final int MSG_WIFI = 0x69;
@@ -216,7 +220,8 @@ public class TopinProtocolDecoder extends BaseProtocolDecoder {
return position;
- } else if (type == MSG_WIFI || type == MSG_WIFI_OFFLINE) {
+ } else if (type == MSG_WIFI || type == MSG_WIFI_OFFLINE
+ || type == MSG_LBS_WIFI || type == MSG_LBS_WIFI_OFFLINE) {
Position position = new Position(getProtocolName());
position.setDeviceId(deviceSession.getDeviceId());
diff --git a/src/test/java/org/traccar/protocol/TopinProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TopinProtocolDecoderTest.java
index 763c4f2..b55e12e 100644
--- a/src/test/java/org/traccar/protocol/TopinProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/TopinProtocolDecoderTest.java
@@ -17,6 +17,9 @@ public class TopinProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780d0103593390754169634d0d0a"));
+ verifyNotNull(decoder, binary(
+ "787803181604130318491475905bd30e25001e10bbf7635d14759006e626560401cc00000028660090df425f000028660090df576c00002866009487566700002866009ca15667000d0a"));
+
verifyAttribute(decoder, binary(
"7878006921120412565802010601071e4a9764071e4a9864010d0a"),
Position.KEY_ALARM, Position.ALARM_VIBRATION);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java b/src/main/java/org/traccar/protocol/TopinProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_60 | diff --git a/src/main/java/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java
index d1025f5..12c31ba 100644
--- a/src/main/java/org/traccar/helper/BufferUtil.java
+++ b/src/main/java/org/traccar/helper/BufferUtil.java
@@ -71,4 +71,16 @@ public final class BufferUtil {
}
}
+ public static boolean isPrintable(ByteBuf buf, int length) {
+ boolean printable = true;
+ for (int i = 0; i < length; i++) {
+ byte b = buf.getByte(buf.readerIndex() + i);
+ if (b < 32 && b != '\r' && b != '\n') {
+ printable = false;
+ break;
+ }
+ }
+ return printable;
+ }
+
}
diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 383d4cb..e1bc2b5 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.BufferUtil;
import org.traccar.session.DeviceSession;
import org.traccar.NetworkMessage;
import org.traccar.Protocol;
@@ -1382,19 +1383,13 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
getLastLocation(position, null);
buf.readUnsignedByte(); // external device type code
- int length = buf.readableBytes() - 9; // line break + checksum + index + checksum + footer
- if (length <= 0) {
- return null;
- } else if (length < 8) {
- position.set(
- Position.PREFIX_TEMP + 1,
- Double.parseDouble(buf.readCharSequence(length - 1, StandardCharsets.US_ASCII).toString()));
+ ByteBuf data = buf.readSlice(buf.readableBytes() - 6); // index + checksum + footer
+ if (BufferUtil.isPrintable(data, data.readableBytes())) {
+ String value = data.readCharSequence(data.readableBytes(), StandardCharsets.US_ASCII).toString();
+ position.set(Position.KEY_RESULT, value.trim());
} else {
- buf.readUnsignedByte(); // card type
- position.set(
- Position.KEY_DRIVER_UNIQUE_ID,
- buf.readCharSequence(length - 1, StandardCharsets.US_ASCII).toString());
+ position.set(Position.KEY_RESULT, ByteBufUtil.hexDump(data));
}
return position;
diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index c8e0005..e888642 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -20,6 +20,7 @@ import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import io.netty.channel.Channel;
import org.traccar.BaseProtocolDecoder;
+import org.traccar.helper.BufferUtil;
import org.traccar.model.Device;
import org.traccar.session.DeviceSession;
import org.traccar.NetworkMessage;
@@ -112,18 +113,6 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
}
}
- private boolean isPrintable(ByteBuf buf, int length) {
- boolean printable = true;
- for (int i = 0; i < length; i++) {
- byte b = buf.getByte(buf.readerIndex() + i);
- if (b < 32 && b != '\r' && b != '\n') {
- printable = false;
- break;
- }
- }
- return printable;
- }
-
private void decodeSerial(
Channel channel, SocketAddress remoteAddress, DeviceSession deviceSession, Position position, ByteBuf buf) {
@@ -169,7 +158,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_TYPE, type);
int length = buf.readInt();
- if (isPrintable(buf, length)) {
+ if (BufferUtil.isPrintable(buf, length)) {
String data = buf.readSlice(length).toString(StandardCharsets.US_ASCII).trim();
if (data.startsWith("UUUUww") && data.endsWith("SSS")) {
String[] values = data.substring(6, data.length() - 4).split(";");
@@ -636,7 +625,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // type
int length = buf.readInt() - 4;
getLastLocation(position, new Date(buf.readUnsignedInt() * 1000));
- if (isPrintable(buf, length)) {
+ if (BufferUtil.isPrintable(buf, length)) {
String data = buf.readCharSequence(length, StandardCharsets.US_ASCII).toString().trim();
if (data.startsWith("GTSL")) {
position.set(Position.KEY_DRIVER_UNIQUE_ID, data.split("\\|")[4]);
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index fac92d7..26f3005 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780D01086471700328358100093F040D0A"));
+ /*verifyAttribute(decoder, binary(
+ "797900109b0344373532304136320d0a000f87f00d0a"),
+ Position.KEY_DRIVER_UNIQUE_ID, "44373532304136320d0a");*/
+
verifyAttribute(decoder, binary(
"7878241617070a150e24ca01fba0040780e177005c0001720253360027db6204e40400004bf1e90d0a"),
Position.KEY_ALARM, Position.ALARM_SOS);
@@ -111,8 +115,9 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"7878281520000000003c49434349443a38393838323339303030303039373330323635303e00020d446f260d0a"),
Position.KEY_ICCID, "89882390000097302650");
- verifyNull(decoder, binary(
- "797900099b0380d600046f91e90d0a"));
+ verifyAttribute(decoder, binary(
+ "797900099b0380d600046f91e90d0a"),
+ Position.KEY_RESULT, "80d600");
verifyNull(decoder, binary(
"797900a56615010d081f3b012c323131303d30303033643238342c323130353d30303030316332302c323130623d30303030326537632c323130633d30303033643238342c323130663d30303030306331632c323130643d30303030323166632c323161363d30303030303030302c323130343d30303030306531302c323132663d30303030303030302c323134353d30303030303030302ccb03851f5f03c020525514a7003e216a0d0a"));
@@ -125,7 +130,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyAttribute(decoder, binary(
"7979000E9B0332382E33A1E60D0A0289BE490D0A"),
- Position.PREFIX_TEMP + 1, 28.3);
+ Position.KEY_RESULT, "32382e33a1e60d0a");
verifyPosition(decoder, binary(
"7878353714080d05000ac500a886eb0b7522f000100001fe0a05ea004f1b000001002e0400002328003b0217c0003c0401020001002c468a0d0a"));
@@ -168,7 +173,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyAttribute(decoder, binary(
"797900149b03023539303042343843454238410300139ba40d0a"),
- Position.KEY_DRIVER_UNIQUE_ID, "5900B48CEB");
+ Position.KEY_RESULT, "0235393030423438434542384103");
verifyPosition(decoder, binary(
"787821121303120b2524c70138e363085b549003d43301940057d200cd52c000006aa1ca0d0a"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/helper/BufferUtil.java b/src/main/java/org/traccar/helper/BufferUtil.java |
gitbug-java_data_traccar-traccar.json_61 | diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 2fb7c6e..1ad27be 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -284,7 +284,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
String[] values = cell.split("@");
network.addCellTower(CellTower.from(
Integer.parseInt(values[0]), Integer.parseInt(values[1]),
- Integer.parseInt(values[2], 16), Integer.parseInt(values[3], 16)));
+ Integer.parseInt(values[2], 16), Long.parseLong(values[3], 16)));
}
break;
case 0x0021:
diff --git a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
index fe4b077..a54fa53 100644
--- a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
@@ -32,6 +32,9 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest {
Position.KEY_HOURS, 58.7);
verifyNotNull(decoder, binary(
+ "c0000000b1aa000000000000050000000031393730303130313134303200000000000000000000000000000000000100180000000000000000000000000000000000c57e000005000a1a000000c569000900155756575a5a5a43445a4e57313139313534000f00133836393733313035313339393231300010000c302e30303030303000110008000000000014000bf800002800000000150006000000200016353035403031403040313337313931363831c0"));
+
+ verifyNotNull(decoder, binary(
"c000000077aa00000000000070020000003230303132373035313635330000000000000000000000000000000000010015ffffffff000000000000019dffffffffff0005000a1f00000e455a00200019313238354031406666666540386233663930634030000f0013333536373236313038313335343530c0"));
verifyPosition(decoder, binary(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_62 | diff --git a/src/main/java/org/traccar/protocol/T622IridiumProtocolDecoder.java b/src/main/java/org/traccar/protocol/T622IridiumProtocolDecoder.java
index 27b7baf..9e64ec9 100644
--- a/src/main/java/org/traccar/protocol/T622IridiumProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/T622IridiumProtocolDecoder.java
@@ -94,7 +94,7 @@ public class T622IridiumProtocolDecoder extends BaseProtocolDecoder {
position.setLongitude(buf.readIntLE() / 1000000.0);
break;
case 0x04:
- position.setTime(new Date((buf.readUnsignedIntLE() + 946713600) * 1000));
+ position.setTime(new Date((buf.readUnsignedIntLE() + 946684800) * 1000));
break;
case 0x05:
position.setValid(buf.readUnsignedByte() > 0);
diff --git a/src/test/java/org/traccar/protocol/T622IridiumProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/T622IridiumProtocolDecoderTest.java
index 17b2526..ff5d5b0 100644
--- a/src/test/java/org/traccar/protocol/T622IridiumProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/T622IridiumProtocolDecoderTest.java
@@ -1,12 +1,10 @@
package org.traccar.protocol;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.traccar.ProtocolTest;
public class T622IridiumProtocolDecoderTest extends ProtocolTest {
- @Disabled
@Test
public void testDecode() throws Exception {
@@ -15,7 +13,8 @@ public class T622IridiumProtocolDecoderTest extends ProtocolTest {
decoder.setFormat("01,02,03,04,05,08");
verifyPosition(decoder, binary(
- "01003301001c2a8cef8333303034333430363735343836353000001700006461d512020011232f03a0fff1c85d0612b3f02b00000048"));
+ "01003501001c68b2cb1733303034333430363735343836353000016e000064b5f497020013234c5ea0ff1c365d0600b1482c010000cf0004"),
+ position("2023-07-18 02:10:08.000", true, -6.26732, 106.77200));
}
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/T622IridiumProtocolDecoder.java b/src/main/java/org/traccar/protocol/T622IridiumProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_63 | diff --git a/src/main/java/org/traccar/protocol/WatchFrameDecoder.java b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java
index ec67aa3..9dfae87 100644
--- a/src/main/java/org/traccar/protocol/WatchFrameDecoder.java
+++ b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java
@@ -27,9 +27,21 @@ public class WatchFrameDecoder extends BaseFrameDecoder {
protected Object decode(
ChannelHandlerContext ctx, Channel channel, ByteBuf buf) throws Exception {
+ int brackets = 0;
int endIndex = -1;
- for (int i = buf.writerIndex() - 1; i >= buf.readerIndex(); i--) {
- if (buf.getByte(i) == ']') {
+ for (int i = buf.readerIndex(); i < buf.writerIndex(); i++) {
+ byte b = buf.getByte(i);
+ switch (b) {
+ case '[':
+ brackets += 1;
+ break;
+ case ']':
+ brackets -= 1;
+ break;
+ default:
+ break;
+ }
+ if (brackets == 0 && i > buf.readerIndex()) {
endIndex = i + 1;
break;
}
diff --git a/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java b/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java
index bf21254..cb20e1b 100644
--- a/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/WatchFrameDecoderTest.java
@@ -11,6 +11,10 @@ public class WatchFrameDecoderTest extends ProtocolTest {
var decoder = inject(new WatchFrameDecoder());
verifyFrame(
+ binary("5b33472a393730353134313734302a303030392a4c4b2c302c302c35335d"),
+ decoder.decode(null, null, binary("5b33472a393730353134313734302a303030392a4c4b2c302c302c35335d5b33472a393730353134313734302a303035412a55442c3139303732332c3139303730372c412c33362e3831353130392c4e2c31302e313739323331322c452c382e32342c3132372e392c32312e302c352c3130302c35332c302c302c30303030303030302c302c302c35382e305d5b33472a393730353134313734302a303030332a544b515d5b33472a393730353134313734302a303030392a4c4b2c302c302c35335d")));
+
+ verifyFrame(
binary("5b33472a3838303930303234322a303133442a55442c3132303632332c3134303032302c412c34382e3934393237332c4e2c20342e333738333036302c452c31382e35362c34332e382c302e302c31322c3130302c37362c3232363132302c302c30303030303030302c322c3235352c3230342c382c333131302c35353032352c3134362c333133302c34393239372c3132342c352c42616e67696e67576966692c33343a61313a65643a65313a39313a34662c2d37312c42415220576946692c33363a61323a65313a65643a61313a64652c2d37322c4e6574776f726b576966692c32363a64653a61313a65643a65313a61302c2d37332c46696265722c33363a61313a65643a65313a39313a34662c2d37352c5b4c475f57616c6c2d4d6f756e7420412f435d653732352c36363a61313a65643a65313a65373a32352c2d38322c31352e305d"),
decoder.decode(null, null, binary("5b33472a3838303930303234322a303133442a55442c3132303632332c3134303032302c412c34382e3934393237332c4e2c20342e333738333036302c452c31382e35362c34332e382c302e302c31322c3130302c37362c3232363132302c302c30303030303030302c322c3235352c3230342c382c333131302c35353032352c3134362c333133302c34393239372c3132342c352c42616e67696e67576966692c33343a61313a65643a65313a39313a34662c2d37312c42415220576946692c33363a61323a65313a65643a61313a64652c2d37322c4e6574776f726b576966692c32363a64653a61313a65643a65313a61302c2d37332c46696265722c33363a61313a65643a65313a39313a34662c2d37352c5b4c475f57616c6c2d4d6f756e7420412f435d653732352c36363a61313a65643a65313a65373a32352c2d38322c31352e305d")));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/WatchFrameDecoder.java b/src/main/java/org/traccar/protocol/WatchFrameDecoder.java |
gitbug-java_data_traccar-traccar.json_64 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index f7cdd39..d6d9884 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -345,7 +345,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
mnc = buf.readUnsignedByte();
}
int lac;
- if (type == MSG_LBS_ALARM) {
+ if (type == MSG_LBS_ALARM || type == MSG_GPS_LBS_7) {
lac = buf.readInt();
} else {
lac = buf.readUnsignedShort();
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index cc71eb9..68579e8 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -17,6 +17,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"78780D01086471700328358100093F040D0A"));
+ verifyAttribute(decoder, binary(
+ "787829a01707150f2d0ecd01635100041e96d000087c02d4020000912e000000000718798d000e0006ed3ce50d0a"),
+ Position.KEY_IGNITION, false);
+
verifyNotNull(decoder, binary(
"787829a0170704112226cf0163fe7c0420f6f000091302d402000091290000000007186b8f01030001460d010d0a"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_65 | diff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
index 1ad27be..7d634b0 100644
--- a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java
@@ -229,7 +229,7 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(buf.readUnsignedShort());
position.setAltitude(buf.readUnsignedShort());
- position.set(Position.KEY_ODOMETER, buf.readUnsignedShort() * 1000);
+ buf.readUnsignedShort(); // odometer speed
Network network = new Network();
@@ -264,8 +264,11 @@ public class HuaShengProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedInt(); // run time
break;
case 0x0009:
- position.set(
- Position.KEY_VIN, buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
+ position.set(Position.KEY_VIN, buf.readCharSequence(length, StandardCharsets.US_ASCII).toString());
+ break;
+ case 0x0010:
+ position.set(Position.KEY_ODOMETER, Double.parseDouble(
+ buf.readCharSequence(length, StandardCharsets.US_ASCII).toString()) * 1000);
break;
case 0x0011:
position.set(Position.KEY_HOURS, buf.readUnsignedInt() * 0.05);
diff --git a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
index a54fa53..d8cc739 100644
--- a/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuaShengProtocolDecoderTest.java
@@ -20,6 +20,10 @@ public class HuaShengProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"c000000077aa0200000000000e000100143347315f48312e315f56312e30372e54000300133335353835353035303434303635380004000b3531323030303000050005010006000400070004000800050000090018383936313032353431343533333239313833360d000a000f796573696e7465726e6574c0"));
+ verifyAttribute(decoder, binary(
+ "c0000000bdaa0000000000061d480000083233303132333039323634330000000000000000000000a600140000000100187e02de0a00290372000005951600260000004a0000040009080000004a0005000a0d0000000ad0000900154d414b474d363639484a4e333031383739000f00133836323230353035353338393836320010001031333231322e30303030303000110008000000000014000bf851084f000018001500060000002000153430344030354035363532403130363332c0"),
+ Position.KEY_ODOMETER, 13212000.0);
+
verifyNotNull(decoder, binary(
"c0000000b9aa00000000000013c800001132333035303431343537323600186bc30045e5b8002a008b0077002d000100187f0c4b2600d906ec000005938800000000000e0000040009110000000e0005000a1d0400000079000900154646464646464646464646464646464646000f00133836323230353035353339313733360010000c302e30303030303000110008000000000014000bf81b204901b52a001500060000002000153231394030324030403130343438393139c0"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuaShengProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_66 | diff --git a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
index 047a182..86a8bf6 100644
--- a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java
@@ -271,18 +271,26 @@ public class SuntechProtocolDecoder extends BaseProtocolDecoder {
index += 1; // collaborative network
}
- DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH:mm:ss");
- dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
- position.setTime(dateFormat.parse(values[index++] + values[index++]));
+ if (values[index].isEmpty()) {
- position.setLatitude(Double.parseDouble(values[index++]));
- position.setLongitude(Double.parseDouble(values[index++]));
- position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(values[index++])));
- position.setCourse(Double.parseDouble(values[index++]));
+ getLastLocation(position, null);
- position.set(Position.KEY_SATELLITES, Integer.parseInt(values[index++]));
+ } else {
- position.setValid(values[index++].equals("1"));
+ DateFormat dateFormat = new SimpleDateFormat("yyyyMMddHH:mm:ss");
+ dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+ position.setTime(dateFormat.parse(values[index++] + values[index++]));
+
+ position.setLatitude(Double.parseDouble(values[index++]));
+ position.setLongitude(Double.parseDouble(values[index++]));
+ position.setSpeed(UnitsConverter.knotsFromKph(Double.parseDouble(values[index++])));
+ position.setCourse(Double.parseDouble(values[index++]));
+
+ position.set(Position.KEY_SATELLITES, Integer.parseInt(values[index++]));
+
+ position.setValid(values[index++].equals("1"));
+
+ }
return position;
}
diff --git a/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java
index 884f133..cbb6813 100644
--- a/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/SuntechProtocolDecoderTest.java
@@ -12,6 +12,9 @@ public class SuntechProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new SuntechProtocolDecoder(null));
+ verifyAttributes(decoder, buffer(
+ "ST410STT;109815653;445;03;16531;724;10;-77;6011;7;16273;724;10;7511;0;0;13903;724;10;6011;0;0;7671;724;10;7111;0;0;16533;724;10;6011;0;0;0;0;0;0;0;0;0;0;0;0;0;0;3.86;0;0098;1;003;;;;;;;;;"));
+
verifyPosition(decoder, buffer(
"ALT;0840037569;FFFFFF;84;1.0.6;0;20221228;11:33:05;00004490;724;11;05D3;33;-22.845935;-46.322000;0.00;0.00;18;0;00000001;00000000;99;;;;08E3800F;4.1;12.37;0;0;0;0;4;;;;"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java b/src/main/java/org/traccar/protocol/SuntechProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_67 | diff --git a/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java b/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java
index 40d56b1..b586f4e 100644
--- a/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java
@@ -51,7 +51,7 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
.number("(dd)(dd)(dd),") // time (hhmmss)
.expression("([AV]),") // validity
.number(" *(-?d+.d+),") // latitude
- .expression("([NS]),")
+ .expression("([NS])?,")
.number(" *(-?d+.d+),") // longitude
.expression("([EW])?,")
.number("(d+.?d*),") // speed
@@ -285,7 +285,8 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
|| type.equalsIgnoreCase("BLOOD")
|| type.equalsIgnoreCase("BPHRT")
|| type.equalsIgnoreCase("TEMP")
- || type.equalsIgnoreCase("btemp2")) {
+ || type.equalsIgnoreCase("btemp2")
+ || type.equalsIgnoreCase("oxygen")) {
if (buf.isReadable()) {
@@ -303,6 +304,8 @@ public class WatchProtocolDecoder extends BaseProtocolDecoder {
if (Integer.parseInt(values[valueIndex++]) > 0) {
position.set(Position.PREFIX_TEMP + 1, Double.parseDouble(values[valueIndex]));
}
+ } else if (type.equalsIgnoreCase("oxygen")) {
+ position.set("bloodOxygen", Integer.parseInt(values[++valueIndex]));
} else {
if (type.equalsIgnoreCase("BPHRT") || type.equalsIgnoreCase("BLOOD")) {
position.set("pressureHigh", values[valueIndex++]);
diff --git a/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java
index 855b979..5fd0ede 100644
--- a/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/WatchProtocolDecoderTest.java
@@ -17,6 +17,13 @@ public class WatchProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new WatchProtocolDecoder(null));
+ verifyAttribute(decoder, buffer(
+ "[3G*9705141740*000B*oxygen,0,98]"),
+ "bloodOxygen", 98);
+
+ verifyPosition(decoder, buffer(
+ "[3G*9705141740*00C2*UD_LTE,260723,185105,V,00.000000,,00.0000000,,0.00,0.0,0.0,0,100,67,0,0,00000000,2,0,605,1,10006,65799,14,10020,4104,4,3,,34:60:f9:ec:19:f8,-82,,98:48:27:55:18:20,-96,,34:e8:94:e4:06:18,-104,0.0]"));
+
verifyPosition(decoder, buffer(
"[SG*9059011020*0067*AL,240123,181628,V,54.427538,N,6.409275,W,0.00,0,0,0,19,90,0,0,00000000,1,1,234,10,55C0,3B882A2,132,,10]"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java b/src/main/java/org/traccar/protocol/WatchProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_68 | diff --git a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java
index 2122d50..649de7c 100644
--- a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java
@@ -248,17 +248,21 @@ public class RuptelaProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // priority (reserved)
- position.setValid(true);
- position.setLongitude(buf.readInt() / 10000000.0);
- position.setLatitude(buf.readInt() / 10000000.0);
- position.setAltitude(buf.readUnsignedShort() / 10.0);
- position.setCourse(buf.readUnsignedShort() / 100.0);
-
- position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
-
- position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
-
- position.set(Position.KEY_HDOP, buf.readUnsignedByte() / 10.0);
+ int longitude = buf.readInt();
+ int latitude = buf.readInt();
+ if (longitude > Integer.MIN_VALUE && latitude > Integer.MIN_VALUE) {
+ position.setValid(true);
+ position.setLongitude(longitude / 10000000.0);
+ position.setLatitude(latitude / 10000000.0);
+ position.setAltitude(buf.readUnsignedShort() / 10.0);
+ position.setCourse(buf.readUnsignedShort() / 100.0);
+ position.set(Position.KEY_SATELLITES, buf.readUnsignedByte());
+ position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedShort()));
+ position.set(Position.KEY_HDOP, buf.readUnsignedByte() / 10.0);
+ } else {
+ buf.skipBytes(8);
+ getLastLocation(position, null);
+ }
if (type == MSG_EXTENDED_RECORDS) {
position.set(Position.KEY_EVENT, buf.readUnsignedShort());
diff --git a/src/test/java/org/traccar/protocol/RuptelaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/RuptelaProtocolDecoderTest.java
index f214ce5..e98dffd 100644
--- a/src/test/java/org/traccar/protocol/RuptelaProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/RuptelaProtocolDecoderTest.java
@@ -13,6 +13,9 @@ public class RuptelaProtocolDecoderTest extends ProtocolTest {
verifyNull(decoder, binary(
"002e000316d53d58d6020f4573303430302e30332e36382e30340000c2b3090d0e950000827b000003e80000003c003c1681"));
+ verifyPositions(decoder, false, binary(
+ "03fb0003137ca79f856d01011d386d438b000080000000800000008000ffffffffffff070220211bff011d30c50000386d438b000080000000800000008000ffffffffffff0702201f1bff011d30c30000386d43a9000180000000800000008000ffffffffffffad0320211b16ad01011d30950000386d43c7000080000000800000008000ffffffffffff070220211b00011d30a60000386d4403000080000000800000008000ffffffffffff070220221b00011d30ae0000386d443f000080000000800000008000ffffffffffff070220231b00011d30ae000064c692cb000080000000800000008000ffffffffffff070220231b18011d3091000064c69306000080000000800000008000ffffffffffff070220231b14011d30a7000064c69322000180000000800000008000ffffffffffffad0320241b14ad00011d30a3000064c69342000080000000800000008000ffffffffffff070220241b13011d30ad000064c6934a000180000000800000008000ffffffffffffad0320241b10ad01011d30c3000064c6937e000080000000800000008000ffffffffffff070220241b12011d3092000064c6938b000180000000800000008000ffffffffffffad0320241b12ad00011d30bd000064c69395000180000000800000008000ffffffffffffad0320241b10ad01011d30a6000064c693ba000080000000800000008000ffffffffffff070220251b17011d30a2000064c693d4000180000000800000008000ffffffffffffad0320251b17ad00011d30cc000064c693f6000080000000800000008000ffffffffffff070220251b15011d3090000064c69404000180000000800000008000ffffffffffffad0320251b16ad01011d30a9000064c69432000080000000800000008000ffffffffffff070220261b14011d30be000064c6946d000180000000800000008000ffffffffffffad0320261b15ad00011d30b1000064c6946e000080000000800000008000ffffffffffff070220261b15011d3096000064c694aa000080000000800000008000ffffffffffff070220261b15011d30a8000064c694b2000180000000800000008000ffffffffffffad0320261b15ad01011d30a5000064c694e6000080000000800000008000ffffffffffff070220261b17011d309a000064c694f5000180000000800000008000ffffffffffffad0320261b17ad00011d309c000064c694f6000180000000800000008000ffffffffffffad0320261b17ad01011d3099000064c69522000080000000800000008000ffffffffffff070220261b14011d3094000064c6955e000080000000800000008000ffffffffffff070220261b15011d30b2000064c6959a000080000000800000008000ffffffffffff070220261b14011d30970000ad9e"));
+
verifyPositions(decoder, binary(
"00800003167d765c155d01000160cd0a310000faae43f7176ee45702332b0c12000006070d05007300cfff260082008600870088000f00d7021100d801c900061d0000c500001e0e988300008900008b000002d0000c9bca720c889a0b047e00000000000000007f0000000000000000800000000000000000810000000000000000a341"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java b/src/main/java/org/traccar/protocol/RuptelaProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_69 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index d6d9884..4762fc8 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -836,11 +836,6 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
}
}
- if (type == MSG_STATUS && variant == Variant.VXT01) {
- position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.01);
- position.set(Position.KEY_RSSI, buf.readUnsignedByte());
- }
-
if (type == MSG_GPS_LBS_1) {
if (variant == Variant.GT06E_CARD) {
position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
@@ -1421,8 +1416,6 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
variant = Variant.VXT01;
} else if (header == 0x7878 && type == MSG_GPS_LBS_STATUS_1 && length == 0x24) {
variant = Variant.VXT01;
- } else if (header == 0x7878 && type == MSG_STATUS && length == 0x0a) {
- variant = Variant.VXT01;
} else if (header == 0x7878 && type == MSG_LBS_MULTIPLE_3 && length == 0x31) {
variant = Variant.WANWAY_S20;
} else if (header == 0x7878 && type == MSG_LBS_MULTIPLE_3 && length == 0x2e) {
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 68579e8..40f268a 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -34,7 +34,7 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
verifyAttribute(decoder, binary(
"78780a130604ea04000006bc8a0d0a"),
- Position.KEY_POWER, 0.0);
+ Position.KEY_POWER, null);
verifyAttributes(decoder, binary(
"797900849404414c4d313d43353b414c4d323d43433b414c4d333d35433b535441313d43303b4459443d30313b534f533d303133323838333730302c2c3b43454e5445523d303133323838333730303b46454e43453d46656e63652c4f46462c302c302e3030303030302c302e3030303030302c3330302c494e206f72204f55542c313b00b79d120d0a"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_70 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 4762fc8..53c812b 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -121,6 +121,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
STANDARD,
OBD6,
WETRUST,
+ JC400,
}
private Variant variant;
@@ -269,12 +270,12 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
}
public static boolean decodeGps(Position position, ByteBuf buf, boolean hasLength, TimeZone timezone) {
- return decodeGps(position, buf, hasLength, true, true, timezone);
+ return decodeGps(position, buf, hasLength, true, true, false, timezone);
}
public static boolean decodeGps(
Position position, ByteBuf buf, boolean hasLength, boolean hasSatellites,
- boolean hasSpeed, TimeZone timezone) {
+ boolean hasSpeed, boolean longSpeed, TimeZone timezone) {
DateBuilder dateBuilder = new DateBuilder(timezone)
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
@@ -293,7 +294,8 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
double longitude = buf.readUnsignedInt() / 60.0 / 30000.0;
if (hasSpeed) {
- position.setSpeed(UnitsConverter.knotsFromKph(buf.readUnsignedByte()));
+ position.setSpeed(UnitsConverter.knotsFromKph(
+ longSpeed ? buf.readUnsignedShort() : buf.readUnsignedByte()));
}
int flags = buf.readUnsignedShort();
@@ -928,24 +930,44 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
boolean extendedAlarm = dataLength > 7;
if (extendedAlarm) {
- decodeGps(position, buf, false, false, false, deviceSession.get(DeviceSession.KEY_TIMEZONE));
+ if (variant == Variant.JC400) {
+ buf.readUnsignedShort(); // marker
+ buf.readUnsignedByte(); // version
+ }
+ decodeGps(
+ position, buf, false,
+ variant == Variant.JC400, variant == Variant.JC400, variant == Variant.JC400,
+ deviceSession.get(DeviceSession.KEY_TIMEZONE));
} else {
DateBuilder dateBuilder = new DateBuilder((TimeZone) deviceSession.get(DeviceSession.KEY_TIMEZONE))
.setDate(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte())
.setTime(buf.readUnsignedByte(), buf.readUnsignedByte(), buf.readUnsignedByte());
getLastLocation(position, dateBuilder.getDate());
}
- short alarmType = buf.readUnsignedByte();
- switch (alarmType) {
+ if (variant == Variant.JC400) {
+ position.set(Position.KEY_POWER, buf.readUnsignedShort() * 0.1);
+ }
+ short event = buf.readUnsignedByte();
+ position.set(Position.KEY_EVENT, event);
+ switch (event) {
case 0x01:
position.set(Position.KEY_ALARM, extendedAlarm ? Position.ALARM_SOS : Position.ALARM_GENERAL);
break;
+ case 0x0E:
+ position.set(Position.KEY_ALARM, Position.ALARM_LOW_POWER);
+ break;
+ case 0x76:
+ position.set(Position.KEY_ALARM, Position.ALARM_TEMPERATURE);
+ break;
case 0x80:
position.set(Position.KEY_ALARM, Position.ALARM_VIBRATION);
break;
case 0x87:
position.set(Position.KEY_ALARM, Position.ALARM_OVERSPEED);
break;
+ case 0x88:
+ position.set(Position.KEY_ALARM, Position.ALARM_POWER_CUT);
+ break;
case 0x90:
position.set(Position.KEY_ALARM, Position.ALARM_ACCELERATION);
break;
@@ -959,7 +981,6 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_ALARM, Position.ALARM_ACCIDENT);
break;
default:
- position.set(Position.KEY_ALARM, Position.ALARM_GENERAL);
break;
}
@@ -1432,6 +1453,8 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
variant = Variant.OBD6;
} else if (header == 0x7878 && type == MSG_GPS_LBS_1 && length == 0x29) {
variant = Variant.WETRUST;
+ } else if (header == 0x7878 && type == MSG_ALARM && buf.getUnsignedShort(buf.readerIndex() + 4) == 0xffff) {
+ variant = Variant.JC400;
} else {
variant = Variant.STANDARD;
}
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 40f268a..9b196e5 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -18,6 +18,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
+ "78785995ffff01170719152013df0163d45f041ee52018be002f00876900004556454e545f3836323739383035303137353131325f30303030303030305f323032335f30375f32355f31385f33325f30355f31342e6d70340119d15a0d0a"),
+ Position.KEY_EVENT, 0x69);
+
+ verifyAttribute(decoder, binary(
"787829a01707150f2d0ecd01635100041e96d000087c02d4020000912e000000000718798d000e0006ed3ce50d0a"),
Position.KEY_IGNITION, false);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_71 | diff --git a/src/main/java/org/traccar/protocol/StarcomProtocolDecoder.java b/src/main/java/org/traccar/protocol/StarcomProtocolDecoder.java
index e758a8b..36d6693 100644
--- a/src/main/java/org/traccar/protocol/StarcomProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StarcomProtocolDecoder.java
@@ -76,6 +76,7 @@ public class StarcomProtocolDecoder extends BaseProtocolDecoder {
position.set(Position.KEY_EVENT, Integer.parseInt(value));
break;
case "mileage":
+ case "odometer":
position.set(Position.KEY_ODOMETER, (long) (Double.parseDouble(value) * 1000));
break;
case "satellites":
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/StarcomProtocolDecoder.java b/src/main/java/org/traccar/protocol/StarcomProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_72 | diff --git a/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java b/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java
index 4a3e21d..895c68a 100644
--- a/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java
+++ b/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java
@@ -91,7 +91,7 @@ public class GatorProtocolEncoder extends BaseProtocolEncoder {
String[] data = command.getString(Command.KEY_FREQUENCY).split(";");
content.writeShort(Integer.valueOf(data[0]));
content.writeShort(Integer.valueOf(data[1]));
- content.writeShort(Integer.valueOf(data[2]));
+ content.writeByte(Integer.valueOf(data[2]));
return encodeContent(command.getDeviceId(), GatorProtocolDecoder.MSG_POSITION_PERIODIC, content);
default:
return null;
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java b/src/main/java/org/traccar/protocol/GatorProtocolEncoder.java |
gitbug-java_data_traccar-traccar.json_73 | diff --git a/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java b/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java
index d7c236c..dd2e1db 100644
--- a/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java
@@ -205,6 +205,9 @@ public class KhdProtocolDecoder extends BaseProtocolDecoder {
}
}
break;
+ case 0x20:
+ position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte());
+ break;
case 0x23:
Network network = new Network();
int count = buf.readUnsignedByte();
diff --git a/src/test/java/org/traccar/protocol/KhdProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/KhdProtocolDecoderTest.java
index b7e8680..7cc6500 100644
--- a/src/test/java/org/traccar/protocol/KhdProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/KhdProtocolDecoderTest.java
@@ -2,6 +2,7 @@ package org.traccar.protocol;
import org.junit.jupiter.api.Test;
import org.traccar.ProtocolTest;
+import org.traccar.model.Position;
public class KhdProtocolDecoderTest extends ProtocolTest {
@@ -10,6 +11,10 @@ public class KhdProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new KhdProtocolDecoder(null));
+ verifyAttribute(decoder, binary(
+ "2929a3003e1680ba0a2304180759500000000000000000000000007b00000080001914000000000000000000162001641b0b0000249002bc58030001cc46020000e70d"),
+ Position.KEY_BATTERY_LEVEL, 100);
+
verifyPosition(decoder, binary(
"2929800028258b8c10210731035840031534240542120200000337fb000000ffff5a00000a0000000005005d0d"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java b/src/main/java/org/traccar/protocol/KhdProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_74 | diff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
index 9c749c8..5cfbb36 100644
--- a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java
@@ -178,7 +178,7 @@ public class StartekProtocolDecoder extends BaseProtocolDecoder {
position.setCourse(parser.nextInt());
position.setAltitude(parser.nextInt());
- position.set(Position.KEY_ODOMETER, parser.nextInt());
+ position.set(Position.KEY_ODOMETER, parser.nextLong());
position.setNetwork(new Network(CellTower.from(
parser.nextInt(), parser.nextInt(), parser.nextHexInt(), parser.nextHexInt(), parser.nextInt())));
diff --git a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
index 9b1362f..94b3fd2 100644
--- a/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/StartekProtocolDecoderTest.java
@@ -11,6 +11,9 @@ public class StartekProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new StartekProtocolDecoder(null));
+ verifyPosition(decoder, text(
+ "&&l141,863911061945394,000,0,,230918072531,A,22.678598,114.045970,26,0.6,0,0,74,2286304571,460|0|249F|00001093,20,001C,00,00,04A7|019C|0000|0000,1,C0"));
+
verifyAttribute(decoder, text(
"&&s148,868703050178631,000,37,,230704040211,A,22.678565,114.046011,31,0.5,0,339,77,8,460|0|249F|0AC2620D,27,0000001D,02,00,04F2|01A1|0000|0000,129,,,,949037"),
Position.KEY_HOURS, 9490000L);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java b/src/main/java/org/traccar/protocol/StartekProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_75 | diff --git a/src/main/java/org/traccar/protocol/PuiProtocolDecoder.java b/src/main/java/org/traccar/protocol/PuiProtocolDecoder.java
index a80af65..f10ff3f 100644
--- a/src/main/java/org/traccar/protocol/PuiProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/PuiProtocolDecoder.java
@@ -51,7 +51,7 @@ public class PuiProtocolDecoder extends BaseMqttProtocolDecoder {
position.setValid(true);
- DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd'T'HHmmss.SSS'Z'");
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
position.setTime(dateFormat.parse(json.getString("ts")));
JsonObject location = json.getJsonObject("location");
diff --git a/src/test/java/org/traccar/protocol/PuiProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/PuiProtocolDecoderTest.java
index 41568d0..1bbf173 100644
--- a/src/test/java/org/traccar/protocol/PuiProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/PuiProtocolDecoderTest.java
@@ -16,7 +16,7 @@ public class PuiProtocolDecoderTest extends ProtocolTest {
"123456789012345").build());
verifyPosition(decoder, MqttMessageBuilders.publish().payload(buffer(
- "{ \"id\": \"015262001044848\", \"ts\": \"20190109T021918.312Z\", \"rpt\": \"hf\", \"location\": { \"lat\": 33.91233, \"lon\": -84.20784 }, \"bear\": 70, \"spd\": 2482, \"ign\": \"on\" }")).qos(MqttQoS.EXACTLY_ONCE).messageId(1).build());
+ "{ \"id\": \"015262001044848\", \"ts\": \"2023-06-01T03:09:51.362Z\", \"rpt\": \"hf\", \"location\": { \"lat\": 33.91233, \"lon\": -84.20784 }, \"bear\": 70, \"spd\": 2482, \"ign\": \"on\" }")).qos(MqttQoS.EXACTLY_ONCE).messageId(1).build());
}
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/PuiProtocolDecoder.java b/src/main/java/org/traccar/protocol/PuiProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_76 | diff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
index beb1ec4..6e83733 100644
--- a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java
@@ -489,8 +489,22 @@ public class HuabaoProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // reserved
break;
case 0x60:
- position.set(Position.KEY_EVENT, buf.readUnsignedShort());
- buf.skipBytes(length - 2);
+ int event = buf.readUnsignedShort();
+ position.set(Position.KEY_EVENT, event);
+ if (event >= 0x0061 && event <= 0x0066) {
+ buf.skipBytes(6); // lock id
+ stringValue = buf.readCharSequence(8, StandardCharsets.US_ASCII).toString();
+ position.set(Position.KEY_DRIVER_UNIQUE_ID, stringValue);
+ }
+ break;
+ case 0x63:
+ for (int i = 1; i <= length / 11; i++) {
+ position.set("lock" + i + "Id", ByteBufUtil.hexDump(buf.readSlice(6)));
+ position.set("lock" + i + "Battery", buf.readUnsignedShort() * 0.001);
+ position.set("lock" + i + "Seal", buf.readUnsignedByte() == 0x31);
+ buf.readUnsignedByte(); // physical state
+ buf.readUnsignedByte(); // rssi
+ }
break;
case 0x69:
position.set(Position.KEY_BATTERY, buf.readUnsignedShort() * 0.01);
diff --git a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
index 9c3fc16..22c34c7 100644
--- a/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/HuabaoProtocolDecoderTest.java
@@ -11,6 +11,14 @@ public class HuabaoProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new HuabaoProtocolDecoder(null));
+ verifyAttribute(decoder, binary(
+ "7E020000C2000000001862003F0000000400108042015A322206C869480017007B012E230918081550661D01CC1A0000099DC25727B0130000099DC26B27B00100000C40F89427B0711438393836303436393130323139303037383135336A0114503FF8AF05826BC8CA24E124F732B7C780C5484D6318C0A840412262D4BCEC26CA0234CCB85455D5114F12B650FA841FBEC0B03C67A21F501CAE6C384595028DA76B010060110065000012345678903930303137333833630B0012345678900E5C3080006804000003D46902016F6D7E"),
+ Position.KEY_DRIVER_UNIQUE_ID, "\u00909001738");
+
+ verifyAttribute(decoder, binary(
+ "7e02000072440061018577001b0000100000200066005ffb8b065dc8900000000000002309080513406316cd91fe1314da1080318122c3a19a6f6f3a0fc6318113660b01fe00000a069a011704de690201a16a011f6b010a6c0f35313031303139313539323738373571143839363231303030313931353932373837353546407e"),
+ "lock2Battery", 4.038);
+
verifyNull(decoder, binary(
"7e010200204f07788ef67601824f4459344f544d314d4459774d4441314d444977626d5633553235536457786cba7e"));
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java b/src/main/java/org/traccar/protocol/HuabaoProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_77 | diff --git a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java
index 4ddea73..a1093fc 100644
--- a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java
@@ -391,7 +391,7 @@ public class T800xProtocolDecoder extends BaseProtocolDecoder {
for (int i = 1; i <= adcCount; i++) {
String value = ByteBufUtil.hexDump(buf.readSlice(2));
if (!value.equals("ffff")) {
- position.set(Position.PREFIX_ADC + i, Integer.parseInt(value) * 0.01);
+ position.set(Position.PREFIX_ADC + i, Integer.parseInt(value, 16) * 0.01);
}
}
}
diff --git a/src/test/java/org/traccar/protocol/T800xProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/T800xProtocolDecoderTest.java
index 3f62a83..468751e 100644
--- a/src/test/java/org/traccar/protocol/T800xProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/T800xProtocolDecoderTest.java
@@ -12,6 +12,9 @@ public class T800xProtocolDecoderTest extends ProtocolTest {
var decoder = inject(new T800xProtocolDecoder(null));
verifyAttributes(decoder, binary(
+ "25251300594a1b0869738060144917003c0e101e03e85a2dc8c00005070000410000000000000000000000005b000003a5b45e00230919102252e3a5094288fabfc0e98b15420000010403921352ffff0000001cffffffffff25251300594a1c0869738060144917003c0e101e03e85a2ac7c00005070000410000000000000000000000002d000003a5b48b002309191023522d320642abfebfc0e98b15420000010c03921345ffff0000001bffffffffff25251300594a1d0869738060144917003c0e101e03e85a1ac9c000050700004100000000000000000000000024000003a5b4af00230919102452b81ef9410002c0c0ec8b15420108011403911345ffff0000001dffffffffff25251300594a1e0869738060144917003c0e101e03e85a3ec7c00005070000410000000000000000000000000e000003a5b4bd002309191025060ad7ec41da02c0c0058c15420084016303921345ffff0000001cffffffffff25251300594a1f0869738060144917003c0e101e03e85a3ec7c020050700004100000000000000000000000005000003a5b4c2002309191025090e2deb410203c0c0108c15420089014303921338ffff0000001dffffffffff25251300594a200869738060144917003c0e101e03e85a1ec5c000050700004100000000000000000000000020000003a5b4e20023091910260948e1bc412205c0c0458c15420040013603921355ffff0000001bffffffffff25251300594a210869738060144917003c0e101e03e85a00c5c020050700004100000000000000000000000000000003a5b4e20023091910270948e1bc412205c0c0458c15420040013603911332ffff0000001dffffffffff"));
+
+ verifyAttributes(decoder, binary(
"272704004901380864112055585747c612230321220006000036435fc8acc2ee600f420000000000000000909019003900001356a18000012c0000a8c00000001e20d4800000c00000"));
verifyAttributes(decoder, binary(
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java b/src/main/java/org/traccar/protocol/T800xProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_78 | diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index e888642..16c1dd2 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -588,6 +588,34 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
}
index += 1;
}
+ } else if (id == 10829 || id == 10831) {
+ ByteBuf data = buf.readSlice(length);
+ data.readUnsignedByte(); // header
+ for (int i = 1; data.isReadable(); i++) {
+ ByteBuf beacon = data.readSlice(data.readUnsignedByte());
+ while (beacon.isReadable()) {
+ int parameterId = beacon.readUnsignedByte();
+ int parameterLength = beacon.readUnsignedByte();
+ switch (parameterId) {
+ case 0:
+ position.set("tag" + i + "Rssi", (int) beacon.readByte());
+ break;
+ case 1:
+ String beaconId = ByteBufUtil.hexDump(beacon.readSlice(parameterLength));
+ position.set("tag" + i + "Id", beaconId);
+ break;
+ case 13:
+ position.set("tag" + i + "LowBattery", beacon.readUnsignedByte());
+ break;
+ case 14:
+ position.set("tag" + i + "Battery", beacon.readUnsignedShort());
+ break;
+ default:
+ beacon.skipBytes(parameterLength);
+ break;
+ }
+ }
+ }
} else {
position.set(Position.PREFIX_IO + id, ByteBufUtil.hexDump(buf.readSlice(length)));
}
diff --git a/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
index 0b4f1d2..7a6bdba 100644
--- a/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/TeltonikaProtocolDecoderTest.java
@@ -16,6 +16,10 @@ public class TeltonikaProtocolDecoderTest extends ProtocolTest {
"000F313233343536373839303132333435"));
verifyAttribute(decoder, binary(
+ "000000000000004b8e010000018368952793000f0e54fc209ab05800b300b40e00002a4f0001000000000000000000012a4f001e011c0001a40110eb47706aa38255aa96f21a154e2d00550d01000e020bd6010000823f"),
+ "tag1Battery", 3030);
+
+ verifyAttribute(decoder, binary(
"00000000000000240d01060000001c642b3ad14754534c7c367c317c307c31323734393838347c317c0d0a010000ec11"),
Position.KEY_DRIVER_UNIQUE_ID, "12749884");
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_79 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index 161d04d..e9bdaf1 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -124,6 +124,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
WETRUST,
JC400,
SL4X,
+ SEEWORLD,
}
private Variant variant;
@@ -901,6 +902,20 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
}
}
+ if (type == MSG_GPS_LBS_2 && variant == Variant.SEEWORLD) {
+ position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
+ buf.readUnsignedByte(); // reporting mode
+ buf.readUnsignedByte(); // supplementary transmission
+ position.set(Position.KEY_ODOMETER, buf.readUnsignedInt());
+ buf.readUnsignedInt(); // travel time
+ int temperature = buf.readUnsignedShort();
+ if (BitUtil.check(temperature, 15)) {
+ temperature = -BitUtil.to(temperature, 15);
+ }
+ position.set(Position.PREFIX_TEMP + 1, temperature * 0.01);
+ position.set("humidity", buf.readUnsignedShort() * 0.01);
+ }
+
if ((type == MSG_GPS_LBS_2 || type == MSG_GPS_LBS_3 || type == MSG_GPS_LBS_4)
&& buf.readableBytes() >= 3 + 6) {
position.set(Position.KEY_IGNITION, buf.readUnsignedByte() > 0);
@@ -1468,6 +1483,8 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
variant = Variant.JC400;
} else if (header == 0x7878 && type == MSG_LBS_3 && length == 0x37) {
variant = Variant.SL4X;
+ } else if (header == 0x7878 && type == MSG_GPS_LBS_2 && length == 0x2f) {
+ variant = Variant.SEEWORLD;
} else {
variant = Variant.STANDARD;
}
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 9b196e5..a2ee4d1 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -18,6 +18,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
+ "78782f22170a020b2737cf02c568a8089fc0dc125c4d01369a371b0a6967020000000007327a00000000001500260074544c0d0a"),
+ "humidity", 53.76);
+
+ verifyAttribute(decoder, binary(
"78785995ffff01170719152013df0163d45f041ee52018be002f00876900004556454e545f3836323739383035303137353131325f30303030303030305f323032335f30375f32355f31385f33325f30355f31342e6d70340119d15a0d0a"),
Position.KEY_EVENT, 0x69);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_80 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index e9bdaf1..f676e73 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -358,7 +358,7 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
long cid;
if (type == MSG_LBS_ALARM || type == MSG_GPS_LBS_7) {
cid = buf.readLong();
- } else if (type == MSG_GPS_LBS_6) {
+ } else if (type == MSG_GPS_LBS_6 || variant == Variant.SEEWORLD) {
cid = buf.readUnsignedInt();
} else {
cid = buf.readUnsignedMedium();
@@ -1485,6 +1485,8 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
variant = Variant.SL4X;
} else if (header == 0x7878 && type == MSG_GPS_LBS_2 && length == 0x2f) {
variant = Variant.SEEWORLD;
+ } else if (header == 0x7878 && type == MSG_GPS_LBS_STATUS_1 && length == 0x26) {
+ variant = Variant.SEEWORLD;
} else {
variant = Variant.STANDARD;
}
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index a2ee4d1..d573957 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -18,8 +18,8 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
- "78782f22170a020b2737cf02c568a8089fc0dc125c4d01369a371b0a6967020000000007327a00000000001500260074544c0d0a"),
- "humidity", 53.76);
+ "78782f221709130f3a32cc02c55f2a089f9afc005c2101360481fe066d9b03000000000025d4000000000020002d036049d70d0a"),
+ Position.PREFIX_TEMP + 1, 0.32);
verifyAttribute(decoder, binary(
"78785995ffff01170719152013df0163d45f041ee52018be002f00876900004556454e545f3836323739383035303137353131325f30303030303030305f323032335f30375f32355f31385f33325f30355f31342e6d70340119d15a0d0a"),
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_traccar-traccar.json_81 | diff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
index f676e73..cf7cd12 100644
--- a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java
@@ -841,7 +841,8 @@ public class Gt06ProtocolDecoder extends BaseProtocolDecoder {
buf.readUnsignedByte(); // working mode
position.set(Position.KEY_POWER, buf.readUnsignedShort() / 100.0);
} else {
- position.set(Position.KEY_BATTERY_LEVEL, buf.readUnsignedByte() * 100 / 6);
+ int battery = buf.readUnsignedByte();
+ position.set(Position.KEY_BATTERY_LEVEL, battery <= 6 ? battery * 100 / 6 : battery);
position.set(Position.KEY_RSSI, buf.readUnsignedByte());
short alarmExtension = buf.readUnsignedByte();
if (variant != Variant.VXT01) {
diff --git a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
index 8e60fb3..be8f4f5 100644
--- a/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
+++ b/src/test/java/org/traccar/protocol/Gt06ProtocolDecoderTest.java
@@ -18,6 +18,10 @@ public class Gt06ProtocolDecoderTest extends ProtocolTest {
"78780D01086471700328358100093F040D0A"));
verifyAttribute(decoder, binary(
+ "78782616170A080C0E24C0027C58AD0C2B8B0100454E0901CC0025030328E7A0005D4B13021EC373170D0A"),
+ Position.KEY_BATTERY_LEVEL, 93);
+
+ verifyAttribute(decoder, binary(
"787826161709130f3a2dcc02c55f2a089f9af9005c210901360481fe066d9b03413e420102035f92fe0d0a"),
Position.KEY_ALARM, Position.ALARM_SOS);
| https://github.com/traccar/traccar.gitdiff --git a/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java b/src/main/java/org/traccar/protocol/Gt06ProtocolDecoder.java |
gitbug-java_data_slub-urnlib.json_1 | diff --git a/src/main/java/de/slub/urn/RQF_RFC8141.java b/src/main/java/de/slub/urn/RQF_RFC8141.java
index 02a0df4..0915cea 100644
--- a/src/main/java/de/slub/urn/RQF_RFC8141.java
+++ b/src/main/java/de/slub/urn/RQF_RFC8141.java
@@ -17,11 +17,13 @@
package de.slub.urn;
+import static java.util.Collections.EMPTY_MAP;
+
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
-import static java.util.Collections.EMPTY_MAP;
-
/**
* Class for representing and parsing optional resolution, query and fragment components
* and making them accessible via unmodifiable maps.
@@ -92,15 +94,19 @@ public final class RQF_RFC8141 {
StringBuilder sb = new StringBuilder();
if (!resolutionParameters.isEmpty()) {
sb.append("?+");
+ final List<String> acc = new ArrayList<>();
for (Map.Entry<String, String> kv : resolutionParameters.entrySet()) {
- sb.append(kv.getKey()).append('=').append(kv.getValue());
+ acc.add(kv.getKey() + "=" + kv.getValue());
}
+ sb.append(String.join("&", acc));
}
if (!queryParameters.isEmpty()) {
sb.append("?=");
+ final List<String> acc = new ArrayList<>();
for (Map.Entry<String, String> kv : queryParameters.entrySet()) {
- sb.append(kv.getKey()).append('=').append(kv.getValue());
+ acc.add(kv.getKey() + "=" + kv.getValue());
}
+ sb.append(String.join("&", acc));
}
if (!fragment.isEmpty()) {
sb.append('#').append(fragment);
diff --git a/src/test/java/de/slub/urn/RQFRFC8141Test.java b/src/test/java/de/slub/urn/RQFRFC8141Test.java
index 15c7976..ee846f6 100644
--- a/src/test/java/de/slub/urn/RQFRFC8141Test.java
+++ b/src/test/java/de/slub/urn/RQFRFC8141Test.java
@@ -17,14 +17,16 @@
package de.slub.urn;
-import org.junit.Test;
-
-import java.util.Collections;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
public class RQFRFC8141Test {
@Test
@@ -65,4 +67,35 @@ public class RQFRFC8141Test {
new RQF_RFC8141(Collections.EMPTY_MAP, Collections.EMPTY_MAP, null);
}
+
+ @Test
+ public void ToString_With_Parameters_And_Fragment() {
+ Map<String, String> resolutionParameters = new HashMap<>();
+ resolutionParameters.put("resolutionParameter0", "foo0");
+ resolutionParameters.put("resolutionParameter1", "foo1");
+ Map<String, String> queryParameters = new HashMap<>();
+ queryParameters.put("queryParameter0", "bar0");
+ queryParameters.put("queryParameters1", "bar1");
+ String fragment = "fragment0";
+ RQF_RFC8141 urn = new RQF_RFC8141(resolutionParameters, queryParameters, fragment);
+ String expected = "?+resolutionParameter1=foo1&resolutionParameter0=foo0?=queryParameter0=bar0&queryParameters1=bar1#fragment0";
+
+ String actual = urn.toString();
+
+ assertEquals(actual, expected);
+ }
+
+ @Test
+ public void ToString_Without_Parameter_And_Fragment() {
+ Map<String, String> resolutionParameters = new HashMap<>();
+ Map<String, String> queryParameters = new HashMap<>();
+ String fragment = "";
+ RQF_RFC8141 urn = new RQF_RFC8141(resolutionParameters, queryParameters, fragment);
+ String expected = "";
+
+ String actual = urn.toString();
+
+ assertEquals(actual, expected);
+ }
+
}
\ No newline at end of file
| https://github.com/slub/urnlib.gitdiff --git a/src/main/java/de/slub/urn/RQF_RFC8141.java b/src/main/java/de/slub/urn/RQF_RFC8141.java |
gitbug-java_data_bhlangonijr-chesslib.json_1 | diff --git a/src/main/java/com/github/bhlangonijr/chesslib/pgn/GameLoader.java b/src/main/java/com/github/bhlangonijr/chesslib/pgn/GameLoader.java
index d0df22d..502e055 100644
--- a/src/main/java/com/github/bhlangonijr/chesslib/pgn/GameLoader.java
+++ b/src/main/java/com/github/bhlangonijr/chesslib/pgn/GameLoader.java
@@ -51,6 +51,10 @@ public class GameLoader {
*/
public static Game loadNextGame(Iterator<String> iterator) {
+ if (!iterator.hasNext()) {
+ return null;
+ }
+
PgnTempContainer container = new PgnTempContainer();
while (iterator.hasNext()) {
@@ -65,10 +69,8 @@ public class GameLoader {
} else if (!line.equals("") && container.moveText != null) {
addMoveText(line, container);
if (isEndGame(line)) {
- if (container.game != null) {
- setMoveText(container.game, container.moveText);
- }
- return container.game;
+ setMoveText(container.game, container.moveText);
+ return container.initGame ? container.game : null;
}
}
} catch (Exception e) { //TODO stricter exceptions
@@ -77,7 +79,7 @@ public class GameLoader {
throw new PgnException("Error parsing PGN[" + r + ", " + name + "]: ", e);
}
}
- return container.game;
+ return container.initGame ? container.game : null;
}
private static void addProperty(String line, PgnTempContainer container) throws Exception {
@@ -85,11 +87,12 @@ public class GameLoader {
if (property == null) {
return;
}
+ container.initGame = true;
String tag = property.name.toLowerCase().trim();
//begin
switch (tag) {
case "event":
- if (container.moveTextParsing && container.game != null && container.game.getHalfMoves().size() == 0) {
+ if (container.moveTextParsing && container.game.getHalfMoves().size() == 0) {
setMoveText(container.game, container.moveText);
}
container.event.setName(property.value);
@@ -118,11 +121,9 @@ public class GameLoader {
if (container.round.getNumber() < 1) {
container.round.setNumber(1); //TODO this is just to have the same behaviour as before...
}
- if (container.game == null) {
- container.game = GameFactory.newGame(UUID.randomUUID().toString(), container.round);
- container.game.setDate(container.event.getStartDate());
- container.round.getGame().add(container.game);
- }
+
+ container.game.setDate(container.event.getStartDate()); //TODO this should be done only once
+
Player player = GameFactory.newPlayer(PlayerType.HUMAN, property.value);
player.setId(property.value);
@@ -137,11 +138,9 @@ public class GameLoader {
if (container.round.getNumber() < 1) {
container.round.setNumber(1); //TODO this just to have the same behaviour as before...
}
- if (container.game == null) {
- container.game = GameFactory.newGame(UUID.randomUUID().toString(), container.round);
- container.game.setDate(container.event.getStartDate());
- container.round.getGame().add(container.game);
- }
+
+ container.game.setDate(container.event.getStartDate()); //TODO this should be done only once
+
Player player = GameFactory.newPlayer(PlayerType.HUMAN, property.value);
player.setId(property.value);
player.setDescription(property.value);
@@ -151,23 +150,16 @@ public class GameLoader {
break;
}
case "result":
- if (container.game != null) {
- GameResult result = GameResult.fromNotation(property.value);
- container.game.setResult(result);
- }
+ container.game.setResult(GameResult.fromNotation(property.value));
break;
case "plycount":
- if (container.game != null) {
- container.game.setPlyCount(property.value);
- }
+ container.game.setPlyCount(property.value);
break;
case "termination":
- if (container.game != null) {
- try {
- container.game.setTermination(Termination.fromValue(property.value.toUpperCase()));
- } catch (Exception e1) {
- container.game.setTermination(Termination.UNTERMINATED);
- }
+ try {
+ container.game.setTermination(Termination.fromValue(property.value.toUpperCase()));
+ } catch (Exception e1) {
+ container.game.setTermination(Termination.UNTERMINATED);
}
break;
case "timecontrol":
@@ -180,29 +172,19 @@ public class GameLoader {
}
break;
case "annotator":
- if (container.game != null) {
- container.game.setAnnotator(property.value);
- }
+ container.game.setAnnotator(property.value);
break;
case "fen":
- if (container.game != null) {
- container.game.setFen(property.value);
- }
+ container.game.setFen(property.value);
break;
case "eco":
- if (container.game != null) {
- container.game.setEco(property.value);
- }
+ container.game.setEco(property.value);
break;
case "opening":
- if (container.game != null) {
- container.game.setOpening(property.value);
- }
+ container.game.setOpening(property.value);
break;
case "variation":
- if (container.game != null) {
- container.game.setVariation(property.value);
- }
+ container.game.setVariation(property.value);
break;
case "whiteelo":
if (container.whitePlayer != null) {
@@ -223,17 +205,16 @@ public class GameLoader {
}
break;
default:
- if (container.game != null) {
- if (container.game.getProperty() == null) {
- container.game.setProperty(new HashMap<String, String>());
- }
- container.game.getProperty().put(property.name, property.value);
+ if (container.game.getProperty() == null) {
+ container.game.setProperty(new HashMap<>());
}
+ container.game.getProperty().put(property.name, property.value);
break;
}
}
private static void addMoveText(String line, PgnTempContainer container) {
+ container.initGame = true;
container.moveText.append(line);
container.moveText.append('\n');
container.moveTextParsing = true;
@@ -245,15 +226,21 @@ public class GameLoader {
private static class PgnTempContainer {
- Event event = new Event();
- Round round = new Round(event);
+ Event event;
+ Round round;
Game game;
Player whitePlayer;
Player blackPlayer;
StringBuilder moveText;
boolean moveTextParsing;
+ boolean initGame;
- PgnTempContainer() {}
+ PgnTempContainer() {
+ this.event = new Event();
+ this.round = new Round(event);
+ this.game = new Game(UUID.randomUUID().toString(), round);
+ this.round.getGame().add(this.game);
+ }
}
private static void setMoveText(Game game, StringBuilder moveText) throws Exception {
diff --git a/src/test/java/com/github/bhlangonijr/chesslib/PgnIteratorTest.java b/src/test/java/com/github/bhlangonijr/chesslib/PgnIteratorTest.java
index e140419..d36007a 100644
--- a/src/test/java/com/github/bhlangonijr/chesslib/PgnIteratorTest.java
+++ b/src/test/java/com/github/bhlangonijr/chesslib/PgnIteratorTest.java
@@ -30,7 +30,7 @@ public class PgnIteratorTest {
assertEquals("1951.06.20", game.getDate());
//assertEquals("1951.??.??", game.getRound().getEvent().getStartDate());
assertEquals(9, game.getRound().getNumber());
- //assertEquals(GameResult.WHITE_WON, game.getResult()); //TODO this is the issue
+ assertEquals(GameResult.WHITE_WON, game.getResult()); //TODO this is the issue
assertEquals("Bent Larsen", game.getWhitePlayer().getName());
assertEquals("Lionel Joyner", game.getBlackPlayer().getName());
assertEquals("C30", game.getEco());
| https://github.com/bhlangonijr/chesslib.gitdiff --git a/src/main/java/com/github/bhlangonijr/chesslib/pgn/GameLoader.java b/src/main/java/com/github/bhlangonijr/chesslib/pgn/GameLoader.java |
gitbug-java_data_vmzakharov-dataframe-ec.json_1 | diff --git a/src/main/java/io/github/vmzakharov/ecdataframe/dsl/value/StringValue.java b/src/main/java/io/github/vmzakharov/ecdataframe/dsl/value/StringValue.java
index c2ee8fc..8ff1213 100644
--- a/src/main/java/io/github/vmzakharov/ecdataframe/dsl/value/StringValue.java
+++ b/src/main/java/io/github/vmzakharov/ecdataframe/dsl/value/StringValue.java
@@ -30,7 +30,7 @@ extends AbstractValue
@Override
public String asStringLiteral()
{
- return '"' + this.value + '"';
+ return this.value.indexOf('\"') == -1 ? '"' + this.value + '"' : '\'' + this.value + '\'';
}
@Override
diff --git a/src/test/java/io/github/vmzakharov/ecdataframe/ScriptFromStringTest.java b/src/test/java/io/github/vmzakharov/ecdataframe/ScriptFromStringTest.java
index 4fd6e45..61311b7 100644
--- a/src/test/java/io/github/vmzakharov/ecdataframe/ScriptFromStringTest.java
+++ b/src/test/java/io/github/vmzakharov/ecdataframe/ScriptFromStringTest.java
@@ -173,4 +173,16 @@ public class ScriptFromStringTest
Assert.assertEquals(1, ((LongValue) result).longValue());
}
+ @Test
+ public void scriptWithMixedQuotes()
+ {
+ String scriptText =
+ "x = 'ba\"r'\n"
+ + "x in (\"qux\", 'ba\"r', 'baz', \"wal'do\")";
+
+ AnonymousScript script = ExpressionTestUtil.toScript(scriptText);
+ Value result = script.evaluate(new InMemoryEvaluationVisitor());
+ Assert.assertTrue(result.isBoolean());
+ Assert.assertTrue(((BooleanValue) result).isTrue());
+ }
}
diff --git a/src/test/java/io/github/vmzakharov/ecdataframe/StandaloneExpressionFromStringTest.java b/src/test/java/io/github/vmzakharov/ecdataframe/StandaloneExpressionFromStringTest.java
index f900bd9..7afefb4 100644
--- a/src/test/java/io/github/vmzakharov/ecdataframe/StandaloneExpressionFromStringTest.java
+++ b/src/test/java/io/github/vmzakharov/ecdataframe/StandaloneExpressionFromStringTest.java
@@ -105,6 +105,7 @@ public class StandaloneExpressionFromStringTest
Assert.assertTrue(ExpressionTestUtil.evaluateToBoolean("\"foo\" in (\"foo\", \"bar\", \"baz\")"));
Assert.assertFalse(ExpressionTestUtil.evaluateToBoolean("\"foo\" in (\"qux\", \"bar\", \"baz\")"));
Assert.assertFalse(ExpressionTestUtil.evaluateToBoolean("'foo' in ('qux', 'bar', 'baz')"));
+ Assert.assertFalse(ExpressionTestUtil.evaluateToBoolean("'foo' in (\"qux\", 'ba\"r', 'baz', \"wal'do\")"));
Assert.assertTrue(ExpressionTestUtil.evaluateToBoolean("123 in (456, 567, 123)"));
Assert.assertFalse(ExpressionTestUtil.evaluateToBoolean("123 in (456, 567, 789)"));
Assert.assertFalse(ExpressionTestUtil.evaluateToBoolean("123 in ()"));
diff --git a/src/test/java/io/github/vmzakharov/ecdataframe/dsl/PrettyPrintingTest.java b/src/test/java/io/github/vmzakharov/ecdataframe/dsl/PrettyPrintingTest.java
index e6fb679..95eca01 100644
--- a/src/test/java/io/github/vmzakharov/ecdataframe/dsl/PrettyPrintingTest.java
+++ b/src/test/java/io/github/vmzakharov/ecdataframe/dsl/PrettyPrintingTest.java
@@ -160,6 +160,17 @@ public class PrettyPrintingTest
}
@Test
+ public void nestedQuotes()
+ {
+ String expressionAsString = "'foo' in (\"qux\", 'ba\"r', 'baz', \"wal'do\")";
+ Expression expression = ExpressionTestUtil.toExpression(expressionAsString);
+
+ String result = PrettyPrintVisitor.exprToString(expression);
+
+ Assert.assertEquals("(\"foo\" in (\"qux\", 'ba\"r', \"baz\", \"wal'do\"))", result);
+ }
+
+ @Test
public void expressionToString()
{
String expressionAsString = "(1 + 2)/ (7.0 +9)";
| https://github.com/vmzakharov/dataframe-ec.gitdiff --git a/src/main/java/io/github/vmzakharov/ecdataframe/dsl/value/StringValue.java b/src/main/java/io/github/vmzakharov/ecdataframe/dsl/value/StringValue.java |
gitbug-java_data_vmzakharov-dataframe-ec.json_2 | diff --git a/src/main/java/io/github/vmzakharov/ecdataframe/dataframe/compare/ComparisonResult.java b/src/main/java/io/github/vmzakharov/ecdataframe/dataframe/compare/ComparisonResult.java
index 9558912..af740c8 100644
--- a/src/main/java/io/github/vmzakharov/ecdataframe/dataframe/compare/ComparisonResult.java
+++ b/src/main/java/io/github/vmzakharov/ecdataframe/dataframe/compare/ComparisonResult.java
@@ -48,12 +48,12 @@ abstract public class ComparisonResult
public boolean leftIsNull()
{
- return this.nullSide == LEFT_NULL;
+ return this.nullSide == LEFT_NULL || this.nullSide == BOTH_NULLS;
}
public boolean rightIsNull()
{
- return this.nullSide == RIGHT_NULL;
+ return this.nullSide == RIGHT_NULL || this.nullSide == BOTH_NULLS;
}
public boolean noNulls()
@@ -66,7 +66,7 @@ abstract public class ComparisonResult
return this.nullSide;
}
- public void nullSide(NullSide newNullSide)
+ private void nullSide(NullSide newNullSide)
{
this.nullSide = newNullSide;
}
diff --git a/src/test/java/io/github/vmzakharov/ecdataframe/dataframe/DfColumnCompareTest.java b/src/test/java/io/github/vmzakharov/ecdataframe/dataframe/DfColumnCompareTest.java
index ab0e763..560edf7 100644
--- a/src/test/java/io/github/vmzakharov/ecdataframe/dataframe/DfColumnCompareTest.java
+++ b/src/test/java/io/github/vmzakharov/ecdataframe/dataframe/DfColumnCompareTest.java
@@ -178,8 +178,16 @@ public class DfColumnCompareTest
DfCellComparator col1Comparator = df1.columnComparator(df2, "col1", "col1");
Assert.assertTrue(col1Comparator.compare(0, 0).rightIsNull());
+ Assert.assertFalse(col1Comparator.compare(0, 0).leftIsNull());
+ Assert.assertFalse(col1Comparator.compare(0, 0).noNulls());
+
Assert.assertTrue(col1Comparator.compare(1, 1).leftIsNull());
+
Assert.assertTrue(col1Comparator.compare(2, 2).bothAreNulls());
+ Assert.assertTrue(col1Comparator.compare(2, 2).rightIsNull());
+ Assert.assertTrue(col1Comparator.compare(2, 2).leftIsNull());
+ Assert.assertFalse(col1Comparator.compare(2, 2).noNulls());
+
Assert.assertTrue(col1Comparator.compare(3, 3).noNulls());
DfCellComparator col2Comparator = df1.columnComparator(df2, "col2", "number");
| https://github.com/vmzakharov/dataframe-ec.gitdiff --git a/src/main/java/io/github/vmzakharov/ecdataframe/dataframe/compare/ComparisonResult.java b/src/main/java/io/github/vmzakharov/ecdataframe/dataframe/compare/ComparisonResult.java |
gitbug-java_data_LMAX-Exchange-Simple-DSL.json_1 | diff --git a/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java b/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java
index 45fdbb9..b9af1f9 100644
--- a/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java
+++ b/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java
@@ -29,6 +29,7 @@ import java.util.Deque;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.regex.Pattern;
/**
* Parser for transforming a specification of {@link DslArg DslArgs} and a set of provided {@link String} values into
@@ -215,7 +216,7 @@ public class DslParamsParser
{
if (arg.isAllowMultipleValues())
{
- final String[] vals = value.split(arg.getMultipleValueSeparator());
+ final String[] vals = value.split(Pattern.quote(arg.getMultipleValueSeparator()));
for (final String singleValue : vals)
{
addSingleValue(arg, singleValue.trim(), values);
diff --git a/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java b/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java
index 1d890b1..ca51a9f 100644
--- a/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java
+++ b/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java
@@ -226,6 +226,25 @@ class DslParamsParserTest
}
@Test
+ public void shouldBeAbleToExtractMultipleValuesForOneParameterUsingTheACustomSeparatorAndIgnoreRegex()
+ {
+ final String[] args = {"a=1", "b=2,00.3,00", "c=4[a-z]5"};
+ final DslArg[] parameters = {
+ new RequiredArg("a"),
+ new RequiredArg("b").setAllowMultipleValues("."),
+ new RequiredArg("c").setAllowMultipleValues("[a-z]")
+ };
+
+ final DslParamsParser parser = new DslParamsParser();
+
+ final DslParams params = parser.parse(args, parameters);
+
+ assertEquals("1", params.value("a"));
+ assertArrayEquals(new String[]{"2,00", "3,00"}, params.values("b"));
+ assertArrayEquals(new String[]{"4", "5"}, params.values("c"));
+ }
+
+ @Test
public void shouldBeAbleToExtractMultipleRequiredArgsWhenSubsequentRequiredArgsAreNotNamed()
{
final String[] args = {"a=1", "b=2", "3", "c=4"};
| https://github.com/LMAX-Exchange/Simple-DSL.gitdiff --git a/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java b/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java |
gitbug-java_data_LMAX-Exchange-Simple-DSL.json_2 | diff --git a/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java b/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java
index f8a2631..45fdbb9 100644
--- a/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java
+++ b/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java
@@ -312,8 +312,7 @@ public class DslParamsParser
break;
}
- checkValidValue(arg, argument.value);
- argValues.add(argument.value);
+ SimpleArgumentProcessor.addValue(arg, argument.value, argValues);
arguments.pollFirst();
}
diff --git a/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java b/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java
index 4353656..1d890b1 100644
--- a/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java
+++ b/src/test/java/com/lmax/simpledsl/internal/DslParamsParserTest.java
@@ -22,7 +22,6 @@ import com.lmax.simpledsl.api.OptionalArg;
import com.lmax.simpledsl.api.RepeatingArgGroup;
import com.lmax.simpledsl.api.RepeatingGroup;
import com.lmax.simpledsl.api.RequiredArg;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -491,7 +490,6 @@ class DslParamsParserTest
}
@Test
- @Disabled("Doesn't work?")
public void shouldBeAbleToSpecifyMultipleValuesForParamInGroupUsingTheDefaultSeparator()
{
final String[] args = {"a: value", "group: Joe", "group: Jenny", "value: 1, 2"};
@@ -518,7 +516,6 @@ class DslParamsParserTest
}
@Test
- @Disabled("Doesn't work?")
public void shouldBeAbleToSpecifyMultipleValuesForParamInGroupUsingACustomSeparator()
{
final String[] args = {"a: value", "group: Joe", "group: Jenny", "value: 1;2"};
@@ -626,6 +623,28 @@ class DslParamsParserTest
}
@Test
+ public void shouldMatchAllowedValuesCaseInsensitivelyAndReturnValuesUsingTheCaseProvidedInTheDSLWithinRepeatingGroups()
+ {
+ final String[] args = {"a: value", "myGroup: joe", "myValue: a"};
+ final DslArg[] parameters = {
+ new RequiredArg("a"),
+ new RepeatingArgGroup(
+ new RequiredArg("myGroup").setAllowedValues("Joe", "Jenny"),
+ new RequiredArg("myValue").setAllowedValues("A", "B"))
+ };
+
+ final DslParamsParser parser = new DslParamsParser();
+
+ final DslParams params = parser.parse(args, parameters);
+
+ assertEquals("value", params.value("a"));
+ final RepeatingGroup[] groups = params.valuesAsGroup("myGroup");
+ assertEquals(1, groups.length);
+ assertEquals("Joe", groups[0].value("myGroup"));
+ assertEquals("A", groups[0].value("myValue"));
+ }
+
+ @Test
public void shouldMatchAllowedValuesSpecifiedViaABoolean()
{
final String[] args = {
@@ -771,6 +790,26 @@ class DslParamsParserTest
}
@Test
+ public void shouldThrowAnExceptionIfInvalidParameterValueIsSpecifiedInRepeatingGroupIdentity()
+ {
+ final String[] args = {"a: value", "myGroup: Joe", "myValue: 1"};
+ final DslArg[] parameters = {
+ new RequiredArg("a"),
+ new RepeatingArgGroup(
+ new RequiredArg("myGroup").setAllowedValues("A", "B"),
+ new RequiredArg("myValue"))
+ };
+
+ final DslParamsParser parser = new DslParamsParser();
+
+ final IllegalArgumentException exception = assertThrows(
+ IllegalArgumentException.class,
+ () -> parser.parse(args, parameters));
+
+ assertEquals("myGroup parameter value 'Joe' must be one of: [A, B]", exception.getMessage());
+ }
+
+ @Test
public void shouldThrowAnExceptionWhenMissingAValueForARequiredArg()
{
final String[] args = {"a=1"};
| https://github.com/LMAX-Exchange/Simple-DSL.gitdiff --git a/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java b/src/main/java/com/lmax/simpledsl/internal/DslParamsParser.java |
gitbug-java_data_GoSimpleLLC-nbvcxz.json_1 | diff --git a/src/main/java/me/gosimple/nbvcxz/matching/DictionaryMatcher.java b/src/main/java/me/gosimple/nbvcxz/matching/DictionaryMatcher.java
index fab3689..17daaaa 100644
--- a/src/main/java/me/gosimple/nbvcxz/matching/DictionaryMatcher.java
+++ b/src/main/java/me/gosimple/nbvcxz/matching/DictionaryMatcher.java
@@ -298,27 +298,29 @@ public final class DictionaryMatcher implements PasswordMatcher
}
// Only do unleet if it's different than the regular lower.
- final List<String> unleet_list = translateLeet(configuration, lower_part);
- for (final String unleet_part : unleet_list)
+ if (dictionary.getMaxLength() > split_password.length())
{
- final Integer unleet_rank = dictionary.getDictonary().get(unleet_part);
- if (unleet_rank != null)
+ final List<String> unleet_list = translateLeet(configuration, lower_part);
+ for (final String unleet_part : unleet_list)
{
- final List<Character[]> subs = getLeetSub(lower_part, unleet_part);
- matches.add(new DictionaryMatch(split_password, configuration, start, end - 1, unleet_part, unleet_rank, subs, dictionary.isExclusion(), false, dictionary.getDictionaryName(), 0));
- continue;
- }
-
- // Only do reversed if it's different than unleet.
- final String reversed_unleet_part = new StringBuilder(unleet_part).reverse().toString();
- {
- final Integer reversed_unleet_rank = dictionary.getDictonary().get(reversed_unleet_part);
- if (reversed_unleet_rank != null)
+ final Integer unleet_rank = dictionary.getDictonary().get(unleet_part);
+ if (unleet_rank != null)
{
- final List<Character[]> subs = getLeetSub(reversed_part, reversed_unleet_part);
- matches.add(new DictionaryMatch(split_password, configuration, start, end - 1, reversed_unleet_part, reversed_unleet_rank, subs, dictionary.isExclusion(), true, dictionary.getDictionaryName(), 0));
+ final List<Character[]> subs = getLeetSub(lower_part, unleet_part);
+ matches.add(new DictionaryMatch(split_password, configuration, start, end - 1, unleet_part, unleet_rank, subs, dictionary.isExclusion(), false, dictionary.getDictionaryName(), 0));
continue;
}
+
+ // Only do reversed if it's different than unleet.
+ final String reversed_unleet_part = new StringBuilder(unleet_part).reverse().toString();
+ {
+ final Integer reversed_unleet_rank = dictionary.getDictonary().get(reversed_unleet_part);
+ if (reversed_unleet_rank != null)
+ {
+ final List<Character[]> subs = getLeetSub(reversed_part, reversed_unleet_part);
+ matches.add(new DictionaryMatch(split_password, configuration, start, end - 1, reversed_unleet_part, reversed_unleet_rank, subs, dictionary.isExclusion(), true, dictionary.getDictionaryName(), 0));
+ }
+ }
}
}
diff --git a/src/main/java/me/gosimple/nbvcxz/resources/ConfigurationBuilder.java b/src/main/java/me/gosimple/nbvcxz/resources/ConfigurationBuilder.java
index 4fd9616..c76eea0 100644
--- a/src/main/java/me/gosimple/nbvcxz/resources/ConfigurationBuilder.java
+++ b/src/main/java/me/gosimple/nbvcxz/resources/ConfigurationBuilder.java
@@ -204,11 +204,12 @@ public class ConfigurationBuilder
}
/**
- * @return The default value for max length is 72.
+ * @return The default value for max length is 256.
+ * This should match the exact length your algorithm is limited to (72 for most bcrypt implementations).
*/
public static int getDefaultMaxLength()
{
- return 72;
+ return 256;
}
/**
@@ -349,6 +350,10 @@ public class ConfigurationBuilder
* Information will be available in the Result if the password was longer
* than maxLength.
*
+ * This should match the exact length your algorithm is limited to (72 for most bcrypt implementations).
+ * If you arbitrarily limit the input for passwords, ensure the passed in value is either already truncated to
+ * the correct length, or this value is set to the same length you will truncate to.
+ *
* @param maxLength Value for maxLength (should be a positive value)
* @return Builder
*/
diff --git a/src/main/java/me/gosimple/nbvcxz/resources/Dictionary.java b/src/main/java/me/gosimple/nbvcxz/resources/Dictionary.java
index c84b6bf..2e44f04 100644
--- a/src/main/java/me/gosimple/nbvcxz/resources/Dictionary.java
+++ b/src/main/java/me/gosimple/nbvcxz/resources/Dictionary.java
@@ -17,6 +17,7 @@ public class Dictionary
private final ArrayList<String> sorted_dictionary;
private final Map<Integer, Integer> sorted_dictionary_length_lookup;
private final boolean exclusion;
+ private final int max_length;
/**
@@ -57,7 +58,7 @@ public class Dictionary
sorted_dictionary_length_lookup.put(key.length(), i);
}
}
-
+ int i_max_length = 0;
for (int i = 0; i < sorted_dictionary_length_lookup.size(); i++)
{
if (!sorted_dictionary_length_lookup.containsKey(i))
@@ -69,7 +70,9 @@ public class Dictionary
}
sorted_dictionary_length_lookup.put(i, sorted_dictionary_length_lookup.get(next_key));
}
+ i_max_length = i;
}
+ max_length = i_max_length;
}
/**
@@ -123,4 +126,12 @@ public class Dictionary
{
return this.dictionary_name;
}
+
+ /**
+ * The longest length of an entry we should check with this dictionary
+ * @return the longest value this dictionary contains
+ */
+ public int getMaxLength() {
+ return max_length;
+ }
}
diff --git a/src/test/java/me/gosimple/nbvcxz/NbvcxzTest.java b/src/test/java/me/gosimple/nbvcxz/NbvcxzTest.java
index d14eae8..24b800d 100644
--- a/src/test/java/me/gosimple/nbvcxz/NbvcxzTest.java
+++ b/src/test/java/me/gosimple/nbvcxz/NbvcxzTest.java
@@ -48,7 +48,7 @@ public class NbvcxzTest
for (final EntropyTest test : tests)
{
test.run();
- Assert.assertEquals(test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
+ Assert.assertEquals(test.getPassword(), test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
}
}
catch (Exception e)
@@ -77,7 +77,7 @@ public class NbvcxzTest
for (final EntropyTest test : tests)
{
test.run();
- Assert.assertEquals(test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
+ Assert.assertEquals(test.getPassword(), test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
}
}
catch (Exception e)
@@ -115,14 +115,14 @@ public class NbvcxzTest
tests.add(new EntropyTest(nbvcxz,"A Fool and His Money Are Soon Parted",84.88322715518174D));
tests.add(new EntropyTest(nbvcxz,"6c891879ed0a0bbf701d5ca8af39a766",124.22235013869417D));
tests.add(new EntropyTest(nbvcxz,"ef00623ced862e84ea15a6f97cb3fbb9f177bd6f23e54459a96ca5926c28c653",247.06618865413472D));
- tests.add(new EntropyTest(nbvcxz,"shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password",132.95506049872384D));
+ tests.add(new EntropyTest(nbvcxz,"shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password",360.5676147181065D));
try
{
for (final EntropyTest test : tests)
{
test.run();
- Assert.assertEquals(test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
+ Assert.assertEquals(test.getPassword(), test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
}
}
catch (Exception e)
@@ -159,7 +159,7 @@ public class NbvcxzTest
tests.add(new EntropyTest(nbvcxz,"A Fool and His Money Are Soon Parted",84.88322715518174D));
tests.add(new EntropyTest(nbvcxz,"6c891879ed0a0bbf701d5ca8af39a766",124.22235013869417D));
tests.add(new EntropyTest(nbvcxz,"ef00623ced862e84ea15a6f97cb3fbb9f177bd6f23e54459a96ca5926c28c653",247.06618865413472D));
- tests.add(new EntropyTest(nbvcxz,"shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password",132.95506049872384D));
+ tests.add(new EntropyTest(nbvcxz,"shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password_shortened_password",360.5676147181065D));
List<Future> futures = new ArrayList<>();
try
@@ -179,7 +179,7 @@ public class NbvcxzTest
// Check results
for (final EntropyTest test : tests)
{
- Assert.assertEquals(test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
+ Assert.assertEquals(test.getPassword(), test.getExpectedEntropy(), test.getEntropy(), test.getDelta());
}
}
catch (Exception e)
| https://github.com/GoSimpleLLC/nbvcxz.gitdiff --git a/src/main/java/me/gosimple/nbvcxz/matching/DictionaryMatcher.java b/src/main/java/me/gosimple/nbvcxz/matching/DictionaryMatcher.java |
gitbug-java_data_fusesource-jansi.json_1 | diff --git a/src/main/java/org/fusesource/jansi/AnsiRenderer.java b/src/main/java/org/fusesource/jansi/AnsiRenderer.java
index 20b1c17..5041c4e 100644
--- a/src/main/java/org/fusesource/jansi/AnsiRenderer.java
+++ b/src/main/java/org/fusesource/jansi/AnsiRenderer.java
@@ -99,6 +99,11 @@ public class AnsiRenderer {
return target;
}
j += BEGIN_TOKEN_LEN;
+
+ // Check for invalid string with END_TOKEN before BEGIN_TOKEN
+ if (k < j) {
+ throw new IllegalArgumentException("Invalid input string found.");
+ }
String spec = input.substring(j, k);
String[] items = spec.split(CODE_TEXT_SEPARATOR, 2);
diff --git a/src/test/java/org/fusesource/jansi/AnsiRendererTest.java b/src/test/java/org/fusesource/jansi/AnsiRendererTest.java
index 05602bd..63dfaba 100644
--- a/src/test/java/org/fusesource/jansi/AnsiRendererTest.java
+++ b/src/test/java/org/fusesource/jansi/AnsiRendererTest.java
@@ -24,6 +24,7 @@ import static org.fusesource.jansi.Ansi.Color.*;
import static org.fusesource.jansi.AnsiRenderer.*;
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 static org.junit.jupiter.api.Assertions.assertTrue;
/**
@@ -31,7 +32,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
*
*/
public class AnsiRendererTest {
-
@BeforeAll
static void setUp() {
Ansi.setEnabled(true);
@@ -113,6 +113,11 @@ public class AnsiRendererTest {
}
@Test
+ public void testRenderInvalidEndBeforeStart() {
+ assertThrows(IllegalArgumentException.class, () -> render("@|@"));
+ }
+
+ @Test
public void testRenderInvalidMissingText() {
String str = render("@|bold|@");
assertEquals("@|bold|@", str);
| https://github.com/fusesource/jansi.gitdiff --git a/src/main/java/org/fusesource/jansi/AnsiRenderer.java b/src/main/java/org/fusesource/jansi/AnsiRenderer.java |
gitbug-java_data_Enigmatis-graphql-java-annotations.json_1 | diff --git a/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java b/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java
index 0082f5f..6fe9965 100644
--- a/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java
+++ b/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java
@@ -14,6 +14,7 @@
*/
package graphql.annotations.processor.retrievers.fieldBuilders;
+import graphql.Scalars;
import graphql.annotations.annotationTypes.directives.activation.GraphQLDirectives;
import graphql.annotations.processor.ProcessingElementsContainer;
import graphql.annotations.processor.exceptions.GraphQLAnnotationsException;
@@ -26,11 +27,14 @@ import graphql.schema.GraphQLType;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Method;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
+import static graphql.Assert.assertShouldNeverHappen;
+import static graphql.scalar.CoercingUtil.isNumberIsh;
import static graphql.schema.GraphQLDirective.newDirective;
@@ -134,7 +138,22 @@ public class DirectivesBuilder implements Builder<GraphQLDirective[]> {
Object argumentValue = methods[finalI].invoke(annotation);
Object value;
if (graphQLArgument.getType() instanceof GraphQLScalarType) {
- value = ((GraphQLScalarType) graphQLArgument.getType()).getCoercing().parseValue(argumentValue);
+// value = ((GraphQLScalarType) graphQLArgument.getType()).getCoercing().parseValue(argumentValue);
+
+ try {
+ GraphQLScalarType argumentType = (GraphQLScalarType) graphQLArgument.getType();
+ if ( argumentType.equals( Scalars.GraphQLBoolean ) )
+ {
+ value = castToBoolean( argumentValue );
+ }
+ else
+ {
+ value = argumentType.getCoercing().parseValue( argumentValue );
+ }
+ builder.value( value );
+ } catch (Exception e) {
+ throw new GraphQLAnnotationsException(COULD_NOT_PARSE_ARGUMENT_VALUE_TO_ARGUMENT_TYPE, e);
+ }
}
else{
value = argumentValue;
@@ -159,8 +178,17 @@ public class DirectivesBuilder implements Builder<GraphQLDirective[]> {
if (graphQLArgument.getType() instanceof GraphQLScalarType) {
try {
- Object value = ((GraphQLScalarType) graphQLArgument.getType()).getCoercing().parseValue(argumentValue);
- builder.value(value);
+ Object value;
+ GraphQLScalarType argumentType = (GraphQLScalarType) graphQLArgument.getType();
+ if ( argumentType.equals( Scalars.GraphQLBoolean ) )
+ {
+ value = castToBoolean( argumentValue );
+ }
+ else
+ {
+ value = argumentType.getCoercing().parseValue( argumentValue );
+ }
+ builder.value( value );
} catch (Exception e) {
throw new GraphQLAnnotationsException(COULD_NOT_PARSE_ARGUMENT_VALUE_TO_ARGUMENT_TYPE, e);
}
@@ -169,4 +197,43 @@ public class DirectivesBuilder implements Builder<GraphQLDirective[]> {
}
}));
}
+
+ private Boolean castToBoolean( Object input )
+ {
+ if ( input instanceof Boolean )
+ {
+ return (Boolean) input;
+ }
+ else if ( input instanceof String )
+ {
+ String lStr = ( (String) input ).toLowerCase();
+ if ( lStr.equals( "true" ) )
+ {
+ return true;
+ }
+ if ( lStr.equals( "false" ) )
+ {
+ return false;
+ }
+ return null;
+ }
+ else if ( isNumberIsh( input ) )
+ {
+ BigDecimal value;
+ try
+ {
+ value = new BigDecimal( input.toString() );
+ }
+ catch ( NumberFormatException e )
+ {
+ // this should never happen because String is handled above
+ return assertShouldNeverHappen();
+ }
+ return value.compareTo( BigDecimal.ZERO ) != 0;
+ }
+ else
+ {
+ return null;
+ }
+ }
}
diff --git a/src/test/java/graphql/annotations/GraphQLDataFetcherTest.java b/src/test/java/graphql/annotations/GraphQLDataFetcherTest.java
index 8100e58..3b17242 100644
--- a/src/test/java/graphql/annotations/GraphQLDataFetcherTest.java
+++ b/src/test/java/graphql/annotations/GraphQLDataFetcherTest.java
@@ -22,12 +22,14 @@ import graphql.annotations.annotationTypes.GraphQLName;
import graphql.annotations.processor.GraphQLAnnotations;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLFieldDefinition;
import graphql.schema.GraphQLSchema;
import graphql.schema.PropertyDataFetcher;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
import java.util.HashMap;
+import java.util.function.Supplier;
import static graphql.annotations.AnnotationsSchemaCreator.newAnnotationsSchema;
import static org.testng.Assert.*;
@@ -54,7 +56,7 @@ public class GraphQLDataFetcherTest {
final HashMap<String, Object> data = result.getData();
assertNotNull(data);
assertTrue(((HashMap<String, Boolean>) data.get("sample")).get("isGreat"));
- assertFalse(((HashMap<String, Boolean>) data.get("sample")).get("isBad")); // TODO investigate why returned false instead of true
+ assertTrue(((HashMap<String, Boolean>) data.get("sample")).get("isBad"));
}
@Test
@@ -84,7 +86,7 @@ public class GraphQLDataFetcherTest {
// Then
final HashMap<String, Object> data = result.getData();
assertNotNull(data);
- assertFalse(((HashMap<String, Boolean>) data.get("sample")).get("isBad")); // TODO investigate why returned true instead of false
+ assertTrue(((HashMap<String, Boolean>) data.get("sample")).get("isBad"));
}
@GraphQLName("Query")
@@ -161,8 +163,10 @@ public class GraphQLDataFetcherTest {
}
@Override
- public Object get(DataFetchingEnvironment environment) {
- final Object result = super.get(environment);
+ public Object get( final GraphQLFieldDefinition fieldDefinition, final Object source, final Supplier supplier )
+ throws Exception
+ {
+ final Object result = super.get( fieldDefinition, source, supplier );
if (flip) {
return !(Boolean) result;
} else {
diff --git a/src/test/java/graphql/annotations/GraphQLDirectivesViaClassDefinitionTest.java b/src/test/java/graphql/annotations/GraphQLDirectivesViaClassDefinitionTest.java
index 8d69b9c..710c75a 100644
--- a/src/test/java/graphql/annotations/GraphQLDirectivesViaClassDefinitionTest.java
+++ b/src/test/java/graphql/annotations/GraphQLDirectivesViaClassDefinitionTest.java
@@ -207,7 +207,7 @@ public class GraphQLDirectivesViaClassDefinitionTest {
}
- @Test(enabled = false) // TODO there is issue with coercing in DirectivesBuilder
+ @Test
public void queryName_directivesProvidedToRegistry_wiringIsActivated() throws Exception {
this.graphQLAnnotations.directive(UpperCase.class);
@@ -218,21 +218,21 @@ public class GraphQLDirectivesViaClassDefinitionTest {
assertEquals(((Map<String, String>) result.getData()).get("name").toString(), "YARIN");
}
- @Test(enabled = false) // TODO there is issue with coercing in DirectivesBuilder
+ @Test
public void queryNameWithFalse_directivesProvidedToRegistry_wiringIsActivated() throws Exception {
GraphQLDirective upperCase = newDirective().name("upperCase").argument(builder -> builder.name("isActive").type(GraphQLBoolean))
.validLocations(Introspection.DirectiveLocation.FIELD_DEFINITION).build();
this.graphQLAnnotations.getContainer().getDirectiveRegistry().put(upperCase.getName(), new DirectiveAndWiring(upperCase, UpperWiring.class));
GraphQLObjectType object = this.graphQLAnnotations.object(Query.class);
GraphQLCodeRegistry codeRegistry = graphQLAnnotations.getContainer().getCodeRegistryBuilder().build();
- GraphQLSchema schema = newSchema().query(object).codeRegistry(codeRegistry).build();
+ GraphQLSchema schema = newSchema().query(object).codeRegistry(codeRegistry).additionalDirective( upperCase ).build();
ExecutionResult result = GraphQL.newGraphQL(schema).build().execute("query { nameWithFalse }");
assertTrue(result.getErrors().isEmpty());
assertEquals(((Map<String, String>) result.getData()).get("nameWithFalse").toString(), "yarin");
}
- @Test(enabled = false) // TODO there is issue with coercing in DirectivesBuilder
+ @Test
public void queryNameWithNoArgs_directivesProvidedToRegistry_wiringIsActivated() throws Exception {
GraphQLSchema schema = newAnnotationsSchema().query(Query2.class).directive(UpperCaseNoDefault.class).build();
@@ -248,7 +248,7 @@ public class GraphQLDirectivesViaClassDefinitionTest {
GraphQL.newGraphQL(schema).build().execute("query { nameWithNoArgs }");
}
- @Test(enabled = false) // TODO there is issue with coercing in DirectivesBuilder
+ @Test
public void queryName_chainedDirectives_wiringIsActivatedInCorrectOrder() throws Exception {
GraphQLSchema schema = newAnnotationsSchema().query(Query3.class).directives(SuffixDirective.class, UpperCase.class).build();
| https://github.com/Enigmatis/graphql-java-annotations.gitdiff --git a/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java b/src/main/java/graphql/annotations/processor/retrievers/fieldBuilders/DirectivesBuilder.java |
gitbug-java_data_giraud-reasonml-idea-plugin.json_1 | diff --git a/src/main/java/com/reason/lang/rescript/ResParser.java b/src/main/java/com/reason/lang/rescript/ResParser.java
index e3cea2d..e97768e 100644
--- a/src/main/java/com/reason/lang/rescript/ResParser.java
+++ b/src/main/java/com/reason/lang/rescript/ResParser.java
@@ -1073,7 +1073,8 @@ public class ResParser extends CommonPsiParser {
private void parseEq() {
if (strictlyInAny(
myTypes.C_TYPE_DECLARATION, myTypes.C_LET_DECLARATION, myTypes.C_MODULE_TYPE, myTypes.C_MODULE_DECLARATION,
- myTypes.C_TAG_PROPERTY, myTypes.C_SIG_EXPR, myTypes.H_NAMED_PARAM_DECLARATION, myTypes.C_NAMED_PARAM
+ myTypes.C_TAG_PROPERTY, myTypes.C_SIG_EXPR, myTypes.H_NAMED_PARAM_DECLARATION, myTypes.C_NAMED_PARAM,
+ myTypes.C_TYPE_CONSTRAINT, myTypes.C_TYPE_BINDING
)) {
if (isFound(myTypes.C_TYPE_DECLARATION)) {
@@ -1115,8 +1116,17 @@ public class ResParser extends CommonPsiParser {
popEndUntilFoundIndex()
.advance().mark(myTypes.C_DEFAULT_VALUE)
.markHolder(myTypes.H_PLACE_HOLDER);
+ } else if (isFound(myTypes.C_TYPE_CONSTRAINT)) {
+ // ... with type t |> =<| ...
+ advance().mark(myTypes.C_TYPE_BINDING);
+ } else if (isFound(myTypes.C_TYPE_BINDING) && strictlyIn(myTypes.C_CONSTRAINTS)) {
+ // .. with type .. = .. |> =<| ..
+ popEndUntilFoundIndex().popEnd();
+ if (strictlyIn(myTypes.C_MODULE_DECLARATION)) {
+ popEndUntilFoundIndex()
+ .advance().mark(myTypes.C_MODULE_BINDING);
+ }
}
-
}
}
@@ -1179,8 +1189,8 @@ public class ResParser extends CommonPsiParser {
.mark(myTypes.C_PARAM_DECLARATION);
}
} else if (is(myTypes.C_TYPE_DECLARATION)) {
- // type |>M<|.t += ...
- remapCurrentToken(myTypes.A_MODULE_NAME).wrapAtom(myTypes.CA_UPPER_SYMBOL);
+ // type |>M<|.t += ...
+ remapCurrentToken(myTypes.A_MODULE_NAME).wrapAtom(myTypes.CA_UPPER_SYMBOL);
} else if (is(myTypes.C_TYPE_BINDING)) {
IElementType nextToken = lookAhead(1);
if (nextToken == myTypes.DOT) { // a path
diff --git a/src/test/java/com/reason/lang/rescript/ModuleParsingTest.java b/src/test/java/com/reason/lang/rescript/ModuleParsingTest.java
index ef63e28..c318f5b 100644
--- a/src/test/java/com/reason/lang/rescript/ModuleParsingTest.java
+++ b/src/test/java/com/reason/lang/rescript/ModuleParsingTest.java
@@ -93,9 +93,22 @@ public class ModuleParsingTest extends ResParsingTestCase {
}
@Test
+ public void test_interface_with_constraints() {
+ RPsiInnerModule e = firstOfType(parseCode("module M: I with type t = X.t = {}"), RPsiInnerModule.class);
+
+ assertEquals("M", e.getName());
+ assertEquals("I", e.getModuleType().getText());
+ assertEquals(myTypes.A_MODULE_NAME, e.getModuleType().getFirstChild().getNode().getElementType());
+ assertSize(1, e.getConstraints());
+ assertEquals("type t = X.t", e.getConstraints().get(0).getText());
+ assertEquals("{}", e.getBody().getText());
+ }
+
+ @Test
public void test_inline_interface_body() {
RPsiInnerModule e = firstOfType(parseCode("module M: { type t } = { type t = int }"), RPsiInnerModule.class);
+ assertNoParserError(e);
assertEquals("M", e.getName());
assertEquals("{ type t }", e.getModuleType().getText());
assertEquals("{ type t = int }", e.getBody().getText());
| https://github.com/giraud/reasonml-idea-plugin.gitdiff --git a/src/main/java/com/reason/lang/rescript/ResParser.java b/src/main/java/com/reason/lang/rescript/ResParser.java |
gitbug-java_data_giraud-reasonml-idea-plugin.json_2 | diff --git a/src/main/java/com/reason/lang/ocaml/OclParser.java b/src/main/java/com/reason/lang/ocaml/OclParser.java
index 3b8cd97..88c58ba 100644
--- a/src/main/java/com/reason/lang/ocaml/OclParser.java
+++ b/src/main/java/com/reason/lang/ocaml/OclParser.java
@@ -1,8 +1,6 @@
package com.reason.lang.ocaml;
import com.intellij.lang.*;
-import com.intellij.openapi.project.*;
-import com.intellij.psi.*;
import com.intellij.psi.tree.*;
import com.reason.lang.*;
import com.reason.lang.core.type.*;
@@ -15,16 +13,6 @@ public class OclParser extends CommonPsiParser {
super(isSafe);
}
- public static ASTNode parseOcamlNode(@NotNull ILazyParseableElementType root, @NotNull ASTNode chameleon) {
- PsiElement parentElement = chameleon.getTreeParent().getPsi();
- Project project = parentElement.getProject();
-
- PsiBuilder builder = PsiBuilderFactory.getInstance().createBuilder(project, chameleon, new OclLexer(), root.getLanguage(), chameleon.getChars());
- OclParser parser = new OclParser(true);
-
- return parser.parse(root, builder).getFirstChildNode();
- }
-
@Override
protected ORParser<OclTypes> getORParser(@NotNull PsiBuilder builder) {
return new OclParserState(builder, myIsSafe);
@@ -344,8 +332,6 @@ public class OclParser extends CommonPsiParser {
popEndUntil(myTypes.C_OBJECT);
advance().end();
popEnd();
- } else {
- //
}
}
}
@@ -753,6 +739,7 @@ public class OclParser extends CommonPsiParser {
}
}
+ @SuppressWarnings("StatementWithEmptyBody")
private void parseEq() {
if (in(myTypes.H_NAMED_PARAM_DECLARATION) && isFoundScope(myTypes.LPAREN)) {
// let fn ?(x |> = <| ...
@@ -774,12 +761,23 @@ public class OclParser extends CommonPsiParser {
popEndUntil(myTypes.C_SIG_EXPR).popEnd().advance();
} else if (strictlyInAny(myTypes.C_LET_DECLARATION, myTypes.C_MODULE_DECLARATION)) {
// if inside a let binding, do nothing
- if (isFound(myTypes.C_LET_DECLARATION) && !isCurrent(myTypes.C_LET_BINDING)) {
+ if (isFound(myTypes.C_LET_DECLARATION)) {
int letPos = getIndex();
- if (in(myTypes.C_LET_BINDING, null, letPos, false)) {
- // in a function :: let (x) y z |> = <| ...
- popEndUntil(myTypes.C_FUNCTION_EXPR).advance()
- .mark(myTypes.C_FUNCTION_BODY);
+ if (isCurrent(myTypes.C_LET_BINDING) && is(myTypes.H_PLACE_HOLDER)) {
+ // inside a let binding, it might be a binary condition
+ updateLatestComposite(myTypes.C_BINARY_CONDITION);
+ markHolderBefore(0, myTypes.H_PLACE_HOLDER);
+ } else if (in(myTypes.C_LET_BINDING, null, letPos, false)) {
+ int letBinding = getIndex();
+ if (in(myTypes.C_FUNCTION_EXPR, null, letBinding, false)) {
+ // in a function :: let (x) y z |> = <| ...
+ popEndUntil(myTypes.C_FUNCTION_EXPR).advance()
+ .mark(myTypes.C_FUNCTION_BODY);
+ } else {
+ // inside a let binding, but not a function expression. it might be a binary condition
+ markBefore(letBinding - 1, myTypes.C_BINARY_CONDITION).
+ popEndUntil(myTypes.C_BINARY_CONDITION);
+ }
} else {
// let x |> = <| ...
popEndUntilIndex(letPos).advance().
@@ -1265,6 +1263,7 @@ public class OclParser extends CommonPsiParser {
mark(myTypes.C_EXTERNAL_DECLARATION);
}
+ @SuppressWarnings("StatementWithEmptyBody")
private void parseType() {
if (is(myTypes.C_MODULE_DECLARATION)) {
// module |>type<| M = ...
diff --git a/src/test/java/com/reason/lang/ocaml/LetParsingTest.java b/src/test/java/com/reason/lang/ocaml/LetParsingTest.java
index 7917b18..e9c6ec3 100644
--- a/src/test/java/com/reason/lang/ocaml/LetParsingTest.java
+++ b/src/test/java/com/reason/lang/ocaml/LetParsingTest.java
@@ -343,14 +343,15 @@ public class LetParsingTest extends OclParsingTestCase {
// https://github.com/giraud/reasonml-idea-plugin/issues/406
@Test
public void test_GH_406() {
- RPsiLet e = firstOfType(parseCode("let is_uppercase s =\n" +
- " let x = 0 in\n" +
- " let open CamomileLibraryDefault.Camomile in\n" +
- " let open UReStr in\n" +
- " let open UReStr.Make(UTF8) in\n" +
- " let y = 0 in\n" +
- " let z = 0 in\n" +
- " false"), RPsiLet.class);
+ RPsiLet e = firstOfType(parseCode("""
+ let is_uppercase s =
+ let x = 0 in
+ let open CamomileLibraryDefault.Camomile in
+ let open UReStr in
+ let open UReStr.Make(UTF8) in
+ let y = 0 in
+ let z = 0 in
+ false"""), RPsiLet.class);
assertNoParserError(e);
RPsiFunctionBody eb = e.getFunction().getBody();
@@ -379,15 +380,17 @@ public class LetParsingTest extends OclParsingTestCase {
// https://github.com/giraud/reasonml-idea-plugin/issues/409
@Test
public void test_GH_409() {
- RPsiLet e = firstOfType(parseCode("let f () =\n" +
- " let b : bool = 1 = 1 in\n" +
- " let x = 0 in\n" +
- " x"), RPsiLet.class);
+ RPsiLet e = firstOfType(parseCode("""
+ let f () =
+ let b : bool = 1 = 1 in
+ let x = 0 in
+ x"""), RPsiLet.class);
assertNoParserError(e);
RPsiFunctionBody eb = e.getFunction().getBody();
RPsiLet[] ebls = PsiTreeUtil.getChildrenOfType(eb, RPsiLet.class);
assertEquals("let b : bool = 1 = 1", ebls[0].getText());
+ assertEquals("1 = 1", PsiTreeUtil.getChildOfType(ebls[0].getBinding(), RPsiBinaryCondition.class).getText());
assertEquals("let x = 0", ebls[1].getText());
assertSize(2, ebls);
}
@@ -395,16 +398,29 @@ public class LetParsingTest extends OclParsingTestCase {
// https://github.com/giraud/reasonml-idea-plugin/issues/409
@Test
public void test_GH_409a() {
- RPsiLet e = firstOfType(parseCode("let f () =\n" +
- " let b : bool = ignore () = () in\n" +
- " let x = 0 in\n" +
- " x"), RPsiLet.class);
+ RPsiLet e = firstOfType(parseCode("""
+ let f () =
+ let b : bool = ignore () = () in
+ let x = 0 in
+ x"""), RPsiLet.class);
assertNoParserError(e);
RPsiFunctionBody eb = e.getFunction().getBody();
RPsiLet[] ebls = PsiTreeUtil.getChildrenOfType(eb, RPsiLet.class);
assertEquals("let b : bool = ignore () = ()", ebls[0].getText());
+ assertEquals("ignore () = ()", PsiTreeUtil.getChildOfType(ebls[0].getBinding(), RPsiBinaryCondition.class).getText());
assertEquals("let x = 0", ebls[1].getText());
assertSize(2, ebls);
}
+
+ // https://github.com/giraud/reasonml-idea-plugin/issues/409
+ @Test
+ public void test_GH_409_binary_condition() {
+ RPsiLet e = firstOfType(parseCode("let b = ignore \"\" = ()"), RPsiLet.class);
+
+ assertNoParserError(e);
+ assertEquals("ignore \"\" = ()", e.getBinding().getText());
+ assertEquals("ignore \"\" = ()", PsiTreeUtil.getChildOfType(e.getBinding(), RPsiBinaryCondition.class).getText());
+ assertEquals("ignore \"\"", PsiTreeUtil.findChildOfType(e, RPsiFunctionCall.class).getText());
+ }
}
| https://github.com/giraud/reasonml-idea-plugin.gitdiff --git a/src/main/java/com/reason/lang/ocaml/OclParser.java b/src/main/java/com/reason/lang/ocaml/OclParser.java |
gitbug-java_data_giraud-reasonml-idea-plugin.json_3 | diff --git a/src/main/java/com/reason/ide/structure/StructureViewElement.java b/src/main/java/com/reason/ide/structure/StructureViewElement.java
index 9ad2ec7..72d20b1 100644
--- a/src/main/java/com/reason/ide/structure/StructureViewElement.java
+++ b/src/main/java/com/reason/ide/structure/StructureViewElement.java
@@ -85,9 +85,8 @@ public class StructureViewElement implements StructureViewTreeElement, SortableT
return m_viewElement.getText();
}
- @Nullable
@Override
- public String getLocationString() {
+ public @Nullable String getLocationString() {
if (myElement instanceof RPsiLet && ((RPsiLet) myElement).isDeconstruction()) {
return "";
}
@@ -96,9 +95,8 @@ public class StructureViewElement implements StructureViewTreeElement, SortableT
: "";
}
- @Nullable
@Override
- public Icon getIcon(boolean unused) {
+ public @Nullable Icon getIcon(boolean unused) {
return PsiIconUtil.getProvidersIcon(myElement, 0);
}
};
@@ -177,7 +175,14 @@ public class StructureViewElement implements StructureViewTreeElement, SortableT
RPsiModuleSignature moduleSignature = moduleElement.getModuleSignature();
if (moduleSignature != null) {
- treeElements.add(new StructureViewElement(moduleSignature, myLevel + 1));
+ RPsiUpperSymbol nameIdentifier = moduleSignature.getNameIdentifier();
+ if (nameIdentifier != null) {
+ // module type of ...
+ treeElements.add(new StructureViewElement(moduleSignature, myLevel + 1));
+ } else {
+ // sig ... end
+ moduleSignature.acceptChildren(new ElementVisitor(treeElements, myLevel));
+ }
}
if (moduleSignature == null) {
diff --git a/src/main/java/com/reason/lang/core/psi/impl/RPsiModuleSignature.java b/src/main/java/com/reason/lang/core/psi/impl/RPsiModuleSignature.java
index d7d175a..212d153 100644
--- a/src/main/java/com/reason/lang/core/psi/impl/RPsiModuleSignature.java
+++ b/src/main/java/com/reason/lang/core/psi/impl/RPsiModuleSignature.java
@@ -20,7 +20,6 @@ public class RPsiModuleSignature extends ORCompositePsiElement<ORLangTypes> impl
@Override
public String @Nullable [] getPath() {
return ORUtil.getQualifiedPath(this);
-
}
public @Nullable RPsiUpperSymbol getNameIdentifier() {
diff --git a/src/main/java/com/reason/lang/ocaml/OclParser.java b/src/main/java/com/reason/lang/ocaml/OclParser.java
index 7e98b2d..8642e0b 100644
--- a/src/main/java/com/reason/lang/ocaml/OclParser.java
+++ b/src/main/java/com/reason/lang/ocaml/OclParser.java
@@ -557,6 +557,9 @@ public class OclParser extends CommonPsiParser {
if (is(myTypes.C_MODULE_BINDING)) { // This is the body of a module type
// module type X = |>sig<| ...
updateScopeToken(myTypes.SIG);
+ } else if (is(myTypes.C_MODULE_SIGNATURE)) {
+ // module X : |>sig<| ...
+ markDummyScope(myTypes.C_SCOPED_EXPR, myTypes.SIG);
} else {
markScope(myTypes.C_SIG_EXPR, myTypes.SIG);
}
diff --git a/src/test/java/com/reason/ide/structure/StructureOCLTest.java b/src/test/java/com/reason/ide/structure/StructureOCLTest.java
index fc13ac3..2f40a00 100644
--- a/src/test/java/com/reason/ide/structure/StructureOCLTest.java
+++ b/src/test/java/com/reason/ide/structure/StructureOCLTest.java
@@ -153,6 +153,23 @@ public class StructureOCLTest extends ORBasePlatformTestCase {
assertPresentation("x", null, ORIcons.LET, fn1.getPresentation());
}
+ // https://github.com/giraud/reasonml-idea-plugin/issues/429
+ @Test
+ public void test_GH_429() {
+ FileBase e = configureCode("A.mli", """
+ module X : sig
+ type t
+ end
+ """);
+
+ StructureViewModel model = new ORStructureViewModel(e);
+
+ TreeElement x = model.getRoot().getChildren()[0];
+ assertPresentation("X", "A.X", ORIcons.INNER_MODULE_INTF, x.getPresentation());
+ TreeElement xt = x.getChildren()[0];
+ assertPresentation("t", null, ORIcons.TYPE, xt.getPresentation());
+
+ }
private void assertPresentation(String name, String location, @Nullable Icon icon, @NotNull ItemPresentation pres) {
assertEquals("Incorrect name", name, pres.getPresentableText());
assertEquals("Incorrect location", location, pres.getLocationString());
diff --git a/src/test/java/com/reason/lang/ocaml/ModuleParsingTest.java b/src/test/java/com/reason/lang/ocaml/ModuleParsingTest.java
index 5968227..b86fb0b 100644
--- a/src/test/java/com/reason/lang/ocaml/ModuleParsingTest.java
+++ b/src/test/java/com/reason/lang/ocaml/ModuleParsingTest.java
@@ -106,12 +106,17 @@ public class ModuleParsingTest extends OclParsingTestCase {
@Test
public void test_rec_signature() {
- PsiFile file = parseCode("module rec A : sig type output = (Constr.constr * UState.t) option type task end = struct end");
+ RPsiInnerModule e = firstOfType(parseCode("""
+ module rec A : sig
+ type output = (Constr.constr * UState.t) option
+ type task
+ end = struct end
+ """), RPsiInnerModule.class);
- assertEquals(1, expressions(file).size());
- RPsiInnerModule e = first(moduleExpressions(file));
assertEquals("A", e.getName());
- assertEquals("sig type output = (Constr.constr * UState.t) option type task end", e.getModuleSignature().getText());
+ RPsiModuleSignature es = e.getModuleSignature();
+ assertNull(PsiTreeUtil.findChildOfType(es, RPsiSignature.class));
+ assertEquals("sig\n type output = (Constr.constr * UState.t) option\n type task\nend", es.getText());
assertEquals("struct end", e.getBody().getText());
}
| https://github.com/giraud/reasonml-idea-plugin.gitdiff --git a/src/main/java/com/reason/ide/structure/StructureViewElement.java b/src/main/java/com/reason/ide/structure/StructureViewElement.java |
gitbug-java_data_xtremexp-UT4X-Converter.json_1 | diff --git a/src/main/java/org/xtx/ut4converter/t3d/T3DActor.java b/src/main/java/org/xtx/ut4converter/t3d/T3DActor.java
index faed09b..e7fcd71 100644
--- a/src/main/java/org/xtx/ut4converter/t3d/T3DActor.java
+++ b/src/main/java/org/xtx/ut4converter/t3d/T3DActor.java
@@ -779,7 +779,17 @@ public abstract class T3DActor extends T3DObject {
this.convert();
this.scale(scaleFactor);
- return "Begin Map\nBegin Level\n" + toT3d() + "End Level\nEnd Map";
+ String convT3d = toT3d();
+
+ if (convT3d == null) {
+ convT3d = "";
+
+ for (T3DActor repActor : this.children) {
+ convT3d += repActor.toT3d();
+ }
+ }
+
+ return "Begin Map\nBegin Level\n" + convT3d + "End Level\nEnd Map";
}
protected void addComponent(final Component... components){
| https://github.com/xtremexp/UT4X-Converter.gitdiff --git a/src/main/java/org/xtx/ut4converter/t3d/T3DActor.java b/src/main/java/org/xtx/ut4converter/t3d/T3DActor.java |
gitbug-java_data_xtremexp-UT4X-Converter.json_2 | diff --git a/src/main/java/org/xtx/ut4converter/t3d/T3DSimpleProperty.java b/src/main/java/org/xtx/ut4converter/t3d/T3DSimpleProperty.java
index f10bb9c..b87d63b 100644
--- a/src/main/java/org/xtx/ut4converter/t3d/T3DSimpleProperty.java
+++ b/src/main/java/org/xtx/ut4converter/t3d/T3DSimpleProperty.java
@@ -5,8 +5,7 @@ import org.xtx.ut4converter.geom.Rotator;
import org.xtx.ut4converter.ucore.UPackageRessource;
import javax.vecmath.Vector3d;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
/**
*
@@ -42,7 +41,8 @@ public class T3DSimpleProperty {
private boolean scalable;
/**
- * Value
+ * Value.
+ * Is a map of [Index, Value] if isList is true
*/
private Object propertyValue;
@@ -102,7 +102,7 @@ public class T3DSimpleProperty {
if (this.isList) {
if (this.propertyValue == null) {
- this.propertyValue = new LinkedList<>();
+ this.propertyValue = new HashMap<>();
}
hasLineProp = line.toLowerCase().startsWith(this.propertyName.toLowerCase() + "(");
} else {
@@ -145,9 +145,9 @@ public class T3DSimpleProperty {
}
if (value != null) {
- if (this.propertyValue instanceof List) {
- final List<Object> theList = (List<Object>) this.propertyValue;
- theList.add(value);
+ if (this.propertyValue instanceof HashMap hashMap) {
+ int index = T3DUtils.parseArrayIndex(line);
+ hashMap.put(index, value);
} else {
this.propertyValue = value;
}
@@ -161,15 +161,11 @@ public class T3DSimpleProperty {
if (this.propertyValue != null) {
- if (this.propertyValue instanceof List) {
- final List<Object> values = (List<Object>) this.propertyValue;
+ if (this.propertyValue instanceof HashMap hashMap) {
- int idx = 0;
-
- for (final Object value : values) {
- sbf.append("\t\t").append(propertyNameConverted).append("(").append(idx).append(")=");
- writeValueProperty(sbf, value);
- idx++;
+ for (Object index : hashMap.keySet()) {
+ sbf.append("\t\t").append(propertyNameConverted).append("(").append(index).append(")=");
+ writeValueProperty(sbf, hashMap.get(index));
}
} else {
sbf.append("\t\t").append(propertyNameConverted).append("=");
diff --git a/src/main/java/org/xtx/ut4converter/t3d/T3DUtils.java b/src/main/java/org/xtx/ut4converter/t3d/T3DUtils.java
index f5a2685..a6d17ef 100644
--- a/src/main/java/org/xtx/ut4converter/t3d/T3DUtils.java
+++ b/src/main/java/org/xtx/ut4converter/t3d/T3DUtils.java
@@ -435,6 +435,17 @@ public class T3DUtils {
}
/**
+ * Skins(2)=Texture'Mission_08T.Doors.MetlDoor_U08G394'
+ * -> returns 2
+ *
+ * @param line Line to be parsed
+ * @return Index
+ */
+ public static int parseArrayIndex(String line){
+ return Integer.parseInt(line.split("=")[0].split("\\(")[1].replaceAll("\\)", ""));
+ }
+
+ /**
* E.G: 'Skins(2)=Texture'Mission_08T.Doors.MetlDoor_U08G394')
*
* @param line Line to parse
diff --git a/src/test/java/org/xtx/ut4converter/t3d/T3DDispatcherTest.java b/src/test/java/org/xtx/ut4converter/t3d/T3DDispatcherTest.java
index 4c391e3..0a1acf8 100644
--- a/src/test/java/org/xtx/ut4converter/t3d/T3DDispatcherTest.java
+++ b/src/test/java/org/xtx/ut4converter/t3d/T3DDispatcherTest.java
@@ -26,6 +26,6 @@ class T3DDispatcherTest {
Assertions.assertNotNull(dispatcher);
final String convT3D = dispatcher.convertScaleAndToT3D(2d);
- System.out.println(convT3D);
+ Assertions.assertTrue(convT3D.contains("OutDelays(4)=7.0"));
}
}
\ No newline at end of file
diff --git a/src/test/resources/t3d/ue1/U1-Dispatcher.t3d b/src/test/resources/t3d/ue1/U1-Dispatcher.t3d
index f353f22..7cea2e0 100644
--- a/src/test/resources/t3d/ue1/U1-Dispatcher.t3d
+++ b/src/test/resources/t3d/ue1/U1-Dispatcher.t3d
@@ -1,21 +1,15 @@
Begin Map
- Begin Actor Class=Dispatcher Name=Dispatcher5
- OutDelays(0)=1.0
- OutDelays(1)=1.0
- OutDelays(2)=1.0
- OutDelays(3)=1.0
- OutDelays(4)=1.0
- OutDelays(5)=1.0
- OutDelays(6)=1.0
- OutEvents(0)="scary1"
- OutEvents(1)="scary2"
- OutEvents(2)="scary3"
- OutEvents(3)="scary4"
- OutEvents(4)="scary5"
- OutEvents(5)="scary6"
- OutEvents(6)="scary7"
- OutEvents(7)="dispatcho2"
- Tag="trap2"
- Location=(X=-784.0,Y=-208.0,Z=-392.0)
+ Begin Actor Class=Dispatcher Name=Dispatcher0
+ OutDelays(2)=1.1
+ OutDelays(4)=7.0
+ OutEvents(0)="Hell"
+ OutEvents(1)="WF1"
+ OutEvents(2)="MW1"
+ OutEvents(3)="STS"
+ OutEvents(4)="EntryDoor"
+ OutEvents(5)="Water1"
+ OutEvents(6)="wATERsPLASH"
+ Tag="DIS1"
+ Location=(X=3058.65,Y=6281.61,Z=628.47)
End Actor
End Map
| https://github.com/xtremexp/UT4X-Converter.gitdiff --git a/src/main/java/org/xtx/ut4converter/t3d/T3DSimpleProperty.java b/src/main/java/org/xtx/ut4converter/t3d/T3DSimpleProperty.java |
gitbug-java_data_wmixvideo-nfe.json_1 | diff --git a/src/main/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFInfoModalRodoviarioVeiculoReboque.java b/src/main/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFInfoModalRodoviarioVeiculoReboque.java
index c198a2c..6101f88 100644
--- a/src/main/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFInfoModalRodoviarioVeiculoReboque.java
+++ b/src/main/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFInfoModalRodoviarioVeiculoReboque.java
@@ -1,35 +1,73 @@
package com.fincatto.documentofiscal.mdfe3.classes.nota;
+import com.fincatto.documentofiscal.DFBase;
+import com.fincatto.documentofiscal.DFUnidadeFederativa;
+import com.fincatto.documentofiscal.mdfe3.classes.def.MDFTipoCarroceria;
import org.simpleframework.xml.Element;
import com.fincatto.documentofiscal.validadores.DFStringValidador;
-public class MDFInfoModalRodoviarioVeiculoReboque extends MDFInfoModalRodoviarioVeiculo {
+public class MDFInfoModalRodoviarioVeiculoReboque extends DFBase {
private static final long serialVersionUID = -2787982058485353668L;
+ @Element(name = "cInt", required = false)
+ protected String codigoInterno;
+
+ @Element(name = "placa")
+ protected String placa;
+
+ @Element(name = "RENAVAM", required = false)
+ protected String renavam;
+
+ @Element(name = "tara")
+ protected String tara;
+
@Element(name = "capKG")
private String capacidadeKG;
- @Override
+ @Element(name = "capM3", required = false)
+ protected String capacidadeM3;
+
+ /**
+ * Tipo de carroceria
+ */
+ @Element(name = "tpCar")
+ protected MDFTipoCarroceria tipoCarroceria;
+
+ @Element(name = "UF")
+ protected String unidadeFederativa;
+
+ @Element(name = "prop", required = false)
+ protected MDFInfoModalRodoviarioVeiculoProp proprietario;
+
public void setCodigoInterno(final String codigoInterno) {
- super.codigoInterno = DFStringValidador.validador(codigoInterno, "Codigo interno Veiculo Reboque", 10, false, false);
+ this.codigoInterno = DFStringValidador.validador(codigoInterno, "Codigo interno Veiculo Reboque", 10, false, false);
+ }
+
+ public String getPlaca() {
+ return this.placa;
}
- @Override
public void setPlaca(final String placa) {
DFStringValidador.placaDeVeiculo(placa, "Placa do reboque");
this.placa = placa;
}
- @Override
+ public String getRenavam() {
+ return this.renavam;
+ }
+
public void setRenavam(final String renavam) {
this.renavam = DFStringValidador.validaIntervalo(renavam, 9, 11, "Renavam do reboque");
}
- @Override
public void setTara(final String tara) {
this.tara = DFStringValidador.capacidadeNDigitos(tara, "Tara em reboque", 5);
}
+ public String getTara() {
+ return this.tara;
+ }
+
public String getCapacidadeKG() {
return this.capacidadeKG;
}
@@ -38,14 +76,40 @@ public class MDFInfoModalRodoviarioVeiculoReboque extends MDFInfoModalRodoviario
this.capacidadeKG = DFStringValidador.capacidadeNDigitos(capacidadeKG, "Capacidade em KG reboque", 5);
}
- @Override
public String getCapacidadeM3() {
return this.capacidadeM3;
}
- @Override
public void setCapacidadeM3(final String capacidadeM3) {
this.capacidadeM3 = DFStringValidador.capacidadeNDigitos(capacidadeM3, "Capacidade em M3 reboque", 2);
}
+ public void setProprietario(final MDFInfoModalRodoviarioVeiculoProp proprietario) {
+ this.proprietario = proprietario;
+ }
+
+ public MDFInfoModalRodoviarioVeiculoProp getProprietario() {
+ return this.proprietario;
+ }
+
+ public MDFTipoCarroceria getTipoCarroceria() {
+ return this.tipoCarroceria;
+ }
+
+ public void setTipoCarroceria(final MDFTipoCarroceria tipoCarroceria) {
+ this.tipoCarroceria = tipoCarroceria;
+ }
+
+ public String getUnidadeFederativa() {
+ return this.unidadeFederativa;
+ }
+
+ public void setUnidadeFederativa(final String unidadeFederativa) {
+ this.unidadeFederativa = unidadeFederativa;
+ }
+
+ public void setUnidadeFederativa(final DFUnidadeFederativa unidadeFederativa) {
+ this.unidadeFederativa = unidadeFederativa.getCodigo();
+ }
+
}
diff --git a/src/test/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFProcessadoTest.java b/src/test/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFProcessadoTest.java
index 1f97a79..dccddca 100644
--- a/src/test/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFProcessadoTest.java
+++ b/src/test/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFProcessadoTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
*/
public class MDFProcessadoTest {
- final String xmlEspected = "<mdfeProc versao=\"3.00\" schemaLocation=\"\" xmlns=\"http://www.portalfiscal.inf.br/mdfe\"><MDFe><infMDFe Id=\"MDFe33200736293264000128580010000000301045981192\" versao=\"3.00\"><ide><cUF>32</cUF><tpAmb>2</tpAmb><tpEmit>2</tpEmit><tpTransp>2</tpTransp><mod>58</mod><serie>1</serie><nMDF>123654</nMDF><cMDF>12345689</cMDF><cDV>1</cDV><modal>1</modal><dhEmi>2019-05-28T11:07:55-03:00</dhEmi><tpEmis>1</tpEmis><procEmi>0</procEmi><verProc>3.0</verProc><UFIni>RJ</UFIni><UFFim>ES</UFFim><infMunCarrega><cMunCarrega>3304557</cMunCarrega><xMunCarrega>Rio de Janeiro</xMunCarrega></infMunCarrega><dhIniViagem>2019-05-28T11:07:55-03:00</dhIniViagem></ide><emit><CNPJ>99999999999999</CNPJ><IE>9999999999</IE><xNome>XXXXXXXXXXXXXXXXXXXX</xNome><xFant>XXXXXXXXXXXXXXXX</xFant><enderEmit><xLgr>VVVVVVVVVVVVV</xLgr><nro>1234</nro><xCpl>ASDFG</xCpl><xBairro>BBBBBBBBBB</xBairro><cMun>3300100</cMun><xMun>Angra dos Reis</xMun><CEP>99999999</CEP><UF>RJ</UF><fone>9999999999</fone><email>[email protected]</email></enderEmit></emit><infModal versaoModal=\"3.00\"><rodo><infANTT><RNTRC>87654321</RNTRC><infCIOT><CIOT>123456789123</CIOT><CNPJ>99999999999999</CNPJ></infCIOT><valePed><disp><CNPJForn>99999999999999</CNPJForn><CPFPg>99999999999</CPFPg><nCompra>999999</nCompra><vValePed>999999.99</vValePed></disp></valePed><infContratante><CNPJ>99999999999999</CNPJ></infContratante><infPag><xNome>NONONONONO NONONO</xNome><CNPJ>99999999999999</CNPJ><Comp><tpComp>99</tpComp><vComp>88888.88</vComp><xComp>COMPCOMPCOMP</xComp></Comp><vContrato>9999.99</vContrato><indPag>1</indPag><infPrazo><nParcela>001</nParcela><dVenc>2020-03-03</dVenc><vParcela>88888.88</vParcela></infPrazo><infBanc><codBanco>001</codBanco><codAgencia>1525</codAgencia></infBanc></infPag></infANTT><veicTracao><cInt>1</cInt><placa>MTX5K56</placa><RENAVAM>99999999999</RENAVAM><tara>888888</tara><capKG>13</capKG><capM3>23</capM3><prop><CPF>99999999999</CPF><RNTRC>55555555</RNTRC><xNome>NONONONO NONONONO</xNome><IE>77777777</IE><UF>ES</UF><tpProp>1</tpProp></prop><condutor><xNome>NONONONO NONONONO</xNome><CPF>99999999999</CPF></condutor><tpRod>02</tpRod><tpCar>01</tpCar><UF>ES</UF></veicTracao><veicReboque><cInt>1</cInt><placa>MTX5K56</placa><RENAVAM>9999999999</RENAVAM><tara>888888</tara><capM3>230</capM3><prop><CPF>99999999999</CPF><RNTRC>55555555</RNTRC><xNome>NONONONO NONONONO</xNome><IE>77777777</IE><UF>ES</UF><tpProp>1</tpProp></prop><tpCar>02</tpCar><UF>ES</UF><capKG>130</capKG></veicReboque></rodo></infModal><infDoc><infMunDescarga><cMunDescarga>3300100</cMunDescarga><xMunDescarga>Angra dos Reis</xMunDescarga><infCTe><chCTe>33333333333333333333333333333333333333333333</chCTe><SegCodBarra>123456789123512345678912351234567891</SegCodBarra><indReentrega>1</indReentrega><infUnidTransp><tpUnidTransp>1</tpUnidTransp><idUnidTransp>258</idUnidTransp><lacUnidTransp><nLacre>1236547890</nLacre></lacUnidTransp><infUnidCarga><tpUnidCarga>1</tpUnidCarga><idUnidCarga>5698</idUnidCarga><lacUnidCarga><nLacre>1236547890</nLacre></lacUnidCarga><qtdRat>65</qtdRat></infUnidCarga><qtdRat>56</qtdRat></infUnidTransp><peri><nONU>4567</nONU><xNomeAE>AAAAAA</xNomeAE><xClaRisco>88</xClaRisco><grEmb>79</grEmb><qTotProd>44</qTotProd><qVolTipo>33</qVolTipo></peri></infCTe><infNFe><chNFe>33333333333333333333333333333333333333333333</chNFe><SegCodBarra>123456789123512345678912351234567892</SegCodBarra><indReentrega>1</indReentrega><infUnidTransp><tpUnidTransp>1</tpUnidTransp><idUnidTransp>258</idUnidTransp><lacUnidTransp><nLacre>1236547890</nLacre></lacUnidTransp><infUnidCarga><tpUnidCarga>1</tpUnidCarga><idUnidCarga>5698</idUnidCarga><lacUnidCarga><nLacre>1236547890</nLacre></lacUnidCarga><qtdRat>65</qtdRat></infUnidCarga><qtdRat>56</qtdRat></infUnidTransp><peri><nONU>4567</nONU><xNomeAE>AAAAAA</xNomeAE><xClaRisco>88</xClaRisco><grEmb>79</grEmb><qTotProd>44</qTotProd><qVolTipo>33</qVolTipo></peri></infNFe><infMDFeTransp><chMDFe>33333333333333333333333333333333333333333333</chMDFe><indReentrega>1</indReentrega><infUnidTransp><tpUnidTransp>1</tpUnidTransp><idUnidTransp>258</idUnidTransp><lacUnidTransp><nLacre>1236547890</nLacre></lacUnidTransp><infUnidCarga><tpUnidCarga>1</tpUnidCarga><idUnidCarga>5698</idUnidCarga><lacUnidCarga><nLacre>1236547890</nLacre></lacUnidCarga><qtdRat>65</qtdRat></infUnidCarga><qtdRat>56</qtdRat></infUnidTransp><peri><nONU>4567</nONU><xNomeAE>AAAAAA</xNomeAE><xClaRisco>88</xClaRisco><grEmb>79</grEmb><qTotProd>44</qTotProd><qVolTipo>33</qVolTipo></peri></infMDFeTransp></infMunDescarga></infDoc><seg><infResp><respSeg>2</respSeg><CNPJ>12345678901234</CNPJ></infResp><infSeg><xSeg>891726585917544010862180488469</xSeg><CNPJ>12345678901234</CNPJ></infSeg><nApol>12457898653245789865</nApol><nAver>1245789865322154879865325487986532154876</nAver><nAver>1245789865322154879865325487986532154877</nAver></seg><prodPred><tpCarga>05</tpCarga><xProd>PRODUTO PRODUTO PRODUTO PRODUTO</xProd><cEAN>SEM GTIN</cEAN><NCM>12345678</NCM><infLotacao><infLocalCarrega><CEP>99999999</CEP></infLocalCarrega><infLocalDescarrega><latitude>-11.235689</latitude><longitude>-32.986572</longitude></infLocalDescarrega></infLotacao></prodPred><tot><qCTe>1</qCTe><qNFe>1</qNFe><qMDFe>1</qMDFe><vCarga>5689.69</vCarga><cUnid>02</cUnid><qCarga>456589.5800</qCarga></tot><lacres><nLacre>0987654321</nLacre></lacres><autXML><CNPJ>99999999999999</CNPJ></autXML><infAdic><infAdFisco>XSSWERTYUIPPASDSDSAFHG</infAdFisco><infCpl>PIUYTRDFBJKLMNHYUIKJNBVFCVG</infCpl></infAdic><infSolicNFF><xSolic>{"id":"1","nome":"NONONO"}</xSolic></infSolicNFF></infMDFe><infMDFeSupl><qrCodMDFe><![CDATA[https://dfe-portal.svrs.rs.gov.br/mdfe/qrCode?chMDFe=33200736293264000128580010000000301045981192&tpAmb=2]]></qrCodMDFe></infMDFeSupl><Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><SignedInfo><CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/><SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/><Reference URI=\"#MDFe33200736293264000128580010000000301045981192\"><Transforms><Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms><DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>DGElW+22IC8ksSISecob4b2l5QU=</DigestValue></Reference></SignedInfo><SignatureValue>hKdILXeEV/2xNpjDEMLR6USZYQF/z9WpHEFXVVwrvPAvuVrR9zpuuLA73zEj3cbwPIJ3x8SSrh5y E22MF2B/HyiE+iOVgljBoOdJY6Ox1N4yzR5Ybz4CyRjDjyj2cDiChWEe3xe/hDtIB5ZSmcsBTegq xoyi/fmfDanqnjIH9pbdej48N+4z4g3z87KBxUgh7cfoRX8YxTIGW8RPwZR6J7pCgtdBx0zxAAD8 X9A8LFYI/EgIBR8BxmAHKRnr2V8GqVKtbmJsY/PPWdsjBF1SAyvVekbvc2BqJOJNbV4IZSWVnsq0 FNWQO1sE9AZMsBseKj4/CYx9VcFRzbZp/M5phw==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIH6DCCBdCgAwIBAgIQdc1vl3hPXUCnmvgAvnw0fDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQG EwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE2MDQGA1UECxMtU2VjcmV0YXJpYSBkYSBSZWNlaXRh IEZlZGVyYWwgZG8gQnJhc2lsIC0gUkZCMRwwGgYDVQQDExNBQyBDZXJ0aXNpZ24gUkZCIEc1MB4X DTIwMDUyNzEzNTQwM1oXDTIxMDUyNzEzNTQwM1owgdkxCzAJBgNVBAYTAkJSMRMwEQYDVQQKDApJ Q1AtQnJhc2lsMQswCQYDVQQIDAJSSjEOMAwGA1UEBwwFTWFjYWUxNjA0BgNVBAsMLVNlY3JldGFy aWEgZGEgUmVjZWl0YSBGZWRlcmFsIGRvIEJyYXNpbCAtIFJGQjEWMBQGA1UECwwNUkZCIGUtQ05Q SiBBMTEXMBUGA1UECwwOMTE4NzEzODgwMDAxMTIxLzAtBgNVBAMMJkdMT0JPTUFSIENPTUVSQ0lB TCBMVERBOjM2MjkzMjY0MDAwMTI4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzX1v mnxpJZfSnKem+e7p16Bh5PiyjYtJ4hhlNQ8bq8hR96NlzrO+Ar72GJQcfUX1oWsd2K2SdnSzD8Q0 UdnTav+Zzu3TKQA8pIdC/tsGQqD7lN9yyxkgv7vcBHoyIf5LOX1BfdNuBpvPdHlqverzRkX7i0O9 Z2+1dZm11aqJqj6rlZ+LSEROOLBj6nPOsgIahwo8rlfpW3F851m6DtBfxULVHEa6m5AcVZKa4uDl 1KoF4C/UUJN/ka++ialk/TWt9GR9hmWEO7oEBbKzwSaAkgimVFkh0g6J+dCRYHSpZLX/makilirT a7ZJJGQPpJ9tbKjT/o1egtAeW0pZaVWdqwIDAQABo4IDCjCCAwYwgbkGA1UdEQSBsTCBrqA9BgVg TAEDBKA0BDIyNjEwMTk1NzQyMDU2NjE2NzM0MDAwMDAwMDAwMDAwMDAwMDAwMDA0MjAwOTJTU1BF U6AfBgVgTAEDAqAWBBRSRU5BVE8gRlJBTkNJU0NPIEdPTqAZBgVgTAEDA6AQBA4zNjI5MzI2NDAw MDEyOKAXBgVgTAEDB6AOBAwwMDAwMDAwMDAwMDCBGEdMT0JPTUFSQEdMT0JPTUFSLkNPTS5CUjAJ BgNVHRMEAjAAMB8GA1UdIwQYMBaAFFN9f52+0WHQILran+OJpxNzWM1CMH8GA1UdIAR4MHYwdAYG YEwBAgEMMGowaAYIKwYBBQUHAgEWXGh0dHA6Ly9pY3AtYnJhc2lsLmNlcnRpc2lnbi5jb20uYnIv cmVwb3NpdG9yaW8vZHBjL0FDX0NlcnRpc2lnbl9SRkIvRFBDX0FDX0NlcnRpc2lnbl9SRkIucGRm MIG8BgNVHR8EgbQwgbEwV6BVoFOGUWh0dHA6Ly9pY3AtYnJhc2lsLmNlcnRpc2lnbi5jb20uYnIv cmVwb3NpdG9yaW8vbGNyL0FDQ2VydGlzaWduUkZCRzUvTGF0ZXN0Q1JMLmNybDBWoFSgUoZQaHR0 cDovL2ljcC1icmFzaWwub3V0cmFsY3IuY29tLmJyL3JlcG9zaXRvcmlvL2xjci9BQ0NlcnRpc2ln blJGQkc1L0xhdGVzdENSTC5jcmwwDgYDVR0PAQH/BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC BggrBgEFBQcDBDCBrAYIKwYBBQUHAQEEgZ8wgZwwXwYIKwYBBQUHMAKGU2h0dHA6Ly9pY3AtYnJh c2lsLmNlcnRpc2lnbi5jb20uYnIvcmVwb3NpdG9yaW8vY2VydGlmaWNhZG9zL0FDX0NlcnRpc2ln bl9SRkJfRzUucDdjMDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC1hYy1jZXJ0aXNpZ24tcmZiLmNl cnRpc2lnbi5jb20uYnIwDQYJKoZIhvcNAQELBQADggIBAKm3NO8lmyabocQTKdfD2/7URoLF7Jie qkKChvgPRfXTcS5vuoAbXfyAHwHIE9vinS0NegjcOAtpsWtY0dm4A4zxiPom9TKz2fQSH2qCYOxm d6DH4i0QTZS9sqjX8WMiLpAj0KgbjH1L7QUfe0y3TKTM5c37ZN0Wn6URW16vfY/SHPHGz5hWIW0K 4Dsr2H2AXikixfwGekoBTyGvRy7waqmiNU2DPNndDTyS79IoDc+wzuNG5cehljMpgPHi1DlikD3o UPW6MMrQpwjJsejj0+6lzR72zDwOcB1B7Sv8zNEjcqekkx89xaKQAVz3S1moUbLvPXE+b6i4ZYAM LQoIng8w3eyDzfucxwPevjFxePniRM5aLhEG7ArQWdKoc9SgovEg1prT2QA5JrZfeS3jHywel+tC pwz06aM7aBMXUvNVlMzia0ixgHT7S00zzs7YeRE4CxLzX/0imn9nl5G9cfOrOyUPm61x/m4fzyGO 1jc3vlv3KNRdzvAKQecpLTxAuIU1v0J0vUjSjjKpbtFmHrLrsCQHhPCqcgKAgV7UdU/FZtaIDr+G 8xho1HSuXGi+klzQXdPE7QGJw8rnVAUMo75vkfihYtZQpjLypfQGtlcuXdC9XOQdbIGjWqrZYmHh O7z7O+bKzTEIMG5C9M0wJU2KzK+2jspLWHJCw4zHUIsq</X509Certificate></X509Data></KeyInfo></Signature></MDFe><protMDFe versao=\"3.00\"><infProt><tpAmb>2</tpAmb><verAplic>RS20200626134456</verAplic><chMDFe>33200736293264000128580010000000301045981192</chMDFe><dhRecbto>2020-07-02T23:29:33-03:00</dhRecbto><nProt>999999999999999</nProt><digVal>DGElW+22IC8ksSISecob4b2l5QU=</digVal><cStat>100</cStat><xMotivo>Autorizado o uso do MDF-e</xMotivo></infProt></protMDFe></mdfeProc>";
+ final String xmlEspected = "<mdfeProc versao=\"3.00\" schemaLocation=\"\" xmlns=\"http://www.portalfiscal.inf.br/mdfe\"><MDFe><infMDFe Id=\"MDFe33200736293264000128580010000000301045981192\" versao=\"3.00\"><ide><cUF>32</cUF><tpAmb>2</tpAmb><tpEmit>2</tpEmit><tpTransp>2</tpTransp><mod>58</mod><serie>1</serie><nMDF>123654</nMDF><cMDF>12345689</cMDF><cDV>1</cDV><modal>1</modal><dhEmi>2019-05-28T11:07:55-03:00</dhEmi><tpEmis>1</tpEmis><procEmi>0</procEmi><verProc>3.0</verProc><UFIni>RJ</UFIni><UFFim>ES</UFFim><infMunCarrega><cMunCarrega>3304557</cMunCarrega><xMunCarrega>Rio de Janeiro</xMunCarrega></infMunCarrega><dhIniViagem>2019-05-28T11:07:55-03:00</dhIniViagem></ide><emit><CNPJ>99999999999999</CNPJ><IE>9999999999</IE><xNome>XXXXXXXXXXXXXXXXXXXX</xNome><xFant>XXXXXXXXXXXXXXXX</xFant><enderEmit><xLgr>VVVVVVVVVVVVV</xLgr><nro>1234</nro><xCpl>ASDFG</xCpl><xBairro>BBBBBBBBBB</xBairro><cMun>3300100</cMun><xMun>Angra dos Reis</xMun><CEP>99999999</CEP><UF>RJ</UF><fone>9999999999</fone><email>[email protected]</email></enderEmit></emit><infModal versaoModal=\"3.00\"><rodo><infANTT><RNTRC>87654321</RNTRC><infCIOT><CIOT>123456789123</CIOT><CNPJ>99999999999999</CNPJ></infCIOT><valePed><disp><CNPJForn>99999999999999</CNPJForn><CPFPg>99999999999</CPFPg><nCompra>999999</nCompra><vValePed>999999.99</vValePed></disp></valePed><infContratante><CNPJ>99999999999999</CNPJ></infContratante><infPag><xNome>NONONONONO NONONO</xNome><CNPJ>99999999999999</CNPJ><Comp><tpComp>99</tpComp><vComp>88888.88</vComp><xComp>COMPCOMPCOMP</xComp></Comp><vContrato>9999.99</vContrato><indPag>1</indPag><infPrazo><nParcela>001</nParcela><dVenc>2020-03-03</dVenc><vParcela>88888.88</vParcela></infPrazo><infBanc><codBanco>001</codBanco><codAgencia>1525</codAgencia></infBanc></infPag></infANTT><veicTracao><cInt>1</cInt><placa>MTX5K56</placa><RENAVAM>99999999999</RENAVAM><tara>888888</tara><capKG>13</capKG><capM3>23</capM3><prop><CPF>99999999999</CPF><RNTRC>55555555</RNTRC><xNome>NONONONO NONONONO</xNome><IE>77777777</IE><UF>ES</UF><tpProp>1</tpProp></prop><condutor><xNome>NONONONO NONONONO</xNome><CPF>99999999999</CPF></condutor><tpRod>02</tpRod><tpCar>01</tpCar><UF>ES</UF></veicTracao><veicReboque><cInt>1</cInt><placa>MTX5K56</placa><RENAVAM>9999999999</RENAVAM><tara>888888</tara><capKG>130</capKG><capM3>230</capM3><tpCar>02</tpCar><UF>ES</UF><prop><CPF>99999999999</CPF><RNTRC>55555555</RNTRC><xNome>NONONONO NONONONO</xNome><IE>77777777</IE><UF>ES</UF><tpProp>1</tpProp></prop></veicReboque></rodo></infModal><infDoc><infMunDescarga><cMunDescarga>3300100</cMunDescarga><xMunDescarga>Angra dos Reis</xMunDescarga><infCTe><chCTe>33333333333333333333333333333333333333333333</chCTe><SegCodBarra>123456789123512345678912351234567891</SegCodBarra><indReentrega>1</indReentrega><infUnidTransp><tpUnidTransp>1</tpUnidTransp><idUnidTransp>258</idUnidTransp><lacUnidTransp><nLacre>1236547890</nLacre></lacUnidTransp><infUnidCarga><tpUnidCarga>1</tpUnidCarga><idUnidCarga>5698</idUnidCarga><lacUnidCarga><nLacre>1236547890</nLacre></lacUnidCarga><qtdRat>65</qtdRat></infUnidCarga><qtdRat>56</qtdRat></infUnidTransp><peri><nONU>4567</nONU><xNomeAE>AAAAAA</xNomeAE><xClaRisco>88</xClaRisco><grEmb>79</grEmb><qTotProd>44</qTotProd><qVolTipo>33</qVolTipo></peri></infCTe><infNFe><chNFe>33333333333333333333333333333333333333333333</chNFe><SegCodBarra>123456789123512345678912351234567892</SegCodBarra><indReentrega>1</indReentrega><infUnidTransp><tpUnidTransp>1</tpUnidTransp><idUnidTransp>258</idUnidTransp><lacUnidTransp><nLacre>1236547890</nLacre></lacUnidTransp><infUnidCarga><tpUnidCarga>1</tpUnidCarga><idUnidCarga>5698</idUnidCarga><lacUnidCarga><nLacre>1236547890</nLacre></lacUnidCarga><qtdRat>65</qtdRat></infUnidCarga><qtdRat>56</qtdRat></infUnidTransp><peri><nONU>4567</nONU><xNomeAE>AAAAAA</xNomeAE><xClaRisco>88</xClaRisco><grEmb>79</grEmb><qTotProd>44</qTotProd><qVolTipo>33</qVolTipo></peri></infNFe><infMDFeTransp><chMDFe>33333333333333333333333333333333333333333333</chMDFe><indReentrega>1</indReentrega><infUnidTransp><tpUnidTransp>1</tpUnidTransp><idUnidTransp>258</idUnidTransp><lacUnidTransp><nLacre>1236547890</nLacre></lacUnidTransp><infUnidCarga><tpUnidCarga>1</tpUnidCarga><idUnidCarga>5698</idUnidCarga><lacUnidCarga><nLacre>1236547890</nLacre></lacUnidCarga><qtdRat>65</qtdRat></infUnidCarga><qtdRat>56</qtdRat></infUnidTransp><peri><nONU>4567</nONU><xNomeAE>AAAAAA</xNomeAE><xClaRisco>88</xClaRisco><grEmb>79</grEmb><qTotProd>44</qTotProd><qVolTipo>33</qVolTipo></peri></infMDFeTransp></infMunDescarga></infDoc><seg><infResp><respSeg>2</respSeg><CNPJ>12345678901234</CNPJ></infResp><infSeg><xSeg>891726585917544010862180488469</xSeg><CNPJ>12345678901234</CNPJ></infSeg><nApol>12457898653245789865</nApol><nAver>1245789865322154879865325487986532154876</nAver><nAver>1245789865322154879865325487986532154877</nAver></seg><prodPred><tpCarga>05</tpCarga><xProd>PRODUTO PRODUTO PRODUTO PRODUTO</xProd><cEAN>SEM GTIN</cEAN><NCM>12345678</NCM><infLotacao><infLocalCarrega><CEP>99999999</CEP></infLocalCarrega><infLocalDescarrega><latitude>-11.235689</latitude><longitude>-32.986572</longitude></infLocalDescarrega></infLotacao></prodPred><tot><qCTe>1</qCTe><qNFe>1</qNFe><qMDFe>1</qMDFe><vCarga>5689.69</vCarga><cUnid>02</cUnid><qCarga>456589.5800</qCarga></tot><lacres><nLacre>0987654321</nLacre></lacres><autXML><CNPJ>99999999999999</CNPJ></autXML><infAdic><infAdFisco>XSSWERTYUIPPASDSDSAFHG</infAdFisco><infCpl>PIUYTRDFBJKLMNHYUIKJNBVFCVG</infCpl></infAdic><infSolicNFF><xSolic>{"id":"1","nome":"NONONO"}</xSolic></infSolicNFF></infMDFe><infMDFeSupl><qrCodMDFe><![CDATA[https://dfe-portal.svrs.rs.gov.br/mdfe/qrCode?chMDFe=33200736293264000128580010000000301045981192&tpAmb=2]]></qrCodMDFe></infMDFeSupl><Signature xmlns=\"http://www.w3.org/2000/09/xmldsig#\"><SignedInfo><CanonicalizationMethod Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/><SignatureMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#rsa-sha1\"/><Reference URI=\"#MDFe33200736293264000128580010000000301045981192\"><Transforms><Transform Algorithm=\"http://www.w3.org/2000/09/xmldsig#enveloped-signature\"/><Transform Algorithm=\"http://www.w3.org/TR/2001/REC-xml-c14n-20010315\"/></Transforms><DigestMethod Algorithm=\"http://www.w3.org/2000/09/xmldsig#sha1\"/><DigestValue>DGElW+22IC8ksSISecob4b2l5QU=</DigestValue></Reference></SignedInfo><SignatureValue>hKdILXeEV/2xNpjDEMLR6USZYQF/z9WpHEFXVVwrvPAvuVrR9zpuuLA73zEj3cbwPIJ3x8SSrh5y E22MF2B/HyiE+iOVgljBoOdJY6Ox1N4yzR5Ybz4CyRjDjyj2cDiChWEe3xe/hDtIB5ZSmcsBTegq xoyi/fmfDanqnjIH9pbdej48N+4z4g3z87KBxUgh7cfoRX8YxTIGW8RPwZR6J7pCgtdBx0zxAAD8 X9A8LFYI/EgIBR8BxmAHKRnr2V8GqVKtbmJsY/PPWdsjBF1SAyvVekbvc2BqJOJNbV4IZSWVnsq0 FNWQO1sE9AZMsBseKj4/CYx9VcFRzbZp/M5phw==</SignatureValue><KeyInfo><X509Data><X509Certificate>MIIH6DCCBdCgAwIBAgIQdc1vl3hPXUCnmvgAvnw0fDANBgkqhkiG9w0BAQsFADB4MQswCQYDVQQG EwJCUjETMBEGA1UEChMKSUNQLUJyYXNpbDE2MDQGA1UECxMtU2VjcmV0YXJpYSBkYSBSZWNlaXRh IEZlZGVyYWwgZG8gQnJhc2lsIC0gUkZCMRwwGgYDVQQDExNBQyBDZXJ0aXNpZ24gUkZCIEc1MB4X DTIwMDUyNzEzNTQwM1oXDTIxMDUyNzEzNTQwM1owgdkxCzAJBgNVBAYTAkJSMRMwEQYDVQQKDApJ Q1AtQnJhc2lsMQswCQYDVQQIDAJSSjEOMAwGA1UEBwwFTWFjYWUxNjA0BgNVBAsMLVNlY3JldGFy aWEgZGEgUmVjZWl0YSBGZWRlcmFsIGRvIEJyYXNpbCAtIFJGQjEWMBQGA1UECwwNUkZCIGUtQ05Q SiBBMTEXMBUGA1UECwwOMTE4NzEzODgwMDAxMTIxLzAtBgNVBAMMJkdMT0JPTUFSIENPTUVSQ0lB TCBMVERBOjM2MjkzMjY0MDAwMTI4MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzX1v mnxpJZfSnKem+e7p16Bh5PiyjYtJ4hhlNQ8bq8hR96NlzrO+Ar72GJQcfUX1oWsd2K2SdnSzD8Q0 UdnTav+Zzu3TKQA8pIdC/tsGQqD7lN9yyxkgv7vcBHoyIf5LOX1BfdNuBpvPdHlqverzRkX7i0O9 Z2+1dZm11aqJqj6rlZ+LSEROOLBj6nPOsgIahwo8rlfpW3F851m6DtBfxULVHEa6m5AcVZKa4uDl 1KoF4C/UUJN/ka++ialk/TWt9GR9hmWEO7oEBbKzwSaAkgimVFkh0g6J+dCRYHSpZLX/makilirT a7ZJJGQPpJ9tbKjT/o1egtAeW0pZaVWdqwIDAQABo4IDCjCCAwYwgbkGA1UdEQSBsTCBrqA9BgVg TAEDBKA0BDIyNjEwMTk1NzQyMDU2NjE2NzM0MDAwMDAwMDAwMDAwMDAwMDAwMDA0MjAwOTJTU1BF U6AfBgVgTAEDAqAWBBRSRU5BVE8gRlJBTkNJU0NPIEdPTqAZBgVgTAEDA6AQBA4zNjI5MzI2NDAw MDEyOKAXBgVgTAEDB6AOBAwwMDAwMDAwMDAwMDCBGEdMT0JPTUFSQEdMT0JPTUFSLkNPTS5CUjAJ BgNVHRMEAjAAMB8GA1UdIwQYMBaAFFN9f52+0WHQILran+OJpxNzWM1CMH8GA1UdIAR4MHYwdAYG YEwBAgEMMGowaAYIKwYBBQUHAgEWXGh0dHA6Ly9pY3AtYnJhc2lsLmNlcnRpc2lnbi5jb20uYnIv cmVwb3NpdG9yaW8vZHBjL0FDX0NlcnRpc2lnbl9SRkIvRFBDX0FDX0NlcnRpc2lnbl9SRkIucGRm MIG8BgNVHR8EgbQwgbEwV6BVoFOGUWh0dHA6Ly9pY3AtYnJhc2lsLmNlcnRpc2lnbi5jb20uYnIv cmVwb3NpdG9yaW8vbGNyL0FDQ2VydGlzaWduUkZCRzUvTGF0ZXN0Q1JMLmNybDBWoFSgUoZQaHR0 cDovL2ljcC1icmFzaWwub3V0cmFsY3IuY29tLmJyL3JlcG9zaXRvcmlvL2xjci9BQ0NlcnRpc2ln blJGQkc1L0xhdGVzdENSTC5jcmwwDgYDVR0PAQH/BAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMC BggrBgEFBQcDBDCBrAYIKwYBBQUHAQEEgZ8wgZwwXwYIKwYBBQUHMAKGU2h0dHA6Ly9pY3AtYnJh c2lsLmNlcnRpc2lnbi5jb20uYnIvcmVwb3NpdG9yaW8vY2VydGlmaWNhZG9zL0FDX0NlcnRpc2ln bl9SRkJfRzUucDdjMDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC1hYy1jZXJ0aXNpZ24tcmZiLmNl cnRpc2lnbi5jb20uYnIwDQYJKoZIhvcNAQELBQADggIBAKm3NO8lmyabocQTKdfD2/7URoLF7Jie qkKChvgPRfXTcS5vuoAbXfyAHwHIE9vinS0NegjcOAtpsWtY0dm4A4zxiPom9TKz2fQSH2qCYOxm d6DH4i0QTZS9sqjX8WMiLpAj0KgbjH1L7QUfe0y3TKTM5c37ZN0Wn6URW16vfY/SHPHGz5hWIW0K 4Dsr2H2AXikixfwGekoBTyGvRy7waqmiNU2DPNndDTyS79IoDc+wzuNG5cehljMpgPHi1DlikD3o UPW6MMrQpwjJsejj0+6lzR72zDwOcB1B7Sv8zNEjcqekkx89xaKQAVz3S1moUbLvPXE+b6i4ZYAM LQoIng8w3eyDzfucxwPevjFxePniRM5aLhEG7ArQWdKoc9SgovEg1prT2QA5JrZfeS3jHywel+tC pwz06aM7aBMXUvNVlMzia0ixgHT7S00zzs7YeRE4CxLzX/0imn9nl5G9cfOrOyUPm61x/m4fzyGO 1jc3vlv3KNRdzvAKQecpLTxAuIU1v0J0vUjSjjKpbtFmHrLrsCQHhPCqcgKAgV7UdU/FZtaIDr+G 8xho1HSuXGi+klzQXdPE7QGJw8rnVAUMo75vkfihYtZQpjLypfQGtlcuXdC9XOQdbIGjWqrZYmHh O7z7O+bKzTEIMG5C9M0wJU2KzK+2jspLWHJCw4zHUIsq</X509Certificate></X509Data></KeyInfo></Signature></MDFe><protMDFe versao=\"3.00\"><infProt><tpAmb>2</tpAmb><verAplic>RS20200626134456</verAplic><chMDFe>33200736293264000128580010000000301045981192</chMDFe><dhRecbto>2020-07-02T23:29:33-03:00</dhRecbto><nProt>999999999999999</nProt><digVal>DGElW+22IC8ksSISecob4b2l5QU=</digVal><cStat>100</cStat><xMotivo>Autorizado o uso do MDF-e</xMotivo></infProt></protMDFe></mdfeProc>";
final String xmlActual = FabricaDeObjetosFakeMDFe.getMDFProcessado().toString();
@Test
| https://github.com/wmixvideo/nfe.gitdiff --git a/src/main/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFInfoModalRodoviarioVeiculoReboque.java b/src/main/java/com/fincatto/documentofiscal/mdfe3/classes/nota/MDFInfoModalRodoviarioVeiculoReboque.java |
gitbug-java_data_beanshell-beanshell.json_1 | diff --git a/src/main/java/bsh/Reflect.java b/src/main/java/bsh/Reflect.java
index 214b91f..996abaa 100644
--- a/src/main/java/bsh/Reflect.java
+++ b/src/main/java/bsh/Reflect.java
@@ -1064,13 +1064,20 @@ public final class Reflect {
}
/*
- * Get method from namespace
+ * Get declared method from namespace
*/
public static BshMethod getMethod(NameSpace ns, String name, Class<?>[] sig) {
+ return getMethod(ns, name, sig, true);
+ }
+
+ /*
+ * Get method from namespace
+ */
+ public static BshMethod getMethod(NameSpace ns, String name, Class<?>[] sig, boolean declaredOnly) {
if (null == ns)
return null;
try {
- return ns.getMethod(name, sig, true);
+ return ns.getMethod(name, sig, declaredOnly);
} catch (Exception e) {
return null;
}
diff --git a/src/main/java/bsh/This.java b/src/main/java/bsh/This.java
index 353cf6c..f519c81 100644
--- a/src/main/java/bsh/This.java
+++ b/src/main/java/bsh/This.java
@@ -219,11 +219,8 @@ public final class This implements java.io.Serializable, Runnable
otherwise callers from outside in Java will not see a the
proxy object as equal to itself.
*/
- BshMethod equalsMethod = null;
- try {
- equalsMethod = namespace.getMethod(
- "equals", new Class<?>[] { Object.class } );
- } catch ( UtilEvalError e ) {/*leave null*/ }
+ BshMethod equalsMethod = Reflect.getMethod(
+ namespace, "equals", new Class<?>[] { Object.class } );
if ( methodName.equals("equals" ) && equalsMethod == null ) {
Object obj = args[0];
return proxy == obj;
@@ -233,14 +230,10 @@ public final class This implements java.io.Serializable, Runnable
If toString() is not explicitly defined override the default
to show the proxy interfaces.
*/
- BshMethod toStringMethod = null;
- try {
- toStringMethod =
- namespace.getMethod( "toString", new Class<?>[] { } );
- } catch ( UtilEvalError e ) {/*leave null*/ }
+ BshMethod toStringMethod = Reflect.getMethod(
+ namespace, "toString", new Class<?>[] { } );
- if ( methodName.equals("toString" ) && toStringMethod == null)
- {
+ if ( methodName.equals("toString" ) && toStringMethod == null) {
Class<?>[] ints = proxy.getClass().getInterfaces();
// XThis.this refers to the enclosing class instance
StringBuilder sb = new StringBuilder(
@@ -268,6 +261,10 @@ public final class This implements java.io.Serializable, Runnable
}
public String toString() {
+ BshMethod toString = Reflect.getMethod(namespace, "toString", new Class<?>[0]);
+ if (null != toString) try {
+ return (String)toString.invoke(new Object[0], declaringInterpreter);
+ } catch (EvalError e) { /* ignore we tried */ }
return "'this' reference to Bsh object: " + namespace;
}
@@ -381,10 +378,8 @@ public final class This implements java.io.Serializable, Runnable
// Find the bsh method
Class<?>[] types = Types.getTypes( args );
- BshMethod bshMethod = null;
- try {
- bshMethod = namespace.getMethod( methodName, types, declaredOnly );
- } catch ( UtilEvalError e ) { /*leave null*/ }
+ BshMethod bshMethod = Reflect.getMethod(
+ namespace, methodName, types, declaredOnly );
if ( bshMethod != null )
return bshMethod.invoke( args, interpreter, callstack, callerInfo );
@@ -401,7 +396,7 @@ public final class This implements java.io.Serializable, Runnable
*/
// a default getClass() that returns the namespace instance class
if ( methodName.equals("getClass") && args.length==0 )
- return This.class;
+ return getClass();
// a default toString() that shows the interfaces we implement
if ( methodName.equals("toString") && args.length==0 )
@@ -418,22 +413,20 @@ public final class This implements java.io.Serializable, Runnable
}
// a default clone() method
- if ( methodName.equals("clone") && args.length==0 ) {
+ if ( methodName.equals("clone") && args.length==0 )
return cloneMethodImpl(callerInfo, callstack);
- }
// Look for a default invoke() handler method in the namespace
boolean[] outHasMethod = new boolean[1];
Object result = namespace.invokeDefaultInvokeMethod(methodName, args,
interpreter, callstack, callerInfo, outHasMethod);
- if ( outHasMethod[0] )
- return result;
+ if ( outHasMethod[0] ) return result;
// Finally look for any command in this namespace that might qualify
try {
return namespace.invokeCommand(
methodName, args, interpreter, callstack, callerInfo, true);
- } catch (EvalError e) {
+ } catch (EvalError e) {
throw new EvalError("Method " +
StringUtil.methodString( methodName, types ) +
" not found in bsh scripted object: "+ namespace.getName(),
@@ -681,7 +674,8 @@ public final class This implements java.io.Serializable, Runnable
args = This.CONTEXT_ARGS.get().remove(instance.toString());
// Find the constructor (now in the instance namespace)
- BshMethod constructor = instanceNameSpace.getMethod(Types.getBaseName(className), Types.getTypes(args), true/*declaredOnly*/);
+ BshMethod constructor = instanceNameSpace.getMethod(
+ Types.getBaseName(className), Types.getTypes(args), true/*declaredOnly*/);
// if args, we must have constructor
if (args.length > 0 && constructor == null)
diff --git a/src/test/resources/test-scripts/scripted_object.bsh b/src/test/resources/test-scripts/scripted_object.bsh
index 4ab989e..ec8b64c 100644
--- a/src/test/resources/test-scripts/scripted_object.bsh
+++ b/src/test/resources/test-scripts/scripted_object.bsh
@@ -57,4 +57,14 @@ assertThat("Test equality of list item", c.ylds, hasItem(c.ylds.get(0)));
assertThat("New reference only has one item in list", d.ylds, iterableWithSize(1));
assertEquals("New reference assigned value", "goodbye", d.ylds.get(0).c);
+// scripted object overwrite toString #371
+
+overwriteToString() {
+ toString() {
+ return "I am overwriteToString";
+ }
+ return this;
+}
+assertEquals("I am overwriteToString", "" + overwriteToString());
+
complete();
| https://github.com/beanshell/beanshell.gitdiff --git a/src/main/java/bsh/Reflect.java b/src/main/java/bsh/Reflect.java |
gitbug-java_data_beanshell-beanshell.json_2 | diff --git a/src/main/java/bsh/Operators.java b/src/main/java/bsh/Operators.java
index 53e943b..837d03e 100644
--- a/src/main/java/bsh/Operators.java
+++ b/src/main/java/bsh/Operators.java
@@ -67,8 +67,9 @@ class Operators implements ParserConstants {
if ( kind == PLUS ) {
// String concatenation operation
if ( lhs instanceof String || rhs instanceof String )
- return String.valueOf((Object) lhs)
- + String.valueOf((Object) rhs);
+ return BSHLiteral.internStrings
+ ? (String.valueOf((Object) lhs) + String.valueOf((Object) rhs)).intern()
+ : String.valueOf((Object) lhs) + String.valueOf((Object) rhs);
// array concatenation operation
if ( lhs.getClass().isArray() && rhs instanceof List )
rhs = ((List<?>) rhs).toArray();
diff --git a/src/test/resources/test-scripts/strings.bsh b/src/test/resources/test-scripts/strings.bsh
index e29e118..13bed25 100644
--- a/src/test/resources/test-scripts/strings.bsh
+++ b/src/test/resources/test-scripts/strings.bsh
@@ -4,6 +4,9 @@ source("TestHarness.bsh");
source("Assert.bsh");
import bsh.BSHLiteral;
+boolean currentInternStrings = BSHLiteral.internStrings;
+BSHLiteral.internStrings = true;
+
// char is not a string
assert('a' == 'a');
assert('a' != "a");
@@ -149,4 +152,40 @@ assert( a.equals('foobar5nulla') );
b="foo"+"bar"+5;
assert(b.equals('foobar5'));
+// String constants comparison (intern strings on) see #343
+BSHLiteral.internStrings = true;
+String s0 = "dcba";
+String s1 = "dcb"+"a";
+String s2 = new String("dcba");
+String s3 = "dc";
+s3 += "ba";
+assertTrue("s0.equals(s1) is true", s0.equals(s1));
+assertTrue("s0.equals(s2) is true", s0.equals(s2));
+assertTrue("s0.equals(s3) is true", s0.equals(s3));
+assertTrue("s0 == s1 is true", s0 == s1);
+assertFalse("s0 == s2 is false", s0 == s2);
+assertTrue("s0 == s3 is true", s0 == s3);
+assertTrue("'h'+'gfe' == 'hg'+'fe' is true", 'h'+'gfe' == 'hg'+'fe');
+assertTrue('"lkj"+"i" == "lk"+"ji" is true', "lkj"+"i" == "lk"+"ji");
+
+// without string constant comparison (intern strings off)
+BSHLiteral.internStrings = false;
+String s0 = "ponm";
+String s1 = "pon"+"m";
+String s2 = new String("ponm");
+String s3 = "po";
+s3 += "nm";
+assertTrue("s0.equals(s1) is true", s0.equals(s1));
+assertTrue("s0.equals(s2) is true", s0.equals(s2));
+assertTrue("s0.equals(s3) is true", s0.equals(s3));
+assertFalse("s0 == s1 is false", s0 == s1);
+assertFalse("s0 == s2 is false", s0 == s2);
+assertFalse("s0 == s3 is false", s0 == s3);
+assertFalse("'t'+'srq' == 'ts'+'rq' is false", 't'+'srq' == 'ts'+'rq');
+assertFalse('"xwv"+"u" == "xw"+"vu" is false', "xwv"+"u" == "xw"+"vu");
+BSHLiteral.internStrings = true;
+
+// reset intern strings flag the way we found it
+BSHLiteral.internStrings = currentInternStrings;
+
complete();
| https://github.com/beanshell/beanshell.gitdiff --git a/src/main/java/bsh/Operators.java b/src/main/java/bsh/Operators.java |
gitbug-java_data_YehiaFarghaly-database-engine.json_1 | diff --git a/src/main/java/app/DBApp.java b/src/main/java/app/DBApp.java
index 61482c9..f42ee64 100644
--- a/src/main/java/app/DBApp.java
+++ b/src/main/java/app/DBApp.java
@@ -72,7 +72,7 @@ public class DBApp implements IDatabase {
*
* @throws DBAppException If the table name is invalid or if the table already
* exists.
- * @throws ParseException
+ * @throws ParseException
* @throws IOException If an error occurs while creating the table files.
*/
@Override
@@ -80,14 +80,13 @@ public class DBApp implements IDatabase {
Hashtable<String, String> htblColNameType, Hashtable<String, String> htblColNameMin,
Hashtable<String, String> htblColNameMax) throws DBAppException {
- Validator.validateTableCreation(myTables, strTableName,
- strClusteringKeyColumn, htblColNameType, htblColNameMin,
- htblColNameMax);
+ Validator.validateTableCreation(myTables, strTableName, strClusteringKeyColumn, htblColNameType, htblColNameMin,
+ htblColNameMax);
Table table = new Table(strTableName, strClusteringKeyColumn, htblColNameType, htblColNameMin, htblColNameMax);
myTables.add(strTableName);
writer.write(table);
-
+
try {
table.createTableFiles();
Serializer.serializeTable(table);
@@ -176,22 +175,22 @@ public class DBApp implements IDatabase {
private void takeAction(Action action, String strTableName, Hashtable<String, Object> htblColNameValue)
throws DBAppException {
try {
+ Validator.validateTable(strTableName, myTables);
Table table = Serializer.deserializeTable(strTableName);
if (action == Action.INSERT) {
- Validator.validateInsertionInput(table, htblColNameValue, myTables);
+ Validator.validateInsertionInput(table, htblColNameValue, myTables);
table.insertTuple(htblColNameValue);
} else if (action == Action.DELETE) {
- Validator.validateDeletionInput(table, htblColNameValue, myTables);
+ Validator.validateDeletionInput(table, htblColNameValue, myTables);
table.deleteTuples(htblColNameValue);
} else {
castClusteringKeyType(table);
htblColNameValue.put(table.getPKColumn(), clusteringKey);
- Validator.validateUpdateInput(table, htblColNameValue, myTables);
+ Validator.validateUpdateInput(table, htblColNameValue, myTables);
table.updateRecordsInTaple(clusteringKey, htblColNameValue);
}
Serializer.serializeTable(table);
- } catch (Exception e) {
- e.printStackTrace();
+ } catch (CsvValidationException | ClassNotFoundException | IOException | ParseException e1) {
}
}
@@ -202,4 +201,23 @@ public class DBApp implements IDatabase {
public Iterator selectFromTable(SQLTerm[] arrSQLTerms, String[] strarrOperators) throws DBAppException {
return new Selector(arrSQLTerms, strarrOperators).getResult();
}
+
+ public static void main(String[] args) throws DBAppException {
+ DBApp engine = new DBApp();
+ engine.init();
+ Hashtable<String, String> htblColNameType = new Hashtable<>();
+ htblColNameType.put("course_id", "java.lang.String");
+ htblColNameType.put("courseName", "java.lang.String");
+
+ Hashtable<String, String> htblColNameMin = new Hashtable<>();
+ htblColNameMin.put("course_id", "9999");
+ htblColNameMin.put("courseName", "AAAAA");
+
+ Hashtable<String, String> htblColNameMax = new Hashtable<>();
+ htblColNameMax.put("course_id", "0000");
+ htblColNameMax.put("courseName", "zzzz");
+
+ engine.createTable("newTable", "course_id", htblColNameType, htblColNameMin, htblColNameMax);
+
+ }
}
diff --git a/src/main/java/util/validation/Validator.java b/src/main/java/util/validation/Validator.java
index 515a390..f9504eb 100644
--- a/src/main/java/util/validation/Validator.java
+++ b/src/main/java/util/validation/Validator.java
@@ -25,10 +25,10 @@ public class Validator {
String strClusteringKeyColumn, Hashtable<String, String> htblColNameType,
Hashtable<String, String> htblColNameMin, Hashtable<String, String> htblColNameMax) throws DBAppException {
- if (validTable(strTableName, appTables)) {
+ if (isValidTable(strTableName, appTables)) {
throw new DBAppException(Constants.ERROR_MESSAGE_REPEATED_TABLE_NAME);
- } else if (!validClusteringKey(strClusteringKeyColumn, htblColNameMax)) {
+ } else if (!validClusteringKey(strClusteringKeyColumn, htblColNameType)) {
throw new DBAppException(Constants.ERROR_MESSAGE_INVALID_CLUSTERINGKEY);
} else if (!validDataTypes(htblColNameType)) {
@@ -41,6 +41,12 @@ public class Validator {
}
}
+ public static void validateTable(String tableName, HashSet<String> myTables) throws DBAppException {
+ if (!isValidTable(tableName, myTables)) {
+ throw new DBAppException(Constants.ERROR_MESSAGE_TABLE_NAME);
+ }
+ }
+
private static boolean validClusteringKey(String strClusteringKeyColumn,
Hashtable<String, String> htblColNameType) {
if (strClusteringKeyColumn != null && htblColNameType.containsKey(strClusteringKeyColumn)) {
@@ -87,9 +93,6 @@ public class Validator {
public static void validateInsertionInput(Table table, Hashtable<String, Object> htblColNameValue,
HashSet<String> appTables)
throws DBAppException, CsvValidationException, ClassNotFoundException, IOException, ParseException {
-
- if (!validTable(table.getName(), appTables))
- throw new DBAppException(Constants.ERROR_MESSAGE_TABLE_NAME);
if (!validTuple(table, htblColNameValue))
throw new DBAppException(Constants.ERROR_MESSAGE_TUPLE_DATA);
}
@@ -97,22 +100,18 @@ public class Validator {
public static void validateDeletionInput(Table table, Hashtable<String, Object> htblColNameValue,
HashSet<String> appTables) throws DBAppException {
getTableInfo(table);
- if (!validTable(table.getName(), appTables))
- throw new DBAppException(Constants.ERROR_MESSAGE_TABLE_NAME);
- else if (!validTupleDelete(htblColNameValue))
+ if (!validTupleDelete(htblColNameValue))
throw new DBAppException(Constants.ERROR_MESSAGE_TUPLE_DATA);
}
public static void validateUpdateInput(Table table, Hashtable<String, Object> htblColNameValue,
HashSet<String> appTables)
throws DBAppException, CsvValidationException, ClassNotFoundException, IOException, ParseException {
- if (!validTable(table.getName(), appTables))
- throw new DBAppException(Constants.ERROR_MESSAGE_TABLE_NAME);
if (!validTupleUpdate(table, htblColNameValue))
throw new DBAppException(Constants.ERROR_MESSAGE_TUPLE_DATA);
}
- private static boolean validTable(String tableName, HashSet<String> myTables) {
+ private static boolean isValidTable(String tableName, HashSet<String> myTables) {
return myTables.contains(tableName);
}
@@ -210,16 +209,15 @@ public class Validator {
private static boolean isTheSameDataType(Hashtable<String, Object> tuple) {
for (int i = 0; i < columns.length; i++) {
if (!sameSuffix(tuple, columns[i], i))
-
+
return false;
}
return true;
}
-
+
private static boolean validTupleDelete(Hashtable<String, Object> htblColNameValue) {
- if (!isTheSameDataTypeMissingCol(htblColNameValue) ||
- !checkTupleSize(htblColNameValue) ||
- !containsAllColumns(htblColNameValue))
+ if (!isTheSameDataTypeMissingCol(htblColNameValue) || !checkTupleSize(htblColNameValue)
+ || !containsAllColumns(htblColNameValue))
return false;
return true;
}
@@ -227,7 +225,7 @@ public class Validator {
private static boolean checkTupleSize(Hashtable<String, Object> tuple) {
return tuple.size() <= columns.length;
}
-
+
private static boolean isTheSameDataTypeMissingCol(Hashtable<String, Object> tuple) {
int index = 0;
for (String column : columns) {
@@ -262,7 +260,7 @@ public class Validator {
int index = 0;
for (String s : columns) {
if (tuple.containsKey(s)) {
- parseMinMax(tuple, s, index);
+ return parseMinMax(tuple, s, index);
}
index++;
}
diff --git a/src/test/java/app/DBAppTest.java b/src/test/java/app/DBAppTest.java
index dcebba3..e251a83 100644
--- a/src/test/java/app/DBAppTest.java
+++ b/src/test/java/app/DBAppTest.java
@@ -59,6 +59,72 @@ public class DBAppTest {
engine.createTable(newTableName, id, htblColNameType, htblColNameMin, htblColNameMax);
}
+ @Test
+ void testCreateTable_AlreadyExistingName_ShouldFailCreation() throws DBAppException {
+ // Given
+ Hashtable<String, String> htblColNameType = new Hashtable<>();
+ htblColNameType.put("id", "java.lang.String");
+ htblColNameType.put("courseName", "java.lang.String");
+
+ Hashtable<String, String> htblColNameMin = new Hashtable<>();
+ htblColNameMin.put("id", "0000");
+ htblColNameMin.put("courseName", "AAAAA");
+
+ Hashtable<String, String> htblColNameMax = new Hashtable<>();
+ htblColNameMin.put("id", "9999");
+ htblColNameMin.put("courseName", "zzzz");
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.createTable(newTableName, "id", htblColNameType, htblColNameMin, htblColNameMax);
+ });
+ // Then
+ assertThat(exception.getMessage()).isEqualTo(Constants.ERROR_MESSAGE_REPEATED_TABLE_NAME);
+ }
+
+ @Test
+ void testCreateTable_InvalidPrimaryKeyColumn_ShouldFailCreation() throws DBAppException {
+ // Given
+ Hashtable<String, String> htblColNameType = new Hashtable<>();
+ htblColNameType.put("id", "java.lang.String");
+ htblColNameType.put("courseName", "java.lang.String");
+
+ Hashtable<String, String> htblColNameMin = new Hashtable<>();
+ htblColNameMin.put("id", "0000");
+ htblColNameMin.put("courseName", "AAAAA");
+
+ Hashtable<String, String> htblColNameMax = new Hashtable<>();
+ htblColNameMin.put("id", "9999");
+ htblColNameMin.put("courseName", "zzzz");
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.createTable("newTable", "price", htblColNameType, htblColNameMin, htblColNameMax);
+ });
+ // Then
+ assertThat(exception.getMessage()).isEqualTo(Constants.ERROR_MESSAGE_INVALID_CLUSTERINGKEY);
+ }
+
+ @Test
+ void testCreateTable_InvalidMinMax_ShouldFailCreation() throws DBAppException {
+ // Given
+ Hashtable<String, String> htblColNameType = new Hashtable<>();
+ htblColNameType.put("course_id", "java.lang.String");
+ htblColNameType.put("courseName", "java.lang.String");
+
+ Hashtable<String, String> htblColNameMin = new Hashtable<>();
+ htblColNameMin.put("course_id", "9999");
+ htblColNameMin.put("courseName", "AAAAA");
+
+ Hashtable<String, String> htblColNameMax = new Hashtable<>();
+ htblColNameMax.put("course_id", "0000");
+ htblColNameMax.put("courseName", "zzzz");
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.createTable("newTable", "course_id", htblColNameType, htblColNameMin, htblColNameMax);
+ });
+ // Then
+ assertThat(exception.getMessage()).isEqualTo(Constants.ERROR_MESSAGE_MIN_OR_MAX_NOT_VALID);
+ }
+
private static void insertRow(int id) throws DBAppException {
Hashtable<String, Object> htblColNameValue = createRow(id, TEST_NAME, TEST_AGE);
@@ -118,20 +184,61 @@ public class DBAppTest {
assertThat(page.getSize() == 100);
}
-// @Test
-// void testInsertIntoTable_RepeatedPrimaryKey_ShouldFailInsert() throws CsvValidationException, ClassNotFoundException, DBAppException, IOException {
-// // Given
-// insertRow(1);
-// Hashtable<String,Object> htblColNameValue = createRow(1, "Mohamed", TEST_AGE);
-//
-// // When
-// try {
-// engine.insertIntoTable(newTableName, htblColNameValue);
-// fail("Expected DBAppException but no exception was thrown");
-// } catch (DBAppException e) {
-// System.out.println(e.getMessage());
-// }
-// }
+ @Test
+ void testInsertIntoTable_RepeatedPrimaryKey_ShouldFailInsert()
+ throws CsvValidationException, ClassNotFoundException, DBAppException, IOException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = createRow(1, "Mohamed", TEST_AGE);
+
+ // When
+ try {
+ engine.insertIntoTable(newTableName, htblColNameValue);
+ fail("Expected DBAppException but no exception was thrown");
+ } catch (DBAppException e) {
+
+ // Then
+ assertThat(e.getMessage()).isEqualTo(Constants.ERROR_MESSAGE_TUPLE_DATA);
+ }
+ }
+
+ @Test
+ void testInsertIntoTable_InvalidDataType_ShouldFailInsertion() throws DBAppException {
+ // Given
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(name, "Foo");
+ htblColNameValue.put(age, "boo");
+ htblColNameValue.put(id, 55);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.insertIntoTable(newTableName, htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
+ void testInsertIntoTable_InvalidTableName_ShouldFailInsertion() {
+ // Given
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(name, "Foo");
+ htblColNameValue.put(age, TEST_AGE);
+ htblColNameValue.put(id, 55);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.insertIntoTable("someRandomTableName", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TABLE_NAME;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
@Test
void testUpdateTable_ValidInput_ShouldUpdateSuccessfully()
@@ -151,30 +258,69 @@ public class DBAppTest {
assertThat(updated.getCells().get(2).getValue()).isEqualTo(updatedName);
}
-// @Test
-// void testUpdateTable_InvalidPrimaryKey_ShouldFailUpdate() throws DBAppException {
-// // Given
-// String updatedName = "Mohamed";
-// Hashtable<String, Object> htblColNameValue = new Hashtable();
-// htblColNameValue.put(name, updatedName);
-//
-// // When
-// Exception exception = assertThrows(DBAppException.class, () -> {
-// engine.updateTable(newTableName, "0", htblColNameValue);
-// });
-//
-// // Then
-// String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
-// String outputMessage = exception.getMessage();
-// assertThat(outputMessage).isEqualTo(expectedMessage);
-// }
+ @Test
+ void testUpdateTable_InvalidPrimaryKey_ShouldFailUpdate() throws DBAppException {
+ // Given
+ insertRow(1);
+ String updatedName = "Mohamed";
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(name, updatedName);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable(newTableName, "0", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
+ void testUpdateTable_ExtraInput_ShouldFailUpdate() throws DBAppException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(name, "Foo");
+ htblColNameValue.put(age, 25);
+ htblColNameValue.put("University", "GUC");
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable(newTableName, "0", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
+ void testUpdateTable_MoreThanMax_ShouldFailUpdate() throws DBAppException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(age, 2500);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable(newTableName, "1", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
@Test
void testDeleteFromTable_OneTuple_ShouldDeleteSuccessfully()
throws DBAppException, ClassNotFoundException, IOException, InterruptedException {
// Given
insertRow(1);
- Hashtable<String,Object> htblColNameValue = new Hashtable<>();
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
htblColNameValue.put(id, 1);
// When
@@ -191,34 +337,55 @@ public class DBAppTest {
// Given
for (int i = 0; i < 100; i++)
insertRow(i);
- Hashtable<String,Object> htblColNameValue = new Hashtable<>();
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
htblColNameValue.put(name, TEST_NAME);
+ htblColNameValue.put(id, 0);
// When
engine.deleteFromTable(newTableName, htblColNameValue);
// Then
Table table = Serializer.deserializeTable(newTableName);
- assertThat(table.isEmpty());
+ assertThat(table.getSize()).isEqualTo(99);
+ }
+
+ @Test
+ void testDeleteFromTable_InvalidColumnName_ShouldFailDelete()
+ throws DBAppException, ClassNotFoundException, IOException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put("middle_name", "Mohamed");
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.deleteFromTable(newTableName, htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
}
-// @Test
-// void testDeleteFromTable_InvalidName_ShouldFailDelete() throws DBAppException, ClassNotFoundException, IOException {
-// // Given
-// insertRow(1);
-// Hashtable<String,Object> htblColNameValue = new Hashtable<>();
-// htblColNameValue.put(name, "Mohamed");
-//
-// // When
-// Exception exception = assertThrows(DBAppException.class, () -> {
-// engine.deleteFromTable(newTableName, htblColNameValue);
-// });
-//
-// // Then
-// String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
-// String outputMessage = exception.getMessage();
-// assertThat(outputMessage).isEqualTo(expectedMessage);
-// }
+ @Test
+ void testDeleteFromTable_InvalidDataType_ShouldFailDelete() throws DBAppException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(id, 1);
+ htblColNameValue.put("age", "Foo");
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.deleteFromTable(newTableName, htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
@AfterEach
void deleteCreatedTable() throws ClassNotFoundException, IOException, InterruptedException {
| https://github.com/YehiaFarghaly/database-engine.gitdiff --git a/src/main/java/app/DBApp.java b/src/main/java/app/DBApp.java |
gitbug-java_data_YehiaFarghaly-database-engine.json_2 | diff --git a/src/main/java/app/DBApp.java b/src/main/java/app/DBApp.java
index 9094d5e..96beffc 100644
--- a/src/main/java/app/DBApp.java
+++ b/src/main/java/app/DBApp.java
@@ -178,22 +178,39 @@ public class DBApp implements IDatabase {
Validator.validateTable(strTableName, myTables);
Table table = Serializer.deserializeTable(strTableName);
if (action == Action.INSERT) {
- Validator.validateInsertionInput(table, htblColNameValue, myTables);
- table.insertTuple(htblColNameValue);
+ takeInsertAction(table, htblColNameValue);
} else if (action == Action.DELETE) {
- Validator.validateDeletionInput(table, htblColNameValue, myTables);
- table.deleteTuples(htblColNameValue);
+ takeDeleteAction(table, htblColNameValue);
} else {
- castClusteringKeyType(table);
- htblColNameValue.put(table.getPKColumn(), clusteringKey);
- Validator.validateUpdateInput(table, htblColNameValue, myTables);
- table.updateRecordsInTaple(clusteringKey, htblColNameValue);
+ takeUpdateAction(table, htblColNameValue);
}
Serializer.serializeTable(table);
} catch (CsvValidationException | ClassNotFoundException | IOException | ParseException e1) {
+ throw new DBAppException();
}
}
+ private void takeInsertAction(Table table, Hashtable<String, Object> htblColNameValue)
+ throws ClassNotFoundException, DBAppException, IOException, ParseException, CsvValidationException {
+ Validator.validateInsertionInput(table, htblColNameValue, myTables);
+ table.insertTuple(htblColNameValue);
+ }
+
+ private void takeDeleteAction(Table table, Hashtable<String, Object> htblColNameValue)
+ throws ClassNotFoundException, DBAppException, IOException, ParseException, CsvValidationException {
+ Validator.validateDeletionInput(table, htblColNameValue, myTables);
+ table.deleteTuples(htblColNameValue);
+ }
+
+ private void takeUpdateAction(Table table, Hashtable<String, Object> htblColNameValue)
+ throws DBAppException, CsvValidationException, ClassNotFoundException, IOException, ParseException {
+ castClusteringKeyType(table);
+ Validator.checkNoClusteringKey(htblColNameValue, table);
+ htblColNameValue.put(table.getPKColumn(), clusteringKey);
+ Validator.validateUpdateInput(table, htblColNameValue, myTables);
+ table.updateRecordsInTaple(clusteringKey, htblColNameValue);
+ }
+
private void castClusteringKeyType(Table table) {
clusteringKey = TypeCaster.castClusteringKey(table, clusteringKeyValue);
}
diff --git a/src/main/java/util/validation/Validator.java b/src/main/java/util/validation/Validator.java
index 2330f9f..450343c 100644
--- a/src/main/java/util/validation/Validator.java
+++ b/src/main/java/util/validation/Validator.java
@@ -34,8 +34,8 @@ public class Validator {
} else if (!validDataTypes(htblColNameType)) {
throw new DBAppException(Constants.ERROR_MESSAGE_DATATYPE);
- } else if (!validMinAndMax(htblColNameType, htblColNameMin, htblColNameMax)
- || !sameColMinMax(htblColNameMin, htblColNameMax)) {
+ } else if (!sameCol(htblColNameMin, htblColNameMax, htblColNameType)
+ || !validMinAndMax(htblColNameType, htblColNameMin, htblColNameMax)) {
throw new DBAppException(Constants.ERROR_MESSAGE_MIN_OR_MAX_NOT_VALID);
}
@@ -86,9 +86,10 @@ public class Validator {
return true;
}
- private static boolean sameColMinMax(Hashtable<String, String> htblColNameMin,
- Hashtable<String, String> htblColNameMax) {
- return htblColNameMin.keySet().equals(htblColNameMax.keySet());
+ private static boolean sameCol(Hashtable<String, String> htblColNameMin, Hashtable<String, String> htblColNameMax,
+ Hashtable<String, String> htblColNameType) {
+ return htblColNameMin.keySet().equals(htblColNameMax.keySet())
+ && htblColNameMin.keySet().equals(htblColNameType.keySet());
}
@@ -113,6 +114,13 @@ public class Validator {
throw new DBAppException(Constants.ERROR_MESSAGE_TUPLE_DATA);
}
+ public static void checkNoClusteringKey(Hashtable<String, Object> htblColNameValue, Table table)
+ throws DBAppException {
+ if (htblColNameValue.containsKey(table.getPKColumn()))
+ throw new DBAppException(Constants.ERROR_MESSAGE_TUPLE_DATA);
+
+ }
+
private static boolean isValidTable(String tableName, HashSet<String> myTables) {
return myTables.contains(tableName);
}
@@ -292,5 +300,4 @@ public class Validator {
private static boolean isFirstGreaterThanSecond(Object comp1, Object comp2) {
return Compare.compare(comp1, comp2) > 0;
}
-
}
\ No newline at end of file
diff --git a/src/test/java/app/DBAppTest.java b/src/test/java/app/DBAppTest.java
index 6680895..0e51ca7 100644
--- a/src/test/java/app/DBAppTest.java
+++ b/src/test/java/app/DBAppTest.java
@@ -102,7 +102,7 @@ public class DBAppTest {
// Then
assertThat(exception.getMessage()).isEqualTo(Constants.ERROR_MESSAGE_INVALID_CLUSTERINGKEY);
}
-
+
@Test
void testCreateTable_InvalidDataType_ShouldFailCreation() throws DBAppException {
// Given
@@ -148,6 +148,28 @@ public class DBAppTest {
}
@Test
+ void testCreateTable_InconsistentColumns_ShouldFailCreation() throws DBAppException {
+ // Given
+ Hashtable<String, String> htblColNameType = new Hashtable<>();
+ htblColNameType.put("course_id", "java.lang.String");
+ htblColNameType.put("courseName", "java.lang.String");
+
+ Hashtable<String, String> htblColNameMin = new Hashtable<>();
+ htblColNameMin.put("id", "0000");
+ htblColNameMin.put("name", "AAAAA");
+
+ Hashtable<String, String> htblColNameMax = new Hashtable<>();
+ htblColNameMax.put("course_id", "9999");
+ htblColNameMax.put("courseName", "zzzz");
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.createTable("newTable", "course_id", htblColNameType, htblColNameMin, htblColNameMax);
+ });
+ // Then
+ assertThat(exception.getMessage()).isEqualTo(Constants.ERROR_MESSAGE_MIN_OR_MAX_NOT_VALID);
+ }
+
+ @Test
void testInsertIntoTable_OneTuple_ShouldInsertSuccessfully() throws ClassNotFoundException, IOException,
CsvValidationException, DBAppException, ParseException, InterruptedException {
// Given
@@ -158,7 +180,7 @@ public class DBAppTest {
// Then
Table table = Serializer.deserializeTable(newTableName);
- assertThat(table.getPagesName().size() == 1);
+ assertThat(table.getPagesName().size()).isEqualTo(1);
Page page = table.getPageAtPosition(0);
assertThat(page.getSize() == 1);
}
@@ -176,11 +198,56 @@ public class DBAppTest {
}
// Then
Table table = Serializer.deserializeTable(newTableName);
- assertThat(table.getPagesName().size() == 2);
+ assertThat(table.getPagesName().size()).isEqualTo(2);
+ Page page = table.getPageAtPosition(1);
+ assertThat(page.getSize()).isEqualTo(99);
+ page = table.getPageAtPosition(0);
+ assertThat(page.isFull());
+ }
+
+ @Test
+ void testInsertIntoTable_InsertingLastRecordIntoFullPage_ShouldInsertSuccessfully() throws ClassNotFoundException,
+ IOException, CsvValidationException, DBAppException, ParseException, InterruptedException {
+ // Given
+ for (int i = 2; i < 402; i += 2) {
+ Hashtable<String, Object> htblColNameValue = createRow(i, TEST_NAME, TEST_AGE);
+ engine.insertIntoTable(newTableName, htblColNameValue);
+ }
+
+ // When
+ Hashtable<String, Object> htblColNameValue = createRow(399, TEST_NAME, TEST_AGE);
+ engine.insertIntoTable(newTableName, htblColNameValue);
+
+ // Then
+ Table table = Serializer.deserializeTable(newTableName);
+ assertThat(table.getPagesName().size()).isEqualTo(2);
Page page = table.getPageAtPosition(0);
assertThat(page.isFull());
+ assertThat(page.getTuples().get(199).getPrimaryKey()).isEqualTo(399);
+ }
+
+ @Test
+ void testInsertIntoTable_InsertingRecordShiftingTwoPages_ShouldInsertSuccessfully() throws ClassNotFoundException,
+ IOException, CsvValidationException, DBAppException, ParseException, InterruptedException {
+ // Given
+ for (int i = 2; i <= 802; i += 2) {
+ Hashtable<String, Object> htblColNameValue = createRow(i, TEST_NAME, TEST_AGE);
+ engine.insertIntoTable(newTableName, htblColNameValue);
+ }
+
+ // When
+ Hashtable<String, Object> htblColNameValue = createRow(399, TEST_NAME, TEST_AGE);
+ engine.insertIntoTable(newTableName, htblColNameValue);
+
+ // Then
+ Table table = Serializer.deserializeTable(newTableName);
+ assertThat(table.getPagesName().size()).isEqualTo(3);
+ Page page = table.getPageAtPosition(0);
+ assertThat(page.getTuples().get(199).getPrimaryKey()).isEqualTo(399);
page = table.getPageAtPosition(1);
- assertThat(page.getSize() == 100);
+ assertThat(page.getTuples().get(0).getPrimaryKey()).isEqualTo(400);
+ page = table.getPageAtPosition(2);
+ assertThat(page.getTuples().get(0).getPrimaryKey()).isEqualTo(800);
}
@Test
@@ -238,7 +305,7 @@ public class DBAppTest {
String outputMessage = exception.getMessage();
assertThat(outputMessage).isEqualTo(expectedMessage);
}
-
+
@Test
void testInsertIntoTable_LessThanMin_ShouldFailInsertion() {
// Given
@@ -257,7 +324,26 @@ public class DBAppTest {
String outputMessage = exception.getMessage();
assertThat(outputMessage).isEqualTo(expectedMessage);
}
-
+
+ @Test
+ void testInsertIntoTable_MoreThanMax_ShouldFailInsertion() {
+ // Given
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(name, "{abc");
+ htblColNameValue.put(age, TEST_AGE);
+ htblColNameValue.put(id, 3);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.insertIntoTable(newTableName, htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
@Test
void testInsertIntoTable_MissingColumn_ShouldFailInsertion() {
// Given
@@ -275,7 +361,7 @@ public class DBAppTest {
String outputMessage = exception.getMessage();
assertThat(outputMessage).isEqualTo(expectedMessage);
}
-
+
@Test
void testInsertIntoTable_ExtraColumn_ShouldFailInsertion() {
// Given
@@ -334,6 +420,25 @@ public class DBAppTest {
}
@Test
+ void testUpdateTable_PrimaryKeyUpdate_ShouldFailUpdate()
+ throws DBAppException, ClassNotFoundException, IOException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(id, 2);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable(newTableName, "1", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
void testUpdateTable_ExtraInput_ShouldFailUpdate() throws DBAppException {
// Given
insertRow(1);
@@ -372,6 +477,60 @@ public class DBAppTest {
}
@Test
+ void testUpdateTable_LessThanMin_ShouldFailUpdate() throws DBAppException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(age, 0);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable(newTableName, "1", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
+ void testUpdateTable_InvalidDataType_ShouldFailUpdate() throws DBAppException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(age, "Foo");
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable(newTableName, "1", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TUPLE_DATA;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
+ void testUpdateTable_InvalidTableName_ShouldFailUpdate() throws DBAppException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(age, 25);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.updateTable("randomName", "1", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TABLE_NAME;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
+ @Test
void testDeleteFromTable_OneTuple_ShouldDeleteSuccessfully()
throws DBAppException, ClassNotFoundException, IOException, InterruptedException {
// Given
@@ -388,7 +547,7 @@ public class DBAppTest {
}
@Test
- void testDeleteFromTable_ManyTuples_ShouldDeleteSuccessfully()
+ void testDeleteFromTable_ManyTuplesDeleteOne_ShouldDeleteSuccessfully()
throws DBAppException, ClassNotFoundException, IOException {
// Given
for (int i = 0; i < 100; i++)
@@ -406,6 +565,23 @@ public class DBAppTest {
}
@Test
+ void testDeleteFromTable_ManyTuplesDeleteAll_ShouldDeleteSuccessfully()
+ throws DBAppException, ClassNotFoundException, IOException {
+ // Given
+ for (int i = 0; i < 100; i++)
+ insertRow(i);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(name, TEST_NAME);
+
+ // When
+ engine.deleteFromTable(newTableName, htblColNameValue);
+
+ // Then
+ Table table = Serializer.deserializeTable(newTableName);
+ assertThat(table.isEmpty());
+ }
+
+ @Test
void testDeleteFromTable_InvalidColumnName_ShouldFailDelete()
throws DBAppException, ClassNotFoundException, IOException {
// Given
@@ -442,7 +618,26 @@ public class DBAppTest {
String outputMessage = exception.getMessage();
assertThat(outputMessage).isEqualTo(expectedMessage);
}
-
+
+ @Test
+ void testDeleteFromTable_InvalidTable_ShouldFailDelete()
+ throws DBAppException, ClassNotFoundException, IOException, InterruptedException {
+ // Given
+ insertRow(1);
+ Hashtable<String, Object> htblColNameValue = new Hashtable<>();
+ htblColNameValue.put(id, 1);
+
+ // When
+ Exception exception = assertThrows(DBAppException.class, () -> {
+ engine.deleteFromTable("randomTableName", htblColNameValue);
+ });
+
+ // Then
+ String expectedMessage = Constants.ERROR_MESSAGE_TABLE_NAME;
+ String outputMessage = exception.getMessage();
+ assertThat(outputMessage).isEqualTo(expectedMessage);
+ }
+
private static void insertRow(int id) throws DBAppException {
Hashtable<String, Object> htblColNameValue = createRow(id, TEST_NAME, TEST_AGE);
@@ -466,7 +661,6 @@ public class DBAppTest {
return htblColNameValue;
}
-
@AfterEach
void deleteCreatedTable() throws ClassNotFoundException, IOException, InterruptedException {
Table table = Serializer.deserializeTable(newTableName);
| https://github.com/YehiaFarghaly/database-engine.gitdiff --git a/src/main/java/app/DBApp.java b/src/main/java/app/DBApp.java |
gitbug-java_data_davidmoten-openapi-to-plantuml.json_1 | diff --git a/src/main/java/com/github/davidmoten/oas3/puml/Converter.java b/src/main/java/com/github/davidmoten/oas3/puml/Converter.java
index fcc6d19..8b36859 100644
--- a/src/main/java/com/github/davidmoten/oas3/puml/Converter.java
+++ b/src/main/java/com/github/davidmoten/oas3/puml/Converter.java
@@ -125,8 +125,7 @@ public final class Converter {
+ "\nhide empty fields" //
+ "\nskinparam class {"
+ "\nBackgroundColor<<Path>> Wheat"
- + "\nBorderColor<<Path>> Tomato"
- + "}"
+ + "\n}"
// make sure that periods in class names aren't interpreted as namespace
// separators (which results in recursive boxing)
+ "\nset namespaceSeparator none" //
diff --git a/src/docs/tests/additional-properties-complex.puml.svg b/src/docs/tests/additional-properties-complex.puml.svg
index dfaf168..4e0c3d1 100644
--- a/src/docs/tests/additional-properties-complex.puml.svg
+++ b/src/docs/tests/additional-properties-complex.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="369px" preserveAspectRatio="none" style="width:188px;height:369px;background:#FFFFFF;" version="1.1" viewBox="0 0 188 369" width="188px" zoomAndPan="magnify"><defs/><g><!--class Thing.property--><g id="elem_Thing.property"><rect codeLine="11" fill="#F1F1F1" height="56.2969" id="Thing.property" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="27.5" y="157"/><ellipse cx="42.5" cy="173" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M45.4688,178.6406 Q44.8906,178.9375 44.25,179.0781 Q43.6094,179.2344 42.9063,179.2344 Q40.4063,179.2344 39.0781,177.5938 Q37.7656,175.9375 37.7656,172.8125 Q37.7656,169.6875 39.0781,168.0313 Q40.4063,166.375 42.9063,166.375 Q43.6094,166.375 44.25,166.5313 Q44.9063,166.6875 45.4688,166.9844 L45.4688,169.7031 Q44.8438,169.125 44.25,168.8594 Q43.6563,168.5781 43.0313,168.5781 Q41.6875,168.5781 41,169.6563 Q40.3125,170.7188 40.3125,172.8125 Q40.3125,174.9063 41,175.9844 Q41.6875,177.0469 43.0313,177.0469 Q43.6563,177.0469 44.25,176.7813 Q44.8438,176.5 45.4688,175.9219 L45.4688,178.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="56.5" y="177.8467">Thing.property</text><line style="stroke:#181818;stroke-width:0.5;" x1="28.5" x2="159.5" y1="189" y2="189"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="33.5" y="205.9951">key : string</text></g><!--class Thing--><g id="elem_Thing"><rect codeLine="15" fill="#F1F1F1" height="72.5938" id="Thing" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="174" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="90.75" y="27.8467">Thing</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="180" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="13" y="55.9951">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="13" y="72.292">description : string {O}</text></g><!--class MyValue--><g id="elem_MyValue"><rect codeLine="20" fill="#F1F1F1" height="72.5938" id="MyValue" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="25" y="290"/><ellipse cx="62.05" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M65.0188,311.6406 Q64.4406,311.9375 63.8,312.0781 Q63.1594,312.2344 62.4563,312.2344 Q59.9563,312.2344 58.6281,310.5938 Q57.3156,308.9375 57.3156,305.8125 Q57.3156,302.6875 58.6281,301.0313 Q59.9563,299.375 62.4563,299.375 Q63.1594,299.375 63.8,299.5313 Q64.4563,299.6875 65.0188,299.9844 L65.0188,302.7031 Q64.3938,302.125 63.8,301.8594 Q63.2063,301.5781 62.5813,301.5781 Q61.2375,301.5781 60.55,302.6563 Q59.8625,303.7188 59.8625,305.8125 Q59.8625,307.9063 60.55,308.9844 Q61.2375,310.0469 62.5813,310.0469 Q63.2063,310.0469 63.8,309.7813 Q64.3938,309.5 65.0188,308.9219 L65.0188,311.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="80.95" y="310.8467">MyValue</text><line style="stroke:#181818;stroke-width:0.5;" x1="26" x2="162" y1="322" y2="322"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="31" y="338.9951">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="31" y="355.292">expiry : timestamp</text></g><!--link Thing to Thing.property--><g id="link_Thing_Thing.property"><path codeLine="25" d="M94,92.06 C94,115.96 94,128.96 94,150.87 " fill="none" id="Thing-Thing.property" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="94,80.06,90,86.06,94,92.06,98,86.06,94,80.06" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="94,156.87,98,147.87,94,151.87,90,147.87,94,156.87" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="95" y="123.0669">property</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="86.2344" y="146.1249">*</text></g><!--link Thing.property to MyValue--><g id="link_Thing.property_MyValue"><path codeLine="27" d="M94,213.23 C94,235.11 94,260.03 94,283.88 " fill="none" id="Thing.property-to-MyValue" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="94,289.88,98,280.88,94,284.88,90,280.88,94,289.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="95" y="256.0669">value</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="85.2625" y="278.862">1</text></g><!--SRC=[ZKzDQyCm3BtxLmWV2ntiEaeEtNciR6Kx6rkhJHBBoEfO2FdlSrAQ9kjbD-bzwSa7Xx3R7OpugW8Rs3Qe_0LymvmePhmZ3ePDYuByXy4sIGU5yUJo4leAs1Garo6cqGksCJb3h_R6rYUcStJFr13FHJuz6b5xOeUyPexK6g51PHI8fKLEnk8xZh52394YAdM9rqSVukaXCILawNIv1z1FNGQeiOCdoC95eeQrPQqShzoaDznXjXoI18ep3Vthi4XxwJvCSyR_vU5F2ZoMab3U4jEcCUdQQBFTLg0t-lwhuW0zhrV7GZ0v7_MYpcJvdcRr2m00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="369px" preserveAspectRatio="none" style="width:188px;height:369px;background:#FFFFFF;" version="1.1" viewBox="0 0 188 369" width="188px" zoomAndPan="magnify"><defs/><g><!--class Thing.property--><g id="elem_Thing.property"><rect codeLine="11" fill="#F1F1F1" height="56.2969" id="Thing.property" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="133" x="27.5" y="157"/><ellipse cx="42.5" cy="173" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M45.4688,178.6406 Q44.8906,178.9375 44.25,179.0781 Q43.6094,179.2344 42.9063,179.2344 Q40.4063,179.2344 39.0781,177.5938 Q37.7656,175.9375 37.7656,172.8125 Q37.7656,169.6875 39.0781,168.0313 Q40.4063,166.375 42.9063,166.375 Q43.6094,166.375 44.25,166.5313 Q44.9063,166.6875 45.4688,166.9844 L45.4688,169.7031 Q44.8438,169.125 44.25,168.8594 Q43.6563,168.5781 43.0313,168.5781 Q41.6875,168.5781 41,169.6563 Q40.3125,170.7188 40.3125,172.8125 Q40.3125,174.9063 41,175.9844 Q41.6875,177.0469 43.0313,177.0469 Q43.6563,177.0469 44.25,176.7813 Q44.8438,176.5 45.4688,175.9219 L45.4688,178.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="101" x="56.5" y="177.8467">Thing.property</text><line style="stroke:#181818;stroke-width:0.5;" x1="28.5" x2="159.5" y1="189" y2="189"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="33.5" y="205.9951">key : string</text></g><!--class Thing--><g id="elem_Thing"><rect codeLine="15" fill="#F1F1F1" height="72.5938" id="Thing" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="174" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="90.75" y="27.8467">Thing</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="180" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="13" y="55.9951">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="162" x="13" y="72.292">description : string {O}</text></g><!--class MyValue--><g id="elem_MyValue"><rect codeLine="20" fill="#F1F1F1" height="72.5938" id="MyValue" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="138" x="25" y="290"/><ellipse cx="62.05" cy="306" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M65.0188,311.6406 Q64.4406,311.9375 63.8,312.0781 Q63.1594,312.2344 62.4563,312.2344 Q59.9563,312.2344 58.6281,310.5938 Q57.3156,308.9375 57.3156,305.8125 Q57.3156,302.6875 58.6281,301.0313 Q59.9563,299.375 62.4563,299.375 Q63.1594,299.375 63.8,299.5313 Q64.4563,299.6875 65.0188,299.9844 L65.0188,302.7031 Q64.3938,302.125 63.8,301.8594 Q63.2063,301.5781 62.5813,301.5781 Q61.2375,301.5781 60.55,302.6563 Q59.8625,303.7188 59.8625,305.8125 Q59.8625,307.9063 60.55,308.9844 Q61.2375,310.0469 62.5813,310.0469 Q63.2063,310.0469 63.8,309.7813 Q64.3938,309.5 65.0188,308.9219 L65.0188,311.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="57" x="80.95" y="310.8467">MyValue</text><line style="stroke:#181818;stroke-width:0.5;" x1="26" x2="162" y1="322" y2="322"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="31" y="338.9951">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="126" x="31" y="355.292">expiry : timestamp</text></g><!--link Thing to Thing.property--><g id="link_Thing_Thing.property"><path codeLine="25" d="M94,92.06 C94,115.96 94,128.96 94,150.87 " fill="none" id="Thing-Thing.property" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="94,80.06,90,86.06,94,92.06,98,86.06,94,80.06" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="94,156.87,98,147.87,94,151.87,90,147.87,94,156.87" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="54" x="95" y="123.0669">property</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="86.2344" y="146.1249">*</text></g><!--link Thing.property to MyValue--><g id="link_Thing.property_MyValue"><path codeLine="27" d="M94,213.23 C94,235.11 94,260.03 94,283.88 " fill="none" id="Thing.property-to-MyValue" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="94,289.88,98,280.88,94,284.88,90,280.88,94,289.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="34" x="95" y="256.0669">value</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="85.2625" y="278.862">1</text></g><!--SRC=[ZK-zJiCm4Dxz52UFbOh4YgeCC2CgG31Rpb5RSMphxeg8ehmxTggcALtOxE__d6yHThkz4TSqO3tPWCgTm5Vad2BZ3R4tP7eKf3yCzba6A8nBBQ-XBu-X8DpvcAiNR33CCAf7Oxi3fMDidr98j0pvT6X4JOfH89OkpiRY6rQp98AO8Yfr2j7lpiV3NQQKaMJG9HLWd1idw7201s2X8YbnLvPhPMsvI2zuYsp9P_4fBZICBzCgxNduCE68_yl3d-ofZX9VpXBJvvfqNhJPRXlG6trxLN60NhvdnqemE-_rQivi-PxVwXS0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/additional-properties-simple.puml.svg b/src/docs/tests/additional-properties-simple.puml.svg
index 55b27c5..96ac8b5 100644
--- a/src/docs/tests/additional-properties-simple.puml.svg
+++ b/src/docs/tests/additional-properties-simple.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="77px" preserveAspectRatio="none" style="width:207px;height:77px;background:#FFFFFF;" version="1.1" viewBox="0 0 207 77" width="207px" zoomAndPan="magnify"><defs/><g><!--class Thing--><g id="elem_Thing"><rect codeLine="11" fill="#F1F1F1" height="56.2969" id="Thing" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="186" x="7" y="7"/><ellipse cx="76.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M79.2188,28.6406 Q78.6406,28.9375 78,29.0781 Q77.3594,29.2344 76.6563,29.2344 Q74.1563,29.2344 72.8281,27.5938 Q71.5156,25.9375 71.5156,22.8125 Q71.5156,19.6875 72.8281,18.0313 Q74.1563,16.375 76.6563,16.375 Q77.3594,16.375 78,16.5313 Q78.6563,16.6875 79.2188,16.9844 L79.2188,19.7031 Q78.5938,19.125 78,18.8594 Q77.4063,18.5781 76.7813,18.5781 Q75.4375,18.5781 74.75,19.6563 Q74.0625,20.7188 74.0625,22.8125 Q74.0625,24.9063 74.75,25.9844 Q75.4375,27.0469 76.7813,27.0469 Q77.4063,27.0469 78,26.7813 Q78.5938,26.5 79.2188,25.9219 L79.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="96.75" y="27.8467">Thing</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="192" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="13" y="55.9951">property : string -> string</text></g><!--SRC=[POvD2i8m48NtESNWtWj8wQ9Ue6Z1TKZ69hJDX9bn8QLtDxKY_ko6z_7UV25wXAfghOQw1XVPZMZ25fvGCYN1Fz1QjXCgyW_1AUiT2WdavJEwHXnB8aDCUUs26wq8pAQnRkYPRiaVQIH-Yrm2MZKDiKV-9XrDLcanWWgfM4Ys3i-upYen94fep3Q_wq9C_Qwy0PYV2WjafenSb0uWoWN3ldvTPZ4F]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="77px" preserveAspectRatio="none" style="width:207px;height:77px;background:#FFFFFF;" version="1.1" viewBox="0 0 207 77" width="207px" zoomAndPan="magnify"><defs/><g><!--class Thing--><g id="elem_Thing"><rect codeLine="11" fill="#F1F1F1" height="56.2969" id="Thing" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="186" x="7" y="7"/><ellipse cx="76.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M79.2188,28.6406 Q78.6406,28.9375 78,29.0781 Q77.3594,29.2344 76.6563,29.2344 Q74.1563,29.2344 72.8281,27.5938 Q71.5156,25.9375 71.5156,22.8125 Q71.5156,19.6875 72.8281,18.0313 Q74.1563,16.375 76.6563,16.375 Q77.3594,16.375 78,16.5313 Q78.6563,16.6875 79.2188,16.9844 L79.2188,19.7031 Q78.5938,19.125 78,18.8594 Q77.4063,18.5781 76.7813,18.5781 Q75.4375,18.5781 74.75,19.6563 Q74.0625,20.7188 74.0625,22.8125 Q74.0625,24.9063 74.75,25.9844 Q75.4375,27.0469 76.7813,27.0469 Q77.4063,27.0469 78,26.7813 Q78.5938,26.5 79.2188,25.9219 L79.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="96.75" y="27.8467">Thing</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="192" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="174" x="13" y="55.9951">property : string -> string</text></g><!--SRC=[POv12i8m44NtESNGlHUGqeLUeAZWEYHZ4vfcmiouaDAxcreHqTtm7l__2T4Zj6rlDNGTkCWkeGaRFA4Koe9_ehTi9rJa7uDJqGTK4yZBDxf5J9N867DPi-2I5O7P7AmR1wPxzaTAn9z7hW6jciK8AkIw9SKwFECQLcB8bD6OhQIvX9Y7ffO1pA-X1GfJGQx3Un3bgc7NlQzQ-WG0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/all-of-class-level.puml.svg b/src/docs/tests/all-of-class-level.puml.svg
index 83b5996..991c671 100644
--- a/src/docs/tests/all-of-class-level.puml.svg
+++ b/src/docs/tests/all-of-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:283px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 162" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="7"/><ellipse cx="100.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,28.6406 Q102.8906,28.9375 102.25,29.0781 Q101.6094,29.2344 100.9063,29.2344 Q98.4063,29.2344 97.0781,27.5938 Q95.7656,25.9375 95.7656,22.8125 Q95.7656,19.6875 97.0781,18.0313 Q98.4063,16.375 100.9063,16.375 Q101.6094,16.375 102.25,16.5313 Q102.9063,16.6875 103.4688,16.9844 L103.4688,19.7031 Q102.8438,19.125 102.25,18.8594 Q101.6563,18.5781 101.0313,18.5781 Q99.6875,18.5781 99,19.6563 Q98.3125,20.7188 98.3125,22.8125 Q98.3125,24.9063 99,25.9844 Q99.6875,27.0469 101.0313,27.0469 Q101.6563,27.0469 102.25,26.7813 Q102.8438,26.5 103.4688,25.9219 L103.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="27.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="99"/><ellipse cx="36.85" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,120.6406 Q39.2406,120.9375 38.6,121.0781 Q37.9594,121.2344 37.2563,121.2344 Q34.7563,121.2344 33.4281,119.5938 Q32.1156,117.9375 32.1156,114.8125 Q32.1156,111.6875 33.4281,110.0313 Q34.7563,108.375 37.2563,108.375 Q37.9594,108.375 38.6,108.5313 Q39.2563,108.6875 39.8188,108.9844 L39.8188,111.7031 Q39.1938,111.125 38.6,110.8594 Q38.0063,110.5781 37.3813,110.5781 Q36.0375,110.5781 35.35,111.6563 Q34.6625,112.7188 34.6625,114.8125 Q34.6625,116.9063 35.35,117.9844 Q36.0375,119.0469 37.3813,119.0469 Q38.0063,119.0469 38.6,118.7813 Q39.1938,118.5 39.8188,117.9219 L39.8188,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="119.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="147.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="99"/><ellipse cx="185.4" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,120.6406 Q187.7906,120.9375 187.15,121.0781 Q186.5094,121.2344 185.8063,121.2344 Q183.3063,121.2344 181.9781,119.5938 Q180.6656,117.9375 180.6656,114.8125 Q180.6656,111.6875 181.9781,110.0313 Q183.3063,108.375 185.8063,108.375 Q186.5094,108.375 187.15,108.5313 Q187.8063,108.6875 188.3688,108.9844 L188.3688,111.7031 Q187.7438,111.125 187.15,110.8594 Q186.5563,110.5781 185.9313,110.5781 Q184.5875,110.5781 183.9,111.6563 Q183.2125,112.7188 183.2125,114.8125 Q183.2125,116.9063 183.9,117.9844 Q184.5875,119.0469 185.9313,119.0469 Q186.5563,119.0469 187.15,118.7813 Q187.7438,118.5 188.3688,117.9219 L188.3688,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="119.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="147.9951">income : decimal</text></g><!--link employee to doctor--><g id="link_employee_doctor"><path codeLine="22" d="M146.71,39.05 C158.44,54.79 173.5041,75.0095 187.7941,94.1795 " fill="none" id="employee-to-doctor" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="191.38,98.99,189.2081,89.3836,188.3917,94.9812,182.7941,94.1648,191.38,98.99" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="177.8023" y="87.8262">1</text></g><!--link employee to nurse--><g id="link_employee_nurse"><path codeLine="24" d="M124.29,39.05 C112.56,54.79 97.4959,75.0095 83.2059,94.1795 " fill="none" id="employee-to-nurse" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="79.62,98.99,88.2059,94.1648,82.6083,94.9812,81.7919,89.3836,79.62,98.99" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="75.3478" y="87.8262">1</text></g><!--SRC=[ROxDQW8n58NtUOhBx5rqMsGMzWN45hg-94SJJ7A7coY8pBkRSM0OMxVdEty-ED1sk-Vg-vviK1jX_2mUK0R91V_0dfKJAlGFGHhgZHhnuifQEWR4ffHpoCEK9Hkv5BgR7TlpIUMItPT4qUN8hmTNinDrq5Vo8uchZAQWKculoi0MtvXggoXboJ1chk_QU9GRqBMbSL7pHSjJ8he_ZuqKSKMaJmgvuWHTcPtOLllg3jbAGhCxs90uJlRLrcRJK_VHBTdtS7vX7W00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:283px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 162" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="7"/><ellipse cx="100.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,28.6406 Q102.8906,28.9375 102.25,29.0781 Q101.6094,29.2344 100.9063,29.2344 Q98.4063,29.2344 97.0781,27.5938 Q95.7656,25.9375 95.7656,22.8125 Q95.7656,19.6875 97.0781,18.0313 Q98.4063,16.375 100.9063,16.375 Q101.6094,16.375 102.25,16.5313 Q102.9063,16.6875 103.4688,16.9844 L103.4688,19.7031 Q102.8438,19.125 102.25,18.8594 Q101.6563,18.5781 101.0313,18.5781 Q99.6875,18.5781 99,19.6563 Q98.3125,20.7188 98.3125,22.8125 Q98.3125,24.9063 99,25.9844 Q99.6875,27.0469 101.0313,27.0469 Q101.6563,27.0469 102.25,26.7813 Q102.8438,26.5 103.4688,25.9219 L103.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="27.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="99"/><ellipse cx="36.85" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,120.6406 Q39.2406,120.9375 38.6,121.0781 Q37.9594,121.2344 37.2563,121.2344 Q34.7563,121.2344 33.4281,119.5938 Q32.1156,117.9375 32.1156,114.8125 Q32.1156,111.6875 33.4281,110.0313 Q34.7563,108.375 37.2563,108.375 Q37.9594,108.375 38.6,108.5313 Q39.2563,108.6875 39.8188,108.9844 L39.8188,111.7031 Q39.1938,111.125 38.6,110.8594 Q38.0063,110.5781 37.3813,110.5781 Q36.0375,110.5781 35.35,111.6563 Q34.6625,112.7188 34.6625,114.8125 Q34.6625,116.9063 35.35,117.9844 Q36.0375,119.0469 37.3813,119.0469 Q38.0063,119.0469 38.6,118.7813 Q39.1938,118.5 39.8188,117.9219 L39.8188,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="119.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="147.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="99"/><ellipse cx="185.4" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,120.6406 Q187.7906,120.9375 187.15,121.0781 Q186.5094,121.2344 185.8063,121.2344 Q183.3063,121.2344 181.9781,119.5938 Q180.6656,117.9375 180.6656,114.8125 Q180.6656,111.6875 181.9781,110.0313 Q183.3063,108.375 185.8063,108.375 Q186.5094,108.375 187.15,108.5313 Q187.8063,108.6875 188.3688,108.9844 L188.3688,111.7031 Q187.7438,111.125 187.15,110.8594 Q186.5563,110.5781 185.9313,110.5781 Q184.5875,110.5781 183.9,111.6563 Q183.2125,112.7188 183.2125,114.8125 Q183.2125,116.9063 183.9,117.9844 Q184.5875,119.0469 185.9313,119.0469 Q186.5563,119.0469 187.15,118.7813 Q187.7438,118.5 188.3688,117.9219 L188.3688,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="119.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="147.9951">income : decimal</text></g><!--link employee to doctor--><g id="link_employee_doctor"><path codeLine="22" d="M146.71,39.05 C158.44,54.79 173.5041,75.0095 187.7941,94.1795 " fill="none" id="employee-to-doctor" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="191.38,98.99,189.2081,89.3836,188.3917,94.9812,182.7941,94.1648,191.38,98.99" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="177.8023" y="87.8262">1</text></g><!--link employee to nurse--><g id="link_employee_nurse"><path codeLine="24" d="M124.29,39.05 C112.56,54.79 97.4959,75.0095 83.2059,94.1795 " fill="none" id="employee-to-nurse" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="79.62,98.99,88.2059,94.1648,82.6083,94.9812,81.7919,89.3836,79.62,98.99" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="75.3478" y="87.8262">1</text></g><!--SRC=[ROwzQiCm58LtFSN5kuUi9NXeNo0aGsSXdKOYyhr6Lmw4u7UFR8DnswpV-GtHWux7aosXwyZ5x19CME4PEWWh_WadcssFWln7GJ-K1rKbYDSz-eb8bUWjyZ1doIMhIa_pQTtjccLa_oL9ydRaEy0MCnb58QvREbY72-PmaKmi36FMagPE97a0JUsRDifZrWKHFPVvYHBkIFH1aGkko3kp5rThVxiZE-bHxHukzZRDzjrMstRK79ej-rvSNvWN]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/all-of-property-level.puml.svg b/src/docs/tests/all-of-property-level.puml.svg
index 18eb626..30a0b45 100644
--- a/src/docs/tests/all-of-property-level.puml.svg
+++ b/src/docs/tests/all-of-property-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:283px;height:179px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 179" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="7"/><ellipse cx="100.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,28.6406 Q102.8906,28.9375 102.25,29.0781 Q101.6094,29.2344 100.9063,29.2344 Q98.4063,29.2344 97.0781,27.5938 Q95.7656,25.9375 95.7656,22.8125 Q95.7656,19.6875 97.0781,18.0313 Q98.4063,16.375 100.9063,16.375 Q101.6094,16.375 102.25,16.5313 Q102.9063,16.6875 103.4688,16.9844 L103.4688,19.7031 Q102.8438,19.125 102.25,18.8594 Q101.6563,18.5781 101.0313,18.5781 Q99.6875,18.5781 99,19.6563 Q98.3125,20.7188 98.3125,22.8125 Q98.3125,24.9063 99,25.9844 Q99.6875,27.0469 101.0313,27.0469 Q101.6563,27.0469 102.25,26.7813 Q102.8438,26.5 103.4688,25.9219 L103.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="27.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="116"/><ellipse cx="36.85" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,137.6406 Q39.2406,137.9375 38.6,138.0781 Q37.9594,138.2344 37.2563,138.2344 Q34.7563,138.2344 33.4281,136.5938 Q32.1156,134.9375 32.1156,131.8125 Q32.1156,128.6875 33.4281,127.0313 Q34.7563,125.375 37.2563,125.375 Q37.9594,125.375 38.6,125.5313 Q39.2563,125.6875 39.8188,125.9844 L39.8188,128.7031 Q39.1938,128.125 38.6,127.8594 Q38.0063,127.5781 37.3813,127.5781 Q36.0375,127.5781 35.35,128.6563 Q34.6625,129.7188 34.6625,131.8125 Q34.6625,133.9063 35.35,134.9844 Q36.0375,136.0469 37.3813,136.0469 Q38.0063,136.0469 38.6,135.7813 Q39.1938,135.5 39.8188,134.9219 L39.8188,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="136.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="164.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="116"/><ellipse cx="185.4" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,137.6406 Q187.7906,137.9375 187.15,138.0781 Q186.5094,138.2344 185.8063,138.2344 Q183.3063,138.2344 181.9781,136.5938 Q180.6656,134.9375 180.6656,131.8125 Q180.6656,128.6875 181.9781,127.0313 Q183.3063,125.375 185.8063,125.375 Q186.5094,125.375 187.15,125.5313 Q187.8063,125.6875 188.3688,125.9844 L188.3688,128.7031 Q187.7438,128.125 187.15,127.8594 Q186.5563,127.5781 185.9313,127.5781 Q184.5875,127.5781 183.9,128.6563 Q183.2125,129.7188 183.2125,131.8125 Q183.2125,133.9063 183.9,134.9844 Q184.5875,136.0469 185.9313,136.0469 Q186.5563,136.0469 187.15,135.7813 Q187.7438,135.5 188.3688,134.9219 L188.3688,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="136.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="164.9951">income : decimal</text></g><!--link employee to doctor--><g id="link_employee_doctor"><path codeLine="22" d="M145.13,39.07 C157.43,58.33 175.721,86.9729 190.911,110.7629 " fill="none" id="employee-to-doctor" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="194.14,115.82,192.6679,106.0818,191.4492,111.6058,185.9252,110.387,194.14,115.82" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="174.5" y="82.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="181.4675" y="105.064">1</text></g><!--link employee to nurse--><g id="link_employee_nurse"><path codeLine="24" d="M125.87,39.07 C113.57,58.33 95.279,86.9729 80.089,110.7629 " fill="none" id="employee-to-nurse" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="76.86,115.82,85.0748,110.387,79.5508,111.6058,78.3321,106.0818,76.86,115.82" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="108.5" y="82.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="71.7825" y="105.064">1</text></g><!--SRC=[ROwzRW8n48HxFyNAFKNQ25q1Bu2IIAbNzWHRsDxJsY0XTEyU7o1o96bdlla9qOFMwnstC0paehe44sxY6-eefUAFiMFbZ0RzvI2FxKpT2UBhKlgAI5sfXrZ6EKikSQrqCHjsXxtAiVYj9D77aSy0RcOZwg7FpeTaRZAPYaQblwWZExnZhcsYLAJ0c5kzxUD9pe3jIzD3BKUjLudeSZqsKS89YLufbeOzT05xSRtscOx5IKR7FLpCd6PyiRLQ3MHVx4-sasHL4kp_tFtG0li6]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:283px;height:179px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 179" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="7"/><ellipse cx="100.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,28.6406 Q102.8906,28.9375 102.25,29.0781 Q101.6094,29.2344 100.9063,29.2344 Q98.4063,29.2344 97.0781,27.5938 Q95.7656,25.9375 95.7656,22.8125 Q95.7656,19.6875 97.0781,18.0313 Q98.4063,16.375 100.9063,16.375 Q101.6094,16.375 102.25,16.5313 Q102.9063,16.6875 103.4688,16.9844 L103.4688,19.7031 Q102.8438,19.125 102.25,18.8594 Q101.6563,18.5781 101.0313,18.5781 Q99.6875,18.5781 99,19.6563 Q98.3125,20.7188 98.3125,22.8125 Q98.3125,24.9063 99,25.9844 Q99.6875,27.0469 101.0313,27.0469 Q101.6563,27.0469 102.25,26.7813 Q102.8438,26.5 103.4688,25.9219 L103.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="27.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="116"/><ellipse cx="36.85" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,137.6406 Q39.2406,137.9375 38.6,138.0781 Q37.9594,138.2344 37.2563,138.2344 Q34.7563,138.2344 33.4281,136.5938 Q32.1156,134.9375 32.1156,131.8125 Q32.1156,128.6875 33.4281,127.0313 Q34.7563,125.375 37.2563,125.375 Q37.9594,125.375 38.6,125.5313 Q39.2563,125.6875 39.8188,125.9844 L39.8188,128.7031 Q39.1938,128.125 38.6,127.8594 Q38.0063,127.5781 37.3813,127.5781 Q36.0375,127.5781 35.35,128.6563 Q34.6625,129.7188 34.6625,131.8125 Q34.6625,133.9063 35.35,134.9844 Q36.0375,136.0469 37.3813,136.0469 Q38.0063,136.0469 38.6,135.7813 Q39.1938,135.5 39.8188,134.9219 L39.8188,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="136.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="164.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="116"/><ellipse cx="185.4" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,137.6406 Q187.7906,137.9375 187.15,138.0781 Q186.5094,138.2344 185.8063,138.2344 Q183.3063,138.2344 181.9781,136.5938 Q180.6656,134.9375 180.6656,131.8125 Q180.6656,128.6875 181.9781,127.0313 Q183.3063,125.375 185.8063,125.375 Q186.5094,125.375 187.15,125.5313 Q187.8063,125.6875 188.3688,125.9844 L188.3688,128.7031 Q187.7438,128.125 187.15,127.8594 Q186.5563,127.5781 185.9313,127.5781 Q184.5875,127.5781 183.9,128.6563 Q183.2125,129.7188 183.2125,131.8125 Q183.2125,133.9063 183.9,134.9844 Q184.5875,136.0469 185.9313,136.0469 Q186.5563,136.0469 187.15,135.7813 Q187.7438,135.5 188.3688,134.9219 L188.3688,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="136.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="164.9951">income : decimal</text></g><!--link employee to doctor--><g id="link_employee_doctor"><path codeLine="22" d="M145.13,39.07 C157.43,58.33 175.721,86.9729 190.911,110.7629 " fill="none" id="employee-to-doctor" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="194.14,115.82,192.6679,106.0818,191.4492,111.6058,185.9252,110.387,194.14,115.82" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="174.5" y="82.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="181.4675" y="105.064">1</text></g><!--link employee to nurse--><g id="link_employee_nurse"><path codeLine="24" d="M125.87,39.07 C113.57,58.33 95.279,86.9729 80.089,110.7629 " fill="none" id="employee-to-nurse" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="76.86,115.82,85.0748,110.387,79.5508,111.6058,78.3321,106.0818,76.86,115.82" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="108.5" y="82.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="71.7825" y="105.064">1</text></g><!--SRC=[ROwzRW8n48HxFyNAFKNQ25qHNW0bHMhBdc2BlTtJsaH2wDuzFa3ayjFEVFEJIm9jj_lGyZ1GB1OPBj_4LzH9fUAFiGyMHZJOBmVZrCxKdQofhgMF0kvAFHQPbYn53hNInRs4U3oOdYJjbDKUHzupGdEpgsWaVQjE8U8DIxYfaQZ0kLk9xnEiPy3tllcXoidgLIAwNETdOdo2wPcAD1nWApXfxBK_wI9HHtGy8POny8AljZQRWVoJ_yvsahmfm__FtG-ji2y0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/anon-nested-class-level.puml.svg b/src/docs/tests/anon-nested-class-level.puml.svg
index ab1b7de..37e4716 100644
--- a/src/docs/tests/anon-nested-class-level.puml.svg
+++ b/src/docs/tests/anon-nested-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="352px" preserveAspectRatio="none" style="width:262px;height:352px;background:#FFFFFF;" version="1.1" viewBox="0 0 262 352" width="262px" zoomAndPan="magnify"><defs/><g><!--class Customer.name.standardName--><g id="elem_Customer.name.standardName"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer.name.standardName" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="248" x="7" y="273"/><ellipse cx="22" cy="289" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,294.6406 Q24.3906,294.9375 23.75,295.0781 Q23.1094,295.2344 22.4063,295.2344 Q19.9063,295.2344 18.5781,293.5938 Q17.2656,291.9375 17.2656,288.8125 Q17.2656,285.6875 18.5781,284.0313 Q19.9063,282.375 22.4063,282.375 Q23.1094,282.375 23.75,282.5313 Q24.4063,282.6875 24.9688,282.9844 L24.9688,285.7031 Q24.3438,285.125 23.75,284.8594 Q23.1563,284.5781 22.5313,284.5781 Q21.1875,284.5781 20.5,285.6563 Q19.8125,286.7188 19.8125,288.8125 Q19.8125,290.9063 20.5,291.9844 Q21.1875,293.0469 22.5313,293.0469 Q23.1563,293.0469 23.75,292.7813 Q24.3438,292.5 24.9688,291.9219 L24.9688,294.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="36" y="293.8467">Customer.name.standardName</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="254" y1="305" y2="305"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="321.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="338.292">lastName : string</text></g><!--class Customer.name--><g id="elem_Customer.name"><rect codeLine="16" fill="#F1F1F1" height="56.2969" id="Customer.name" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="59.5" y="140"/><ellipse cx="74.5" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M77.4688,161.6406 Q76.8906,161.9375 76.25,162.0781 Q75.6094,162.2344 74.9063,162.2344 Q72.4063,162.2344 71.0781,160.5938 Q69.7656,158.9375 69.7656,155.8125 Q69.7656,152.6875 71.0781,151.0313 Q72.4063,149.375 74.9063,149.375 Q75.6094,149.375 76.25,149.5313 Q76.9063,149.6875 77.4688,149.9844 L77.4688,152.7031 Q76.8438,152.125 76.25,151.8594 Q75.6563,151.5781 75.0313,151.5781 Q73.6875,151.5781 73,152.6563 Q72.3125,153.7188 72.3125,155.8125 Q72.3125,157.9063 73,158.9844 Q73.6875,160.0469 75.0313,160.0469 Q75.6563,160.0469 76.25,159.7813 Q76.8438,159.5 77.4688,158.9219 L77.4688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="88.5" y="160.8467">Customer.name</text><line style="stroke:#181818;stroke-width:0.5;" x1="60.5" x2="201.5" y1="172" y2="172"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="65.5" y="188.9951">origin : string {O}</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="20" fill="#F1F1F1" height="56.2969" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="29.5" y="7"/><ellipse cx="92.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M95.7188,28.6406 Q95.1406,28.9375 94.5,29.0781 Q93.8594,29.2344 93.1563,29.2344 Q90.6563,29.2344 89.3281,27.5938 Q88.0156,25.9375 88.0156,22.8125 Q88.0156,19.6875 89.3281,18.0313 Q90.6563,16.375 93.1563,16.375 Q93.8594,16.375 94.5,16.5313 Q95.1563,16.6875 95.7188,16.9844 L95.7188,19.7031 Q95.0938,19.125 94.5,18.8594 Q93.9063,18.5781 93.2813,18.5781 Q91.9375,18.5781 91.25,19.6563 Q90.5625,20.7188 90.5625,22.8125 Q90.5625,24.9063 91.25,25.9844 Q91.9375,27.0469 93.2813,27.0469 Q93.9063,27.0469 94.5,26.7813 Q95.0938,26.5 95.7188,25.9219 L95.7188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="113.25" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="30.5" x2="231.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="35.5" y="55.9951">heightMetres : decimal {O}</text></g><!--link Customer.name to Customer.name.standardName--><g id="link_Customer.name_Customer.name.standardName"><path codeLine="24" d="M131,208.23 C131,230.11 131,243.03 131,266.88 " fill="none" id="Customer.name-Customer.name.standardName" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,196.23,127,202.23,131,208.23,135,202.23,131,196.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,272.88,135,263.88,131,267.88,127,263.88,131,272.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="96" x="132" y="239.0669">standardName</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="104.7875" y="261.862">0..1</text></g><!--link Customer to Customer.name--><g id="link_Customer_Customer.name"><path codeLine="26" d="M131,75.14 C131,97.63 131,111.42 131,133.89 " fill="none" id="Customer-Customer.name" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,63.14,127,69.14,131,75.14,135,69.14,131,63.14" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,139.89,135,130.89,131,134.89,127,130.89,131,139.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="132" y="106.0669">name</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="122.125" y="129.1493">1</text></g><!--SRC=[VO_1QiCm44Jl-eh5nq1CUmt1X-JSDhI5deMqjKHihTdT78hnlrTEcc0xeJTfHlDc5A97s6uFLaDLWOli6ZJX8hwZT9G4xuo3PTkY8YySR3lzWUm4yZALlYCsMP5ZJDsO1TTO4UZDphfZpNHAVayDyMt8Lq2hPaViaUVE9xLMQJ222YclaCuw_C0HgyIGAA4n5tonFubIYroE3qjHcxnb_velHUu6wC-xXZoFHKSPDY3ACTKJCwCMtl2uOCuaZdLCjn3qRyE3u3mJCDP1Nr0P9ISzkjZQvXfTjgtMwmgAfx9yBlx_QaP1CPCci2ld3lANEn_DBm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="352px" preserveAspectRatio="none" style="width:262px;height:352px;background:#FFFFFF;" version="1.1" viewBox="0 0 262 352" width="262px" zoomAndPan="magnify"><defs/><g><!--class Customer.name.standardName--><g id="elem_Customer.name.standardName"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer.name.standardName" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="248" x="7" y="273"/><ellipse cx="22" cy="289" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,294.6406 Q24.3906,294.9375 23.75,295.0781 Q23.1094,295.2344 22.4063,295.2344 Q19.9063,295.2344 18.5781,293.5938 Q17.2656,291.9375 17.2656,288.8125 Q17.2656,285.6875 18.5781,284.0313 Q19.9063,282.375 22.4063,282.375 Q23.1094,282.375 23.75,282.5313 Q24.4063,282.6875 24.9688,282.9844 L24.9688,285.7031 Q24.3438,285.125 23.75,284.8594 Q23.1563,284.5781 22.5313,284.5781 Q21.1875,284.5781 20.5,285.6563 Q19.8125,286.7188 19.8125,288.8125 Q19.8125,290.9063 20.5,291.9844 Q21.1875,293.0469 22.5313,293.0469 Q23.1563,293.0469 23.75,292.7813 Q24.3438,292.5 24.9688,291.9219 L24.9688,294.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="216" x="36" y="293.8467">Customer.name.standardName</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="254" y1="305" y2="305"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="321.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="338.292">lastName : string</text></g><!--class Customer.name--><g id="elem_Customer.name"><rect codeLine="16" fill="#F1F1F1" height="56.2969" id="Customer.name" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="59.5" y="140"/><ellipse cx="74.5" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M77.4688,161.6406 Q76.8906,161.9375 76.25,162.0781 Q75.6094,162.2344 74.9063,162.2344 Q72.4063,162.2344 71.0781,160.5938 Q69.7656,158.9375 69.7656,155.8125 Q69.7656,152.6875 71.0781,151.0313 Q72.4063,149.375 74.9063,149.375 Q75.6094,149.375 76.25,149.5313 Q76.9063,149.6875 77.4688,149.9844 L77.4688,152.7031 Q76.8438,152.125 76.25,151.8594 Q75.6563,151.5781 75.0313,151.5781 Q73.6875,151.5781 73,152.6563 Q72.3125,153.7188 72.3125,155.8125 Q72.3125,157.9063 73,158.9844 Q73.6875,160.0469 75.0313,160.0469 Q75.6563,160.0469 76.25,159.7813 Q76.8438,159.5 77.4688,158.9219 L77.4688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="88.5" y="160.8467">Customer.name</text><line style="stroke:#181818;stroke-width:0.5;" x1="60.5" x2="201.5" y1="172" y2="172"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="65.5" y="188.9951">origin : string {O}</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="20" fill="#F1F1F1" height="56.2969" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="29.5" y="7"/><ellipse cx="92.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M95.7188,28.6406 Q95.1406,28.9375 94.5,29.0781 Q93.8594,29.2344 93.1563,29.2344 Q90.6563,29.2344 89.3281,27.5938 Q88.0156,25.9375 88.0156,22.8125 Q88.0156,19.6875 89.3281,18.0313 Q90.6563,16.375 93.1563,16.375 Q93.8594,16.375 94.5,16.5313 Q95.1563,16.6875 95.7188,16.9844 L95.7188,19.7031 Q95.0938,19.125 94.5,18.8594 Q93.9063,18.5781 93.2813,18.5781 Q91.9375,18.5781 91.25,19.6563 Q90.5625,20.7188 90.5625,22.8125 Q90.5625,24.9063 91.25,25.9844 Q91.9375,27.0469 93.2813,27.0469 Q93.9063,27.0469 94.5,26.7813 Q95.0938,26.5 95.7188,25.9219 L95.7188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="113.25" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="30.5" x2="231.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="35.5" y="55.9951">heightMetres : decimal {O}</text></g><!--link Customer.name to Customer.name.standardName--><g id="link_Customer.name_Customer.name.standardName"><path codeLine="24" d="M131,208.23 C131,230.11 131,243.03 131,266.88 " fill="none" id="Customer.name-Customer.name.standardName" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,196.23,127,202.23,131,208.23,135,202.23,131,196.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,272.88,135,263.88,131,267.88,127,263.88,131,272.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="96" x="132" y="239.0669">standardName</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="104.7875" y="261.862">0..1</text></g><!--link Customer to Customer.name--><g id="link_Customer_Customer.name"><path codeLine="26" d="M131,75.14 C131,97.63 131,111.42 131,133.89 " fill="none" id="Customer-Customer.name" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,63.14,127,69.14,131,75.14,135,69.14,131,63.14" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="131,139.89,135,130.89,131,134.89,127,130.89,131,139.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="132" y="106.0669">name</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="122.125" y="129.1493">1</text></g><!--SRC=[VOynJyCm48Lt_ufJHgH6iA8g0vs12WRcatt4LXqxkhiEACf_nsbfbQGLc_DUlk_PFZY2xNQFwfi6R60RoVXp-47IvoHqK-oHiICbNZNKzVe3fV7PoJpw3XHB8eUG-ea56r441lE2zj1oFYQtop7pzI9Vdb3DQ8GKKjcI7YrzqWHhPaWvaJ5dIRKxYkQEk9v-h4KnEMJtLZwgiW0mdDR7SWaMdM9u1b4EgPsLHRNgnli3IsVcq8PqXM1u7- -0IyPJQBs-aZ998HtPq66yeEkrXyscWUgnhf-g_vzQL50jefdiuhcH_76de_a5]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/anon-property-not-required.puml.svg b/src/docs/tests/anon-property-not-required.puml.svg
index c691d0e..5e34916 100644
--- a/src/docs/tests/anon-property-not-required.puml.svg
+++ b/src/docs/tests/anon-property-not-required.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="219px" preserveAspectRatio="none" style="width:217px;height:219px;background:#FFFFFF;" version="1.1" viewBox="0 0 217 219" width="217px" zoomAndPan="magnify"><defs/><g><!--class Customer.name--><g id="elem_Customer.name"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer.name" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="37" y="140"/><ellipse cx="52" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M54.9688,161.6406 Q54.3906,161.9375 53.75,162.0781 Q53.1094,162.2344 52.4063,162.2344 Q49.9063,162.2344 48.5781,160.5938 Q47.2656,158.9375 47.2656,155.8125 Q47.2656,152.6875 48.5781,151.0313 Q49.9063,149.375 52.4063,149.375 Q53.1094,149.375 53.75,149.5313 Q54.4063,149.6875 54.9688,149.9844 L54.9688,152.7031 Q54.3438,152.125 53.75,151.8594 Q53.1563,151.5781 52.5313,151.5781 Q51.1875,151.5781 50.5,152.6563 Q49.8125,153.7188 49.8125,155.8125 Q49.8125,157.9063 50.5,158.9844 Q51.1875,160.0469 52.5313,160.0469 Q53.1563,160.0469 53.75,159.7813 Q54.3438,159.5 54.9688,158.9219 L54.9688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="66" y="160.8467">Customer.name</text><line style="stroke:#181818;stroke-width:0.5;" x1="38" x2="179" y1="172" y2="172"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="43" y="188.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="43" y="205.292">lastName : string</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="16" fill="#F1F1F1" height="56.2969" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="90.75" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="209" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="55.9951">heightMetres : decimal {O}</text></g><!--link Customer to Customer.name--><g id="link_Customer_Customer.name"><path codeLine="20" d="M108.5,75.23 C108.5,97.11 108.5,110.03 108.5,133.88 " fill="none" id="Customer-Customer.name" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,63.23,104.5,69.23,108.5,75.23,112.5,69.23,108.5,63.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,139.88,112.5,130.88,108.5,134.88,104.5,130.88,108.5,139.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="109.5" y="106.0669">name</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="82.2875" y="128.862">0..1</text></g><!--SRC=[POunQyCm48Lt_Of3Oo6cNKFmaCnjGbFeBAIh9MBfpDrbACR_lN82nOatyRxxdbvC0M6tEpcDRGi-iU_Hn7luYJ9G4Lo1asENKP6V2EP1Vw6II46MqK_2lYPoIMMONV2z4u7Hx9s_T4pN4WxK4_yF-OxerEo90_8Z-QBib2OZg53g2XcSnpFEjKeCXGeQSw-tXwiePUHcFhJrEu3nDcMgYrZqeyQm1L5EfLl0QZ-nQTNvM1SnTL7VKHcbMW5zogw7yJZDwa9wsMnQiAzDysPN-we8zlOqVm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="219px" preserveAspectRatio="none" style="width:217px;height:219px;background:#FFFFFF;" version="1.1" viewBox="0 0 217 219" width="217px" zoomAndPan="magnify"><defs/><g><!--class Customer.name--><g id="elem_Customer.name"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer.name" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="37" y="140"/><ellipse cx="52" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M54.9688,161.6406 Q54.3906,161.9375 53.75,162.0781 Q53.1094,162.2344 52.4063,162.2344 Q49.9063,162.2344 48.5781,160.5938 Q47.2656,158.9375 47.2656,155.8125 Q47.2656,152.6875 48.5781,151.0313 Q49.9063,149.375 52.4063,149.375 Q53.1094,149.375 53.75,149.5313 Q54.4063,149.6875 54.9688,149.9844 L54.9688,152.7031 Q54.3438,152.125 53.75,151.8594 Q53.1563,151.5781 52.5313,151.5781 Q51.1875,151.5781 50.5,152.6563 Q49.8125,153.7188 49.8125,155.8125 Q49.8125,157.9063 50.5,158.9844 Q51.1875,160.0469 52.5313,160.0469 Q53.1563,160.0469 53.75,159.7813 Q54.3438,159.5 54.9688,158.9219 L54.9688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="66" y="160.8467">Customer.name</text><line style="stroke:#181818;stroke-width:0.5;" x1="38" x2="179" y1="172" y2="172"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="43" y="188.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="43" y="205.292">lastName : string</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="16" fill="#F1F1F1" height="56.2969" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="90.75" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="209" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="55.9951">heightMetres : decimal {O}</text></g><!--link Customer to Customer.name--><g id="link_Customer_Customer.name"><path codeLine="20" d="M108.5,75.23 C108.5,97.11 108.5,110.03 108.5,133.88 " fill="none" id="Customer-Customer.name" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,63.23,104.5,69.23,108.5,75.23,112.5,69.23,108.5,63.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,139.88,112.5,130.88,108.5,134.88,104.5,130.88,108.5,139.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="109.5" y="106.0669">name</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="82.2875" y="128.862">0..1</text></g><!--SRC=[POunQyCm48Lt_Of3Oo6cNKFmqCnjGpDq5lAh9I9Bvkuo5EF_NZc1uiQRU9- -zox43dGud9o6jYKVsIUOS0y_8MF9WWquENO35Fn0C8pwGvM4qiaw-ev8DP5BpEFYaazEX2RpwlobvtBDtR6amd-7V0KuDRCHAEMw9QFpE6EHjJ3bac7ClSGUhw9b03VBHrjBYQRRu5ntMVIznhGdKOwvNy5gFx1vq_c_BY3sGT-W3AbM1ny7bsZwc1Tr9JtjTYtPvwPviPlxgaZszZI_]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/anon-property-required.puml.svg b/src/docs/tests/anon-property-required.puml.svg
index ed4cf84..2a5c30f 100644
--- a/src/docs/tests/anon-property-required.puml.svg
+++ b/src/docs/tests/anon-property-required.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="219px" preserveAspectRatio="none" style="width:217px;height:219px;background:#FFFFFF;" version="1.1" viewBox="0 0 217 219" width="217px" zoomAndPan="magnify"><defs/><g><!--class Customer.name--><g id="elem_Customer.name"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer.name" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="37" y="140"/><ellipse cx="52" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M54.9688,161.6406 Q54.3906,161.9375 53.75,162.0781 Q53.1094,162.2344 52.4063,162.2344 Q49.9063,162.2344 48.5781,160.5938 Q47.2656,158.9375 47.2656,155.8125 Q47.2656,152.6875 48.5781,151.0313 Q49.9063,149.375 52.4063,149.375 Q53.1094,149.375 53.75,149.5313 Q54.4063,149.6875 54.9688,149.9844 L54.9688,152.7031 Q54.3438,152.125 53.75,151.8594 Q53.1563,151.5781 52.5313,151.5781 Q51.1875,151.5781 50.5,152.6563 Q49.8125,153.7188 49.8125,155.8125 Q49.8125,157.9063 50.5,158.9844 Q51.1875,160.0469 52.5313,160.0469 Q53.1563,160.0469 53.75,159.7813 Q54.3438,159.5 54.9688,158.9219 L54.9688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="66" y="160.8467">Customer.name</text><line style="stroke:#181818;stroke-width:0.5;" x1="38" x2="179" y1="172" y2="172"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="43" y="188.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="43" y="205.292">lastName : string</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="16" fill="#F1F1F1" height="56.2969" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="90.75" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="209" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="55.9951">heightMetres : decimal {O}</text></g><!--link Customer to Customer.name--><g id="link_Customer_Customer.name"><path codeLine="20" d="M108.5,75.23 C108.5,97.11 108.5,110.03 108.5,133.88 " fill="none" id="Customer-Customer.name" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,63.23,104.5,69.23,108.5,75.23,112.5,69.23,108.5,63.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,139.88,112.5,130.88,108.5,134.88,104.5,130.88,108.5,139.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="109.5" y="106.0669">name</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="99.7625" y="128.862">1</text></g><!--SRC=[POunQyCm48Lt_Of3Oo65hYLuIEQs8Grq5jBL4f5qvkuo1EF_NZc1uiIRUDzzJo-cWB3T7fp6hWEVs6SqyHuUKGQgWYjmSEmAAl8JmJBe5Hg956GP_IRCBP5pgiFiWizE14QpS_xSCrrgs5Cc_X_o4z6fsH47v4ToekAK9YEeKDiA6Pp7RvnhbHWgLJJcNc_t5r4goA_peMtV0OotALDRnAAVBOPt4ELK-mLizXERLfsFTH5J7_K3bL6Q5T2duZACNzEiBgINpQO3-sPNuve5zlOqVm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="219px" preserveAspectRatio="none" style="width:217px;height:219px;background:#FFFFFF;" version="1.1" viewBox="0 0 217 219" width="217px" zoomAndPan="magnify"><defs/><g><!--class Customer.name--><g id="elem_Customer.name"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer.name" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="143" x="37" y="140"/><ellipse cx="52" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M54.9688,161.6406 Q54.3906,161.9375 53.75,162.0781 Q53.1094,162.2344 52.4063,162.2344 Q49.9063,162.2344 48.5781,160.5938 Q47.2656,158.9375 47.2656,155.8125 Q47.2656,152.6875 48.5781,151.0313 Q49.9063,149.375 52.4063,149.375 Q53.1094,149.375 53.75,149.5313 Q54.4063,149.6875 54.9688,149.9844 L54.9688,152.7031 Q54.3438,152.125 53.75,151.8594 Q53.1563,151.5781 52.5313,151.5781 Q51.1875,151.5781 50.5,152.6563 Q49.8125,153.7188 49.8125,155.8125 Q49.8125,157.9063 50.5,158.9844 Q51.1875,160.0469 52.5313,160.0469 Q53.1563,160.0469 53.75,159.7813 Q54.3438,159.5 54.9688,158.9219 L54.9688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="66" y="160.8467">Customer.name</text><line style="stroke:#181818;stroke-width:0.5;" x1="38" x2="179" y1="172" y2="172"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="43" y="188.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="43" y="205.292">lastName : string</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="16" fill="#F1F1F1" height="56.2969" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="90.75" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="209" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="55.9951">heightMetres : decimal {O}</text></g><!--link Customer to Customer.name--><g id="link_Customer_Customer.name"><path codeLine="20" d="M108.5,75.23 C108.5,97.11 108.5,110.03 108.5,133.88 " fill="none" id="Customer-Customer.name" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,63.23,104.5,69.23,108.5,75.23,112.5,69.23,108.5,63.23" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,139.88,112.5,130.88,108.5,134.88,104.5,130.88,108.5,139.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="109.5" y="106.0669">name</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="99.7625" y="128.862">1</text></g><!--SRC=[POunQyCm48Lt_Of3Oo61hYLuIEQceHaw2_dL4f4bStSPWl5_hvn0SU9Dl4_VUnTY2zhjJav3qv2Fx1DCU8JVaA5amGgS7BiU2duXw0UzKIMXjBACVYDIJUGIyp2xv9CJeT7idRzqNAwvFPHK-F-Gdm2dPZ82fLotP70UPyoo5gPSCenvbDZ3LRJquEtyqTPIel4-EDLT5ZtMc3v8b6Fk5h3QBsnQTJxN1SGkw2UK8TLguMFl4erVqwmkfBVDfY7xRbV7LOli_Md-0000]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/any-of-anon-class-level.puml.svg b/src/docs/tests/any-of-anon-class-level.puml.svg
index e23bffa..a04839f 100644
--- a/src/docs/tests/any-of-anon-class-level.puml.svg
+++ b/src/docs/tests/any-of-anon-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:447px;height:179px;background:#FFFFFF;" version="1.1" viewBox="0 0 447 179" width="447px" zoomAndPan="magnify"><defs/><g><!--class employee.1--><g id="elem_employee.1"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="employee.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="7" y="7"/><ellipse cx="61.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M64.7188,28.6406 Q64.1406,28.9375 63.5,29.0781 Q62.8594,29.2344 62.1563,29.2344 Q59.6563,29.2344 58.3281,27.5938 Q57.0156,25.9375 57.0156,22.8125 Q57.0156,19.6875 58.3281,18.0313 Q59.6563,16.375 62.1563,16.375 Q62.8594,16.375 63.5,16.5313 Q64.1563,16.6875 64.7188,16.9844 L64.7188,19.7031 Q64.0938,19.125 63.5,18.8594 Q62.9063,18.5781 62.2813,18.5781 Q60.9375,18.5781 60.25,19.6563 Q59.5625,20.7188 59.5625,22.8125 Q59.5625,24.9063 60.25,25.9844 Q60.9375,27.0469 62.2813,27.0469 Q62.9063,27.0469 63.5,26.7813 Q64.0938,26.5 64.7188,25.9219 L64.7188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="82.25" y="27.8467">employee.1</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="205" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="13" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="72.292">level : integer</text></g><!--class employee.2--><g id="elem_employee.2"><rect codeLine="16" fill="#F1F1F1" height="72.5938" id="employee.2" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="241" y="7"/><ellipse cx="295.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M298.7188,28.6406 Q298.1406,28.9375 297.5,29.0781 Q296.8594,29.2344 296.1563,29.2344 Q293.6563,29.2344 292.3281,27.5938 Q291.0156,25.9375 291.0156,22.8125 Q291.0156,19.6875 292.3281,18.0313 Q293.6563,16.375 296.1563,16.375 Q296.8594,16.375 297.5,16.5313 Q298.1563,16.6875 298.7188,16.9844 L298.7188,19.7031 Q298.0938,19.125 297.5,18.8594 Q296.9063,18.5781 296.2813,18.5781 Q294.9375,18.5781 294.25,19.6563 Q293.5625,20.7188 293.5625,22.8125 Q293.5625,24.9063 294.25,25.9844 Q294.9375,27.0469 296.2813,27.0469 Q296.9063,27.0469 297.5,26.7813 Q298.0938,26.5 298.7188,25.9219 L298.7188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="316.25" y="27.8467">employee.2</text><line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="439" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="247" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="247" y="72.292">income : decimal</text></g><!--class employee--><g id="elem_employee"><rect codeLine="21" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="173.5" y="140"/><ellipse cx="188.5" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M191.4688,161.6406 Q190.8906,161.9375 190.25,162.0781 Q189.6094,162.2344 188.9063,162.2344 Q186.4063,162.2344 185.0781,160.5938 Q183.7656,158.9375 183.7656,155.8125 Q183.7656,152.6875 185.0781,151.0313 Q186.4063,149.375 188.9063,149.375 Q189.6094,149.375 190.25,149.5313 Q190.9063,149.6875 191.4688,149.9844 L191.4688,152.7031 Q190.8438,152.125 190.25,151.8594 Q189.6563,151.5781 189.0313,151.5781 Q187.6875,151.5781 187,152.6563 Q186.3125,153.7188 186.3125,155.8125 Q186.3125,157.9063 187,158.9844 Q187.6875,160.0469 189.0313,160.0469 Q189.6563,160.0469 190.25,159.7813 Q190.8438,159.5 191.4688,158.9219 L191.4688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="202.5" y="160.8467">employee</text></g><!--link employee.1 to employee--><g id="link_employee.1_employee"><path codeLine="24" d="M144.16,80.07 C165.54,100.26 178.1044,112.1201 194.3344,127.4501 " fill="none" id="employee.1-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="207.42,139.81,198.4544,123.0882,190.2145,131.8119,207.42,139.81" style="stroke:#181818;stroke-width:1.0;"/></g><!--link employee.2 to employee--><g id="link_employee.2_employee"><path codeLine="26" d="M302.84,80.07 C281.46,100.26 268.8956,112.1201 252.6656,127.4501 " fill="none" id="employee.2-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="239.58,139.81,256.7855,131.8119,248.5456,123.0882,239.58,139.81" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[bOx1JiCm44Jl_efLxqMYHrJbK3w0YbRYRDb3RDNsMck358NyEmuLA2LSkCxRVJFEMz1-VzJLTHqPBoP0kMluZ98v5Qp0KOkEg91V137NWHfnRCioUlK8BIaNd_ByIoReKcXK1sqklV1RieySM7w6l3ZegWui5d9BpXnrvKaLL4fjHSdQu8HPMraeSO9IL_scbGSUWBlxJUiY6hzsJFITduSCUg1InQUUngTfSHFmZj2WJnKzH4rhw-x_LfyCnvbQ61zr-4CxIrjwCtwx_UWM5qkwMzDF]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="179px" preserveAspectRatio="none" style="width:447px;height:179px;background:#FFFFFF;" version="1.1" viewBox="0 0 447 179" width="447px" zoomAndPan="magnify"><defs/><g><!--class employee.1--><g id="elem_employee.1"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="employee.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="7" y="7"/><ellipse cx="61.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M64.7188,28.6406 Q64.1406,28.9375 63.5,29.0781 Q62.8594,29.2344 62.1563,29.2344 Q59.6563,29.2344 58.3281,27.5938 Q57.0156,25.9375 57.0156,22.8125 Q57.0156,19.6875 58.3281,18.0313 Q59.6563,16.375 62.1563,16.375 Q62.8594,16.375 63.5,16.5313 Q64.1563,16.6875 64.7188,16.9844 L64.7188,19.7031 Q64.0938,19.125 63.5,18.8594 Q62.9063,18.5781 62.2813,18.5781 Q60.9375,18.5781 60.25,19.6563 Q59.5625,20.7188 59.5625,22.8125 Q59.5625,24.9063 60.25,25.9844 Q60.9375,27.0469 62.2813,27.0469 Q62.9063,27.0469 63.5,26.7813 Q64.0938,26.5 64.7188,25.9219 L64.7188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="82.25" y="27.8467">employee.1</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="205" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="13" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="72.292">level : integer</text></g><!--class employee.2--><g id="elem_employee.2"><rect codeLine="16" fill="#F1F1F1" height="72.5938" id="employee.2" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="241" y="7"/><ellipse cx="295.75" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M298.7188,28.6406 Q298.1406,28.9375 297.5,29.0781 Q296.8594,29.2344 296.1563,29.2344 Q293.6563,29.2344 292.3281,27.5938 Q291.0156,25.9375 291.0156,22.8125 Q291.0156,19.6875 292.3281,18.0313 Q293.6563,16.375 296.1563,16.375 Q296.8594,16.375 297.5,16.5313 Q298.1563,16.6875 298.7188,16.9844 L298.7188,19.7031 Q298.0938,19.125 297.5,18.8594 Q296.9063,18.5781 296.2813,18.5781 Q294.9375,18.5781 294.25,19.6563 Q293.5625,20.7188 293.5625,22.8125 Q293.5625,24.9063 294.25,25.9844 Q294.9375,27.0469 296.2813,27.0469 Q296.9063,27.0469 297.5,26.7813 Q298.0938,26.5 298.7188,25.9219 L298.7188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="81" x="316.25" y="27.8467">employee.2</text><line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="439" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="247" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="247" y="72.292">income : decimal</text></g><!--class employee--><g id="elem_employee"><rect codeLine="21" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="173.5" y="140"/><ellipse cx="188.5" cy="156" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M191.4688,161.6406 Q190.8906,161.9375 190.25,162.0781 Q189.6094,162.2344 188.9063,162.2344 Q186.4063,162.2344 185.0781,160.5938 Q183.7656,158.9375 183.7656,155.8125 Q183.7656,152.6875 185.0781,151.0313 Q186.4063,149.375 188.9063,149.375 Q189.6094,149.375 190.25,149.5313 Q190.9063,149.6875 191.4688,149.9844 L191.4688,152.7031 Q190.8438,152.125 190.25,151.8594 Q189.6563,151.5781 189.0313,151.5781 Q187.6875,151.5781 187,152.6563 Q186.3125,153.7188 186.3125,155.8125 Q186.3125,157.9063 187,158.9844 Q187.6875,160.0469 189.0313,160.0469 Q189.6563,160.0469 190.25,159.7813 Q190.8438,159.5 191.4688,158.9219 L191.4688,161.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="202.5" y="160.8467">employee</text></g><!--link employee.1 to employee--><g id="link_employee.1_employee"><path codeLine="24" d="M144.16,80.07 C165.54,100.26 178.1044,112.1201 194.3344,127.4501 " fill="none" id="employee.1-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="207.42,139.81,198.4544,123.0882,190.2145,131.8119,207.42,139.81" style="stroke:#181818;stroke-width:1.0;"/></g><!--link employee.2 to employee--><g id="link_employee.2_employee"><path codeLine="26" d="M302.84,80.07 C281.46,100.26 268.8956,112.1201 252.6656,127.4501 " fill="none" id="employee.2-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="239.58,139.81,256.7855,131.8119,248.5456,123.0882,239.58,139.81" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[bOx1JiCm44Jl_efLxqMYnwhAeNm05I1njfnfRDNPjRmkKXJoxpXKe42uS9stysPzQ467myaMtpJaGdOHnj_29sWILgp0oMRReo3_8kXJ6QWIBwqketD0h8bU0gUvIovQLHhDqRfBb-NAxOD4oT-Fl7hOOYQZACHrIvDrUCPSBfA9XM7CJRAf4r46uEv-Kur4u-VQH5_vov10UzAI0tSqFawBcuWtn0e35tJ8TN5btVtV6jX9FzCMBlGs_g6TfJNzyVns-zuiBfPqjwOV]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/any-of-anon-property-level.puml.svg b/src/docs/tests/any-of-anon-property-level.puml.svg
index d286597..a7dcf7f 100644
--- a/src/docs/tests/any-of-anon-property-level.puml.svg
+++ b/src/docs/tests/any-of-anon-property-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:582px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 582 188" width="582px" zoomAndPan="magnify"><defs/><g><!--class employee.role--><g id="elem_employee.role"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="employee.role" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="7" y="7"/><ellipse cx="53.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M56.2188,28.6406 Q55.6406,28.9375 55,29.0781 Q54.3594,29.2344 53.6563,29.2344 Q51.1563,29.2344 49.8281,27.5938 Q48.5156,25.9375 48.5156,22.8125 Q48.5156,19.6875 49.8281,18.0313 Q51.1563,16.375 53.6563,16.375 Q54.3594,16.375 55,16.5313 Q55.6563,16.6875 56.2188,16.9844 L56.2188,19.7031 Q55.5938,19.125 55,18.8594 Q54.4063,18.5781 53.7813,18.5781 Q52.4375,18.5781 51.75,19.6563 Q51.0625,20.7188 51.0625,22.8125 Q51.0625,24.9063 51.75,25.9844 Q52.4375,27.0469 53.7813,27.0469 Q54.4063,27.0469 55,26.7813 Q55.5938,26.5 56.2188,25.9219 L56.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="73.75" y="27.8467">employee.role</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="205" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="13" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="72.292">level : integer</text></g><!--class employee.role.1--><g id="elem_employee.role.1"><rect codeLine="16" fill="#F1F1F1" height="72.5938" id="employee.role.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="241" y="7"/><ellipse cx="281.2" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M284.1688,28.6406 Q283.5906,28.9375 282.95,29.0781 Q282.3094,29.2344 281.6063,29.2344 Q279.1063,29.2344 277.7781,27.5938 Q276.4656,25.9375 276.4656,22.8125 Q276.4656,19.6875 277.7781,18.0313 Q279.1063,16.375 281.6063,16.375 Q282.3094,16.375 282.95,16.5313 Q283.6063,16.6875 284.1688,16.9844 L284.1688,19.7031 Q283.5438,19.125 282.95,18.8594 Q282.3563,18.5781 281.7313,18.5781 Q280.3875,18.5781 279.7,19.6563 Q279.0125,20.7188 279.0125,22.8125 Q279.0125,24.9063 279.7,25.9844 Q280.3875,27.0469 281.7313,27.0469 Q282.3563,27.0469 282.95,26.7813 Q283.5438,26.5 284.1688,25.9219 L284.1688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="300.8" y="27.8467">employee.role.1</text><line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="439" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="247" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="247" y="72.292">income : decimal</text></g><!--class employee--><g id="elem_employee"><rect codeLine="21" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="475.5" y="27.5"/><ellipse cx="490.5" cy="43.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M493.4688,49.1406 Q492.8906,49.4375 492.25,49.5781 Q491.6094,49.7344 490.9063,49.7344 Q488.4063,49.7344 487.0781,48.0938 Q485.7656,46.4375 485.7656,43.3125 Q485.7656,40.1875 487.0781,38.5313 Q488.4063,36.875 490.9063,36.875 Q491.6094,36.875 492.25,37.0313 Q492.9063,37.1875 493.4688,37.4844 L493.4688,40.2031 Q492.8438,39.625 492.25,39.3594 Q491.6563,39.0781 491.0313,39.0781 Q489.6875,39.0781 489,40.1563 Q488.3125,41.2188 488.3125,43.3125 Q488.3125,45.4063 489,46.4844 Q489.6875,47.5469 491.0313,47.5469 Q491.6563,47.5469 492.25,47.2813 Q492.8438,47 493.4688,46.4219 L493.4688,49.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="504.5" y="48.3467">employee</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="340.5,157,352.5,169,340.5,181,328.5,169,340.5,157" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="26" d="M502.82,59.64 C460.75,87.73 377.6105,143.2291 352.3805,160.0691 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="347.39,163.4,357.0963,161.7306,351.5487,160.6242,352.6551,155.0766,347.39,163.4" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="423.5" y="123.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="360.3769" y="151.5063">0..1</text></g><!--link employee.role to anon1--><g id="link_employee.role_anon1"><path codeLine="28" d="M173.87,80.06 C231.66,110.55 293.3513,143.1179 317.2613,155.7379 " fill="none" id="employee.role-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="333.18,164.14,320.062,150.4317,314.4606,161.0441,333.18,164.14" style="stroke:#181818;stroke-width:1.0;"/></g><!--link employee.role.1 to anon1--><g id="link_employee.role.1_anon1"><path codeLine="30" d="M340.5,80.22 C340.5,106.15 340.5,121.58 340.5,138.74 " fill="none" id="employee.role.1-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="340.5,156.74,346.5,138.74,334.5,138.74,340.5,156.74" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[bOz1JiCm44NtFiN8-rHqYweioW6ee19ho_uaLcrFP1kaAEJks2b5QUc6xNypR-Rtre1skuFAVTkIjb4xYFuSlY0D71B-W8EAoYCZtX3u8OzKICychQDt2rUITB9XgBkadKg99h5N-jH5_WZcYHt7tqVUUgWizXmDuZKvibUPPv6GAPGlqg0qNb6rcIC53X3Yh9VbkECHs4HsaEKSqRIyCjC57SS1z4WfHniwcfxdrOp39ro1DcHqY6A-Bzvi_w-sGRElr41RhzmTTvMMr5ZbEHXIfTbMY1LkcbO-REfrkK1PT79fkXhxgTuqN-rbx9PMmnN_1W00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="188px" preserveAspectRatio="none" style="width:582px;height:188px;background:#FFFFFF;" version="1.1" viewBox="0 0 582 188" width="582px" zoomAndPan="magnify"><defs/><g><!--class employee.role--><g id="elem_employee.role"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="employee.role" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="7" y="7"/><ellipse cx="53.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M56.2188,28.6406 Q55.6406,28.9375 55,29.0781 Q54.3594,29.2344 53.6563,29.2344 Q51.1563,29.2344 49.8281,27.5938 Q48.5156,25.9375 48.5156,22.8125 Q48.5156,19.6875 49.8281,18.0313 Q51.1563,16.375 53.6563,16.375 Q54.3594,16.375 55,16.5313 Q55.6563,16.6875 56.2188,16.9844 L56.2188,19.7031 Q55.5938,19.125 55,18.8594 Q54.4063,18.5781 53.7813,18.5781 Q52.4375,18.5781 51.75,19.6563 Q51.0625,20.7188 51.0625,22.8125 Q51.0625,24.9063 51.75,25.9844 Q52.4375,27.0469 53.7813,27.0469 Q54.4063,27.0469 55,26.7813 Q55.5938,26.5 56.2188,25.9219 L56.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="73.75" y="27.8467">employee.role</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="205" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="13" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="72.292">level : integer</text></g><!--class employee.role.1--><g id="elem_employee.role.1"><rect codeLine="16" fill="#F1F1F1" height="72.5938" id="employee.role.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="199" x="241" y="7"/><ellipse cx="281.2" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M284.1688,28.6406 Q283.5906,28.9375 282.95,29.0781 Q282.3094,29.2344 281.6063,29.2344 Q279.1063,29.2344 277.7781,27.5938 Q276.4656,25.9375 276.4656,22.8125 Q276.4656,19.6875 277.7781,18.0313 Q279.1063,16.375 281.6063,16.375 Q282.3094,16.375 282.95,16.5313 Q283.6063,16.6875 284.1688,16.9844 L284.1688,19.7031 Q283.5438,19.125 282.95,18.8594 Q282.3563,18.5781 281.7313,18.5781 Q280.3875,18.5781 279.7,19.6563 Q279.0125,20.7188 279.0125,22.8125 Q279.0125,24.9063 279.7,25.9844 Q280.3875,27.0469 281.7313,27.0469 Q282.3563,27.0469 282.95,26.7813 Q283.5438,26.5 284.1688,25.9219 L284.1688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="111" x="300.8" y="27.8467">employee.role.1</text><line style="stroke:#181818;stroke-width:0.5;" x1="242" x2="439" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="187" x="247" y="55.9951">employeeType : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="247" y="72.292">income : decimal</text></g><!--class employee--><g id="elem_employee"><rect codeLine="21" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="475.5" y="27.5"/><ellipse cx="490.5" cy="43.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M493.4688,49.1406 Q492.8906,49.4375 492.25,49.5781 Q491.6094,49.7344 490.9063,49.7344 Q488.4063,49.7344 487.0781,48.0938 Q485.7656,46.4375 485.7656,43.3125 Q485.7656,40.1875 487.0781,38.5313 Q488.4063,36.875 490.9063,36.875 Q491.6094,36.875 492.25,37.0313 Q492.9063,37.1875 493.4688,37.4844 L493.4688,40.2031 Q492.8438,39.625 492.25,39.3594 Q491.6563,39.0781 491.0313,39.0781 Q489.6875,39.0781 489,40.1563 Q488.3125,41.2188 488.3125,43.3125 Q488.3125,45.4063 489,46.4844 Q489.6875,47.5469 491.0313,47.5469 Q491.6563,47.5469 492.25,47.2813 Q492.8438,47 493.4688,46.4219 L493.4688,49.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="504.5" y="48.3467">employee</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="340.5,157,352.5,169,340.5,181,328.5,169,340.5,157" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="26" d="M502.82,59.64 C460.75,87.73 377.6105,143.2291 352.3805,160.0691 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="347.39,163.4,357.0963,161.7306,351.5487,160.6242,352.6551,155.0766,347.39,163.4" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="423.5" y="123.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="360.3769" y="151.5063">0..1</text></g><!--link employee.role to anon1--><g id="link_employee.role_anon1"><path codeLine="28" d="M173.87,80.06 C231.66,110.55 293.3513,143.1179 317.2613,155.7379 " fill="none" id="employee.role-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="333.18,164.14,320.062,150.4317,314.4606,161.0441,333.18,164.14" style="stroke:#181818;stroke-width:1.0;"/></g><!--link employee.role.1 to anon1--><g id="link_employee.role.1_anon1"><path codeLine="30" d="M340.5,80.22 C340.5,106.15 340.5,121.58 340.5,138.74 " fill="none" id="employee.role.1-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="340.5,156.74,346.5,138.74,334.5,138.74,340.5,156.74" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[bOz1JiCm44NtFiN8-qHqYweiu01K58crPNyIgux7iWrI579tx9IYKBfX-z_C-pE3DQ3z_g3oq7MaRTGEOZY7pqY1VS8VS51HZSY8LmHZo1CLCh19s-ZDmfKadQmFTPUqKodHB1wKFlMHtxrvPCVnvv3N0IgBHIHaygKh1QLnH5tE7CcpXn1dYImLZYUWZUmWYvHeNWiNkg2NAO3kAULeVK_pqxAPSVY0Az3wZ1wnbDuKjxl_gwtNF5PgeEset0rtbPRKM3MoDwJAPpiXDhXfEddNrdQvGbbqSlrqC_RzUjDyTfUnQreDl_WN]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/any-of-class-level.puml.svg b/src/docs/tests/any-of-class-level.puml.svg
index 96aa2df..7fb6f25 100644
--- a/src/docs/tests/any-of-class-level.puml.svg
+++ b/src/docs/tests/any-of-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:283px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 162" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="123"/><ellipse cx="100.5" cy="139" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,144.6406 Q102.8906,144.9375 102.25,145.0781 Q101.6094,145.2344 100.9063,145.2344 Q98.4063,145.2344 97.0781,143.5938 Q95.7656,141.9375 95.7656,138.8125 Q95.7656,135.6875 97.0781,134.0313 Q98.4063,132.375 100.9063,132.375 Q101.6094,132.375 102.25,132.5313 Q102.9063,132.6875 103.4688,132.9844 L103.4688,135.7031 Q102.8438,135.125 102.25,134.8594 Q101.6563,134.5781 101.0313,134.5781 Q99.6875,134.5781 99,135.6563 Q98.3125,136.7188 98.3125,138.8125 Q98.3125,140.9063 99,141.9844 Q99.6875,143.0469 101.0313,143.0469 Q101.6563,143.0469 102.25,142.7813 Q102.8438,142.5 103.4688,141.9219 L103.4688,144.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="143.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="7"/><ellipse cx="36.85" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,28.6406 Q39.2406,28.9375 38.6,29.0781 Q37.9594,29.2344 37.2563,29.2344 Q34.7563,29.2344 33.4281,27.5938 Q32.1156,25.9375 32.1156,22.8125 Q32.1156,19.6875 33.4281,18.0313 Q34.7563,16.375 37.2563,16.375 Q37.9594,16.375 38.6,16.5313 Q39.2563,16.6875 39.8188,16.9844 L39.8188,19.7031 Q39.1938,19.125 38.6,18.8594 Q38.0063,18.5781 37.3813,18.5781 Q36.0375,18.5781 35.35,19.6563 Q34.6625,20.7188 34.6625,22.8125 Q34.6625,24.9063 35.35,25.9844 Q36.0375,27.0469 37.3813,27.0469 Q38.0063,27.0469 38.6,26.7813 Q39.1938,26.5 39.8188,25.9219 L39.8188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="7"/><ellipse cx="185.4" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,28.6406 Q187.7906,28.9375 187.15,29.0781 Q186.5094,29.2344 185.8063,29.2344 Q183.3063,29.2344 181.9781,27.5938 Q180.6656,25.9375 180.6656,22.8125 Q180.6656,19.6875 181.9781,18.0313 Q183.3063,16.375 185.8063,16.375 Q186.5094,16.375 187.15,16.5313 Q187.8063,16.6875 188.3688,16.9844 L188.3688,19.7031 Q187.7438,19.125 187.15,18.8594 Q186.5563,18.5781 185.9313,18.5781 Q184.5875,18.5781 183.9,19.6563 Q183.2125,20.7188 183.2125,22.8125 Q183.2125,24.9063 183.9,25.9844 Q184.5875,27.0469 185.9313,27.0469 Q186.5563,27.0469 187.15,26.7813 Q187.7438,26.5 188.3688,25.9219 L188.3688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="55.9951">income : decimal</text></g><!--link doctor to employee--><g id="link_doctor_employee"><path codeLine="22" d="M191.33,63.07 C177.08,82.19 169.2688,92.6892 157.5488,108.4092 " fill="none" id="doctor-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="146.79,122.84,162.3591,111.9955,152.7386,104.8229,146.79,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to employee--><g id="link_nurse_employee"><path codeLine="24" d="M79.67,63.07 C93.92,82.19 101.7312,92.6892 113.4512,108.4092 " fill="none" id="nurse-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="124.21,122.84,118.2614,104.8229,108.6409,111.9955,124.21,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POv1QWCn34NtFeN8FXSeOHRf1K9Rw5hOlx69RGsIKmZftBsUf0oJTFlUr_-AAO1skmEtE0paa_eC5-_m3JPADVmJ1rOkQD0dWpAs2tKJ9TWQVINaJkoKwZZVaiziHbUtPtywgfnhU9KikZpo6S7DxKK3zD5yIE4capCqglqB6zdZ7NDj4wKg5SxTwpTzFCi5sFIbQQ7rh7P3HDVROnDbV2FJ2wNQS8Ikma5yhtrCf-gbeCS3V2gSv_WIt6v_XjLoDtzxp-8N]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:283px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 162" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="123"/><ellipse cx="100.5" cy="139" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,144.6406 Q102.8906,144.9375 102.25,145.0781 Q101.6094,145.2344 100.9063,145.2344 Q98.4063,145.2344 97.0781,143.5938 Q95.7656,141.9375 95.7656,138.8125 Q95.7656,135.6875 97.0781,134.0313 Q98.4063,132.375 100.9063,132.375 Q101.6094,132.375 102.25,132.5313 Q102.9063,132.6875 103.4688,132.9844 L103.4688,135.7031 Q102.8438,135.125 102.25,134.8594 Q101.6563,134.5781 101.0313,134.5781 Q99.6875,134.5781 99,135.6563 Q98.3125,136.7188 98.3125,138.8125 Q98.3125,140.9063 99,141.9844 Q99.6875,143.0469 101.0313,143.0469 Q101.6563,143.0469 102.25,142.7813 Q102.8438,142.5 103.4688,141.9219 L103.4688,144.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="143.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="7"/><ellipse cx="36.85" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,28.6406 Q39.2406,28.9375 38.6,29.0781 Q37.9594,29.2344 37.2563,29.2344 Q34.7563,29.2344 33.4281,27.5938 Q32.1156,25.9375 32.1156,22.8125 Q32.1156,19.6875 33.4281,18.0313 Q34.7563,16.375 37.2563,16.375 Q37.9594,16.375 38.6,16.5313 Q39.2563,16.6875 39.8188,16.9844 L39.8188,19.7031 Q39.1938,19.125 38.6,18.8594 Q38.0063,18.5781 37.3813,18.5781 Q36.0375,18.5781 35.35,19.6563 Q34.6625,20.7188 34.6625,22.8125 Q34.6625,24.9063 35.35,25.9844 Q36.0375,27.0469 37.3813,27.0469 Q38.0063,27.0469 38.6,26.7813 Q39.1938,26.5 39.8188,25.9219 L39.8188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="7"/><ellipse cx="185.4" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,28.6406 Q187.7906,28.9375 187.15,29.0781 Q186.5094,29.2344 185.8063,29.2344 Q183.3063,29.2344 181.9781,27.5938 Q180.6656,25.9375 180.6656,22.8125 Q180.6656,19.6875 181.9781,18.0313 Q183.3063,16.375 185.8063,16.375 Q186.5094,16.375 187.15,16.5313 Q187.8063,16.6875 188.3688,16.9844 L188.3688,19.7031 Q187.7438,19.125 187.15,18.8594 Q186.5563,18.5781 185.9313,18.5781 Q184.5875,18.5781 183.9,19.6563 Q183.2125,20.7188 183.2125,22.8125 Q183.2125,24.9063 183.9,25.9844 Q184.5875,27.0469 185.9313,27.0469 Q186.5563,27.0469 187.15,26.7813 Q187.7438,26.5 188.3688,25.9219 L188.3688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="55.9951">income : decimal</text></g><!--link doctor to employee--><g id="link_doctor_employee"><path codeLine="22" d="M191.33,63.07 C177.08,82.19 169.2688,92.6892 157.5488,108.4092 " fill="none" id="doctor-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="146.79,122.84,162.3591,111.9955,152.7386,104.8229,146.79,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to employee--><g id="link_nurse_employee"><path codeLine="24" d="M79.67,63.07 C93.92,82.19 101.7312,92.6892 113.4512,108.4092 " fill="none" id="nurse-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="124.21,122.84,118.2614,104.8229,108.6409,111.9955,124.21,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POun3i8m40Hxl-94pmSGIW4VG51GM_Q2BPoxo6UG8iZVSG150ThPkTqBqOFMwvqjeMd8nUmIJ7Z3FRGJLlm5EvjjYuByaw3jIayr2U9rZauHgHAzHEx6MtB9gjBTRAoxdBDSsMybIPuUEGROOWQZACHrIplhSC1uN2GJ2yEOTycYJYJfWKNj6oRArwmlH7H_pG-KS4EY5KKkE2FFP2-krdxRaPsqgBg7YwrDepw9o-MZcItNvBFt6pm1]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/any-of-property-level.puml.svg b/src/docs/tests/any-of-property-level.puml.svg
index 5b6f5ef..a5c2b61 100644
--- a/src/docs/tests/any-of-property-level.puml.svg
+++ b/src/docs/tests/any-of-property-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="171px" preserveAspectRatio="none" style="width:418px;height:171px;background:#FFFFFF;" version="1.1" viewBox="0 0 418 171" width="418px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="19"/><ellipse cx="22" cy="35" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,40.6406 Q24.3906,40.9375 23.75,41.0781 Q23.1094,41.2344 22.4063,41.2344 Q19.9063,41.2344 18.5781,39.5938 Q17.2656,37.9375 17.2656,34.8125 Q17.2656,31.6875 18.5781,30.0313 Q19.9063,28.375 22.4063,28.375 Q23.1094,28.375 23.75,28.5313 Q24.4063,28.6875 24.9688,28.9844 L24.9688,31.7031 Q24.3438,31.125 23.75,30.8594 Q23.1563,30.5781 22.5313,30.5781 Q21.1875,30.5781 20.5,31.6563 Q19.8125,32.7188 19.8125,34.8125 Q19.8125,36.9063 20.5,37.9844 Q21.1875,39.0469 22.5313,39.0469 Q23.1563,39.0469 23.75,38.7813 Q24.3438,38.5 24.9688,37.9219 L24.9688,40.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="39.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="142.5" y="7"/><ellipse cx="172.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M175.3188,28.6406 Q174.7406,28.9375 174.1,29.0781 Q173.4594,29.2344 172.7563,29.2344 Q170.2563,29.2344 168.9281,27.5938 Q167.6156,25.9375 167.6156,22.8125 Q167.6156,19.6875 168.9281,18.0313 Q170.2563,16.375 172.7563,16.375 Q173.4594,16.375 174.1,16.5313 Q174.7563,16.6875 175.3188,16.9844 L175.3188,19.7031 Q174.6938,19.125 174.1,18.8594 Q173.5063,18.5781 172.8813,18.5781 Q171.5375,18.5781 170.85,19.6563 Q170.1625,20.7188 170.1625,22.8125 Q170.1625,24.9063 170.85,25.9844 Q171.5375,27.0469 172.8813,27.0469 Q173.5063,27.0469 174.1,26.7813 Q174.6938,26.5 175.3188,25.9219 L175.3188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="189.65" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="143.5" x2="246.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="148.5" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="282.5" y="7"/><ellipse cx="320.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M323.8688,28.6406 Q323.2906,28.9375 322.65,29.0781 Q322.0094,29.2344 321.3063,29.2344 Q318.8063,29.2344 317.4781,27.5938 Q316.1656,25.9375 316.1656,22.8125 Q316.1656,19.6875 317.4781,18.0313 Q318.8063,16.375 321.3063,16.375 Q322.0094,16.375 322.65,16.5313 Q323.3063,16.6875 323.8688,16.9844 L323.8688,19.7031 Q323.2438,19.125 322.65,18.8594 Q322.0563,18.5781 321.4313,18.5781 Q320.0875,18.5781 319.4,19.6563 Q318.7125,20.7188 318.7125,22.8125 Q318.7125,24.9063 319.4,25.9844 Q320.0875,27.0469 321.4313,27.0469 Q322.0563,27.0469 322.65,26.7813 Q323.2438,26.5 323.8688,25.9219 L323.8688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="340.1" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="283.5" x2="410.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="288.5" y="55.9951">income : decimal</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="195,140,207,152,195,164,183,152,195,140" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="24" d="M75.04,51.03 C106.31,77.09 164.5201,125.5996 184.2901,142.0696 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="188.9,145.91,184.5454,137.0761,185.0584,142.7097,179.4249,143.2226,188.9,145.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="144" y="106.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="151.0988" y="132.6652">0..1</text></g><!--link doctor to anon1--><g id="link_doctor_anon1"><path codeLine="26" d="M310.98,63.25 C274.11,91.15 234.0311,121.4551 215.6711,135.3551 " fill="none" id="doctor-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="201.32,146.22,219.2927,140.1388,212.0494,130.5714,201.32,146.22" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to anon1--><g id="link_nurse_anon1"><path codeLine="28" d="M195,63.25 C195,87.7 195,104.33 195,121.88 " fill="none" id="nurse-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="195,139.88,201,121.88,189,121.88,195,139.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POx1QiCm44Jl-ef5TuVcMe8FwG-4jj3p8aqZ4Kbh9AKGKlzxPQS9TdjzRtPsdBUWtUx0rVKz6PzDW78t-8eoI2hu9mwSEQ8Y_p68GxrGCqviMQ9FZz18EVaqJBTa0fT2LxLdSpfcEIVx8a7oOyY70rUrbsoHr-PT8bSPLK6br5QKWGtUCDLMoPGaGQbRlMxFWrm0tJwD3vhEkSo8w3eF6odW2u6UoQUA8_8YRCMqsdNQ9oCHBMvXVEGmnQtdACaIjm5RfHQlkwxNJvlDLfEUfMw7Eak0Rh5xVTTzztVVyE_45Vq1]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="171px" preserveAspectRatio="none" style="width:418px;height:171px;background:#FFFFFF;" version="1.1" viewBox="0 0 418 171" width="418px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="19"/><ellipse cx="22" cy="35" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,40.6406 Q24.3906,40.9375 23.75,41.0781 Q23.1094,41.2344 22.4063,41.2344 Q19.9063,41.2344 18.5781,39.5938 Q17.2656,37.9375 17.2656,34.8125 Q17.2656,31.6875 18.5781,30.0313 Q19.9063,28.375 22.4063,28.375 Q23.1094,28.375 23.75,28.5313 Q24.4063,28.6875 24.9688,28.9844 L24.9688,31.7031 Q24.3438,31.125 23.75,30.8594 Q23.1563,30.5781 22.5313,30.5781 Q21.1875,30.5781 20.5,31.6563 Q19.8125,32.7188 19.8125,34.8125 Q19.8125,36.9063 20.5,37.9844 Q21.1875,39.0469 22.5313,39.0469 Q23.1563,39.0469 23.75,38.7813 Q24.3438,38.5 24.9688,37.9219 L24.9688,40.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="39.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="142.5" y="7"/><ellipse cx="172.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M175.3188,28.6406 Q174.7406,28.9375 174.1,29.0781 Q173.4594,29.2344 172.7563,29.2344 Q170.2563,29.2344 168.9281,27.5938 Q167.6156,25.9375 167.6156,22.8125 Q167.6156,19.6875 168.9281,18.0313 Q170.2563,16.375 172.7563,16.375 Q173.4594,16.375 174.1,16.5313 Q174.7563,16.6875 175.3188,16.9844 L175.3188,19.7031 Q174.6938,19.125 174.1,18.8594 Q173.5063,18.5781 172.8813,18.5781 Q171.5375,18.5781 170.85,19.6563 Q170.1625,20.7188 170.1625,22.8125 Q170.1625,24.9063 170.85,25.9844 Q171.5375,27.0469 172.8813,27.0469 Q173.5063,27.0469 174.1,26.7813 Q174.6938,26.5 175.3188,25.9219 L175.3188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="189.65" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="143.5" x2="246.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="148.5" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="282.5" y="7"/><ellipse cx="320.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M323.8688,28.6406 Q323.2906,28.9375 322.65,29.0781 Q322.0094,29.2344 321.3063,29.2344 Q318.8063,29.2344 317.4781,27.5938 Q316.1656,25.9375 316.1656,22.8125 Q316.1656,19.6875 317.4781,18.0313 Q318.8063,16.375 321.3063,16.375 Q322.0094,16.375 322.65,16.5313 Q323.3063,16.6875 323.8688,16.9844 L323.8688,19.7031 Q323.2438,19.125 322.65,18.8594 Q322.0563,18.5781 321.4313,18.5781 Q320.0875,18.5781 319.4,19.6563 Q318.7125,20.7188 318.7125,22.8125 Q318.7125,24.9063 319.4,25.9844 Q320.0875,27.0469 321.4313,27.0469 Q322.0563,27.0469 322.65,26.7813 Q323.2438,26.5 323.8688,25.9219 L323.8688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="340.1" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="283.5" x2="410.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="288.5" y="55.9951">income : decimal</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="195,140,207,152,195,164,183,152,195,140" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="24" d="M75.04,51.03 C106.31,77.09 164.5201,125.5996 184.2901,142.0696 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="188.9,145.91,184.5454,137.0761,185.0584,142.7097,179.4249,143.2226,188.9,145.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="144" y="106.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="151.0988" y="132.6652">0..1</text></g><!--link doctor to anon1--><g id="link_doctor_anon1"><path codeLine="26" d="M310.98,63.25 C274.11,91.15 234.0311,121.4551 215.6711,135.3551 " fill="none" id="doctor-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="201.32,146.22,219.2927,140.1388,212.0494,130.5714,201.32,146.22" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to anon1--><g id="link_nurse_anon1"><path codeLine="28" d="M195,63.25 C195,87.7 195,104.33 195,121.88 " fill="none" id="nurse-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="195,139.88,201,121.88,189,121.88,195,139.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POvDJiCm48NtFiN8-rHqYweiu08LB5YFx4TjrV54jejKbToTIKgh5BRV-mtHWtQxFRVGz-HYSGacNE4RwYYvuf-mvy836ieV1SFOpgHA45_Nw3CYAQd7cCSvIovnhNGnB-oEXoAdx5ybIRaV-GZWPYPJqIZhLXtPuHrpk4cXB1d6N4kiJYGv0rRxfZlDfr8NH7HPvYTA-4AYPugvuO2oCdjnMlleZjd90BLxk3Xmckq-yY3P4-k1hJ6hwQxhxTDcixLa5z5gq1P9i6gxrNVTTt_J5VzUVA0_]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/array-anon-class-level.puml.svg b/src/docs/tests/array-anon-class-level.puml.svg
index bfe8928..5758bf1 100644
--- a/src/docs/tests/array-anon-class-level.puml.svg
+++ b/src/docs/tests/array-anon-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="178px" preserveAspectRatio="none" style="width:143px;height:178px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 178" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customers.1--><g id="elem_Customers.1"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customers.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="99"/><ellipse cx="25.6" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M28.5688,120.6406 Q27.9906,120.9375 27.35,121.0781 Q26.7094,121.2344 26.0063,121.2344 Q23.5063,121.2344 22.1781,119.5938 Q20.8656,117.9375 20.8656,114.8125 Q20.8656,111.6875 22.1781,110.0313 Q23.5063,108.375 26.0063,108.375 Q26.7094,108.375 27.35,108.5313 Q28.0063,108.6875 28.5688,108.9844 L28.5688,111.7031 Q27.9438,111.125 27.35,110.8594 Q26.7563,110.5781 26.1313,110.5781 Q24.7875,110.5781 24.1,111.6563 Q23.4125,112.7188 23.4125,114.8125 Q23.4125,116.9063 24.1,117.9844 Q24.7875,119.0469 26.1313,119.0469 Q26.7563,119.0469 27.35,118.7813 Q27.9438,118.5 28.5688,117.9219 L28.5688,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="40.4" y="119.8467">Customers.1</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="147.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="164.292">lastName : string</text></g><!--class Customers--><g id="elem_Customers"><rect codeLine="16" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="17.5" y="7"/><ellipse cx="32.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M35.4688,28.6406 Q34.8906,28.9375 34.25,29.0781 Q33.6094,29.2344 32.9063,29.2344 Q30.4063,29.2344 29.0781,27.5938 Q27.7656,25.9375 27.7656,22.8125 Q27.7656,19.6875 29.0781,18.0313 Q30.4063,16.375 32.9063,16.375 Q33.6094,16.375 34.25,16.5313 Q34.9063,16.6875 35.4688,16.9844 L35.4688,19.7031 Q34.8438,19.125 34.25,18.8594 Q33.6563,18.5781 33.0313,18.5781 Q31.6875,18.5781 31,19.6563 Q30.3125,20.7188 30.3125,22.8125 Q30.3125,24.9063 31,25.9844 Q31.6875,27.0469 33.0313,27.0469 Q33.6563,27.0469 34.25,26.7813 Q34.8438,26.5 35.4688,25.9219 L35.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="46.5" y="27.8467">Customers</text></g><!--link Customers to Customers.1--><g id="link_Customers_Customers.1"><path codeLine="19" d="M71.5,39.36 C71.5,54.66 71.5,72.7 71.5,92.79 " fill="none" id="Customers-to-Customers.1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,98.79,75.5,89.79,71.5,93.79,67.5,89.79,71.5,98.79" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="63.8766" y="88.03">*</text></g><!--SRC=[POuz2y8m48Rt_8gZer31LQH3tKLKS0xfQO9jBjoTWvJ-TrCBqkhwFBmVFZG8kztHggygS85TYyPFy8IIA0h-YQDbsw4Y_nZiahuW6q-DpD4jO9k9F49COnPSQqMWDxLrZplJCpPxQec_HwuUhPgQk45UcWjrLcamWWenlv1a7Pvnh5LYY1JHcAc-s3z5gKEMzQR8Om3zvyYG_x3e8QTX2w8SudqcS_R73V-DOr_6Sr2M5HIhOZbhtW00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="178px" preserveAspectRatio="none" style="width:143px;height:178px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 178" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customers.1--><g id="elem_Customers.1"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customers.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="99"/><ellipse cx="25.6" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M28.5688,120.6406 Q27.9906,120.9375 27.35,121.0781 Q26.7094,121.2344 26.0063,121.2344 Q23.5063,121.2344 22.1781,119.5938 Q20.8656,117.9375 20.8656,114.8125 Q20.8656,111.6875 22.1781,110.0313 Q23.5063,108.375 26.0063,108.375 Q26.7094,108.375 27.35,108.5313 Q28.0063,108.6875 28.5688,108.9844 L28.5688,111.7031 Q27.9438,111.125 27.35,110.8594 Q26.7563,110.5781 26.1313,110.5781 Q24.7875,110.5781 24.1,111.6563 Q23.4125,112.7188 23.4125,114.8125 Q23.4125,116.9063 24.1,117.9844 Q24.7875,119.0469 26.1313,119.0469 Q26.7563,119.0469 27.35,118.7813 Q27.9438,118.5 28.5688,117.9219 L28.5688,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="40.4" y="119.8467">Customers.1</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="147.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="164.292">lastName : string</text></g><!--class Customers--><g id="elem_Customers"><rect codeLine="16" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="17.5" y="7"/><ellipse cx="32.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M35.4688,28.6406 Q34.8906,28.9375 34.25,29.0781 Q33.6094,29.2344 32.9063,29.2344 Q30.4063,29.2344 29.0781,27.5938 Q27.7656,25.9375 27.7656,22.8125 Q27.7656,19.6875 29.0781,18.0313 Q30.4063,16.375 32.9063,16.375 Q33.6094,16.375 34.25,16.5313 Q34.9063,16.6875 35.4688,16.9844 L35.4688,19.7031 Q34.8438,19.125 34.25,18.8594 Q33.6563,18.5781 33.0313,18.5781 Q31.6875,18.5781 31,19.6563 Q30.3125,20.7188 30.3125,22.8125 Q30.3125,24.9063 31,25.9844 Q31.6875,27.0469 33.0313,27.0469 Q33.6563,27.0469 34.25,26.7813 Q34.8438,26.5 35.4688,25.9219 L35.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="46.5" y="27.8467">Customers</text></g><!--link Customers to Customers.1--><g id="link_Customers_Customers.1"><path codeLine="19" d="M71.5,39.36 C71.5,54.66 71.5,72.7 71.5,92.79 " fill="none" id="Customers-to-Customers.1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,98.79,75.5,89.79,71.5,93.79,67.5,89.79,71.5,98.79" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="63.8766" y="88.03">*</text></g><!--SRC=[POuz2uCm48Rt_8h3iM2XQn67kXTfXyuXNaqm9d9t3aNyxuqLYgthy_1-MDSW54MjnPOb64V6ex8hl24FCJ3kHAr9zoX8VmRxGLwGZ8qDRz7JeK-4EnU69Gl6QsQOr4MRhgKuXgQAFjBtoCEY5ZKhHe6GjdZG1k-uX2KIX1XGgRKagqQMs2FnyPIbIe3fCpUdLMAvfZISWOLSQ3SoPV_Sl6zS-XBUWZml8JjalxFg3G00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/array-anon-property-level.puml.svg b/src/docs/tests/array-anon-property-level.puml.svg
index b7d0cab..d141973 100644
--- a/src/docs/tests/array-anon-property-level.puml.svg
+++ b/src/docs/tests/array-anon-property-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="195px" preserveAspectRatio="none" style="width:173px;height:195px;background:#FFFFFF;" version="1.1" viewBox="0 0 173 195" width="173px" zoomAndPan="magnify"><defs/><g><!--class Customers.names--><g id="elem_Customers.names"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customers.names" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="7" y="116"/><ellipse cx="22" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,137.6406 Q24.3906,137.9375 23.75,138.0781 Q23.1094,138.2344 22.4063,138.2344 Q19.9063,138.2344 18.5781,136.5938 Q17.2656,134.9375 17.2656,131.8125 Q17.2656,128.6875 18.5781,127.0313 Q19.9063,125.375 22.4063,125.375 Q23.1094,125.375 23.75,125.5313 Q24.4063,125.6875 24.9688,125.9844 L24.9688,128.7031 Q24.3438,128.125 23.75,127.8594 Q23.1563,127.5781 22.5313,127.5781 Q21.1875,127.5781 20.5,128.6563 Q19.8125,129.7188 19.8125,131.8125 Q19.8125,133.9063 20.5,134.9844 Q21.1875,136.0469 22.5313,136.0469 Q23.1563,136.0469 23.75,135.7813 Q24.3438,135.5 24.9688,134.9219 L24.9688,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="36" y="136.8467">Customers.names</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="165" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="164.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="181.292">lastName : string</text></g><!--class Customers--><g id="elem_Customers"><rect codeLine="16" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="32.5" y="7"/><ellipse cx="47.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M50.4688,28.6406 Q49.8906,28.9375 49.25,29.0781 Q48.6094,29.2344 47.9063,29.2344 Q45.4063,29.2344 44.0781,27.5938 Q42.7656,25.9375 42.7656,22.8125 Q42.7656,19.6875 44.0781,18.0313 Q45.4063,16.375 47.9063,16.375 Q48.6094,16.375 49.25,16.5313 Q49.9063,16.6875 50.4688,16.9844 L50.4688,19.7031 Q49.8438,19.125 49.25,18.8594 Q48.6563,18.5781 48.0313,18.5781 Q46.6875,18.5781 46,19.6563 Q45.3125,20.7188 45.3125,22.8125 Q45.3125,24.9063 46,25.9844 Q46.6875,27.0469 48.0313,27.0469 Q48.6563,27.0469 49.25,26.7813 Q49.8438,26.5 50.4688,25.9219 L50.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="61.5" y="27.8467">Customers</text></g><!--link Customers to Customers.names--><g id="link_Customers_Customers.names"><path codeLine="19" d="M86.5,39.13 C86.5,57.93 86.5,84.62 86.5,109.91 " fill="none" id="Customers-to-Customers.names" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="86.5,115.91,90.5,106.91,86.5,110.91,82.5,106.91,86.5,115.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="87.5" y="82.0669">names</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="78.8547" y="104.8975">*</text></g><!--SRC=[ROxB2i9034NtynLXbe9-W4WNkXTHmVKmZSvWEob9N8ZqtqqjI7timZd9pKsvHbYjTa5JLK7C71jqQOHxb8wAu8_O1GujAlANmRRJEvX9LCiKdJCsHkIQIpVSGco223pSEiJhXUbMwWqrnEyYfuH1tPguHluqHsg3Kky45Ogra2v4FE0GgyHGgA1pOxpVt4IfHPR5QzFRGu37gqnldLXqQnoM8CgvN2RIxhzS_viwv1cUWlcy0Z_pVrvR4lXnTay0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="195px" preserveAspectRatio="none" style="width:173px;height:195px;background:#FFFFFF;" version="1.1" viewBox="0 0 173 195" width="173px" zoomAndPan="magnify"><defs/><g><!--class Customers.names--><g id="elem_Customers.names"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customers.names" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="159" x="7" y="116"/><ellipse cx="22" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,137.6406 Q24.3906,137.9375 23.75,138.0781 Q23.1094,138.2344 22.4063,138.2344 Q19.9063,138.2344 18.5781,136.5938 Q17.2656,134.9375 17.2656,131.8125 Q17.2656,128.6875 18.5781,127.0313 Q19.9063,125.375 22.4063,125.375 Q23.1094,125.375 23.75,125.5313 Q24.4063,125.6875 24.9688,125.9844 L24.9688,128.7031 Q24.3438,128.125 23.75,127.8594 Q23.1563,127.5781 22.5313,127.5781 Q21.1875,127.5781 20.5,128.6563 Q19.8125,129.7188 19.8125,131.8125 Q19.8125,133.9063 20.5,134.9844 Q21.1875,136.0469 22.5313,136.0469 Q23.1563,136.0469 23.75,135.7813 Q24.3438,135.5 24.9688,134.9219 L24.9688,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="127" x="36" y="136.8467">Customers.names</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="165" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="164.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="181.292">lastName : string</text></g><!--class Customers--><g id="elem_Customers"><rect codeLine="16" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="32.5" y="7"/><ellipse cx="47.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M50.4688,28.6406 Q49.8906,28.9375 49.25,29.0781 Q48.6094,29.2344 47.9063,29.2344 Q45.4063,29.2344 44.0781,27.5938 Q42.7656,25.9375 42.7656,22.8125 Q42.7656,19.6875 44.0781,18.0313 Q45.4063,16.375 47.9063,16.375 Q48.6094,16.375 49.25,16.5313 Q49.9063,16.6875 50.4688,16.9844 L50.4688,19.7031 Q49.8438,19.125 49.25,18.8594 Q48.6563,18.5781 48.0313,18.5781 Q46.6875,18.5781 46,19.6563 Q45.3125,20.7188 45.3125,22.8125 Q45.3125,24.9063 46,25.9844 Q46.6875,27.0469 48.0313,27.0469 Q48.6563,27.0469 49.25,26.7813 Q49.8438,26.5 50.4688,25.9219 L50.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="61.5" y="27.8467">Customers</text></g><!--link Customers to Customers.names--><g id="link_Customers_Customers.names"><path codeLine="19" d="M86.5,39.13 C86.5,57.93 86.5,84.62 86.5,109.91 " fill="none" id="Customers-to-Customers.names" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="86.5,115.91,90.5,106.91,86.5,110.91,82.5,106.91,86.5,115.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="87.5" y="82.0669">names</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="78.8547" y="104.8975">*</text></g><!--SRC=[ROv12i8m44NtESMGfQ07aDA5xgNemdL8noQqJShCT27Ikpkr8AMw2-_dlpyXrWX5KJa9PGa-ak_GX0LUaOUS67-2of7hKP0s2VQ3F46Ja6jUeqV4JWctCGrp5tpdcE5bJiwt3UKnrUVSPVeUSW_en4o6KI3f5W_EumtdicI2b1CQiqZiUMJ9FH8VFZ-jQW5Udyb9budbeXoEm48nDQjG-vji-hNEFiLhiD-NO7VspxIQm2vlymO0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/array-class-level.puml.svg b/src/docs/tests/array-class-level.puml.svg
index 44e3764..2092f83 100644
--- a/src/docs/tests/array-class-level.puml.svg
+++ b/src/docs/tests/array-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="178px" preserveAspectRatio="none" style="width:143px;height:178px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 178" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="17.5" y="7"/><ellipse cx="32.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M35.4688,28.6406 Q34.8906,28.9375 34.25,29.0781 Q33.6094,29.2344 32.9063,29.2344 Q30.4063,29.2344 29.0781,27.5938 Q27.7656,25.9375 27.7656,22.8125 Q27.7656,19.6875 29.0781,18.0313 Q30.4063,16.375 32.9063,16.375 Q33.6094,16.375 34.25,16.5313 Q34.9063,16.6875 35.4688,16.9844 L35.4688,19.7031 Q34.8438,19.125 34.25,18.8594 Q33.6563,18.5781 33.0313,18.5781 Q31.6875,18.5781 31,19.6563 Q30.3125,20.7188 30.3125,22.8125 Q30.3125,24.9063 31,25.9844 Q31.6875,27.0469 33.0313,27.0469 Q33.6563,27.0469 34.25,26.7813 Q34.8438,26.5 35.4688,25.9219 L35.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="46.5" y="27.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="99"/><ellipse cx="35.05" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M38.0188,120.6406 Q37.4406,120.9375 36.8,121.0781 Q36.1594,121.2344 35.4563,121.2344 Q32.9563,121.2344 31.6281,119.5938 Q30.3156,117.9375 30.3156,114.8125 Q30.3156,111.6875 31.6281,110.0313 Q32.9563,108.375 35.4563,108.375 Q36.1594,108.375 36.8,108.5313 Q37.4563,108.6875 38.0188,108.9844 L38.0188,111.7031 Q37.3938,111.125 36.8,110.8594 Q36.2063,110.5781 35.5813,110.5781 Q34.2375,110.5781 33.55,111.6563 Q32.8625,112.7188 32.8625,114.8125 Q32.8625,116.9063 33.55,117.9844 Q34.2375,119.0469 35.5813,119.0469 Q36.2063,119.0469 36.8,118.7813 Q37.3938,118.5 38.0188,117.9219 L38.0188,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="51.95" y="119.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="147.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="164.292">lastName : string</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="19" d="M71.5,39.36 C71.5,54.66 71.5,72.7 71.5,92.79 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,98.79,75.5,89.79,71.5,93.79,67.5,89.79,71.5,98.79" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="63.8766" y="88.03">*</text></g><!--SRC=[POx12i8m38RlVOhGe-0BYEmmxo8gU2vjjCMr6KbsaB5tjrEGgTVl8r_-c0B2Tdjm6fi6V6BVeOblU4JfgGZ-YODZbr6HVmpcNXzGJQGWItHDs5KYzrJw-HPyvqHWDAtpznlJKCAEEkBFa4j4fwOb3iZVvapPAKr6KA7K5T8xZoUSiqeCXGeQyyxRtI1A6LbiVJNzuPa2ZAznKzt8eljQX0s8SYgtXQo7FwxcbltrkW6xiekuUG80]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="178px" preserveAspectRatio="none" style="width:143px;height:178px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 178" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="17.5" y="7"/><ellipse cx="32.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M35.4688,28.6406 Q34.8906,28.9375 34.25,29.0781 Q33.6094,29.2344 32.9063,29.2344 Q30.4063,29.2344 29.0781,27.5938 Q27.7656,25.9375 27.7656,22.8125 Q27.7656,19.6875 29.0781,18.0313 Q30.4063,16.375 32.9063,16.375 Q33.6094,16.375 34.25,16.5313 Q34.9063,16.6875 35.4688,16.9844 L35.4688,19.7031 Q34.8438,19.125 34.25,18.8594 Q33.6563,18.5781 33.0313,18.5781 Q31.6875,18.5781 31,19.6563 Q30.3125,20.7188 30.3125,22.8125 Q30.3125,24.9063 31,25.9844 Q31.6875,27.0469 33.0313,27.0469 Q33.6563,27.0469 34.25,26.7813 Q34.8438,26.5 35.4688,25.9219 L35.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="46.5" y="27.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="99"/><ellipse cx="35.05" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M38.0188,120.6406 Q37.4406,120.9375 36.8,121.0781 Q36.1594,121.2344 35.4563,121.2344 Q32.9563,121.2344 31.6281,119.5938 Q30.3156,117.9375 30.3156,114.8125 Q30.3156,111.6875 31.6281,110.0313 Q32.9563,108.375 35.4563,108.375 Q36.1594,108.375 36.8,108.5313 Q37.4563,108.6875 38.0188,108.9844 L38.0188,111.7031 Q37.3938,111.125 36.8,110.8594 Q36.2063,110.5781 35.5813,110.5781 Q34.2375,110.5781 33.55,111.6563 Q32.8625,112.7188 32.8625,114.8125 Q32.8625,116.9063 33.55,117.9844 Q34.2375,119.0469 35.5813,119.0469 Q36.2063,119.0469 36.8,118.7813 Q37.3938,118.5 38.0188,117.9219 L38.0188,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="51.95" y="119.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="147.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="164.292">lastName : string</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="19" d="M71.5,39.36 C71.5,54.66 71.5,72.7 71.5,92.79 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,98.79,75.5,89.79,71.5,93.79,67.5,89.79,71.5,98.79" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="63.8766" y="88.03">*</text></g><!--SRC=[POwn2eCm48RtFCMHiU0B576eUv5sw1pYrGGr2NVdKCHtRwnGHDVlu__kd6yHoh8nugeAh2Sxe78RV22d61XFeZ5aHXIaWy4noGUoSR7bFNfx73BXteUqRi4EXXbcTJEsxoXEeQtZ4Ed_oCkX4RKeHe6GRt4o5f-uZYKIX1XGgIsYwuabZaYiSt0vuPK2pByNblm9iTnp4Qx0GZvqEvc71vTp-tvHLA0lUXTNNm00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/array-property-level.puml.svg b/src/docs/tests/array-property-level.puml.svg
index 852c2d3..6c38419 100644
--- a/src/docs/tests/array-property-level.puml.svg
+++ b/src/docs/tests/array-property-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="195px" preserveAspectRatio="none" style="width:143px;height:195px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 195" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="17.5" y="7"/><ellipse cx="32.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M35.4688,28.6406 Q34.8906,28.9375 34.25,29.0781 Q33.6094,29.2344 32.9063,29.2344 Q30.4063,29.2344 29.0781,27.5938 Q27.7656,25.9375 27.7656,22.8125 Q27.7656,19.6875 29.0781,18.0313 Q30.4063,16.375 32.9063,16.375 Q33.6094,16.375 34.25,16.5313 Q34.9063,16.6875 35.4688,16.9844 L35.4688,19.7031 Q34.8438,19.125 34.25,18.8594 Q33.6563,18.5781 33.0313,18.5781 Q31.6875,18.5781 31,19.6563 Q30.3125,20.7188 30.3125,22.8125 Q30.3125,24.9063 31,25.9844 Q31.6875,27.0469 33.0313,27.0469 Q33.6563,27.0469 34.25,26.7813 Q34.8438,26.5 35.4688,25.9219 L35.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="46.5" y="27.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="116"/><ellipse cx="35.05" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M38.0188,137.6406 Q37.4406,137.9375 36.8,138.0781 Q36.1594,138.2344 35.4563,138.2344 Q32.9563,138.2344 31.6281,136.5938 Q30.3156,134.9375 30.3156,131.8125 Q30.3156,128.6875 31.6281,127.0313 Q32.9563,125.375 35.4563,125.375 Q36.1594,125.375 36.8,125.5313 Q37.4563,125.6875 38.0188,125.9844 L38.0188,128.7031 Q37.3938,128.125 36.8,127.8594 Q36.2063,127.5781 35.5813,127.5781 Q34.2375,127.5781 33.55,128.6563 Q32.8625,129.7188 32.8625,131.8125 Q32.8625,133.9063 33.55,134.9844 Q34.2375,136.0469 35.5813,136.0469 Q36.2063,136.0469 36.8,135.7813 Q37.3938,135.5 38.0188,134.9219 L38.0188,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="51.95" y="136.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="164.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="181.292">lastName : string</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="19" d="M71.5,39.13 C71.5,57.93 71.5,84.62 71.5,109.91 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,115.91,75.5,106.91,71.5,110.91,67.5,106.91,71.5,115.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="72.5" y="82.0669">group</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="63.8547" y="104.8975">*</text></g><!--SRC=[PO_12i8m38RlVOhGe-0BYEoWTn4LF9SkskBMb2GxYEpTpHHawlN_aYz_KcuHrkjzqDGq43F73brwXmUKIaNm3-m3XnuL-OTWN_KEHXArCeyk6JjBv9PBdNOXTa447cuJuktAD9HsIntnfyWvOL2t8MwHlyc9-g0qEa65OYsaXeX7dBHA38KAElVM- -qWIZsoU3ir_iLJ2l1ubHkj8ulkp0Wh4ELShZDeYp_CT7F_Sjc0N_Yvt6R1JyzLxvu0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="195px" preserveAspectRatio="none" style="width:143px;height:195px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 195" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="17.5" y="7"/><ellipse cx="32.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M35.4688,28.6406 Q34.8906,28.9375 34.25,29.0781 Q33.6094,29.2344 32.9063,29.2344 Q30.4063,29.2344 29.0781,27.5938 Q27.7656,25.9375 27.7656,22.8125 Q27.7656,19.6875 29.0781,18.0313 Q30.4063,16.375 32.9063,16.375 Q33.6094,16.375 34.25,16.5313 Q34.9063,16.6875 35.4688,16.9844 L35.4688,19.7031 Q34.8438,19.125 34.25,18.8594 Q33.6563,18.5781 33.0313,18.5781 Q31.6875,18.5781 31,19.6563 Q30.3125,20.7188 30.3125,22.8125 Q30.3125,24.9063 31,25.9844 Q31.6875,27.0469 33.0313,27.0469 Q33.6563,27.0469 34.25,26.7813 Q34.8438,26.5 35.4688,25.9219 L35.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="46.5" y="27.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="116"/><ellipse cx="35.05" cy="132" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M38.0188,137.6406 Q37.4406,137.9375 36.8,138.0781 Q36.1594,138.2344 35.4563,138.2344 Q32.9563,138.2344 31.6281,136.5938 Q30.3156,134.9375 30.3156,131.8125 Q30.3156,128.6875 31.6281,127.0313 Q32.9563,125.375 35.4563,125.375 Q36.1594,125.375 36.8,125.5313 Q37.4563,125.6875 38.0188,125.9844 L38.0188,128.7031 Q37.3938,128.125 36.8,127.8594 Q36.2063,127.5781 35.5813,127.5781 Q34.2375,127.5781 33.55,128.6563 Q32.8625,129.7188 32.8625,131.8125 Q32.8625,133.9063 33.55,134.9844 Q34.2375,136.0469 35.5813,136.0469 Q36.2063,136.0469 36.8,135.7813 Q37.3938,135.5 38.0188,134.9219 L38.0188,137.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="51.95" y="136.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="148" y2="148"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="164.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="181.292">lastName : string</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="19" d="M71.5,39.13 C71.5,57.93 71.5,84.62 71.5,109.91 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,115.91,75.5,106.91,71.5,110.91,67.5,106.91,71.5,115.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="37" x="72.5" y="82.0669">group</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="63.8547" y="104.8975">*</text></g><!--SRC=[POz12i8m44NtESMGfT0BY7HXzr9quJgaOnFQ9c5ckX3ftPqgIB7R__9V_eJO8PnEhPDGr-0Z-H5D-8PNv98JumwqZjo4WlH7S2ho12KXTxoD7X57JNY8gQnTyADZXfSvEp_qbEVKDNdCz1jo3-Z4B8PH8EbVN9p76wvboGGf9pJcAx7Dp98d9BOgN7RncWAyFXCMNK8i5pN24LWefdu3jVZ7LBVrLrKDzc2tSdqBTZsXMFC6]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/empty.puml.svg b/src/docs/tests/empty.puml.svg
index 192081b..e0aa7b5 100644
--- a/src/docs/tests/empty.puml.svg
+++ b/src/docs/tests/empty.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="10px" preserveAspectRatio="none" style="width:10px;height:10px;background:#FFFFFF;" version="1.1" viewBox="0 0 10 10" width="10px" zoomAndPan="magnify"><defs/><g><!--SRC=[POvB2W8n40NtEKKECinYlC2WWkicUPemcNJeRXSYtjqCWlZPLl4UbNA47uQPB8sZ3rb2WKilk8Sshee_CPFG2eFy6ApDRhwRn54_qJcZTA9BhctR-b18rT_TH66v25zht75XUOUS4iZSn18Xt-R8Ana_dC9yxHNQAE20xTPOVEKAzmG0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="10px" preserveAspectRatio="none" style="width:10px;height:10px;background:#FFFFFF;" version="1.1" viewBox="0 0 10 10" width="10px" zoomAndPan="magnify"><defs/><g><!--SRC=[POv12i8m44NtESKSf7IX5oYwS3saNnEQPiBCk13nxaqHH7Jx7e__Kvv1mp2nft6ac3KMXFI69rYJQlWJ4oklSEYFmThyGTqacUqRNJDA9xRaslQMOc4pUeO3n-McSg_pKOhevyWbWJsyWi6fzYrh77767hieLQa86m00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/enum.puml.svg b/src/docs/tests/enum.puml.svg
index f77275e..f8e541a 100644
--- a/src/docs/tests/enum.puml.svg
+++ b/src/docs/tests/enum.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="109px" preserveAspectRatio="none" style="width:155px;height:109px;background:#FFFFFF;" version="1.1" viewBox="0 0 155 109" width="155px" zoomAndPan="magnify"><defs/><g><!--class EmployeeType--><g id="elem_EmployeeType"><rect codeLine="11" fill="#F1F1F1" height="88.8906" id="EmployeeType" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="7" y="7"/><ellipse cx="22" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M26.1094,29 L18.3906,29 L18.3906,16.6094 L26.1094,16.6094 L26.1094,18.7656 L20.8438,18.7656 L20.8438,21.4375 L25.6094,21.4375 L25.6094,23.5938 L20.8438,23.5938 L20.8438,26.8438 L26.1094,26.8438 L26.1094,29 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="36" y="27.8467">EmployeeType</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="140" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="13" y="55.9951">Doctor</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="13" y="72.292">Nurse</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="13" y="88.5889">Administrator</text></g><!--SRC=[POxB2a8n34Jt_OhWTuZWQokYWklIZhRODYNfNLp4VxSgY8zLmfnCPaBqeEbqQrkOpSX5SGaclCGTj79H_86j5PlH83y4kRQHEWdizLCwHQIkw2MM-l2IIrQLhcPXtUKiF1I_vCJoBd8CiCqiM3pacnmusyOtesXKUWkjrc6Fnzl6GeKBZ44PCatMkIOUWSDOCUbXH2js_QWlcq4KVSvzZYLgUvhDpTm1]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="109px" preserveAspectRatio="none" style="width:155px;height:109px;background:#FFFFFF;" version="1.1" viewBox="0 0 155 109" width="155px" zoomAndPan="magnify"><defs/><g><!--class EmployeeType--><g id="elem_EmployeeType"><rect codeLine="11" fill="#F1F1F1" height="88.8906" id="EmployeeType" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="7" y="7"/><ellipse cx="22" cy="23" fill="#EB937F" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M26.1094,29 L18.3906,29 L18.3906,16.6094 L26.1094,16.6094 L26.1094,18.7656 L20.8438,18.7656 L20.8438,21.4375 L25.6094,21.4375 L25.6094,23.5938 L20.8438,23.5938 L20.8438,26.8438 L26.1094,26.8438 L26.1094,29 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="36" y="27.8467">EmployeeType</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="140" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="47" x="13" y="55.9951">Doctor</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="41" x="13" y="72.292">Nurse</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="13" y="88.5889">Administrator</text></g><!--SRC=[POxD2W8n38JlVOhWSomB_brbKS5pQKTRjcrAqpqiuhlRLH3HKy9ClfauRq5TD-Zg-fwCBoP0kRTuX6HEWZzZq4L7L9GV1p7NcPhZsCgtTFK8JP7HfxomP88MeRlQQ3FU2a_9RZbm-JnoST1LFPIWKcfTahN12GjSkL3Y1AMGfaYhVSo1P-0yPwnQ9D6EJJjgos4gWZRNDlhafRxWble4]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/external-ref.puml.svg b/src/docs/tests/external-ref.puml.svg
index f7b8f45..34ccfc4 100644
--- a/src/docs/tests/external-ref.puml.svg
+++ b/src/docs/tests/external-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="279px" preserveAspectRatio="none" style="width:283px;height:279px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 279" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="7"/><ellipse cx="100.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,28.6406 Q102.8906,28.9375 102.25,29.0781 Q101.6094,29.2344 100.9063,29.2344 Q98.4063,29.2344 97.0781,27.5938 Q95.7656,25.9375 95.7656,22.8125 Q95.7656,19.6875 97.0781,18.0313 Q98.4063,16.375 100.9063,16.375 Q101.6094,16.375 102.25,16.5313 Q102.9063,16.6875 103.4688,16.9844 L103.4688,19.7031 Q102.8438,19.125 102.25,18.8594 Q101.6563,18.5781 101.0313,18.5781 Q99.6875,18.5781 99,19.6563 Q98.3125,20.7188 98.3125,22.8125 Q98.3125,24.9063 99,25.9844 Q99.6875,27.0469 101.0313,27.0469 Q101.6563,27.0469 102.25,26.7813 Q102.8438,26.5 103.4688,25.9219 L103.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="27.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="100"/><ellipse cx="36.85" cy="116" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,121.6406 Q39.2406,121.9375 38.6,122.0781 Q37.9594,122.2344 37.2563,122.2344 Q34.7563,122.2344 33.4281,120.5938 Q32.1156,118.9375 32.1156,115.8125 Q32.1156,112.6875 33.4281,111.0313 Q34.7563,109.375 37.2563,109.375 Q37.9594,109.375 38.6,109.5313 Q39.2563,109.6875 39.8188,109.9844 L39.8188,112.7031 Q39.1938,112.125 38.6,111.8594 Q38.0063,111.5781 37.3813,111.5781 Q36.0375,111.5781 35.35,112.6563 Q34.6625,113.7188 34.6625,115.8125 Q34.6625,117.9063 35.35,118.9844 Q36.0375,120.0469 37.3813,120.0469 Q38.0063,120.0469 38.6,119.7813 Q39.1938,119.5 39.8188,118.9219 L39.8188,121.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="120.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="132" y2="132"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="148.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="100"/><ellipse cx="185.4" cy="116" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,121.6406 Q187.7906,121.9375 187.15,122.0781 Q186.5094,122.2344 185.8063,122.2344 Q183.3063,122.2344 181.9781,120.5938 Q180.6656,118.9375 180.6656,115.8125 Q180.6656,112.6875 181.9781,111.0313 Q183.3063,109.375 185.8063,109.375 Q186.5094,109.375 187.15,109.5313 Q187.8063,109.6875 188.3688,109.9844 L188.3688,112.7031 Q187.7438,112.125 187.15,111.8594 Q186.5563,111.5781 185.9313,111.5781 Q184.5875,111.5781 183.9,112.6563 Q183.2125,113.7188 183.2125,115.8125 Q183.2125,117.9063 183.9,118.9844 Q184.5875,120.0469 185.9313,120.0469 Q186.5563,120.0469 187.15,119.7813 Q187.7438,119.5 188.3688,118.9219 L188.3688,121.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="120.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="132" y2="132"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="148.9951">income : decimal</text></g><!--class agreement--><g id="elem_agreement"><rect codeLine="22" fill="#F1F1F1" height="40.2656" id="agreement" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="63.5" y="233"/><ellipse cx="78.5" cy="253.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M81.4688,258.7734 Q80.8906,259.0703 80.25,259.2109 Q79.6094,259.3672 78.9063,259.3672 Q76.4063,259.3672 75.0781,257.7266 Q73.7656,256.0703 73.7656,252.9453 Q73.7656,249.8203 75.0781,248.1641 Q76.4063,246.5078 78.9063,246.5078 Q79.6094,246.5078 80.25,246.6641 Q80.9063,246.8203 81.4688,247.1172 L81.4688,249.8359 Q80.8438,249.2578 80.25,248.9922 Q79.6563,248.7109 79.0313,248.7109 Q77.6875,248.7109 77,249.7891 Q76.3125,250.8516 76.3125,252.9453 Q76.3125,255.0391 77,256.1172 Q77.6875,257.1797 79.0313,257.1797 Q79.6563,257.1797 80.25,256.9141 Q80.8438,256.6328 81.4688,256.0547 L81.4688,258.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="114" x="90.5" y="249.1387">«agreements.yml»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="109.5" y="264.9639">agreement</text></g><!--link employee to doctor--><g id="link_employee_doctor"><path codeLine="25" d="M146.71,39.2 C158.44,55.09 173.5268,75.5426 187.8168,94.9026 " fill="none" id="employee-to-doctor" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="191.38,99.73,189.2535,90.1135,188.4107,95.7072,182.817,94.8644,191.38,99.73" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="178.1038" y="88.9543">1</text></g><!--link employee to nurse--><g id="link_employee_nurse"><path codeLine="27" d="M124.29,39.2 C112.56,55.09 97.4732,75.5426 83.1832,94.9026 " fill="none" id="employee-to-nurse" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="79.62,99.73,88.183,94.8644,82.5893,95.7072,81.7465,90.1135,79.62,99.73" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="75.1463" y="88.9543">1</text></g><!--link nurse to agreement--><g id="link_nurse_agreement"><path codeLine="29" d="M65.94,156.33 C70.13,170.9 76.51,188.71 85.5,203 C92.42,214 97.8267,220.3536 106.8467,228.7436 " fill="none" id="nurse-to-agreement" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="111.24,232.83,107.3744,223.7715,107.5789,229.4246,101.9258,229.6292,111.24,232.83" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="86.5" y="199.0669">agreement</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="77.3231" y="222.096">0..1</text></g><!--link doctor to agreement--><g id="link_doctor_agreement"><path codeLine="31" d="M194.41,156.3 C179.88,179.51 162.564,207.1745 149.704,227.7145 " fill="none" id="doctor-to-agreement" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="146.52,232.8,154.6863,227.2944,149.1733,228.5621,147.9057,223.0491,146.52,232.8" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="175.5" y="199.0669">agreement</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="122.5256" y="222.0576">0..1</text></g><!--SRC=[ZP11JiCm44NtFiKe-qQmHLKMvG8LL69jsP_4gks9R1Sfgd9t9Yb4Bh1WwV_-p3nvS1Qqtnzr6RgEZ4l6Gmsty0Lvv9Zn2nnrqW45wGT16Cj4GWQskOxU7Rma-UpYkCoIyJfdkgg3DkS-yINQP_QSDf6t0Rge0oUBT4zE77JXMMKKYcAHHstmYcLjuKIH8vIwhM_akES9QEJIlANnal8Q4LrNiPayFk3fYLmiw96gicKZQ-_RBXeEaBg5SK7xggxx10J4qiWtRO_SJi6B-sfHMUrs7JMFpNRbRtZp5VObleA7jbrOTKzywhVqlzt_EV09]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="279px" preserveAspectRatio="none" style="width:283px;height:279px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 279" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="7"/><ellipse cx="100.5" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,28.6406 Q102.8906,28.9375 102.25,29.0781 Q101.6094,29.2344 100.9063,29.2344 Q98.4063,29.2344 97.0781,27.5938 Q95.7656,25.9375 95.7656,22.8125 Q95.7656,19.6875 97.0781,18.0313 Q98.4063,16.375 100.9063,16.375 Q101.6094,16.375 102.25,16.5313 Q102.9063,16.6875 103.4688,16.9844 L103.4688,19.7031 Q102.8438,19.125 102.25,18.8594 Q101.6563,18.5781 101.0313,18.5781 Q99.6875,18.5781 99,19.6563 Q98.3125,20.7188 98.3125,22.8125 Q98.3125,24.9063 99,25.9844 Q99.6875,27.0469 101.0313,27.0469 Q101.6563,27.0469 102.25,26.7813 Q102.8438,26.5 103.4688,25.9219 L103.4688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="27.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="100"/><ellipse cx="36.85" cy="116" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,121.6406 Q39.2406,121.9375 38.6,122.0781 Q37.9594,122.2344 37.2563,122.2344 Q34.7563,122.2344 33.4281,120.5938 Q32.1156,118.9375 32.1156,115.8125 Q32.1156,112.6875 33.4281,111.0313 Q34.7563,109.375 37.2563,109.375 Q37.9594,109.375 38.6,109.5313 Q39.2563,109.6875 39.8188,109.9844 L39.8188,112.7031 Q39.1938,112.125 38.6,111.8594 Q38.0063,111.5781 37.3813,111.5781 Q36.0375,111.5781 35.35,112.6563 Q34.6625,113.7188 34.6625,115.8125 Q34.6625,117.9063 35.35,118.9844 Q36.0375,120.0469 37.3813,120.0469 Q38.0063,120.0469 38.6,119.7813 Q39.1938,119.5 39.8188,118.9219 L39.8188,121.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="120.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="132" y2="132"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="148.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="100"/><ellipse cx="185.4" cy="116" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,121.6406 Q187.7906,121.9375 187.15,122.0781 Q186.5094,122.2344 185.8063,122.2344 Q183.3063,122.2344 181.9781,120.5938 Q180.6656,118.9375 180.6656,115.8125 Q180.6656,112.6875 181.9781,111.0313 Q183.3063,109.375 185.8063,109.375 Q186.5094,109.375 187.15,109.5313 Q187.8063,109.6875 188.3688,109.9844 L188.3688,112.7031 Q187.7438,112.125 187.15,111.8594 Q186.5563,111.5781 185.9313,111.5781 Q184.5875,111.5781 183.9,112.6563 Q183.2125,113.7188 183.2125,115.8125 Q183.2125,117.9063 183.9,118.9844 Q184.5875,120.0469 185.9313,120.0469 Q186.5563,120.0469 187.15,119.7813 Q187.7438,119.5 188.3688,118.9219 L188.3688,121.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="120.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="132" y2="132"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="148.9951">income : decimal</text></g><!--class agreement--><g id="elem_agreement"><rect codeLine="22" fill="#F1F1F1" height="40.2656" id="agreement" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="142" x="63.5" y="233"/><ellipse cx="78.5" cy="253.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M81.4688,258.7734 Q80.8906,259.0703 80.25,259.2109 Q79.6094,259.3672 78.9063,259.3672 Q76.4063,259.3672 75.0781,257.7266 Q73.7656,256.0703 73.7656,252.9453 Q73.7656,249.8203 75.0781,248.1641 Q76.4063,246.5078 78.9063,246.5078 Q79.6094,246.5078 80.25,246.6641 Q80.9063,246.8203 81.4688,247.1172 L81.4688,249.8359 Q80.8438,249.2578 80.25,248.9922 Q79.6563,248.7109 79.0313,248.7109 Q77.6875,248.7109 77,249.7891 Q76.3125,250.8516 76.3125,252.9453 Q76.3125,255.0391 77,256.1172 Q77.6875,257.1797 79.0313,257.1797 Q79.6563,257.1797 80.25,256.9141 Q80.8438,256.6328 81.4688,256.0547 L81.4688,258.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="114" x="90.5" y="249.1387">«agreements.yml»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="109.5" y="264.9639">agreement</text></g><!--link employee to doctor--><g id="link_employee_doctor"><path codeLine="25" d="M146.71,39.2 C158.44,55.09 173.5268,75.5426 187.8168,94.9026 " fill="none" id="employee-to-doctor" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="191.38,99.73,189.2535,90.1135,188.4107,95.7072,182.817,94.8644,191.38,99.73" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="178.1038" y="88.9543">1</text></g><!--link employee to nurse--><g id="link_employee_nurse"><path codeLine="27" d="M124.29,39.2 C112.56,55.09 97.4732,75.5426 83.1832,94.9026 " fill="none" id="employee-to-nurse" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="79.62,99.73,88.183,94.8644,82.5893,95.7072,81.7465,90.1135,79.62,99.73" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="75.1463" y="88.9543">1</text></g><!--link nurse to agreement--><g id="link_nurse_agreement"><path codeLine="29" d="M65.94,156.33 C70.13,170.9 76.51,188.71 85.5,203 C92.42,214 97.8267,220.3536 106.8467,228.7436 " fill="none" id="nurse-to-agreement" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="111.24,232.83,107.3744,223.7715,107.5789,229.4246,101.9258,229.6292,111.24,232.83" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="86.5" y="199.0669">agreement</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="77.3231" y="222.096">0..1</text></g><!--link doctor to agreement--><g id="link_doctor_agreement"><path codeLine="31" d="M194.41,156.3 C179.88,179.51 162.564,207.1745 149.704,227.7145 " fill="none" id="doctor-to-agreement" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="146.52,232.8,154.6863,227.2944,149.1733,228.5621,147.9057,223.0491,146.52,232.8" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="71" x="175.5" y="199.0669">agreement</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="122.5256" y="222.0576">0..1</text></g><!--SRC=[ZP0xRiCm44HxdcB1taBI1eQAv096KgGcoB58c1-1f0C8XkwUbUG8pAT8kJEpEmzhdG4TZoTLRT-JTbbx2Bk9hoXZYWM_Z9FAAg0Y_t0GnZeHEpQPqafd1yzAkRWuBhkalIg5Rk9PwSkGqpMQb-HJta7UBLGLioYe5BchZ4hZ3SjoJPbYYX1YEoAvmgS9a7nltjLupMMLY6vh_KmU7_3qH2vM3CXDs2JDPx-dNTGfWEC6sWNbcxWQCX0Gg-Hdx4Fffk2PVQLeg0w7dkIZt5l-DZTUzkxWg_7GTOlNz35FEtF-Y_sV2vy0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/one-of-class-level-empty.puml.svg b/src/docs/tests/one-of-class-level-empty.puml.svg
index dc61748..b784545 100644
--- a/src/docs/tests/one-of-class-level-empty.puml.svg
+++ b/src/docs/tests/one-of-class-level-empty.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="53px" preserveAspectRatio="none" style="width:121px;height:53px;background:#FFFFFF;" version="1.1" viewBox="0 0 121 53" width="121px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="7"/><ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="27.8467">employee</text></g><!--SRC=[POxB2i8m44Nt-OhWTvGkwWyK5LmFoTM4ffam4nT5-k-c5CJ7zXpk8qGFstKZrT3traLn2IRiy0Gjd1L_OYIX6HNoOp2NkjXc0dlzHBU8r8XECPSjQrqYLViq0xdfBlp8_iY9vNta6a3L32mUycqkF5FbrIYgpUs55d8uOwkjB3PpXZ5x_Q6D9rw0GrjQpGi0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="53px" preserveAspectRatio="none" style="width:121px;height:53px;background:#FFFFFF;" version="1.1" viewBox="0 0 121 53" width="121px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="7"/><ellipse cx="22" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,28.6406 Q24.3906,28.9375 23.75,29.0781 Q23.1094,29.2344 22.4063,29.2344 Q19.9063,29.2344 18.5781,27.5938 Q17.2656,25.9375 17.2656,22.8125 Q17.2656,19.6875 18.5781,18.0313 Q19.9063,16.375 22.4063,16.375 Q23.1094,16.375 23.75,16.5313 Q24.4063,16.6875 24.9688,16.9844 L24.9688,19.7031 Q24.3438,19.125 23.75,18.8594 Q23.1563,18.5781 22.5313,18.5781 Q21.1875,18.5781 20.5,19.6563 Q19.8125,20.7188 19.8125,22.8125 Q19.8125,24.9063 20.5,25.9844 Q21.1875,27.0469 22.5313,27.0469 Q23.1563,27.0469 23.75,26.7813 Q24.3438,26.5 24.9688,25.9219 L24.9688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="27.8467">employee</text></g><!--SRC=[POvD2i8m44RtSugXvoXTw0MABbmFwQS9JJCX4nT5UdTJ2YAwVO_lnuS9tFUZL3yCx49n4UGFU85bJOO_CKgH1HNbns39TULcl4xsZUu1iH6RGyfxbbqKCtxHITpyAFfCqrcZbi-HcuTKsiXGERKjo-9mnHwkMZXf0j5HqhM9g2lGjRwDtW00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/one-of-class-level.puml.svg b/src/docs/tests/one-of-class-level.puml.svg
index 96aa2df..7fb6f25 100644
--- a/src/docs/tests/one-of-class-level.puml.svg
+++ b/src/docs/tests/one-of-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:283px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 162" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="123"/><ellipse cx="100.5" cy="139" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,144.6406 Q102.8906,144.9375 102.25,145.0781 Q101.6094,145.2344 100.9063,145.2344 Q98.4063,145.2344 97.0781,143.5938 Q95.7656,141.9375 95.7656,138.8125 Q95.7656,135.6875 97.0781,134.0313 Q98.4063,132.375 100.9063,132.375 Q101.6094,132.375 102.25,132.5313 Q102.9063,132.6875 103.4688,132.9844 L103.4688,135.7031 Q102.8438,135.125 102.25,134.8594 Q101.6563,134.5781 101.0313,134.5781 Q99.6875,134.5781 99,135.6563 Q98.3125,136.7188 98.3125,138.8125 Q98.3125,140.9063 99,141.9844 Q99.6875,143.0469 101.0313,143.0469 Q101.6563,143.0469 102.25,142.7813 Q102.8438,142.5 103.4688,141.9219 L103.4688,144.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="143.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="7"/><ellipse cx="36.85" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,28.6406 Q39.2406,28.9375 38.6,29.0781 Q37.9594,29.2344 37.2563,29.2344 Q34.7563,29.2344 33.4281,27.5938 Q32.1156,25.9375 32.1156,22.8125 Q32.1156,19.6875 33.4281,18.0313 Q34.7563,16.375 37.2563,16.375 Q37.9594,16.375 38.6,16.5313 Q39.2563,16.6875 39.8188,16.9844 L39.8188,19.7031 Q39.1938,19.125 38.6,18.8594 Q38.0063,18.5781 37.3813,18.5781 Q36.0375,18.5781 35.35,19.6563 Q34.6625,20.7188 34.6625,22.8125 Q34.6625,24.9063 35.35,25.9844 Q36.0375,27.0469 37.3813,27.0469 Q38.0063,27.0469 38.6,26.7813 Q39.1938,26.5 39.8188,25.9219 L39.8188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="7"/><ellipse cx="185.4" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,28.6406 Q187.7906,28.9375 187.15,29.0781 Q186.5094,29.2344 185.8063,29.2344 Q183.3063,29.2344 181.9781,27.5938 Q180.6656,25.9375 180.6656,22.8125 Q180.6656,19.6875 181.9781,18.0313 Q183.3063,16.375 185.8063,16.375 Q186.5094,16.375 187.15,16.5313 Q187.8063,16.6875 188.3688,16.9844 L188.3688,19.7031 Q187.7438,19.125 187.15,18.8594 Q186.5563,18.5781 185.9313,18.5781 Q184.5875,18.5781 183.9,19.6563 Q183.2125,20.7188 183.2125,22.8125 Q183.2125,24.9063 183.9,25.9844 Q184.5875,27.0469 185.9313,27.0469 Q186.5563,27.0469 187.15,26.7813 Q187.7438,26.5 188.3688,25.9219 L188.3688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="55.9951">income : decimal</text></g><!--link doctor to employee--><g id="link_doctor_employee"><path codeLine="22" d="M191.33,63.07 C177.08,82.19 169.2688,92.6892 157.5488,108.4092 " fill="none" id="doctor-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="146.79,122.84,162.3591,111.9955,152.7386,104.8229,146.79,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to employee--><g id="link_nurse_employee"><path codeLine="24" d="M79.67,63.07 C93.92,82.19 101.7312,92.6892 113.4512,108.4092 " fill="none" id="nurse-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="124.21,122.84,118.2614,104.8229,108.6409,111.9955,124.21,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POv1QWCn34NtFeN8FXSeOHRf1K9Rw5hOlx69RGsIKmZftBsUf0oJTFlUr_-AAO1skmEtE0paa_eC5-_m3JPADVmJ1rOkQD0dWpAs2tKJ9TWQVINaJkoKwZZVaiziHbUtPtywgfnhU9KikZpo6S7DxKK3zD5yIE4capCqglqB6zdZ7NDj4wKg5SxTwpTzFCi5sFIbQQ7rh7P3HDVROnDbV2FJ2wNQS8Ikma5yhtrCf-gbeCS3V2gSv_WIt6v_XjLoDtzxp-8N]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="162px" preserveAspectRatio="none" style="width:283px;height:162px;background:#FFFFFF;" version="1.1" viewBox="0 0 283 162" width="283px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="85.5" y="123"/><ellipse cx="100.5" cy="139" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M103.4688,144.6406 Q102.8906,144.9375 102.25,145.0781 Q101.6094,145.2344 100.9063,145.2344 Q98.4063,145.2344 97.0781,143.5938 Q95.7656,141.9375 95.7656,138.8125 Q95.7656,135.6875 97.0781,134.0313 Q98.4063,132.375 100.9063,132.375 Q101.6094,132.375 102.25,132.5313 Q102.9063,132.6875 103.4688,132.9844 L103.4688,135.7031 Q102.8438,135.125 102.25,134.8594 Q101.6563,134.5781 101.0313,134.5781 Q99.6875,134.5781 99,135.6563 Q98.3125,136.7188 98.3125,138.8125 Q98.3125,140.9063 99,141.9844 Q99.6875,143.0469 101.0313,143.0469 Q101.6563,143.0469 102.25,142.7813 Q102.8438,142.5 103.4688,141.9219 L103.4688,144.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="114.5" y="143.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="7" y="7"/><ellipse cx="36.85" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,28.6406 Q39.2406,28.9375 38.6,29.0781 Q37.9594,29.2344 37.2563,29.2344 Q34.7563,29.2344 33.4281,27.5938 Q32.1156,25.9375 32.1156,22.8125 Q32.1156,19.6875 33.4281,18.0313 Q34.7563,16.375 37.2563,16.375 Q37.9594,16.375 38.6,16.5313 Q39.2563,16.6875 39.8188,16.9844 L39.8188,19.7031 Q39.1938,19.125 38.6,18.8594 Q38.0063,18.5781 37.3813,18.5781 Q36.0375,18.5781 35.35,19.6563 Q34.6625,20.7188 34.6625,22.8125 Q34.6625,24.9063 35.35,25.9844 Q36.0375,27.0469 37.3813,27.0469 Q38.0063,27.0469 38.6,26.7813 Q39.1938,26.5 39.8188,25.9219 L39.8188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="54.15" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="111" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="13" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="147" y="7"/><ellipse cx="185.4" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M188.3688,28.6406 Q187.7906,28.9375 187.15,29.0781 Q186.5094,29.2344 185.8063,29.2344 Q183.3063,29.2344 181.9781,27.5938 Q180.6656,25.9375 180.6656,22.8125 Q180.6656,19.6875 181.9781,18.0313 Q183.3063,16.375 185.8063,16.375 Q186.5094,16.375 187.15,16.5313 Q187.8063,16.6875 188.3688,16.9844 L188.3688,19.7031 Q187.7438,19.125 187.15,18.8594 Q186.5563,18.5781 185.9313,18.5781 Q184.5875,18.5781 183.9,19.6563 Q183.2125,20.7188 183.2125,22.8125 Q183.2125,24.9063 183.9,25.9844 Q184.5875,27.0469 185.9313,27.0469 Q186.5563,27.0469 187.15,26.7813 Q187.7438,26.5 188.3688,25.9219 L188.3688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="204.6" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="148" x2="275" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="153" y="55.9951">income : decimal</text></g><!--link doctor to employee--><g id="link_doctor_employee"><path codeLine="22" d="M191.33,63.07 C177.08,82.19 169.2688,92.6892 157.5488,108.4092 " fill="none" id="doctor-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="146.79,122.84,162.3591,111.9955,152.7386,104.8229,146.79,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to employee--><g id="link_nurse_employee"><path codeLine="24" d="M79.67,63.07 C93.92,82.19 101.7312,92.6892 113.4512,108.4092 " fill="none" id="nurse-to-employee" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="124.21,122.84,118.2614,104.8229,108.6409,111.9955,124.21,122.84" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POun3i8m40Hxl-94pmSGIW4VG51GM_Q2BPoxo6UG8iZVSG150ThPkTqBqOFMwvqjeMd8nUmIJ7Z3FRGJLlm5EvjjYuByaw3jIayr2U9rZauHgHAzHEx6MtB9gjBTRAoxdBDSsMybIPuUEGROOWQZACHrIplhSC1uN2GJ2yEOTycYJYJfWKNj6oRArwmlH7H_pG-KS4EY5KKkE2FFP2-krdxRaPsqgBg7YwrDepw9o-MZcItNvBFt6pm1]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/one-of-property-level-required.puml.svg b/src/docs/tests/one-of-property-level-required.puml.svg
index 2c21ed0..f97cd0e 100644
--- a/src/docs/tests/one-of-property-level-required.puml.svg
+++ b/src/docs/tests/one-of-property-level-required.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="171px" preserveAspectRatio="none" style="width:418px;height:171px;background:#FFFFFF;" version="1.1" viewBox="0 0 418 171" width="418px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="19"/><ellipse cx="22" cy="35" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,40.6406 Q24.3906,40.9375 23.75,41.0781 Q23.1094,41.2344 22.4063,41.2344 Q19.9063,41.2344 18.5781,39.5938 Q17.2656,37.9375 17.2656,34.8125 Q17.2656,31.6875 18.5781,30.0313 Q19.9063,28.375 22.4063,28.375 Q23.1094,28.375 23.75,28.5313 Q24.4063,28.6875 24.9688,28.9844 L24.9688,31.7031 Q24.3438,31.125 23.75,30.8594 Q23.1563,30.5781 22.5313,30.5781 Q21.1875,30.5781 20.5,31.6563 Q19.8125,32.7188 19.8125,34.8125 Q19.8125,36.9063 20.5,37.9844 Q21.1875,39.0469 22.5313,39.0469 Q23.1563,39.0469 23.75,38.7813 Q24.3438,38.5 24.9688,37.9219 L24.9688,40.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="39.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="142.5" y="7"/><ellipse cx="172.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M175.3188,28.6406 Q174.7406,28.9375 174.1,29.0781 Q173.4594,29.2344 172.7563,29.2344 Q170.2563,29.2344 168.9281,27.5938 Q167.6156,25.9375 167.6156,22.8125 Q167.6156,19.6875 168.9281,18.0313 Q170.2563,16.375 172.7563,16.375 Q173.4594,16.375 174.1,16.5313 Q174.7563,16.6875 175.3188,16.9844 L175.3188,19.7031 Q174.6938,19.125 174.1,18.8594 Q173.5063,18.5781 172.8813,18.5781 Q171.5375,18.5781 170.85,19.6563 Q170.1625,20.7188 170.1625,22.8125 Q170.1625,24.9063 170.85,25.9844 Q171.5375,27.0469 172.8813,27.0469 Q173.5063,27.0469 174.1,26.7813 Q174.6938,26.5 175.3188,25.9219 L175.3188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="189.65" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="143.5" x2="246.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="148.5" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="282.5" y="7"/><ellipse cx="320.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M323.8688,28.6406 Q323.2906,28.9375 322.65,29.0781 Q322.0094,29.2344 321.3063,29.2344 Q318.8063,29.2344 317.4781,27.5938 Q316.1656,25.9375 316.1656,22.8125 Q316.1656,19.6875 317.4781,18.0313 Q318.8063,16.375 321.3063,16.375 Q322.0094,16.375 322.65,16.5313 Q323.3063,16.6875 323.8688,16.9844 L323.8688,19.7031 Q323.2438,19.125 322.65,18.8594 Q322.0563,18.5781 321.4313,18.5781 Q320.0875,18.5781 319.4,19.6563 Q318.7125,20.7188 318.7125,22.8125 Q318.7125,24.9063 319.4,25.9844 Q320.0875,27.0469 321.4313,27.0469 Q322.0563,27.0469 322.65,26.7813 Q323.2438,26.5 323.8688,25.9219 L323.8688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="340.1" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="283.5" x2="410.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="288.5" y="55.9951">income : decimal</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="195,140,207,152,195,164,183,152,195,140" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="24" d="M75.04,51.03 C106.31,77.09 164.5201,125.5996 184.2901,142.0696 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="188.9,145.91,184.5454,137.0761,185.0584,142.7097,179.4249,143.2226,188.9,145.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="144" y="106.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="170.5475" y="129.1152">1</text></g><!--link doctor to anon1--><g id="link_doctor_anon1"><path codeLine="26" d="M310.98,63.25 C274.11,91.15 234.0311,121.4551 215.6711,135.3551 " fill="none" id="doctor-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="201.32,146.22,219.2927,140.1388,212.0494,130.5714,201.32,146.22" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to anon1--><g id="link_nurse_anon1"><path codeLine="28" d="M195,63.25 C195,87.7 195,104.33 195,121.88 " fill="none" id="nurse-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="195,139.88,201,121.88,189,121.88,195,139.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POx1Ri8m44Jl_egLxpbmhL0Ez0TGMwddbJqb5hOtMXiaHFFlTK91eRs-DpixG_2WxNRFTUXxSa5TX1bky0rbb5pmJ-nPEQ52_nYaiLwecK5yMQElWDX8EOOyphVa8fT2LxDZTpoedB9_bIZw6F8vWAlPYNhei_cGn5KcKr0fjnLbP8TtpBLLbB9a67Ehj-rvb0jWswVfGVD9ouA8hikmYIBEYFH28LSSeAkm5zTgdzCXEqbeSGyN4iSvxWCdoPwu3TWOithTTRtTMBABiUtAgaJObhbtTzrtV_SD_-vxeZy0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="171px" preserveAspectRatio="none" style="width:418px;height:171px;background:#FFFFFF;" version="1.1" viewBox="0 0 418 171" width="418px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="19"/><ellipse cx="22" cy="35" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,40.6406 Q24.3906,40.9375 23.75,41.0781 Q23.1094,41.2344 22.4063,41.2344 Q19.9063,41.2344 18.5781,39.5938 Q17.2656,37.9375 17.2656,34.8125 Q17.2656,31.6875 18.5781,30.0313 Q19.9063,28.375 22.4063,28.375 Q23.1094,28.375 23.75,28.5313 Q24.4063,28.6875 24.9688,28.9844 L24.9688,31.7031 Q24.3438,31.125 23.75,30.8594 Q23.1563,30.5781 22.5313,30.5781 Q21.1875,30.5781 20.5,31.6563 Q19.8125,32.7188 19.8125,34.8125 Q19.8125,36.9063 20.5,37.9844 Q21.1875,39.0469 22.5313,39.0469 Q23.1563,39.0469 23.75,38.7813 Q24.3438,38.5 24.9688,37.9219 L24.9688,40.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="39.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="142.5" y="7"/><ellipse cx="172.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M175.3188,28.6406 Q174.7406,28.9375 174.1,29.0781 Q173.4594,29.2344 172.7563,29.2344 Q170.2563,29.2344 168.9281,27.5938 Q167.6156,25.9375 167.6156,22.8125 Q167.6156,19.6875 168.9281,18.0313 Q170.2563,16.375 172.7563,16.375 Q173.4594,16.375 174.1,16.5313 Q174.7563,16.6875 175.3188,16.9844 L175.3188,19.7031 Q174.6938,19.125 174.1,18.8594 Q173.5063,18.5781 172.8813,18.5781 Q171.5375,18.5781 170.85,19.6563 Q170.1625,20.7188 170.1625,22.8125 Q170.1625,24.9063 170.85,25.9844 Q171.5375,27.0469 172.8813,27.0469 Q173.5063,27.0469 174.1,26.7813 Q174.6938,26.5 175.3188,25.9219 L175.3188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="189.65" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="143.5" x2="246.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="148.5" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="282.5" y="7"/><ellipse cx="320.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M323.8688,28.6406 Q323.2906,28.9375 322.65,29.0781 Q322.0094,29.2344 321.3063,29.2344 Q318.8063,29.2344 317.4781,27.5938 Q316.1656,25.9375 316.1656,22.8125 Q316.1656,19.6875 317.4781,18.0313 Q318.8063,16.375 321.3063,16.375 Q322.0094,16.375 322.65,16.5313 Q323.3063,16.6875 323.8688,16.9844 L323.8688,19.7031 Q323.2438,19.125 322.65,18.8594 Q322.0563,18.5781 321.4313,18.5781 Q320.0875,18.5781 319.4,19.6563 Q318.7125,20.7188 318.7125,22.8125 Q318.7125,24.9063 319.4,25.9844 Q320.0875,27.0469 321.4313,27.0469 Q322.0563,27.0469 322.65,26.7813 Q323.2438,26.5 323.8688,25.9219 L323.8688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="340.1" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="283.5" x2="410.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="288.5" y="55.9951">income : decimal</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="195,140,207,152,195,164,183,152,195,140" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="24" d="M75.04,51.03 C106.31,77.09 164.5201,125.5996 184.2901,142.0696 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="188.9,145.91,184.5454,137.0761,185.0584,142.7097,179.4249,143.2226,188.9,145.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="144" y="106.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="170.5475" y="129.1152">1</text></g><!--link doctor to anon1--><g id="link_doctor_anon1"><path codeLine="26" d="M310.98,63.25 C274.11,91.15 234.0311,121.4551 215.6711,135.3551 " fill="none" id="doctor-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="201.32,146.22,219.2927,140.1388,212.0494,130.5714,201.32,146.22" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to anon1--><g id="link_nurse_anon1"><path codeLine="28" d="M195,63.25 C195,87.7 195,104.33 195,121.88 " fill="none" id="nurse-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="195,139.88,201,121.88,189,121.88,195,139.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POwzRi8m58LtFyMLzmoi5Sf0Nm2rG-Sh-q0iRD_8DaY8vjrx4meAxVgTto5uq7QxvpRqFRbGN8GPxl03TPHSyK_OS-64Xl97GHhRbLGPnDSrEWH49VKKyZXdoKMkbMvcn-vqB7BE_bsYbEUHhm7Sp6Gg6cNTgYCxV68EDocK9SEOUudLYIXNm6hVzAJvNEg2Y6xB_4GH5qHwev0RZYWhinUdjQ_ka9qagDt3XSHnjll0IR8drWCROrRJNTVRZIMxA5PJjaY4LS-Zk-k- -uUk-FVV2_q1]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/one-of-property-level.puml.svg b/src/docs/tests/one-of-property-level.puml.svg
index 5b6f5ef..a5c2b61 100644
--- a/src/docs/tests/one-of-property-level.puml.svg
+++ b/src/docs/tests/one-of-property-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="171px" preserveAspectRatio="none" style="width:418px;height:171px;background:#FFFFFF;" version="1.1" viewBox="0 0 418 171" width="418px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="19"/><ellipse cx="22" cy="35" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,40.6406 Q24.3906,40.9375 23.75,41.0781 Q23.1094,41.2344 22.4063,41.2344 Q19.9063,41.2344 18.5781,39.5938 Q17.2656,37.9375 17.2656,34.8125 Q17.2656,31.6875 18.5781,30.0313 Q19.9063,28.375 22.4063,28.375 Q23.1094,28.375 23.75,28.5313 Q24.4063,28.6875 24.9688,28.9844 L24.9688,31.7031 Q24.3438,31.125 23.75,30.8594 Q23.1563,30.5781 22.5313,30.5781 Q21.1875,30.5781 20.5,31.6563 Q19.8125,32.7188 19.8125,34.8125 Q19.8125,36.9063 20.5,37.9844 Q21.1875,39.0469 22.5313,39.0469 Q23.1563,39.0469 23.75,38.7813 Q24.3438,38.5 24.9688,37.9219 L24.9688,40.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="39.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="142.5" y="7"/><ellipse cx="172.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M175.3188,28.6406 Q174.7406,28.9375 174.1,29.0781 Q173.4594,29.2344 172.7563,29.2344 Q170.2563,29.2344 168.9281,27.5938 Q167.6156,25.9375 167.6156,22.8125 Q167.6156,19.6875 168.9281,18.0313 Q170.2563,16.375 172.7563,16.375 Q173.4594,16.375 174.1,16.5313 Q174.7563,16.6875 175.3188,16.9844 L175.3188,19.7031 Q174.6938,19.125 174.1,18.8594 Q173.5063,18.5781 172.8813,18.5781 Q171.5375,18.5781 170.85,19.6563 Q170.1625,20.7188 170.1625,22.8125 Q170.1625,24.9063 170.85,25.9844 Q171.5375,27.0469 172.8813,27.0469 Q173.5063,27.0469 174.1,26.7813 Q174.6938,26.5 175.3188,25.9219 L175.3188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="189.65" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="143.5" x2="246.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="148.5" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="282.5" y="7"/><ellipse cx="320.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M323.8688,28.6406 Q323.2906,28.9375 322.65,29.0781 Q322.0094,29.2344 321.3063,29.2344 Q318.8063,29.2344 317.4781,27.5938 Q316.1656,25.9375 316.1656,22.8125 Q316.1656,19.6875 317.4781,18.0313 Q318.8063,16.375 321.3063,16.375 Q322.0094,16.375 322.65,16.5313 Q323.3063,16.6875 323.8688,16.9844 L323.8688,19.7031 Q323.2438,19.125 322.65,18.8594 Q322.0563,18.5781 321.4313,18.5781 Q320.0875,18.5781 319.4,19.6563 Q318.7125,20.7188 318.7125,22.8125 Q318.7125,24.9063 319.4,25.9844 Q320.0875,27.0469 321.4313,27.0469 Q322.0563,27.0469 322.65,26.7813 Q323.2438,26.5 323.8688,25.9219 L323.8688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="340.1" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="283.5" x2="410.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="288.5" y="55.9951">income : decimal</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="195,140,207,152,195,164,183,152,195,140" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="24" d="M75.04,51.03 C106.31,77.09 164.5201,125.5996 184.2901,142.0696 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="188.9,145.91,184.5454,137.0761,185.0584,142.7097,179.4249,143.2226,188.9,145.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="144" y="106.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="151.0988" y="132.6652">0..1</text></g><!--link doctor to anon1--><g id="link_doctor_anon1"><path codeLine="26" d="M310.98,63.25 C274.11,91.15 234.0311,121.4551 215.6711,135.3551 " fill="none" id="doctor-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="201.32,146.22,219.2927,140.1388,212.0494,130.5714,201.32,146.22" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to anon1--><g id="link_nurse_anon1"><path codeLine="28" d="M195,63.25 C195,87.7 195,104.33 195,121.88 " fill="none" id="nurse-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="195,139.88,201,121.88,189,121.88,195,139.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POx1QiCm44Jl-ef5TuVcMe8FwG-4jj3p8aqZ4Kbh9AKGKlzxPQS9TdjzRtPsdBUWtUx0rVKz6PzDW78t-8eoI2hu9mwSEQ8Y_p68GxrGCqviMQ9FZz18EVaqJBTa0fT2LxLdSpfcEIVx8a7oOyY70rUrbsoHr-PT8bSPLK6br5QKWGtUCDLMoPGaGQbRlMxFWrm0tJwD3vhEkSo8w3eF6odW2u6UoQUA8_8YRCMqsdNQ9oCHBMvXVEGmnQtdACaIjm5RfHQlkwxNJvlDLfEUfMw7Eak0Rh5xVTTzztVVyE_45Vq1]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="171px" preserveAspectRatio="none" style="width:418px;height:171px;background:#FFFFFF;" version="1.1" viewBox="0 0 418 171" width="418px" zoomAndPan="magnify"><defs/><g><!--class employee--><g id="elem_employee"><rect codeLine="11" fill="#F1F1F1" height="32" id="employee" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="19"/><ellipse cx="22" cy="35" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M24.9688,40.6406 Q24.3906,40.9375 23.75,41.0781 Q23.1094,41.2344 22.4063,41.2344 Q19.9063,41.2344 18.5781,39.5938 Q17.2656,37.9375 17.2656,34.8125 Q17.2656,31.6875 18.5781,30.0313 Q19.9063,28.375 22.4063,28.375 Q23.1094,28.375 23.75,28.5313 Q24.4063,28.6875 24.9688,28.9844 L24.9688,31.7031 Q24.3438,31.125 23.75,30.8594 Q23.1563,30.5781 22.5313,30.5781 Q21.1875,30.5781 20.5,31.6563 Q19.8125,32.7188 19.8125,34.8125 Q19.8125,36.9063 20.5,37.9844 Q21.1875,39.0469 22.5313,39.0469 Q23.1563,39.0469 23.75,38.7813 Q24.3438,38.5 24.9688,37.9219 L24.9688,40.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="36" y="39.8467">employee</text></g><!--class nurse--><g id="elem_nurse"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="nurse" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="105" x="142.5" y="7"/><ellipse cx="172.35" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M175.3188,28.6406 Q174.7406,28.9375 174.1,29.0781 Q173.4594,29.2344 172.7563,29.2344 Q170.2563,29.2344 168.9281,27.5938 Q167.6156,25.9375 167.6156,22.8125 Q167.6156,19.6875 168.9281,18.0313 Q170.2563,16.375 172.7563,16.375 Q173.4594,16.375 174.1,16.5313 Q174.7563,16.6875 175.3188,16.9844 L175.3188,19.7031 Q174.6938,19.125 174.1,18.8594 Q173.5063,18.5781 172.8813,18.5781 Q171.5375,18.5781 170.85,19.6563 Q170.1625,20.7188 170.1625,22.8125 Q170.1625,24.9063 170.85,25.9844 Q171.5375,27.0469 172.8813,27.0469 Q173.5063,27.0469 174.1,26.7813 Q174.6938,26.5 175.3188,25.9219 L175.3188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="40" x="189.65" y="27.8467">nurse</text><line style="stroke:#181818;stroke-width:0.5;" x1="143.5" x2="246.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="93" x="148.5" y="55.9951">level : integer</text></g><!--class doctor--><g id="elem_doctor"><rect codeLine="18" fill="#F1F1F1" height="56.2969" id="doctor" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="282.5" y="7"/><ellipse cx="320.9" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M323.8688,28.6406 Q323.2906,28.9375 322.65,29.0781 Q322.0094,29.2344 321.3063,29.2344 Q318.8063,29.2344 317.4781,27.5938 Q316.1656,25.9375 316.1656,22.8125 Q316.1656,19.6875 317.4781,18.0313 Q318.8063,16.375 321.3063,16.375 Q322.0094,16.375 322.65,16.5313 Q323.3063,16.6875 323.8688,16.9844 L323.8688,19.7031 Q323.2438,19.125 322.65,18.8594 Q322.0563,18.5781 321.4313,18.5781 Q320.0875,18.5781 319.4,19.6563 Q318.7125,20.7188 318.7125,22.8125 Q318.7125,24.9063 319.4,25.9844 Q320.0875,27.0469 321.4313,27.0469 Q322.0563,27.0469 322.65,26.7813 Q323.2438,26.5 323.8688,25.9219 L323.8688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="45" x="340.1" y="27.8467">doctor</text><line style="stroke:#181818;stroke-width:0.5;" x1="283.5" x2="410.5" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="288.5" y="55.9951">income : decimal</text></g><g id="elem_anon1"><polygon fill="#F1F1F1" points="195,140,207,152,195,164,183,152,195,140" style="stroke:#181818;stroke-width:0.5;"/></g><!--link employee to anon1--><g id="link_employee_anon1"><path codeLine="24" d="M75.04,51.03 C106.31,77.09 164.5201,125.5996 184.2901,142.0696 " fill="none" id="employee-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="188.9,145.91,184.5454,137.0761,185.0584,142.7097,179.4249,143.2226,188.9,145.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="144" y="106.0669">role</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="151.0988" y="132.6652">0..1</text></g><!--link doctor to anon1--><g id="link_doctor_anon1"><path codeLine="26" d="M310.98,63.25 C274.11,91.15 234.0311,121.4551 215.6711,135.3551 " fill="none" id="doctor-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="201.32,146.22,219.2927,140.1388,212.0494,130.5714,201.32,146.22" style="stroke:#181818;stroke-width:1.0;"/></g><!--link nurse to anon1--><g id="link_nurse_anon1"><path codeLine="28" d="M195,63.25 C195,87.7 195,104.33 195,121.88 " fill="none" id="nurse-to-anon1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="none" points="195,139.88,201,121.88,189,121.88,195,139.88" style="stroke:#181818;stroke-width:1.0;"/></g><!--SRC=[POvDJiCm48NtFiN8-rHqYweiu08LB5YFx4TjrV54jejKbToTIKgh5BRV-mtHWtQxFRVGz-HYSGacNE4RwYYvuf-mvy836ieV1SFOpgHA45_Nw3CYAQd7cCSvIovnhNGnB-oEXoAdx5ybIRaV-GZWPYPJqIZhLXtPuHrpk4cXB1d6N4kiJYGv0rRxfZlDfr8NH7HPvYTA-4AYPugvuO2oCdjnMlleZjd90BLxk3Xmckq-yY3P4-k1hJ6hwQxhxTDcixLa5z5gq1P9i6gxrNVTTt_J5VzUVA0_]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/parameter-anon-empty-object.puml.svg b/src/docs/tests/parameter-anon-empty-object.puml.svg
index 21199d1..bebc5fb 100644
--- a/src/docs/tests/parameter-anon-empty-object.puml.svg
+++ b/src/docs/tests/parameter-anon-empty-object.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:687px;height:304px;background:#FFFFFF;" version="1.1" viewBox="0 0 687 304" width="687px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="500.5" y="225"/><ellipse cx="543.4" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M546.3688,246.6406 Q545.7906,246.9375 545.15,247.0781 Q544.5094,247.2344 543.8063,247.2344 Q541.3063,247.2344 539.9781,245.5938 Q538.6656,243.9375 538.6656,240.8125 Q538.6656,237.6875 539.9781,236.0313 Q541.3063,234.375 543.8063,234.375 Q544.5094,234.375 545.15,234.5313 Q545.8063,234.6875 546.3688,234.9844 L546.3688,237.7031 Q545.7438,237.125 545.15,236.8594 Q544.5563,236.5781 543.9313,236.5781 Q542.5875,236.5781 541.9,237.6563 Q541.2125,238.7188 541.2125,240.8125 Q541.2125,242.9063 541.9,243.9844 Q542.5875,245.0469 543.9313,245.0469 Q544.5563,245.0469 545.15,244.7813 Q545.7438,244.5 546.3688,243.9219 L546.3688,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="563.6" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="501.5" x2="661.5" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="506.5" y="273.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="506.5" y="290.292">lastName : string {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="16" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="266.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="328.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="269.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired.offset--><g id="elem_GET /customer/expired.offset"><rect codeLine="19" fill="#F1F1F1" height="40.2656" id="GET /customer/expired.offset" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="209" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="72" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="10" y="155.9639">GET /customer/expired.offset</text></g><!--class GET /customer/expired.limit--><g id="elem_GET /customer/expired.limit"><rect codeLine="22" fill="#F1F1F1" height="40.2656" id="GET /customer/expired.limit" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="251" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="310" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="254" y="155.9639">GET /customer/expired.limit</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="25" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="483" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="544.5" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="486" y="155.9639">GET /customer/expired 200</text></g><!--link GET /customer/expired to GET /customer/expired.offset--><g id="link_GET /customer/expired_GET /customer/expired.offset"><path codeLine="28" d="M309.93,47.12 C265.92,68.39 200.6224,99.9396 156.5624,121.2296 " fill="none" id="GET /customer/expired-to-GET /customer/expired.offset" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="151.16,123.84,161.0038,123.5259,155.662,121.6646,157.5232,116.3227,151.16,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="246.5" y="90.0669">offset</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="153.6351" y="112.7623">1</text></g><!--link GET /customer/expired to GET /customer/expired.limit--><g id="link_GET /customer/expired_GET /customer/expired.limit"><path codeLine="30" d="M349.5,47.25 C349.5,68.48 349.5,96.44 349.5,117.69 " fill="none" id="GET /customer/expired-to-GET /customer/expired.limit" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="349.5,123.69,353.5,114.69,349.5,118.69,345.5,114.69,349.5,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="27" x="350.5" y="90.0669">limit</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="322.125" y="112.9167">0..1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="32" d="M581.5,164.07 C581.5,180.48 581.5,198.58 581.5,218.59 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="581.5,224.59,585.5,215.59,581.5,219.59,577.5,215.59,581.5,224.59" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="573.8984" y="214.0703">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="34" d="M388.07,47.12 C430.98,68.39 494.5142,99.8853 537.4642,121.1753 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="542.84,123.84,536.5528,116.259,538.3602,121.6194,532.9998,123.4268,542.84,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="480.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="522.3086" y="112.7623">1</text></g><!--SRC=[dP51JyCm38Nl-HLMZaZh2aSqzR09SOC99d6EKdUDriQLaqcWgl-TjAb6DoX3t18xx_DxJcboXDLggtoPPQ0Dwmf56Oilw1go3hyrjefLZHxveeDrupyWT4hAtRHK6An2nHsCRNejw4ev1wrOAttOCnrjlg6A-6JahKJbnPeuHpxlxAXMdZhXq8CDBboZDBvYZ_N4OCcY414lDqVdgKQMOH90ExZeWXbs_Yb8uHwSPsFtq3vtamT1_4E_Es4V7tQmr2DxYU-DOSpbrnR3j2kF4ogA441UxF8FmihKvXywk4jJUVwbKJGNPh78GDxAQ_x3Ya2EbokmD4dcUMEi0HVFSxIOP23UoCaNpqzFaj-YHDumk3-9Jm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:687px;height:304px;background:#FFFFFF;" version="1.1" viewBox="0 0 687 304" width="687px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="500.5" y="225"/><ellipse cx="543.4" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M546.3688,246.6406 Q545.7906,246.9375 545.15,247.0781 Q544.5094,247.2344 543.8063,247.2344 Q541.3063,247.2344 539.9781,245.5938 Q538.6656,243.9375 538.6656,240.8125 Q538.6656,237.6875 539.9781,236.0313 Q541.3063,234.375 543.8063,234.375 Q544.5094,234.375 545.15,234.5313 Q545.8063,234.6875 546.3688,234.9844 L546.3688,237.7031 Q545.7438,237.125 545.15,236.8594 Q544.5563,236.5781 543.9313,236.5781 Q542.5875,236.5781 541.9,237.6563 Q541.2125,238.7188 541.2125,240.8125 Q541.2125,242.9063 541.9,243.9844 Q542.5875,245.0469 543.9313,245.0469 Q544.5563,245.0469 545.15,244.7813 Q545.7438,244.5 546.3688,243.9219 L546.3688,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="563.6" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="501.5" x2="661.5" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="506.5" y="273.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="506.5" y="290.292">lastName : string {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="16" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="266.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="328.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="269.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired.offset--><g id="elem_GET /customer/expired.offset"><rect codeLine="19" fill="#F1F1F1" height="40.2656" id="GET /customer/expired.offset" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="209" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="72" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="10" y="155.9639">GET /customer/expired.offset</text></g><!--class GET /customer/expired.limit--><g id="elem_GET /customer/expired.limit"><rect codeLine="22" fill="#F1F1F1" height="40.2656" id="GET /customer/expired.limit" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="251" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="310" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="254" y="155.9639">GET /customer/expired.limit</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="25" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="483" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="544.5" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="486" y="155.9639">GET /customer/expired 200</text></g><!--link GET /customer/expired to GET /customer/expired.offset--><g id="link_GET /customer/expired_GET /customer/expired.offset"><path codeLine="28" d="M309.93,47.12 C265.92,68.39 200.6224,99.9396 156.5624,121.2296 " fill="none" id="GET /customer/expired-to-GET /customer/expired.offset" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="151.16,123.84,161.0038,123.5259,155.662,121.6646,157.5232,116.3227,151.16,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="246.5" y="90.0669">offset</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="153.6351" y="112.7623">1</text></g><!--link GET /customer/expired to GET /customer/expired.limit--><g id="link_GET /customer/expired_GET /customer/expired.limit"><path codeLine="30" d="M349.5,47.25 C349.5,68.48 349.5,96.44 349.5,117.69 " fill="none" id="GET /customer/expired-to-GET /customer/expired.limit" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="349.5,123.69,353.5,114.69,349.5,118.69,345.5,114.69,349.5,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="27" x="350.5" y="90.0669">limit</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="322.125" y="112.9167">0..1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="32" d="M581.5,164.07 C581.5,180.48 581.5,198.58 581.5,218.59 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="581.5,224.59,585.5,215.59,581.5,219.59,577.5,215.59,581.5,224.59" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="573.8984" y="214.0703">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="34" d="M388.07,47.12 C430.98,68.39 494.5142,99.8853 537.4642,121.1753 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="542.84,123.84,536.5528,116.259,538.3602,121.6194,532.9998,123.4268,542.84,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="480.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="522.3086" y="112.7623">1</text></g><!--SRC=[dP51IyGm48Nl-HL3Zi9sgqTPUd0HRxgeu3caqstOD0cPB2Yb_zsqAMjThPMz9JDvtvitgLM9iDdiHAYB0gJoKYEhK_4PoLb3-AEn4ruq6D2VTR1nuGDYfxObJKkLGXqhT536zLgGMX11o-w4FEozFPfoQxNrfq7UQXI1TOmmW8bUv8J45-p5mNemrY1Z2SAtHmgsGSyZ3w0TlBfewIayHYdS0WMlp1xQfsxo88f_wNSdxCFzAwpbo5xZkrCUI_wrg-Ysy3YpLHK3yBED_KEeLQCkqC5DdlFl7vT4Ss5MgmBuDL-QFwu8-7XPWELPDiyROmsuT9wZfIG3yOfFldZUFSl-Yf9uWt5_Ofy0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/parameter-anon.puml.svg b/src/docs/tests/parameter-anon.puml.svg
index 9354f6c..b16b469 100644
--- a/src/docs/tests/parameter-anon.puml.svg
+++ b/src/docs/tests/parameter-anon.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:687px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 687 345" width="687px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="500.5" y="266"/><ellipse cx="543.4" cy="282" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M546.3688,287.6406 Q545.7906,287.9375 545.15,288.0781 Q544.5094,288.2344 543.8063,288.2344 Q541.3063,288.2344 539.9781,286.5938 Q538.6656,284.9375 538.6656,281.8125 Q538.6656,278.6875 539.9781,277.0313 Q541.3063,275.375 543.8063,275.375 Q544.5094,275.375 545.15,275.5313 Q545.8063,275.6875 546.3688,275.9844 L546.3688,278.7031 Q545.7438,278.125 545.15,277.8594 Q544.5563,277.5781 543.9313,277.5781 Q542.5875,277.5781 541.9,278.6563 Q541.2125,279.7188 541.2125,281.8125 Q541.2125,283.9063 541.9,284.9844 Q542.5875,286.0469 543.9313,286.0469 Q544.5563,286.0469 545.15,285.7813 Q545.7438,285.5 546.3688,284.9219 L546.3688,287.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="563.6" y="286.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="501.5" x2="661.5" y1="298" y2="298"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="506.5" y="314.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="506.5" y="331.292">lastName : string {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="16" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="266.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="328.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="269.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired.offset--><g id="elem_GET /customer/expired.offset"><rect codeLine="19" fill="#F1F1F1" height="80.8594" id="GET /customer/expired.offset" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="209" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="72" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="10" y="155.9639">GET /customer/expired.offset</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="215" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="13" y="181.2607">min : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="13" y="197.5576">max : integer {O}</text></g><!--class GET /customer/expired.limit--><g id="elem_GET /customer/expired.limit"><rect codeLine="24" fill="#F1F1F1" height="80.8594" id="GET /customer/expired.limit" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="251" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="310" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="254" y="155.9639">GET /customer/expired.limit</text><line style="stroke:#181818;stroke-width:0.5;" x1="252" x2="447" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="257" y="181.2607">min : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="257" y="197.5576">max : integer {O}</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="29" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="483" y="144.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="544.5" y="160.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="486" y="176.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired to GET /customer/expired.offset--><g id="link_GET /customer/expired_GET /customer/expired.offset"><path codeLine="32" d="M315.91,47.13 C281.05,66.97 230.754,95.6011 186.374,120.8711 " fill="none" id="GET /customer/expired-to-GET /customer/expired.offset" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="181.16,123.84,190.9603,122.8627,185.505,121.366,187.0018,115.9107,181.16,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="260.5" y="90.0669">offset</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="184.0349" y="112.953">1</text></g><!--link GET /customer/expired to GET /customer/expired.limit--><g id="link_GET /customer/expired_GET /customer/expired.limit"><path codeLine="34" d="M349.5,47.13 C349.5,66.97 349.5,92.57 349.5,117.84 " fill="none" id="GET /customer/expired-to-GET /customer/expired.limit" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="349.5,123.84,353.5,114.84,349.5,118.84,345.5,114.84,349.5,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="27" x="350.5" y="90.0669">limit</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="323.5125" y="112.953">0..1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="36" d="M581.5,184.7 C581.5,205.71 581.5,233.87 581.5,259.83 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="581.5,265.83,585.5,256.83,581.5,260.83,577.5,256.83,581.5,265.83" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="573.8547" y="254.8027">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="38" d="M382.25,47.13 C426.46,72.95 499.6087,115.6744 543.7387,141.4444 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="548.92,144.47,543.1652,136.4774,544.6023,141.9486,539.131,143.3857,548.92,144.47" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="460.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="530.1746" y="133.4305">1</text></g><!--SRC=[lLAnReCm4Dtz5IUFbK9enofYI5HrQwCsKcSB3h22RNHsf5I8Vw_1A0LQojRjVE_klNTFBcM6iDiTXIkJ1599QOMi3CqtjBNH5dy0Hq52eKEQ8QXgzmaUAKrcnwrSOkKxzYnrtUr2MWbheM5xaPuBCXUT7Knbw6RaeqJXsDvGXZH5JaO9PrfcqO7sBcmjKdp7ZjOP0cqqCXRe-U5YdL58t2i1DBsBrfiXwrxyAZo2TIHr0SrhEnhmox_WxOts-Ua4stJWtkArbeGP_qxHgwqCHoRF_G5ybkN4ffBQ6v3QOO4qSwZ4TOQj2LPIoN_KWuSuvjCl559P2c-pIO3VyxMyl0lWmsE5B8wYPRuXZfukr4jiuPAUyOwFljIoUXJzTKhWwuMxYdq1]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:687px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 687 345" width="687px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="500.5" y="266"/><ellipse cx="543.4" cy="282" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M546.3688,287.6406 Q545.7906,287.9375 545.15,288.0781 Q544.5094,288.2344 543.8063,288.2344 Q541.3063,288.2344 539.9781,286.5938 Q538.6656,284.9375 538.6656,281.8125 Q538.6656,278.6875 539.9781,277.0313 Q541.3063,275.375 543.8063,275.375 Q544.5094,275.375 545.15,275.5313 Q545.8063,275.6875 546.3688,275.9844 L546.3688,278.7031 Q545.7438,278.125 545.15,277.8594 Q544.5563,277.5781 543.9313,277.5781 Q542.5875,277.5781 541.9,278.6563 Q541.2125,279.7188 541.2125,281.8125 Q541.2125,283.9063 541.9,284.9844 Q542.5875,286.0469 543.9313,286.0469 Q544.5563,286.0469 545.15,285.7813 Q545.7438,285.5 546.3688,284.9219 L546.3688,287.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="563.6" y="286.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="501.5" x2="661.5" y1="298" y2="298"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="506.5" y="314.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="506.5" y="331.292">lastName : string {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="16" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="266.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="328.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="269.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired.offset--><g id="elem_GET /customer/expired.offset"><rect codeLine="19" fill="#F1F1F1" height="80.8594" id="GET /customer/expired.offset" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="209" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="72" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="203" x="10" y="155.9639">GET /customer/expired.offset</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="215" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="13" y="181.2607">min : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="13" y="197.5576">max : integer {O}</text></g><!--class GET /customer/expired.limit--><g id="elem_GET /customer/expired.limit"><rect codeLine="24" fill="#F1F1F1" height="80.8594" id="GET /customer/expired.limit" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="251" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="310" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="254" y="155.9639">GET /customer/expired.limit</text><line style="stroke:#181818;stroke-width:0.5;" x1="252" x2="447" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="120" x="257" y="181.2607">min : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="123" x="257" y="197.5576">max : integer {O}</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="29" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="483" y="144.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="544.5" y="160.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="486" y="176.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired to GET /customer/expired.offset--><g id="link_GET /customer/expired_GET /customer/expired.offset"><path codeLine="32" d="M315.91,47.13 C281.05,66.97 230.754,95.6011 186.374,120.8711 " fill="none" id="GET /customer/expired-to-GET /customer/expired.offset" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="181.16,123.84,190.9603,122.8627,185.505,121.366,187.0018,115.9107,181.16,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="36" x="260.5" y="90.0669">offset</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="184.0349" y="112.953">1</text></g><!--link GET /customer/expired to GET /customer/expired.limit--><g id="link_GET /customer/expired_GET /customer/expired.limit"><path codeLine="34" d="M349.5,47.13 C349.5,66.97 349.5,92.57 349.5,117.84 " fill="none" id="GET /customer/expired-to-GET /customer/expired.limit" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="349.5,123.84,353.5,114.84,349.5,118.84,345.5,114.84,349.5,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="27" x="350.5" y="90.0669">limit</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="323.5125" y="112.953">0..1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="36" d="M581.5,184.7 C581.5,205.71 581.5,233.87 581.5,259.83 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="581.5,265.83,585.5,256.83,581.5,260.83,577.5,256.83,581.5,265.83" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="573.8547" y="254.8027">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="38" d="M382.25,47.13 C426.46,72.95 499.6087,115.6744 543.7387,141.4444 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="548.92,144.47,543.1652,136.4774,544.6023,141.9486,539.131,143.3857,548.92,144.47" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="460.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="530.1746" y="133.4305">1</text></g><!--SRC=[lP91IyGm48Nl-HL3Zi9sgqTPUd0HRxgeu3caqpPiavGa2okb_zrfKzPkjVRcBPd9VE_D8vNA4NQxWmXLbe5KJjR8gbXyHTzOu_57uo2Sq1ZGpJgec_09rAbixgUbGc5D5NzKfkbdGTR2UsZPWv37qjcJoVUsjkvYvAD24LZ7F0OmfEKR8V4D- -5W7HXhaB48uVkJ3rQZuyG3Q0UjZYIT3yyq2lVWWrEcXFQbcpoWuL_wtGNxzFWEMpcojtXkbCESVsT5QYkF4riKj02V9NPbKoj31fG9MAARETJYFEkj2TPAgt_KWxiqvTSV9QQo5Dvcam6_vMjvaGlWusK5bYR9Cc-COy35yn8jRZ8GR_ZaIosh9ybVgqJU8DoVs1S0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/parameter-ref-complex.puml.svg b/src/docs/tests/parameter-ref-complex.puml.svg
index 5cabadc..0b23165 100644
--- a/src/docs/tests/parameter-ref-complex.puml.svg
+++ b/src/docs/tests/parameter-ref-complex.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:380px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 380 345" width="380px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="194" y="266"/><ellipse cx="236.9" cy="282" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M239.8688,287.6406 Q239.2906,287.9375 238.65,288.0781 Q238.0094,288.2344 237.3063,288.2344 Q234.8063,288.2344 233.4781,286.5938 Q232.1656,284.9375 232.1656,281.8125 Q232.1656,278.6875 233.4781,277.0313 Q234.8063,275.375 237.3063,275.375 Q238.0094,275.375 238.65,275.5313 Q239.3063,275.6875 239.8688,275.9844 L239.8688,278.7031 Q239.2438,278.125 238.65,277.8594 Q238.0563,277.5781 237.4313,277.5781 Q236.0875,277.5781 235.4,278.6563 Q234.7125,279.7188 234.7125,281.8125 Q234.7125,283.9063 235.4,284.9844 Q236.0875,286.0469 237.4313,286.0469 Q238.0563,286.0469 238.65,285.7813 Q239.2438,285.5 239.8688,284.9219 L239.8688,287.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="257.1" y="286.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="195" x2="355" y1="298" y2="298"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="200" y="314.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="200" y="331.292">lastName : string {O}</text></g><!--class CustomerId--><g id="elem_CustomerId"><rect codeLine="16" fill="#F1F1F1" height="80.8594" id="CustomerId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="34.5" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="34" y="155.9639">CustomerId</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="140" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="13" y="181.2607">id : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="197.5576">prefix : string {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="21" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="48" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="110" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="51" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="24" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="176.5" y="144.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="238" y="160.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="179.5" y="176.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired to CustomerId--><g id="link_GET /customer/expired_CustomerId"><path codeLine="27" d="M122.95,47.13 C114.61,66.97 103.6365,93.0394 93.0065,118.3094 " fill="none" id="GET /customer/expired-to-CustomerId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="90.68,123.84,97.8568,117.0951,92.6187,119.2312,90.4827,113.9931,90.68,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="111" y="90.0669">customerId</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="84.7801" y="112.953">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="29" d="M275,184.7 C275,205.71 275,233.87 275,259.83 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="275,265.83,279,256.83,275,260.83,271,256.83,275,265.83" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="267.3547" y="254.8027">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="31" d="M156.24,47.08 C167.47,55.87 180.68,66.63 192,77 C215.95,98.93 237.4985,121.8062 253.8285,139.8062 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="257.86,144.25,254.7753,134.8967,254.5004,140.5469,248.8503,140.272,257.86,144.25" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="209" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="243.9144" y="133.4935">1</text></g><!--SRC=[XP5BQyCm48Jl-XMBZeKyscC9FYI4qaiRsa3FGjh48hOaTXL8CVxlbH-qTbAtDx6pCzz8ogr1MArsAkPP1jgIBb3atV0DENZ7U2Fi5AaI8zALWcM8dv2Kt1iUZWuMYpJXatMXyO8k53DKOgtqwKZ-xCp65vw-YtpagA9OUp98OsNlInLzBHWZkDI2WzBuZariz0JEEnIYYvURCqTV8ib40gZQ5dKgGnnVaXKUWIDPTuJgjHui9FClUdqJ-sparMECEDPC0GBXmLwcuf-sUrZedh70Ix24FQbzWGJvPnaUbaiv_i3ED9KzcsKWx-NuQgaVIFqpcB9tj3RYRX0Xft7pUO_x8w-bDoVn1G00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="345px" preserveAspectRatio="none" style="width:380px;height:345px;background:#FFFFFF;" version="1.1" viewBox="0 0 380 345" width="380px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="194" y="266"/><ellipse cx="236.9" cy="282" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M239.8688,287.6406 Q239.2906,287.9375 238.65,288.0781 Q238.0094,288.2344 237.3063,288.2344 Q234.8063,288.2344 233.4781,286.5938 Q232.1656,284.9375 232.1656,281.8125 Q232.1656,278.6875 233.4781,277.0313 Q234.8063,275.375 237.3063,275.375 Q238.0094,275.375 238.65,275.5313 Q239.3063,275.6875 239.8688,275.9844 L239.8688,278.7031 Q239.2438,278.125 238.65,277.8594 Q238.0563,277.5781 237.4313,277.5781 Q236.0875,277.5781 235.4,278.6563 Q234.7125,279.7188 234.7125,281.8125 Q234.7125,283.9063 235.4,284.9844 Q236.0875,286.0469 237.4313,286.0469 Q238.0563,286.0469 238.65,285.7813 Q239.2438,285.5 239.8688,284.9219 L239.8688,287.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="257.1" y="286.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="195" x2="355" y1="298" y2="298"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="200" y="314.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="200" y="331.292">lastName : string {O}</text></g><!--class CustomerId--><g id="elem_CustomerId"><rect codeLine="16" fill="#F1F1F1" height="80.8594" id="CustomerId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="34.5" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="34" y="155.9639">CustomerId</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="140" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="13" y="181.2607">id : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="197.5576">prefix : string {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="21" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="48" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="110" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="51" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="24" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="176.5" y="144.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="238" y="160.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="179.5" y="176.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired to CustomerId--><g id="link_GET /customer/expired_CustomerId"><path codeLine="27" d="M122.95,47.13 C114.61,66.97 103.6365,93.0394 93.0065,118.3094 " fill="none" id="GET /customer/expired-to-CustomerId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="90.68,123.84,97.8568,117.0951,92.6187,119.2312,90.4827,113.9931,90.68,123.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="111" y="90.0669">customerId</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="84.7801" y="112.953">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="29" d="M275,184.7 C275,205.71 275,233.87 275,259.83 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="275,265.83,279,256.83,275,260.83,271,256.83,275,265.83" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="267.3547" y="254.8027">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="31" d="M156.24,47.08 C167.47,55.87 180.68,66.63 192,77 C215.95,98.93 237.4985,121.8062 253.8285,139.8062 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="257.86,144.25,254.7753,134.8967,254.5004,140.5469,248.8503,140.272,257.86,144.25" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="209" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="243.9144" y="133.4935">1</text></g><!--SRC=[XP5BQyCm48Jl-XMBZeMyUYp1XuPGUab3M-XPo9j8n9R4hW8fnl-zyeFMJkhs9cOqy-rAnkO8w_LUHPDbe2tf0eNfn5Vau1tZZR5Nf4gCI5SEbY5-GdACptae7ImMIU6JTQ79WYuKCrJYKUdJaVpPvHjVUFeUvCEWYg8MZ15SOd5G6j-m2KTFuBn38ReIkJbpz2MIJ7q0LSkg4v8uxb8K7e0ZMNU4wgKUN4ZXN_pwflOvbrShZpWsdm84meEzJDK_RTzXeNl60Y_14lQazWKIv9_BSBzSol4tTQ6fxjai0xcIuzNIV23rZp0LxsXjnTsWGaxZvlCUzqTVIszEuWi0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/parameter-ref-ref.puml.svg b/src/docs/tests/parameter-ref-ref.puml.svg
index 39a2d66..8cd5c40 100644
--- a/src/docs/tests/parameter-ref-ref.puml.svg
+++ b/src/docs/tests/parameter-ref-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:339px;height:304px;background:#FFFFFF;" version="1.1" viewBox="0 0 339 304" width="339px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="153" y="225"/><ellipse cx="195.9" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M198.8688,246.6406 Q198.2906,246.9375 197.65,247.0781 Q197.0094,247.2344 196.3063,247.2344 Q193.8063,247.2344 192.4781,245.5938 Q191.1656,243.9375 191.1656,240.8125 Q191.1656,237.6875 192.4781,236.0313 Q193.8063,234.375 196.3063,234.375 Q197.0094,234.375 197.65,234.5313 Q198.3063,234.6875 198.8688,234.9844 L198.8688,237.7031 Q198.2438,237.125 197.65,236.8594 Q197.0563,236.5781 196.4313,236.5781 Q195.0875,236.5781 194.4,237.6563 Q193.7125,238.7188 193.7125,240.8125 Q193.7125,242.9063 194.4,243.9844 Q195.0875,245.0469 196.4313,245.0469 Q197.0563,245.0469 197.65,244.7813 Q198.2438,244.5 198.8688,243.9219 L198.8688,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="216.1" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="154" x2="314" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="159" y="273.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="159" y="290.292">lastName : string {O}</text></g><!--class CustomerId--><g id="elem_CustomerId"><rect codeLine="16" fill="#F1F1F1" height="40.2656" id="CustomerId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="86" x="14" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="17.5" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="17" y="155.9639">CustomerId</text></g><!--class Id--><g id="elem_Id"><rect codeLine="19" fill="#F1F1F1" height="64.5625" id="Id" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="229"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="17.5" y="245.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12" x="51" y="260.9639">Id</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="106" y1="269.2656" y2="269.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="13" y="286.2607">value : string</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="23" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="62" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="124" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="65" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="26" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="135.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="197" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="138.5" y="155.9639">GET /customer/expired 200</text></g><!--link CustomerId to Id--><g id="link_CustomerId_Id"><path codeLine="29" d="M57,164.07 C57,181.63 57,202.01 57,222.74 " fill="none" id="CustomerId-to-Id" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="57,228.74,61,219.74,57,223.74,53,219.74,57,228.74" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="48.2125" y="217.9368">1</text></g><!--link GET /customer/expired to CustomerId--><g id="link_GET /customer/expired_CustomerId"><path codeLine="31" d="M130.27,47.25 C114.03,68.48 91.6861,97.6749 75.4261,118.9249 " fill="none" id="GET /customer/expired-to-CustomerId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.78,123.69,80.4259,118.9731,74.8184,119.7191,74.0725,114.1117,71.78,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="108" y="90.0669">id</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="66.8119" y="112.9167">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="33" d="M234,164.07 C234,180.48 234,198.58 234,218.59 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="234,224.59,238,215.59,234,219.59,230,215.59,234,224.59" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="226.3984" y="214.0703">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="35" d="M159.9,47.25 C176.33,68.48 198.9386,97.6944 215.3786,118.9444 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="219.05,123.69,216.7066,114.124,215.9905,119.7353,210.3791,119.0192,219.05,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="195" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="205.7203" y="112.9167">1</text></g><!--SRC=[VP5BQyCm48Jl-XMBZeMyUYp1XuHGUab36-XPoDjOn9RChbnQZFzxvGUndJYvYPsT-OPLOcA4zVgWV195e0tf54NI3Z-GSsSPRuI38fMXHxfICClz7mGbSJ4FHzy6qp3Xix5vxGMTAcOenKRfyubSOUEjInrTYdmbgBpOE8gHnihHPSgxIZ1wiA45vqhZ9zQntX5OPr68Dbvk2_OkGvA1150sBQfGXjZlWnLUW3qPUuBolHei1FE4Njt4liNowXY1qwzDoZtbHwL5ZnZuNdT7MEYEiS3Vt11sKSq5Hf39PNXUBkNu0rlJgFfi5e5SoQPeaEvWBrj3QwWDqjotjGKQwzF0-W0pdtUO1taDjNw9Vm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="304px" preserveAspectRatio="none" style="width:339px;height:304px;background:#FFFFFF;" version="1.1" viewBox="0 0 339 304" width="339px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="153" y="225"/><ellipse cx="195.9" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M198.8688,246.6406 Q198.2906,246.9375 197.65,247.0781 Q197.0094,247.2344 196.3063,247.2344 Q193.8063,247.2344 192.4781,245.5938 Q191.1656,243.9375 191.1656,240.8125 Q191.1656,237.6875 192.4781,236.0313 Q193.8063,234.375 196.3063,234.375 Q197.0094,234.375 197.65,234.5313 Q198.3063,234.6875 198.8688,234.9844 L198.8688,237.7031 Q198.2438,237.125 197.65,236.8594 Q197.0563,236.5781 196.4313,236.5781 Q195.0875,236.5781 194.4,237.6563 Q193.7125,238.7188 193.7125,240.8125 Q193.7125,242.9063 194.4,243.9844 Q195.0875,245.0469 196.4313,245.0469 Q197.0563,245.0469 197.65,244.7813 Q198.2438,244.5 198.8688,243.9219 L198.8688,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="216.1" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="154" x2="314" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="159" y="273.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="159" y="290.292">lastName : string {O}</text></g><!--class CustomerId--><g id="elem_CustomerId"><rect codeLine="16" fill="#F1F1F1" height="40.2656" id="CustomerId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="86" x="14" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="17.5" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="17" y="155.9639">CustomerId</text></g><!--class Id--><g id="elem_Id"><rect codeLine="19" fill="#F1F1F1" height="64.5625" id="Id" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="229"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="17.5" y="245.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="12" x="51" y="260.9639">Id</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="106" y1="269.2656" y2="269.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="13" y="286.2607">value : string</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="23" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="62" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="124" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="65" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="26" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="135.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="197" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="138.5" y="155.9639">GET /customer/expired 200</text></g><!--link CustomerId to Id--><g id="link_CustomerId_Id"><path codeLine="29" d="M57,164.07 C57,181.63 57,202.01 57,222.74 " fill="none" id="CustomerId-to-Id" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="57,228.74,61,219.74,57,223.74,53,219.74,57,228.74" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="48.2125" y="217.9368">1</text></g><!--link GET /customer/expired to CustomerId--><g id="link_GET /customer/expired_CustomerId"><path codeLine="31" d="M130.27,47.25 C114.03,68.48 91.6861,97.6749 75.4261,118.9249 " fill="none" id="GET /customer/expired-to-CustomerId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.78,123.69,80.4259,118.9731,74.8184,119.7191,74.0725,114.1117,71.78,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="11" x="108" y="90.0669">id</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="66.8119" y="112.9167">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="33" d="M234,164.07 C234,180.48 234,198.58 234,218.59 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="234,224.59,238,215.59,234,219.59,230,215.59,234,224.59" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="226.3984" y="214.0703">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="35" d="M159.9,47.25 C176.33,68.48 198.9386,97.6944 215.3786,118.9444 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="219.05,123.69,216.7066,114.124,215.9905,119.7353,210.3791,119.0192,219.05,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="195" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="205.7203" y="112.9167">1</text></g><!--SRC=[VP7BQiCm44Nt-ef1oq8UxR84Bnf2wQODRQ5h8KyZ4Lio6hcq6FzxPTd4Sk9aP-REcNDjAvqZR3PxuLMMWTHE5iXKFtn7ggmXl0ZsmeaIFRgp1ClA_q58bCqf7NrhBCA4ZjfK7Gko44JGi2SXZmTdQvDlRM7TgSYNGk5PomWzcE2YIaZym0xsre6n1XdhZ_1jJTwMw7Yu1z14LnkKZlnhGE4Ho3jj3j2yjSb2W6VozkBiIyxFNZbunhNPUBJyYA8U5GdtlFk4bHmSA_ojjCFXLFm24ydiCZoirtpwctfeKdsno83VyrWqH5UqfwqK3RM1w-jONo2YTmbwGxDS3feRzwArUsB_]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/parameter-ref.puml.svg b/src/docs/tests/parameter-ref.puml.svg
index 25c9939..51d20d4 100644
--- a/src/docs/tests/parameter-ref.puml.svg
+++ b/src/docs/tests/parameter-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="329px" preserveAspectRatio="none" style="width:346px;height:329px;background:#FFFFFF;" version="1.1" viewBox="0 0 346 329" width="346px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="160" y="250"/><ellipse cx="202.9" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M205.8688,271.6406 Q205.2906,271.9375 204.65,272.0781 Q204.0094,272.2344 203.3063,272.2344 Q200.8063,272.2344 199.4781,270.5938 Q198.1656,268.9375 198.1656,265.8125 Q198.1656,262.6875 199.4781,261.0313 Q200.8063,259.375 203.3063,259.375 Q204.0094,259.375 204.65,259.5313 Q205.3063,259.6875 205.8688,259.9844 L205.8688,262.7031 Q205.2438,262.125 204.65,261.8594 Q204.0563,261.5781 203.4313,261.5781 Q202.0875,261.5781 201.4,262.6563 Q200.7125,263.7188 200.7125,265.8125 Q200.7125,267.9063 201.4,268.9844 Q202.0875,270.0469 203.4313,270.0469 Q204.0563,270.0469 204.65,269.7813 Q205.2438,269.5 205.8688,268.9219 L205.8688,271.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="223.1" y="270.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="161" x2="321" y1="282" y2="282"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="166" y="298.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="166" y="315.292">lastName : string {O}</text></g><!--class CustomerId--><g id="elem_CustomerId"><rect codeLine="16" fill="#F1F1F1" height="64.5625" id="CustomerId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="17.5" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="17" y="155.9639">CustomerId</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="106" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="13" y="181.2607">value : string</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="20" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="31" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="93" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="34" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="23" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="142.5" y="136.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="204" y="152.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="145.5" y="168.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired to CustomerId--><g id="link_GET /customer/expired_CustomerId"><path codeLine="26" d="M103.64,47.37 C98.99,56.3 93.53,67.1 89,77 C82.01,92.25 77.1143,103.9136 71.3843,118.3436 " fill="none" id="GET /customer/expired-to-CustomerId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="69.17,123.92,76.2091,117.0316,71.0153,119.273,68.7739,114.0791,69.17,123.92" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="90" y="90.0669">customerId</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="62.8551" y="112.7792">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="28" d="M241,176.66 C241,195.98 241,220.25 241,243.97 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="241,249.97,245,240.97,241,244.97,237,240.97,241,249.97" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="233.3547" y="238.9686">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="30" d="M135.46,47.22 C145.23,56.13 156.85,66.95 167,77 C186.96,96.77 204.8866,115.8962 219.6566,132.0162 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="223.71,136.44,220.5792,127.102,220.3322,132.7535,214.6807,132.5065,223.71,136.44" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="184" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="209.4561" y="125.3916">1</text></g><!--SRC=[XP5BJyCm48Jl_XKh7v7wW2EgScY541Uee19doraQguatsdKGACf_ntc89YsbDsjdvvkndRaKORNQcf0b2LZ7DaULzSDNb9Ayu9cmDMmA3CWd2XPb-8QeP9JAUFJXC8yJEJXVjbwmkH61MgsDFUoPAfzkA2V-BVAUeGbgJPmYJvKT5IPGemG3-DX2IcFn3Lji80PF7fNgyNfJIQ02MSSaWBfhqSGoBE4vMk4U9B3pUwXVcj52DF-XDsVOfrIVFCOavzFarP4nyZy-x61X1yW2lqh7EA2wAqRAbMMuMoxrz8TwqoNsR9Q0ljNJxh4RQ7iSNBBtQHtYPeJGb-Fcyo7k7rwNtfxK3m00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="329px" preserveAspectRatio="none" style="width:346px;height:329px;background:#FFFFFF;" version="1.1" viewBox="0 0 346 329" width="346px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="162" x="160" y="250"/><ellipse cx="202.9" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M205.8688,271.6406 Q205.2906,271.9375 204.65,272.0781 Q204.0094,272.2344 203.3063,272.2344 Q200.8063,272.2344 199.4781,270.5938 Q198.1656,268.9375 198.1656,265.8125 Q198.1656,262.6875 199.4781,261.0313 Q200.8063,259.375 203.3063,259.375 Q204.0094,259.375 204.65,259.5313 Q205.3063,259.6875 205.8688,259.9844 L205.8688,262.7031 Q205.2438,262.125 204.65,261.8594 Q204.0563,261.5781 203.4313,261.5781 Q202.0875,261.5781 201.4,262.6563 Q200.7125,263.7188 200.7125,265.8125 Q200.7125,267.9063 201.4,268.9844 Q202.0875,270.0469 203.4313,270.0469 Q204.0563,270.0469 204.65,269.7813 Q205.2438,269.5 205.8688,268.9219 L205.8688,271.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="223.1" y="270.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="161" x2="321" y1="282" y2="282"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="150" x="166" y="298.9951">firstName : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="149" x="166" y="315.292">lastName : string {O}</text></g><!--class CustomerId--><g id="elem_CustomerId"><rect codeLine="16" fill="#F1F1F1" height="64.5625" id="CustomerId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="100" x="7" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="17.5" y="140.1387">«Parameter»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="80" x="17" y="155.9639">CustomerId</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="106" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="13" y="181.2607">value : string</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="20" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="31" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="93" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="34" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="23" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="142.5" y="136.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="204" y="152.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="145.5" y="168.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired to CustomerId--><g id="link_GET /customer/expired_CustomerId"><path codeLine="26" d="M103.64,47.37 C98.99,56.3 93.53,67.1 89,77 C82.01,92.25 77.1143,103.9136 71.3843,118.3436 " fill="none" id="GET /customer/expired-to-CustomerId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="69.17,123.92,76.2091,117.0316,71.0153,119.273,68.7739,114.0791,69.17,123.92" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="72" x="90" y="90.0669">customerId</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="62.8551" y="112.7792">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="28" d="M241,176.66 C241,195.98 241,220.25 241,243.97 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="241,249.97,245,240.97,241,244.97,237,240.97,241,249.97" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="233.3547" y="238.9686">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="30" d="M135.46,47.22 C145.23,56.13 156.85,66.95 167,77 C186.96,96.77 204.8866,115.8962 219.6566,132.0162 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="223.71,136.44,220.5792,127.102,220.3322,132.7535,214.6807,132.5065,223.71,136.44" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="184" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="209.4561" y="125.3916">1</text></g><!--SRC=[XP7DIyGm4CNl-Ik678NzqACiFRY8UD551SyX7RTXqoJCfAAK_k-c7xZjhdLluRrvlpT32fCZR3Ox5Oii0sr8MnH5BxuW1-yOpuoT8bLYH3fni0pn6v9J-9p7qeT1cnG-61VQB6YhcA4MTqeVzkGhbs-zzVIxo7k1Aef6C4PmgOk3qlYARJXw0kST2j53vBRYw4iacNW0TTVLf4hY-9IYS0iSoRWzrC_DQ225__2RC-nZBazEdlHyAbiT6QFym_qRhFG0MU5NC8G3gZinKIuCmyrwBQV_q8Vcs8j51l9QJdTFku7KHs4kthTrYAiHGixNBPT3tJ-yhhrzYHy0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/path-returns-non-ref.puml.svg b/src/docs/tests/path-returns-non-ref.puml.svg
index f8dff68..b71d665 100644
--- a/src/docs/tests/path-returns-non-ref.puml.svg
+++ b/src/docs/tests/path-returns-non-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:258px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 434" width="258px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="225"/><ellipse cx="90.75" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,246.6406 Q93.1406,246.9375 92.5,247.0781 Q91.8594,247.2344 91.1563,247.2344 Q88.6563,247.2344 87.3281,245.5938 Q86.0156,243.9375 86.0156,240.8125 Q86.0156,237.6875 87.3281,236.0313 Q88.6563,234.375 91.1563,234.375 Q91.8594,234.375 92.5,234.5313 Q93.1563,234.6875 93.7188,234.9844 L93.7188,237.7031 Q93.0938,237.125 92.5,236.8594 Q91.9063,236.5781 91.2813,236.5781 Q89.9375,236.5781 89.25,237.6563 Q88.5625,238.7188 88.5625,240.8125 Q88.5625,242.9063 89.25,243.9844 Q89.9375,245.0469 91.2813,245.0469 Q91.9063,245.0469 92.5,244.7813 Q93.0938,244.5 93.7188,243.9219 L93.7188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="420.667">picture : byte[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="24" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="46" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="108" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="49" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="30.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="33.5" y="155.9639">GET /customer/expired 200</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="30" d="M129,164.32 C129,179.41 129,195.66 129,218.84 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,224.84,133,215.84,129,219.84,125,215.84,129,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.743" y="213.8965">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="32" d="M129,47.25 C129,68.48 129,96.44 129,117.69 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="129,123.69,133,114.69,129,118.69,125,114.69,129,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="130" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.875" y="112.9167">1</text></g><!--SRC=[XPBBRi8m44Nt-OgHbvLujCiAiG1LNHLGGUgYwi8uGpmYiQFn11KX_hrEG3o2eAiuSy_SEtvOIX46WvaMEno28JOv9lPG_CHGUXVmHfXfrWKASal1efGjHCNwD5oMLeHvh8GrkRBk1PFh462NZBHPP-mhbuvzxlaqo9T5BSd8SufyhInyeSNlau02BauHIcrmZhMjU0Rd7IR9mLwDgo2-G5On2M3NJB6Fmt2GIMo5LmZ2vB8BCJRUrInIPkK3XJ54FKL3XSvXDzrVGAaMdAv6n69h9lwrtESO0dcte2P4uYU8BigMZQkA9V9qDRQKfumkekG4C-GMg7FQr4PBxtFKhcr3PjsSqca_tpyjPAKtlc8Id3IHuPnqWvPafE8cRIjubFUdutv_Mq3F7C-yXxybCQRg_BhYBVm3mqk_hwvVtg7f4Txf344zgOlhliShw7OZ-wmUniVjWQfNoHy0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:258px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 434" width="258px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="225"/><ellipse cx="90.75" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,246.6406 Q93.1406,246.9375 92.5,247.0781 Q91.8594,247.2344 91.1563,247.2344 Q88.6563,247.2344 87.3281,245.5938 Q86.0156,243.9375 86.0156,240.8125 Q86.0156,237.6875 87.3281,236.0313 Q88.6563,234.375 91.1563,234.375 Q91.8594,234.375 92.5,234.5313 Q93.1563,234.6875 93.7188,234.9844 L93.7188,237.7031 Q93.0938,237.125 92.5,236.8594 Q91.9063,236.5781 91.2813,236.5781 Q89.9375,236.5781 89.25,237.6563 Q88.5625,238.7188 88.5625,240.8125 Q88.5625,242.9063 89.25,243.9844 Q89.9375,245.0469 91.2813,245.0469 Q91.9063,245.0469 92.5,244.7813 Q93.0938,244.5 93.7188,243.9219 L93.7188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="420.667">picture : byte[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="24" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="46" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="108" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="49" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="30.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="33.5" y="155.9639">GET /customer/expired 200</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="30" d="M129,164.32 C129,179.41 129,195.66 129,218.84 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,224.84,133,215.84,129,219.84,125,215.84,129,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.743" y="213.8965">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="32" d="M129,47.25 C129,68.48 129,96.44 129,117.69 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="129,123.69,133,114.69,129,118.69,125,114.69,129,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="130" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.875" y="112.9167">1</text></g><!--SRC=[XP9FRy8m3CNl_HHMZfFuinqdn04qxJH00sc7QOUGkiIYJIh7HKEettrfGOmLmKvf_7v-ht5YAKKOZHPQx7WCXjZacDXZyHr3wLt0As6XMHSeo1q5YrBs41Nhqt1PoWZpM0bRScNJ2oRN8S0XcMYptR2lN3hrkUVpZtnOr9BKIK015xD2gGqkiMaMp-2ymoGvcgXf5SGNo2hw0HpQh3f6Sf1PR8Ld2CBaDXTYRBofMQIDbJSKnX3r50qLEeV3lBw0KYqupoR4OXicxZhkImo1l5jH6o9n2QABicFZgcADFC-cblAKqKMKdE06kGFgd7QDqThx7BNhsf3PjbCwd-VpguDaUkSh9i5P6nb-awxGaenKtARj1KzoVHxtwyiA1kOqym5-byIOgjyt56_X7nYUXaFrztqTc-xXlTuOr8EwkEvRl89-FxAFwcvyF1wevYlv0G00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/path-returns-ref-ref.puml.svg b/src/docs/tests/path-returns-ref-ref.puml.svg
index 5599c93..949db4d 100644
--- a/src/docs/tests/path-returns-ref-ref.puml.svg
+++ b/src/docs/tests/path-returns-ref-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:336px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 336 434" width="336px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="55" y="128"/><ellipse cx="70" cy="144" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M72.9688,149.6406 Q72.3906,149.9375 71.75,150.0781 Q71.1094,150.2344 70.4063,150.2344 Q67.9063,150.2344 66.5781,148.5938 Q65.2656,146.9375 65.2656,143.8125 Q65.2656,140.6875 66.5781,139.0313 Q67.9063,137.375 70.4063,137.375 Q71.1094,137.375 71.75,137.5313 Q72.4063,137.6875 72.9688,137.9844 L72.9688,140.7031 Q72.3438,140.125 71.75,139.8594 Q71.1563,139.5781 70.5313,139.5781 Q69.1875,139.5781 68.5,140.6563 Q67.8125,141.7188 67.8125,143.8125 Q67.8125,145.9063 68.5,146.9844 Q69.1875,148.0469 70.5313,148.0469 Q71.1563,148.0469 71.75,147.7813 Q72.3438,147.5 72.9688,146.9219 L72.9688,149.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="84" y="148.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="225"/><ellipse cx="90.75" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,246.6406 Q93.1406,246.9375 92.5,247.0781 Q91.8594,247.2344 91.1563,247.2344 Q88.6563,247.2344 87.3281,245.5938 Q86.0156,243.9375 86.0156,240.8125 Q86.0156,237.6875 87.3281,236.0313 Q88.6563,234.375 91.1563,234.375 Q91.8594,234.375 92.5,234.5313 Q93.1563,234.6875 93.7188,234.9844 L93.7188,237.7031 Q93.0938,237.125 92.5,236.8594 Q91.9063,236.5781 91.2813,236.5781 Q89.9375,236.5781 89.25,237.6563 Q88.5625,238.7188 88.5625,240.8125 Q88.5625,242.9063 89.25,243.9844 Q89.9375,245.0469 91.2813,245.0469 Q91.9063,245.0469 92.5,244.7813 Q93.0938,244.5 93.7188,243.9219 L93.7188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="420.667">picture : byte[] {O}</text></g><!--class Customers.1--><g id="elem_Customers.1"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="Customers.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="198.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="209" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="201.5" y="155.9639">Customers.1</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="30" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="163" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="225" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="166" y="38.9639">GET /customer/expired</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="33" d="M110.67,160.08 C112.33,175.08 114.3807,193.5063 117.2007,219.0163 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="117.86,224.98,120.8469,215.595,117.3106,220.0103,112.8953,216.474,117.86,224.98" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="109.7849" y="214.0468">*</text></g><!--link Customers.1 to Customer--><g id="link_Customers.1_Customer"><path codeLine="35" d="M233.48,164.32 C223.69,179.41 212.5327,196.6247 197.5127,219.8047 " fill="none" id="Customers.1-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="194.25,224.84,202.501,219.4622,196.969,220.6439,195.7872,215.1119,194.25,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="191.7848" y="213.8965">*</text></g><!--link GET /customer/expired to Customers.1--><g id="link_GET /customer/expired_Customers.1"><path codeLine="37" d="M246,47.25 C246,68.48 246,96.44 246,117.69 " fill="none" id="GET /customer/expired-to-Customers.1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="246,123.69,250,114.69,246,118.69,242,114.69,246,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="247" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="236.875" y="112.9167">1</text></g><!--SRC=[TL91Ri8m4Bpd5PQFbQ3GOuKuWAgU2gWWzL3rO9mDNf7OqUu65I7-NYSW2A6SBC-CPyPUEqn1ZKOB8suyLXR9vf2u4_W9N0RFS4Si39a21AZ3G57ANaN6XPJRK8QGHuItwClwhBAvOLQ7P6BiTaEXykaqv84kHRuS64acWLAWMsOL2YFXc328yh45byR24cfR2QHyy90a9tizhLX20SGwHXtlu1fLwj2KEyQEn3ABZkfLiH3wJOkC1nzo3d3Zv0E4W2EVWiN2vEemFxP4gH6OPnCaSRKcxZhkIs36u5VOX4XSM4nHTcnyLQo1vjdKOPuI-2X5Bx01wWXDZhlQQ1r23iPtRT1kcyUxtEVxfoF9p2vKX0Ap9fAlINVI4grKrAJj1Sxq_NDpVwXlVzNDLDxVLkhPdhNFy5iYGQglV_CaRi-qrnih_QHR0stpTTg_YWT1_NxK3dMdRxoKqY-3WKx-0000]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:336px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 336 434" width="336px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="55" y="128"/><ellipse cx="70" cy="144" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M72.9688,149.6406 Q72.3906,149.9375 71.75,150.0781 Q71.1094,150.2344 70.4063,150.2344 Q67.9063,150.2344 66.5781,148.5938 Q65.2656,146.9375 65.2656,143.8125 Q65.2656,140.6875 66.5781,139.0313 Q67.9063,137.375 70.4063,137.375 Q71.1094,137.375 71.75,137.5313 Q72.4063,137.6875 72.9688,137.9844 L72.9688,140.7031 Q72.3438,140.125 71.75,139.8594 Q71.1563,139.5781 70.5313,139.5781 Q69.1875,139.5781 68.5,140.6563 Q67.8125,141.7188 67.8125,143.8125 Q67.8125,145.9063 68.5,146.9844 Q69.1875,148.0469 70.5313,148.0469 Q71.1563,148.0469 71.75,147.7813 Q72.3438,147.5 72.9688,146.9219 L72.9688,149.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="84" y="148.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="225"/><ellipse cx="90.75" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,246.6406 Q93.1406,246.9375 92.5,247.0781 Q91.8594,247.2344 91.1563,247.2344 Q88.6563,247.2344 87.3281,245.5938 Q86.0156,243.9375 86.0156,240.8125 Q86.0156,237.6875 87.3281,236.0313 Q88.6563,234.375 91.1563,234.375 Q91.8594,234.375 92.5,234.5313 Q93.1563,234.6875 93.7188,234.9844 L93.7188,237.7031 Q93.0938,237.125 92.5,236.8594 Q91.9063,236.5781 91.2813,236.5781 Q89.9375,236.5781 89.25,237.6563 Q88.5625,238.7188 88.5625,240.8125 Q88.5625,242.9063 89.25,243.9844 Q89.9375,245.0469 91.2813,245.0469 Q91.9063,245.0469 92.5,244.7813 Q93.0938,244.5 93.7188,243.9219 L93.7188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="420.667">picture : byte[] {O}</text></g><!--class Customers.1--><g id="elem_Customers.1"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="Customers.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="198.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="209" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="201.5" y="155.9639">Customers.1</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="30" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="163" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="225" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="166" y="38.9639">GET /customer/expired</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="33" d="M110.67,160.08 C112.33,175.08 114.3807,193.5063 117.2007,219.0163 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="117.86,224.98,120.8469,215.595,117.3106,220.0103,112.8953,216.474,117.86,224.98" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="109.7849" y="214.0468">*</text></g><!--link Customers.1 to Customer--><g id="link_Customers.1_Customer"><path codeLine="35" d="M233.48,164.32 C223.69,179.41 212.5327,196.6247 197.5127,219.8047 " fill="none" id="Customers.1-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="194.25,224.84,202.501,219.4622,196.969,220.6439,195.7872,215.1119,194.25,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="191.7848" y="213.8965">*</text></g><!--link GET /customer/expired to Customers.1--><g id="link_GET /customer/expired_Customers.1"><path codeLine="37" d="M246,47.25 C246,68.48 246,96.44 246,117.69 " fill="none" id="GET /customer/expired-to-Customers.1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="246,123.69,250,114.69,246,118.69,242,114.69,246,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="247" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="236.875" y="112.9167">1</text></g><!--SRC=[TP9FRy8m3CNl_HHHZfFuj-E4E82cdGPe8EqmxH1IbrYqIMMxQ0ZntPSMn4ePfwf-Fx_dn76OWXgFbqRSPA8iaiqXSUVY1t0PFCETi3Ha2X2WZW95AGSL5HTIRfSoX3nMU8U-h7kLpGspEYPJOtTR2fLFPo4FT1taqu6Hv9GmYF8nYqjZOGLrimHIFdX8ahE9dbKieG1Y7GrFT-MwgjIn6U4K9o6MUNHKBug5q6zROcnyg3d0hPDt40AEUWeM2vEhu-BKWb8ZiCYcIE9g9lvrt5V0ZC6liGcH-64nHTcnyLMn0LfaCuTvIk0ZYbvW2zG1JOxxscWJGWx6TstGxfhBkvxdwxk3P6OVAaA1UHF9VqbtQ8bMAchI3W8N-VwwkJ_Ijs_dPYjlhsiri1Ts03yb4gJwxmMUuVPEUxs9qa-wjT2sNgVzIpm8wlSZEzATUUEXb7uU3dNo2m00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/path-returns-ref-ref2.puml.svg b/src/docs/tests/path-returns-ref-ref2.puml.svg
index 843bb8f..d65c26f 100644
--- a/src/docs/tests/path-returns-ref-ref2.puml.svg
+++ b/src/docs/tests/path-returns-ref-ref2.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="527px" preserveAspectRatio="none" style="width:258px;height:527px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 527" width="258px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="75" y="225"/><ellipse cx="90" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M92.9688,246.6406 Q92.3906,246.9375 91.75,247.0781 Q91.1094,247.2344 90.4063,247.2344 Q87.9063,247.2344 86.5781,245.5938 Q85.2656,243.9375 85.2656,240.8125 Q85.2656,237.6875 86.5781,236.0313 Q87.9063,234.375 90.4063,234.375 Q91.1094,234.375 91.75,234.5313 Q92.4063,234.6875 92.9688,234.9844 L92.9688,237.7031 Q92.3438,237.125 91.75,236.8594 Q91.1563,236.5781 90.5313,236.5781 Q89.1875,236.5781 88.5,237.6563 Q87.8125,238.7188 87.8125,240.8125 Q87.8125,242.9063 88.5,243.9844 Q89.1875,245.0469 90.5313,245.0469 Q91.1563,245.0469 91.75,244.7813 Q92.3438,244.5 92.9688,243.9219 L92.9688,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="104" y="245.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="318"/><ellipse cx="90.75" cy="334" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,339.6406 Q93.1406,339.9375 92.5,340.0781 Q91.8594,340.2344 91.1563,340.2344 Q88.6563,340.2344 87.3281,338.5938 Q86.0156,336.9375 86.0156,333.8125 Q86.0156,330.6875 87.3281,329.0313 Q88.6563,327.375 91.1563,327.375 Q91.8594,327.375 92.5,327.5313 Q93.1563,327.6875 93.7188,327.9844 L93.7188,330.7031 Q93.0938,330.125 92.5,329.8594 Q91.9063,329.5781 91.2813,329.5781 Q89.9375,329.5781 89.25,330.6563 Q88.5625,331.7188 88.5625,333.8125 Q88.5625,335.9063 89.25,336.9844 Q89.9375,338.0469 91.2813,338.0469 Q91.9063,338.0469 92.5,337.7813 Q93.0938,337.5 93.7188,336.9219 L93.7188,339.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="338.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="350" y2="350"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="366.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="383.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="399.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="415.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="432.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="448.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="464.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="481.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="497.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="513.667">picture : byte[] {O}</text></g><!--class Customers.1--><g id="elem_Customers.1"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="Customers.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="81.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="84.5" y="155.9639">Customers.1</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="30" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="46" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="108" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="49" y="38.9639">GET /customer/expired</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="33" d="M129,257.05 C129,271.22 129,287.78 129,311.6 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,317.6,133,308.6,129,312.6,125,308.6,129,317.6" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.7539" y="306.9805">*</text></g><!--link Customers.1 to Customers--><g id="link_Customers.1_Customers"><path codeLine="35" d="M129,164.22 C129,182.12 129,202.42 129,218.86 " fill="none" id="Customers.1-to-Customers" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,224.86,133,215.86,129,219.86,125,215.86,129,224.86" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.625" y="213.8235">1</text></g><!--link GET /customer/expired to Customers.1--><g id="link_GET /customer/expired_Customers.1"><path codeLine="37" d="M129,47.25 C129,68.48 129,96.44 129,117.69 " fill="none" id="GET /customer/expired-to-Customers.1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="129,123.69,133,114.69,129,118.69,125,114.69,129,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="130" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.875" y="112.9167">1</text></g><!--SRC=[TP9FRy8m3CNl_HHHZfFuj-E4E82cdGPe8EqmxH1IbrYqIMMxQ0ZntPSM1AM8KrM_NzvpOZjCGOt7IoDkCb4MoUQGk7Fn2xWCdk51M1eo1GXGHu6Yb8EAYWifjqiPGXuhl4DVrcULpGspEYPJOtTR2fLFPo4FT6tasu6HP1ee1RfNrg4m4au9WoWVk-3IM5X1RIk1b0yUakHihsSLIoY0MCUeqqEvhYfrR9exnHw9PHuTrPjY8VJRbXWFFjKSuDR99mW1Hpq5YuN9rN5nQa6f4LXaKoHnDHF_EkuhOCRWrzY4IFomcABisFYgs00jifd3F2Nm4KKli0NgW2R7VMsq2I47uxisQ7VDurtly_FRGJAp3nMXmBo9v5lI0rgYbOgQj8F0HNvyRkwFzFrMtKtbutsj1lR23k2lH89KttRp3BTdskjDb7xHhO6szJgj8KQwlGaHUPBKxtVXsYBUIkdNuL0d_m00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="527px" preserveAspectRatio="none" style="width:258px;height:527px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 527" width="258px" zoomAndPan="magnify"><defs/><g><!--class Customers--><g id="elem_Customers"><rect codeLine="11" fill="#F1F1F1" height="32" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="108" x="75" y="225"/><ellipse cx="90" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M92.9688,246.6406 Q92.3906,246.9375 91.75,247.0781 Q91.1094,247.2344 90.4063,247.2344 Q87.9063,247.2344 86.5781,245.5938 Q85.2656,243.9375 85.2656,240.8125 Q85.2656,237.6875 86.5781,236.0313 Q87.9063,234.375 90.4063,234.375 Q91.1094,234.375 91.75,234.5313 Q92.4063,234.6875 92.9688,234.9844 L92.9688,237.7031 Q92.3438,237.125 91.75,236.8594 Q91.1563,236.5781 90.5313,236.5781 Q89.1875,236.5781 88.5,237.6563 Q87.8125,238.7188 87.8125,240.8125 Q87.8125,242.9063 88.5,243.9844 Q89.1875,245.0469 90.5313,245.0469 Q91.1563,245.0469 91.75,244.7813 Q92.3438,244.5 92.9688,243.9219 L92.9688,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="104" y="245.8467">Customers</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="14" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="318"/><ellipse cx="90.75" cy="334" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,339.6406 Q93.1406,339.9375 92.5,340.0781 Q91.8594,340.2344 91.1563,340.2344 Q88.6563,340.2344 87.3281,338.5938 Q86.0156,336.9375 86.0156,333.8125 Q86.0156,330.6875 87.3281,329.0313 Q88.6563,327.375 91.1563,327.375 Q91.8594,327.375 92.5,327.5313 Q93.1563,327.6875 93.7188,327.9844 L93.7188,330.7031 Q93.0938,330.125 92.5,329.8594 Q91.9063,329.5781 91.2813,329.5781 Q89.9375,329.5781 89.25,330.6563 Q88.5625,331.7188 88.5625,333.8125 Q88.5625,335.9063 89.25,336.9844 Q89.9375,338.0469 91.2813,338.0469 Q91.9063,338.0469 92.5,337.7813 Q93.0938,337.5 93.7188,336.9219 L93.7188,339.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="338.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="350" y2="350"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="366.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="383.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="399.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="415.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="432.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="448.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="464.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="481.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="497.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="513.667">picture : byte[] {O}</text></g><!--class Customers.1--><g id="elem_Customers.1"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="Customers.1" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="95" x="81.5" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="84.5" y="155.9639">Customers.1</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="30" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="46" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="108" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="49" y="38.9639">GET /customer/expired</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="33" d="M129,257.05 C129,271.22 129,287.78 129,311.6 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,317.6,133,308.6,129,312.6,125,308.6,129,317.6" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.7539" y="306.9805">*</text></g><!--link Customers.1 to Customers--><g id="link_Customers.1_Customers"><path codeLine="35" d="M129,164.22 C129,182.12 129,202.42 129,218.86 " fill="none" id="Customers.1-to-Customers" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,224.86,133,215.86,129,219.86,125,215.86,129,224.86" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.625" y="213.8235">1</text></g><!--link GET /customer/expired to Customers.1--><g id="link_GET /customer/expired_Customers.1"><path codeLine="37" d="M129,47.25 C129,68.48 129,96.44 129,117.69 " fill="none" id="GET /customer/expired-to-Customers.1" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="129,123.69,133,114.69,129,118.69,125,114.69,129,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="130" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.875" y="112.9167">1</text></g><!--SRC=[TP9FRy8m3CNl_HHHZfFuj-E4E82cdGPe8EqmxH1IbrYqIMMxQ0ZntPSM1AM8KrM_NzvpOZjCGOt7IoDkCb4MoUQGk7Fn2xWCdk51M1eo1GXGHu6Yb8EAYWifjqiPGXuhl4DVrcULpGspEYPJOtTR2fLFPo4FT6tasu6Hv9GmYF8nYqjZOGNrOGcaVF2G96SJFQjOGW74EXgU7ifrLQbZqy8fTa8iy-YetXGBeT-sn7ZmgUO0jqu-GGWuwYbOB4okZejJ2qgDm2AR8echcVZNSLy1CmQ_nYP4ueV556N7nbV51cYHpHpcAO6FA7g1BL07D3dkQwDD23aOtxL1ksiUxtgVdzyEafbzg0W5vaqatv8Uq1AjLDIa7GGkykDpSt-axtVdRYeVxsiri1Ts07yb4gJwje5dk3tJNc-Yz8jk3RIjrsaDCTBjJOZ8awH-lmlN5l5MIhyEXphv1m00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/path-returns-ref.puml.svg b/src/docs/tests/path-returns-ref.puml.svg
index 3cc5890..913ff5b 100644
--- a/src/docs/tests/path-returns-ref.puml.svg
+++ b/src/docs/tests/path-returns-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:258px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 434" width="258px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="225"/><ellipse cx="90.75" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,246.6406 Q93.1406,246.9375 92.5,247.0781 Q91.8594,247.2344 91.1563,247.2344 Q88.6563,247.2344 87.3281,245.5938 Q86.0156,243.9375 86.0156,240.8125 Q86.0156,237.6875 87.3281,236.0313 Q88.6563,234.375 91.1563,234.375 Q91.8594,234.375 92.5,234.5313 Q93.1563,234.6875 93.7188,234.9844 L93.7188,237.7031 Q93.0938,237.125 92.5,236.8594 Q91.9063,236.5781 91.2813,236.5781 Q89.9375,236.5781 89.25,237.6563 Q88.5625,238.7188 88.5625,240.8125 Q88.5625,242.9063 89.25,243.9844 Q89.9375,245.0469 91.2813,245.0469 Q91.9063,245.0469 92.5,244.7813 Q93.0938,244.5 93.7188,243.9219 L93.7188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="420.667">picture : byte[] {O}</text></g><!--class Customers--><g id="elem_Customers"><rect codeLine="24" fill="#F1F1F1" height="40.2656" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="88" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="91" y="155.9639">Customers</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="27" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="46" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="108" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="49" y="38.9639">GET /customer/expired</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="30" d="M129,164.32 C129,179.41 129,195.66 129,218.84 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,224.84,133,215.84,129,219.84,125,215.84,129,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.743" y="213.8965">*</text></g><!--link GET /customer/expired to Customers--><g id="link_GET /customer/expired_Customers"><path codeLine="32" d="M129,47.25 C129,68.48 129,96.44 129,117.69 " fill="none" id="GET /customer/expired-to-Customers" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="129,123.69,133,114.69,129,118.69,125,114.69,129,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="130" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.875" y="112.9167">1</text></g><!--SRC=[TP91Ry8m38Nl_HLHZfDWRCS9SG1DEmtGGDfXsY6aRcFH9fNjeY7K_xvG49GYJb7zFZ-_Ed6OWXgFbqRSPA8iaYqWSQVY5t0LFCETi3HaIX2WdW9b9NiL5HTIxfOoX29MU8k-ElOgMnXcTKYcncvp2hLFPw48T0doxS18CWsK0jqgwr0Q2Kt28Ch755mP2oiusaeWvOE793dPwrdD4aeW7ISfTMXJD34CiSnZgtfJB8G-xuYnyQ7c07Cddo047FKKB9QcK8T5qu5I8x38faZYZapywhclW1c3NsCxHEB1OiggP-FhSWEqo6OEYvJ0HnIzG0xK0qs1kwFH9eG2ZE_ReDssMxhypyzl3ydCBjI40lDs95ydtQ4LMgcfdRONEClDtRfPtpwUkFqhzF6-Li_sJ3x3NuK4gRu-mHFSzHeC9ae_wSvrHls1pN0OsHTzaoN6LVfrDDB9Fm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:258px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 258 434" width="258px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="225"/><ellipse cx="90.75" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,246.6406 Q93.1406,246.9375 92.5,247.0781 Q91.8594,247.2344 91.1563,247.2344 Q88.6563,247.2344 87.3281,245.5938 Q86.0156,243.9375 86.0156,240.8125 Q86.0156,237.6875 87.3281,236.0313 Q88.6563,234.375 91.1563,234.375 Q91.8594,234.375 92.5,234.5313 Q93.1563,234.6875 93.7188,234.9844 L93.7188,237.7031 Q93.0938,237.125 92.5,236.8594 Q91.9063,236.5781 91.2813,236.5781 Q89.9375,236.5781 89.25,237.6563 Q88.5625,238.7188 88.5625,240.8125 Q88.5625,242.9063 89.25,243.9844 Q89.9375,245.0469 91.2813,245.0469 Q91.9063,245.0469 92.5,244.7813 Q93.0938,244.5 93.7188,243.9219 L93.7188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="420.667">picture : byte[] {O}</text></g><!--class Customers--><g id="elem_Customers"><rect codeLine="24" fill="#F1F1F1" height="40.2656" id="Customers" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="82" x="88" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="76" x="91" y="155.9639">Customers</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="27" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="46" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="108" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="49" y="38.9639">GET /customer/expired</text></g><!--link Customers to Customer--><g id="link_Customers_Customer"><path codeLine="30" d="M129,164.32 C129,179.41 129,195.66 129,218.84 " fill="none" id="Customers-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,224.84,133,215.84,129,219.84,125,215.84,129,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.743" y="213.8965">*</text></g><!--link GET /customer/expired to Customers--><g id="link_GET /customer/expired_Customers"><path codeLine="32" d="M129,47.25 C129,68.48 129,96.44 129,117.69 " fill="none" id="GET /customer/expired-to-Customers" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="129,123.69,133,114.69,129,118.69,125,114.69,129,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="130" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="119.875" y="112.9167">1</text></g><!--SRC=[TP9FRy8m3CNl_HHHZfFuinqdn04qxJH00sc7QOUGker5crIsYuPGl_j2GQCKSOhgz_DxhXE7AQZ9P6N4JQVA8ja24dSkVW9NmJFS2Ij3fWG1wYbGLd9GKN4XvMufGoXYXNVegrElieLXLiTaPkmkfr3xT1wAGF-3V3amaZG9WoWVixWo5jPmQfP0oWSFIN8sqVEQ9PH0ElefTMopcXX9B8lOgbuL2w7FEs9iVAWvmDp91mW1Hpq5YwKfr77PTA3K22op6PAu4nE_UkvhOCRWDzY6I3nOJ5drR7nTRe6MsTnXaHBuYA8No85we2bmVpBQXb20yNqRjBjsI___y_tJGpAp3pMXmAADv6lI7LgXbPhQj8F0HMxkritwzed4xL-XzxUD6jaBEOBV2WbIVNrePxZhDHXCbNxIdUkC-WERuJ2op_fcbZYkqY_ZiKx-0000]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/petstore-expanded.puml.svg b/src/docs/tests/petstore-expanded.puml.svg
index 5c5e052..57dd4af 100644
--- a/src/docs/tests/petstore-expanded.puml.svg
+++ b/src/docs/tests/petstore-expanded.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="548px" preserveAspectRatio="none" style="width:724px;height:548px;background:#FFFFFF;" version="1.1" viewBox="0 0 724 548" width="724px" zoomAndPan="magnify"><defs/><g><!--class Pet--><g id="elem_Pet"><rect codeLine="11" fill="#F1F1F1" height="32" id="Pet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="141" y="355.5"/><ellipse cx="156" cy="371.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M158.9688,377.1406 Q158.3906,377.4375 157.75,377.5781 Q157.1094,377.7344 156.4063,377.7344 Q153.9063,377.7344 152.5781,376.0938 Q151.2656,374.4375 151.2656,371.3125 Q151.2656,368.1875 152.5781,366.5313 Q153.9063,364.875 156.4063,364.875 Q157.1094,364.875 157.75,365.0313 Q158.4063,365.1875 158.9688,365.4844 L158.9688,368.2031 Q158.3438,367.625 157.75,367.3594 Q157.1563,367.0781 156.5313,367.0781 Q155.1875,367.0781 154.5,368.1563 Q153.8125,369.2188 153.8125,371.3125 Q153.8125,373.4063 154.5,374.4844 Q155.1875,375.5469 156.5313,375.5469 Q157.1563,375.5469 157.75,375.2813 Q158.3438,375 158.9688,374.4219 L158.9688,377.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="23" x="170" y="376.3467">Pet</text></g><!--class PetId--><g id="elem_PetId"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="PetId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="86" x="125.5" y="477.5"/><ellipse cx="149.05" cy="493.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M152.0188,499.1406 Q151.4406,499.4375 150.8,499.5781 Q150.1594,499.7344 149.4563,499.7344 Q146.9563,499.7344 145.6281,498.0938 Q144.3156,496.4375 144.3156,493.3125 Q144.3156,490.1875 145.6281,488.5313 Q146.9563,486.875 149.4563,486.875 Q150.1594,486.875 150.8,487.0313 Q151.4563,487.1875 152.0188,487.4844 L152.0188,490.2031 Q151.3938,489.625 150.8,489.3594 Q150.2063,489.0781 149.5813,489.0781 Q148.2375,489.0781 147.55,490.1563 Q146.8625,491.2188 146.8625,493.3125 Q146.8625,495.4063 147.55,496.4844 Q148.2375,497.5469 149.5813,497.5469 Q150.2063,497.5469 150.8,497.2813 Q151.3938,497 152.0188,496.4219 L152.0188,499.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="164.95" y="498.3467">PetId</text><line style="stroke:#181818;stroke-width:0.5;" x1="126.5" x2="210.5" y1="509.5" y2="509.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="131.5" y="526.4951">id : integer</text></g><!--class NewPet--><g id="elem_NewPet"><rect codeLine="18" fill="#F1F1F1" height="72.5938" id="NewPet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="119" x="278" y="469"/><ellipse cx="308.3" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M311.2688,490.6406 Q310.6906,490.9375 310.05,491.0781 Q309.4094,491.2344 308.7063,491.2344 Q306.2063,491.2344 304.8781,489.5938 Q303.5656,487.9375 303.5656,484.8125 Q303.5656,481.6875 304.8781,480.0313 Q306.2063,478.375 308.7063,478.375 Q309.4094,478.375 310.05,478.5313 Q310.7063,478.6875 311.2688,478.9844 L311.2688,481.7031 Q310.6438,481.125 310.05,480.8594 Q309.4563,480.5781 308.8313,480.5781 Q307.4875,480.5781 306.8,481.6563 Q306.1125,482.7188 306.1125,484.8125 Q306.1125,486.9063 306.8,487.9844 Q307.4875,489.0469 308.8313,489.0469 Q309.4563,489.0469 310.05,488.7813 Q310.6438,488.5 311.2688,487.9219 L311.2688,490.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="325.7" y="489.8467">NewPet</text><line style="stroke:#181818;stroke-width:0.5;" x1="279" x2="396" y1="501" y2="501"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="284" y="517.9951">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="284" y="534.292">tag : string {O}</text></g><!--class Error--><g id="elem_Error"><rect codeLine="23" fill="#F1F1F1" height="72.5938" id="Error" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="128" x="411.5" y="335"/><ellipse cx="454.85" cy="351" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M457.8188,356.6406 Q457.2406,356.9375 456.6,357.0781 Q455.9594,357.2344 455.2563,357.2344 Q452.7563,357.2344 451.4281,355.5938 Q450.1156,353.9375 450.1156,350.8125 Q450.1156,347.6875 451.4281,346.0313 Q452.7563,344.375 455.2563,344.375 Q455.9594,344.375 456.6,344.5313 Q457.2563,344.6875 457.8188,344.9844 L457.8188,347.7031 Q457.1938,347.125 456.6,346.8594 Q456.0063,346.5781 455.3813,346.5781 Q454.0375,346.5781 453.35,347.6563 Q452.6625,348.7188 452.6625,350.8125 Q452.6625,352.9063 453.35,353.9844 Q454.0375,355.0469 455.3813,355.0469 Q456.0063,355.0469 456.6,354.7813 Q457.1938,354.5 457.8188,353.9219 L457.8188,356.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="475.15" y="355.8467">Error</text><line style="stroke:#181818;stroke-width:0.5;" x1="412.5" x2="538.5" y1="367" y2="367"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="417.5" y="383.9951">code : integer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="417.5" y="400.292">message : string</text></g><!--class findPets--><g id="elem_findPets"><rect codeLine="28" fill="#F5DEB3" height="94.8281" id="findPets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="198" y="7"/><ellipse cx="229.2" cy="34.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M232.1688,39.7578 Q231.5906,40.0547 230.95,40.1953 Q230.3094,40.3516 229.6063,40.3516 Q227.1063,40.3516 225.7781,38.7109 Q224.4656,37.0547 224.4656,33.9297 Q224.4656,30.8047 225.7781,29.1484 Q227.1063,27.4922 229.6063,27.4922 Q230.3094,27.4922 230.95,27.6484 Q231.6063,27.8047 232.1688,28.1016 L232.1688,30.8203 Q231.5438,30.2422 230.95,29.9766 Q230.3563,29.6953 229.7313,29.6953 Q228.3875,29.6953 227.7,30.7734 Q227.0125,31.8359 227.0125,33.9297 Q227.0125,36.0234 227.7,37.1016 Q228.3875,38.1641 229.7313,38.1641 Q230.3563,38.1641 230.95,37.8984 Q231.5438,37.6172 232.1688,37.0391 L232.1688,39.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="260.3" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="73" x="244.8" y="37.1074">«GET /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="253.3" y="52.9326">findPets</text><line style="stroke:#181818;stroke-width:0.5;" x1="199" x2="334" y1="61.2344" y2="61.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="204" y="78.2295">tags : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="204" y="94.5264">limit : integer {O}</text></g><!--class findPets 200--><g id="elem_findPets 200"><rect codeLine="33" fill="#F1F1F1" height="40.2656" id="findPets 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="7" y="198.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="16.5" y="214.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="10" y="230.4639">findPets 200</text></g><!--class addPet--><g id="elem_addPet"><rect codeLine="36" fill="#F5DEB3" height="54.2344" id="addPet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="303" y="191.5"/><ellipse cx="318" cy="218.6172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M320.9688,224.2578 Q320.3906,224.5547 319.75,224.6953 Q319.1094,224.8516 318.4063,224.8516 Q315.9063,224.8516 314.5781,223.2109 Q313.2656,221.5547 313.2656,218.4297 Q313.2656,215.3047 314.5781,213.6484 Q315.9063,211.9922 318.4063,211.9922 Q319.1094,211.9922 319.75,212.1484 Q320.4063,212.3047 320.9688,212.6016 L320.9688,215.3203 Q320.3438,214.7422 319.75,214.4766 Q319.1563,214.1953 318.5313,214.1953 Q317.1875,214.1953 316.5,215.2734 Q315.8125,216.3359 315.8125,218.4297 Q315.8125,220.5234 316.5,221.6016 Q317.1875,222.6641 318.5313,222.6641 Q319.1563,222.6641 319.75,222.3984 Q320.3438,222.1172 320.9688,221.5391 L320.9688,224.2578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="348.5" y="207.6387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="330" y="221.6074">«POST /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="345" y="237.4326">addPet</text></g><!--class find pet by id--><g id="elem_find pet by id"><rect codeLine="39" fill="#F5DEB3" height="78.5313" id="find pet by id" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="132" x="135.5" y="179"/><ellipse cx="150.5" cy="206.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M153.4688,211.7578 Q152.8906,212.0547 152.25,212.1953 Q151.6094,212.3516 150.9063,212.3516 Q148.4063,212.3516 147.0781,210.7109 Q145.7656,209.0547 145.7656,205.9297 Q145.7656,202.8047 147.0781,201.1484 Q148.4063,199.4922 150.9063,199.4922 Q151.6094,199.4922 152.25,199.6484 Q152.9063,199.8047 153.4688,200.1016 L153.4688,202.8203 Q152.8438,202.2422 152.25,201.9766 Q151.6563,201.6953 151.0313,201.6953 Q149.6875,201.6953 149,202.7734 Q148.3125,203.8359 148.3125,205.9297 Q148.3125,208.0234 149,209.1016 Q149.6875,210.1641 151.0313,210.1641 Q151.6563,210.1641 152.25,209.8984 Q152.8438,209.6172 153.4688,209.0391 L153.4688,211.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="193.5" y="195.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="104" x="162.5" y="209.1074">«GET /pets/{id}»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="170.5" y="224.9326">find pet by id</text><line style="stroke:#181818;stroke-width:0.5;" x1="136.5" x2="266.5" y1="233.2344" y2="233.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="141.5" y="250.2295">id : integer</text></g><!--class deletePet--><g id="elem_deletePet"><rect codeLine="43" fill="#F5DEB3" height="78.5313" id="deletePet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="155" x="562" y="179"/><ellipse cx="577" cy="206.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M579.9688,211.7578 Q579.3906,212.0547 578.75,212.1953 Q578.1094,212.3516 577.4063,212.3516 Q574.9063,212.3516 573.5781,210.7109 Q572.2656,209.0547 572.2656,205.9297 Q572.2656,202.8047 573.5781,201.1484 Q574.9063,199.4922 577.4063,199.4922 Q578.1094,199.4922 578.75,199.6484 Q579.4063,199.8047 579.9688,200.1016 L579.9688,202.8203 Q579.3438,202.2422 578.75,201.9766 Q578.1563,201.6953 577.5313,201.6953 Q576.1875,201.6953 575.5,202.7734 Q574.8125,203.8359 574.8125,205.9297 Q574.8125,208.0234 575.5,209.1016 Q576.1875,210.1641 577.5313,210.1641 Q578.1563,210.1641 578.75,209.8984 Q579.3438,209.6172 579.9688,209.0391 L579.9688,211.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="631.5" y="195.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="127" x="589" y="209.1074">«DELETE /pets/{id}»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="619" y="224.9326">deletePet</text><line style="stroke:#181818;stroke-width:0.5;" x1="563" x2="716" y1="233.2344" y2="233.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="568" y="250.2295">id : integer</text></g><!--class deletePet 204--><g id="elem_deletePet 204"><rect codeLine="47" fill="#F1F1F1" height="40.2656" id="deletePet 204" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="587.5" y="351.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="602.5" y="367.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="590.5" y="383.4639">deletePet 204</text></g><!--link Pet to NewPet--><g id="link_Pet_NewPet"><path codeLine="50" d="M187.89,387.64 C213.12,407.35 253.2716,438.7065 287.3116,465.2965 " fill="none" id="Pet-to-NewPet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="292.04,468.99,287.4098,460.2974,288.0997,465.912,282.485,466.602,292.04,468.99" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="274.9208" y="457.9922">1</text></g><!--link Pet to PetId--><g id="link_Pet_PetId"><path codeLine="52" d="M168.5,387.64 C168.5,409.52 168.5,444.3 168.5,471.43 " fill="none" id="Pet-to-PetId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="168.5,477.43,172.5,468.43,168.5,472.43,164.5,468.43,168.5,477.43" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="159.575" y="466.2524">1</text></g><!--link findPets 200 to Pet--><g id="link_findPets 200_Pet"><path codeLine="54" d="M68.06,238.62 C91.15,268.94 132.0651,322.6563 153.1951,350.4063 " fill="none" id="findPets 200-to-Pet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="156.83,355.18,154.5601,345.5963,153.801,351.202,148.1953,350.4428,156.83,355.18" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="144.8049" y="344.3785">*</text></g><!--link findPets to findPets 200--><g id="link_findPets_findPets 200"><path codeLine="56" d="M205.18,102.14 C163.15,134.11 114.366,171.2082 83.436,194.7282 " fill="none" id="findPets-to-findPets 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="78.66,198.36,88.2452,196.0963,82.64,195.3335,83.4028,189.7283,78.66,198.36" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="161.5" y="145.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="76.8758" y="187.2881">1</text></g><!--link findPets to Error--><g id="link_findPets_Error"><path codeLine="58" d="M335.24,93.96 C367.5,115.2 403.94,144.32 427.5,179 C459.76,226.49 469.8539,287.8414 473.3139,328.7114 " fill="none" id="findPets-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="473.82,334.69,477.0465,325.3847,473.3982,329.7078,469.075,326.0595,473.82,334.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="461.5" y="223.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="464.8083" y="323.9122">1</text></g><!--link addPet to Pet--><g id="link_addPet_Pet"><path codeLine="60" d="M309.14,245.52 C300.98,249.8 292.54,254.11 284.5,258 C254.4,272.56 240.38,265.66 215.5,288 C194.52,306.83 182.7382,331.7039 175.8082,349.8739 " fill="none" id="addPet-to-Pet" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="173.67,355.48,180.6146,348.4963,175.4518,350.8083,173.1398,345.6454,173.67,355.48" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="216.5" y="301.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="166.0722" y="344.4847">1</text></g><!--link addPet to Error--><g id="link_addPet_Error"><path codeLine="62" d="M370.16,245.67 C379.84,263.19 393.69,286.37 408.5,305 C416.7,315.31 422.1481,321.4468 431.5981,330.7668 " fill="none" id="addPet-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="435.87,334.98,432.2709,325.8123,432.3101,331.469,426.6533,331.5082,435.87,334.98" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="409.5" y="301.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="419.8257" y="323.9804">1</text></g><!--link addPet to NewPet--><g id="link_addPet_NewPet"><path codeLine="64" d="M354.76,245.55 C351.35,296.8 344.1496,404.8233 340.2696,462.9533 " fill="none" id="addPet-to-NewPet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="339.87,468.94,344.4605,460.2264,340.203,463.9511,336.4783,459.6936,339.87,468.94" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="331.5695" y="457.933">1</text></g><!--link find pet by id to Pet--><g id="link_find pet by id_Pet"><path codeLine="66" d="M165.37,258.26 C158.86,267.39 153.02,277.53 149.5,288 C141.76,310.98 149.2558,333.2192 157.4358,349.9592 " fill="none" id="find pet by id-to-Pet" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="160.07,355.35,159.7125,345.5076,157.8748,350.8577,152.5248,349.0199,160.07,355.35" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="150.5" y="301.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="158.5472" y="344.31">1</text></g><!--link find pet by id to Error--><g id="link_find pet by id_Error"><path codeLine="68" d="M263.07,258.07 C287.81,273.16 316.75,290.34 343.5,305 C365.26,316.93 384.0957,326.5725 405.7957,337.2425 " fill="none" id="find pet by id-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="411.18,339.89,404.8685,332.3292,406.6931,337.6838,401.3385,339.5083,411.18,339.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="344.5" y="301.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="395.7075" y="332.7087">1</text></g><!--link deletePet to deletePet 204--><g id="link_deletePet_deletePet 204"><path codeLine="70" d="M639.5,258.39 C639.5,288.1 639.5,321.79 639.5,345.1 " fill="none" id="deletePet-to-deletePet 204" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="639.5,351.1,643.5,342.1,639.5,346.1,635.5,342.1,639.5,351.1" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="640.5" y="301.0669">204</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="630.375" y="340.3013">1</text></g><!--link deletePet to Error--><g id="link_deletePet_Error"><path codeLine="72" d="M597.27,258.39 C571.64,281.98 543.5941,307.8061 518.6341,330.7861 " fill="none" id="deletePet-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="514.22,334.85,523.5505,331.6968,517.8984,331.4634,518.1319,325.8113,514.22,334.85" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="563.5" y="301.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="512.6215" y="323.8264">1</text></g><!--SRC=[fLBBQiCm4BpxAnOV2qdJabC9EQGrfL0QqmHwA3seriOMiIKZAPHW_E-LxSIM_A27tgIPqUoiTXD64LQhaEXalOQ8oIX5Bsd0TrIvu0e7H4WaoL2Zx36OvVeCXaa4LJPqO9WQH1qPpwkt4AL4AIYy3OcEiHGdJXz5AcGRv2D1ehsDa1Ibo-n5HhGeFOKQk4cXSXBX3YjRBIHmmT7p6di_HEsR8gKDlD0A0YZgJ2Km2W_0kCOOfQLymv_BwqvQbJDYfINZiOLh4hSm5DlIiWca5D9rYGH5gsH7c5uKYQqAdSs1SMhYAByRbJaz1tkupGrSNGita6fjFh_gJ1sRiepfBa4lyRKKt2yMlhi4pbSIIkiFiWE5svsJo7K5Gy3tsVpuH1kt1QDblvU9-L1CpG8E4Zm5hy4- -8UTQNivsdQpJBFP6lmxlzsF0Tvic87TVwpvcuQtMH_cyyjBzu592Nvr6XTVzgfMKJoGKrhRNeVIwkgRxJLG_E4qqd1_bjF59fKJHQsXjjBUP2xsoodvgFCl]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="548px" preserveAspectRatio="none" style="width:724px;height:548px;background:#FFFFFF;" version="1.1" viewBox="0 0 724 548" width="724px" zoomAndPan="magnify"><defs/><g><!--class Pet--><g id="elem_Pet"><rect codeLine="11" fill="#F1F1F1" height="32" id="Pet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="55" x="141" y="355.5"/><ellipse cx="156" cy="371.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M158.9688,377.1406 Q158.3906,377.4375 157.75,377.5781 Q157.1094,377.7344 156.4063,377.7344 Q153.9063,377.7344 152.5781,376.0938 Q151.2656,374.4375 151.2656,371.3125 Q151.2656,368.1875 152.5781,366.5313 Q153.9063,364.875 156.4063,364.875 Q157.1094,364.875 157.75,365.0313 Q158.4063,365.1875 158.9688,365.4844 L158.9688,368.2031 Q158.3438,367.625 157.75,367.3594 Q157.1563,367.0781 156.5313,367.0781 Q155.1875,367.0781 154.5,368.1563 Q153.8125,369.2188 153.8125,371.3125 Q153.8125,373.4063 154.5,374.4844 Q155.1875,375.5469 156.5313,375.5469 Q157.1563,375.5469 157.75,375.2813 Q158.3438,375 158.9688,374.4219 L158.9688,377.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="23" x="170" y="376.3467">Pet</text></g><!--class PetId--><g id="elem_PetId"><rect codeLine="14" fill="#F1F1F1" height="56.2969" id="PetId" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="86" x="125.5" y="477.5"/><ellipse cx="149.05" cy="493.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M152.0188,499.1406 Q151.4406,499.4375 150.8,499.5781 Q150.1594,499.7344 149.4563,499.7344 Q146.9563,499.7344 145.6281,498.0938 Q144.3156,496.4375 144.3156,493.3125 Q144.3156,490.1875 145.6281,488.5313 Q146.9563,486.875 149.4563,486.875 Q150.1594,486.875 150.8,487.0313 Q151.4563,487.1875 152.0188,487.4844 L152.0188,490.2031 Q151.3938,489.625 150.8,489.3594 Q150.2063,489.0781 149.5813,489.0781 Q148.2375,489.0781 147.55,490.1563 Q146.8625,491.2188 146.8625,493.3125 Q146.8625,495.4063 147.55,496.4844 Q148.2375,497.5469 149.5813,497.5469 Q150.2063,497.5469 150.8,497.2813 Q151.3938,497 152.0188,496.4219 L152.0188,499.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="35" x="164.95" y="498.3467">PetId</text><line style="stroke:#181818;stroke-width:0.5;" x1="126.5" x2="210.5" y1="509.5" y2="509.5"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="131.5" y="526.4951">id : integer</text></g><!--class NewPet--><g id="elem_NewPet"><rect codeLine="18" fill="#F1F1F1" height="72.5938" id="NewPet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="119" x="278" y="469"/><ellipse cx="308.3" cy="485" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M311.2688,490.6406 Q310.6906,490.9375 310.05,491.0781 Q309.4094,491.2344 308.7063,491.2344 Q306.2063,491.2344 304.8781,489.5938 Q303.5656,487.9375 303.5656,484.8125 Q303.5656,481.6875 304.8781,480.0313 Q306.2063,478.375 308.7063,478.375 Q309.4094,478.375 310.05,478.5313 Q310.7063,478.6875 311.2688,478.9844 L311.2688,481.7031 Q310.6438,481.125 310.05,480.8594 Q309.4563,480.5781 308.8313,480.5781 Q307.4875,480.5781 306.8,481.6563 Q306.1125,482.7188 306.1125,484.8125 Q306.1125,486.9063 306.8,487.9844 Q307.4875,489.0469 308.8313,489.0469 Q309.4563,489.0469 310.05,488.7813 Q310.6438,488.5 311.2688,487.9219 L311.2688,490.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="53" x="325.7" y="489.8467">NewPet</text><line style="stroke:#181818;stroke-width:0.5;" x1="279" x2="396" y1="501" y2="501"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="284" y="517.9951">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="284" y="534.292">tag : string {O}</text></g><!--class Error--><g id="elem_Error"><rect codeLine="23" fill="#F1F1F1" height="72.5938" id="Error" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="128" x="411.5" y="335"/><ellipse cx="454.85" cy="351" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M457.8188,356.6406 Q457.2406,356.9375 456.6,357.0781 Q455.9594,357.2344 455.2563,357.2344 Q452.7563,357.2344 451.4281,355.5938 Q450.1156,353.9375 450.1156,350.8125 Q450.1156,347.6875 451.4281,346.0313 Q452.7563,344.375 455.2563,344.375 Q455.9594,344.375 456.6,344.5313 Q457.2563,344.6875 457.8188,344.9844 L457.8188,347.7031 Q457.1938,347.125 456.6,346.8594 Q456.0063,346.5781 455.3813,346.5781 Q454.0375,346.5781 453.35,347.6563 Q452.6625,348.7188 452.6625,350.8125 Q452.6625,352.9063 453.35,353.9844 Q454.0375,355.0469 455.3813,355.0469 Q456.0063,355.0469 456.6,354.7813 Q457.1938,354.5 457.8188,353.9219 L457.8188,356.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="475.15" y="355.8467">Error</text><line style="stroke:#181818;stroke-width:0.5;" x1="412.5" x2="538.5" y1="367" y2="367"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="417.5" y="383.9951">code : integer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="417.5" y="400.292">message : string</text></g><!--class findPets--><g id="elem_findPets"><rect codeLine="28" fill="#F5DEB3" height="94.8281" id="findPets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="137" x="198" y="7"/><ellipse cx="229.2" cy="34.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M232.1688,39.7578 Q231.5906,40.0547 230.95,40.1953 Q230.3094,40.3516 229.6063,40.3516 Q227.1063,40.3516 225.7781,38.7109 Q224.4656,37.0547 224.4656,33.9297 Q224.4656,30.8047 225.7781,29.1484 Q227.1063,27.4922 229.6063,27.4922 Q230.3094,27.4922 230.95,27.6484 Q231.6063,27.8047 232.1688,28.1016 L232.1688,30.8203 Q231.5438,30.2422 230.95,29.9766 Q230.3563,29.6953 229.7313,29.6953 Q228.3875,29.6953 227.7,30.7734 Q227.0125,31.8359 227.0125,33.9297 Q227.0125,36.0234 227.7,37.1016 Q228.3875,38.1641 229.7313,38.1641 Q230.3563,38.1641 230.95,37.8984 Q231.5438,37.6172 232.1688,37.0391 L232.1688,39.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="260.3" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="73" x="244.8" y="37.1074">«GET /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="56" x="253.3" y="52.9326">findPets</text><line style="stroke:#181818;stroke-width:0.5;" x1="199" x2="334" y1="61.2344" y2="61.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="125" x="204" y="78.2295">tags : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="204" y="94.5264">limit : integer {O}</text></g><!--class findPets 200--><g id="elem_findPets 200"><rect codeLine="33" fill="#F1F1F1" height="40.2656" id="findPets 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="93" x="7" y="198.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="16.5" y="214.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="10" y="230.4639">findPets 200</text></g><!--class addPet--><g id="elem_addPet"><rect codeLine="36" fill="#F5DEB3" height="54.2344" id="addPet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="303" y="191.5"/><ellipse cx="318" cy="218.6172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M320.9688,224.2578 Q320.3906,224.5547 319.75,224.6953 Q319.1094,224.8516 318.4063,224.8516 Q315.9063,224.8516 314.5781,223.2109 Q313.2656,221.5547 313.2656,218.4297 Q313.2656,215.3047 314.5781,213.6484 Q315.9063,211.9922 318.4063,211.9922 Q319.1094,211.9922 319.75,212.1484 Q320.4063,212.3047 320.9688,212.6016 L320.9688,215.3203 Q320.3438,214.7422 319.75,214.4766 Q319.1563,214.1953 318.5313,214.1953 Q317.1875,214.1953 316.5,215.2734 Q315.8125,216.3359 315.8125,218.4297 Q315.8125,220.5234 316.5,221.6016 Q317.1875,222.6641 318.5313,222.6641 Q319.1563,222.6641 319.75,222.3984 Q320.3438,222.1172 320.9688,221.5391 L320.9688,224.2578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="348.5" y="207.6387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="330" y="221.6074">«POST /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="49" x="345" y="237.4326">addPet</text></g><!--class find pet by id--><g id="elem_find pet by id"><rect codeLine="39" fill="#F5DEB3" height="78.5313" id="find pet by id" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="132" x="135.5" y="179"/><ellipse cx="150.5" cy="206.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M153.4688,211.7578 Q152.8906,212.0547 152.25,212.1953 Q151.6094,212.3516 150.9063,212.3516 Q148.4063,212.3516 147.0781,210.7109 Q145.7656,209.0547 145.7656,205.9297 Q145.7656,202.8047 147.0781,201.1484 Q148.4063,199.4922 150.9063,199.4922 Q151.6094,199.4922 152.25,199.6484 Q152.9063,199.8047 153.4688,200.1016 L153.4688,202.8203 Q152.8438,202.2422 152.25,201.9766 Q151.6563,201.6953 151.0313,201.6953 Q149.6875,201.6953 149,202.7734 Q148.3125,203.8359 148.3125,205.9297 Q148.3125,208.0234 149,209.1016 Q149.6875,210.1641 151.0313,210.1641 Q151.6563,210.1641 152.25,209.8984 Q152.8438,209.6172 153.4688,209.0391 L153.4688,211.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="193.5" y="195.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="104" x="162.5" y="209.1074">«GET /pets/{id}»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="170.5" y="224.9326">find pet by id</text><line style="stroke:#181818;stroke-width:0.5;" x1="136.5" x2="266.5" y1="233.2344" y2="233.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="141.5" y="250.2295">id : integer</text></g><!--class deletePet--><g id="elem_deletePet"><rect codeLine="43" fill="#F5DEB3" height="78.5313" id="deletePet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="155" x="562" y="179"/><ellipse cx="577" cy="206.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M579.9688,211.7578 Q579.3906,212.0547 578.75,212.1953 Q578.1094,212.3516 577.4063,212.3516 Q574.9063,212.3516 573.5781,210.7109 Q572.2656,209.0547 572.2656,205.9297 Q572.2656,202.8047 573.5781,201.1484 Q574.9063,199.4922 577.4063,199.4922 Q578.1094,199.4922 578.75,199.6484 Q579.4063,199.8047 579.9688,200.1016 L579.9688,202.8203 Q579.3438,202.2422 578.75,201.9766 Q578.1563,201.6953 577.5313,201.6953 Q576.1875,201.6953 575.5,202.7734 Q574.8125,203.8359 574.8125,205.9297 Q574.8125,208.0234 575.5,209.1016 Q576.1875,210.1641 577.5313,210.1641 Q578.1563,210.1641 578.75,209.8984 Q579.3438,209.6172 579.9688,209.0391 L579.9688,211.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="631.5" y="195.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="127" x="589" y="209.1074">«DELETE /pets/{id}»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="67" x="619" y="224.9326">deletePet</text><line style="stroke:#181818;stroke-width:0.5;" x1="563" x2="716" y1="233.2344" y2="233.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="568" y="250.2295">id : integer</text></g><!--class deletePet 204--><g id="elem_deletePet 204"><rect codeLine="47" fill="#F1F1F1" height="40.2656" id="deletePet 204" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="104" x="587.5" y="351.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="602.5" y="367.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="98" x="590.5" y="383.4639">deletePet 204</text></g><!--link Pet to NewPet--><g id="link_Pet_NewPet"><path codeLine="50" d="M187.89,387.64 C213.12,407.35 253.2716,438.7065 287.3116,465.2965 " fill="none" id="Pet-to-NewPet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="292.04,468.99,287.4098,460.2974,288.0997,465.912,282.485,466.602,292.04,468.99" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="274.9208" y="457.9922">1</text></g><!--link Pet to PetId--><g id="link_Pet_PetId"><path codeLine="52" d="M168.5,387.64 C168.5,409.52 168.5,444.3 168.5,471.43 " fill="none" id="Pet-to-PetId" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="168.5,477.43,172.5,468.43,168.5,472.43,164.5,468.43,168.5,477.43" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="159.575" y="466.2524">1</text></g><!--link findPets 200 to Pet--><g id="link_findPets 200_Pet"><path codeLine="54" d="M68.06,238.62 C91.15,268.94 132.0651,322.6563 153.1951,350.4063 " fill="none" id="findPets 200-to-Pet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="156.83,355.18,154.5601,345.5963,153.801,351.202,148.1953,350.4428,156.83,355.18" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="144.8049" y="344.3785">*</text></g><!--link findPets to findPets 200--><g id="link_findPets_findPets 200"><path codeLine="56" d="M205.18,102.14 C163.15,134.11 114.366,171.2082 83.436,194.7282 " fill="none" id="findPets-to-findPets 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="78.66,198.36,88.2452,196.0963,82.64,195.3335,83.4028,189.7283,78.66,198.36" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="161.5" y="145.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="76.8758" y="187.2881">1</text></g><!--link findPets to Error--><g id="link_findPets_Error"><path codeLine="58" d="M335.24,93.96 C367.5,115.2 403.94,144.32 427.5,179 C459.76,226.49 469.8539,287.8414 473.3139,328.7114 " fill="none" id="findPets-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="473.82,334.69,477.0465,325.3847,473.3982,329.7078,469.075,326.0595,473.82,334.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="461.5" y="223.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="464.8083" y="323.9122">1</text></g><!--link addPet to Pet--><g id="link_addPet_Pet"><path codeLine="60" d="M309.14,245.52 C300.98,249.8 292.54,254.11 284.5,258 C254.4,272.56 240.38,265.66 215.5,288 C194.52,306.83 182.7382,331.7039 175.8082,349.8739 " fill="none" id="addPet-to-Pet" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="173.67,355.48,180.6146,348.4963,175.4518,350.8083,173.1398,345.6454,173.67,355.48" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="216.5" y="301.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="166.0722" y="344.4847">1</text></g><!--link addPet to Error--><g id="link_addPet_Error"><path codeLine="62" d="M370.16,245.67 C379.84,263.19 393.69,286.37 408.5,305 C416.7,315.31 422.1481,321.4468 431.5981,330.7668 " fill="none" id="addPet-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="435.87,334.98,432.2709,325.8123,432.3101,331.469,426.6533,331.5082,435.87,334.98" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="409.5" y="301.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="419.8257" y="323.9804">1</text></g><!--link addPet to NewPet--><g id="link_addPet_NewPet"><path codeLine="64" d="M354.76,245.55 C351.35,296.8 344.1496,404.8233 340.2696,462.9533 " fill="none" id="addPet-to-NewPet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="339.87,468.94,344.4605,460.2264,340.203,463.9511,336.4783,459.6936,339.87,468.94" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="331.5695" y="457.933">1</text></g><!--link find pet by id to Pet--><g id="link_find pet by id_Pet"><path codeLine="66" d="M165.37,258.26 C158.86,267.39 153.02,277.53 149.5,288 C141.76,310.98 149.2558,333.2192 157.4358,349.9592 " fill="none" id="find pet by id-to-Pet" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="160.07,355.35,159.7125,345.5076,157.8748,350.8577,152.5248,349.0199,160.07,355.35" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="150.5" y="301.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="158.5472" y="344.31">1</text></g><!--link find pet by id to Error--><g id="link_find pet by id_Error"><path codeLine="68" d="M263.07,258.07 C287.81,273.16 316.75,290.34 343.5,305 C365.26,316.93 384.0957,326.5725 405.7957,337.2425 " fill="none" id="find pet by id-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="411.18,339.89,404.8685,332.3292,406.6931,337.6838,401.3385,339.5083,411.18,339.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="344.5" y="301.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="395.7075" y="332.7087">1</text></g><!--link deletePet to deletePet 204--><g id="link_deletePet_deletePet 204"><path codeLine="70" d="M639.5,258.39 C639.5,288.1 639.5,321.79 639.5,345.1 " fill="none" id="deletePet-to-deletePet 204" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="639.5,351.1,643.5,342.1,639.5,346.1,635.5,342.1,639.5,351.1" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="640.5" y="301.0669">204</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="630.375" y="340.3013">1</text></g><!--link deletePet to Error--><g id="link_deletePet_Error"><path codeLine="72" d="M597.27,258.39 C571.64,281.98 543.5941,307.8061 518.6341,330.7861 " fill="none" id="deletePet-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="514.22,334.85,523.5505,331.6968,517.8984,331.4634,518.1319,325.8113,514.22,334.85" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="563.5" y="301.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="512.6215" y="323.8264">1</text></g><!--SRC=[fLBBQiCm4BpxAnOV2tcqv5H23crDAPJ6D84UIW-gjR557Cb82YKO_tlbHsp93thepPwPdPtLRi8emdeT4friDX0n6QNe9JNuZYeJNE6028aa9zGeUmoUCdq1moI2AXiwC4mDeewCPsKjH2bH2dBlWKJ7M8epfuyY5R8Dyf4WqLxXATJ0JI-LaGXtM1Ph8O4BZfvNc_WXQjzO5JRmGai88Ayw5y0et0FZ6cEKbl8DVvhgJbgsCsAb9UEnXMiIjp3asyAo2QGKqdM914MhPKUOMHI9hGwTpO5nQk8elrk8-NeEzh3835p-vcuWrTfyVbMPEZPb9wQx1Bt4rrPmjrpwxggTfoIKLWza1mgtEoUHwmg6WE-BUV69CHOveqL_bedzK4pDcGqIF0MlmJxuXvqPUpKwTdrCiza6_5k_lOy1Nb-OWTrthFYRchTP7-Rpfj8jC2d1Bx_6nSrTLIgA1t9EAzlhKbfTzMTx3HH_E8qCtD_bTBD9vKHJQwcjjBUPndur9Hzr_WK0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/petstore.puml.svg b/src/docs/tests/petstore.puml.svg
index 8a0d30f..9656ed5 100644
--- a/src/docs/tests/petstore.puml.svg
+++ b/src/docs/tests/petstore.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:520px;height:392px;background:#FFFFFF;" version="1.1" viewBox="0 0 520 392" width="520px" zoomAndPan="magnify"><defs/><g><!--class Pet--><g id="elem_Pet"><rect codeLine="11" fill="#F1F1F1" height="88.8906" id="Pet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="119" x="58.5" y="297"/><ellipse cx="102.3" cy="313" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M105.2688,318.6406 Q104.6906,318.9375 104.05,319.0781 Q103.4094,319.2344 102.7063,319.2344 Q100.2063,319.2344 98.8781,317.5938 Q97.5656,315.9375 97.5656,312.8125 Q97.5656,309.6875 98.8781,308.0313 Q100.2063,306.375 102.7063,306.375 Q103.4094,306.375 104.05,306.5313 Q104.7063,306.6875 105.2688,306.9844 L105.2688,309.7031 Q104.6438,309.125 104.05,308.8594 Q103.4563,308.5781 102.8313,308.5781 Q101.4875,308.5781 100.8,309.6563 Q100.1125,310.7188 100.1125,312.8125 Q100.1125,314.9063 100.8,315.9844 Q101.4875,317.0469 102.8313,317.0469 Q103.4563,317.0469 104.05,316.7813 Q104.6438,316.5 105.2688,315.9219 L105.2688,318.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="23" x="122.7" y="317.8467">Pet</text><line style="stroke:#181818;stroke-width:0.5;" x1="59.5" x2="176.5" y1="329" y2="329"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="64.5" y="345.9951">id : integer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="64.5" y="362.292">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="64.5" y="378.5889">tag : string {O}</text></g><!--class Pets--><g id="elem_Pets"><rect codeLine="17" fill="#F1F1F1" height="32" id="Pets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="27.5" y="183.5"/><ellipse cx="42.5" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M45.4688,205.1406 Q44.8906,205.4375 44.25,205.5781 Q43.6094,205.7344 42.9063,205.7344 Q40.4063,205.7344 39.0781,204.0938 Q37.7656,202.4375 37.7656,199.3125 Q37.7656,196.1875 39.0781,194.5313 Q40.4063,192.875 42.9063,192.875 Q43.6094,192.875 44.25,193.0313 Q44.9063,193.1875 45.4688,193.4844 L45.4688,196.2031 Q44.8438,195.625 44.25,195.3594 Q43.6563,195.0781 43.0313,195.0781 Q41.6875,195.0781 41,196.1563 Q40.3125,197.2188 40.3125,199.3125 Q40.3125,201.4063 41,202.4844 Q41.6875,203.5469 43.0313,203.5469 Q43.6563,203.5469 44.25,203.2813 Q44.8438,203 45.4688,202.4219 L45.4688,205.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="31" x="56.5" y="204.3467">Pets</text></g><!--class Error--><g id="elem_Error"><rect codeLine="20" fill="#F1F1F1" height="72.5938" id="Error" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="128" x="238" y="163"/><ellipse cx="281.35" cy="179" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M284.3188,184.6406 Q283.7406,184.9375 283.1,185.0781 Q282.4594,185.2344 281.7563,185.2344 Q279.2563,185.2344 277.9281,183.5938 Q276.6156,181.9375 276.6156,178.8125 Q276.6156,175.6875 277.9281,174.0313 Q279.2563,172.375 281.7563,172.375 Q282.4594,172.375 283.1,172.5313 Q283.7563,172.6875 284.3188,172.9844 L284.3188,175.7031 Q283.6938,175.125 283.1,174.8594 Q282.5063,174.5781 281.8813,174.5781 Q280.5375,174.5781 279.85,175.6563 Q279.1625,176.7188 279.1625,178.8125 Q279.1625,180.9063 279.85,181.9844 Q280.5375,183.0469 281.8813,183.0469 Q282.5063,183.0469 283.1,182.7813 Q283.6938,182.5 284.3188,181.9219 L284.3188,184.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="301.65" y="183.8467">Error</text><line style="stroke:#181818;stroke-width:0.5;" x1="239" x2="365" y1="195" y2="195"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="244" y="211.9951">code : integer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="244" y="228.292">message : string</text></g><!--class listPets--><g id="elem_listPets"><rect codeLine="25" fill="#F5DEB3" height="78.5313" id="listPets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="7" y="7"/><ellipse cx="36.85" cy="34.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,39.7578 Q39.2406,40.0547 38.6,40.1953 Q37.9594,40.3516 37.2563,40.3516 Q34.7563,40.3516 33.4281,38.7109 Q32.1156,37.0547 32.1156,33.9297 Q32.1156,30.8047 33.4281,29.1484 Q34.7563,27.4922 37.2563,27.4922 Q37.9594,27.4922 38.6,27.6484 Q39.2563,27.8047 39.8188,28.1016 L39.8188,30.8203 Q39.1938,30.2422 38.6,29.9766 Q38.0063,29.6953 37.3813,29.6953 Q36.0375,29.6953 35.35,30.7734 Q34.6625,31.8359 34.6625,33.9297 Q34.6625,36.0234 35.35,37.1016 Q36.0375,38.1641 37.3813,38.1641 Q38.0063,38.1641 38.6,37.8984 Q39.1938,37.6172 39.8188,37.0391 L39.8188,39.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="67.65" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="73" x="52.15" y="37.1074">«GET /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="63.65" y="52.9326">listPets</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="140" y1="61.2344" y2="61.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="78.2295">limit : integer {O}</text></g><!--class createPets--><g id="elem_createPets"><rect codeLine="29" fill="#F5DEB3" height="54.2344" id="createPets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="392.5" y="19.5"/><ellipse cx="407.5" cy="46.6172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M410.4688,52.2578 Q409.8906,52.5547 409.25,52.6953 Q408.6094,52.8516 407.9063,52.8516 Q405.4063,52.8516 404.0781,51.2109 Q402.7656,49.5547 402.7656,46.4297 Q402.7656,43.3047 404.0781,41.6484 Q405.4063,39.9922 407.9063,39.9922 Q408.6094,39.9922 409.25,40.1484 Q409.9063,40.3047 410.4688,40.6016 L410.4688,43.3203 Q409.8438,42.7422 409.25,42.4766 Q408.6563,42.1953 408.0313,42.1953 Q406.6875,42.1953 406,43.2734 Q405.3125,44.3359 405.3125,46.4297 Q405.3125,48.5234 406,49.6016 Q406.6875,50.6641 408.0313,50.6641 Q408.6563,50.6641 409.25,50.3984 Q409.8438,50.1172 410.4688,49.5391 L410.4688,52.2578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="438" y="35.6387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="419.5" y="49.6074">«POST /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="421.5" y="65.4326">createPets</text></g><!--class createPets 201--><g id="elem_createPets 201"><rect codeLine="32" fill="#F1F1F1" height="40.2656" id="createPets 201" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="401" y="179.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="420" y="195.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="404" y="211.4639">createPets 201</text></g><!--class showPetById--><g id="elem_showPetById"><rect codeLine="35" fill="#F5DEB3" height="78.5313" id="showPetById" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="154" x="192" y="7"/><ellipse cx="207" cy="34.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M209.9688,39.7578 Q209.3906,40.0547 208.75,40.1953 Q208.1094,40.3516 207.4063,40.3516 Q204.9063,40.3516 203.5781,38.7109 Q202.2656,37.0547 202.2656,33.9297 Q202.2656,30.8047 203.5781,29.1484 Q204.9063,27.4922 207.4063,27.4922 Q208.1094,27.4922 208.75,27.6484 Q209.4063,27.8047 209.9688,28.1016 L209.9688,30.8203 Q209.3438,30.2422 208.75,29.9766 Q208.1563,29.6953 207.5313,29.6953 Q206.1875,29.6953 205.5,30.7734 Q204.8125,31.8359 204.8125,33.9297 Q204.8125,36.0234 205.5,37.1016 Q206.1875,38.1641 207.5313,38.1641 Q208.1563,38.1641 208.75,37.8984 Q209.3438,37.6172 209.9688,37.0391 L209.9688,39.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="261" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="126" x="219" y="37.1074">«GET /pets/{petId}»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="237.5" y="52.9326">showPetById</text><line style="stroke:#181818;stroke-width:0.5;" x1="193" x2="345" y1="61.2344" y2="61.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="198" y="78.2295">petId : string</text></g><!--link Pets to Pet--><g id="link_Pets_Pet"><path codeLine="39" d="M65.43,215.75 C73.58,235.1 85.6605,263.7507 97.3305,291.4507 " fill="none" id="Pets-to-Pet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="99.66,296.98,99.852,287.133,97.7187,292.3722,92.4795,290.239,99.66,296.98" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="89.1793" y="285.7755">*</text></g><!--link listPets to Pets--><g id="link_listPets_Pets"><path codeLine="41" d="M50.3,86.11 C45.64,95.56 41.44,105.87 39,116 C33.34,139.5 40.5874,161.32 48.3674,177.87 " fill="none" id="listPets-to-Pets" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="50.92,183.3,50.7111,173.4534,48.7929,178.775,43.4712,176.8568,50.92,183.3" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="40" y="129.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="38.9185" y="172.5383">1</text></g><!--link listPets to Error--><g id="link_listPets_Error"><path codeLine="43" d="M132.42,86.19 C168.04,109.78 208.2473,136.4174 243.0273,159.4474 " fill="none" id="listPets-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="248.03,162.76,242.7344,154.456,243.8611,159.9995,238.3176,161.1262,248.03,162.76" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="202" y="129.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="229.7041" y="151.9947">1</text></g><!--link createPets to createPets 201--><g id="link_createPets_createPets 201"><path codeLine="45" d="M447.92,73.8 C450.11,103.88 453.2043,146.4358 455.1543,173.2158 " fill="none" id="createPets-to-createPets 201" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="455.59,179.2,458.9258,169.9333,455.2269,174.2132,450.947,170.5143,455.59,179.2" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="453" y="129.0669">201</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="446.0684" y="168.4295">1</text></g><!--link createPets to Error--><g id="link_createPets_Error"><path codeLine="47" d="M420.92,73.8 C397.39,98.48 366.1605,131.2176 340.1105,158.5376 " fill="none" id="createPets-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="335.97,162.88,345.0757,159.1268,339.4204,159.2614,339.2859,153.6061,335.97,162.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="379" y="129.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="333.4957" y="151.862">1</text></g><!--link showPetById to Pet--><g id="link_showPetById_Pet"><path codeLine="49" d="M242.05,86.12 C227.26,108.12 209.11,136.52 195,163 C171.39,207.32 151.2999,254.8318 136.8399,291.3318 " fill="none" id="showPetById-to-Pet" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="134.63,296.91,141.6636,290.0159,136.4716,292.2615,134.226,287.0694,134.63,296.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="196" y="204.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="128.564" y="286.0192">1</text></g><!--link showPetById to Error--><g id="link_showPetById_Error"><path codeLine="51" d="M271.04,86.14 C272.35,100.93 274.49,117.88 278,133 C280.3,142.91 281.611,147.7343 285.111,157.3143 " fill="none" id="showPetById-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="287.17,162.95,287.8387,153.1239,285.4542,158.2536,280.3245,155.8691,287.17,162.95" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="279" y="129.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="275.6982" y="151.9449">1</text></g><!--SRC=[TP91Zu8m48Nl_8f9ZvlegiUDyU36R3n9LfCzD-q8ZQKbRSt64Fxx5d2XHRWGU3FplTSfkU08ssrANRxR0HE6IKpoJln6MsfbyQMGKaCBT6X65InAzm1VoJMteNGLABrYRqALpImmIQs5AjbJTikClYl-gQKsVP2V7AbBzjfmD77beWlgT9rOTA1y2bjIXcTii4uRK5fXadHuag8ZtWIWQWFK83XyW50ECpI1t71ymJeZL1ReZcQz3DMfJkeGRHlse1oCqIQsOvhZfA6FRMaMU0uOAQphuFsH_TlNuGBlfPURpz12YaAumMEKaXc_Hdp5fQTpn9kQWCrgJUA_8EgqkVxrVVl7aSzaVQ_yyyZhSUPMZSx-NETYiGFoHhgBy-gmY-NILzRaV-z-6CXcjPffUbv5syNnIk-onONRw7l71twYrxC3C_1e7M7SEErqsoJp3m00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="392px" preserveAspectRatio="none" style="width:520px;height:392px;background:#FFFFFF;" version="1.1" viewBox="0 0 520 392" width="520px" zoomAndPan="magnify"><defs/><g><!--class Pet--><g id="elem_Pet"><rect codeLine="11" fill="#F1F1F1" height="88.8906" id="Pet" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="119" x="58.5" y="297"/><ellipse cx="102.3" cy="313" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M105.2688,318.6406 Q104.6906,318.9375 104.05,319.0781 Q103.4094,319.2344 102.7063,319.2344 Q100.2063,319.2344 98.8781,317.5938 Q97.5656,315.9375 97.5656,312.8125 Q97.5656,309.6875 98.8781,308.0313 Q100.2063,306.375 102.7063,306.375 Q103.4094,306.375 104.05,306.5313 Q104.7063,306.6875 105.2688,306.9844 L105.2688,309.7031 Q104.6438,309.125 104.05,308.8594 Q103.4563,308.5781 102.8313,308.5781 Q101.4875,308.5781 100.8,309.6563 Q100.1125,310.7188 100.1125,312.8125 Q100.1125,314.9063 100.8,315.9844 Q101.4875,317.0469 102.8313,317.0469 Q103.4563,317.0469 104.05,316.7813 Q104.6438,316.5 105.2688,315.9219 L105.2688,318.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="23" x="122.7" y="317.8467">Pet</text><line style="stroke:#181818;stroke-width:0.5;" x1="59.5" x2="176.5" y1="329" y2="329"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="74" x="64.5" y="345.9951">id : integer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="64.5" y="362.292">name : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="107" x="64.5" y="378.5889">tag : string {O}</text></g><!--class Pets--><g id="elem_Pets"><rect codeLine="17" fill="#F1F1F1" height="32" id="Pets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="63" x="27.5" y="183.5"/><ellipse cx="42.5" cy="199.5" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M45.4688,205.1406 Q44.8906,205.4375 44.25,205.5781 Q43.6094,205.7344 42.9063,205.7344 Q40.4063,205.7344 39.0781,204.0938 Q37.7656,202.4375 37.7656,199.3125 Q37.7656,196.1875 39.0781,194.5313 Q40.4063,192.875 42.9063,192.875 Q43.6094,192.875 44.25,193.0313 Q44.9063,193.1875 45.4688,193.4844 L45.4688,196.2031 Q44.8438,195.625 44.25,195.3594 Q43.6563,195.0781 43.0313,195.0781 Q41.6875,195.0781 41,196.1563 Q40.3125,197.2188 40.3125,199.3125 Q40.3125,201.4063 41,202.4844 Q41.6875,203.5469 43.0313,203.5469 Q43.6563,203.5469 44.25,203.2813 Q44.8438,203 45.4688,202.4219 L45.4688,205.1406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="31" x="56.5" y="204.3467">Pets</text></g><!--class Error--><g id="elem_Error"><rect codeLine="20" fill="#F1F1F1" height="72.5938" id="Error" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="128" x="238" y="163"/><ellipse cx="281.35" cy="179" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M284.3188,184.6406 Q283.7406,184.9375 283.1,185.0781 Q282.4594,185.2344 281.7563,185.2344 Q279.2563,185.2344 277.9281,183.5938 Q276.6156,181.9375 276.6156,178.8125 Q276.6156,175.6875 277.9281,174.0313 Q279.2563,172.375 281.7563,172.375 Q282.4594,172.375 283.1,172.5313 Q283.7563,172.6875 284.3188,172.9844 L284.3188,175.7031 Q283.6938,175.125 283.1,174.8594 Q282.5063,174.5781 281.8813,174.5781 Q280.5375,174.5781 279.85,175.6563 Q279.1625,176.7188 279.1625,178.8125 Q279.1625,180.9063 279.85,181.9844 Q280.5375,183.0469 281.8813,183.0469 Q282.5063,183.0469 283.1,182.7813 Q283.6938,182.5 284.3188,181.9219 L284.3188,184.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="33" x="301.65" y="183.8467">Error</text><line style="stroke:#181818;stroke-width:0.5;" x1="239" x2="365" y1="195" y2="195"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="244" y="211.9951">code : integer</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="244" y="228.292">message : string</text></g><!--class listPets--><g id="elem_listPets"><rect codeLine="25" fill="#F5DEB3" height="78.5313" id="listPets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="7" y="7"/><ellipse cx="36.85" cy="34.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M39.8188,39.7578 Q39.2406,40.0547 38.6,40.1953 Q37.9594,40.3516 37.2563,40.3516 Q34.7563,40.3516 33.4281,38.7109 Q32.1156,37.0547 32.1156,33.9297 Q32.1156,30.8047 33.4281,29.1484 Q34.7563,27.4922 37.2563,27.4922 Q37.9594,27.4922 38.6,27.6484 Q39.2563,27.8047 39.8188,28.1016 L39.8188,30.8203 Q39.1938,30.2422 38.6,29.9766 Q38.0063,29.6953 37.3813,29.6953 Q36.0375,29.6953 35.35,30.7734 Q34.6625,31.8359 34.6625,33.9297 Q34.6625,36.0234 35.35,37.1016 Q36.0375,38.1641 37.3813,38.1641 Q38.0063,38.1641 38.6,37.8984 Q39.1938,37.6172 39.8188,37.0391 L39.8188,39.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="67.65" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="73" x="52.15" y="37.1074">«GET /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="50" x="63.65" y="52.9326">listPets</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="140" y1="61.2344" y2="61.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="78.2295">limit : integer {O}</text></g><!--class createPets--><g id="elem_createPets"><rect codeLine="29" fill="#F5DEB3" height="54.2344" id="createPets" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="107" x="392.5" y="19.5"/><ellipse cx="407.5" cy="46.6172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M410.4688,52.2578 Q409.8906,52.5547 409.25,52.6953 Q408.6094,52.8516 407.9063,52.8516 Q405.4063,52.8516 404.0781,51.2109 Q402.7656,49.5547 402.7656,46.4297 Q402.7656,43.3047 404.0781,41.6484 Q405.4063,39.9922 407.9063,39.9922 Q408.6094,39.9922 409.25,40.1484 Q409.9063,40.3047 410.4688,40.6016 L410.4688,43.3203 Q409.8438,42.7422 409.25,42.4766 Q408.6563,42.1953 408.0313,42.1953 Q406.6875,42.1953 406,43.2734 Q405.3125,44.3359 405.3125,46.4297 Q405.3125,48.5234 406,49.6016 Q406.6875,50.6641 408.0313,50.6641 Q408.6563,50.6641 409.25,50.3984 Q409.8438,50.1172 410.4688,49.5391 L410.4688,52.2578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="438" y="35.6387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="79" x="419.5" y="49.6074">«POST /pets»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="75" x="421.5" y="65.4326">createPets</text></g><!--class createPets 201--><g id="elem_createPets 201"><rect codeLine="32" fill="#F1F1F1" height="40.2656" id="createPets 201" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="112" x="401" y="179.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="420" y="195.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="106" x="404" y="211.4639">createPets 201</text></g><!--class showPetById--><g id="elem_showPetById"><rect codeLine="35" fill="#F5DEB3" height="78.5313" id="showPetById" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="154" x="192" y="7"/><ellipse cx="207" cy="34.1172" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M209.9688,39.7578 Q209.3906,40.0547 208.75,40.1953 Q208.1094,40.3516 207.4063,40.3516 Q204.9063,40.3516 203.5781,38.7109 Q202.2656,37.0547 202.2656,33.9297 Q202.2656,30.8047 203.5781,29.1484 Q204.9063,27.4922 207.4063,27.4922 Q208.1094,27.4922 208.75,27.6484 Q209.4063,27.8047 209.9688,28.1016 L209.9688,30.8203 Q209.3438,30.2422 208.75,29.9766 Q208.1563,29.6953 207.5313,29.6953 Q206.1875,29.6953 205.5,30.7734 Q204.8125,31.8359 204.8125,33.9297 Q204.8125,36.0234 205.5,37.1016 Q206.1875,38.1641 207.5313,38.1641 Q208.1563,38.1641 208.75,37.8984 Q209.3438,37.6172 209.9688,37.0391 L209.9688,39.7578 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="261" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="126" x="219" y="37.1074">«GET /pets/{petId}»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="89" x="237.5" y="52.9326">showPetById</text><line style="stroke:#181818;stroke-width:0.5;" x1="193" x2="345" y1="61.2344" y2="61.2344"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="87" x="198" y="78.2295">petId : string</text></g><!--link Pets to Pet--><g id="link_Pets_Pet"><path codeLine="39" d="M65.43,215.75 C73.58,235.1 85.6605,263.7507 97.3305,291.4507 " fill="none" id="Pets-to-Pet" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="99.66,296.98,99.852,287.133,97.7187,292.3722,92.4795,290.239,99.66,296.98" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="89.1793" y="285.7755">*</text></g><!--link listPets to Pets--><g id="link_listPets_Pets"><path codeLine="41" d="M50.3,86.11 C45.64,95.56 41.44,105.87 39,116 C33.34,139.5 40.5874,161.32 48.3674,177.87 " fill="none" id="listPets-to-Pets" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="50.92,183.3,50.7111,173.4534,48.7929,178.775,43.4712,176.8568,50.92,183.3" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="40" y="129.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="38.9185" y="172.5383">1</text></g><!--link listPets to Error--><g id="link_listPets_Error"><path codeLine="43" d="M132.42,86.19 C168.04,109.78 208.2473,136.4174 243.0273,159.4474 " fill="none" id="listPets-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="248.03,162.76,242.7344,154.456,243.8611,159.9995,238.3176,161.1262,248.03,162.76" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="202" y="129.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="229.7041" y="151.9947">1</text></g><!--link createPets to createPets 201--><g id="link_createPets_createPets 201"><path codeLine="45" d="M447.92,73.8 C450.11,103.88 453.2043,146.4358 455.1543,173.2158 " fill="none" id="createPets-to-createPets 201" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="455.59,179.2,458.9258,169.9333,455.2269,174.2132,450.947,170.5143,455.59,179.2" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="453" y="129.0669">201</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="446.0684" y="168.4295">1</text></g><!--link createPets to Error--><g id="link_createPets_Error"><path codeLine="47" d="M420.92,73.8 C397.39,98.48 366.1605,131.2176 340.1105,158.5376 " fill="none" id="createPets-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="335.97,162.88,345.0757,159.1268,339.4204,159.2614,339.2859,153.6061,335.97,162.88" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="379" y="129.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="333.4957" y="151.862">1</text></g><!--link showPetById to Pet--><g id="link_showPetById_Pet"><path codeLine="49" d="M242.05,86.12 C227.26,108.12 209.11,136.52 195,163 C171.39,207.32 151.2999,254.8318 136.8399,291.3318 " fill="none" id="showPetById-to-Pet" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="134.63,296.91,141.6636,290.0159,136.4716,292.2615,134.226,287.0694,134.63,296.91" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="196" y="204.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="128.564" y="286.0192">1</text></g><!--link showPetById to Error--><g id="link_showPetById_Error"><path codeLine="51" d="M271.04,86.14 C272.35,100.93 274.49,117.88 278,133 C280.3,142.91 281.611,147.7343 285.111,157.3143 " fill="none" id="showPetById-to-Error" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="287.17,162.95,287.8387,153.1239,285.4542,158.2536,280.3245,155.8691,287.17,162.95" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="44" x="279" y="129.0669">default</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="275.6982" y="151.9449">1</text></g><!--SRC=[TP5FYuCm4CNlVeeXnuN-FIwbXovbwQcoNTXpC5CDrKIIbAM8ttr7xMfYzIBnpSpllKmoAH1skvYxRB-7H9eanoZhn2-qfLOMNmenDxn0XsPKmQ9q3w1AfeNrfQl4d1HxawfiPY79kRLGHGUUt5AZxqfyw5oRFiXFXjn5TMJHWI8lM_84BzWCEsr0QOLHr45OZ8uH2g1gRMgG0jv1AeSf6azkE5ImpaYLUhhZQIz3TQx9raFRXZqeHsEq2UqIBN3Ia69RddgU0oQNrdNm_ifq-Zn-mweakVdrBN9PI3TuZ58cXfQ5hxZuV0buKnEmNMzO-DP1fytqB_KT7YSnatLLqVSawd7cLWtk_bpdOh47ziQwXoDrsCLoIPKD-zyx3GFRhjSpJS-dQBi4NlazRt7-DlhUyOMVwCtim0myM8SVDqmxtJR9_0C0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/ref-class-level.puml.svg b/src/docs/tests/ref-class-level.puml.svg
index d355044..e9ac73c 100644
--- a/src/docs/tests/ref-class-level.puml.svg
+++ b/src/docs/tests/ref-class-level.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="178px" preserveAspectRatio="none" style="width:143px;height:178px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 178" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="99"/><ellipse cx="35.05" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M38.0188,120.6406 Q37.4406,120.9375 36.8,121.0781 Q36.1594,121.2344 35.4563,121.2344 Q32.9563,121.2344 31.6281,119.5938 Q30.3156,117.9375 30.3156,114.8125 Q30.3156,111.6875 31.6281,110.0313 Q32.9563,108.375 35.4563,108.375 Q36.1594,108.375 36.8,108.5313 Q37.4563,108.6875 38.0188,108.9844 L38.0188,111.7031 Q37.3938,111.125 36.8,110.8594 Q36.2063,110.5781 35.5813,110.5781 Q34.2375,110.5781 33.55,111.6563 Q32.8625,112.7188 32.8625,114.8125 Q32.8625,116.9063 33.55,117.9844 Q34.2375,119.0469 35.5813,119.0469 Q36.2063,119.0469 36.8,118.7813 Q37.3938,118.5 38.0188,117.9219 L38.0188,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="51.95" y="119.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="147.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="164.292">lastName : string</text></g><!--class Client--><g id="elem_Client"><rect codeLine="16" fill="#F1F1F1" height="32" id="Client" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="36" y="7"/><ellipse cx="51" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M53.9688,28.6406 Q53.3906,28.9375 52.75,29.0781 Q52.1094,29.2344 51.4063,29.2344 Q48.9063,29.2344 47.5781,27.5938 Q46.2656,25.9375 46.2656,22.8125 Q46.2656,19.6875 47.5781,18.0313 Q48.9063,16.375 51.4063,16.375 Q52.1094,16.375 52.75,16.5313 Q53.4063,16.6875 53.9688,16.9844 L53.9688,19.7031 Q53.3438,19.125 52.75,18.8594 Q52.1563,18.5781 51.5313,18.5781 Q50.1875,18.5781 49.5,19.6563 Q48.8125,20.7188 48.8125,22.8125 Q48.8125,24.9063 49.5,25.9844 Q50.1875,27.0469 51.5313,27.0469 Q52.1563,27.0469 52.75,26.7813 Q53.3438,26.5 53.9688,25.9219 L53.9688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="65" y="27.8467">Client</text></g><!--link Client to Customer--><g id="link_Client_Customer"><path codeLine="19" d="M71.5,39.36 C71.5,54.66 71.5,72.7 71.5,92.79 " fill="none" id="Client-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,98.79,75.5,89.79,71.5,93.79,67.5,89.79,71.5,98.79" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="62.7875" y="88.03">1</text></g><!--SRC=[POwn3i8m34JtV8NLlGChGXtAZX0WCKUfQIBIkBBT0LNzTrAGe9JHx-dEvqE3iDiThVgg0XVOHJJ-3KyeFIN1Ft6qR3jKv9N1hjS7PEEfaIMw1OoPo3saViw2YrO4HbDRTs-PXjJiAH9_XbmzMZKrSOFyQoxKMQN922gal49ww_2CSwqIGwA4nhphY_qWIXroaJy1ZAyLKnx3eeSSXIs8SaZjGkRWoatVkXWmwLoMsUSgomgAJR7uPfu0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="178px" preserveAspectRatio="none" style="width:143px;height:178px;background:#FFFFFF;" version="1.1" viewBox="0 0 143 178" width="143px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="72.5938" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="129" x="7" y="99"/><ellipse cx="35.05" cy="115" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M38.0188,120.6406 Q37.4406,120.9375 36.8,121.0781 Q36.1594,121.2344 35.4563,121.2344 Q32.9563,121.2344 31.6281,119.5938 Q30.3156,117.9375 30.3156,114.8125 Q30.3156,111.6875 31.6281,110.0313 Q32.9563,108.375 35.4563,108.375 Q36.1594,108.375 36.8,108.5313 Q37.4563,108.6875 38.0188,108.9844 L38.0188,111.7031 Q37.3938,111.125 36.8,110.8594 Q36.2063,110.5781 35.5813,110.5781 Q34.2375,110.5781 33.55,111.6563 Q32.8625,112.7188 32.8625,114.8125 Q32.8625,116.9063 33.55,117.9844 Q34.2375,119.0469 35.5813,119.0469 Q36.2063,119.0469 36.8,118.7813 Q37.3938,118.5 38.0188,117.9219 L38.0188,120.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="51.95" y="119.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="135" y1="131" y2="131"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="147.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="164.292">lastName : string</text></g><!--class Client--><g id="elem_Client"><rect codeLine="16" fill="#F1F1F1" height="32" id="Client" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="71" x="36" y="7"/><ellipse cx="51" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M53.9688,28.6406 Q53.3906,28.9375 52.75,29.0781 Q52.1094,29.2344 51.4063,29.2344 Q48.9063,29.2344 47.5781,27.5938 Q46.2656,25.9375 46.2656,22.8125 Q46.2656,19.6875 47.5781,18.0313 Q48.9063,16.375 51.4063,16.375 Q52.1094,16.375 52.75,16.5313 Q53.4063,16.6875 53.9688,16.9844 L53.9688,19.7031 Q53.3438,19.125 52.75,18.8594 Q52.1563,18.5781 51.5313,18.5781 Q50.1875,18.5781 49.5,19.6563 Q48.8125,20.7188 48.8125,22.8125 Q48.8125,24.9063 49.5,25.9844 Q50.1875,27.0469 51.5313,27.0469 Q52.1563,27.0469 52.75,26.7813 Q53.3438,26.5 53.9688,25.9219 L53.9688,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="39" x="65" y="27.8467">Client</text></g><!--link Client to Customer--><g id="link_Client_Customer"><path codeLine="19" d="M71.5,39.36 C71.5,54.66 71.5,72.7 71.5,92.79 " fill="none" id="Client-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="71.5,98.79,75.5,89.79,71.5,93.79,67.5,89.79,71.5,98.79" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="62.7875" y="88.03">1</text></g><!--SRC=[POwn3eCm34JtV8N5pj2rgXZANg5sw1m5bqI49BBDK27-lQ585D7Hz_JkR5sBSBaqMcnLWN5aF2gxXdVa50FZ7sWqwG45wK1mIFA6J6niUH-z7FgSSEz2MbmmNZF3fAxQz1t5CRHrz96sHvuMjQXPCGg4lCL96tpW8aia236WKcj9KOyiSK0gSX_0zDsQyoIntB8APs0X5xeTpEA1pRywxp38KfQpxIhB2efJiLjJ7m00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/request-body-ref-ref.puml.svg b/src/docs/tests/request-body-ref-ref.puml.svg
index 44540cc..a0a3402 100644
--- a/src/docs/tests/request-body-ref-ref.puml.svg
+++ b/src/docs/tests/request-body-ref-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:506px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 506 434" width="506px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="255.5" y="225"/><ellipse cx="339.25" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M342.2188,246.6406 Q341.6406,246.9375 341,247.0781 Q340.3594,247.2344 339.6563,247.2344 Q337.1563,247.2344 335.8281,245.5938 Q334.5156,243.9375 334.5156,240.8125 Q334.5156,237.6875 335.8281,236.0313 Q337.1563,234.375 339.6563,234.375 Q340.3594,234.375 341,234.5313 Q341.6563,234.6875 342.2188,234.9844 L342.2188,237.7031 Q341.5938,237.125 341,236.8594 Q340.4063,236.5781 339.7813,236.5781 Q338.4375,236.5781 337.75,237.6563 Q337.0625,238.7188 337.0625,240.8125 Q337.0625,242.9063 337.75,243.9844 Q338.4375,245.0469 339.7813,245.0469 Q340.4063,245.0469 341,244.7813 Q341.5938,244.5 342.2188,243.9219 L342.2188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="359.75" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="256.5" x2="498.5" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="261.5" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="261.5" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="261.5" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="261.5" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="261.5" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="261.5" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="261.5" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="261.5" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="261.5" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="261.5" y="420.667">picture : byte[] {O}</text></g><!--class repositories--><g id="elem_repositories"><rect codeLine="24" fill="#F1F1F1" height="40.2656" id="repositories" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="68.5" y="124"/><ellipse cx="83.5" cy="144.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M86.4688,149.7734 Q85.8906,150.0703 85.25,150.2109 Q84.6094,150.3672 83.9063,150.3672 Q81.4063,150.3672 80.0781,148.7266 Q78.7656,147.0703 78.7656,143.9453 Q78.7656,140.8203 80.0781,139.1641 Q81.4063,137.5078 83.9063,137.5078 Q84.6094,137.5078 85.25,137.6641 Q85.9063,137.8203 86.4688,138.1172 L86.4688,140.8359 Q85.8438,140.2578 85.25,139.9922 Q84.6563,139.7109 84.0313,139.7109 Q82.6875,139.7109 82,140.7891 Q81.3125,141.8516 81.3125,143.9453 Q81.3125,146.0391 82,147.1172 Q82.6875,148.1797 84.0313,148.1797 Q84.6563,148.1797 85.25,147.9141 Q85.8438,147.6328 86.4688,147.0547 L86.4688,149.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="95.5" y="140.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="102.5" y="155.9639">repositories</text></g><!--class repositoriesAlt--><g id="elem_repositoriesAlt"><rect codeLine="27" fill="#F1F1F1" height="64.5625" id="repositoriesAlt" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="7" y="294"/><ellipse cx="59.75" cy="314.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M62.7188,319.7734 Q62.1406,320.0703 61.5,320.2109 Q60.8594,320.3672 60.1563,320.3672 Q57.6563,320.3672 56.3281,318.7266 Q55.0156,317.0703 55.0156,313.9453 Q55.0156,310.8203 56.3281,309.1641 Q57.6563,307.5078 60.1563,307.5078 Q60.8594,307.5078 61.5,307.6641 Q62.1563,307.8203 62.7188,308.1172 L62.7188,310.8359 Q62.0938,310.2578 61.5,309.9922 Q60.9063,309.7109 60.2813,309.7109 Q58.9375,309.7109 58.25,310.7891 Q57.5625,311.8516 57.5625,313.9453 Q57.5625,316.0391 58.25,317.1172 Q58.9375,318.1797 60.2813,318.1797 Q60.9063,318.1797 61.5,317.9141 Q62.0938,317.6328 62.7188,317.0547 L62.7188,319.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="81.75" y="310.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="80.25" y="325.9639">repositoriesAlt</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="219" y1="334.2656" y2="334.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="13" y="351.2607">repository_ids : integer[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="31" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="145.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="207.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="148.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="34" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="262" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="323.5" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="265" y="155.9639">GET /customer/expired 200</text></g><!--link repositories to repositoriesAlt--><g id="link_repositories_repositoriesAlt"><path codeLine="37" d="M128.68,164.32 C125.76,195.33 120.5635,250.5565 117.0335,287.9765 " fill="none" id="repositories-to-repositoriesAlt" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="116.47,293.95,121.2976,285.3655,116.9396,288.9721,113.3329,284.6141,116.47,293.95" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="108.2576" y="282.8154">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="39" d="M362.32,164.32 C363.74,179.41 365.2782,195.6864 367.4582,218.8664 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="368.02,224.84,371.1597,215.505,367.5518,219.862,363.1949,216.2541,368.02,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="360.0668" y="213.8965">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="41" d="M250.59,47.25 C274.96,68.48 309.4162,98.4986 333.8062,119.7486 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="338.33,123.69,334.1719,114.762,334.5601,120.4055,328.9166,120.7937,338.33,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="302.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="322.9697" y="112.9167">1</text></g><!--link GET /customer/expired to repositories--><g id="link_GET /customer/expired_repositories"><path codeLine="43" d="M212.1,47.25 C194.01,68.48 168.9618,97.8734 150.8518,119.1234 " fill="none" id="GET /customer/expired-to-repositories" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="146.96,123.69,155.8421,119.4346,150.2032,119.8845,149.7533,114.2456,146.96,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="142.4644" y="112.9167">1</text></g><!--SRC=[VL9DYnin3BtFhp0-5lQhnx84cb1wsitI3VHGIl7QIYpYiQQIPca8-U_rJ48-9icUnkFtzDwJfOW1pEFZYzCu6XcFx1DKSNlv0wIXB706l3XsDIZm086wqPKfIAGWnrTpX5HkP8cvwMgDJqx4hAknyyi5Kvl3X1BnFiZF24whCN40FaLcL3kbJIMW9fSKqZWFhz39Ah79bA6gjl9sqefI3MoBap7hFiMcX67Hvr9glXXHnhmu0alXLIm2Bg8-WJ98mGDuh5qow-dcY1ISmdG-HjROSShVGFqLH93o37iJBHzHLpS3cTpMRy3J-IHY2WovK34hB807H9VmlHDw8qhWyb06_R9_fNq_ltuFA7FtJYsZmdDlAGUdCsg3NblktLOAEtYpVsw6XWJB5134zllpjotDZIciok3A32vJloQzo3xuxjchFnZE0nvalt-RcJk_c_eT_6kG8TZ3Vfzak4Wsd-_lxUdkRui6tTtSZ8nziEUT5EO7mdtP9tkqcjVurjpUxYm-q2jlOMntkYvpCQcj_WC0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="434px" preserveAspectRatio="none" style="width:506px;height:434px;background:#FFFFFF;" version="1.1" viewBox="0 0 506 434" width="506px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="255.5" y="225"/><ellipse cx="339.25" cy="241" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M342.2188,246.6406 Q341.6406,246.9375 341,247.0781 Q340.3594,247.2344 339.6563,247.2344 Q337.1563,247.2344 335.8281,245.5938 Q334.5156,243.9375 334.5156,240.8125 Q334.5156,237.6875 335.8281,236.0313 Q337.1563,234.375 339.6563,234.375 Q340.3594,234.375 341,234.5313 Q341.6563,234.6875 342.2188,234.9844 L342.2188,237.7031 Q341.5938,237.125 341,236.8594 Q340.4063,236.5781 339.7813,236.5781 Q338.4375,236.5781 337.75,237.6563 Q337.0625,238.7188 337.0625,240.8125 Q337.0625,242.9063 337.75,243.9844 Q338.4375,245.0469 339.7813,245.0469 Q340.4063,245.0469 341,244.7813 Q341.5938,244.5 342.2188,243.9219 L342.2188,246.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="359.75" y="245.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="256.5" x2="498.5" y1="257" y2="257"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="261.5" y="273.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="261.5" y="290.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="261.5" y="306.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="261.5" y="322.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="261.5" y="339.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="261.5" y="355.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="261.5" y="371.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="261.5" y="388.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="261.5" y="404.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="261.5" y="420.667">picture : byte[] {O}</text></g><!--class repositories--><g id="elem_repositories"><rect codeLine="24" fill="#F1F1F1" height="40.2656" id="repositories" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="124" x="68.5" y="124"/><ellipse cx="83.5" cy="144.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M86.4688,149.7734 Q85.8906,150.0703 85.25,150.2109 Q84.6094,150.3672 83.9063,150.3672 Q81.4063,150.3672 80.0781,148.7266 Q78.7656,147.0703 78.7656,143.9453 Q78.7656,140.8203 80.0781,139.1641 Q81.4063,137.5078 83.9063,137.5078 Q84.6094,137.5078 85.25,137.6641 Q85.9063,137.8203 86.4688,138.1172 L86.4688,140.8359 Q85.8438,140.2578 85.25,139.9922 Q84.6563,139.7109 84.0313,139.7109 Q82.6875,139.7109 82,140.7891 Q81.3125,141.8516 81.3125,143.9453 Q81.3125,146.0391 82,147.1172 Q82.6875,148.1797 84.0313,148.1797 Q84.6563,148.1797 85.25,147.9141 Q85.8438,147.6328 86.4688,147.0547 L86.4688,149.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="95.5" y="140.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="102.5" y="155.9639">repositories</text></g><!--class repositoriesAlt--><g id="elem_repositoriesAlt"><rect codeLine="27" fill="#F1F1F1" height="64.5625" id="repositoriesAlt" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="7" y="294"/><ellipse cx="59.75" cy="314.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M62.7188,319.7734 Q62.1406,320.0703 61.5,320.2109 Q60.8594,320.3672 60.1563,320.3672 Q57.6563,320.3672 56.3281,318.7266 Q55.0156,317.0703 55.0156,313.9453 Q55.0156,310.8203 56.3281,309.1641 Q57.6563,307.5078 60.1563,307.5078 Q60.8594,307.5078 61.5,307.6641 Q62.1563,307.8203 62.7188,308.1172 L62.7188,310.8359 Q62.0938,310.2578 61.5,309.9922 Q60.9063,309.7109 60.2813,309.7109 Q58.9375,309.7109 58.25,310.7891 Q57.5625,311.8516 57.5625,313.9453 Q57.5625,316.0391 58.25,317.1172 Q58.9375,318.1797 60.2813,318.1797 Q60.9063,318.1797 61.5,317.9141 Q62.0938,317.6328 62.7188,317.0547 L62.7188,319.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="81.75" y="310.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="99" x="80.25" y="325.9639">repositoriesAlt</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="219" y1="334.2656" y2="334.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="13" y="351.2607">repository_ids : integer[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="31" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="145.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="207.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="148.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="34" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="262" y="124"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="323.5" y="140.1387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="265" y="155.9639">GET /customer/expired 200</text></g><!--link repositories to repositoriesAlt--><g id="link_repositories_repositoriesAlt"><path codeLine="37" d="M128.68,164.32 C125.76,195.33 120.5635,250.5565 117.0335,287.9765 " fill="none" id="repositories-to-repositoriesAlt" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="116.47,293.95,121.2976,285.3655,116.9396,288.9721,113.3329,284.6141,116.47,293.95" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="108.2576" y="282.8154">1</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="39" d="M362.32,164.32 C363.74,179.41 365.2782,195.6864 367.4582,218.8664 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="368.02,224.84,371.1597,215.505,367.5518,219.862,363.1949,216.2541,368.02,224.84" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="360.0668" y="213.8965">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="41" d="M250.59,47.25 C274.96,68.48 309.4162,98.4986 333.8062,119.7486 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="338.33,123.69,334.1719,114.762,334.5601,120.4055,328.9166,120.7937,338.33,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="302.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="322.9697" y="112.9167">1</text></g><!--link GET /customer/expired to repositories--><g id="link_GET /customer/expired_repositories"><path codeLine="43" d="M212.1,47.25 C194.01,68.48 168.9618,97.8734 150.8518,119.1234 " fill="none" id="GET /customer/expired-to-repositories" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="146.96,123.69,155.8421,119.4346,150.2032,119.8845,149.7533,114.2456,146.96,123.69" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="142.4644" y="112.9167">1</text></g><!--SRC=[VL9DQnin4BtlhnXqBEIhnn0CjIaz9GvDe8SGYYADhS5QQJip6sAC_tkrQsCxQpkdrSvxyzvy1V88TtUFLiDe18xOHQp29lWRfSb9y0Xuj6nhLEG1WdMZIoX8o5uEGpF2M2AoeDHqkU2Y5O5LDRPkCUVS9Z_9CVEka3y1hLRhIb0X5IzfhCCdx98rCwISiAes8cRIYkOQsHGzW5NljIwMBFfGKk4MH9dI_00iYMUnW3GFUe_AA0NtwAYs4LRJzG79MyNfR4oieUEKlu7w4ufGJi_KcsZvYDgw6SYajdv3diucWQ9dJ8LAIN6EF23QIE-Tq5lE4MqQof1Rz5FQzVFoEg3Cx7jkcHGVUalPEnrH6tBQSk-sLDp2wzsu6PiiLBP0AAQ_adzjQMwS_R8ihkpWDFL7r9FilU-ElVnB_hZ0lUoldyzmvRPRlyAFXXYzsL_nfnfEak7xzRNvVE6Rf45t5nSZC3Vck9F2_4AuJ_jc3axp7D_0vUNMuWkzCWimtUkypCbAJVKV]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/request-body-ref.puml.svg b/src/docs/tests/request-body-ref.puml.svg
index 142ec75..d0df142 100644
--- a/src/docs/tests/request-body-ref.puml.svg
+++ b/src/docs/tests/request-body-ref.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="459px" preserveAspectRatio="none" style="width:482px;height:459px;background:#FFFFFF;" version="1.1" viewBox="0 0 482 459" width="482px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="231.5" y="250"/><ellipse cx="315.25" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M318.2188,271.6406 Q317.6406,271.9375 317,272.0781 Q316.3594,272.2344 315.6563,272.2344 Q313.1563,272.2344 311.8281,270.5938 Q310.5156,268.9375 310.5156,265.8125 Q310.5156,262.6875 311.8281,261.0313 Q313.1563,259.375 315.6563,259.375 Q316.3594,259.375 317,259.5313 Q317.6563,259.6875 318.2188,259.9844 L318.2188,262.7031 Q317.5938,262.125 317,261.8594 Q316.4063,261.5781 315.7813,261.5781 Q314.4375,261.5781 313.75,262.6563 Q313.0625,263.7188 313.0625,265.8125 Q313.0625,267.9063 313.75,268.9844 Q314.4375,270.0469 315.7813,270.0469 Q316.4063,270.0469 317,269.7813 Q317.5938,269.5 318.2188,268.9219 L318.2188,271.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="335.75" y="270.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="232.5" x2="474.5" y1="282" y2="282"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="237.5" y="298.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="237.5" y="315.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="237.5" y="331.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="237.5" y="347.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="237.5" y="364.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="237.5" y="380.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="237.5" y="396.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="237.5" y="413.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="237.5" y="429.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="237.5" y="445.667">picture : byte[] {O}</text></g><!--class repositories--><g id="elem_repositories"><rect codeLine="24" fill="#F1F1F1" height="64.5625" id="repositories" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="7" y="124"/><ellipse cx="63.25" cy="144.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M66.2188,149.7734 Q65.6406,150.0703 65,150.2109 Q64.3594,150.3672 63.6563,150.3672 Q61.1563,150.3672 59.8281,148.7266 Q58.5156,147.0703 58.5156,143.9453 Q58.5156,140.8203 59.8281,139.1641 Q61.1563,137.5078 63.6563,137.5078 Q64.3594,137.5078 65,137.6641 Q65.6563,137.8203 66.2188,138.1172 L66.2188,140.8359 Q65.5938,140.2578 65,139.9922 Q64.4063,139.7109 63.7813,139.7109 Q62.4375,139.7109 61.75,140.7891 Q61.0625,141.8516 61.0625,143.9453 Q61.0625,146.0391 61.75,147.1172 Q62.4375,148.1797 63.7813,148.1797 Q64.4063,148.1797 65,147.9141 Q65.5938,147.6328 66.2188,147.0547 L66.2188,149.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="81.75" y="140.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="88.75" y="155.9639">repositories</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="219" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="13" y="181.2607">repository_ids : integer[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="28" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="59.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="121.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="62.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="31" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="255" y="136.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="316.5" y="152.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="258" y="168.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="34" d="M353.5,176.71 C353.5,194.35 353.5,215.93 353.5,243.97 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="353.5,249.97,357.5,240.97,353.5,244.97,349.5,240.97,353.5,249.97" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="346.243" y="239.036">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="36" d="M174.09,47.09 C213.98,71.19 277.0749,109.3167 316.9049,133.3867 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="322.04,136.49,316.4061,128.4117,317.7607,133.9039,312.2684,135.2585,322.04,136.49" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="249.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="303.6236" y="125.4563">1</text></g><!--link GET /customer/expired to repositories--><g id="link_GET /customer/expired_repositories"><path codeLine="38" d="M138.16,47.09 C133.54,67.37 127.4998,93.9292 122.0198,118.0392 " fill="none" id="GET /customer/expired-to-repositories" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="120.69,123.89,126.5853,116.0004,121.7982,119.0144,118.7842,114.2273,120.69,123.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="113.3479" y="112.743">1</text></g><!--SRC=[XL9DYzj03BtxLuWv5lQZFPObXuJIKpTBDz13AMLsHic8s2DNafU6aF_UiRFamo7RayTwJ-_fAr54U7XuyfOc4mWaeSOgxOFVKLlEYXV0anVVeA6C46nQsq114aSz3Iq9wnBHDUMspuLGUrNOLbCVrYlXBiSProo7Gduaz5PDMIBAERBWnXllAaM3NAhGrWTynbxMM21pnghQoxjPfyODYYjE0DkXYbqfHjGUIofy1ZMXl3e1I-9LB26jadr34zI2HmpK-1gsyzq9ANh3-N9AOgddbB-H-ZEg4kS53IPMFcg-QKSokMjUKERBMQ8w2kP2fMouGXaHVKsllT0BSuq-ZsKeh8Sf7Vhv-Mj4MVfNxeGC7mTBFJfTK5iAridWjZ5yWtU7SGksh5IsGAXkk9y_NMbkod5J5dUsWmDryvlYfULHy-kN1To5jptUuT-M1ACxNcnH_GyPFjtVk_DhtYUzHx-vcO3xu4vEw1hVmUrjuNvqxzgN3i7rh-ioWsKlSpR6wXy0]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="459px" preserveAspectRatio="none" style="width:482px;height:459px;background:#FFFFFF;" version="1.1" viewBox="0 0 482 459" width="482px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="231.5" y="250"/><ellipse cx="315.25" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M318.2188,271.6406 Q317.6406,271.9375 317,272.0781 Q316.3594,272.2344 315.6563,272.2344 Q313.1563,272.2344 311.8281,270.5938 Q310.5156,268.9375 310.5156,265.8125 Q310.5156,262.6875 311.8281,261.0313 Q313.1563,259.375 315.6563,259.375 Q316.3594,259.375 317,259.5313 Q317.6563,259.6875 318.2188,259.9844 L318.2188,262.7031 Q317.5938,262.125 317,261.8594 Q316.4063,261.5781 315.7813,261.5781 Q314.4375,261.5781 313.75,262.6563 Q313.0625,263.7188 313.0625,265.8125 Q313.0625,267.9063 313.75,268.9844 Q314.4375,270.0469 315.7813,270.0469 Q316.4063,270.0469 317,269.7813 Q317.5938,269.5 318.2188,268.9219 L318.2188,271.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="335.75" y="270.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="232.5" x2="474.5" y1="282" y2="282"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="237.5" y="298.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="237.5" y="315.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="237.5" y="331.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="237.5" y="347.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="237.5" y="364.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="237.5" y="380.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="237.5" y="396.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="237.5" y="413.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="237.5" y="429.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="237.5" y="445.667">picture : byte[] {O}</text></g><!--class repositories--><g id="elem_repositories"><rect codeLine="24" fill="#F1F1F1" height="64.5625" id="repositories" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="213" x="7" y="124"/><ellipse cx="63.25" cy="144.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M66.2188,149.7734 Q65.6406,150.0703 65,150.2109 Q64.3594,150.3672 63.6563,150.3672 Q61.1563,150.3672 59.8281,148.7266 Q58.5156,147.0703 58.5156,143.9453 Q58.5156,140.8203 59.8281,139.1641 Q61.1563,137.5078 63.6563,137.5078 Q64.3594,137.5078 65,137.6641 Q65.6563,137.8203 66.2188,138.1172 L66.2188,140.8359 Q65.5938,140.2578 65,139.9922 Q64.4063,139.7109 63.7813,139.7109 Q62.4375,139.7109 61.75,140.7891 Q61.0625,141.8516 61.0625,143.9453 Q61.0625,146.0391 61.75,147.1172 Q62.4375,148.1797 63.7813,148.1797 Q64.4063,148.1797 65,147.9141 Q65.5938,147.6328 66.2188,147.0547 L66.2188,149.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="81.75" y="140.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="82" x="88.75" y="155.9639">repositories</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="219" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="13" y="181.2607">repository_ids : integer[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="28" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="59.5" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="121.5" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="62.5" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="31" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="255" y="136.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="316.5" y="152.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="258" y="168.4639">GET /customer/expired 200</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="34" d="M353.5,176.71 C353.5,194.35 353.5,215.93 353.5,243.97 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="353.5,249.97,357.5,240.97,353.5,244.97,349.5,240.97,353.5,249.97" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="346.243" y="239.036">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="36" d="M174.09,47.09 C213.98,71.19 277.0749,109.3167 316.9049,133.3867 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="322.04,136.49,316.4061,128.4117,317.7607,133.9039,312.2684,135.2585,322.04,136.49" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="249.5" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="303.6236" y="125.4563">1</text></g><!--link GET /customer/expired to repositories--><g id="link_GET /customer/expired_repositories"><path codeLine="38" d="M138.16,47.09 C133.54,67.37 127.4998,93.9292 122.0198,118.0392 " fill="none" id="GET /customer/expired-to-repositories" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="120.69,123.89,126.5853,116.0004,121.7982,119.0144,118.7842,114.2273,120.69,123.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="113.3479" y="112.743">1</text></g><!--SRC=[XL9BQzj04BxhLmnx3EJLOma-s9IU6eScq4CfPRCxzWwMTjMPKQWn_kyToS4F6QSdIVEzD8z44U7XuSbhcamW48SQgxGhVaTfInOy0vuy-mOLUOHWq-eQ34abod5fGLXRHLQKsruBeVOYiAccFgoMNBeSPwKklF-H7mczLjjAK25RbhG-u3FsOYqCkMIigfs9ctMYfK5svWUm6RAs5icYZoQ5po3Ab9T7e0alOWbfcVGRAgCO7Z5GuslOpBT7fEWLvuifiQQUOryZzsSKeP9VQ0XHUuZwfXtPvAvvHPulPedgo9YDIbbnYJmY-fhUUgFNKchqUMn3OJLCQT_FpryZoiA_bOv9yN68b4FI6RMbe1qFQMl5TtYx7pTZMuHi2uJYXYlvqrbpqnBNjhYJ7UofwzyKpoCFdb-_lC1jUD_ZBVvjYJ6wmrsQwt_8yEdkpftUx4xq4VtwUWBkoXsTq2M-WviRuzwx3-EjGt3zssMR8RAtEHbZzGy0]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/request-body.puml.svg b/src/docs/tests/request-body.puml.svg
index ed5de8d..89c13f4 100644
--- a/src/docs/tests/request-body.puml.svg
+++ b/src/docs/tests/request-body.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="459px" preserveAspectRatio="none" style="width:524px;height:459px;background:#FFFFFF;" version="1.1" viewBox="0 0 524 459" width="524px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="250"/><ellipse cx="90.75" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,271.6406 Q93.1406,271.9375 92.5,272.0781 Q91.8594,272.2344 91.1563,272.2344 Q88.6563,272.2344 87.3281,270.5938 Q86.0156,268.9375 86.0156,265.8125 Q86.0156,262.6875 87.3281,261.0313 Q88.6563,259.375 91.1563,259.375 Q91.8594,259.375 92.5,259.5313 Q93.1563,259.6875 93.7188,259.9844 L93.7188,262.7031 Q93.0938,262.125 92.5,261.8594 Q91.9063,261.5781 91.2813,261.5781 Q89.9375,261.5781 89.25,262.6563 Q88.5625,263.7188 88.5625,265.8125 Q88.5625,267.9063 89.25,268.9844 Q89.9375,270.0469 91.2813,270.0469 Q91.9063,270.0469 92.5,269.7813 Q93.0938,269.5 93.7188,268.9219 L93.7188,271.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="270.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="282" y2="282"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="298.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="315.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="331.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="347.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="364.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="380.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="396.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="413.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="429.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="445.667">picture : byte[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="24" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="229" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="291" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="232" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="30.5" y="136.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="152.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="33.5" y="168.4639">GET /customer/expired 200</text></g><!--class GET /customer/expired Request--><g id="elem_GET /customer/expired Request"><rect codeLine="30" fill="#F1F1F1" height="64.5625" id="GET /customer/expired Request" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="255" x="262.5" y="124"/><ellipse cx="277.5" cy="144.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M280.4688,149.7734 Q279.8906,150.0703 279.25,150.2109 Q278.6094,150.3672 277.9063,150.3672 Q275.4063,150.3672 274.0781,148.7266 Q272.7656,147.0703 272.7656,143.9453 Q272.7656,140.8203 274.0781,139.1641 Q275.4063,137.5078 277.9063,137.5078 Q278.6094,137.5078 279.25,137.6641 Q279.9063,137.8203 280.4688,138.1172 L280.4688,140.8359 Q279.8438,140.2578 279.25,139.9922 Q278.6563,139.7109 278.0313,139.7109 Q276.6875,139.7109 276,140.7891 Q275.3125,141.8516 275.3125,143.9453 Q275.3125,146.0391 276,147.1172 Q276.6875,148.1797 278.0313,148.1797 Q278.6563,148.1797 279.25,147.9141 Q279.8438,147.6328 280.4688,147.0547 L280.4688,149.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="355" y="140.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="291.5" y="155.9639">GET /customer/expired Request</text><line style="stroke:#181818;stroke-width:0.5;" x1="263.5" x2="516.5" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="268.5" y="181.2607">repository_ids : integer[] {O}</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="34" d="M129,176.71 C129,194.35 129,215.93 129,243.97 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,249.97,133,240.97,129,244.97,125,240.97,129,249.97" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.743" y="239.036">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="36" d="M284.6,47.09 C250,71.19 195.7531,108.9902 161.2031,133.0602 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="156.28,136.49,165.9511,134.6274,160.3826,133.6319,161.3781,128.0633,156.28,136.49" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="238" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="155.1185" y="125.4563">1</text></g><!--link GET /customer/expired to GET /customer/expired Request--><g id="link_GET /customer/expired_GET /customer/expired Request"><path codeLine="38" d="M323.68,47.09 C336.09,67.37 352.7788,94.6618 367.5288,118.7718 " fill="none" id="GET /customer/expired-to-GET /customer/expired Request" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="370.66,123.89,369.3753,114.1253,368.0507,119.6249,362.5511,118.3002,370.66,123.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="357.8461" y="112.743">1</text></g><!--SRC=[ZL9BJ-Cm4BxdLrW-8l7Q8q8zj49xMegW4WU4aB6dzQY9dPsP8Agg_vr92dsaAd2Au-yrCvw80SprzPsJE1WOZ-HBAEBwyXwupedX0BXpv2eGe1u2LIqBeqZCWNUlfWYbtl0SKzrgZIyTiraMG-VdCyfD2gDSPjeKyXZ1IJ7C583saKckdEHLmI0cQHLSEmyFqDfA9fDoWg9OszjHmv8h8Aj9nYoxAbPQ3B7SgjHS6HR2DDi1LNWKYu2pAFz025Zn01uhLvhbUBL32avWF1qYIMmv-jTpVm1cp6c2NOZeXyLLTSycDTKhq7WwYbW6WgHKJ08pe1xHbVZM6htcN89BVHlqysvActwUddkKgNlB3Q70RHV9swG3QerU6khI5WAVy6epxhyt4tFkFsT-3kyr4WIxtIvzXH_8vi_5XTtVl5-8xk5_eqDS2xlZC8V5Mhijdg3EZBeZYnSCXrrgo7SrdPuEZ3snEpjrZ6_DsPboB-stFMg-iUtfk4qNUTpcg-lY0m00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="459px" preserveAspectRatio="none" style="width:524px;height:459px;background:#FFFFFF;" version="1.1" viewBox="0 0 524 459" width="524px" zoomAndPan="magnify"><defs/><g><!--class Customer--><g id="elem_Customer"><rect codeLine="11" fill="#F1F1F1" height="202.9688" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="250"/><ellipse cx="90.75" cy="266" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M93.7188,271.6406 Q93.1406,271.9375 92.5,272.0781 Q91.8594,272.2344 91.1563,272.2344 Q88.6563,272.2344 87.3281,270.5938 Q86.0156,268.9375 86.0156,265.8125 Q86.0156,262.6875 87.3281,261.0313 Q88.6563,259.375 91.1563,259.375 Q91.8594,259.375 92.5,259.5313 Q93.1563,259.6875 93.7188,259.9844 L93.7188,262.7031 Q93.0938,262.125 92.5,261.8594 Q91.9063,261.5781 91.2813,261.5781 Q89.9375,261.5781 89.25,262.6563 Q88.5625,263.7188 88.5625,265.8125 Q88.5625,267.9063 89.25,268.9844 Q89.9375,270.0469 91.2813,270.0469 Q91.9063,270.0469 92.5,269.7813 Q93.0938,269.5 93.7188,268.9219 L93.7188,271.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="111.25" y="270.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="282" y2="282"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="298.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="315.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="331.5889">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="347.8857">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="364.1826">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="380.4795">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="396.7764">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="413.0732">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="429.3701">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="445.667">picture : byte[] {O}</text></g><!--class GET /customer/expired--><g id="elem_GET /customer/expired"><rect codeLine="24" fill="#F5DEB3" height="40.2656" id="GET /customer/expired" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="166" x="229" y="7"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="42" x="291" y="23.1387">«Path»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="160" x="232" y="38.9639">GET /customer/expired</text></g><!--class GET /customer/expired 200--><g id="elem_GET /customer/expired 200"><rect codeLine="27" fill="#F1F1F1" height="40.2656" id="GET /customer/expired 200" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="197" x="30.5" y="136.5"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="74" x="92" y="152.6387">«Response»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="33.5" y="168.4639">GET /customer/expired 200</text></g><!--class GET /customer/expired Request--><g id="elem_GET /customer/expired Request"><rect codeLine="30" fill="#F1F1F1" height="64.5625" id="GET /customer/expired Request" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="255" x="262.5" y="124"/><ellipse cx="277.5" cy="144.1328" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M280.4688,149.7734 Q279.8906,150.0703 279.25,150.2109 Q278.6094,150.3672 277.9063,150.3672 Q275.4063,150.3672 274.0781,148.7266 Q272.7656,147.0703 272.7656,143.9453 Q272.7656,140.8203 274.0781,139.1641 Q275.4063,137.5078 277.9063,137.5078 Q278.6094,137.5078 279.25,137.6641 Q279.9063,137.8203 280.4688,138.1172 L280.4688,140.8359 Q279.8438,140.2578 279.25,139.9922 Q278.6563,139.7109 278.0313,139.7109 Q276.6875,139.7109 276,140.7891 Q275.3125,141.8516 275.3125,143.9453 Q275.3125,146.0391 276,147.1172 Q276.6875,148.1797 278.0313,148.1797 Q278.6563,148.1797 279.25,147.9141 Q279.8438,147.6328 280.4688,147.0547 L280.4688,149.7734 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="12" font-style="italic" lengthAdjust="spacing" textLength="96" x="355" y="140.1387">«RequestBody»</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="223" x="291.5" y="155.9639">GET /customer/expired Request</text><line style="stroke:#181818;stroke-width:0.5;" x1="263.5" x2="516.5" y1="164.2656" y2="164.2656"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="201" x="268.5" y="181.2607">repository_ids : integer[] {O}</text></g><!--link GET /customer/expired 200 to Customer--><g id="link_GET /customer/expired 200_Customer"><path codeLine="34" d="M129,176.71 C129,194.35 129,215.93 129,243.97 " fill="none" id="GET /customer/expired 200-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="129,249.97,133,240.97,129,244.97,125,240.97,129,249.97" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="121.743" y="239.036">*</text></g><!--link GET /customer/expired to GET /customer/expired 200--><g id="link_GET /customer/expired_GET /customer/expired 200"><path codeLine="36" d="M284.6,47.09 C250,71.19 195.7531,108.9902 161.2031,133.0602 " fill="none" id="GET /customer/expired-to-GET /customer/expired 200" style="stroke:#181818;stroke-width:1.0;stroke-dasharray:7.0,7.0;"/><polygon fill="#181818" points="156.28,136.49,165.9511,134.6274,160.3826,133.6319,161.3781,128.0633,156.28,136.49" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="238" y="90.0669">200</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="155.1185" y="125.4563">1</text></g><!--link GET /customer/expired to GET /customer/expired Request--><g id="link_GET /customer/expired_GET /customer/expired Request"><path codeLine="38" d="M323.68,47.09 C336.09,67.37 352.7788,94.6618 367.5288,118.7718 " fill="none" id="GET /customer/expired-to-GET /customer/expired Request" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="370.66,123.89,369.3753,114.1253,368.0507,119.6249,362.5511,118.3002,370.66,123.89" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="357.8461" y="112.743">1</text></g><!--SRC=[ZL9BRzim3BxxLn0w3kXZEmv53Wc6djeKRO4TXc5G9IOYOaiUIHSBWlptqKwNP0xIxMIPtqkac2WYtDmyU4sJ2GJYK6ELTiL7bBPamHFWmRDlK95723Qjhi6GLA8SbnQ4jLLaHRdjjH1gBmARQkh3Qicbot5MwiBxYtnDwBNQLe8AsRAazG6Vi1ThOSWbOrNjJDoi4oqDiZC_WCsGjRL85hqtANm6KQQyF09DU1PBICkaTwYCOdZ4G8slOJFV7f6YLvmlfiIQUexzZToVK8HAVgOXHEqZwfjsP9ExvWLvlfWbgYDZDYfbnINoYEXhUksDNagfqUUn3ONLCALzFz- -ZoWB_rew9iNx8L8EIIVKbe9sFAIj5T_WxNxSjr-UuIgypVmAVxN46DrXX-mL_a66JzVNxk_z-W_H8_xiR8WxuN2SbhZUQG-NPsoBaEt8-WV5qoujvBqxNLnCm7rmHpjrZk_WyjAu7zsxFLe-kFvqtcQ8F6_pf-lgDm00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/simple-has-refs.puml.svg b/src/docs/tests/simple-has-refs.puml.svg
index 3ab5d90..93c9b68 100644
--- a/src/docs/tests/simple-has-refs.puml.svg
+++ b/src/docs/tests/simple-has-refs.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="236px" preserveAspectRatio="none" style="width:422px;height:236px;background:#FFFFFF;" version="1.1" viewBox="0 0 422 236" width="422px" zoomAndPan="magnify"><defs/><g><!--class CustomerType--><g id="elem_CustomerType"><rect codeLine="11" fill="#F1F1F1" height="56.2969" id="CustomerType" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="41.5" y="173"/><ellipse cx="56.5" cy="189" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M59.4688,194.6406 Q58.8906,194.9375 58.25,195.0781 Q57.6094,195.2344 56.9063,195.2344 Q54.4063,195.2344 53.0781,193.5938 Q51.7656,191.9375 51.7656,188.8125 Q51.7656,185.6875 53.0781,184.0313 Q54.4063,182.375 56.9063,182.375 Q57.6094,182.375 58.25,182.5313 Q58.9063,182.6875 59.4688,182.9844 L59.4688,185.7031 Q58.8438,185.125 58.25,184.8594 Q57.6563,184.5781 57.0313,184.5781 Q55.6875,184.5781 55,185.6563 Q54.3125,186.7188 54.3125,188.8125 Q54.3125,190.9063 55,191.9844 Q55.6875,193.0469 57.0313,193.0469 Q57.6563,193.0469 58.25,192.7813 Q58.8438,192.5 59.4688,191.9219 L59.4688,194.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="70.5" y="193.8467">CustomerType</text><line style="stroke:#181818;stroke-width:0.5;" x1="42.5" x2="174.5" y1="205" y2="205"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="47.5" y="221.9951">value : string</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="15" fill="#F1F1F1" height="88.8906" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="90.75" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="209" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="55.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="72.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="88.5889">heightMetres : decimal {O}</text></g><!--link Customer to CustomerType--><g id="link_Customer_CustomerType"><path codeLine="21" d="M108.5,96.36 C108.5,121.15 108.5,145.38 108.5,166.77 " fill="none" id="Customer-to-CustomerType" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,172.77,112.5,163.77,108.5,167.77,104.5,163.77,108.5,172.77" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="109.5" y="139.0669">type</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="99.625" y="162.003">1</text></g><!--link Customer to Customer--><g id="link_Customer_Customer"><path codeLine="23" d="M210.29,44.13 C230.55,44.96 245,47.42 245,51.5 C245,55.58 236.545,57.7944 216.285,58.6244 " fill="none" id="Customer-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="210.29,58.87,219.4462,62.4982,215.2858,58.6653,219.1187,54.505,210.29,58.87" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="251" y="56.0669">friends</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="218.0222" y="55.9362">*</text></g><!--link Customer to Customer--><g id="link_Customer_Customer"><path codeLine="25" d="M210.13,36.37 C257.5,34.92 300,39.97 300,51.5 C300,63.03 263.4972,68.2636 216.1272,66.8136 " fill="none" id="Customer-to-Customer-1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="210.13,66.63,219.0034,70.9035,215.1277,66.783,219.2482,62.9072,210.13,66.63" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="103" x="306" y="56.0669">favouritePartner</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="218.1196" y="80.2966">0..1</text></g><!--SRC=[TP71QiCm44Jl-ef5nq92Sot1X-JSDhI1deMqZaHaoUok0y7utoidq3XnUXFpPdO6v8D3MAztHdnLWGra8of_5R-GsvmOPs1do3GeI0y4crREK8ZFZgTI7J0MXOyXjMCMR3JCqAkDiSS3vIwvROwP_eRyU3IYDfaSqZtPvyP87XIZG2ehk3KMlt4yAvaWvOHANS_hRSUI6wJzkKLTsW3wov81JYPs26_0GY4Tr32BtDlhG2mVfUqMkS4I_9Tv30SlxoY4NBX36neJeVySniv9ss9HWLxfnyqb0rh6vzpzegTpBywQ0YR7Jyolo-NgYT-SSaT1iFoef2AhNm00]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="236px" preserveAspectRatio="none" style="width:422px;height:236px;background:#FFFFFF;" version="1.1" viewBox="0 0 422 236" width="422px" zoomAndPan="magnify"><defs/><g><!--class CustomerType--><g id="elem_CustomerType"><rect codeLine="11" fill="#F1F1F1" height="56.2969" id="CustomerType" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="134" x="41.5" y="173"/><ellipse cx="56.5" cy="189" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M59.4688,194.6406 Q58.8906,194.9375 58.25,195.0781 Q57.6094,195.2344 56.9063,195.2344 Q54.4063,195.2344 53.0781,193.5938 Q51.7656,191.9375 51.7656,188.8125 Q51.7656,185.6875 53.0781,184.0313 Q54.4063,182.375 56.9063,182.375 Q57.6094,182.375 58.25,182.5313 Q58.9063,182.6875 59.4688,182.9844 L59.4688,185.7031 Q58.8438,185.125 58.25,184.8594 Q57.6563,184.5781 57.0313,184.5781 Q55.6875,184.5781 55,185.6563 Q54.3125,186.7188 54.3125,188.8125 Q54.3125,190.9063 55,191.9844 Q55.6875,193.0469 57.0313,193.0469 Q57.6563,193.0469 58.25,192.7813 Q58.8438,192.5 59.4688,191.9219 L59.4688,194.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="102" x="70.5" y="193.8467">CustomerType</text><line style="stroke:#181818;stroke-width:0.5;" x1="42.5" x2="174.5" y1="205" y2="205"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="88" x="47.5" y="221.9951">value : string</text></g><!--class Customer--><g id="elem_Customer"><rect codeLine="15" fill="#F1F1F1" height="88.8906" id="Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="203" x="7" y="7"/><ellipse cx="70.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M73.2188,28.6406 Q72.6406,28.9375 72,29.0781 Q71.3594,29.2344 70.6563,29.2344 Q68.1563,29.2344 66.8281,27.5938 Q65.5156,25.9375 65.5156,22.8125 Q65.5156,19.6875 66.8281,18.0313 Q68.1563,16.375 70.6563,16.375 Q71.3594,16.375 72,16.5313 Q72.6563,16.6875 73.2188,16.9844 L73.2188,19.7031 Q72.5938,19.125 72,18.8594 Q71.4063,18.5781 70.7813,18.5781 Q69.4375,18.5781 68.75,19.6563 Q68.0625,20.7188 68.0625,22.8125 Q68.0625,24.9063 68.75,25.9844 Q69.4375,27.0469 70.7813,27.0469 Q71.4063,27.0469 72,26.7813 Q72.5938,26.5 73.2188,25.9219 L73.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="68" x="90.75" y="27.8467">Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="209" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="55.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="72.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="88.5889">heightMetres : decimal {O}</text></g><!--link Customer to CustomerType--><g id="link_Customer_CustomerType"><path codeLine="21" d="M108.5,96.36 C108.5,121.15 108.5,145.38 108.5,166.77 " fill="none" id="Customer-to-CustomerType" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="108.5,172.77,112.5,163.77,108.5,167.77,104.5,163.77,108.5,172.77" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="28" x="109.5" y="139.0669">type</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="8" x="99.625" y="162.003">1</text></g><!--link Customer to Customer--><g id="link_Customer_Customer"><path codeLine="23" d="M210.29,44.13 C230.55,44.96 245,47.42 245,51.5 C245,55.58 236.545,57.7944 216.285,58.6244 " fill="none" id="Customer-to-Customer" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="210.29,58.87,219.4462,62.4982,215.2858,58.6653,219.1187,54.505,210.29,58.87" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="43" x="251" y="56.0669">friends</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="7" x="218.0222" y="55.9362">*</text></g><!--link Customer to Customer--><g id="link_Customer_Customer"><path codeLine="25" d="M210.13,36.37 C257.5,34.92 300,39.97 300,51.5 C300,63.03 263.4972,68.2636 216.1272,66.8136 " fill="none" id="Customer-to-Customer-1" style="stroke:#181818;stroke-width:1.0;"/><polygon fill="#181818" points="210.13,66.63,219.0034,70.9035,215.1277,66.783,219.2482,62.9072,210.13,66.63" style="stroke:#181818;stroke-width:1.0;"/><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="103" x="306" y="56.0669">favouritePartner</text><text fill="#000000" font-family="sans-serif" font-size="13" lengthAdjust="spacing" textLength="24" x="218.1196" y="80.2966">0..1</text></g><!--SRC=[TP71QiCm44Jl-ef5nq92Sot1X-RS9hI5deMyjaHaIUok0y7utoidqBXEUXCpytO6v7oDiDqUZBYg0kl91bJkAduWvnGPxuo38TEX82qSxBASeJWkrJoN6e-XA7pqCKyis62OOL2lnXvRIdsiToaa-XtoxT286XMZG2nTd8t5JvnWIGGnHLJgUaJlUfRK8NsTC-fo4s2uz8rmCg57U04Myh4jvvR8ttZZYUMzjDsGcrd0Vps7ldNoXaB8nQ_H-iu46FRZr3bhMwqgq1kzt5mOq38zxzDFUZxtacp8OwpvGVXvlTuyo9jJwiaBbd-JM6Jr0m00]--></g></svg>
\ No newline at end of file
diff --git a/src/docs/tests/simple-types-and-arrays.puml.svg b/src/docs/tests/simple-types-and-arrays.puml.svg
index f2085f8..46cbd2a 100644
--- a/src/docs/tests/simple-types-and-arrays.puml.svg
+++ b/src/docs/tests/simple-types-and-arrays.puml.svg
@@ -1,1 +1,1 @@
-<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="305px" preserveAspectRatio="none" style="width:265px;height:305px;background:#FFFFFF;" version="1.1" viewBox="0 0 265 305" width="265px" zoomAndPan="magnify"><defs/><g><!--class My.Customer--><g id="elem_My.Customer"><rect codeLine="11" fill="#F1F1F1" height="284.4531" id="My.Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="7"/><ellipse cx="79.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M82.2188,28.6406 Q81.6406,28.9375 81,29.0781 Q80.3594,29.2344 79.6563,29.2344 Q77.1563,29.2344 75.8281,27.5938 Q74.5156,25.9375 74.5156,22.8125 Q74.5156,19.6875 75.8281,18.0313 Q77.1563,16.375 79.6563,16.375 Q80.3594,16.375 81,16.5313 Q81.6563,16.6875 82.2188,16.9844 L82.2188,19.7031 Q81.5938,19.125 81,18.8594 Q80.4063,18.5781 79.7813,18.5781 Q78.4375,18.5781 77.75,19.6563 Q77.0625,20.7188 77.0625,22.8125 Q77.0625,24.9063 77.75,25.9844 Q78.4375,27.0469 79.7813,27.0469 Q80.4063,27.0469 81,26.7813 Q81.5938,26.5 82.2188,25.9219 L82.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="99.75" y="27.8467">My.Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="55.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="72.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="13" y="88.5889">secret : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="13" y="104.8857">email : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="13" y="121.1826">id : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="137.4795">history : byte[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="141" x="13" y="153.7764">history2 : byte[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="170.0732">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="186.3701">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="202.667">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="218.9639">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="235.2607">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="251.5576">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="267.8545">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="284.1514">picture : byte[] {O}</text></g><!--SRC=[TP7BRi8m44Nt-GgB3-YYomgnW3KF5IGMLHV6diGZ_8Xc9aWHoh_N2Ig5qAmipxbpvuxjq8AQptTQt6AX39BnKBXRyHEuJf7X1UmqwG02D28GQcbL9YvPVYoL23vN-8onxdkLyPfPNOkbDkUAKXFjAlb4zo171rgAPI8Bz4mEAMX9NS4WAkOKN6i3U-Xj9P6AAK9HtEndw_PjrR2a03JBmvIw3a6wd8TODhbRVIWMmbWzmDmxoHWCvS6_H5sttGE5eD5FGRHJn67EI6t6frRWw_j__3x90IidQn02pXeB1eFs8v7L0jjoYIIkr-JRQECzC6EA1nmMbtomw52FR68JJa3RSkNGMuAOfHW5Ag2HK7kyz4Qdb3peEBP1Snu-x_uaBrkL-f8QGe7DC9B_9hr8QpJI43o_JrVy0000]--></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="us-ascii" standalone="no"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" contentStyleType="text/css" height="305px" preserveAspectRatio="none" style="width:265px;height:305px;background:#FFFFFF;" version="1.1" viewBox="0 0 265 305" width="265px" zoomAndPan="magnify"><defs/><g><!--class My.Customer--><g id="elem_My.Customer"><rect codeLine="11" fill="#F1F1F1" height="284.4531" id="My.Customer" rx="2.5" ry="2.5" style="stroke:#181818;stroke-width:0.5;" width="244" x="7" y="7"/><ellipse cx="79.25" cy="23" fill="#ADD1B2" rx="11" ry="11" style="stroke:#181818;stroke-width:1.0;"/><path d="M82.2188,28.6406 Q81.6406,28.9375 81,29.0781 Q80.3594,29.2344 79.6563,29.2344 Q77.1563,29.2344 75.8281,27.5938 Q74.5156,25.9375 74.5156,22.8125 Q74.5156,19.6875 75.8281,18.0313 Q77.1563,16.375 79.6563,16.375 Q80.3594,16.375 81,16.5313 Q81.6563,16.6875 82.2188,16.9844 L82.2188,19.7031 Q81.5938,19.125 81,18.8594 Q80.4063,18.5781 79.7813,18.5781 Q78.4375,18.5781 77.75,19.6563 Q77.0625,20.7188 77.0625,22.8125 Q77.0625,24.9063 77.75,25.9844 Q78.4375,27.0469 79.7813,27.0469 Q80.4063,27.0469 81,26.7813 Q81.5938,26.5 82.2188,25.9219 L82.2188,28.6406 Z " fill="#000000"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="91" x="99.75" y="27.8467">My.Customer</text><line style="stroke:#181818;stroke-width:0.5;" x1="8" x2="250" y1="39" y2="39"/><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="117" x="13" y="55.9951">firstName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="116" x="13" y="72.292">lastName : string</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="129" x="13" y="88.5889">secret : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="121" x="13" y="104.8857">email : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="97" x="13" y="121.1826">id : string {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="137.4795">history : byte[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="141" x="13" y="153.7764">history2 : byte[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="191" x="13" y="170.0732">heightMetres : decimal {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="122" x="13" y="186.3701">dateOfBirth : date</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="232" x="13" y="202.667">lastSessionTime : timestamp {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="221" x="13" y="218.9639">numberOfChildren : integer {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="132" x="13" y="235.2607">alive : boolean {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="170" x="13" y="251.5576">nicknames : string[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="227" x="13" y="267.8545">favouriteNumbers : integer[] {O}</text><text fill="#000000" font-family="sans-serif" font-size="14" lengthAdjust="spacing" textLength="134" x="13" y="284.1514">picture : byte[] {O}</text></g><!--SRC=[TP6zRiCm38HtFuMG1-ZGiIWo97D-q1JeK7HGvBD5H9OCaWuG17xtoWcQfauz2U9tl2CbJoNCw-lMgf_FZIDs0OM_5jyWROg21x2rR1ieU4JGj7eocVXKodsf8eHSaGF5TkWrBbWHSouMrXrgJbqiboaalWtouM6rw0k1cfYpfBKEEmpDcjZ4554KLvFPwlIqx4HJ0vvbIsFEbxW-fxBeEdUR5oFA5Eixc7idcS1n3luXvhpfxoWQIs4AKZb5FEKP-PJn_gJu_FeVFqzoKErr1ML8rfHmrDWm4fLMiQaMnEe7JRwDDjv1X59yfylYcWzHsxGZczWrU_2cMdeA9IDcAKL53Hu9RQ3ZOBHFAS36iGsvm-NpRa_oi5LbZwbZKgmlaVARz21joMd7-Fi-VV4D]--></g></svg>
\ No newline at end of file
diff --git a/src/test/resources/outputs/additional-properties-complex.puml b/src/test/resources/outputs/additional-properties-complex.puml
index a44e83d..078f1fa 100644
--- a/src/test/resources/outputs/additional-properties-complex.puml
+++ b/src/test/resources/outputs/additional-properties-complex.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Thing.property" {
diff --git a/src/test/resources/outputs/additional-properties-simple.puml b/src/test/resources/outputs/additional-properties-simple.puml
index 4da1a24..02aac59 100644
--- a/src/test/resources/outputs/additional-properties-simple.puml
+++ b/src/test/resources/outputs/additional-properties-simple.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Thing" {
diff --git a/src/test/resources/outputs/all-of-class-level.puml b/src/test/resources/outputs/all-of-class-level.puml
index fb1bb59..55deba7 100644
--- a/src/test/resources/outputs/all-of-class-level.puml
+++ b/src/test/resources/outputs/all-of-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/all-of-property-level.puml b/src/test/resources/outputs/all-of-property-level.puml
index ca0e1ff..dfdfeff 100644
--- a/src/test/resources/outputs/all-of-property-level.puml
+++ b/src/test/resources/outputs/all-of-property-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/anon-nested-class-level.puml b/src/test/resources/outputs/anon-nested-class-level.puml
index 99de3fd..c973ee1 100644
--- a/src/test/resources/outputs/anon-nested-class-level.puml
+++ b/src/test/resources/outputs/anon-nested-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer.name.standardName" {
diff --git a/src/test/resources/outputs/anon-property-not-required.puml b/src/test/resources/outputs/anon-property-not-required.puml
index b4ccf6c..47e425d 100644
--- a/src/test/resources/outputs/anon-property-not-required.puml
+++ b/src/test/resources/outputs/anon-property-not-required.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer.name" {
diff --git a/src/test/resources/outputs/anon-property-required.puml b/src/test/resources/outputs/anon-property-required.puml
index 35ae67d..d7461dd 100644
--- a/src/test/resources/outputs/anon-property-required.puml
+++ b/src/test/resources/outputs/anon-property-required.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer.name" {
diff --git a/src/test/resources/outputs/any-of-anon-class-level.puml b/src/test/resources/outputs/any-of-anon-class-level.puml
index 7277097..c0b848b 100644
--- a/src/test/resources/outputs/any-of-anon-class-level.puml
+++ b/src/test/resources/outputs/any-of-anon-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee.1" {
diff --git a/src/test/resources/outputs/any-of-anon-property-level.puml b/src/test/resources/outputs/any-of-anon-property-level.puml
index d83a775..1843249 100644
--- a/src/test/resources/outputs/any-of-anon-property-level.puml
+++ b/src/test/resources/outputs/any-of-anon-property-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee.role" {
diff --git a/src/test/resources/outputs/any-of-class-level.puml b/src/test/resources/outputs/any-of-class-level.puml
index eda99ab..144cc34 100644
--- a/src/test/resources/outputs/any-of-class-level.puml
+++ b/src/test/resources/outputs/any-of-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/any-of-property-level.puml b/src/test/resources/outputs/any-of-property-level.puml
index 45fca15..9599d8d 100644
--- a/src/test/resources/outputs/any-of-property-level.puml
+++ b/src/test/resources/outputs/any-of-property-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/array-anon-class-level.puml b/src/test/resources/outputs/array-anon-class-level.puml
index 56eda41..5e4b40c 100644
--- a/src/test/resources/outputs/array-anon-class-level.puml
+++ b/src/test/resources/outputs/array-anon-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customers.1" {
diff --git a/src/test/resources/outputs/array-anon-property-level.puml b/src/test/resources/outputs/array-anon-property-level.puml
index 435356b..6e2ca90 100644
--- a/src/test/resources/outputs/array-anon-property-level.puml
+++ b/src/test/resources/outputs/array-anon-property-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customers.names" {
diff --git a/src/test/resources/outputs/array-class-level.puml b/src/test/resources/outputs/array-class-level.puml
index 1570dae..2b4f9b0 100644
--- a/src/test/resources/outputs/array-class-level.puml
+++ b/src/test/resources/outputs/array-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customers" {
diff --git a/src/test/resources/outputs/array-property-level.puml b/src/test/resources/outputs/array-property-level.puml
index 281bb8b..a54e710 100644
--- a/src/test/resources/outputs/array-property-level.puml
+++ b/src/test/resources/outputs/array-property-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customers" {
diff --git a/src/test/resources/outputs/empty.puml b/src/test/resources/outputs/empty.puml
index af9dac3..0040b5b 100644
--- a/src/test/resources/outputs/empty.puml
+++ b/src/test/resources/outputs/empty.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
@enduml
\ No newline at end of file
diff --git a/src/test/resources/outputs/enum.puml b/src/test/resources/outputs/enum.puml
index 8b69546..d7bd6ce 100644
--- a/src/test/resources/outputs/enum.puml
+++ b/src/test/resources/outputs/enum.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
enum "EmployeeType" {
diff --git a/src/test/resources/outputs/external-ref.puml b/src/test/resources/outputs/external-ref.puml
index e2d2615..3d196d2 100644
--- a/src/test/resources/outputs/external-ref.puml
+++ b/src/test/resources/outputs/external-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/one-of-class-level-empty.puml b/src/test/resources/outputs/one-of-class-level-empty.puml
index 94fbd57..085ab17 100644
--- a/src/test/resources/outputs/one-of-class-level-empty.puml
+++ b/src/test/resources/outputs/one-of-class-level-empty.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/one-of-class-level.puml b/src/test/resources/outputs/one-of-class-level.puml
index eda99ab..144cc34 100644
--- a/src/test/resources/outputs/one-of-class-level.puml
+++ b/src/test/resources/outputs/one-of-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/one-of-property-level-required.puml b/src/test/resources/outputs/one-of-property-level-required.puml
index 5a88a47..9900952 100644
--- a/src/test/resources/outputs/one-of-property-level-required.puml
+++ b/src/test/resources/outputs/one-of-property-level-required.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/one-of-property-level.puml b/src/test/resources/outputs/one-of-property-level.puml
index 45fca15..9599d8d 100644
--- a/src/test/resources/outputs/one-of-property-level.puml
+++ b/src/test/resources/outputs/one-of-property-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "employee" {
diff --git a/src/test/resources/outputs/parameter-anon-empty-object.puml b/src/test/resources/outputs/parameter-anon-empty-object.puml
index 078337d..6378f31 100644
--- a/src/test/resources/outputs/parameter-anon-empty-object.puml
+++ b/src/test/resources/outputs/parameter-anon-empty-object.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/parameter-anon.puml b/src/test/resources/outputs/parameter-anon.puml
index 409977c..1632b5e 100644
--- a/src/test/resources/outputs/parameter-anon.puml
+++ b/src/test/resources/outputs/parameter-anon.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/parameter-ref-complex.puml b/src/test/resources/outputs/parameter-ref-complex.puml
index 7ece93a..40050cf 100644
--- a/src/test/resources/outputs/parameter-ref-complex.puml
+++ b/src/test/resources/outputs/parameter-ref-complex.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/parameter-ref-ref.puml b/src/test/resources/outputs/parameter-ref-ref.puml
index 3a70400..2e5f7d5 100644
--- a/src/test/resources/outputs/parameter-ref-ref.puml
+++ b/src/test/resources/outputs/parameter-ref-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/parameter-ref.puml b/src/test/resources/outputs/parameter-ref.puml
index 23e53ea..382e6a2 100644
--- a/src/test/resources/outputs/parameter-ref.puml
+++ b/src/test/resources/outputs/parameter-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/path-returns-non-ref.puml b/src/test/resources/outputs/path-returns-non-ref.puml
index fff5f65..0407794 100644
--- a/src/test/resources/outputs/path-returns-non-ref.puml
+++ b/src/test/resources/outputs/path-returns-non-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/path-returns-ref-ref.puml b/src/test/resources/outputs/path-returns-ref-ref.puml
index 34216ef..d3586ed 100644
--- a/src/test/resources/outputs/path-returns-ref-ref.puml
+++ b/src/test/resources/outputs/path-returns-ref-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customers" {
diff --git a/src/test/resources/outputs/path-returns-ref-ref2.puml b/src/test/resources/outputs/path-returns-ref-ref2.puml
index efe6cf5..f89eb8f 100644
--- a/src/test/resources/outputs/path-returns-ref-ref2.puml
+++ b/src/test/resources/outputs/path-returns-ref-ref2.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customers" {
diff --git a/src/test/resources/outputs/path-returns-ref.puml b/src/test/resources/outputs/path-returns-ref.puml
index ca385ed..2845106 100644
--- a/src/test/resources/outputs/path-returns-ref.puml
+++ b/src/test/resources/outputs/path-returns-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/petstore-expanded.puml b/src/test/resources/outputs/petstore-expanded.puml
index 148f704..666410c 100644
--- a/src/test/resources/outputs/petstore-expanded.puml
+++ b/src/test/resources/outputs/petstore-expanded.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Pet" {
diff --git a/src/test/resources/outputs/petstore.puml b/src/test/resources/outputs/petstore.puml
index 0b0d640..4c28820 100644
--- a/src/test/resources/outputs/petstore.puml
+++ b/src/test/resources/outputs/petstore.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Pet" {
diff --git a/src/test/resources/outputs/ref-class-level.puml b/src/test/resources/outputs/ref-class-level.puml
index 4876d2f..7224254 100644
--- a/src/test/resources/outputs/ref-class-level.puml
+++ b/src/test/resources/outputs/ref-class-level.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/request-body-ref-ref.puml b/src/test/resources/outputs/request-body-ref-ref.puml
index 669bbc2..e34d670 100644
--- a/src/test/resources/outputs/request-body-ref-ref.puml
+++ b/src/test/resources/outputs/request-body-ref-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/request-body-ref.puml b/src/test/resources/outputs/request-body-ref.puml
index 4f5ceb3..05d696d 100644
--- a/src/test/resources/outputs/request-body-ref.puml
+++ b/src/test/resources/outputs/request-body-ref.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/request-body.puml b/src/test/resources/outputs/request-body.puml
index e4ec9fa..b494265 100644
--- a/src/test/resources/outputs/request-body.puml
+++ b/src/test/resources/outputs/request-body.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "Customer" {
diff --git a/src/test/resources/outputs/simple-has-refs.puml b/src/test/resources/outputs/simple-has-refs.puml
index f73e81c..def2994 100644
--- a/src/test/resources/outputs/simple-has-refs.puml
+++ b/src/test/resources/outputs/simple-has-refs.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "CustomerType" {
diff --git a/src/test/resources/outputs/simple-types-and-arrays.puml b/src/test/resources/outputs/simple-types-and-arrays.puml
index a16b78b..e5893c7 100644
--- a/src/test/resources/outputs/simple-types-and-arrays.puml
+++ b/src/test/resources/outputs/simple-types-and-arrays.puml
@@ -6,7 +6,7 @@ hide empty methods
hide empty fields
skinparam class {
BackgroundColor<<Path>> Wheat
-BorderColor<<Path>> Tomato}
+}
set namespaceSeparator none
class "My.Customer" {
| https://github.com/davidmoten/openapi-to-plantuml.gitdiff --git a/src/main/java/com/github/davidmoten/oas3/puml/Converter.java b/src/main/java/com/github/davidmoten/oas3/puml/Converter.java |
gitbug-java_data_snowflakedb-snowflake-jdbc.json_1 | diff --git a/src/main/java/net/snowflake/client/jdbc/RestRequest.java b/src/main/java/net/snowflake/client/jdbc/RestRequest.java
index 6049aa8..600f2ca 100644
--- a/src/main/java/net/snowflake/client/jdbc/RestRequest.java
+++ b/src/main/java/net/snowflake/client/jdbc/RestRequest.java
@@ -446,6 +446,8 @@ public class RestRequest {
response.getStatusLine().getStatusCode() >= 600)
&& // gateway timeout
response.getStatusLine().getStatusCode() != 408
+ && // retry
+ response.getStatusLine().getStatusCode() != 429
&& // request timeout
(!retryHTTP403 || response.getStatusLine().getStatusCode() != 403);
}
diff --git a/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java b/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java
index f632460..4956231 100644
--- a/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java
+++ b/src/test/java/net/snowflake/client/jdbc/RestRequestTest.java
@@ -210,7 +210,7 @@ public class RestRequestTest {
testCases.add(new TestCase(425, false, true));
testCases.add(new TestCase(426, false, true));
testCases.add(new TestCase(428, false, true));
- testCases.add(new TestCase(429, false, true));
+ testCases.add(new TestCase(429, false, false)); // do retry on HTTP 429
testCases.add(new TestCase(431, false, true));
testCases.add(new TestCase(451, false, true));
testCases.add(new TestCase(500, false, false));
@@ -263,7 +263,7 @@ public class RestRequestTest {
testCases.add(new TestCase(425, true, true));
testCases.add(new TestCase(426, true, true));
testCases.add(new TestCase(428, true, true));
- testCases.add(new TestCase(429, true, true));
+ testCases.add(new TestCase(429, true, false)); // do retry on HTTP 429
testCases.add(new TestCase(431, true, true));
testCases.add(new TestCase(451, true, true));
testCases.add(new TestCase(500, true, false));
| https://github.com/snowflakedb/snowflake-jdbc.gitdiff --git a/src/main/java/net/snowflake/client/jdbc/RestRequest.java b/src/main/java/net/snowflake/client/jdbc/RestRequest.java |
gitbug-java_data_snowflakedb-snowflake-jdbc.json_2 | diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java
index 878e68c..e75a41e 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java
@@ -7,6 +7,7 @@ import com.google.common.base.Strings;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.*;
@@ -153,6 +154,10 @@ public class SnowflakeConnectString implements Serializable {
}
return new SnowflakeConnectString(scheme, host, port, parameters, account);
+ } catch (URISyntaxException uriEx) {
+ logger.warn(
+ "Exception thrown while parsing Snowflake connect string. Illegal character in url.");
+ return INVALID_CONNECT_STRING;
} catch (Exception ex) {
logger.warn("Exception thrown while parsing Snowflake connect string", ex);
return INVALID_CONNECT_STRING;
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
index c642975..2021224 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
@@ -175,7 +175,7 @@ public class SnowflakeDriver implements Driver {
public Connection connect(String url, Properties info) throws SQLException {
SnowflakeConnectString conStr = SnowflakeConnectString.parse(url, info);
if (!conStr.isValid()) {
- return null;
+ throw new SnowflakeSQLException("Connection string is invalid. Unable to parse.");
}
return new SnowflakeConnectionV1(url, info);
}
diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectStringParseTest.java b/src/test/java/net/snowflake/client/jdbc/ConnectStringParseTest.java
index 0536d0c..871a6cf 100644
--- a/src/test/java/net/snowflake/client/jdbc/ConnectStringParseTest.java
+++ b/src/test/java/net/snowflake/client/jdbc/ConnectStringParseTest.java
@@ -2,6 +2,7 @@ package net.snowflake.client.jdbc;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
import java.util.Properties;
import net.snowflake.client.core.SFSessionProperty;
@@ -58,4 +59,13 @@ public class ConnectStringParseTest {
is("abc_test"));
assertThat(cstring.getHost(), is("abc-test.us-east-1.snowflakecomputing.com"));
}
+
+ @Test
+ public void testParseWithIllegalUriCharacters() {
+ Properties info = new Properties();
+ String jdbcConnectString =
+ "jdbc:snowflake://abc-test.us-east-1.snowflakecomputing.com/?private_key_file=C:\\temp\\rsa_key.p8&private_key_file_pwd=test_password&user=test_user";
+ SnowflakeConnectString cstring = SnowflakeConnectString.parse(jdbcConnectString, info);
+ assertEquals("://:-1", cstring.toString());
+ }
}
diff --git a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverTest.java b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverTest.java
index 9b276b7..416a390 100644
--- a/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverTest.java
+++ b/src/test/java/net/snowflake/client/jdbc/SnowflakeDriverTest.java
@@ -362,10 +362,10 @@ public class SnowflakeDriverTest {
assertFalse(snowflakeDriver.acceptsURL("jdbc:mysql://localhost:3306/dbname"));
}
- @Test
+ @Test(expected = SQLException.class)
public void testInvalidNullConnect() throws SQLException {
SnowflakeDriver snowflakeDriver = SnowflakeDriver.INSTANCE;
- assertNull(snowflakeDriver.connect(null, null));
+ snowflakeDriver.connect(null, null);
}
@Test
@@ -405,4 +405,18 @@ public class SnowflakeDriverTest {
// Just to make sure this function won't break anything
SnowflakeDriver.disableIllegalReflectiveAccessWarning();
}
+
+ @Test
+ public void testParseConnectStringException() {
+ SnowflakeDriver snowflakeDriver = SnowflakeDriver.INSTANCE;
+ Properties info = new Properties();
+ String jdbcConnectString =
+ "jdbc:snowflake://abc-test.us-east-1.snowflakecomputing.com/?private_key_file=C:\\temp\\rsa_key.p8&private_key_file_pwd=test_password&user=test_user";
+ try {
+ snowflakeDriver.connect(jdbcConnectString, info);
+ fail();
+ } catch (Exception ex) {
+ assertEquals("Connection string is invalid. Unable to parse.", ex.getMessage());
+ }
+ }
}
| https://github.com/snowflakedb/snowflake-jdbc.gitdiff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java |
gitbug-java_data_snowflakedb-snowflake-jdbc.json_3 | diff --git a/src/main/java/net/snowflake/client/config/SFClientConfigParser.java b/src/main/java/net/snowflake/client/config/SFClientConfigParser.java
index 9d8b356..436f0e4 100644
--- a/src/main/java/net/snowflake/client/config/SFClientConfigParser.java
+++ b/src/main/java/net/snowflake/client/config/SFClientConfigParser.java
@@ -40,7 +40,8 @@ public class SFClientConfigParser {
derivedConfigFilePath = systemGetEnv(SF_CLIENT_CONFIG_ENV_NAME);
} else {
// 3. Read SF_CLIENT_CONFIG_FILE_NAME from where jdbc jar is loaded.
- String driverLocation = getConfigFilePathFromJDBCJarLocation();
+ String driverLocation =
+ Paths.get(getConfigFilePathFromJDBCJarLocation(), SF_CLIENT_CONFIG_FILE_NAME).toString();
if (Files.exists(Paths.get(driverLocation))) {
derivedConfigFilePath = driverLocation;
} else {
@@ -84,10 +85,19 @@ public class SFClientConfigParser {
String jarPath =
SnowflakeDriver.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+
// remove /snowflake-jdbc-3.13.29.jar from the path.
- return jarPath.substring(0, jarPath.lastIndexOf("/"))
- + File.separator
- + SF_CLIENT_CONFIG_FILE_NAME;
+ String updatedPath = jarPath.substring(0, jarPath.lastIndexOf("/"));
+
+ if (systemGetProperty("os.name") != null
+ && systemGetProperty("os.name").toLowerCase().startsWith("windows")) {
+ // Path translation for windows
+ if (updatedPath.startsWith("/")) {
+ updatedPath = updatedPath.substring(1);
+ }
+ updatedPath = updatedPath.replace("/", "\\");
+ }
+ return updatedPath;
}
return "";
}
diff --git a/src/test/java/net/snowflake/client/config/SFClientConfigParserTest.java b/src/test/java/net/snowflake/client/config/SFClientConfigParserTest.java
index 140e92a..c4f3140 100644
--- a/src/test/java/net/snowflake/client/config/SFClientConfigParserTest.java
+++ b/src/test/java/net/snowflake/client/config/SFClientConfigParserTest.java
@@ -79,7 +79,8 @@ public class SFClientConfigParserTest {
@Test
public void testloadSFClientConfigWithDriverLoaction() {
- String configLocation = getConfigFilePathFromJDBCJarLocation();
+ String configLocation =
+ Paths.get(getConfigFilePathFromJDBCJarLocation(), SF_CLIENT_CONFIG_FILE_NAME).toString();
Path configFilePath = Paths.get(configLocation);
try {
@@ -141,4 +142,13 @@ public class SFClientConfigParserTest {
String jdbcDirectoryPath = getConfigFilePathFromJDBCJarLocation();
assertTrue(jdbcDirectoryPath != null && !jdbcDirectoryPath.isEmpty());
}
+
+ @Test
+ public void testgetConfigFileNameFromJDBCJarLocationForWindows() {
+ try (MockedStatic<SnowflakeUtil> mockedSnowflakeUtil = mockStatic(SnowflakeUtil.class)) {
+ mockedSnowflakeUtil.when(() -> systemGetProperty("os.name")).thenReturn("windows");
+ String jdbcDirectoryPath = getConfigFilePathFromJDBCJarLocation();
+ assertFalse(jdbcDirectoryPath.contains("/")); // windows use \ in paths
+ }
+ }
}
| https://github.com/snowflakedb/snowflake-jdbc.gitdiff --git a/src/main/java/net/snowflake/client/config/SFClientConfigParser.java b/src/main/java/net/snowflake/client/config/SFClientConfigParser.java |
gitbug-java_data_snowflakedb-snowflake-jdbc.json_4 | diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
index b8626cd..94c3a32 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
@@ -864,8 +864,8 @@ public class SnowflakeFileTransferAgent extends SFBaseFileTransferAgent {
localLocation = systemGetProperty("user.home") + localLocation.substring(1);
}
- // it should not contain any ~ after the above replacement
- if (localLocation.contains("~")) {
+ // it should not start with any ~ after the above replacement
+ if (localLocation.startsWith("~")) {
throw new SnowflakeSQLLoggedException(
session,
ErrorCode.PATH_NOT_DIRECTORY.getMessageCode(),
@@ -1690,7 +1690,9 @@ public class SnowflakeFileTransferAgent extends SFBaseFileTransferAgent {
for (String path : filePathList) {
// replace ~ with user home
- path = path.replace("~", systemGetProperty("user.home"));
+ if (path.startsWith("~")) {
+ path = systemGetProperty("user.home") + path.substring(1);
+ }
// user may also specify files relative to current directory
// add the current path if that is the case
diff --git a/src/test/java/net/snowflake/client/jdbc/FileUploaderExpandFileNamesTest.java b/src/test/java/net/snowflake/client/jdbc/FileUploaderExpandFileNamesTest.java
index 80d26cc..fefd55e 100644
--- a/src/test/java/net/snowflake/client/jdbc/FileUploaderExpandFileNamesTest.java
+++ b/src/test/java/net/snowflake/client/jdbc/FileUploaderExpandFileNamesTest.java
@@ -29,7 +29,11 @@ public class FileUploaderExpandFileNamesTest {
System.setProperty("user.home", folderName);
String[] locations = {
- folderName + "/Tes*Fil*A", folderName + "/TestFil?B", "~/TestFileC", "TestFileD"
+ folderName + "/Tes*Fil*A",
+ folderName + "/TestFil?B",
+ "~/TestFileC",
+ "TestFileD",
+ folderName + "/TestFileE~"
};
Set<String> files = SnowflakeFileTransferAgent.expandFileNames(locations);
@@ -38,6 +42,7 @@ public class FileUploaderExpandFileNamesTest {
assertTrue(files.contains(folderName + "/TestFileB"));
assertTrue(files.contains(folderName + "/TestFileC"));
assertTrue(files.contains(folderName + "/TestFileD"));
+ assertTrue(files.contains(folderName + "/TestFileE~"));
}
@Test
diff --git a/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java b/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java
index 245b040..443e868 100644
--- a/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/FileUploaderLatestIT.java
@@ -3,17 +3,16 @@
*/
package net.snowflake.client.jdbc;
+import static net.snowflake.client.jdbc.SnowflakeUtil.systemGetProperty;
import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.*;
import com.amazonaws.services.s3.model.ObjectMetadata;
import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.NoSuchAlgorithmException;
import java.sql.*;
@@ -28,6 +27,7 @@ import net.snowflake.client.core.SFSession;
import net.snowflake.client.core.SFStatement;
import net.snowflake.client.jdbc.cloud.storage.*;
import net.snowflake.common.core.RemoteStoreFileEncryptionMaterial;
+import org.apache.commons.io.FileUtils;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -810,4 +810,97 @@ public class FileUploaderLatestIT extends FileUploaderPrepIT {
sfAgent.execute();
}
+
+ @Test
+ public void testUploadFileWithTildeInFolderName() throws SQLException, IOException {
+ Connection connection = null;
+ Statement statement = null;
+ ResultSet resultSet = null;
+ Writer writer = null;
+ Path topDataDir = null;
+
+ try {
+ topDataDir = Files.createTempDirectory("testPutFileTilde");
+ topDataDir.toFile().deleteOnExit();
+
+ // create sub directory where the name includes ~
+ Path subDir = Files.createDirectories(Paths.get(topDataDir.toString(), "snowflake~"));
+
+ // create a test data
+ File dataFile = new File(subDir.toFile(), "test.txt");
+ writer =
+ new BufferedWriter(
+ new OutputStreamWriter(
+ Files.newOutputStream(Paths.get(dataFile.getCanonicalPath())),
+ StandardCharsets.UTF_8));
+ writer.write("1,test1");
+ writer.close();
+
+ connection = getConnection();
+ statement = connection.createStatement();
+ statement.execute("create or replace stage testStage");
+ String sql = String.format("PUT 'file://%s' @testStage", dataFile.getCanonicalPath());
+
+ // Escape backslashes. This must be done by the application.
+ sql = sql.replaceAll("\\\\", "\\\\\\\\");
+ resultSet = statement.executeQuery(sql);
+ while (resultSet.next()) {
+ assertEquals("UPLOADED", resultSet.getString("status"));
+ }
+ } finally {
+ if (connection != null) {
+ connection.createStatement().execute("drop stage if exists testStage");
+ }
+ closeSQLObjects(resultSet, statement, connection);
+ if (writer != null) {
+ writer.close();
+ }
+ FileUtils.deleteDirectory(topDataDir.toFile());
+ }
+ }
+
+ @Test
+ public void testUploadWithTildeInPath() throws SQLException, IOException {
+ Connection connection = null;
+ Statement statement = null;
+ ResultSet resultSet = null;
+ Writer writer = null;
+ Path subDir = null;
+
+ try {
+
+ String homeDir = systemGetProperty("user.home");
+
+ // create sub directory where the name includes ~
+ subDir = Files.createDirectories(Paths.get(homeDir, "snowflake"));
+
+ // create a test data
+ File dataFile = new File(subDir.toFile(), "test.txt");
+ writer =
+ new BufferedWriter(
+ new OutputStreamWriter(
+ Files.newOutputStream(Paths.get(dataFile.getCanonicalPath())),
+ StandardCharsets.UTF_8));
+ writer.write("1,test1");
+ writer.close();
+
+ connection = getConnection();
+ statement = connection.createStatement();
+ statement.execute("create or replace stage testStage");
+
+ resultSet = statement.executeQuery("PUT 'file://~/snowflake/test.txt' @testStage");
+ while (resultSet.next()) {
+ assertEquals("UPLOADED", resultSet.getString("status"));
+ }
+ } finally {
+ if (connection != null) {
+ connection.createStatement().execute("drop stage if exists testStage");
+ }
+ closeSQLObjects(resultSet, statement, connection);
+ if (writer != null) {
+ writer.close();
+ }
+ FileUtils.deleteDirectory(subDir.toFile());
+ }
+ }
}
| https://github.com/snowflakedb/snowflake-jdbc.gitdiff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java |
gitbug-java_data_damianszczepanik-cucumber-reporting.json_1 | diff --git a/src/main/java/net/masterthought/cucumber/generators/FeatureReportPage.java b/src/main/java/net/masterthought/cucumber/generators/FeatureReportPage.java
index d445a47..208afe9 100644
--- a/src/main/java/net/masterthought/cucumber/generators/FeatureReportPage.java
+++ b/src/main/java/net/masterthought/cucumber/generators/FeatureReportPage.java
@@ -3,6 +3,7 @@ package net.masterthought.cucumber.generators;
import net.masterthought.cucumber.Configuration;
import net.masterthought.cucumber.ReportResult;
import net.masterthought.cucumber.json.Feature;
+import net.masterthought.cucumber.presentation.PresentationMode;
public class FeatureReportPage extends AbstractPage {
@@ -21,6 +22,7 @@ public class FeatureReportPage extends AbstractPage {
@Override
public void prepareReport() {
context.put("feature", feature);
+ context.put("parallel_testing", configuration.containsPresentationMode(PresentationMode.PARALLEL_TESTING));
}
}
diff --git a/src/test/java/net/masterthought/cucumber/generators/FeatureReportPageTest.java b/src/test/java/net/masterthought/cucumber/generators/FeatureReportPageTest.java
index 6c29c6b..5a06913 100644
--- a/src/test/java/net/masterthought/cucumber/generators/FeatureReportPageTest.java
+++ b/src/test/java/net/masterthought/cucumber/generators/FeatureReportPageTest.java
@@ -47,7 +47,7 @@ public class FeatureReportPageTest extends PageTest {
// then
VelocityContext context = page.context;
- assertThat(context.getKeys()).hasSize(14);
+ assertThat(context.getKeys()).hasSize(15);
assertThat(context.get("feature")).isEqualTo(feature);
}
diff --git a/src/test/java/net/masterthought/cucumber/generators/integrations/FeatureReportPageIntegrationTest.java b/src/test/java/net/masterthought/cucumber/generators/integrations/FeatureReportPageIntegrationTest.java
index 91d5713..e3fba70 100644
--- a/src/test/java/net/masterthought/cucumber/generators/integrations/FeatureReportPageIntegrationTest.java
+++ b/src/test/java/net/masterthought/cucumber/generators/integrations/FeatureReportPageIntegrationTest.java
@@ -1,5 +1,9 @@
package net.masterthought.cucumber.generators.integrations;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+
import net.masterthought.cucumber.generators.FeatureReportPage;
import net.masterthought.cucumber.generators.integrations.helpers.BriefAssertion;
import net.masterthought.cucumber.generators.integrations.helpers.DocumentAssertion;
@@ -22,13 +26,10 @@ import net.masterthought.cucumber.json.Output;
import net.masterthought.cucumber.json.Result;
import net.masterthought.cucumber.json.Row;
import net.masterthought.cucumber.json.Step;
+import net.masterthought.cucumber.presentation.PresentationMode;
import org.apache.commons.lang.StringUtils;
import org.junit.Test;
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -112,6 +113,26 @@ public class FeatureReportPageIntegrationTest extends PageTest {
}
@Test
+ public void generatePage_OnParallelTesting_generatesQualifierColumn() {
+
+ // given
+ setUpWithJson(SAMPLE_JSON);
+ final Feature feature = features.get(0);
+ configuration.addPresentationModes(PresentationMode.PARALLEL_TESTING);
+ page = new FeatureReportPage(reportResult, configuration, feature);
+
+ // when
+ page.generatePage();
+
+ // then
+ DocumentAssertion document = documentFrom(page.getWebPage());
+ TableRowAssertion bodyRow = document.getReport().getTableStats().getBodyRow();
+
+ bodyRow.hasExactValues(feature.getName(), "sample", "10", "0", "0", "0", "0", "10", "1", "0", "1", "1:39.263", "Passed");
+ bodyRow.hasExactCSSClasses("tagname", "", "passed", "", "", "", "", "total", "passed", "", "total", "duration", "passed");
+ }
+
+ @Test
public void generatePage_generatesFeatureDetails() {
// given
| https://github.com/damianszczepanik/cucumber-reporting.gitdiff --git a/src/main/java/net/masterthought/cucumber/generators/FeatureReportPage.java b/src/main/java/net/masterthought/cucumber/generators/FeatureReportPage.java |
gitbug-java_data_semver4j-semver4j.json_1 | diff --git a/src/main/java/org/semver4j/RangesList.java b/src/main/java/org/semver4j/RangesList.java
index c70ac62..d1bc4f6 100644
--- a/src/main/java/org/semver4j/RangesList.java
+++ b/src/main/java/org/semver4j/RangesList.java
@@ -81,7 +81,8 @@ public class RangesList {
public String toString() {
return rangesList.stream()
.map(RangesList::formatRanges)
- .collect(joining(OR_JOINER));
+ .collect(joining(OR_JOINER))
+ .replaceAll("^\\(([^()]+)\\)$", "$1");
}
private static String formatRanges(List<Range> ranges) {
diff --git a/src/test/java/org/semver4j/RangesListTest.java b/src/test/java/org/semver4j/RangesListTest.java
index 1ad2197..c036232 100644
--- a/src/test/java/org/semver4j/RangesListTest.java
+++ b/src/test/java/org/semver4j/RangesListTest.java
@@ -13,4 +13,13 @@ public class RangesListTest {
//when/then
assertThat(rangesList.toString()).isEqualTo("<=2.6.8 or (>=3.0.0 and <=3.0.1)");
}
+
+ @Test
+ void shouldOmitOuterParentheses() {
+ //given
+ RangesList rangesList = RangesListFactory.create(">=3.0.0 <=3.0.1");
+
+ //when/then
+ assertThat(rangesList.toString()).isEqualTo(">=3.0.0 and <=3.0.1");
+ }
}
| https://github.com/semver4j/semver4j.gitdiff --git a/src/main/java/org/semver4j/RangesList.java b/src/main/java/org/semver4j/RangesList.java |
gitbug-java_data_semver4j-semver4j.json_2 | diff --git a/src/main/java/org/semver4j/Semver.java b/src/main/java/org/semver4j/Semver.java
index 89203d3..cd3ed09 100644
--- a/src/main/java/org/semver4j/Semver.java
+++ b/src/main/java/org/semver4j/Semver.java
@@ -4,8 +4,11 @@ import org.semver4j.internal.*;
import org.semver4j.internal.StrictParser.Version;
import java.util.List;
+import java.util.Locale;
import java.util.Objects;
+import static java.lang.String.format;
+import static java.lang.String.join;
import static java.util.Objects.hash;
/**
@@ -15,7 +18,7 @@ import static java.util.Objects.hash;
public class Semver implements Comparable<Semver> {
public static final Semver ZERO = new Semver("0.0.0");
- private final String version;
+ private final String originalVersion;
private final int major;
private final int minor;
@@ -23,16 +26,27 @@ public class Semver implements Comparable<Semver> {
private final List<String> preRelease;
private final List<String> build;
+ private final String version;
+
public Semver(String version) {
- this.version = version.trim();
+ this.originalVersion = version.trim();
- Version parsedVersion = new StrictParser().parse(this.version);
+ Version parsedVersion = new StrictParser().parse(this.originalVersion);
major = parsedVersion.getMajor();
minor = parsedVersion.getMinor();
patch = parsedVersion.getPatch();
preRelease = parsedVersion.getPreRelease();
build = parsedVersion.getBuild();
+
+ String resultVersion = format(Locale.ROOT, "%d.%d.%d", major, minor, patch);
+ if (!preRelease.isEmpty()) {
+ resultVersion += "-" + join(".", preRelease);
+ }
+ if (!build.isEmpty()) {
+ resultVersion += "+" + join(".", build);
+ }
+ this.version = resultVersion;
}
/**
@@ -56,6 +70,10 @@ public class Semver implements Comparable<Semver> {
* @return {@link Semver} if can coerce version, {@code null} otherwise
*/
public static Semver coerce(String version) {
+ Semver semver = parse(version);
+ if (semver != null) {
+ return semver;
+ }
String coerce = Coerce.coerce(version);
return parse(coerce);
}
@@ -466,12 +484,12 @@ public class Semver implements Comparable<Semver> {
return false;
}
Semver semver = (Semver) o;
- return Objects.equals(version, semver.version);
+ return Objects.equals(originalVersion, semver.originalVersion);
}
@Override
public int hashCode() {
- return hash(version);
+ return hash(originalVersion);
}
@Override
diff --git a/src/test/java/org/semver4j/SemverTest.java b/src/test/java/org/semver4j/SemverTest.java
index dfcc9f3..012996a 100644
--- a/src/test/java/org/semver4j/SemverTest.java
+++ b/src/test/java/org/semver4j/SemverTest.java
@@ -766,7 +766,8 @@ class SemverTest {
arguments(format(Locale.ROOT, "%s.2.3.4", repeat("1", 17)), "2.3.4"),
arguments(format(Locale.ROOT, "1.%s.3.4", repeat("2", 17)), "1.0.0"),
arguments(format(Locale.ROOT, "1.2.%s.4", repeat("3", 17)), "1.2.0"),
- arguments("10", "10.0.0")
+ arguments("10", "10.0.0"),
+ arguments("3.2.1-rc.2", "3.2.1-rc.2")
);
}
| https://github.com/semver4j/semver4j.gitdiff --git a/src/main/java/org/semver4j/Semver.java b/src/main/java/org/semver4j/Semver.java |
gitbug-java_data_semver4j-semver4j.json_3 | diff --git a/src/main/java/org/semver4j/internal/range/processor/XRangeProcessor.java b/src/main/java/org/semver4j/internal/range/processor/XRangeProcessor.java
index 3864446..b336ff7 100644
--- a/src/main/java/org/semver4j/internal/range/processor/XRangeProcessor.java
+++ b/src/main/java/org/semver4j/internal/range/processor/XRangeProcessor.java
@@ -47,9 +47,6 @@ public class XRangeProcessor implements Processor {
}
if (!compareSign.isEmpty() && isX(patch)) {
- if (isX(minor)) {
- minor = 0;
- }
patch = 0;
if (compareSign.equals(GT.asString())) {
compareSign = GTE.asString();
@@ -64,9 +61,12 @@ public class XRangeProcessor implements Processor {
compareSign = LT.asString();
if (isX(minor)) {
major = major + 1;
+ minor = 0;
} else {
minor = minor + 1;
}
+ } else if (isX(minor)) {
+ minor = 0;
}
String from = format(Locale.ROOT, "%s%d.%d.%d", compareSign, major, minor, patch);
diff --git a/src/test/java/org/semver4j/SemverTest.java b/src/test/java/org/semver4j/SemverTest.java
index b438ec7..d3fa87d 100644
--- a/src/test/java/org/semver4j/SemverTest.java
+++ b/src/test/java/org/semver4j/SemverTest.java
@@ -998,9 +998,11 @@ class SemverTest {
arguments("1.9.9", "<=2.0", true),
arguments("2.0.0", "<=2.0", true),
arguments("2.0.1", "<=2.0", true),
+ arguments("2.1.0", "<=2.0", false),
arguments("1.9.9", "<=2", true),
arguments("2.0.0", "<=2", true),
arguments("2.0.1", "<=2", true),
+ arguments("2.2.0", "<=2", true),
arguments("2.0.1", "<=2.0.0", false),
arguments("3.0.0", "<=2.0.0", false),
arguments("3.0.0", "<=2.0", false),
| https://github.com/semver4j/semver4j.gitdiff --git a/src/main/java/org/semver4j/internal/range/processor/XRangeProcessor.java b/src/main/java/org/semver4j/internal/range/processor/XRangeProcessor.java |
gitbug-java_data_Bindambc-whatsapp-business-java-api.json_1 | diff --git a/src/main/java/com/whatsapp/api/domain/messages/Language.java b/src/main/java/com/whatsapp/api/domain/messages/Language.java
index 817f020..52c88d5 100644
--- a/src/main/java/com/whatsapp/api/domain/messages/Language.java
+++ b/src/main/java/com/whatsapp/api/domain/messages/Language.java
@@ -1,28 +1,12 @@
package com.whatsapp.api.domain.messages;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.whatsapp.api.domain.templates.type.LanguageType;
/**
- * The type Language.
+ * @param code Language code. See {@link LanguageType}
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
-public record Language(LanguageType code) {
- /**
- * Instantiates a new Language.
- *
- * @param code the code
- */
- public Language {
- }
-
- /**
- * Gets code.
- *
- * @return the code
- */
- @Override
- public LanguageType code() {
- return code;
- }
+public record Language(@JsonProperty("code") LanguageType code) {
}
diff --git a/src/test/java/com/whatsapp/api/examples/SendTemplateTextMessageExample.java b/src/test/java/com/whatsapp/api/examples/SendTemplateTextMessageExample.java
index 1595c61..6b2e1f4 100644
--- a/src/test/java/com/whatsapp/api/examples/SendTemplateTextMessageExample.java
+++ b/src/test/java/com/whatsapp/api/examples/SendTemplateTextMessageExample.java
@@ -34,5 +34,7 @@ public class SendTemplateTextMessageExample {
);
whatsappBusinessCloudApi.sendMessage(PHONE_NUMBER_ID, message);
+
+
}
}
diff --git a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java
index d24e59a..4fd7d84 100644
--- a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java
+++ b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessCloudApiTest.java
@@ -5,12 +5,18 @@ import com.whatsapp.api.TestConstants;
import com.whatsapp.api.WhatsappApiFactory;
import com.whatsapp.api.domain.media.FileType;
import com.whatsapp.api.domain.messages.AudioMessage;
+import com.whatsapp.api.domain.messages.Component;
import com.whatsapp.api.domain.messages.DocumentMessage;
import com.whatsapp.api.domain.messages.ImageMessage;
+import com.whatsapp.api.domain.messages.Language;
import com.whatsapp.api.domain.messages.Message.MessageBuilder;
import com.whatsapp.api.domain.messages.StickerMessage;
+import com.whatsapp.api.domain.messages.TemplateMessage;
import com.whatsapp.api.domain.messages.TextMessage;
+import com.whatsapp.api.domain.messages.TextParameter;
import com.whatsapp.api.domain.messages.VideoMessage;
+import com.whatsapp.api.domain.templates.type.ComponentType;
+import com.whatsapp.api.domain.templates.type.LanguageType;
import com.whatsapp.api.exception.WhatsappApiException;
import com.whatsapp.api.exception.utils.Formatter;
import mockwebserver3.MockResponse;
@@ -91,6 +97,41 @@ public class WhatsappBusinessCloudApiTest extends MockServerUtilsTest {
}
@Test
+ void testSendTemplateTextMessage() throws IOException, URISyntaxException, InterruptedException {
+ mockWebServer.enqueue(new MockResponse().setResponseCode(200).setBody(fromResource("/message.json")));
+
+ WhatsappApiFactory factory = WhatsappApiFactory.newInstance(TestConstants.TOKEN);
+
+ WhatsappBusinessCloudApi whatsappBusinessCloudApi = factory.newBusinessCloudApi();
+
+
+ var templateMessage = new TemplateMessage()//
+ .setLanguage(new Language(LanguageType.PT_BR))//
+ .setName("number_confirmation")//
+ .addComponent(//
+ new Component(ComponentType.BODY)//
+ .addParameter(new TextParameter("18754269072")//
+ ));
+
+ var message = MessageBuilder.builder()//
+ .setTo(TestConstants.PHONE_NUMBER_1)//
+ .buildTemplateMessage(templateMessage);
+
+ whatsappBusinessCloudApi.sendMessage(PHONE_NUMBER_ID, message);
+
+ RecordedRequest recordedRequest = mockWebServer.takeRequest();
+ Assertions.assertEquals("POST", recordedRequest.getMethod());
+ Assertions.assertEquals("/" + API_VERSION + "/" + PHONE_NUMBER_ID + "/messages", recordedRequest.getPath());
+
+ var expectedBody = """
+ {"messaging_product":"whatsapp","recipient_type":"individual","to":"%s","type":"template","template":{"components":[{"type":"BODY","parameters":[{"type":"text","text":"18754269072"}]}],"name":"number_confirmation","language":{"code":"pt_BR"}}}""";
+
+ Assertions.assertEquals(String.format(expectedBody, PHONE_NUMBER_1), recordedRequest.getBody().readUtf8());
+
+ }
+
+
+ @Test
void testSendAudioMessage() throws IOException, URISyntaxException, InterruptedException {
mockWebServer.enqueue(new MockResponse().setResponseCode(200).setBody(fromResource("/message.json")));
| https://github.com/Bindambc/whatsapp-business-java-api.gitdiff --git a/src/main/java/com/whatsapp/api/domain/messages/Language.java b/src/main/java/com/whatsapp/api/domain/messages/Language.java |
gitbug-java_data_Bindambc-whatsapp-business-java-api.json_2 | diff --git a/src/main/java/com/whatsapp/api/domain/templates/QuickReplyButton.java b/src/main/java/com/whatsapp/api/domain/templates/QuickReplyButton.java
index f7a21a9..4ad1003 100644
--- a/src/main/java/com/whatsapp/api/domain/templates/QuickReplyButton.java
+++ b/src/main/java/com/whatsapp/api/domain/templates/QuickReplyButton.java
@@ -12,7 +12,7 @@ public class QuickReplyButton extends Button {
* Instantiates a new Quick reply button.
*/
protected QuickReplyButton() {
-
+ super(ButtonType.QUICK_REPLY);
}
/**
diff --git a/src/main/java/com/whatsapp/api/domain/templates/UrlButton.java b/src/main/java/com/whatsapp/api/domain/templates/UrlButton.java
index c8fa0ac..402e75a 100644
--- a/src/main/java/com/whatsapp/api/domain/templates/UrlButton.java
+++ b/src/main/java/com/whatsapp/api/domain/templates/UrlButton.java
@@ -21,6 +21,7 @@ public class UrlButton extends Button {
* Instantiates a new Url button.
*/
protected UrlButton() {
+ super(ButtonType.URL);
}
/**
diff --git a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java
index 39d2d2b..59bf811 100644
--- a/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java
+++ b/src/test/java/com/whatsapp/api/impl/WhatsappBusinessManagementApiTest.java
@@ -1,5 +1,6 @@
package com.whatsapp.api.impl;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.whatsapp.api.MockServerUtilsTest;
import com.whatsapp.api.TestConstants;
import com.whatsapp.api.WhatsappApiFactory;
@@ -17,6 +18,7 @@ import com.whatsapp.api.domain.templates.MessageTemplate;
import com.whatsapp.api.domain.templates.PhoneNumberButton;
import com.whatsapp.api.domain.templates.QuickReplyButton;
import com.whatsapp.api.domain.templates.UrlButton;
+import com.whatsapp.api.domain.templates.type.ButtonType;
import com.whatsapp.api.domain.templates.type.Category;
import com.whatsapp.api.domain.templates.type.HeaderFormat;
import com.whatsapp.api.domain.templates.type.LanguageType;
@@ -450,9 +452,9 @@ class WhatsappBusinessManagementApiTest extends MockServerUtilsTest {
var templates = whatsappBusinessCloudApi.retrieveTemplates(WABA_ID);
//TODO: review button
- //var returnedJson = new ObjectMapper().writeValueAsString(templates);
+ var returnedJson = new ObjectMapper().writeValueAsString(templates);
- //JSONAssert.assertEquals(expectedJson, returnedJson,JSONCompareMode.STRICT);
+ JSONAssert.assertEquals(expectedJson, returnedJson,JSONCompareMode.STRICT);
// data[1].components[3].buttons[0]
Assertions.assertEquals(7, templates.data().size());
@@ -460,6 +462,11 @@ class WhatsappBusinessManagementApiTest extends MockServerUtilsTest {
Assertions.assertEquals("Hello {{1}}, welcome to our {{2}} test.", templates.data().get(0).components().get(1).getText());
Assertions.assertEquals("1772832833109192", templates.data().get(6).id());
+ var buttonComponent = (ButtonComponent) templates.data().get(1).components().get(3);
+
+ Assertions.assertEquals(ButtonType.QUICK_REPLY,buttonComponent.getButtons().get(0).getType());
+
+
}
@Test
| https://github.com/Bindambc/whatsapp-business-java-api.gitdiff --git a/src/main/java/com/whatsapp/api/domain/templates/QuickReplyButton.java b/src/main/java/com/whatsapp/api/domain/templates/QuickReplyButton.java |
gitbug-java_data_c-rack-cbor-java.json_1 | diff --git a/src/main/java/co/nstant/in/cbor/decoder/SpecialDecoder.java b/src/main/java/co/nstant/in/cbor/decoder/SpecialDecoder.java
index bab71e7..7ca4bf1 100644
--- a/src/main/java/co/nstant/in/cbor/decoder/SpecialDecoder.java
+++ b/src/main/java/co/nstant/in/cbor/decoder/SpecialDecoder.java
@@ -51,7 +51,6 @@ public class SpecialDecoder extends AbstractDecoder<Special> {
return doublePrecisionFloatDecoder.decode(initialByte);
case SIMPLE_VALUE_NEXT_BYTE:
return new SimpleValue(nextSymbol());
- case UNALLOCATED:
default:
throw new CborException("Not implemented");
}
diff --git a/src/main/java/co/nstant/in/cbor/encoder/SpecialEncoder.java b/src/main/java/co/nstant/in/cbor/encoder/SpecialEncoder.java
index 8fa3f0c..1bed2b5 100644
--- a/src/main/java/co/nstant/in/cbor/encoder/SpecialEncoder.java
+++ b/src/main/java/co/nstant/in/cbor/encoder/SpecialEncoder.java
@@ -25,7 +25,7 @@ public class SpecialEncoder extends AbstractEncoder<Special> {
}
@Override
- public void encode(Special dataItem) throws CborException {
+ public void encode(Special dataItem) throws CborException{
switch (dataItem.getSpecialType()) {
case BREAK:
write((7 << 5) | 31);
@@ -47,8 +47,6 @@ public class SpecialEncoder extends AbstractEncoder<Special> {
break;
}
break;
- case UNALLOCATED:
- throw new CborException("Unallocated special type");
case IEEE_754_HALF_PRECISION_FLOAT:
halfPrecisionFloatEncoder.encode((HalfPrecisionFloat) dataItem);
break;
@@ -62,6 +60,8 @@ public class SpecialEncoder extends AbstractEncoder<Special> {
SimpleValue simpleValueNextByte = (SimpleValue) dataItem;
write((byte) ((7 << 5) | 24), (byte) simpleValueNextByte.getValue());
break;
+ default:
+ throw new AssertionError("Unknown special value type");
}
}
diff --git a/src/main/java/co/nstant/in/cbor/model/SpecialType.java b/src/main/java/co/nstant/in/cbor/model/SpecialType.java
index 2a96fb3..5f4c8c1 100644
--- a/src/main/java/co/nstant/in/cbor/model/SpecialType.java
+++ b/src/main/java/co/nstant/in/cbor/model/SpecialType.java
@@ -1,11 +1,13 @@
package co.nstant.in.cbor.model;
+import co.nstant.in.cbor.CborException;
+
public enum SpecialType {
SIMPLE_VALUE, SIMPLE_VALUE_NEXT_BYTE, IEEE_754_HALF_PRECISION_FLOAT, IEEE_754_SINGLE_PRECISION_FLOAT,
- IEEE_754_DOUBLE_PRECISION_FLOAT, UNALLOCATED, BREAK;
+ IEEE_754_DOUBLE_PRECISION_FLOAT, BREAK;
- public static SpecialType ofByte(int b) {
+ public static SpecialType ofByte(int b) throws CborException {
switch (b & 31) {
case 24:
return SIMPLE_VALUE_NEXT_BYTE;
@@ -18,7 +20,7 @@ public enum SpecialType {
case 28:
case 29:
case 30:
- return UNALLOCATED;
+ throw new CborException("Not implemented special type " + b);
case 31:
return BREAK;
default:
diff --git a/src/test/java/co/nstant/in/cbor/encoder/SpecialEncoderTest.java b/src/test/java/co/nstant/in/cbor/encoder/SpecialEncoderTest.java
index 387ee28..cf63490 100644
--- a/src/test/java/co/nstant/in/cbor/encoder/SpecialEncoderTest.java
+++ b/src/test/java/co/nstant/in/cbor/encoder/SpecialEncoderTest.java
@@ -19,13 +19,6 @@ public class SpecialEncoderTest {
}
- @Test(expected = CborException.class)
- public void shouldNotEncodeReserved() throws CborException {
- ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
- Special dataItem = new Mock(SpecialType.UNALLOCATED);
- new CborEncoder(byteArrayOutputStream).encode(dataItem);
- }
-
@Test(expected = ClassCastException.class)
public void shouldExpectDoublePrecisionFloatImplementation() throws CborException {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
diff --git a/src/test/java/co/nstant/in/cbor/model/SpecialTypeTest.java b/src/test/java/co/nstant/in/cbor/model/SpecialTypeTest.java
index 1d530c7..5ef08c9 100644
--- a/src/test/java/co/nstant/in/cbor/model/SpecialTypeTest.java
+++ b/src/test/java/co/nstant/in/cbor/model/SpecialTypeTest.java
@@ -3,13 +3,23 @@ package co.nstant.in.cbor.model;
import org.junit.Assert;
import org.junit.Test;
+import co.nstant.in.cbor.CborException;
+
public class SpecialTypeTest {
- @Test
- public void shouldDetectUnallocated() {
- Assert.assertTrue(SpecialType.ofByte(28).equals(SpecialType.UNALLOCATED));
- Assert.assertTrue(SpecialType.ofByte(29).equals(SpecialType.UNALLOCATED));
- Assert.assertTrue(SpecialType.ofByte(30).equals(SpecialType.UNALLOCATED));
+ @Test(expected = CborException.class)
+ public void shouldDetectUnallocated28() throws CborException {
+ SpecialType.ofByte(28);
+ }
+
+ @Test(expected = CborException.class)
+ public void shouldDetectUnallocated29() throws CborException {
+ SpecialType.ofByte(29);
+ }
+
+ @Test(expected = CborException.class)
+ public void shouldDetectUnallocated30() throws CborException {
+ SpecialType.ofByte(30);
}
}
| https://github.com/c-rack/cbor-java.gitdiff --git a/src/main/java/co/nstant/in/cbor/decoder/SpecialDecoder.java b/src/main/java/co/nstant/in/cbor/decoder/SpecialDecoder.java |
gitbug-java_data_nikoo28-java-solutions.json_1 | diff --git a/src/main/java/leetcode/medium/OnlineStockSpan.java b/src/main/java/leetcode/medium/OnlineStockSpan.java
index ee013ef..dc22f4f 100644
--- a/src/main/java/leetcode/medium/OnlineStockSpan.java
+++ b/src/main/java/leetcode/medium/OnlineStockSpan.java
@@ -35,7 +35,7 @@ public class OnlineStockSpan {
for (int i = 1; i < prices.length; i++) {
while (!indexStack.isEmpty()
- && prices[indexStack.peek()] <= prices[i])
+ && prices[indexStack.peek()] < prices[i])
indexStack.pop();
// If index stack is empty, the price at index 'i'
diff --git a/src/test/java/leetcode/medium/OnlineStockSpanTest.java b/src/test/java/leetcode/medium/OnlineStockSpanTest.java
index f362e4d..d87ed2b 100644
--- a/src/test/java/leetcode/medium/OnlineStockSpanTest.java
+++ b/src/test/java/leetcode/medium/OnlineStockSpanTest.java
@@ -56,4 +56,13 @@ class OnlineStockSpanTest {
int[] actualSpans = onlineStockSpan.calculateSpans(prices);
assertArrayEquals(spans, actualSpans);
}
+
+ @Test
+ void testCalculateSpans6() {
+ int[] prices = {10, 10, 10, 10};
+ int[] spans = {1, 1, 1, 1};
+
+ int[] actualSpans = onlineStockSpan.calculateSpans(prices);
+ assertArrayEquals(spans, actualSpans);
+ }
}
\ No newline at end of file
| https://github.com/nikoo28/java-solutions.gitdiff --git a/src/main/java/leetcode/medium/OnlineStockSpan.java b/src/main/java/leetcode/medium/OnlineStockSpan.java |
gitbug-java_data_crawler-commons-crawler-commons.json_1 | diff --git a/src/main/java/crawlercommons/robots/SimpleRobotRulesParser.java b/src/main/java/crawlercommons/robots/SimpleRobotRulesParser.java
index c22461c..f7d33d7 100644
--- a/src/main/java/crawlercommons/robots/SimpleRobotRulesParser.java
+++ b/src/main/java/crawlercommons/robots/SimpleRobotRulesParser.java
@@ -492,7 +492,17 @@ public class SimpleRobotRulesParser extends BaseRobotsParser {
int bytesLen = content.length;
int offset = 0;
- Charset encoding = StandardCharsets.US_ASCII;
+
+ /*
+ * RFC 9309 requires that is "UTF-8 encoded" (<a href=
+ * "https://www.rfc-editor.org/rfc/rfc9309.html#name-access-method"> RFC
+ * 9309, section 2.3 Access Method</a>), but
+ * "Implementors MAY bridge encoding mismatches if they detect that the robots.txt file is not UTF-8 encoded."
+ * (<a href=
+ * "https://www.rfc-editor.org/rfc/rfc9309.html#name-the-allow-and-disallow-line"
+ * > RFC 9309, section 2.2.2. The "Allow" and "Disallow" Lines</a>)
+ */
+ Charset encoding = StandardCharsets.UTF_8;
// Check for a UTF-8 BOM at the beginning (EF BB BF)
if ((bytesLen >= 3) && (content[0] == (byte) 0xEF) && (content[1] == (byte) 0xBB) && (content[2] == (byte) 0xBF)) {
diff --git a/src/test/java/crawlercommons/robots/SimpleRobotRulesParserTest.java b/src/test/java/crawlercommons/robots/SimpleRobotRulesParserTest.java
index 597498f..3fb6dc4 100644
--- a/src/test/java/crawlercommons/robots/SimpleRobotRulesParserTest.java
+++ b/src/test/java/crawlercommons/robots/SimpleRobotRulesParserTest.java
@@ -22,6 +22,7 @@ import org.junit.jupiter.params.provider.CsvSource;
import java.io.InputStream;
import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -227,6 +228,44 @@ public class SimpleRobotRulesParserTest {
}
@Test
+ void testUnicodeUnescapedPaths() {
+ final String simpleRobotsTxt = "User-agent: *" + CRLF //
+ + "Disallow: /bücher/" + CRLF //
+ + "Disallow: /k%C3%B6nyvek/" + CRLF //
+ + CRLF //
+ + "User-agent: GoodBot" + CRLF //
+ + "Allow: /";
+
+ BaseRobotRules rules = createRobotRules("mybot", simpleRobotsTxt);
+ assertTrue(rules.isAllowed("https://www.example.com/"));
+
+ // test using escaped and unescaped URLs
+ assertFalse(rules.isAllowed("https://www.example.com/b%C3%BCcher/book1.html"));
+ assertFalse(rules.isAllowed("https://www.example.com/bücher/book2.html"));
+
+ // (for completeness) check also escaped path in robots.txt
+ assertFalse(rules.isAllowed("https://www.example.com/k%C3%B6nyvek/book1.html"));
+ assertFalse(rules.isAllowed("https://www.example.com/könyvek/book2.html"));
+
+ // test invalid encoding: invalid encoded characters should not break
+ // parsing of rules below
+ rules = createRobotRules("goodbot", simpleRobotsTxt.getBytes(StandardCharsets.ISO_8859_1));
+ assertTrue(rules.isAllowed("https://www.example.com/"));
+ assertTrue(rules.isAllowed("https://www.example.com/b%C3%BCcher/book1.html"));
+
+ // test invalid encoding: only rules with invalid characters should be
+ // ignored
+ rules = createRobotRules("mybot", simpleRobotsTxt.getBytes(StandardCharsets.ISO_8859_1));
+ assertTrue(rules.isAllowed("https://www.example.com/"));
+ assertFalse(rules.isAllowed("https://www.example.com/k%C3%B6nyvek/book1.html"));
+ assertFalse(rules.isAllowed("https://www.example.com/könyvek/book2.html"));
+ // if URL paths in disallow rules are not properly encoded, these two
+ // URLs are not matched:
+ // assertFalse(rules.isAllowed("https://www.example.com/b%C3%BCcher/book2.html"));
+ // assertFalse(rules.isAllowed("https://www.example.com/bücher/book1.html"));
+ }
+
+ @Test
void testSimplestAllowAll() {
final String simpleRobotsTxt = "User-agent: *" + CRLF //
+ "Disallow:";
| https://github.com/crawler-commons/crawler-commons.gitdiff --git a/src/main/java/crawlercommons/robots/SimpleRobotRulesParser.java b/src/main/java/crawlercommons/robots/SimpleRobotRulesParser.java |
gitbug-java_data_cdimascio-dotenv-java.json_1 | diff --git a/src/main/java/io/github/cdimascio/dotenv/internal/DotenvParser.java b/src/main/java/io/github/cdimascio/dotenv/internal/DotenvParser.java
index 30616e3..97b8d00 100644
--- a/src/main/java/io/github/cdimascio/dotenv/internal/DotenvParser.java
+++ b/src/main/java/io/github/cdimascio/dotenv/internal/DotenvParser.java
@@ -19,7 +19,17 @@ import static java.util.Collections.emptyList;
public class DotenvParser {
private static final Pattern WHITE_SPACE_REGEX = Pattern.compile("^\\s*$"); // ^\s*${'$'}
- private static final Pattern DOTENV_ENTRY_REGEX = Pattern.compile("^\\s*([\\w.\\-]+)\\s*(=)\\s*([^#]*)?\\s*(#.*)?$"); // ^\s*([\w.\-]+)\s*(=)\s*([^#]*)?\s*(#.*)?$
+
+ // The follow regex matches key values.
+ // It supports quoted values surrounded by single or double quotes
+ // - Single quotes: ['][^']*[']
+ // The above regex snippet matches a value wrapped in single quotes.
+ // The regex snippet does not match internal single quotes. This is present to allow the trailing comment to include single quotes
+ // - Double quotes: same logic as single quotes
+ // It ignore trailing comments
+ // - Trailing comment: \s*(#.*)?$
+ // The above snippet ignore spaces, the captures the # and the trailing comment
+ private static final Pattern DOTENV_ENTRY_REGEX = Pattern.compile("^\\s*([\\w.\\-]+)\\s*(=)\\s*(['][^']*[']|[\"][^\"]*[\"]|[^#]*)?\\s*(#.*)?$"); //"^\\s*([\\w.\\-]+)\\s*(=)\\s*([^#]*)?\\s*(#.*)?$"); // ^\s*([\w.\-]+)\s*(=)\s*([^#]*)?\s*(#.*)?$
private final DotenvReader reader;
private final boolean throwIfMissing;
diff --git a/src/test/java/tests/BasicTests.java b/src/test/java/tests/BasicTests.java
index c15cfd7..502e6ed 100644
--- a/src/test/java/tests/BasicTests.java
+++ b/src/test/java/tests/BasicTests.java
@@ -16,6 +16,7 @@ public class BasicTests {
put("WITHOUT_VALUE", "");
put("MULTI_LINE", "hello\\nworld");
put("TRAILING_COMMENT", "value");
+ put("QUOTED_VALUE", "iH4>hb_d0#_GN8d]6");
}};
@Test(expected = DotenvException.class)
diff --git a/src/test/resources/.env b/src/test/resources/.env
index 2c940e0..d0ccf01 100644
--- a/src/test/resources/.env
+++ b/src/test/resources/.env
@@ -4,6 +4,7 @@ MY_TEST_EV2=my test ev 2
WITHOUT_VALUE=
MULTI_LINE=hello\nworld
TRAILING_COMMENT=value # comment
+QUOTED_VALUE="iH4>hb_d0#_GN8d]6" # comment "test"
## Malformed EV!
MY_TEST_EV3
diff --git a/src/test/resources/env b/src/test/resources/env
index 8aaf95f..d01afb9 100644
--- a/src/test/resources/env
+++ b/src/test/resources/env
@@ -4,6 +4,7 @@ MY_TEST_EV2=my test ev 2
WITHOUT_VALUE=
MULTI_LINE=hello\nworld
TRAILING_COMMENT=value # comment
+QUOTED_VALUE="iH4>hb_d0#_GN8d]6" # comment "test"
## Malformed EV!
MY_TEST_EV3
| https://github.com/cdimascio/dotenv-java.gitdiff --git a/src/main/java/io/github/cdimascio/dotenv/internal/DotenvParser.java b/src/main/java/io/github/cdimascio/dotenv/internal/DotenvParser.java |