CNDB-15608 fix lint issues in affected files (#2131)

While working on CNDB-15608, IntelliJ lint complains were noticed, which
are not related to the actual changes in the patch port. Thus I fix them
in this separate commit to avoid unnecessary noise while working on the
actual patch port.

Many of the changes are align what I have already merged earlier in
other PRs.
Some of the changes might not match preferences from others and I am
open for discussion.

The changes include:
- Remove unused imports
- Use the formatter of the logger instead of string concatenation
- Use method instead of lambda
- Remove unnecessary suppression of resource warnings
- Simplify Boolean conditions
- Remove unnecessary modifiers in interfaces
- Fix typos
- Fixing links in javadoc comments
- Add static modifier to nested classes
- Remove class fields when not used
- Remove unnecessary throws in method signatures
- Use final when recommended
- Remove unused method arguments
- Replace single char strings with chars
- Remove unnecessary null variable initialization
- Replace assert true with assert equal
- Change order of assert arguments to have expected value first
- Remove unnecessary explicit casting

Author: k-rus

src/java/org/apache/cassandra/db/marshal/AbstractType.java

@@ -37,6 +37,7 @@
 import org.apache.cassandra.cql3.CQL3Type;
 import org.apache.cassandra.cql3.ColumnSpecification;
 import org.apache.cassandra.cql3.Term;
+import org.apache.cassandra.db.rows.Cell;
 import org.apache.cassandra.exceptions.InvalidColumnTypeException;
 import org.apache.cassandra.exceptions.SyntaxException;
 import org.apache.cassandra.io.util.DataInputPlus;

src/java/org/apache/cassandra/index/sai/IndexContext.java

@@ -614,7 +614,7 @@ public int getIntOption(String name, int defaultValue)
         }
         catch (NumberFormatException e)
         {
-            logger.error("Failed to parse index configuration " + name + " = " + value + " as integer");
+            logger.error("Failed to parse index configuration {} = {} as integer", name, value);
             return defaultValue;
         }
     }
@@ -1003,7 +1003,7 @@ public long indexFileCacheSize()
     public IndexFeatureSet indexFeatureSet()
     {
         IndexFeatureSet.Accumulator accumulator = new IndexFeatureSet.Accumulator(version);
-        getView().getIndexes().stream().map(SSTableIndex::indexFeatureSet).forEach(set -> accumulator.accumulate(set));
+        getView().getIndexes().stream().map(SSTableIndex::indexFeatureSet).forEach(accumulator::accumulate);
         return accumulator.complete();
     }
 }

src/java/org/apache/cassandra/index/sai/SSTableContext.java

@@ -65,7 +65,6 @@ private SSTableContext(SSTableContext copy)
         this.primaryKeyMapFactory = copy.primaryKeyMapFactory;
     }
 
-    @SuppressWarnings("resource")
     public static SSTableContext create(SSTableReader sstable, IndexComponents.ForRead perSSTableComponents)
     {
         var onDiskFormat = perSSTableComponents.onDiskFormat();

src/java/org/apache/cassandra/index/sai/StorageAttachedIndexGroup.java

@@ -246,7 +246,7 @@ public void rangeTombstone(RangeTombstone tombstone)
 
             private void forEach(Consumer<Index.Indexer> action)
             {
-                indexers.forEach(action::accept);
+                indexers.forEach(action);
             }
         };
     }
@@ -336,7 +336,7 @@ public void handleNotification(INotification notification, Object sender)
 
             // Avoid validation for index files just written following Memtable flush. ZCS streaming should
             // validate index checksum.
-            boolean validate = notice.fromStreaming() || !notice.memtable().isPresent();
+            boolean validate = notice.fromStreaming() || notice.memtable().isEmpty();
             onSSTableChanged(Collections.emptySet(), notice.added, indices, validate);
         }
         else if (notification instanceof SSTableListChangedNotification)
@@ -436,7 +436,7 @@ public int totalIndexBuildsInProgress()
      */
     public int totalQueryableIndexCount()
     {
-        return (int) indices.stream().filter(i -> baseCfs.indexManager.isIndexQueryable(i)).count();
+        return (int) indices.stream().filter(baseCfs.indexManager::isIndexQueryable).count();
     }
 
     /**
@@ -513,7 +513,7 @@ public void unsafeReload()
     public void reset()
     {
         contextManager.clear();
-        indices.forEach(index -> index.makeIndexNonQueryable());
+        indices.forEach(StorageAttachedIndex::makeIndexNonQueryable);
         onSSTableChanged(baseCfs.getLiveSSTables(), Collections.emptySet(), indices, false);
     }
 }

src/java/org/apache/cassandra/index/sai/disk/PerSSTableWriter.java

@@ -21,16 +21,14 @@
 
 import com.google.common.base.Stopwatch;
 
-import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.db.rows.Unfiltered;
 import org.apache.cassandra.index.sai.utils.PrimaryKey;
 
 /**
  * Writes all SSTable-attached index token and offset structures.
  */
 public interface PerSSTableWriter
 {
-    public static final PerSSTableWriter NONE = (key) -> {};
+    PerSSTableWriter NONE = key -> {};
 
     default void startPartition(long position) throws IOException
     {}

src/java/org/apache/cassandra/index/sai/disk/format/IndexDescriptor.java

@@ -522,7 +522,7 @@ public void markComplete() throws IOException
         {
             addOrGet(completionMarkerComponent()).createEmpty();
             sealed = true;
-            // Until this call, the group is not attached to the parent. This create the link.
+            // Until this call, the group is not attached to the parent. This creates the link.
             updateParentLink(this);
         }
 

src/java/org/apache/cassandra/index/sai/disk/format/OnDiskFormat.java

@@ -28,6 +28,7 @@
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.index.sai.IndexContext;
 import org.apache.cassandra.index.sai.SSTableContext;
+import org.apache.cassandra.index.sai.SSTableIndex;
 import org.apache.cassandra.index.sai.StorageAttachedIndex;
 import org.apache.cassandra.index.sai.disk.PerIndexWriter;
 import org.apache.cassandra.index.sai.disk.PerSSTableWriter;
@@ -73,15 +74,15 @@ public interface OnDiskFormat
      *
      * @return the index feature set
      */
-    public IndexFeatureSet indexFeatureSet();
+    IndexFeatureSet indexFeatureSet();
 
     /**
      * Returns the {@link PrimaryKey.Factory} for the on-disk format
      *
      * @param comparator
      * @return the primary key factory
      */
-    public PrimaryKey.Factory newPrimaryKeyFactory(ClusteringComparator comparator);
+    PrimaryKey.Factory newPrimaryKeyFactory(ClusteringComparator comparator);
 
     /**
      * Returns a {@link PrimaryKeyMap.Factory} for the SSTable
@@ -92,18 +93,18 @@ public interface OnDiskFormat
      * @return a {@link PrimaryKeyMap.Factory} for the SSTable
      * @throws IOException
      */
-    public PrimaryKeyMap.Factory newPrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents, PrimaryKey.Factory primaryKeyFactory, SSTableReader sstable) throws IOException;
+    PrimaryKeyMap.Factory newPrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComponents, PrimaryKey.Factory primaryKeyFactory, SSTableReader sstable) throws IOException;
 
     /**
-     * Create a new {@link SearchableIndex} for an on-disk index. This is held by the {@SSTableIndex}
+     * Create a new {@link SearchableIndex} for an on-disk index. This is held by the {@link SSTableIndex}
      * and shared between queries.
      *
      * @param sstableContext The {@link SSTableContext} holding the per-SSTable information for the index
      * @param perIndexComponents The group of per-index sstable components to use/read for the returned index (which
      *                           also link to the underlying {@link IndexContext} for the index).
      * @return the created {@link SearchableIndex}.
      */
-    public SearchableIndex newSearchableIndex(SSTableContext sstableContext, IndexComponents.ForRead perIndexComponents);
+    SearchableIndex newSearchableIndex(SSTableContext sstableContext, IndexComponents.ForRead perIndexComponents);
 
     IndexSearcher newIndexSearcher(SSTableContext sstableContext,
                                    IndexContext indexContext,
@@ -117,7 +118,7 @@ IndexSearcher newIndexSearcher(SSTableContext sstableContext,
      * @return The {@link PerSSTableWriter} to write the per-SSTable on-disk components
      * @throws IOException
      */
-    public PerSSTableWriter newPerSSTableWriter(IndexDescriptor indexDescriptor) throws IOException;
+    PerSSTableWriter newPerSSTableWriter(IndexDescriptor indexDescriptor) throws IOException;
 
     /**
      * Create a new writer for the per-index on-disk components of an index. The {@link LifecycleNewTracker}
@@ -132,10 +133,10 @@ IndexSearcher newIndexSearcher(SSTableContext sstableContext,
      * @param keyCount
      * @return The {@link PerIndexWriter} that will write the per-index on-disk components
      */
-    public PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
-                                            IndexDescriptor indexDescriptor,
-                                            LifecycleNewTracker tracker,
-                                            RowMapping rowMapping, long keyCount);
+    PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
+                                     IndexDescriptor indexDescriptor,
+                                     LifecycleNewTracker tracker,
+                                     RowMapping rowMapping, long keyCount);
 
     /**
      * Validate the provided on-disk components (that must be for this version).
@@ -154,7 +155,7 @@ public PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
      *
      * @return The set of {@link IndexComponentType} for the per-SSTable index
      */
-    public Set<IndexComponentType> perSSTableComponentTypes();
+    Set<IndexComponentType> perSSTableComponentTypes();
 
     /**
      * Returns the set of {@link IndexComponentType} for the per-index part of an index.
@@ -164,12 +165,12 @@ public PerIndexWriter newPerIndexWriter(StorageAttachedIndex index,
      * @param indexContext The {@link IndexContext} for the index
      * @return The set of {@link IndexComponentType} for the per-index index
      */
-    default public Set<IndexComponentType> perIndexComponentTypes(IndexContext indexContext)
+    default Set<IndexComponentType> perIndexComponentTypes(IndexContext indexContext)
     {
         return perIndexComponentTypes(indexContext.getValidator());
     }
 
-    public Set<IndexComponentType> perIndexComponentTypes(AbstractType<?> validator);
+    Set<IndexComponentType> perIndexComponentTypes(AbstractType<?> validator);
 
     /**
      * Return the number of open per-SSTable files that can be open during a query.
@@ -178,7 +179,7 @@ default public Set<IndexComponentType> perIndexComponentTypes(IndexContext index
      *
      * @return The number of open per-SSTable files
      */
-    public int openFilesPerSSTable();
+    int openFilesPerSSTable();
 
     /**
      * Return the number of open per-index files that can be open during a query.
@@ -188,7 +189,7 @@ default public Set<IndexComponentType> perIndexComponentTypes(IndexContext index
      * @param indexContext The {@link IndexContext} for the index
      * @return The number of open per-index files
      */
-    public int openFilesPerIndex(IndexContext indexContext);
+    int openFilesPerIndex(IndexContext indexContext);
 
     /**
      * Return the {@link ByteOrder} for the given {@link IndexComponentType} and {@link IndexContext}.
@@ -197,7 +198,7 @@ default public Set<IndexComponentType> perIndexComponentTypes(IndexContext index
      * @param context   - The {@link IndexContext} for the index
      * @return The {@link ByteOrder} for the file associated with the {@link IndexComponentType}
      */
-    public ByteOrder byteOrderFor(IndexComponentType component, IndexContext context);
+    ByteOrder byteOrderFor(IndexComponentType component, IndexContext context);
 
     /**
      * Encode the given {@link ByteBuffer} into a {@link ByteComparable} object based on the provided {@link AbstractType}

src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyFactory.java

@@ -56,7 +56,7 @@ public PrimaryKey create(DecoratedKey partitionKey, Clustering clustering)
         return new PartitionAwarePrimaryKey(partitionKey.getToken(), partitionKey, null);
     }
 
-    private class PartitionAwarePrimaryKey implements PrimaryKey
+    private static class PartitionAwarePrimaryKey implements PrimaryKey
     {
         private final Token token;
         private DecoratedKey partitionKey;

src/java/org/apache/cassandra/index/sai/disk/v1/PartitionAwarePrimaryKeyMap.java

@@ -19,7 +19,6 @@
 package org.apache.cassandra.index.sai.disk.v1;
 
 import java.io.IOException;
-import java.nio.ByteBuffer;
 
 import javax.annotation.concurrent.NotThreadSafe;
 import javax.annotation.concurrent.ThreadSafe;
@@ -106,8 +105,8 @@ public PartitionAwarePrimaryKeyMapFactory(IndexComponents.ForRead perSSTableComp
         @Override
         public PrimaryKeyMap newPerSSTablePrimaryKeyMap()
         {
-            final LongArray rowIdToToken = new LongArray.DeferredLongArray(() -> tokenReaderFactory.open());
-            final LongArray rowIdToOffset = new LongArray.DeferredLongArray(() -> offsetReaderFactory.open());
+            final LongArray rowIdToToken = new LongArray.DeferredLongArray(tokenReaderFactory::open);
+            final LongArray rowIdToOffset = new LongArray.DeferredLongArray(offsetReaderFactory::open);
 
             return new PartitionAwarePrimaryKeyMap(rowIdToToken, rowIdToOffset, partitioner, keyFetcher, primaryKeyFactory, sstableId);
         }

src/java/org/apache/cassandra/index/sai/disk/v1/PerIndexFiles.java

@@ -28,7 +28,6 @@
 
 import org.apache.cassandra.index.sai.disk.format.IndexComponents;
 import org.apache.cassandra.index.sai.disk.format.IndexComponentType;
-import org.apache.cassandra.index.sai.disk.format.Version;
 import org.apache.cassandra.io.util.FileHandle;
 import org.apache.cassandra.io.util.FileUtils;