Skip to content

Commit f2545f9

Browse files
committed
Update repo.
1 parent 82bad92 commit f2545f9

2 files changed

Lines changed: 3 additions & 33 deletions

File tree

plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetVendorId.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,14 +1609,12 @@ public enum BACnetVendorId {
16091609
KOMFORTIQ_INC((int) 1397, (int) 1397, (String) "Komfort IQ, Inc."),
16101610
COOL_TERA_LIMITED((int) 1398, (int) 1398, (String) "CoolTera Limited"),
16111611
HADRON_SOLUTIONS_SRLS((int) 1399, (int) 1399, (String) "Hadron Solutions S.r.l.s"),
1612-
16131612
BITPOOL((int) 1401, (int) 1401, (String) "Bitpool"),
16141613
SONICULLC((int) 1402, (int) 1402, (String) "Sonicu, LLC"),
16151614
RISHABH_INSTRUMENTS_LIMITED((int) 1403, (int) 1403, (String) "Rishabh Instruments Limited"),
16161615
THING_WAREHOUSELLC((int) 1404, (int) 1404, (String) "Thing Warehouse LLC"),
16171616
INNOFRIENDS_GMBH((int) 1405, (int) 1405, (String) "Innofriends GmbH"),
16181617
METRONICAKP_SPJ((int) 1406, (int) 1406, (String) "Metronic AKP Sp. J."),
1619-
16201618
UNKNOWN_VENDOR((int) 0xFFFF, (int) 0xFFFF, (String) "Unknown");
16211619
private static final Map<Integer, BACnetVendorId> map;
16221620

plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7VarPayloadDataItem.java

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,13 @@ public class S7VarPayloadDataItem implements Message {
4141
protected final DataTransportErrorCode returnCode;
4242
protected final DataTransportSize transportSize;
4343
protected final byte[] data;
44-
protected final Boolean hasNext;
4544

4645
public S7VarPayloadDataItem(
47-
DataTransportErrorCode returnCode,
48-
DataTransportSize transportSize,
49-
byte[] data,
50-
Boolean hasNext) {
46+
DataTransportErrorCode returnCode, DataTransportSize transportSize, byte[] data) {
5147
super();
5248
this.returnCode = returnCode;
5349
this.transportSize = transportSize;
5450
this.data = data;
55-
this.hasNext = hasNext;
5651
}
5752

5853
public DataTransportErrorCode getReturnCode() {
@@ -67,10 +62,6 @@ public byte[] getData() {
6762
return data;
6863
}
6964

70-
public Boolean getHasNext() {
71-
return hasNext;
72-
}
73-
7465
public void serialize(WriteBuffer writeBuffer) throws SerializationException {
7566
PositionAware positionAware = writeBuffer;
7667
boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
@@ -110,9 +101,6 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException {
110101
// Array Field (data)
111102
writeByteArrayField("data", data, writeByteArray(writeBuffer, 8));
112103

113-
// Optional Field (hasNext) (Can be skipped, if the value is null)
114-
writeOptionalField("hasNext", hasNext, writeBoolean(writeBuffer));
115-
116104
// Padding Field (padding)
117105
writePaddingField(
118106
"padding",
@@ -148,17 +136,8 @@ public int getLengthInBits() {
148136
lengthInBits += 8 * data.length;
149137
}
150138

151-
// Optional Field (hasNext)
152-
if (hasNext != null) {
153-
lengthInBits += 1;
154-
}
155-
156139
// Padding Field (padding)
157-
<<<<<<< HEAD
158140
int _timesPadding = (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0));
159-
=======
160-
int _timesPadding = (int) (((PADCOUNT(data, hasNext)) % (2)));
161-
>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.)
162141
while (_timesPadding-- > 0) {
163142
lengthInBits += 8;
164143
}
@@ -201,19 +180,13 @@ public static S7VarPayloadDataItem staticParse(ReadBuffer readBuffer) throws Par
201180
Math.toIntExact(
202181
((transportSize.getSizeInBits()) ? CEIL((dataLength) / (8.0)) : dataLength)));
203182

204-
<<<<<<< HEAD
205183
readPaddingField(
206184
readUnsignedShort(readBuffer, 8), (int) ((((!(_lastItem))) ? ((COUNT(data)) % (2)) : 0)));
207-
=======
208-
Boolean hasNext = readOptionalField("hasNext", readBoolean(readBuffer), (dataLength) < (-(1)));
209-
210-
readPaddingField(readUnsignedShort(readBuffer, 8), (int) (((PADCOUNT(data, hasNext)) % (2))));
211-
>>>>>>> fe65e60f40 (Test for S7VarPayloadItem.)
212185

213186
readBuffer.closeContext("S7VarPayloadDataItem");
214187
// Create the instance
215188
S7VarPayloadDataItem _s7VarPayloadDataItem;
216-
_s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data, hasNext);
189+
_s7VarPayloadDataItem = new S7VarPayloadDataItem(returnCode, transportSize, data);
217190
return _s7VarPayloadDataItem;
218191
}
219192

@@ -229,13 +202,12 @@ public boolean equals(Object o) {
229202
return (getReturnCode() == that.getReturnCode())
230203
&& (getTransportSize() == that.getTransportSize())
231204
&& (getData() == that.getData())
232-
&& (getHasNext() == that.getHasNext())
233205
&& true;
234206
}
235207

236208
@Override
237209
public int hashCode() {
238-
return Objects.hash(getReturnCode(), getTransportSize(), getData(), getHasNext());
210+
return Objects.hash(getReturnCode(), getTransportSize(), getData());
239211
}
240212

241213
@Override

0 commit comments

Comments
 (0)