// ALBUMPROVDER METHODS
//
+ @Nullable
@Override
- public Optional<Album> getAlbum(String albumId) {
+ public Album getAlbum(@Nonnull String albumId) {
lock.readLock().lock();
try {
- return fromNullable(allAlbums.get(albumId));
+ return allAlbums.get(albumId);
} finally {
lock.readLock().unlock();
}
// IMAGEPROVIDER METHODS
//
+ @Nullable
@Override
- public Optional<Image> getImage(String imageId) {
+ public Image getImage(@Nonnull String imageId) {
lock.readLock().lock();
try {
- return fromNullable(allImages.get(imageId));
+ return allImages.get(imageId);
} finally {
lock.readLock().unlock();
}