Skip to content

Commit 1567956

Browse files
karlnicholaskarlnicholas
committed
sonarqube cleanup.
1 parent 22eb83b commit 1567956

6 files changed

Lines changed: 63 additions & 59 deletions

File tree

‎src/main/java/org/hdf5javalib/datatype/StringDatatype.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
* @see HdfGlobalHeap
2323
*/
2424
public class StringDatatype implements Datatype {
25+
private static final String RFFU = "Reserved for future use.";
26+
private static final String RESERVED = "Reserved";
2527
/**
2628
* The class and version information for the datatype (class 3, version 1).
2729
*/
@@ -276,55 +278,55 @@ public enum PaddingType {
276278
/**
277279
* Reserved padding type for future use.
278280
*/
279-
RESERVED_3(3, "Reserved", "Reserved for future use."),
281+
RESERVED_3(3, RESERVED, RFFU),
280282
/**
281283
* Reserved padding type for future use.
282284
*/
283-
RESERVED_4(4, "Reserved", "Reserved for future use."),
285+
RESERVED_4(4, RESERVED, RFFU),
284286
/**
285287
* Reserved padding type for future use.
286288
*/
287-
RESERVED_5(5, "Reserved", "Reserved for future use."),
289+
RESERVED_5(5, RESERVED, RFFU),
288290
/**
289291
* Reserved padding type for future use.
290292
*/
291-
RESERVED_6(6, "Reserved", "Reserved for future use."),
293+
RESERVED_6(6, RESERVED, RFFU),
292294
/**
293295
* Reserved padding type for future use.
294296
*/
295-
RESERVED_7(7, "Reserved", "Reserved for future use."),
297+
RESERVED_7(7, RESERVED, RFFU),
296298
/**
297299
* Reserved padding type for future use.
298300
*/
299-
RESERVED_8(8, "Reserved", "Reserved for future use."),
301+
RESERVED_8(8, RESERVED, RFFU),
300302
/**
301303
* Reserved padding type for future use.
302304
*/
303-
RESERVED_9(9, "Reserved", "Reserved for future use."),
305+
RESERVED_9(9, RESERVED, RFFU),
304306
/**
305307
* Reserved padding type for future use.
306308
*/
307-
RESERVED_10(10, "Reserved", "Reserved for future use."),
309+
RESERVED_10(10, RESERVED, RFFU),
308310
/**
309311
* Reserved padding type for future use.
310312
*/
311-
RESERVED_11(11, "Reserved", "Reserved for future use."),
313+
RESERVED_11(11, RESERVED, RFFU),
312314
/**
313315
* Reserved padding type for future use.
314316
*/
315-
RESERVED_12(12, "Reserved", "Reserved for future use."),
317+
RESERVED_12(12, RESERVED, RFFU),
316318
/**
317319
* Reserved padding type for future use.
318320
*/
319-
RESERVED_13(13, "Reserved", "Reserved for future use."),
321+
RESERVED_13(13, RESERVED, RFFU),
320322
/**
321323
* Reserved padding type for future use.
322324
*/
323-
RESERVED_14(14, "Reserved", "Reserved for future use."),
325+
RESERVED_14(14, RESERVED, RFFU),
324326
/**
325327
* Reserved padding type for future use.
326328
*/
327-
RESERVED_15(15, "Reserved", "Reserved for future use.");
329+
RESERVED_15(15, RESERVED, RFFU);
328330

329331
private final int value;
330332
private final String name;
@@ -378,59 +380,59 @@ public enum CharacterSet {
378380
/**
379381
* Reserved character set for future use.
380382
*/
381-
RESERVED_2(2, "Reserved", "Reserved for future use."),
383+
RESERVED_2(2, RESERVED, RFFU),
382384
/**
383385
* Reserved character set for future use.
384386
*/
385-
RESERVED_3(3, "Reserved", "Reserved for future use."),
387+
RESERVED_3(3, RESERVED, RFFU),
386388
/**
387389
* Reserved character set for future use.
388390
*/
389-
RESERVED_4(4, "Reserved", "Reserved for future use."),
391+
RESERVED_4(4, RESERVED, RFFU),
390392
/**
391393
* Reserved character set for future use.
392394
*/
393-
RESERVED_5(5, "Reserved", "Reserved for future use."),
395+
RESERVED_5(5, RESERVED, RFFU),
394396
/**
395397
* Reserved character set for future use.
396398
*/
397-
RESERVED_6(6, "Reserved", "Reserved for future use."),
399+
RESERVED_6(6, RESERVED, RFFU),
398400
/**
399401
* Reserved character set for future use.
400402
*/
401-
RESERVED_7(7, "Reserved", "Reserved for future use."),
403+
RESERVED_7(7, RESERVED, RFFU),
402404
/**
403405
* Reserved character set for future use.
404406
*/
405-
RESERVED_8(8, "Reserved", "Reserved for future use."),
407+
RESERVED_8(8, RESERVED, RFFU),
406408
/**
407409
* Reserved character set for future use.
408410
*/
409-
RESERVED_9(9, "Reserved", "Reserved for future use."),
411+
RESERVED_9(9, RESERVED, RFFU),
410412
/**
411413
* Reserved character set for future use.
412414
*/
413-
RESERVED_10(10, "Reserved", "Reserved for future use."),
415+
RESERVED_10(10, RESERVED, RFFU),
414416
/**
415417
* Reserved character set for future use.
416418
*/
417-
RESERVED_11(11, "Reserved", "Reserved for future use."),
419+
RESERVED_11(11, RESERVED, RFFU),
418420
/**
419421
* Reserved character set for future use.
420422
*/
421-
RESERVED_12(12, "Reserved", "Reserved for future use."),
423+
RESERVED_12(12, RESERVED, RFFU),
422424
/**
423425
* Reserved character set for future use.
424426
*/
425-
RESERVED_13(13, "Reserved", "Reserved for future use."),
427+
RESERVED_13(13, RESERVED, RFFU),
426428
/**
427429
* Reserved character set for future use.
428430
*/
429-
RESERVED_14(14, "Reserved", "Reserved for future use."),
431+
RESERVED_14(14, RESERVED, RFFU),
430432
/**
431433
* Reserved character set for future use.
432434
*/
433-
RESERVED_15(15, "Reserved", "Reserved for future use.");
435+
RESERVED_15(15, RESERVED, RFFU);
434436

435437
final int value;
436438
final String name;

‎src/main/java/org/hdf5javalib/datatype/VariableLengthDatatype.java‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
* @see HdfGlobalHeap
2929
*/
3030
public class VariableLengthDatatype implements Datatype {
31+
private static final String RFFU = "Reserved for future use.";
32+
private static final String RESERVED = "Reserved";
3133
/**
3234
* The class and version information for the datatype (class 9, version 1).
3335
*/
@@ -347,59 +349,59 @@ public enum Type {
347349
/**
348350
* Reserved type for future use.
349351
*/
350-
RESERVED_2(2, "Reserved", "Reserved for future use."),
352+
RESERVED_2(2, RESERVED, RFFU),
351353
/**
352354
* Reserved type for future use.
353355
*/
354-
RESERVED_3(3, "Reserved", "Reserved for future use."),
356+
RESERVED_3(3, RESERVED, RFFU),
355357
/**
356358
* Reserved type for future use.
357359
*/
358-
RESERVED_4(4, "Reserved", "Reserved for future use."),
360+
RESERVED_4(4, RESERVED, RFFU),
359361
/**
360362
* Reserved type for future use.
361363
*/
362-
RESERVED_5(5, "Reserved", "Reserved for future use."),
364+
RESERVED_5(5, RESERVED, RFFU),
363365
/**
364366
* Reserved type for future use.
365367
*/
366-
RESERVED_6(6, "Reserved", "Reserved for future use."),
368+
RESERVED_6(6, RESERVED, RFFU),
367369
/**
368370
* Reserved type for future use.
369371
*/
370-
RESERVED_7(7, "Reserved", "Reserved for future use."),
372+
RESERVED_7(7, RESERVED, RFFU),
371373
/**
372374
* Reserved type for future use.
373375
*/
374-
RESERVED_8(8, "Reserved", "Reserved for future use."),
376+
RESERVED_8(8, RESERVED, RFFU),
375377
/**
376378
* Reserved type for future use.
377379
*/
378-
RESERVED_9(9, "Reserved", "Reserved for future use."),
380+
RESERVED_9(9, RESERVED, RFFU),
379381
/**
380382
* Reserved type for future use.
381383
*/
382-
RESERVED_10(10, "Reserved", "Reserved for future use."),
384+
RESERVED_10(10, RESERVED, RFFU),
383385
/**
384386
* Reserved type for future use.
385387
*/
386-
RESERVED_11(11, "Reserved", "Reserved for future use."),
388+
RESERVED_11(11, RESERVED, RFFU),
387389
/**
388390
* Reserved type for future use.
389391
*/
390-
RESERVED_12(12, "Reserved", "Reserved for future use."),
392+
RESERVED_12(12, RESERVED, RFFU),
391393
/**
392394
* Reserved type for future use.
393395
*/
394-
RESERVED_13(13, "Reserved", "Reserved for future use."),
396+
RESERVED_13(13, RESERVED, RFFU),
395397
/**
396398
* Reserved type for future use.
397399
*/
398-
RESERVED_14(14, "Reserved", "Reserved for future use."),
400+
RESERVED_14(14, RESERVED, RFFU),
399401
/**
400402
* Reserved type for future use.
401403
*/
402-
RESERVED_15(15, "Reserved", "Reserved for future use.");
404+
RESERVED_15(15, RESERVED, RFFU);
403405

404406
private final int value;
405407
private final String name;
@@ -460,55 +462,55 @@ public enum PaddingType {
460462
/**
461463
* Reserved padding type for future use.
462464
*/
463-
RESERVED_3(3, "Reserved", "Reserved for future use."),
465+
RESERVED_3(3, RESERVED, RFFU),
464466
/**
465467
* Reserved padding type for future use.
466468
*/
467-
RESERVED_4(4, "Reserved", "Reserved for future use."),
469+
RESERVED_4(4, RESERVED, RFFU),
468470
/**
469471
* Reserved padding type for future use.
470472
*/
471-
RESERVED_5(5, "Reserved", "Reserved for future use."),
473+
RESERVED_5(5, RESERVED, RFFU),
472474
/**
473475
* Reserved padding type for future use.
474476
*/
475-
RESERVED_6(6, "Reserved", "Reserved for future use."),
477+
RESERVED_6(6, RESERVED, RFFU),
476478
/**
477479
* Reserved padding type for future use.
478480
*/
479-
RESERVED_7(7, "Reserved", "Reserved for future use."),
481+
RESERVED_7(7, RESERVED, RFFU),
480482
/**
481483
* Reserved padding type for future use.
482484
*/
483-
RESERVED_8(8, "Reserved", "Reserved for future use."),
485+
RESERVED_8(8, RESERVED, RFFU),
484486
/**
485487
* Reserved padding type for future use.
486488
*/
487-
RESERVED_9(9, "Reserved", "Reserved for future use."),
489+
RESERVED_9(9, RESERVED, RFFU),
488490
/**
489491
* Reserved padding type for future use.
490492
*/
491-
RESERVED_10(10, "Reserved", "Reserved for future use."),
493+
RESERVED_10(10, RESERVED, RFFU),
492494
/**
493495
* Reserved padding type for future use.
494496
*/
495-
RESERVED_11(11, "Reserved", "Reserved for future use."),
497+
RESERVED_11(11, RESERVED, RFFU),
496498
/**
497499
* Reserved padding type for future use.
498500
*/
499-
RESERVED_12(12, "Reserved", "Reserved for future use."),
501+
RESERVED_12(12, RESERVED, RFFU),
500502
/**
501503
* Reserved padding type for future use.
502504
*/
503-
RESERVED_13(13, "Reserved", "Reserved for future use."),
505+
RESERVED_13(13, RESERVED, RFFU),
504506
/**
505507
* Reserved padding type for future use.
506508
*/
507-
RESERVED_14(14, "Reserved", "Reserved for future use."),
509+
RESERVED_14(14, RESERVED, RFFU),
508510
/**
509511
* Reserved padding type for future use.
510512
*/
511-
RESERVED_15(15, "Reserved", "Reserved for future use.");
513+
RESERVED_15(15, RESERVED, RFFU);
512514

513515
private final int value;
514516
private final String name;

‎src/main/java/org/hdf5javalib/hdffile/dataobjects/HdfObjectHeaderPrefixV2.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ public HdfObjectHeaderPrefixV2(
5050
}
5151
@Override
5252
public void writeAsGroupToByteChannel(SeekableByteChannel seekableByteChannel, HdfFileAllocation fileAllocation) throws IOException {
53-
53+
// not implemented
5454
}
5555
}

‎src/main/java/org/hdf5javalib/hdffile/dataobjects/messages/DataLayoutMessage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ public boolean hasData() {
495495
*/
496496
@Override
497497
public void writeMessageToByteBuffer(ByteBuffer buffer) {
498-
// writeMessageData(buffer);
498+
writeMessageData(buffer);
499499
// // Write version (1 byte)
500500
// buffer.put((byte) version);
501501
// // Write layout class (1 byte)

‎src/main/java/org/hdf5javalib/hdffile/dataobjects/messages/ExternalDataFilesMessage.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.List;
1313

1414
public class ExternalDataFilesMessage extends HdfMessage {
15-
private static final int ExternalDataFilesMessage_reserved1 = 3;
15+
private static final int externalDataFilesMessageReserved1 = 3;
1616

1717
private final byte version;
1818
private final int allocatedSlots;
@@ -42,7 +42,7 @@ public static HdfMessage parseHeaderMessage(int messageFlags, byte[] data, HdfDa
4242
ByteBuffer buffer = ByteBuffer.wrap(data).order(ByteOrder.LITTLE_ENDIAN);
4343

4444
byte version = buffer.get();
45-
buffer.position(buffer.position() + ExternalDataFilesMessage_reserved1);
45+
buffer.position(buffer.position() + externalDataFilesMessageReserved1);
4646
int allocatedSlots = Short.toUnsignedInt(buffer.getShort());
4747
int usedSlots = Short.toUnsignedInt(buffer.getShort());
4848
HdfFixedPoint heapAddress = HdfReadUtils.readHdfFixedPointFromBuffer(hdfDataFile.getSuperblock().getFixedPointDatatypeForOffset(), buffer);

‎src/main/java/org/hdf5javalib/hdffile/dataobjects/messages/LinkMessage.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ public static HdfMessage parseHeaderMessage(int messageFlags, byte[] data, HdfDa
126126

127127
@Override
128128
public void writeMessageToByteBuffer(ByteBuffer buffer) {
129-
129+
writeMessageData(buffer);
130130
}
131131
}

0 commit comments

Comments
 (0)