SonarQube cleanup

karlnicholas · karlnicholas · commit 21e72c6a799b · 2025-10-16T21:07:29.000-04:00
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfAttributeReference.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfAttributeReference.java
@@ -1,7 +1,6 @@
 package org.hdf5javalib.dataclass.reference;
 
 import org.hdf5javalib.datatype.ReferenceDatatype;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfAttributeReference implements HdfReferenceInstance {
     private final boolean external;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfDataHolder.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfDataHolder.java
@@ -1,4 +1,4 @@
-package org.hdf5javalib.utils;
+package org.hdf5javalib.dataclass.reference;
 
 import org.hdf5javalib.dataclass.HdfData;
 
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfDatasetRegionReference.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfDatasetRegionReference.java
@@ -6,7 +6,6 @@
 import org.hdf5javalib.hdfjava.HdfDataObject;
 import org.hdf5javalib.hdfjava.HdfTree;
 import org.hdf5javalib.hdfjava.HdfTreeNode;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfDataspaceSelectionInstance.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfDataspaceSelectionInstance.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfObjectReference.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfObjectReference.java
@@ -9,7 +9,6 @@
 import org.hdf5javalib.hdfjava.HdfDataObject;
 import org.hdf5javalib.hdfjava.HdfTree;
 import org.hdf5javalib.hdfjava.HdfTreeNode;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfReferenceInstance.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfReferenceInstance.java
@@ -1,7 +1,5 @@
 package org.hdf5javalib.dataclass.reference;
 
-import org.hdf5javalib.utils.HdfDataHolder;
-
 public interface HdfReferenceInstance {
     HdfDataHolder getData();
 }
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectPointsV1.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectPointsV1.java
@@ -8,7 +8,6 @@
 import org.hdf5javalib.hdfjava.HdfDataObject;
 import org.hdf5javalib.hdfjava.HdfDataset;
 import org.hdf5javalib.utils.FlattenedArrayUtils;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectPointsV2.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectPointsV2.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectPointsV2 extends HdfDataspaceSelectionInstance {
     private final int version;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionAll.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionAll.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectionAll extends HdfDataspaceSelectionInstance {
     private final int version;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionAttribute.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionAttribute.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectionAttribute extends HdfDataspaceSelectionInstance {
     private final String attributeName;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV1.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV1.java
@@ -8,7 +8,6 @@
 import org.hdf5javalib.hdfjava.HdfDataObject;
 import org.hdf5javalib.hdfjava.HdfDataset;
 import org.hdf5javalib.utils.FlattenedArrayUtils;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV2.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV2.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectionHyperSlabV2 extends HdfDataspaceSelectionInstance {
     private final int version;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV3Irregular.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV3Irregular.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectionHyperSlabV3Irregular extends HdfDataspaceSelectionInstance {
     private final int version;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV3Regular.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionHyperSlabV3Regular.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectionHyperSlabV3Regular extends HdfDataspaceSelectionInstance {
     private final int version;
diff --git a/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionNone.java b/src/main/java/org/hdf5javalib/dataclass/reference/HdfSelectionNone.java
@@ -2,7 +2,6 @@
 
 import org.hdf5javalib.hdfjava.HdfDataFile;
 import org.hdf5javalib.hdfjava.HdfDataObject;
-import org.hdf5javalib.utils.HdfDataHolder;
 
 public class HdfSelectionNone extends HdfDataspaceSelectionInstance {
     private final int version;
diff --git a/src/main/java/org/hdf5javalib/datatype/ReferenceDatatype.java b/src/main/java/org/hdf5javalib/datatype/ReferenceDatatype.java
@@ -8,7 +8,7 @@
 import org.hdf5javalib.dataclass.reference.HdfReferenceInstance;
 import org.hdf5javalib.hdffile.infrastructure.HdfGlobalHeap;
 import org.hdf5javalib.hdfjava.HdfDataFile;
-import org.hdf5javalib.utils.HdfDataHolder;
+import org.hdf5javalib.dataclass.reference.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/main/java/org/hdf5javalib/hdffile/dataobjects/messages/AttributeMessage.java b/src/main/java/org/hdf5javalib/hdffile/dataobjects/messages/AttributeMessage.java
@@ -6,7 +6,7 @@
 import org.hdf5javalib.datatype.Datatype;
 import org.hdf5javalib.datatype.StringDatatype;
 import org.hdf5javalib.hdfjava.HdfDataFile;
-import org.hdf5javalib.utils.HdfDataHolder;
+import org.hdf5javalib.dataclass.reference.HdfDataHolder;
 
 import java.io.IOException;
 import java.lang.reflect.Array;
diff --git a/src/main/java/org/hdf5javalib/utils/HdfDisplayUtils.java b/src/main/java/org/hdf5javalib/utils/HdfDisplayUtils.java
@@ -2,6 +2,7 @@
 
 import org.hdf5javalib.dataclass.HdfData;
 import org.hdf5javalib.dataclass.HdfFixedPoint;
+import org.hdf5javalib.dataclass.reference.HdfDataHolder;
 import org.hdf5javalib.datasource.TypedDataSource;
 import org.hdf5javalib.hdffile.dataobjects.HdfObjectHeaderPrefix;
 import org.hdf5javalib.hdffile.dataobjects.messages.AttributeMessage;
diff --git a/src/test/java/org/hdf5javalib/examples/h5ex_t/H5exTReadTest.java b/src/test/java/org/hdf5javalib/examples/h5ex_t/H5exTReadTest.java
@@ -10,7 +10,7 @@
 import org.hdf5javalib.examples.ResourceLoader;
 import org.hdf5javalib.hdfjava.HdfDataset;
 import org.hdf5javalib.hdfjava.HdfFileReader;
-import org.hdf5javalib.utils.HdfDataHolder;
+import org.hdf5javalib.dataclass.reference.HdfDataHolder;
 import org.junit.jupiter.api.Test;
 
 import java.nio.channels.SeekableByteChannel;
diff --git a/src/test/java/org/hdf5javalib/examples/h5ex_t/att/H5exTAttReadTest.java b/src/test/java/org/hdf5javalib/examples/h5ex_t/att/H5exTAttReadTest.java
@@ -10,7 +10,7 @@
 import org.hdf5javalib.hdffile.dataobjects.messages.AttributeMessage;
 import org.hdf5javalib.hdfjava.HdfDataset;
 import org.hdf5javalib.hdfjava.HdfFileReader;
-import org.hdf5javalib.utils.HdfDataHolder;
+import org.hdf5javalib.dataclass.reference.HdfDataHolder;
 import org.junit.jupiter.api.Test;
 
 import java.nio.channels.SeekableByteChannel;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.hdf5javalib.utils;`
	`1`	`+package org.hdf5javalib.dataclass.reference;`
`2`	`2`
`3`	`3`	`import org.hdf5javalib.dataclass.HdfData;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`package org.hdf5javalib.dataclass.reference;`
`2`	`2`
`3`		`-import org.hdf5javalib.utils.HdfDataHolder;`
`4`		`-`
`5`	`3`	`public interface HdfReferenceInstance {`
`6`	`4`	`HdfDataHolder getData();`
`7`	`5`	`}`