Skip to content

Commit b157dd5

Browse files
authored
Rename getBulletRecordProvider to createBulletRecordProvider and getCachedBulletRecordProvider to getBulletRecordProvider (#96)
1 parent e840c79 commit b157dd5

File tree

3 files changed

+17
-16
lines changed

3 files changed

+17
-16
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5151
<maven.compiler.source>1.8</maven.compiler.source>
5252
<maven.compiler.target>1.8</maven.compiler.target>
53-
<bullet.record.version>1.1.1</bullet.record.version>
53+
<bullet.record.version>1.1.3</bullet.record.version>
5454
<sketches.version>0.9.1</sketches.version>
5555
</properties>
5656

src/main/java/com/yahoo/bullet/common/BulletConfig.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -348,24 +348,25 @@ public BulletConfig() {
348348
}
349349

350350
/**
351-
* Construct a {@link BulletRecordProvider} and store it in this BulletConfig instance.
351+
* Create a {@link BulletRecordProvider} and store it in this BulletConfig instance. If the provider is changed,
352+
* this method should be called before {@link BulletConfig#getBulletRecordProvider()} is called again.
352353
*
353354
* @return The BulletRecordProvider instance.
354355
*/
355-
public BulletRecordProvider getBulletRecordProvider() {
356+
public BulletRecordProvider createBulletRecordProvider() {
356357
provider = BulletRecordProvider.from(getAs(RECORD_PROVIDER_CLASS_NAME, String.class));
357358
return provider;
358359
}
359360

360361
/**
361-
* Get the {@link BulletRecordProvider} stored in this BulletConfig instance, or construct and store one first if
362+
* Get the {@link BulletRecordProvider} stored in this BulletConfig instance, or create and store one first if
362363
* there is none.
363364
*
364365
* @return The BulletRecordProvider instance.
365366
*/
366-
public BulletRecordProvider getCachedBulletRecordProvider() {
367+
public BulletRecordProvider getBulletRecordProvider() {
367368
if (provider == null) {
368-
return getBulletRecordProvider();
369+
return createBulletRecordProvider();
369370
}
370371
return provider;
371372
}

src/test/java/com/yahoo/bullet/common/BulletConfigTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -459,13 +459,13 @@ public void testValidatorIsACopy() {
459459
}
460460

461461
@Test
462-
public void testGetBulletRecordProvider() {
462+
public void testCreateBulletRecordProvider() {
463463
BulletConfig config = new BulletConfig();
464-
BulletRecordProvider providerA = config.getBulletRecordProvider();
465-
BulletRecordProvider providerB = config.getBulletRecordProvider();
464+
BulletRecordProvider providerA = config.createBulletRecordProvider();
465+
BulletRecordProvider providerB = config.createBulletRecordProvider();
466466

467467
// Creates a new provider each time
468-
Assert.assertNotEquals(providerA, providerB);
468+
Assert.assertNotSame(providerA, providerB);
469469

470470
// Ensure the provider generates new records each time
471471
BulletRecord recordA = providerA.getInstance();
@@ -480,10 +480,10 @@ public void testGetBulletRecordProvider() {
480480
}
481481

482482
@Test
483-
public void testGetCachedBulletRecordProvider() {
483+
public void testGetBulletRecordProvider() {
484484
BulletConfig config = new BulletConfig();
485-
BulletRecordProvider providerA = config.getCachedBulletRecordProvider();
486-
BulletRecordProvider providerB = config.getCachedBulletRecordProvider();
485+
BulletRecordProvider providerA = config.getBulletRecordProvider();
486+
BulletRecordProvider providerB = config.getBulletRecordProvider();
487487

488488
// Uses the same provider
489489
Assert.assertSame(providerA, providerB);
@@ -494,14 +494,14 @@ public void testSettingDifferentBulletRecordProvider() {
494494
BulletConfig config = new BulletConfig();
495495

496496
// Default record provider is TypedAvroBulletRecordProvider
497-
Assert.assertTrue(config.getBulletRecordProvider() instanceof TypedAvroBulletRecordProvider);
497+
Assert.assertTrue(config.createBulletRecordProvider() instanceof TypedAvroBulletRecordProvider);
498498

499499
config.set(BulletConfig.RECORD_PROVIDER_CLASS_NAME, TypedSimpleBulletRecordProvider.class.getName());
500500

501501
// Cached record provider doesn't change with new setting
502-
Assert.assertTrue(config.getCachedBulletRecordProvider() instanceof TypedAvroBulletRecordProvider);
502+
Assert.assertTrue(config.getBulletRecordProvider() instanceof TypedAvroBulletRecordProvider);
503503

504-
Assert.assertTrue(config.getBulletRecordProvider() instanceof TypedSimpleBulletRecordProvider);
504+
Assert.assertTrue(config.createBulletRecordProvider() instanceof TypedSimpleBulletRecordProvider);
505505
}
506506

507507
@Test(expectedExceptions = IllegalStateException.class)

0 commit comments

Comments
 (0)