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
4474e46
..
2746d7b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/
src/main/java/net/pterodactylus/sone/core/Core.java
@@
-99,7
+99,6
@@
import net.pterodactylus.util.service.AbstractService;
import net.pterodactylus.util.thread.NamedThreadFactory;
import com.google.common.annotations.VisibleForTesting;
import net.pterodactylus.util.thread.NamedThreadFactory;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.HashMultimap;
import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.HashMultimap;
@@
-109,6
+108,7
@@
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import com.google.inject.Singleton;
+import kotlin.jvm.functions.Function1;
/**
* The Sone core.
/**
* The Sone core.
@@
-317,14
+317,16
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
/**
* {@inheritDocs}
*/
/**
* {@inheritDocs}
*/
+ @Nonnull
@Override
public Collection<Sone> getSones() {
return database.getSones();
}
@Override
public Collection<Sone> getSones() {
return database.getSones();
}
+ @Nonnull
@Override
@Override
- public Function
<String, Optional<Sone>> s
oneLoader() {
- return database.
s
oneLoader();
+ public Function
1<String, Sone> getS
oneLoader() {
+ return database.
getS
oneLoader();
}
/**
}
/**
@@
-337,7
+339,8
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* Sone
*/
@Override
* Sone
*/
@Override
- public Optional<Sone> getSone(String id) {
+ @Nullable
+ public Sone getSone(@Nonnull String id) {
return database.getSone(id);
}
return database.getSone(id);
}
@@
-357,9
+360,9
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* @return The Sone with the given ID, or {@code null}
*/
public Sone getLocalSone(String id) {
* @return The Sone with the given ID, or {@code null}
*/
public Sone getLocalSone(String id) {
-
Optional<Sone>
sone = database.getSone(id);
- if (
sone.isPresent() && sone.get()
.isLocal()) {
- return sone
.get()
;
+
Sone
sone = database.getSone(id);
+ if (
(sone != null) && sone
.isLocal()) {
+ return sone;
}
return null;
}
}
return null;
}
@@
-381,7
+384,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* @return The Sone with the given ID
*/
public Sone getRemoteSone(String id) {
* @return The Sone with the given ID
*/
public Sone getRemoteSone(String id) {
- return database.getSone(id)
.orNull()
;
+ return database.getSone(id);
}
/**
}
/**
@@
-419,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);
}
@@
-456,8
+457,9
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
/**
* {@inheritDoc}
*/
/**
* {@inheritDoc}
*/
+ @Nullable
@Override
@Override
- public
Optional<PostReply>
getPostReply(String replyId) {
+ public
PostReply
getPostReply(String replyId) {
return database.getPostReply(replyId);
}
return database.getPostReply(replyId);
}
@@
-539,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() {
@@
-553,6
+555,7
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* The ID of the image
* @return The image with the given ID
*/
* The ID of the image
* @return The image with the given ID
*/
+ @Nullable
public Image getImage(String imageId) {
return getImage(imageId, true);
}
public Image getImage(String imageId) {
return getImage(imageId, true);
}
@@
-569,10
+572,11
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* @return The image with the given ID, or {@code null} if none exists and
* none was created
*/
* @return The image with the given ID, or {@code null} if none exists and
* none was created
*/
+ @Nullable
public Image getImage(String imageId, boolean create) {
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;
@@
-694,12
+698,12
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
}
String property = fromNullable(identity.getProperty("Sone.LatestEdition")).or("0");
long latestEdition = fromNullable(tryParse(property)).or(0L);
}
String property = fromNullable(identity.getProperty("Sone.LatestEdition")).or("0");
long latestEdition = fromNullable(tryParse(property)).or(0L);
-
Optional<Sone>
existingSone = getSone(identity.getId());
- if (
existingSone.isPresent() && existingSone.get()
.isLocal()) {
- return existingSone
.get()
;
+
Sone
existingSone = getSone(identity.getId());
+ if (
(existingSone != null )&& existingSone
.isLocal()) {
+ return existingSone;
}
}
- boolean newSone =
!existingSone.isPresent()
;
- Sone sone = !newSone ? existingSone
.get()
: database.newSoneBuilder().from(identity).build();
+ boolean newSone =
existingSone == null
;
+ Sone sone = !newSone ? existingSone : database.newSoneBuilder().from(identity).build();
sone.setLatestEdition(latestEdition);
if (newSone) {
synchronized (knownSones) {
sone.setLatestEdition(latestEdition);
if (newSone) {
synchronized (knownSones) {
@@
-737,16
+741,16
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
if (!soneFollowingTimes.containsKey(soneId)) {
long now = System.currentTimeMillis();
soneFollowingTimes.put(soneId, now);
if (!soneFollowingTimes.containsKey(soneId)) {
long now = System.currentTimeMillis();
soneFollowingTimes.put(soneId, now);
-
Optional<Sone>
followedSone = getSone(soneId);
- if (
!followedSone.isPresent()
) {
+
Sone
followedSone = getSone(soneId);
+ if (
followedSone == null
) {
return;
}
return;
}
- for (Post post : followedSone.get
().get
Posts()) {
+ for (Post post : followedSone.getPosts()) {
if (post.getTime() < now) {
markPostKnown(post);
}
}
if (post.getTime() < now) {
markPostKnown(post);
}
}
- for (PostReply reply : followedSone.get
().get
Replies()) {
+ for (PostReply reply : followedSone.getReplies()) {
if (reply.getTime() < now) {
markReplyKnown(reply);
}
if (reply.getTime() < now) {
markReplyKnown(reply);
}
@@
-871,20
+875,20
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
* of the age of the given Sone
*/
public void updateSone(final Sone sone, boolean soneRescueMode) {
* of the age of the given Sone
*/
public void updateSone(final Sone sone, boolean soneRescueMode) {
-
Optional<Sone>
storedSone = getSone(sone.getId());
- if (storedSone
.isPresent()
) {
- if (!soneRescueMode && !(sone.getTime() > storedSone.get
().get
Time())) {
+
Sone
storedSone = getSone(sone.getId());
+ if (storedSone
!= null
) {
+ if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
return;
}
List<Object> events =
logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
return;
}
List<Object> events =
- collectEventsForChangesInSone(storedSone
.get()
, sone);
+ collectEventsForChangesInSone(storedSone, sone);
database.storeSone(sone);
for (Object event : events) {
eventBus.post(event);
}
database.storeSone(sone);
for (Object event : events) {
eventBus.post(event);
}
- sone.setOptions(storedSone.get
().get
Options());
- sone.setKnown(storedSone.
get().
isKnown());
+ sone.setOptions(storedSone.getOptions());
+ sone.setKnown(storedSone.isKnown());
sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
if (sone.isLocal()) {
touchConfiguration();
sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
if (sone.isLocal()) {
touchConfiguration();
@@
-1730,19
+1734,19
@@
public class Core extends AbstractService implements SoneProvider, PostProvider,
return;
}
}
return;
}
}
-
Optional<Sone>
sone = getSone(identity.getId());
- if (
!sone.isPresent()
) {
+
Sone
sone = getSone(identity.getId());
+ if (
sone == null
) {
/* TODO - we don’t have the Sone anymore. should this happen? */
return;
}
/* TODO - we don’t have the Sone anymore. should this happen? */
return;
}
- for (PostReply postReply : sone.get
().get
Replies()) {
+ for (PostReply postReply : sone.getReplies()) {
eventBus.post(new PostReplyRemovedEvent(postReply));
}
eventBus.post(new PostReplyRemovedEvent(postReply));
}
- for (Post post : sone.get
().get
Posts()) {
+ for (Post post : sone.getPosts()) {
eventBus.post(new PostRemovedEvent(post));
}
eventBus.post(new PostRemovedEvent(post));
}
- eventBus.post(new SoneRemovedEvent(sone
.get()
));
- database.removeSone(sone
.get()
);
+ eventBus.post(new SoneRemovedEvent(sone));
+ database.removeSone(sone);
}
/**
}
/**