projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Return nullable Post instead of Optional
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
core
/
Core.java
diff --git
a/src/main/java/net/pterodactylus/sone/core/Core.java
b/src/main/java/net/pterodactylus/sone/core/Core.java
index
508d167
..
2746d7b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-422,11
+422,9
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
return database.newPostBuilder();
}
return database.newPostBuilder();
}
- /**
- * {@inheritDoc}
- */
+ @Nullable
@Override
@Override
- public
Optional<Post> getPost(
String postId) {
+ public
Post getPost(@Nonnull
String postId) {
return database.getPost(postId);
}
return database.getPost(postId);
}
@@
-543,7
+541,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
*/
@Nullable
public Album getAlbum(@Nonnull String albumId) {
*/
@Nullable
public Album getAlbum(@Nonnull String albumId) {
- return database.getAlbum(albumId)
.orNull()
;
+ return database.getAlbum(albumId);
}
public ImageBuilder imageBuilder() {
}
public ImageBuilder imageBuilder() {
@@
-576,9
+574,9
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
*/
@Nullable
public Image getImage(String imageId, boolean create) {
*/
@Nullable
public Image getImage(String imageId, boolean create) {
-
Optional<Image>
image = database.getImage(imageId);
- if (image
.isPresent()
) {
- return image
.get()
;
+
Image
image = database.getImage(imageId);
+ if (image
!= null
) {
+ return image;
}
if (!create) {
return null;
}
if (!create) {
return null;