Skip to content

Commit

Permalink
Refactor for camelcase
Browse files Browse the repository at this point in the history
  • Loading branch information
allenc3 committed Jul 13, 2020
1 parent d099e78 commit 82a9545
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
Expand Up @@ -62,9 +62,9 @@ public class BQTableSchemaToProtoDescriptor {
* @param BQTableSchema
* @throws Descriptors.DescriptorValidationException
*/
public static Descriptor ConvertBQTableSchemaToProtoDescriptor(Table.TableSchema BQTableSchema)
public static Descriptor convertBQTableSchemaToProtoDescriptor(Table.TableSchema BQTableSchema)
throws Descriptors.DescriptorValidationException {
return ConvertBQTableSchemaToProtoDescriptorImpl(
return convertBQTableSchemaToProtoDescriptorImpl(
BQTableSchema, "root", new HashMap<ImmutableList<Table.TableFieldSchema>, Descriptor>());
}

Expand All @@ -77,7 +77,7 @@ public static Descriptor ConvertBQTableSchemaToProtoDescriptor(Table.TableSchema
* @param dependencyMap Stores already constructed descriptors to prevent reconstruction
* @throws Descriptors.DescriptorValidationException
*/
private static Descriptor ConvertBQTableSchemaToProtoDescriptorImpl(
private static Descriptor convertBQTableSchemaToProtoDescriptorImpl(
Table.TableSchema BQTableSchema,
String scope,
HashMap<ImmutableList<Table.TableFieldSchema>, Descriptor> dependencyMap)
Expand All @@ -93,19 +93,19 @@ private static Descriptor ConvertBQTableSchemaToProtoDescriptorImpl(
if (dependencyMap.containsKey(fieldList)) {
Descriptor descriptor = dependencyMap.get(fieldList);
dependenciesList.add(descriptor.getFile());
fields.add(ConvertBQTableFieldToProtoField(BQTableField, index++, descriptor.getName()));
fields.add(convertBQTableFieldToProtoField(BQTableField, index++, descriptor.getName()));
} else {
Descriptor descriptor =
ConvertBQTableSchemaToProtoDescriptorImpl(
convertBQTableSchemaToProtoDescriptorImpl(
Table.TableSchema.newBuilder().addAllFields(fieldList).build(),
currentScope,
dependencyMap);
dependenciesList.add(descriptor.getFile());
dependencyMap.put(fieldList, descriptor);
fields.add(ConvertBQTableFieldToProtoField(BQTableField, index++, currentScope));
fields.add(convertBQTableFieldToProtoField(BQTableField, index++, currentScope));
}
} else {
fields.add(ConvertBQTableFieldToProtoField(BQTableField, index++, currentScope));
fields.add(convertBQTableFieldToProtoField(BQTableField, index++, currentScope));
}
}
FileDescriptor[] dependenciesArray = new FileDescriptor[dependenciesList.size()];
Expand All @@ -127,7 +127,7 @@ private static Descriptor ConvertBQTableSchemaToProtoDescriptorImpl(
* @param index Index for protobuf fields.
* @param scope used to name descriptors
*/
private static FieldDescriptorProto ConvertBQTableFieldToProtoField(
private static FieldDescriptorProto convertBQTableFieldToProtoField(
Table.TableFieldSchema BQTableField, int index, String scope) {
Table.TableFieldSchema.Mode mode = BQTableField.getMode();
String fieldName = BQTableField.getName();
Expand Down
Expand Up @@ -101,7 +101,7 @@ public void testSimpleTypes() throws Exception {
final Table.TableSchema tableSchema =
Table.TableSchema.newBuilder().addFields(0, tableFieldSchema).build();
final Descriptor descriptor =
BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoDescriptor(tableSchema);
BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema);
isDescriptorEqual(descriptor, entry.getValue());
}
}
Expand All @@ -124,7 +124,7 @@ public void testStructSimple() throws Exception {
final Table.TableSchema tableSchema =
Table.TableSchema.newBuilder().addFields(0, tableFieldSchema).build();
final Descriptor descriptor =
BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoDescriptor(tableSchema);
BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema);
isDescriptorEqual(descriptor, MessageType.getDescriptor());
}

Expand Down Expand Up @@ -193,7 +193,7 @@ public void testStructComplex() throws Exception {
.addFields(7, ComplexLvl2)
.build();
final Descriptor descriptor =
BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoDescriptor(tableSchema);
BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema);
isDescriptorEqual(descriptor, ComplexRoot.getDescriptor());
}

Expand Down Expand Up @@ -224,7 +224,7 @@ public void testOptions() throws Exception {
.addFields(2, optional)
.build();
final Descriptor descriptor =
BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoDescriptor(tableSchema);
BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema);
isDescriptorEqual(descriptor, OptionTest.getDescriptor());
}

Expand Down Expand Up @@ -274,7 +274,7 @@ public void testDescriptorReuseDuringCreation() throws Exception {
.addFields(2, reuse_lvl1_2)
.build();
final Descriptor descriptor =
BQTableSchemaToProtoDescriptor.ConvertBQTableSchemaToProtoDescriptor(tableSchema);
BQTableSchemaToProtoDescriptor.convertBQTableSchemaToProtoDescriptor(tableSchema);
HashMap<String, Integer> descriptorToCount = new HashMap<String, Integer>();
mapDescriptorToCount(descriptor, descriptorToCount);
assertEquals(descriptorToCount.size(), 2);
Expand Down

0 comments on commit 82a9545

Please sign in to comment.