rearrange entries in src/main

Author: brokkoli71

src/main/java/dev/zarr/zarrjava/core/Array.java

@@ -22,8 +22,6 @@ public abstract class Array extends AbstractNode {
 
     protected CodecPipeline codecPipeline;
 
-    public abstract ArrayMetadata metadata();
-
     protected Array(StoreHandle storeHandle) throws ZarrException {
         super(storeHandle);
     }
@@ -71,6 +69,8 @@ public static Array open(String path) throws IOException, ZarrException {
         return open(Paths.get(path));
     }
 
+    public abstract ArrayMetadata metadata();
+
     /**
      * Writes a ucar.ma2.Array into the Zarr array at a specified offset. The shape of the Zarr array
      * needs be large enough for the write.

src/main/java/dev/zarr/zarrjava/core/ArrayMetadata.java

@@ -29,23 +29,6 @@ public ArrayMetadata(long[] shape, Object fillValue, DataType dataType) throws Z
         this.parsedFillValue = parseFillValue(fillValue, dataType);
     }
 
-    public int ndim() {
-        return shape.length;
-    }
-
-    public abstract int[] chunkShape();
-
-    public abstract DataType dataType();
-
-    public abstract Array allocateFillValueChunk();
-
-    public abstract ChunkKeyEncoding chunkKeyEncoding();
-
-    public abstract Object parsedFillValue();
-
-    public @Nonnull
-    abstract Attributes attributes() throws ZarrException;
-
     public static Object parseFillValue(Object fillValue, @Nonnull DataType dataType)
             throws ZarrException {
         if (fillValue == null) {
@@ -151,6 +134,23 @@ public static Object parseFillValue(Object fillValue, @Nonnull DataType dataType
         throw new ZarrException("Invalid fill value '" + fillValue + "'.");
     }
 
+    public int ndim() {
+        return shape.length;
+    }
+
+    public abstract int[] chunkShape();
+
+    public abstract DataType dataType();
+
+    public abstract Array allocateFillValueChunk();
+
+    public abstract ChunkKeyEncoding chunkKeyEncoding();
+
+    public abstract Object parsedFillValue();
+
+    public @Nonnull
+    abstract Attributes attributes() throws ZarrException;
+
     public static final class CoreArrayMetadata {
 
         public final long[] shape;

src/main/java/dev/zarr/zarrjava/core/codec/CodecPipeline.java

@@ -11,9 +11,9 @@
 
 public class CodecPipeline {
 
+    public final CoreArrayMetadata arrayMetadata;
     @Nonnull
     final Codec[] codecs;
-    public final CoreArrayMetadata arrayMetadata;
 
     public CodecPipeline(@Nonnull Codec[] codecs, CoreArrayMetadata arrayMetadata) throws ZarrException {
         this.arrayMetadata = arrayMetadata;

src/main/java/dev/zarr/zarrjava/core/codec/core/BytesCodec.java

@@ -86,6 +86,10 @@ public enum Endian {
             this.endian = endian;
         }
 
+        public static Endian nativeOrder() {
+            return ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN ? LITTLE : BIG;
+        }
+
         @JsonValue
         public String getValue() {
             return endian;
@@ -101,10 +105,6 @@ public ByteOrder getByteOrder() {
                     throw new RuntimeException("Unreachable");
             }
         }
-
-        public static Endian nativeOrder() {
-            return ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN ? LITTLE : BIG;
-        }
     }
 
 }

src/main/java/dev/zarr/zarrjava/v2/Array.java

@@ -28,10 +28,6 @@ public class Array extends dev.zarr.zarrjava.core.Array implements Node {
 
     private final ArrayMetadata metadata;
 
-    public ArrayMetadata metadata() {
-        return metadata;
-    }
-
     protected Array(StoreHandle storeHandle, ArrayMetadata arrayMetadata) throws IOException, ZarrException {
         super(storeHandle);
         this.metadata = arrayMetadata;
@@ -193,6 +189,10 @@ public static ArrayMetadataBuilder metadataBuilder(ArrayMetadata existingMetadat
         return ArrayMetadataBuilder.fromArrayMetadata(existingMetadata);
     }
 
+    public ArrayMetadata metadata() {
+        return metadata;
+    }
+
     private Array writeMetadata(ArrayMetadata newArrayMetadata) throws ZarrException, IOException {
         return Array.create(storeHandle, newArrayMetadata, true);
     }

src/main/java/dev/zarr/zarrjava/v3/Array.java

@@ -25,10 +25,6 @@ public class Array extends dev.zarr.zarrjava.core.Array implements Node {
 
     private final ArrayMetadata metadata;
 
-    public ArrayMetadata metadata() {
-        return metadata;
-    }
-
     protected Array(StoreHandle storeHandle, ArrayMetadata arrayMetadata) throws ZarrException {
         super(storeHandle);
         this.metadata = arrayMetadata;
@@ -196,6 +192,10 @@ public static ArrayMetadataBuilder metadataBuilder(ArrayMetadata existingMetadat
         return ArrayMetadataBuilder.fromArrayMetadata(existingMetadata);
     }
 
+    public ArrayMetadata metadata() {
+        return metadata;
+    }
+
     private Array writeMetadata(ArrayMetadata newArrayMetadata) throws ZarrException, IOException {
         return Array.create(storeHandle, newArrayMetadata, true);
     }

src/main/java/dev/zarr/zarrjava/v3/ArrayMetadata.java

@@ -129,6 +129,9 @@ public ArrayMetadata(
         this.storageTransformers = storageTransformers;
     }
 
+    public static Optional<Codec> getShardingIndexedCodec(Codec[] codecs) {
+        return Arrays.stream(codecs).filter(codec -> codec instanceof ShardingIndexedCodec).findFirst();
+    }
 
     public ucar.ma2.Array allocateFillValueChunk() {
         return coreArrayMetadata.allocateFillValueChunk();
@@ -153,10 +156,6 @@ public Attributes attributes() throws ZarrException {
         return attributes;
     }
 
-    public static Optional<Codec> getShardingIndexedCodec(Codec[] codecs) {
-        return Arrays.stream(codecs).filter(codec -> codec instanceof ShardingIndexedCodec).findFirst();
-    }
-
     public int[] chunkShape() {
         return ((RegularChunkGrid) this.chunkGrid).configuration.chunkShape;
     }

src/main/java/dev/zarr/zarrjava/v3/codec/core/TransposeCodec.java

@@ -62,15 +62,6 @@ public long computeEncodedSize(long inputByteLength,
         return inputByteLength;
     }
 
-    public static final class Configuration {
-        public final int[] order;
-
-        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-        public Configuration(@JsonProperty(value = "order") int[] order) {
-            this.order = order;
-        }
-    }
-
     @Override
     public ArrayMetadata.CoreArrayMetadata resolveArrayMetadata() throws ZarrException {
         super.resolveArrayMetadata();
@@ -90,4 +81,13 @@ public ArrayMetadata.CoreArrayMetadata resolveArrayMetadata() throws ZarrExcepti
                 arrayMetadata.parsedFillValue
         );
     }
+
+    public static final class Configuration {
+        public final int[] order;
+
+        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+        public Configuration(@JsonProperty(value = "order") int[] order) {
+            this.order = order;
+        }
+    }
 }