Code tidying

Author: mikera

convex-core/src/main/java/convex/core/cpos/Belief.java

@@ -191,13 +191,11 @@ public HashMap<AccountKey, SignedData<Order>> getOrdersHashMap() {
 	@SuppressWarnings("unchecked")
 	public static Collection<SignedData<Order>> extractOrders(ACell payload) {
 		ArrayList<SignedData<Order>> result=new ArrayList<>();
-		if (payload instanceof SignedData) {
-			SignedData<?> sd=(SignedData<?>)payload;
+		if (payload instanceof SignedData sd) {
 			if (sd.getValue() instanceof Order) {
 				result.add((SignedData<Order>) sd);
 			}
-		} else if (payload instanceof Belief) {
-			Belief b=(Belief)payload;
+		} else if (payload instanceof Belief b) {
 			Index<AccountKey, SignedData<Order>> porders = b.getOrders();
 			int n=porders.size();
 			for (int i=0; i<n; i++) {

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

@@ -225,7 +225,7 @@ public AccountStatus withParent(Address newParent) {
 
 	@Override 
 	public boolean equals(ACell o) {
-		if (o instanceof AccountStatus) return equals((AccountStatus)o);
+		if (o instanceof AccountStatus as) return equals(as);
 		return Cells.equalsGeneric(this, o);
 	}
 

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

@@ -118,7 +118,7 @@ protected final long calcMemorySize() {
 
 	@Override
 	public boolean equals(ACell a) {
-		if (a instanceof AExtensionValue) return equals((AExtensionValue) a);
+		if (a instanceof AExtensionValue ev) return equals(ev);
 		return Cells.equalsGeneric(this, a);
 	}
 

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

@@ -58,6 +58,12 @@ public AList<T> empty() {
 		return Lists.empty();
 	}
 
+	/**
+	 * Reverses this List, producing a Vector
+	 */
+	@Override
+	public abstract AVector<T> reversed();
+	
 	@Override
 	public abstract AList<T> next();
 

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

@@ -82,7 +82,7 @@ public final boolean containsKey(Object key) {
 
 	@Override
 	public final boolean containsValue(Object value) {
-		if (value instanceof ACell) return containsValue((ACell)value);
+		if (value instanceof ACell cell) return containsValue(cell);
 		return false;
 	}
 

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

@@ -260,6 +260,9 @@ public AVector<T> empty() {
 		return (AVector<T>) VectorLeaf.EMPTY;
 	}
 
+	/**
+	 * Reverses this Vector, producing a List
+	 */
 	@Override
 	public AList<T> reversed() {
 		return convex.core.data.List.reverse(this);

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

@@ -268,8 +268,9 @@ public static Blob createRandom(Random random, long length) {
 
 	@Override
 	public Blob getChunk(long i) {
-		if ((i == 0) && (count <= CHUNK_LENGTH))
-			return this;
+		if ((i == 0) && (count <= CHUNK_LENGTH)) {
+			return this; // this must be the only chunk
+		}
 		long start = i * CHUNK_LENGTH;
 		long take = Math.min(CHUNK_LENGTH, count - start);
 		return slice(start, start + take);

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

@@ -49,7 +49,7 @@ private BlobTree(Ref<ABlob>[] children, int shift, long count) {
 	 * @return New BlobTree instance
 	 */
 	public static BlobTree create(ABlob blob) {
-		if (blob instanceof BlobTree) return (BlobTree) blob; // already a BlobTree
+		if (blob instanceof BlobTree bt) return bt; // already a BlobTree
 
 		long length = blob.count();
 		if (length<=Blob.CHUNK_LENGTH) throw new IllegalArgumentException("Can't make BlobTree for too small length: "+length);
@@ -294,9 +294,8 @@ public boolean equalsBytes(byte[] bytes, long byteOffset) {
 	@Override
 	public boolean equalsBytes(ABlob b) {
 		if (b.count()!=count) return false;
-		if (b instanceof BlobTree) {
-			BlobTree bb=(BlobTree) b;
-			return equals(bb);
+		if (b instanceof BlobTree bt) {
+			return equals(bt);
 		}
 
 		assert (!b.isCanonical()) : "Canonical Blob of this size should be a BlobTree?";

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

@@ -949,7 +949,7 @@ public Index<K, V> mergeDifferences(Index<K, V> b, MergeFunction<V> func) {
 
 	@Override
 	public <R extends ACell> ADataStructure<R> map(Function<MapEntry<K, V>, R> mapper) {
-		Index result=EMPTY;
+		// Index result=EMPTY;
 		// return result;
 		throw new TODOException();
 	}

convex-core/src/main/java/convex/core/util/JSONUtils.java

@@ -53,24 +53,22 @@ public class JSONUtils {
 	public static Object json(ACell o) {
 		if (o == null)
 			return null;
-		if (o instanceof CVMLong)
-			return ((CVMLong) o).longValue();
-		if (o instanceof CVMBigInteger)
-			return ((CVMBigInteger) o).big();
-		if (o instanceof CVMDouble)
-			return  ((CVMDouble) o).doubleValue();
-		if (o instanceof CVMBool)
-			return  ((CVMBool) o).booleanValue();
-		if (o instanceof CVMChar)
-			return  ((CVMChar) o).toString();
-		if (o instanceof Address)
-			return (Long) ((Address) o).longValue();
-		if (o instanceof AMap) {
-			AMap<?, ?> m = (AMap<?, ?>) o;
+		if (o instanceof CVMLong cvmLong)
+			return cvmLong.longValue();
+		if (o instanceof CVMBigInteger bi)
+			return bi.big();
+		if (o instanceof CVMDouble cd)
+			return  cd.doubleValue();
+		if (o instanceof CVMBool bool)
+			return  bool.booleanValue();
+		if (o instanceof CVMChar c)
+			return  c.toString();
+		if (o instanceof Address a)
+			return (Long) a.longValue();
+		if (o instanceof AMap m) {
 			return JSONUtils.jsonMap(m);
 		}
-		if (o instanceof ASequence) {
-			ASequence<?> seq = (ASequence<?>) o;
+		if (o instanceof ASequence seq) {
 			long n = seq.count();
 			ArrayList<Object> list = new ArrayList<>();
 			for (long i = 0; i < n; i++) {