Skip to content

Commit 75c17c5

Browse files
committed
Address spotless errors
1 parent de55077 commit 75c17c5

5 files changed

Lines changed: 17 additions & 14 deletions

File tree

parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestParquetToThriftReadWriteAndProjection.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
import org.apache.parquet.thrift.test.RequiredPrimitiveFixture;
4545
import org.apache.parquet.thrift.test.RequiredSetFixture;
4646
import org.apache.parquet.thrift.test.StructWithReorderedOptionalFields;
47-
import org.apache.parquet.thrift.test.compat.MapWithPrimMapValue;
48-
import org.apache.parquet.thrift.test.compat.MapWithStructMapValue;
49-
import org.apache.parquet.thrift.test.compat.MapWithStructValue;
5047
import org.apache.parquet.thrift.test.compat.StructV3;
5148
import org.apache.parquet.thrift.test.compat.StructV4WithExtracStructField;
5249
import org.apache.thrift.TBase;

parquet-thrift/src/test/java/org/apache/parquet/thrift/TestParquetReadProtocol.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.apache.parquet.column.ParquetProperties;
4646
import org.apache.parquet.column.impl.ColumnWriteStoreV1;
4747
import org.apache.parquet.column.page.mem.MemPageStore;
48-
import org.apache.parquet.conf.ParquetConfiguration;
4948
import org.apache.parquet.io.ColumnIOFactory;
5049
import org.apache.parquet.io.MessageColumnIO;
5150
import org.apache.parquet.io.RecordReader;
@@ -166,7 +165,8 @@ public void testStructInMap() throws Exception {
166165
recordWriter.flush();
167166
columns.flush();
168167

169-
ThriftRecordConverter<T> converter = new TBaseRecordConverter<T>(thriftClass, schema, thriftType, new Configuration());
168+
ThriftRecordConverter<T> converter =
169+
new TBaseRecordConverter<T>(thriftClass, schema, thriftType, new Configuration());
170170
final RecordReader<T> recordReader = columnIO.getRecordReader(memPageStore, converter);
171171

172172
final T result = recordReader.read();

parquet-thrift/src/test/java/org/apache/parquet/thrift/TestParquetWriteProtocol.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ public void testNameList() throws TException {
177177
names.add("John");
178178
names.add("Jack");
179179
final TestNameList o = new TestNameList("name", names);
180-
180+
181181
String[] expectations = {
182182
"startMessage()",
183183
"startField(name, 0)",

parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftParquetReaderWriter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.hadoop.fs.FileSystem;
2929
import org.apache.hadoop.fs.Path;
3030
import org.apache.parquet.hadoop.metadata.CompressionCodecName;
31-
import org.junit.Assert;
3231
import org.junit.Test;
3332

3433
public class TestThriftParquetReaderWriter {

parquet-thrift/src/test/java/org/apache/parquet/thrift/TestThriftSchemaConverter.java

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,7 @@ private void shouldThrowWhenNoColumnsAreSelected(String filters, Class<? extends
244244
getStrictFilteredSchema(filters, thriftClass);
245245
fail("this should throw");
246246
} catch (ThriftProjectionException e) {
247-
assertEquals(
248-
"No columns have been selected", e.getMessage());
247+
assertEquals("No columns have been selected", e.getMessage());
249248
}
250249
}
251250

@@ -256,13 +255,21 @@ public void testThrowWhenNoColumnsAreSelected() {
256255

257256
@Test
258257
public void testThrowWhenProjectionFilterMatchesNothing() {
259-
shouldThrowWhenProjectionFilterMatchesNothing("name;non_existing", "Pattern: 'non_existing' (when expanded to 'non_existing')", TestStructInMap.class);
260-
shouldThrowWhenProjectionFilterMatchesNothing("**;non_existing", "Pattern: 'non_existing' (when expanded to 'non_existing')", TestStructInMap.class);
261258
shouldThrowWhenProjectionFilterMatchesNothing(
262-
"**;names/non_existing", "Pattern: 'names/non_existing' (when expanded to 'names/non_existing')", TestStructInMap.class);
259+
"name;non_existing",
260+
"Pattern: 'non_existing' (when expanded to 'non_existing')",
261+
TestStructInMap.class);
262+
shouldThrowWhenProjectionFilterMatchesNothing(
263+
"**;non_existing", "Pattern: 'non_existing' (when expanded to 'non_existing')", TestStructInMap.class);
263264
shouldThrowWhenProjectionFilterMatchesNothing(
264-
"**;names/non_existing;non_existing", "Pattern: 'names/non_existing' (when expanded to 'names/non_existing')\n" +
265-
"Pattern: 'non_existing' (when expanded to 'non_existing')", TestStructInMap.class);
265+
"**;names/non_existing",
266+
"Pattern: 'names/non_existing' (when expanded to 'names/non_existing')",
267+
TestStructInMap.class);
268+
shouldThrowWhenProjectionFilterMatchesNothing(
269+
"**;names/non_existing;non_existing",
270+
"Pattern: 'names/non_existing' (when expanded to 'names/non_existing')\n"
271+
+ "Pattern: 'non_existing' (when expanded to 'non_existing')",
272+
TestStructInMap.class);
266273
}
267274

268275
@Test

0 commit comments

Comments
 (0)