Misc code tidying

Author: mikera

convex-core/src/main/java/convex/core/cvm/State.java

@@ -32,7 +32,6 @@
 import convex.core.data.Index;
 import convex.core.data.Keyword;
 import convex.core.data.Keywords;
-import convex.core.data.LongBlob;
 import convex.core.data.MapEntry;
 import convex.core.data.PeerStatus;
 import convex.core.data.Ref;
@@ -41,6 +40,7 @@
 import convex.core.data.Symbol;
 import convex.core.data.Tag;
 import convex.core.data.Vectors;
+import convex.core.data.impl.LongBlob;
 import convex.core.data.prim.CVMLong;
 import convex.core.exceptions.BadFormatException;
 import convex.core.exceptions.InvalidDataException;

convex-core/src/main/java/convex/core/data/AArrayBlob.java

@@ -216,15 +216,15 @@ public int getHexDigit(long digitPos) {
 	 * Gets the internal array backing this Blob. Use with caution!
 	 * @return Byte array backing this blob
 	 */
-	public byte[] getInternalArray() {
+	public final byte[] getInternalArray() {
 		return store;
 	}
 
 	/**
 	 * Gets this offset into the internal array backing this Blob.
 	 * @return Offset into backing array
 	 */
-	public int getInternalOffset() {
+	public final int getInternalOffset() {
 		return offset;
 	}
 
@@ -366,7 +366,7 @@ public int getRefCount() {
 	}
 
 	@Override
-	public int read(long offset, long count, ByteBuffer dest) {
+	public int toByteBuffer(long offset, long count, ByteBuffer dest) {
 		if (count<0) throw new IllegalArgumentException("Negative count");
 		if ((offset<0)||(offset+count>this.count)) throw new IllegalArgumentException();
 		int n=(int)count;

convex-core/src/main/java/convex/core/data/ABlob.java

@@ -168,8 +168,6 @@ public byte byteAt(long i) {
 		}
 		return byteAtUnchecked(i);
 	}
-	
-
 
 	/**
 	 * Append an additional Blob to this, creating a new Blob as needed.
@@ -330,19 +328,19 @@ public short shortAt(long i) {
 	 * @param dest Destination byte buffer
 	 * @return Number of bytes read
 	 */
-	public int read(long offset, ByteBuffer dest) {
+	public int toByteBuffer(long offset, ByteBuffer dest) {
 		long n=Math.min(count()-offset, dest.remaining());
-		return read(offset,n,dest);
+		return toByteBuffer(offset,n,dest);
 	}
 
 	/**
 	 * Gets bytes from this Blob into a ByteBuffer
 	 * @param offset Offset into this Blob to read from
-	 * @param count Number of bytes to read. Must be in bounds
+	 * @param count Number of bytes to read.
 	 * @param dest Destination byte buffer
 	 * @return Number of bytes read
 	 */
-	public abstract int read(long offset, long count, ByteBuffer dest);
+	public abstract int toByteBuffer(long offset, long count, ByteBuffer dest);
 
 	/**
 	 * Replaces a slice of this Blob, returning a new Blob

convex-core/src/main/java/convex/core/data/ACell.java

@@ -25,7 +25,7 @@ public abstract class ACell extends AObject implements IWriteable, IValidated {
 	protected long memorySize=-1;
 
 	/**
-	 * Cached Ref. This is useful to manage persistence. Also cached Ref MUST refer to canonical value
+	 * Cached Ref. This is useful to manage persistence. Cached Ref MUST refer to a canonical value
 	 */
 	protected Ref<ACell> cachedRef=null;
 

convex-core/src/main/java/convex/core/data/Address.java

@@ -1,5 +1,6 @@
 package convex.core.data;
 
+import convex.core.data.impl.LongBlob;
 import convex.core.data.prim.CVMLong;
 import convex.core.data.type.AType;
 import convex.core.data.type.Types;

convex-core/src/main/java/convex/core/data/BlobTree.java

@@ -599,7 +599,7 @@ public ABlob toCanonical() {
 	}
 
 	@Override
-	public int read(long offset, long count, ByteBuffer dest) {
+	public int toByteBuffer(long offset, long count, ByteBuffer dest) {
 		if (count<0) throw new IllegalArgumentException("Negative count");
 		if ((offset<0)||(offset+count>this.count)) throw new IndexOutOfBoundsException();
 		int result=0;
@@ -610,7 +610,7 @@ public int read(long offset, long count, ByteBuffer dest) {
 			if (offset<csize) {
 				long n=Math.min(count, csize-offset);
 				if (n>0) {
-					result+=getChild(i).read(offset,n, dest);
+					result+=getChild(i).toByteBuffer(offset,n, dest);
 				}
 				count-=n;
 				offset=0; // offset is now the start of the next child 

convex-core/src/main/java/convex/core/data/Format.java

@@ -854,8 +854,9 @@ public static <T extends ACell> T decodeMultiCell(Blob data) throws BadFormatExc
 		ArrayList<ACell> stack=new ArrayList<>();
 
 		IRefFunction func=new IRefFunction() {
+			@SuppressWarnings("rawtypes")
 			@Override
-			public Ref<?> apply(Ref<?> r) {
+			public Ref apply(Ref r) {
 				if (r.isEmbedded()) {
 					ACell cc=r.getValue();
 					if (cc==null) return r;

convex-core/src/main/java/convex/core/data/IRefFunction.java

@@ -7,10 +7,11 @@
  * In general, IRefFunction is used to provide a visitor for data objects containing nested Refs.
  */
 @FunctionalInterface
-public interface IRefFunction {
+public interface IRefFunction  {
 
 	// Note we can't have a generic type parameter in a functional interface.
 	// So using a wildcard seems the best option?
 
-	public Ref<?> apply(Ref<?> t);
+	@SuppressWarnings("rawtypes")
+	public Ref apply(Ref t);
 }

convex-core/src/main/java/convex/core/data/RefDirect.java

@@ -32,7 +32,7 @@ private RefDirect(T value, Hash hash, int flags) {
      * @param status Status for the Ref
      * @return New Direct Ref
      */
-	static <T extends ACell> RefDirect<T> create(T value, Hash hash, int status) {
+	public static <T extends ACell> RefDirect<T> create(T value, Hash hash, int status) {
 		int flags=status&Ref.STATUS_MASK;
 		return new RefDirect<T>(value, hash, flags);
 	}

convex-core/src/main/java/convex/core/data/StringSlice.java

@@ -1,5 +1,6 @@
 package convex.core.data;
 
+import convex.core.data.impl.LongBlob;
 import convex.core.data.util.BlobBuilder;
 import convex.core.exceptions.InvalidDataException;
 import convex.core.util.Errors;