Skip to content

Commit af79b50

Browse files
committed
Introduce IpDatabase internal to properly implement IpDatabaseProvider interface.
1 parent 26feb3b commit af79b50

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/geoip/IpDatabaseBridge.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,10 @@ public ProxyInternal(final IpDatabase delegate) {
3030
public String getDatabaseType() throws IOException {
3131
return toInternal().getDatabaseType();
3232
}
33+
34+
@Override
35+
public IpDatabase toInternal() {
36+
return this.internalDelegate;
37+
}
3338
}
3439
}

libs/logstash-bridge/src/main/java/org/elasticsearch/logstashbridge/geoip/IpDatabaseProviderBridge.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ default Boolean isValid(String name) {
2626
}
2727

2828
@FixForMultiProject(description = "What ProjectId should be resolved for multi-project case?")
29-
default IpDatabaseBridge getDatabase(String name) {
29+
default IpDatabaseBridge.ProxyInternal getDatabase(String name) {
3030
return new IpDatabaseBridge.ProxyInternal(toInternal().getDatabase(ProjectId.DEFAULT, name));
3131
}
3232

@@ -61,12 +61,12 @@ private AbstractExternal getIpDatabaseProviderBridge() {
6161

6262
@Override
6363
public Boolean isValid(ProjectId projectId, String name) {
64-
return IpDatabaseProviderBridge.AbstractExternal.this.toInternal().isValid(projectId, name);
64+
return IpDatabaseProviderBridge.AbstractExternal.this.isValid(name);
6565
}
6666

6767
@Override
6868
public IpDatabase getDatabase(ProjectId projectId, String name) {
69-
return IpDatabaseProviderBridge.AbstractExternal.this.toInternal().getDatabase(projectId, name);
69+
return IpDatabaseProviderBridge.AbstractExternal.this.getDatabase(name).toInternal();
7070
}
7171
}
7272
}

0 commit comments

Comments
 (0)