projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-0.8.8'
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
text
/
SoneTextParser.java
diff --git
a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
index
a093e46
..
0b1585a
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
+++ b/
src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
@@
-26,12
+26,16
@@
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import net.pterodactylus.sone.core.PostProvider;
-import net.pterodactylus.sone.core.SoneProvider;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.SoneImpl;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.SoneProvider;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.logging.Logging;
+
+import com.google.common.base.Optional;
+
import freenet.keys.FreenetURI;
/**
import freenet.keys.FreenetURI;
/**
@@
-239,15
+243,15
@@
public class SoneTextParser implements Parser<SoneTextParserContext> {
if (linkType == LinkType.SONE) {
if (line.length() >= (7 + 43)) {
String soneId = line.substring(7, 50);
if (linkType == LinkType.SONE) {
if (line.length() >= (7 + 43)) {
String soneId = line.substring(7, 50);
-
Sone sone = soneProvider.getSone(soneId, false
);
- if (
sone == null
) {
+
Optional<Sone> sone = soneProvider.getSone(soneId
);
+ if (
!sone.isPresent()
) {
/*
* don’t use create=true above, we don’t want
* the empty shell.
*/
/*
* don’t use create=true above, we don’t want
* the empty shell.
*/
- sone =
new Sone(soneId, false
);
+ sone =
Optional.<Sone>of(new SoneImpl(soneId, false)
);
}
}
- parts.add(new SonePart(sone));
+ parts.add(new SonePart(sone
.get()
));
line = line.substring(50);
} else {
parts.add(new PlainTextPart(line));
line = line.substring(50);
} else {
parts.add(new PlainTextPart(line));
@@
-258,9
+262,9
@@
public class SoneTextParser implements Parser<SoneTextParserContext> {
if (linkType == LinkType.POST) {
if (line.length() >= (7 + 36)) {
String postId = line.substring(7, 43);
if (linkType == LinkType.POST) {
if (line.length() >= (7 + 36)) {
String postId = line.substring(7, 43);
-
Post
post = postProvider.getPost(postId);
- if (
(post != null) && (post.getSone() != null
)) {
- parts.add(new PostPart(post));
+
Optional<Post>
post = postProvider.getPost(postId);
+ if (
post.isPresent(
)) {
+ parts.add(new PostPart(post
.get()
));
} else {
parts.add(new PlainTextPart(line.substring(0, 43)));
}
} else {
parts.add(new PlainTextPart(line.substring(0, 43)));
}