@Override
public Optional<O> getSchemaSource(String moduleName, Optional<String> revision) {
- return getSchemaSourceImpl(moduleName, revision, defaultDelegate);
+ checkNotNull(moduleName, "Module name should not be null.");
+ checkNotNull(revision, "Revision should not be null");
+ return getSchemaSource(SourceIdentifier.create(moduleName, revision));
+ }
+
+ @Override
+ public Optional<O> getSchemaSource(SourceIdentifier sourceIdentifier) {
+ return getSchemaSourceImpl(sourceIdentifier, defaultDelegate);
}
- private Optional<O> getSchemaSourceImpl(String moduleName, Optional<String> revision,
+ protected final Optional<O> getSchemaSourceImpl(SourceIdentifier identifier,
SchemaSourceProvider<I> delegate) {
- checkNotNull(moduleName, "Module name should not be null.");
- checkNotNull(revision, "Revision should not be null");
+ checkNotNull(identifier, "Source identifier name should not be null.");
- Optional<O> cached = getCachedSchemaSource(moduleName, revision);
+ Optional<O> cached = getCachedSchemaSource(identifier);
if (cached.isPresent()) {
return cached;
}
- Optional<I> live = delegate.getSchemaSource(moduleName, revision);
- return cacheSchemaSource(moduleName, revision, live);
+ Optional<I> live = delegate.getSchemaSource(identifier);
+ return cacheSchemaSource(identifier, live);
}
- abstract protected Optional<O> cacheSchemaSource(String moduleName, Optional<String> revision, Optional<I> stream);
+ abstract protected Optional<O> cacheSchemaSource(SourceIdentifier identifier, Optional<I> stream);
- abstract protected Optional<O> getCachedSchemaSource(String moduleName, Optional<String> revision);
+ abstract protected Optional<O> getCachedSchemaSource(SourceIdentifier identifier);
public SchemaSourceProvider<I> getDelegate() {
return defaultDelegate;
return new SchemaSourceProviderInstance(delegate);
}
- private class SchemaSourceProviderInstance implements SchemaSourceProvider<O>, Delegator<SchemaSourceProvider<I>> {
+ private class SchemaSourceProviderInstance implements //
+ SchemaSourceProvider<O>,
+ Delegator<SchemaSourceProvider<I>> {
private final SchemaSourceProvider<I> delegate;
@Override
public Optional<O> getSchemaSource(String moduleName, Optional<String> revision) {
- return getSchemaSourceImpl(moduleName, revision, getDelegate());
+ return getSchemaSource(SourceIdentifier.create(moduleName, revision));
}
@Override
public SchemaSourceProvider<I> getDelegate() {
return delegate;
}
+
+ @Override
+ public Optional<O> getSchemaSource(SourceIdentifier sourceIdentifier) {
+ return getSchemaSourceImpl(sourceIdentifier, getDelegate());
+ }
}
}