Skip to content

Commit 67beafa

Browse files
blootsvoetsblootsvoets
committed
Optimized imports
1 parent 02658da commit 67beafa

11 files changed

+85
-70
lines changed

‎src/main/java/org/radarcns/RestructureAvroRecords.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
import org.radarcns.data.CsvAvroConverter;
3232
import org.radarcns.data.FileCacheStore;
3333
import org.radarcns.data.JsonAvroConverter;
34-
import org.radarcns.util.ProgressBar;
3534
import org.radarcns.data.RecordConverterFactory;
35+
import org.radarcns.util.ProgressBar;
3636
import org.radarcns.util.commandline.CommandLineArgs;
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;

‎src/main/java/org/radarcns/data/FileCache.java‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,28 @@
1616

1717
package org.radarcns.data;
1818

19-
import java.io.*;
19+
import org.apache.avro.generic.GenericRecord;
20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
22+
23+
import javax.annotation.Nonnull;
24+
import java.io.BufferedInputStream;
25+
import java.io.BufferedOutputStream;
26+
import java.io.ByteArrayInputStream;
27+
import java.io.Closeable;
28+
import java.io.Flushable;
29+
import java.io.IOException;
30+
import java.io.InputStream;
31+
import java.io.InputStreamReader;
32+
import java.io.OutputStream;
33+
import java.io.OutputStreamWriter;
34+
import java.io.Reader;
35+
import java.io.Writer;
2036
import java.nio.file.Files;
2137
import java.nio.file.Path;
2238
import java.nio.file.StandardOpenOption;
2339
import java.util.zip.GZIPInputStream;
2440
import java.util.zip.GZIPOutputStream;
25-
import javax.annotation.Nonnull;
26-
import org.apache.avro.generic.GenericRecord;
27-
import org.slf4j.Logger;
28-
import org.slf4j.LoggerFactory;
2941

3042
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
3143

‎src/main/java/org/radarcns/data/RecordConverter.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616

1717
package org.radarcns.data;
1818

19+
import org.apache.avro.generic.GenericRecord;
20+
1921
import java.io.Closeable;
2022
import java.io.Flushable;
2123
import java.io.IOException;
2224
import java.util.Map;
23-
import org.apache.avro.generic.GenericRecord;
2425

2526
/** Converts a GenericRecord to Java primitives or writes it to file. */
2627
public interface RecordConverter extends Flushable, Closeable {

‎src/main/java/org/radarcns/util/commandline/HdfsUriValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.radarcns.util.commandline;
22

33

4-
import com.beust.jcommander.ParameterException;
54
import com.beust.jcommander.IParameterValidator;
5+
import com.beust.jcommander.ParameterException;
66

77
public class HdfsUriValidator implements IParameterValidator{
88
@Override

‎src/main/java/org/radarcns/util/commandline/PathValidator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.radarcns.util.commandline;
22

3-
import com.beust.jcommander.ParameterException;
43
import com.beust.jcommander.IParameterValidator;
4+
import com.beust.jcommander.ParameterException;
55

66
public class PathValidator implements IParameterValidator{
77
@Override

‎src/test/java/org/radarcns/OffsetRangeSetTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import org.junit.Test;
44

5-
import static org.junit.Assert.*;
5+
import static org.junit.Assert.assertEquals;
6+
import static org.junit.Assert.assertFalse;
7+
import static org.junit.Assert.assertTrue;
68

79
public class OffsetRangeSetTest {
810
@Test

‎src/test/java/org/radarcns/RestructureAvroRecordsTest.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,16 @@
1616

1717
package org.radarcns;
1818

19-
import static org.junit.Assert.*;
20-
21-
import java.text.SimpleDateFormat;
22-
import java.util.Calendar;
23-
import java.util.Date;
24-
import java.util.TimeZone;
2519
import org.apache.avro.Schema;
26-
import org.apache.avro.Schema.Field;
2720
import org.apache.avro.SchemaBuilder;
2821
import org.apache.avro.generic.GenericRecord;
2922
import org.apache.avro.generic.GenericRecordBuilder;
3023
import org.junit.Test;
3124

25+
import java.util.Date;
26+
27+
import static org.junit.Assert.assertEquals;
28+
3229
public class RestructureAvroRecordsTest {
3330
@Test
3431
public void createHourTimestamp() throws Exception {

‎src/test/java/org/radarcns/util/CsvAvroConverterTest.java‎ renamed to ‎src/test/java/org/radarcns/data/CsvAvroConverterTest.java‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.radarcns.util;
18-
19-
import static org.junit.Assert.assertArrayEquals;
20-
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertFalse;
22-
import static org.junit.Assert.assertNull;
23-
import static org.junit.Assert.assertTrue;
24-
25-
import java.io.*;
26-
import java.nio.file.Files;
27-
import java.nio.file.Path;
28-
import java.util.Arrays;
29-
import java.util.Iterator;
30-
import java.util.LinkedHashSet;
31-
import java.util.List;
32-
import java.util.Map;
33-
import java.util.Set;
34-
import java.util.zip.GZIPInputStream;
35-
import java.util.zip.GZIPOutputStream;
17+
package org.radarcns.data;
3618

3719
import org.apache.avro.Schema;
3820
import org.apache.avro.Schema.Parser;
@@ -47,9 +29,34 @@
4729
import org.junit.Test;
4830
import org.junit.rules.ExpectedException;
4931
import org.junit.rules.TemporaryFolder;
50-
import org.radarcns.data.CsvAvroConverter;
51-
import org.radarcns.data.RecordConverter;
52-
import org.radarcns.data.RecordConverterFactory;
32+
33+
import java.io.BufferedReader;
34+
import java.io.BufferedWriter;
35+
import java.io.IOException;
36+
import java.io.InputStream;
37+
import java.io.InputStreamReader;
38+
import java.io.OutputStream;
39+
import java.io.OutputStreamWriter;
40+
import java.io.Reader;
41+
import java.io.StringReader;
42+
import java.io.StringWriter;
43+
import java.io.Writer;
44+
import java.nio.file.Files;
45+
import java.nio.file.Path;
46+
import java.util.Arrays;
47+
import java.util.Iterator;
48+
import java.util.LinkedHashSet;
49+
import java.util.List;
50+
import java.util.Map;
51+
import java.util.Set;
52+
import java.util.zip.GZIPInputStream;
53+
import java.util.zip.GZIPOutputStream;
54+
55+
import static org.junit.Assert.assertArrayEquals;
56+
import static org.junit.Assert.assertEquals;
57+
import static org.junit.Assert.assertFalse;
58+
import static org.junit.Assert.assertNull;
59+
import static org.junit.Assert.assertTrue;
5360

5461
public class CsvAvroConverterTest {
5562
@Rule

‎src/test/java/org/radarcns/util/FileCacheStoreTest.java‎ renamed to ‎src/test/java/org/radarcns/data/FileCacheStoreTest.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.radarcns.util;
18-
19-
import static org.junit.Assert.assertEquals;
20-
21-
import java.io.IOException;
22-
import java.nio.file.Files;
23-
import java.nio.file.Path;
24-
import java.util.Arrays;
25-
import java.util.Collection;
17+
package org.radarcns.data;
2618

2719
import org.apache.avro.Schema;
2820
import org.apache.avro.SchemaBuilder;
@@ -33,9 +25,14 @@
3325
import org.junit.rules.TemporaryFolder;
3426
import org.junit.runner.RunWith;
3527
import org.junit.runners.Parameterized;
36-
import org.radarcns.data.CsvAvroConverter;
37-
import org.radarcns.data.FileCacheStore;
38-
import org.radarcns.data.RecordConverterFactory;
28+
29+
import java.io.IOException;
30+
import java.nio.file.Files;
31+
import java.nio.file.Path;
32+
import java.util.Arrays;
33+
import java.util.Collection;
34+
35+
import static org.junit.Assert.assertEquals;
3936

4037
@RunWith(Parameterized.class)
4138
public class FileCacheStoreTest {

‎src/test/java/org/radarcns/util/FileCacheTest.java‎ renamed to ‎src/test/java/org/radarcns/data/FileCacheTest.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.radarcns.util;
17+
package org.radarcns.data;
1818

1919
import org.apache.avro.Schema;
2020
import org.apache.avro.SchemaBuilder;
@@ -26,9 +26,6 @@
2626
import org.junit.rules.TemporaryFolder;
2727
import org.junit.runner.RunWith;
2828
import org.junit.runners.Parameterized;
29-
import org.radarcns.data.CsvAvroConverter;
30-
import org.radarcns.data.FileCache;
31-
import org.radarcns.data.RecordConverterFactory;
3229

3330
import java.io.BufferedReader;
3431
import java.io.IOException;
@@ -39,8 +36,6 @@
3936
import java.nio.file.Path;
4037
import java.util.Arrays;
4138
import java.util.Collection;
42-
import java.util.Collections;
43-
import java.util.List;
4439
import java.util.zip.GZIPInputStream;
4540

4641
import static org.junit.Assert.assertEquals;

0 commit comments

Comments
 (0)