Skip to content

Commit cedd6d8

Browse files
authored
fix: Refactoring methods in TemplateUtils. Using CamelCasing for names. (#2967) (#2970)
* Refactoring methods in TemplateUtils. Using CamelCasing for names. * Refactoring methods in TemplateUtils. Using CamelCasing for names. (cherry picked from commit 93a1c2d)
1 parent e802352 commit cedd6d8

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
3+
<differences>
4+
<difference>
5+
<differenceType>7002</differenceType>
6+
<className>com/google/cloud/bigtable/beam/TemplateUtils</className>
7+
<method>**</method>
8+
</difference>
9+
</differences>

bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/TemplateUtils.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,11 @@
4848
*/
4949
@InternalApi("For internal usage only")
5050
public class TemplateUtils {
51-
/** Builds CloudBigtableTableConfiguration from input runtime parameters for import job. */
52-
public static CloudBigtableTableConfiguration BuildImportConfig(ImportOptions opts) {
53-
return BuildImportConfigWithCustomUserAgent(opts, "ImportJob");
54-
}
55-
5651
/**
5752
* Builds CloudBigtableTableConfiguration from input runtime parameters for import job with with
5853
* custom user agent.
5954
*/
60-
public static CloudBigtableTableConfiguration BuildImportConfigWithCustomUserAgent(
55+
public static CloudBigtableTableConfiguration buildImportConfig(
6156
ImportOptions opts, String customUserAgent) {
6257
CloudBigtableTableConfiguration.Builder builder =
6358
new CloudBigtableTableConfiguration.Builder()
@@ -166,7 +161,7 @@ public String toString() {
166161
}
167162

168163
/** Builds CloudBigtableScanConfiguration from input runtime parameters for export job. */
169-
public static CloudBigtableScanConfiguration BuildExportConfig(ExportOptions options) {
164+
public static CloudBigtableScanConfiguration buildExportConfig(ExportOptions options) {
170165
ValueProvider<ReadRowsRequest> request = new RequestValueProvider(options);
171166
CloudBigtableScanConfiguration.Builder configBuilder =
172167
new CloudBigtableScanConfiguration.Builder()

bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/hbasesnapshots/ImportJobFromHbaseSnapshot.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ static Pipeline buildPipeline(ImportOptions opts) throws Exception {
119119
.apply(
120120
"Write to Bigtable",
121121
CloudBigtableIO.writeToTable(
122-
TemplateUtils.BuildImportConfigWithCustomUserAgent(
123-
opts, "HBaseSnapshotImportJob")));
122+
TemplateUtils.buildImportConfig(opts, "HBaseSnapshotImportJob")));
124123

125124
final List<KV<String, String>> sourceAndRestoreFolders =
126125
Arrays.asList(

bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ExportJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ static Pipeline buildPipeline(ExportOptions opts) {
205205

206206
Pipeline pipeline = Pipeline.create(Utils.tweakOptions(opts));
207207

208-
CloudBigtableScanConfiguration config = TemplateUtils.BuildExportConfig(opts);
208+
CloudBigtableScanConfiguration config = TemplateUtils.buildExportConfig(opts);
209209
pipeline
210210
.apply("Read table", Read.from(CloudBigtableIO.read(config)))
211211
.apply("Format results", MapElements.via(new ResultToKV()))

bigtable-dataflow-parent/bigtable-beam-import/src/main/java/com/google/cloud/bigtable/beam/sequencefiles/ImportJob.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static SequenceFileSource<ImmutableBytesWritable, Result> createSource(
177177

178178
static PTransform<PCollection<Mutation>, PDone> createSink(ImportOptions opts) {
179179
CloudBigtableTableConfiguration config =
180-
TemplateUtils.BuildImportConfigWithCustomUserAgent(opts, "SequenceFileImportJob");
180+
TemplateUtils.buildImportConfig(opts, "SequenceFileImportJob");
181181
return CloudBigtableIO.writeToTable(config);
182182
}
183183
}

0 commit comments

Comments
 (0)