Optimize imports

blootsvoets · blootsvoets · commit 7c37a4ba0ef5 · 2020-07-23T10:53:49.000+02:00
diff --git a/src/integrationTest/java/org/radarbase/output/accounting/RedisRemoteLockManagerTest.kt b/src/integrationTest/java/org/radarbase/output/accounting/RedisRemoteLockManagerTest.kt
@@ -1,7 +1,8 @@
 package org.radarbase.output.accounting
 
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.*
+import org.hamcrest.Matchers.not
+import org.hamcrest.Matchers.nullValue
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
diff --git a/src/main/java/org/radarbase/output/Application.kt b/src/main/java/org/radarbase/output/Application.kt
@@ -19,31 +19,29 @@ package org.radarbase.output
 import com.beust.jcommander.JCommander
 import com.beust.jcommander.ParameterException
 import org.radarbase.output.accounting.*
+import org.radarbase.output.cleaner.SourceDataCleaner
 import org.radarbase.output.compression.Compression
 import org.radarbase.output.config.CommandLineArgs
 import org.radarbase.output.config.RestructureConfig
 import org.radarbase.output.format.RecordConverterFactory
+import org.radarbase.output.path.RecordPathFactory
 import org.radarbase.output.source.SourceStorage
 import org.radarbase.output.source.SourceStorageFactory
-import org.radarbase.output.path.RecordPathFactory
 import org.radarbase.output.target.TargetStorage
 import org.radarbase.output.target.TargetStorageFactory
 import org.radarbase.output.util.ProgressBar.Companion.format
+import org.radarbase.output.util.TimeUtil.durationSince
 import org.radarbase.output.util.Timer
 import org.radarbase.output.worker.FileCacheStore
-import org.radarbase.output.cleaner.SourceDataCleaner
-import org.radarbase.output.util.TimeUtil.durationSince
 import org.radarbase.output.worker.RadarKafkaRestructure
 import org.slf4j.LoggerFactory
 import redis.clients.jedis.JedisPool
 import java.io.IOException
 import java.nio.file.Files
 import java.text.NumberFormat
-import java.time.Duration
 import java.time.Instant
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
-import java.time.temporal.Temporal
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.system.exitProcess
diff --git a/src/main/java/org/radarbase/output/FileStoreFactory.kt b/src/main/java/org/radarbase/output/FileStoreFactory.kt
@@ -16,18 +16,18 @@
 
 package org.radarbase.output
 
-import java.io.IOException
 import org.radarbase.output.accounting.Accountant
 import org.radarbase.output.accounting.OffsetPersistenceFactory
 import org.radarbase.output.accounting.RemoteLockManager
-import org.radarbase.output.config.RestructureConfig
 import org.radarbase.output.compression.Compression
+import org.radarbase.output.config.RestructureConfig
 import org.radarbase.output.format.RecordConverterFactory
-import org.radarbase.output.source.SourceStorage
 import org.radarbase.output.path.RecordPathFactory
+import org.radarbase.output.source.SourceStorage
 import org.radarbase.output.target.TargetStorage
 import org.radarbase.output.worker.FileCacheStore
 import redis.clients.jedis.JedisPool
+import java.io.IOException
 
 /** Factory for all factory classes and settings.  */
 interface FileStoreFactory {
diff --git a/src/main/java/org/radarbase/output/accounting/HdfsRemoteLockManager.kt b/src/main/java/org/radarbase/output/accounting/HdfsRemoteLockManager.kt
@@ -4,7 +4,6 @@ import org.apache.hadoop.fs.FSDataOutputStream
 import org.apache.hadoop.fs.FileSystem
 import org.apache.hadoop.fs.Path
 import org.slf4j.LoggerFactory
-import java.lang.Exception
 
 class HdfsRemoteLockManager(
         private val fileSystem: FileSystem,
diff --git a/src/main/java/org/radarbase/output/accounting/TopicPartition.kt b/src/main/java/org/radarbase/output/accounting/TopicPartition.kt
@@ -16,7 +16,7 @@
 
 package org.radarbase.output.accounting
 
-import java.util.Objects
+import java.util.*
 
 @Suppress("EqualsOrHashCode")
 data class TopicPartition(val topic: String, val partition: Int) : Comparable<TopicPartition> {
diff --git a/src/main/java/org/radarbase/output/config/RestructureConfig.kt b/src/main/java/org/radarbase/output/config/RestructureConfig.kt
@@ -9,18 +9,13 @@ import io.minio.MinioClient
 import org.apache.hadoop.conf.Configuration
 import org.radarbase.output.Application.Companion.CACHE_SIZE_DEFAULT
 import org.radarbase.output.Plugin
-import org.radarbase.output.path.ObservationKeyPathFactory
 import org.radarbase.output.compression.Compression
 import org.radarbase.output.compression.CompressionFactory
 import org.radarbase.output.format.FormatFactory
 import org.radarbase.output.format.RecordConverterFactory
+import org.radarbase.output.path.ObservationKeyPathFactory
 import org.radarbase.output.path.RecordPathFactory
-import org.radarbase.output.target.AzureTargetStorage
-import org.radarbase.output.target.LocalTargetStorage
-import org.radarbase.output.target.S3TargetStorage
-import org.radarbase.output.target.TargetStorage
 import org.slf4j.LoggerFactory
-import java.lang.IllegalStateException
 import java.net.URI
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/src/main/java/org/radarbase/output/config/YAMLConfigLoader.kt b/src/main/java/org/radarbase/output/config/YAMLConfigLoader.kt
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import com.fasterxml.jackson.module.kotlin.readValue
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
-import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.nio.file.Files
 import java.nio.file.Paths
diff --git a/src/main/java/org/radarbase/output/format/Format.kt b/src/main/java/org/radarbase/output/format/Format.kt
@@ -16,7 +16,7 @@
 
 package org.radarbase.output.format
 
-import java.util.Locale
+import java.util.*
 
 interface Format {
     val formats: Collection<String>
diff --git a/src/main/java/org/radarbase/output/format/JsonAvroConverter.kt b/src/main/java/org/radarbase/output/format/JsonAvroConverter.kt
@@ -21,7 +21,6 @@ import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.core.util.MinimalPrettyPrinter
 import com.fasterxml.jackson.databind.ObjectMapper
 import org.apache.avro.generic.GenericRecord
-import java.io.BufferedReader
 import java.io.IOException
 import java.io.Writer
 
diff --git a/src/main/java/org/radarbase/output/format/JsonAvroConverterFactory.kt b/src/main/java/org/radarbase/output/format/JsonAvroConverterFactory.kt
@@ -1,14 +1,10 @@
 package org.radarbase.output.format
 
-import com.fasterxml.jackson.databind.JsonNode
 import org.apache.avro.generic.GenericRecord
 import org.radarbase.output.compression.Compression
 import org.radarbase.output.format.JsonAvroConverter.Companion.JSON_READER
 import org.radarbase.output.format.JsonAvroConverter.Companion.JSON_WRITER
 import org.radarbase.output.util.TimeUtil.getDate
-import org.radarbase.output.util.TimeUtil.parseDate
-import org.radarbase.output.util.TimeUtil.parseDateTime
-import org.radarbase.output.util.TimeUtil.toDouble
 import java.io.*
 import java.nio.file.Files
 import java.nio.file.Path
diff --git a/src/main/java/org/radarbase/output/format/JsonAvroDataConverter.kt b/src/main/java/org/radarbase/output/format/JsonAvroDataConverter.kt
@@ -5,8 +5,7 @@ import org.apache.avro.generic.GenericData
 import org.apache.avro.generic.GenericFixed
 import org.apache.avro.generic.GenericRecord
 import java.nio.ByteBuffer
-import java.util.ArrayList
-import java.util.HashMap
+import java.util.*
 
 class JsonAvroDataConverter {
     fun convertRecord(record: GenericRecord): Map<String, Any?> {
diff --git a/src/main/java/org/radarbase/output/format/RecordConverter.kt b/src/main/java/org/radarbase/output/format/RecordConverter.kt
@@ -16,10 +16,10 @@
 
 package org.radarbase.output.format
 
+import org.apache.avro.generic.GenericRecord
 import java.io.Closeable
 import java.io.Flushable
 import java.io.IOException
-import org.apache.avro.generic.GenericRecord
 
 /** Converts a GenericRecord to Java primitives or writes it to file.  */
 interface RecordConverter : Flushable, Closeable {
diff --git a/src/main/java/org/radarbase/output/format/RecordConverterFactory.kt b/src/main/java/org/radarbase/output/format/RecordConverterFactory.kt
@@ -18,14 +18,25 @@ package org.radarbase.output.format
 
 import org.apache.avro.Schema
 import org.apache.avro.generic.GenericData
-import java.nio.file.Files
-import java.nio.file.Path
-import java.util.LinkedHashSet
-import java.util.regex.Pattern
 import org.apache.avro.generic.GenericRecord
 import org.radarbase.output.compression.Compression
 import java.io.*
-import java.time.Instant
+import java.nio.file.Files
+import java.nio.file.Path
+import java.util.*
+import java.util.regex.Pattern
+import kotlin.collections.ArrayList
+import kotlin.collections.Collection
+import kotlin.collections.List
+import kotlin.collections.Map
+import kotlin.collections.MutableList
+import kotlin.collections.Set
+import kotlin.collections.component1
+import kotlin.collections.component2
+import kotlin.collections.emptySet
+import kotlin.collections.iterator
+import kotlin.collections.toTypedArray
+import kotlin.collections.withIndex
 
 interface RecordConverterFactory : Format {
     /**
diff --git a/src/main/java/org/radarbase/output/path/ObservationKeyPathFactory.kt b/src/main/java/org/radarbase/output/path/ObservationKeyPathFactory.kt
@@ -16,10 +16,10 @@
 
 package org.radarbase.output.path
 
+import org.apache.avro.generic.GenericRecord
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.time.Instant
-import org.apache.avro.generic.GenericRecord
 
 open class ObservationKeyPathFactory : RecordPathFactory() {
     override fun getRelativePath(topic: String, key: GenericRecord,
diff --git a/src/main/java/org/radarbase/output/target/AzureTargetStorage.kt b/src/main/java/org/radarbase/output/target/AzureTargetStorage.kt
@@ -24,7 +24,6 @@ import org.radarbase.output.util.toKey
 import org.slf4j.LoggerFactory
 import java.io.IOException
 import java.io.InputStream
-import java.lang.Exception
 import java.nio.file.Files
 import java.nio.file.Path
 
diff --git a/src/main/java/org/radarbase/output/util/ProgressBar.kt b/src/main/java/org/radarbase/output/util/ProgressBar.kt
@@ -19,8 +19,6 @@ package org.radarbase.output.util
 import org.slf4j.LoggerFactory
 import java.time.Duration
 import java.util.concurrent.TimeUnit
-import java.util.concurrent.atomic.AtomicBoolean
-import java.util.concurrent.atomic.AtomicLong
 
 /**
  * Progress bar.
diff --git a/src/main/java/org/radarbase/output/util/Timer.kt b/src/main/java/org/radarbase/output/util/Timer.kt
@@ -16,12 +16,12 @@
 
 package org.radarbase.output.util
 
+import org.radarbase.output.util.ProgressBar.Companion.appendTime
 import java.time.Duration
+import java.util.*
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ConcurrentMap
 import java.util.concurrent.atomic.LongAdder
-import org.radarbase.output.util.ProgressBar.Companion.appendTime
-import java.util.*
 
 /** Timer for multi-threaded timings. The timer may be disabled to increase program performance.  */
 object Timer {
diff --git a/src/main/java/org/radarbase/output/worker/FileCacheStore.kt b/src/main/java/org/radarbase/output/worker/FileCacheStore.kt
@@ -20,12 +20,15 @@ import org.apache.avro.Schema
 import org.apache.avro.generic.GenericRecord
 import org.radarbase.output.FileStoreFactory
 import org.radarbase.output.accounting.Accountant
-import org.radarbase.output.worker.FileCacheStore.WriteResponse.*
 import org.radarbase.output.util.TemporaryDirectory
 import org.radarbase.output.util.ThrowingConsumer.tryCatch
 import org.radarbase.output.util.Timer.time
+import org.radarbase.output.worker.FileCacheStore.WriteResponse.*
 import org.slf4j.LoggerFactory
-import java.io.*
+import java.io.Closeable
+import java.io.Flushable
+import java.io.IOException
+import java.io.UncheckedIOException
 import java.nio.file.Files
 import java.nio.file.Path
 import java.util.*
diff --git a/src/main/java/org/radarbase/output/worker/RestructureWorker.kt b/src/main/java/org/radarbase/output/worker/RestructureWorker.kt
@@ -9,10 +9,10 @@ import org.apache.avro.generic.GenericRecord
 import org.radarbase.output.FileStoreFactory
 import org.radarbase.output.accounting.Accountant
 import org.radarbase.output.accounting.OffsetRangeSet
+import org.radarbase.output.path.RecordPathFactory
 import org.radarbase.output.source.SourceStorage
 import org.radarbase.output.source.TopicFile
 import org.radarbase.output.source.TopicFileList
-import org.radarbase.output.path.RecordPathFactory
 import org.radarbase.output.util.ProgressBar
 import org.radarbase.output.util.ReadOnlyFunctionalValue
 import org.radarbase.output.util.Timer.time
diff --git a/src/test/java/org/radarbase/output/OffsetRangeFileTest.kt b/src/test/java/org/radarbase/output/OffsetRangeFileTest.kt
@@ -20,10 +20,10 @@ import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
-import org.radarbase.output.accounting.TopicPartitionOffsetRange
 import org.radarbase.output.accounting.OffsetFilePersistence
 import org.radarbase.output.accounting.OffsetPersistenceFactory
 import org.radarbase.output.accounting.TopicPartition
+import org.radarbase.output.accounting.TopicPartitionOffsetRange
 import org.radarbase.output.config.LocalConfig
 import org.radarbase.output.target.LocalTargetStorage
 import org.radarbase.output.target.TargetStorage
diff --git a/src/test/java/org/radarbase/output/OffsetRangeSetTest.kt b/src/test/java/org/radarbase/output/OffsetRangeSetTest.kt
@@ -1,13 +1,10 @@
 package org.radarbase.output
 
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertFalse
-import org.junit.jupiter.api.Assertions.assertTrue
-
+import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.Test
-import org.radarbase.output.accounting.TopicPartitionOffsetRange
 import org.radarbase.output.accounting.OffsetRangeSet
 import org.radarbase.output.accounting.TopicPartition
+import org.radarbase.output.accounting.TopicPartitionOffsetRange
 import java.time.Instant
 
 class OffsetRangeSetTest {
diff --git a/src/test/java/org/radarbase/output/RadarHdfsRestructureTest.kt b/src/test/java/org/radarbase/output/RadarHdfsRestructureTest.kt
@@ -21,7 +21,6 @@ import org.apache.avro.generic.GenericRecordBuilder
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.radarbase.output.path.ObservationKeyPathFactory
-import org.radarbase.output.path.RecordPathFactory
 import org.radarbase.output.util.TimeUtil.getDate
 
 class RadarHdfsRestructureTest {
diff --git a/src/test/java/org/radarbase/output/data/FileCacheStoreTest.kt b/src/test/java/org/radarbase/output/data/FileCacheStoreTest.kt
@@ -16,8 +16,8 @@
 
 package org.radarbase.output.data
 
-import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.check
+import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.times
 import com.nhaarman.mockitokotlin2.verify
 import org.apache.avro.SchemaBuilder
@@ -29,9 +29,9 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
 import org.radarbase.output.Application
 import org.radarbase.output.accounting.Accountant
-import org.radarbase.output.accounting.TopicPartitionOffsetRange
 import org.radarbase.output.accounting.OffsetRangeSet
 import org.radarbase.output.accounting.TopicPartition
+import org.radarbase.output.accounting.TopicPartitionOffsetRange
 import org.radarbase.output.config.*
 import org.radarbase.output.worker.FileCacheStore
 import java.io.IOException
diff --git a/src/test/java/org/radarbase/output/util/TimeUtilTest.kt b/src/test/java/org/radarbase/output/util/TimeUtilTest.kt
@@ -1,6 +1,6 @@
 package org.radarbase.output.util
 
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.radarbase.output.util.TimeUtil.toDouble
 import java.time.Instant
