GEOMESA-3581 Parallelize spill-to-disk during sort operations (#3548)

Author: elahrvivaz

geomesa-fs/geomesa-fs-storage/geomesa-fs-storage-core/src/main/scala/org/locationtech/geomesa/fs/storage/core/package.scala

@@ -130,7 +130,7 @@ package object core {
     /**
      * Json serializer for partitions
      */
-    private[core] object PartitionSerializer extends JsonSerializer[Partition] with JsonDeserializer[Partition] {
+    object PartitionSerializer extends JsonSerializer[Partition] with JsonDeserializer[Partition] {
 
       override def serialize(src: Partition, typeOfSrc: Type, context: JsonSerializationContext): JsonElement = {
         val array = new JsonArray(src.values.size)
@@ -180,7 +180,7 @@ package object core {
     /**
      * Json serializer for partition keys
      */
-    private[core] object PartitionKeySerializer extends JsonSerializer[PartitionKey] with JsonDeserializer[PartitionKey] {
+    object PartitionKeySerializer extends JsonSerializer[PartitionKey] with JsonDeserializer[PartitionKey] {
 
       override def serialize(src: PartitionKey, typeOfSrc: Type, context: JsonSerializationContext): JsonElement = {
         val obj = new JsonObject()

geomesa-fs/geomesa-fs-tools/src/main/scala/org/locationtech/geomesa/fs/tools/ingest/FsGeneratePartitionFiltersCommand.scala

@@ -28,7 +28,7 @@ class FsGeneratePartitionFiltersCommand extends FsDataStoreCommand {
 
   override def execute(): Unit = withDataStore { ds =>
     if (params.cqlFilter == null && params.partitions.isEmpty) {
-      throw new ParameterException("At least one of --partitions or --cql must be specified")
+      throw new ParameterException("At least one of --partition or --cql must be specified")
     }
 
     val metadata = ds.storage(params.featureName).metadata