Rename Lock.LockFactory to Lock.Factory
Since the LockFactory is an inner type of the Lock it doesn't need to
repeat the name of the outer class. It is also a common pattern in
Gerrit code base to name inner factory interfaces just Factory.
Further, simplify the Guice binding of the Lock.Factory as the call to
'.implements(...)' is not really required in this case.
Change-Id: I0c723aad011bb84702414450581195d27251e9d3
diff --git a/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Lock.java b/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Lock.java
index b2cdacf..72fef8d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Lock.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Lock.java
@@ -50,7 +50,7 @@
public class Lock implements AutoCloseable {
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
- public interface LockFactory {
+ public interface Factory {
Lock create(@Assisted("projectName") String projectName, @Assisted("refName") String refName);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Module.java b/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Module.java
index c146a9c..7216d5c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/Module.java
@@ -51,10 +51,7 @@
.to(SpannerRefDatabase.class)
.in(Scopes.SINGLETON);
listener().to(SpannerLifeCycleManager.class);
- install(
- new FactoryModuleBuilder()
- .implement(AutoCloseable.class, Lock.class)
- .build(Lock.LockFactory.class));
+ install(new FactoryModuleBuilder().build(Lock.Factory.class));
}
@Provides
diff --git a/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabase.java b/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabase.java
index 8db7745..0593139 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabase.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/spannerrefdb/SpannerRefDatabase.java
@@ -41,10 +41,10 @@
private static final FluentLogger logger = FluentLogger.forEnclosingClass();
private final DatabaseClient dbClient;
- private final Lock.LockFactory lockFactory;
+ private final Lock.Factory lockFactory;
@Inject
- SpannerRefDatabase(DatabaseClient dbClient, Lock.LockFactory lockFactory) {
+ SpannerRefDatabase(DatabaseClient dbClient, Lock.Factory lockFactory) {
this.dbClient = dbClient;
this.lockFactory = lockFactory;
}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/EmulatedSpannerRefDb.java b/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/EmulatedSpannerRefDb.java
index c555044..4288641 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/EmulatedSpannerRefDb.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/spannerrefdb/EmulatedSpannerRefDb.java
@@ -67,8 +67,8 @@
spannerInstance.createDatabase(SPANNER_DATABASE_ID, Collections.emptyList()).get();
createSchema();
databaseClient = createDatabaseClient();
- Lock.LockFactory lockFactory =
- new Lock.LockFactory() {
+ Lock.Factory lockFactory =
+ new Lock.Factory() {
@Override
public Lock create(String projectName, String refName) {
return new Lock(databaseClient, "", projectName, refName);
