Skip to content

Commit 354cd89

Browse files
author
Chris Li
committed
Replace sneakythrows
1 parent 8d95885 commit 354cd89

File tree

5 files changed

+15
-26
lines changed

5 files changed

+15
-26
lines changed

cdi-core/src/main/java/com/linkedin/cdi/converter/AvroNormalizerConverter.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
import com.google.common.base.Optional;
88
import com.google.gson.JsonArray;
99
import com.google.gson.JsonElement;
10+
import com.linkedin.cdi.configuration.MultistageProperties;
11+
import com.linkedin.cdi.util.AvroSchemaUtils;
1012
import java.util.ArrayList;
1113
import java.util.HashSet;
1214
import java.util.List;
@@ -18,9 +20,6 @@
1820
import org.apache.gobblin.converter.Converter;
1921
import org.apache.gobblin.converter.SchemaConversionException;
2022
import org.apache.gobblin.converter.SingleRecordIterable;
21-
import org.apache.gobblin.converter.avro.UnsupportedDateTypeException;
22-
import com.linkedin.cdi.configuration.MultistageProperties;
23-
import com.linkedin.cdi.util.AvroSchemaUtils;
2423
import org.apache.gobblin.util.AvroUtils;
2524
import org.apache.gobblin.util.EmptyIterable;
2625

@@ -92,11 +91,7 @@ public Schema convertSchema(Schema schema, WorkUnitState workUnitState) throws S
9291
buildIntermediateSchemas(schema);
9392
}
9493

95-
try {
96-
finalSchema = AvroSchemaUtils.fromJsonSchema(targetSchema, workUnitState);
97-
} catch (UnsupportedDateTypeException e) {
98-
throw new SchemaConversionException(e);
99-
}
94+
finalSchema = AvroSchemaUtils.fromJsonSchema(targetSchema, workUnitState);
10095
return finalSchema;
10196
}
10297

cdi-core/src/main/java/com/linkedin/cdi/filter/AvroSchemaBasedFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.apache.avro.generic.GenericData;
1313
import org.apache.avro.generic.GenericRecord;
1414
import org.apache.gobblin.configuration.WorkUnitState;
15-
import org.apache.gobblin.converter.avro.UnsupportedDateTypeException;
1615
import org.apache.gobblin.util.AvroUtils;
1716
import org.slf4j.Logger;
1817
import org.slf4j.LoggerFactory;
@@ -30,7 +29,7 @@ public AvroSchemaBasedFilter(JsonIntermediateSchema schema, AvroExtractorKeys av
3029
}
3130

3231
@Override
33-
public GenericRecord filter(GenericRecord input) throws UnsupportedDateTypeException {
32+
public GenericRecord filter(GenericRecord input) {
3433
Schema outputSchema = AvroSchemaUtils.fromJsonSchema(schema.toJson(), state);
3534
GenericRecord filteredRow = new GenericData.Record(outputSchema);
3635
for (String fieldName : AvroSchemaUtils.getSchemaFieldNames(outputSchema)) {

cdi-core/src/main/java/com/linkedin/cdi/filter/MultistageSchemaBasedFilter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
package com.linkedin.cdi.filter;
66

77
import com.linkedin.cdi.util.JsonIntermediateSchema;
8-
import org.apache.gobblin.converter.avro.UnsupportedDateTypeException;
98

109

1110
/**
@@ -21,7 +20,7 @@ public MultistageSchemaBasedFilter(JsonIntermediateSchema schema) {
2120
}
2221

2322
@Override
24-
public T filter(T input) throws UnsupportedDateTypeException {
23+
public T filter(T input) {
2524
return null;
2625
}
2726
}

cdi-core/src/main/java/com/linkedin/cdi/filter/SchemaBasedFilter.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@
44

55
package com.linkedin.cdi.filter;
66

7-
import org.apache.gobblin.converter.avro.UnsupportedDateTypeException;
8-
9-
107
/**
118
* Base filter interface
129
*
1310
*/
1411
public interface SchemaBasedFilter<T> {
15-
T filter(T input) throws UnsupportedDateTypeException;
12+
T filter(T input);
1613
}

cdi-core/src/main/java/com/linkedin/cdi/util/AvroSchemaUtils.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,16 @@ public interface AvroSchemaUtils {
2424
* @return avro schema
2525
* @throws UnsupportedDateTypeException unsupported type
2626
*/
27-
static Schema fromJsonSchema(JsonArray schema, WorkUnitState state) throws UnsupportedDateTypeException {
27+
static Schema fromJsonSchema(JsonArray schema, WorkUnitState state) {
2828
JsonSchema jsonSchema = new JsonSchema(schema);
2929
jsonSchema.setColumnName(state.getExtract().getTable());
30-
JsonElementConversionFactory.RecordConverter recordConverter =
31-
new JsonElementConversionFactory.RecordConverter(jsonSchema, state, state.getExtract().getNamespace());
32-
return recordConverter.schema();
30+
try {
31+
JsonElementConversionFactory.RecordConverter recordConverter =
32+
new JsonElementConversionFactory.RecordConverter(jsonSchema, state, state.getExtract().getNamespace());
33+
return recordConverter.schema();
34+
} catch (Exception e) {
35+
throw new RuntimeException(e.getMessage(), e);
36+
}
3337
}
3438

3539
/**
@@ -62,12 +66,7 @@ static GenericRecord createEOF(WorkUnitState state) {
6266
JsonArray eofSchema = new Gson()
6367
.fromJson("[{\"columnName\":\"EOF\",\"isNullable\":\"false\",\"dataType\":{\"type\":\"string\"}}]",
6468
JsonArray.class);
65-
Schema schema = null;
66-
try {
67-
schema = fromJsonSchema(eofSchema, state);
68-
} catch (UnsupportedDateTypeException e) {
69-
// impossible, since the schema is fixed here and string type is supported
70-
}
69+
Schema schema = fromJsonSchema(eofSchema, state);
7170
assert (schema != null);
7271
GenericRecord eofRecord = new GenericData.Record(schema);
7372
eofRecord.put("EOF", "EOF");

0 commit comments

Comments
 (0)