Skip to content

Commit b49348c

Browse files
vyazelenkovyazelenko
committed
[Java] Use BYTE_ORDER constant instead of accessing java.nio.ByteOrder directly.
1 parent e1b8520 commit b49348c

File tree

10 files changed

+200
-165
lines changed

10 files changed

+200
-165
lines changed

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2949,7 +2949,7 @@ private static void generateArrayLengthMethod(
29492949

29502950
private String byteOrderString(final Encoding encoding)
29512951
{
2952-
return sizeOfPrimitive(encoding) == 1 ? "" : ", java.nio.ByteOrder." + encoding.byteOrder();
2952+
return sizeOfPrimitive(encoding) == 1 ? "" : ", BYTE_ORDER";
29532953
}
29542954

29552955
private CharSequence generatePrimitiveArrayPropertyEncode(

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/FrameCodecDecoder.java‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public int irId()
297297
onIrIdAccessed();
298298
}
299299

300-
return buffer.getInt(offset + 0, java.nio.ByteOrder.LITTLE_ENDIAN);
300+
return buffer.getInt(offset + 0, BYTE_ORDER);
301301
}
302302

303303

@@ -364,7 +364,7 @@ public int irVersion()
364364
onIrVersionAccessed();
365365
}
366366

367-
return buffer.getInt(offset + 4, java.nio.ByteOrder.LITTLE_ENDIAN);
367+
return buffer.getInt(offset + 4, BYTE_ORDER);
368368
}
369369

370370

@@ -431,7 +431,7 @@ public int schemaVersion()
431431
onSchemaVersionAccessed();
432432
}
433433

434-
return buffer.getInt(offset + 8, java.nio.ByteOrder.LITTLE_ENDIAN);
434+
return buffer.getInt(offset + 8, BYTE_ORDER);
435435
}
436436

437437

@@ -503,7 +503,7 @@ public int packageNameLength()
503503
}
504504

505505
final int limit = parentMessage.limit();
506-
return (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
506+
return (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
507507
}
508508

509509
public int skipPackageName()
@@ -515,7 +515,7 @@ public int skipPackageName()
515515

516516
final int headerLength = 2;
517517
final int limit = parentMessage.limit();
518-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
518+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
519519
final int dataOffset = limit + headerLength;
520520
parentMessage.limit(dataOffset + dataLength);
521521

@@ -531,7 +531,7 @@ public int getPackageName(final MutableDirectBuffer dst, final int dstOffset, fi
531531

532532
final int headerLength = 2;
533533
final int limit = parentMessage.limit();
534-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
534+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
535535
final int bytesCopied = Math.min(length, dataLength);
536536
parentMessage.limit(limit + headerLength + dataLength);
537537
buffer.getBytes(limit + headerLength, dst, dstOffset, bytesCopied);
@@ -548,7 +548,7 @@ public int getPackageName(final byte[] dst, final int dstOffset, final int lengt
548548

549549
final int headerLength = 2;
550550
final int limit = parentMessage.limit();
551-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
551+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
552552
final int bytesCopied = Math.min(length, dataLength);
553553
parentMessage.limit(limit + headerLength + dataLength);
554554
buffer.getBytes(limit + headerLength, dst, dstOffset, bytesCopied);
@@ -565,7 +565,7 @@ public void wrapPackageName(final DirectBuffer wrapBuffer)
565565

566566
final int headerLength = 2;
567567
final int limit = parentMessage.limit();
568-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
568+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
569569
parentMessage.limit(limit + headerLength + dataLength);
570570
wrapBuffer.wrap(buffer, limit + headerLength, dataLength);
571571
}
@@ -579,7 +579,7 @@ public String packageName()
579579

580580
final int headerLength = 2;
581581
final int limit = parentMessage.limit();
582-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
582+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
583583
parentMessage.limit(limit + headerLength + dataLength);
584584

585585
if (0 == dataLength)
@@ -661,7 +661,7 @@ public int namespaceNameLength()
661661
}
662662

663663
final int limit = parentMessage.limit();
664-
return (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
664+
return (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
665665
}
666666

667667
public int skipNamespaceName()
@@ -673,7 +673,7 @@ public int skipNamespaceName()
673673

674674
final int headerLength = 2;
675675
final int limit = parentMessage.limit();
676-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
676+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
677677
final int dataOffset = limit + headerLength;
678678
parentMessage.limit(dataOffset + dataLength);
679679

@@ -689,7 +689,7 @@ public int getNamespaceName(final MutableDirectBuffer dst, final int dstOffset,
689689

690690
final int headerLength = 2;
691691
final int limit = parentMessage.limit();
692-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
692+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
693693
final int bytesCopied = Math.min(length, dataLength);
694694
parentMessage.limit(limit + headerLength + dataLength);
695695
buffer.getBytes(limit + headerLength, dst, dstOffset, bytesCopied);
@@ -706,7 +706,7 @@ public int getNamespaceName(final byte[] dst, final int dstOffset, final int len
706706

707707
final int headerLength = 2;
708708
final int limit = parentMessage.limit();
709-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
709+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
710710
final int bytesCopied = Math.min(length, dataLength);
711711
parentMessage.limit(limit + headerLength + dataLength);
712712
buffer.getBytes(limit + headerLength, dst, dstOffset, bytesCopied);
@@ -723,7 +723,7 @@ public void wrapNamespaceName(final DirectBuffer wrapBuffer)
723723

724724
final int headerLength = 2;
725725
final int limit = parentMessage.limit();
726-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
726+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
727727
parentMessage.limit(limit + headerLength + dataLength);
728728
wrapBuffer.wrap(buffer, limit + headerLength, dataLength);
729729
}
@@ -737,7 +737,7 @@ public String namespaceName()
737737

738738
final int headerLength = 2;
739739
final int limit = parentMessage.limit();
740-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
740+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
741741
parentMessage.limit(limit + headerLength + dataLength);
742742

743743
if (0 == dataLength)
@@ -819,7 +819,7 @@ public int semanticVersionLength()
819819
}
820820

821821
final int limit = parentMessage.limit();
822-
return (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
822+
return (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
823823
}
824824

825825
public int skipSemanticVersion()
@@ -831,7 +831,7 @@ public int skipSemanticVersion()
831831

832832
final int headerLength = 2;
833833
final int limit = parentMessage.limit();
834-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
834+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
835835
final int dataOffset = limit + headerLength;
836836
parentMessage.limit(dataOffset + dataLength);
837837

@@ -847,7 +847,7 @@ public int getSemanticVersion(final MutableDirectBuffer dst, final int dstOffset
847847

848848
final int headerLength = 2;
849849
final int limit = parentMessage.limit();
850-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
850+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
851851
final int bytesCopied = Math.min(length, dataLength);
852852
parentMessage.limit(limit + headerLength + dataLength);
853853
buffer.getBytes(limit + headerLength, dst, dstOffset, bytesCopied);
@@ -864,7 +864,7 @@ public int getSemanticVersion(final byte[] dst, final int dstOffset, final int l
864864

865865
final int headerLength = 2;
866866
final int limit = parentMessage.limit();
867-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
867+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
868868
final int bytesCopied = Math.min(length, dataLength);
869869
parentMessage.limit(limit + headerLength + dataLength);
870870
buffer.getBytes(limit + headerLength, dst, dstOffset, bytesCopied);
@@ -881,7 +881,7 @@ public void wrapSemanticVersion(final DirectBuffer wrapBuffer)
881881

882882
final int headerLength = 2;
883883
final int limit = parentMessage.limit();
884-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
884+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
885885
parentMessage.limit(limit + headerLength + dataLength);
886886
wrapBuffer.wrap(buffer, limit + headerLength, dataLength);
887887
}
@@ -895,7 +895,7 @@ public String semanticVersion()
895895

896896
final int headerLength = 2;
897897
final int limit = parentMessage.limit();
898-
final int dataLength = (buffer.getShort(limit, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
898+
final int dataLength = (buffer.getShort(limit, BYTE_ORDER) & 0xFFFF);
899899
parentMessage.limit(limit + headerLength + dataLength);
900900

901901
if (0 == dataLength)

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/FrameCodecEncoder.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public FrameCodecEncoder irId(final int value)
243243
onIrIdAccessed();
244244
}
245245

246-
buffer.putInt(offset + 0, value, java.nio.ByteOrder.LITTLE_ENDIAN);
246+
buffer.putInt(offset + 0, value, BYTE_ORDER);
247247
return this;
248248
}
249249

@@ -311,7 +311,7 @@ public FrameCodecEncoder irVersion(final int value)
311311
onIrVersionAccessed();
312312
}
313313

314-
buffer.putInt(offset + 4, value, java.nio.ByteOrder.LITTLE_ENDIAN);
314+
buffer.putInt(offset + 4, value, BYTE_ORDER);
315315
return this;
316316
}
317317

@@ -379,7 +379,7 @@ public FrameCodecEncoder schemaVersion(final int value)
379379
onSchemaVersionAccessed();
380380
}
381381

382-
buffer.putInt(offset + 8, value, java.nio.ByteOrder.LITTLE_ENDIAN);
382+
buffer.putInt(offset + 8, value, BYTE_ORDER);
383383
return this;
384384
}
385385

@@ -439,7 +439,7 @@ public FrameCodecEncoder putPackageName(final DirectBuffer src, final int srcOff
439439
final int headerLength = 2;
440440
final int limit = parentMessage.limit();
441441
parentMessage.limit(limit + headerLength + length);
442-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
442+
buffer.putShort(limit, (short)length, BYTE_ORDER);
443443
buffer.putBytes(limit + headerLength, src, srcOffset, length);
444444

445445
return this;
@@ -460,7 +460,7 @@ public FrameCodecEncoder putPackageName(final byte[] src, final int srcOffset, f
460460
final int headerLength = 2;
461461
final int limit = parentMessage.limit();
462462
parentMessage.limit(limit + headerLength + length);
463-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
463+
buffer.putShort(limit, (short)length, BYTE_ORDER);
464464
buffer.putBytes(limit + headerLength, src, srcOffset, length);
465465

466466
return this;
@@ -484,7 +484,7 @@ public FrameCodecEncoder packageName(final String value)
484484
final int headerLength = 2;
485485
final int limit = parentMessage.limit();
486486
parentMessage.limit(limit + headerLength + length);
487-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
487+
buffer.putShort(limit, (short)length, BYTE_ORDER);
488488
buffer.putBytes(limit + headerLength, bytes, 0, length);
489489

490490
return this;
@@ -545,7 +545,7 @@ public FrameCodecEncoder putNamespaceName(final DirectBuffer src, final int srcO
545545
final int headerLength = 2;
546546
final int limit = parentMessage.limit();
547547
parentMessage.limit(limit + headerLength + length);
548-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
548+
buffer.putShort(limit, (short)length, BYTE_ORDER);
549549
buffer.putBytes(limit + headerLength, src, srcOffset, length);
550550

551551
return this;
@@ -566,7 +566,7 @@ public FrameCodecEncoder putNamespaceName(final byte[] src, final int srcOffset,
566566
final int headerLength = 2;
567567
final int limit = parentMessage.limit();
568568
parentMessage.limit(limit + headerLength + length);
569-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
569+
buffer.putShort(limit, (short)length, BYTE_ORDER);
570570
buffer.putBytes(limit + headerLength, src, srcOffset, length);
571571

572572
return this;
@@ -590,7 +590,7 @@ public FrameCodecEncoder namespaceName(final String value)
590590
final int headerLength = 2;
591591
final int limit = parentMessage.limit();
592592
parentMessage.limit(limit + headerLength + length);
593-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
593+
buffer.putShort(limit, (short)length, BYTE_ORDER);
594594
buffer.putBytes(limit + headerLength, bytes, 0, length);
595595

596596
return this;
@@ -651,7 +651,7 @@ public FrameCodecEncoder putSemanticVersion(final DirectBuffer src, final int sr
651651
final int headerLength = 2;
652652
final int limit = parentMessage.limit();
653653
parentMessage.limit(limit + headerLength + length);
654-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
654+
buffer.putShort(limit, (short)length, BYTE_ORDER);
655655
buffer.putBytes(limit + headerLength, src, srcOffset, length);
656656

657657
return this;
@@ -672,7 +672,7 @@ public FrameCodecEncoder putSemanticVersion(final byte[] src, final int srcOffse
672672
final int headerLength = 2;
673673
final int limit = parentMessage.limit();
674674
parentMessage.limit(limit + headerLength + length);
675-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
675+
buffer.putShort(limit, (short)length, BYTE_ORDER);
676676
buffer.putBytes(limit + headerLength, src, srcOffset, length);
677677

678678
return this;
@@ -696,7 +696,7 @@ public FrameCodecEncoder semanticVersion(final String value)
696696
final int headerLength = 2;
697697
final int limit = parentMessage.limit();
698698
parentMessage.limit(limit + headerLength + length);
699-
buffer.putShort(limit, (short)length, java.nio.ByteOrder.LITTLE_ENDIAN);
699+
buffer.putShort(limit, (short)length, BYTE_ORDER);
700700
buffer.putBytes(limit + headerLength, bytes, 0, length);
701701

702702
return this;

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/MessageHeaderDecoder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public static int blockLengthMaxValue()
8787

8888
public int blockLength()
8989
{
90-
return (buffer.getShort(offset + 0, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
90+
return (buffer.getShort(offset + 0, BYTE_ORDER) & 0xFFFF);
9191
}
9292

9393

@@ -123,7 +123,7 @@ public static int templateIdMaxValue()
123123

124124
public int templateId()
125125
{
126-
return (buffer.getShort(offset + 2, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
126+
return (buffer.getShort(offset + 2, BYTE_ORDER) & 0xFFFF);
127127
}
128128

129129

@@ -159,7 +159,7 @@ public static int schemaIdMaxValue()
159159

160160
public int schemaId()
161161
{
162-
return (buffer.getShort(offset + 4, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
162+
return (buffer.getShort(offset + 4, BYTE_ORDER) & 0xFFFF);
163163
}
164164

165165

@@ -195,7 +195,7 @@ public static int versionMaxValue()
195195

196196
public int version()
197197
{
198-
return (buffer.getShort(offset + 6, java.nio.ByteOrder.LITTLE_ENDIAN) & 0xFFFF);
198+
return (buffer.getShort(offset + 6, BYTE_ORDER) & 0xFFFF);
199199
}
200200

201201

‎sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/MessageHeaderEncoder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static int blockLengthMaxValue()
8282

8383
public MessageHeaderEncoder blockLength(final int value)
8484
{
85-
buffer.putShort(offset + 0, (short)value, java.nio.ByteOrder.LITTLE_ENDIAN);
85+
buffer.putShort(offset + 0, (short)value, BYTE_ORDER);
8686
return this;
8787
}
8888

@@ -114,7 +114,7 @@ public static int templateIdMaxValue()
114114

115115
public MessageHeaderEncoder templateId(final int value)
116116
{
117-
buffer.putShort(offset + 2, (short)value, java.nio.ByteOrder.LITTLE_ENDIAN);
117+
buffer.putShort(offset + 2, (short)value, BYTE_ORDER);
118118
return this;
119119
}
120120

@@ -146,7 +146,7 @@ public static int schemaIdMaxValue()
146146

147147
public MessageHeaderEncoder schemaId(final int value)
148148
{
149-
buffer.putShort(offset + 4, (short)value, java.nio.ByteOrder.LITTLE_ENDIAN);
149+
buffer.putShort(offset + 4, (short)value, BYTE_ORDER);
150150
return this;
151151
}
152152

@@ -178,7 +178,7 @@ public static int versionMaxValue()
178178

179179
public MessageHeaderEncoder version(final int value)
180180
{
181-
buffer.putShort(offset + 6, (short)value, java.nio.ByteOrder.LITTLE_ENDIAN);
181+
buffer.putShort(offset + 6, (short)value, BYTE_ORDER);
182182
return this;
183183
}
184184

0 commit comments

Comments
 (0)