Lint fixes

Signed-off-by: Prabhu Subramanian <[email protected]>

Author: prabhu

build.sbt

@@ -1,7 +1,7 @@
 name := "overflowdb2"
 ThisBuild / organization := "io.appthreat"
-ThisBuild / version      := "1.0.1"
-ThisBuild / scalaVersion := "3.5.2"
+ThisBuild / version      := "1.0.2"
+ThisBuild / scalaVersion := "3.6.4"
 publish / skip := true
 
 lazy val core = project.in(file("core"))

core/src/main/java/overflowdb/AdjacentNodes.java

@@ -35,65 +35,69 @@ public class AdjacentNodes {
    * getOffset(2 * kindOffset + 1) gets the length of the relevant slice in nodesWithEdgeProperties of the desired kindOffset (get the kindOffset from layout info)
    */
   public int getOffset(int pos){
-    if(offsets instanceof byte[]){
-      return ((byte[]) offsets)[pos];
-    } else if(offsets instanceof short[]){
-      return ((short[]) offsets)[pos];
-    } else if (offsets instanceof int[]){
-      return ((int[]) offsets)[pos];
-    } else throw new RuntimeException("corrupt state: offsets of type " + offsets.getClass().getName());
+      return switch (offsets) {
+          case byte[] bytes -> bytes[pos];
+          case short[] shorts -> shorts[pos];
+          case int[] ints -> ints[pos];
+          case null, default -> {
+              assert offsets != null;
+              throw new RuntimeException("corrupt state: offsets of type " + offsets.getClass().getName());
+          }
+      };
   }
 
   /** Attempts to update AdjacentNodes in-place and return this; otherwise, create a new AdjacentNodes and return that.
    * */
   AdjacentNodes setOffset(int pos, int val){
-    if(offsets instanceof byte[]) {
-      if(val == (byte) val){
-        ((byte[]) offsets)[pos] = (byte) val;
-        return this;
-      } else if (val == (short) val){
-        byte[] oldOffsets = (byte[]) offsets;
-        short[] newOffsets = new short[oldOffsets.length];
-        for(int i = 0; i < oldOffsets.length; i++){
-          newOffsets[i] = oldOffsets[i];
-        }
-        newOffsets[pos] = (short) val;
-        return new AdjacentNodes(nodesWithEdgeProperties, newOffsets);
-      } else {
-        byte[] oldOffsets = (byte[]) offsets;
-        int[] newOffsets = new int[oldOffsets.length];
-        for(int i = 0; i < oldOffsets.length; i++){
-          newOffsets[i] = oldOffsets[i];
-        }
-        newOffsets[pos] = val;
-        return new AdjacentNodes(nodesWithEdgeProperties, newOffsets);
+      switch (offsets) {
+          case byte[] oldOffsets -> {
+              if (val == (byte) val) {
+                  oldOffsets[pos] = (byte) val;
+                  return this;
+              } else if (val == (short) val) {
+                  short[] newOffsets = new short[oldOffsets.length];
+                  for (int i = 0; i < oldOffsets.length; i++) {
+                      newOffsets[i] = oldOffsets[i];
+                  }
+                  newOffsets[pos] = (short) val;
+                  return new AdjacentNodes(nodesWithEdgeProperties, newOffsets);
+              } else {
+                  int[] newOffsets = new int[oldOffsets.length];
+                  for (int i = 0; i < oldOffsets.length; i++) {
+                      newOffsets[i] = oldOffsets[i];
+                  }
+                  newOffsets[pos] = val;
+                  return new AdjacentNodes(nodesWithEdgeProperties, newOffsets);
+              }
+          }
+          case short[] oldOffsets -> {
+              if (val == (short) val) {
+                  oldOffsets[pos] = (short) val;
+                  return this;
+              } else {
+                  int[] newOffsets = new int[oldOffsets.length];
+                  for (int i = 0; i < oldOffsets.length; i++) {
+                      newOffsets[i] = oldOffsets[i];
+                  }
+                  newOffsets[pos] = val;
+                  return new AdjacentNodes(nodesWithEdgeProperties, newOffsets);
+              }
+          }
+          case int[] ints -> {
+              ints[pos] = val;
+              return this;
+          }
+          default -> throw new RuntimeException("corrupt state: offsets of type " + offsets.getClass().getName());
       }
-    } else if (offsets instanceof short[]){
-      if(val == (short) val){
-        ((short[]) offsets)[pos] = (short) val;
-        return this;
-      } else {
-        short[] oldOffsets = (short[]) offsets;
-        int[] newOffsets = new int[oldOffsets.length];
-        for(int i = 0; i < oldOffsets.length; i++){
-          newOffsets[i] = oldOffsets[i];
-        }
-        newOffsets[pos] = val;
-        return new AdjacentNodes(nodesWithEdgeProperties, newOffsets);
-      }
-    } else if (offsets instanceof int[]){
-      ((int[]) offsets)[pos] = val;
-      return this;
-    } else {
-      throw new RuntimeException("corrupt state: offsets of type " + offsets.getClass().getName());
-    }
   }
 
   public int offsetLengths(){
-    if(offsets instanceof int[]) return ((int[]) offsets).length;
-    else if (offsets instanceof short[]) return ((short[]) offsets).length;
-    else if (offsets instanceof byte[]) return ((byte[]) offsets).length;
-    else throw new RuntimeException();
+      return switch (offsets) {
+          case int[] ints -> ints.length;
+          case short[] shorts -> shorts.length;
+          case byte[] bytes -> bytes.length;
+          case null, default -> throw new RuntimeException();
+      };
   }
 
 }

core/src/main/java/overflowdb/BatchedUpdate.java

@@ -18,29 +18,29 @@ public static AppliedDiff applyDiff(Graph graph, DiffOrBuilder diff, KeyPool key
     }
 
     public interface KeyPool {
-        public long next();
+        long next();
     }
 
     public interface DiffOrBuilder {
-        public int size();
+        int size();
 
         Iterator<Change> iterator();
     }
 
     public interface ModificationListener {
-        public abstract void onAfterInitNewNode(Node node);
+        void onAfterInitNewNode(Node node);
 
-        public abstract void onAfterAddNewEdge(Edge edge);
+        void onAfterAddNewEdge(Edge edge);
 
-        public abstract void onBeforePropertyChange(Node node, String key);
+        void onBeforePropertyChange(Node node, String key);
 
-        public abstract void onAfterPropertyChange(Node node, String key, Object value);
+        void onAfterPropertyChange(Node node, String key, Object value);
 
-        public abstract void onBeforeRemoveNode(Node node);
+        void onBeforeRemoveNode(Node node);
 
-        public abstract void onBeforeRemoveEdge(Edge edge);
+        void onBeforeRemoveEdge(Edge edge);
 
-        public abstract void finish();
+        void finish();
     }
 
 
@@ -144,9 +144,9 @@ public DiffGraphBuilder removeEdge(Edge edge) {
 
     public static class AppliedDiff {
         public DiffOrBuilder diffGraph;
-        private ModificationListener listener;
-        private int transitiveModifications;
-        private Graph graph;
+        private final ModificationListener listener;
+        private final int transitiveModifications;
+        private final Graph graph;
 
         AppliedDiff(Graph graph, DiffOrBuilder diffGraph, ModificationListener listener, int transitiveModifications) {
             this.graph = graph;
@@ -265,8 +265,8 @@ private Node mapDetached(DetachedNodeData detachedNode) {
                     } else {
                         linkedNode = graph.addNode(keyPool.next(), detachedNode.label());
                     }
-                } else if (linkedNode instanceof Long) {
-                    linkedNode = graph.addNode(((Long) linkedNode).longValue(), detachedNode.label());
+                } else {
+                    linkedNode = graph.addNode((Long) linkedNode, detachedNode.label());
                 }
                 detachedNode.setRefOrId(linkedNode);
                 deferredInitializers.addLast(detachedNode);
@@ -290,9 +290,8 @@ private void applyChange(Change change) {
             if (change instanceof DetachedNodeData) {
                 mapDetached((DetachedNodeData) change);
                 drainDeferred();
-            } else if (change instanceof CreateEdge) {
+            } else if (change instanceof CreateEdge create) {
                 nChanges += 1;
-                CreateEdge create = (CreateEdge) change;
                 Node src = create.src instanceof DetachedNodeData ? mapDetached((DetachedNodeData) create.src) : (Node) create.src;
                 Node dst = create.dst instanceof DetachedNodeData ? mapDetached((DetachedNodeData) create.dst) : (Node) create.dst;
                 drainDeferred();
@@ -303,22 +302,19 @@ private void applyChange(Change change) {
                 } else {
                     src.addEdgeSilentInternal(create.label, dst, properties);
                 }
-            } else if (change instanceof RemoveEdge) {
+            } else if (change instanceof RemoveEdge remove) {
                 nChanges += 1;
-                RemoveEdge remove = (RemoveEdge) change;
                 if (listener != null)
                     listener.onBeforeRemoveEdge(remove.edge);
                 remove.edge.removeInternal();
-            } else if (change instanceof RemoveNode) {
+            } else if (change instanceof RemoveNode remove) {
                 nChanges += 1;
-                RemoveNode remove = (RemoveNode) change;
                 if (listener != null)
                     listener.onBeforeRemoveNode(remove.node);
                 remove.node.removeInternal();
 
-            } else if (change instanceof SetNodeProperty) {
+            } else if (change instanceof SetNodeProperty setProp) {
                 nChanges += 1;
-                SetNodeProperty setProp = (SetNodeProperty) change;
                 if (listener != null)
                     listener.onBeforePropertyChange(setProp.node, setProp.label);
                 setProp.node.setPropertyInternal(setProp.label, setProp.value);

core/src/main/java/overflowdb/DetachedNodeData.java

@@ -1,13 +1,11 @@
 package overflowdb;
 
-import overflowdb.BatchedUpdate;
-import overflowdb.Node;
 
 public interface DetachedNodeData extends BatchedUpdate.Change, NodeOrDetachedNode {
-        public String label();
+        String label();
         /** RefOrId is initially null, and can be a Long if a specific id is required,
          * and is set to Node once the node has been added to the graph.
          * */
-        public Object getRefOrId();
-        public void setRefOrId(Object refOrId);
+        Object getRefOrId();
+        void setRefOrId(Object refOrId);
 }

core/src/main/java/overflowdb/Element.java

@@ -21,8 +21,8 @@ public <A> A property(String key, A defaultValue) {
   }
 
   public <A> A property(PropertyKey<A> key, A defaultValue) {
-    Object value = property(key);
-    return value != null ? (A) value : defaultValue;
+    A value = property(key);
+    return value != null ? value : defaultValue;
   }
 
   /** override this in specific element class, to define a default value */
@@ -38,8 +38,9 @@ public Object propertyDefaultValue(String propertyKey) {
   public abstract Map<String, Object> propertiesMap();
 
 
-  @Deprecated public final void setProperty(String key, Object value) {setPropertyImpl(key, value);};
-  protected abstract void setPropertyImpl(String key, Object value);
+  @Deprecated public final void setProperty(String key, Object value) {setPropertyImpl(key, value);}
+
+    protected abstract void setPropertyImpl(String key, Object value);
   final void setPropertyInternal(String key, Object value) {setPropertyImpl(key, value);}
 
   @Deprecated public final <A> void setProperty(PropertyKey<A> key, A value){setPropertyImpl(key, value);}
@@ -57,8 +58,9 @@ public Object propertyDefaultValue(String propertyKey) {
   final void removePropertyInternal(String key){removePropertyImpl(key);}
 
 
-  @Deprecated public final void remove(){removeImpl();};
+  @Deprecated public final void remove(){removeImpl();}
+
   protected abstract void removeImpl();
-  final void removeInternal(){removeImpl();};
+  final void removeInternal(){removeImpl();}
 
 }

core/src/main/java/overflowdb/Graph.java

@@ -16,22 +16,22 @@
 
 public final class Graph implements AutoCloseable {
 
-  protected final AtomicLong currentId = new AtomicLong(-1L);
+  private final AtomicLong currentId = new AtomicLong(-1L);
   final NodesList nodes = new NodesList();
   public final IndexManager indexManager = new IndexManager(this);
   private final Config config;
   private volatile boolean closed = false;
 
-  protected final Map<String, NodeFactory> nodeFactoryByLabel;
-  protected final Map<String, EdgeFactory> edgeFactoryByLabel;
+  private final Map<String, NodeFactory> nodeFactoryByLabel;
+  final Map<String, EdgeFactory> edgeFactoryByLabel;
 
-  protected final OdbStorage storage;
+  final OdbStorage storage;
   public final NodeSerializer nodeSerializer;
-  protected final NodeDeserializer nodeDeserializer;
-  protected final StringInterner stringInterner;
-  protected final boolean overflowEnabled;
-  protected final ReferenceManager referenceManager;
-  protected final NodesWriter nodesWriter;
+  final NodeDeserializer nodeDeserializer;
+  private final StringInterner stringInterner;
+  private final boolean overflowEnabled;
+  private final ReferenceManager referenceManager;
+  private final NodesWriter nodesWriter;
 
   /**
    * @param convertPropertyForPersistence applied to all element property values by @{@link NodeSerializer} prior
@@ -88,34 +88,25 @@ private void initElementCollections(OdbStorage storage) {
     long start = System.currentTimeMillis();
     final Set<Map.Entry<Long, byte[]>> serializedNodes = storage.allNodes();
     final int serializedNodesCount = serializedNodes.size();
-    if (serializedNodesCount > 0) {
-    }
     int importCount = 0;
     long maxId = currentId.get();
 
-    final Iterator<Map.Entry<Long, byte[]>> serializedVertexIter = serializedNodes.iterator();
-    while (serializedVertexIter.hasNext()) {
-      final Map.Entry<Long, byte[]> entry = serializedVertexIter.next();
-      try {
-        final NodeRef nodeRef = nodeDeserializer.deserializeRef(entry.getValue());
-        nodes.add(nodeRef);
-        importCount++;
-        if (importCount % 131072 == 0) { // some random magic number that allows for quick division
-        }
-        if (nodeRef.id > maxId) maxId = nodeRef.id;
-      } catch (IOException e) {
-        throw new RuntimeException("error while initializing vertex from storage: id=" + entry.getKey(), e);
+      for (Map.Entry<Long, byte[]> entry : serializedNodes) {
+          try {
+              final NodeRef nodeRef = nodeDeserializer.deserializeRef(entry.getValue());
+              nodes.add(nodeRef);
+              importCount++;
+              if (nodeRef.id > maxId) maxId = nodeRef.id;
+          } catch (IOException e) {
+              throw new RuntimeException("error while initializing vertex from storage: id=" + entry.getKey(), e);
+          }
       }
-    }
 
     currentId.set(maxId + 1);
     indexManager.initializeStoredIndices(storage);
     long elapsedMillis = System.currentTimeMillis() - start;
   }
 
-
-  ////////////// STRUCTURE API METHODS //////////////////
-
   /**
    * Add a node with given label and properties
    * Will automatically assign an ID - this is the safest option to avoid ID clashes.
@@ -290,7 +281,7 @@ public Iterator<Edge> E() {
 
   /** Iterator over all edges */
   public Iterator<Edge> edges() {
-    return IteratorUtils.flatMap(nodes(), node -> node.outE());
+    return IteratorUtils.flatMap(nodes(), Node::outE);
   }
 
   /** Iterator over edges with given label */
@@ -304,7 +295,7 @@ public Iterator<Node> V() {
   }
 
   /** Iterator over all nodes */
-  public final Iterator<Node> nodes() {
+  public Iterator<Node> nodes() {
     return nodes.iterator();
   }
 
@@ -364,7 +355,7 @@ public Iterator<Node> nodes(final Predicate<String> labelPredicate) {
     return multiIterator;
   }
 
-  private final void addNodesToMultiIterator(final MultiIterator<Node> multiIterator, final String label) {
+  private void addNodesToMultiIterator(final MultiIterator<Node> multiIterator, final String label) {
     final Collection<Node> ret = nodes.nodesByLabel(label);
     if (ret != null) {
       multiIterator.addIterator(ret.iterator());
@@ -382,9 +373,7 @@ public OdbStorage getStorage() {
   /** Copies all nodes/edges into the given empty graph, preserving their ids and properties. */
   public void copyTo(Graph destination) {
     if (destination.nodeCount() > 0) throw new AssertionError("destination graph must be empty, but isn't");
-    nodes().forEachRemaining(node -> {
-      destination.addNode(node.id(), node.label(), PropertyHelper.toKeyValueArray(node.propertiesMap()));
-    });
+    nodes().forEachRemaining(node -> destination.addNode(node.id(), node.label(), PropertyHelper.toKeyValueArray(node.propertiesMap())));
     nodes().forEachRemaining( node -> {
       NodeDb mapped =  ((NodeRef<NodeDb>) destination.node(node.id())).get();