@@ -28,16 +28,6 @@ private int[][] toIntMatrix(HdfData[][] data) {
2828 return res ;
2929 }
3030
31- private double [][] toDoubleMatrix (HdfData [][] data ) {
32- double [][] res = new double [data .length ][data [0 ].length ];
33- for (int i = 0 ; i < data .length ; i ++) {
34- for (int j = 0 ; j < data [i ].length ; j ++) {
35- res [i ][j ] = data [i ][j ].getInstance (Double .class );
36- }
37- }
38- return res ;
39- }
40-
4131 private BigDecimal [][] toBigDecimalMatrix (HdfData [][] data ) {
4232 BigDecimal [][] res = new BigDecimal [data .length ][data [0 ].length ];
4333 for (int i = 0 ; i < data .length ; i ++) {
@@ -121,22 +111,23 @@ void testCompact() throws Exception {
121111 void testExtern () throws Exception {
122112 try (SeekableByteChannel channel = ResourceLoader .loadResourceAsChannel ("h5ex_d/h5ex_d_extern.h5" )) {
123113 HdfFileReader reader = new HdfFileReader (channel ).readFile ();
124- HdfDataset dataSet = reader .getDataset ("/DS1" ).orElseThrow ();
125- DataLayoutMessage layout = dataSet .getObjectHeader ().findMessageByType (DataLayoutMessage .class ).orElseThrow ();
126- assertInstanceOf (DataLayoutMessage .ContiguousStorage .class , layout .getDataLayoutStorage ());
127- DataLayoutMessage .ContiguousStorage cont = (DataLayoutMessage .ContiguousStorage ) layout .getDataLayoutStorage ();
128- assertTrue (cont .getDataAddress ().isUndefined ());
129- ExternalDataFilesMessage external = dataSet .getObjectHeader ().getHeaderMessages ().stream ()
130- .filter (m -> m instanceof ExternalDataFilesMessage )
131- .map (ExternalDataFilesMessage .class ::cast )
132- .findFirst ().orElse (null );
133- assertNotNull (external );
134- assertEquals (1 , external .getUsedSlots ());
135- List <ExternalDataFilesMessage .SlotDefinition > slots = external .getSlotDefinitions ();
136- assertEquals (1 , slots .size ());
137- assertEquals (8 , slots .get (0 ).nameOffset ().getInstance (Long .class ).intValue ());
138- assertEquals (0 , slots .get (0 ).fileOffset ().getInstance (Long .class ).intValue ());
139- assertTrue (slots .get (0 ).dataSize ().isUndefined ());
114+ try (HdfDataset dataSet = reader .getDataset ("/DS1" ).orElseThrow () ) {
115+ DataLayoutMessage layout = dataSet .getObjectHeader ().findMessageByType (DataLayoutMessage .class ).orElseThrow ();
116+ assertInstanceOf (DataLayoutMessage .ContiguousStorage .class , layout .getDataLayoutStorage ());
117+ DataLayoutMessage .ContiguousStorage cont = (DataLayoutMessage .ContiguousStorage ) layout .getDataLayoutStorage ();
118+ assertTrue (cont .getDataAddress ().isUndefined ());
119+ ExternalDataFilesMessage external = dataSet .getObjectHeader ().getHeaderMessages ().stream ()
120+ .filter (m -> m instanceof ExternalDataFilesMessage )
121+ .map (ExternalDataFilesMessage .class ::cast )
122+ .findFirst ().orElse (null );
123+ assertNotNull (external );
124+ assertEquals (1 , external .getUsedSlots ());
125+ List <ExternalDataFilesMessage .SlotDefinition > slots = external .getSlotDefinitions ();
126+ assertEquals (1 , slots .size ());
127+ assertEquals (8 , slots .get (0 ).nameOffset ().getInstance (Long .class ).intValue ());
128+ assertEquals (0 , slots .get (0 ).fileOffset ().getInstance (Long .class ).intValue ());
129+ assertTrue (slots .get (0 ).dataSize ().isUndefined ());
130+ }
140131 }
141132 }
142133
0 commit comments