X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=79a6259f0b09286e164e7f11dce74629ccbadc46;hb=b9fc06f5bf20b1c0d5e7c5e9b49e87581a843ee7;hp=46558ab8734d78a87be6139f6bd9b3ec38ee6d1c;hpb=c4ae226ec5052116cefc542ae2017036a7bc6332;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 46558ab..79a6259 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -1,5 +1,5 @@
/*
- * Sone - SoneInserter.java - Copyright © 2010â2016 David Roden
+ * Sone - SoneInserter.java - Copyright © 2010â2019 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -59,7 +59,6 @@ import net.pterodactylus.util.template.XmlFilter;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Charsets;
-import com.google.common.base.Optional;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Ordering;
import com.google.common.eventbus.EventBus;
@@ -73,8 +72,6 @@ import freenet.support.io.ArrayBucket;
/**
* A Sone inserter is responsible for inserting a Sone if it has changed.
- *
- * @author David âBombeâ Roden
*/
public class SoneInserter extends AbstractService {
@@ -125,20 +122,20 @@ public class SoneInserter extends AbstractService {
this(core, eventBus, freenetInterface, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
@Override
public boolean isLocked() {
- final Optional sone = core.getSone(soneId);
- if (!sone.isPresent()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
return false;
}
- return core.isLocked(sone.get());
+ return core.isLocked(sone);
}
@Override
public String getFingerprint() {
- final Optional sone = core.getSone(soneId);
- if (!sone.isPresent()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
return null;
}
- return sone.get().getFingerprint();
+ return sone.getFingerprint();
}
}, insertionDelay), 1000);
}
@@ -219,12 +216,11 @@ public class SoneInserter extends AbstractService {
sleep(delay);
if (soneModificationDetector.isEligibleForInsert()) {
- Optional soneOptional = core.getSone(soneId);
- if (!soneOptional.isPresent()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
logger.log(Level.WARNING, format("Sone %s has disappeared, exiting inserter.", soneId));
return;
}
- Sone sone = soneOptional.get();
InsertInformation insertInformation = new InsertInformation(sone);
logger.log(Level.INFO, String.format("Inserting Sone â%sââ¦", sone.getName()));
@@ -282,14 +278,12 @@ public class SoneInserter extends AbstractService {
* Container for information that are required to insert a Sone. This
* container merely exists to copy all relevant data without holding a lock
* on the {@link Sone} object for too long.
- *
- * @author David âBombeâ Roden
*/
@VisibleForTesting
class InsertInformation implements Closeable {
/** All properties of the Sone, copied for thread safety. */
- private final Map soneProperties = new HashMap();
+ private final Map soneProperties = new HashMap<>();
private final String fingerprint;
private final ManifestCreator manifestCreator;
@@ -301,16 +295,16 @@ public class SoneInserter extends AbstractService {
*/
public InsertInformation(Sone sone) {
this.fingerprint = sone.getFingerprint();
- Map soneProperties = new HashMap();
+ Map soneProperties = new HashMap<>();
soneProperties.put("id", sone.getId());
soneProperties.put("name", sone.getName());
soneProperties.put("time", currentTimeMillis());
soneProperties.put("requestUri", sone.getRequestUri());
soneProperties.put("profile", sone.getProfile());
- soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
+ soneProperties.put("posts", Ordering.from(Post.NEWEST_FIRST).sortedCopy(sone.getPosts()));
soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
- soneProperties.put("likedPostIds", new HashSet(sone.getLikedPostIds()));
- soneProperties.put("likedReplyIds", new HashSet(sone.getLikedReplyIds()));
+ soneProperties.put("likedPostIds", new HashSet<>(sone.getLikedPostIds()));
+ soneProperties.put("likedReplyIds", new HashSet<>(sone.getLikedReplyIds()));
soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
manifestCreator = new ManifestCreator(core, soneProperties);
}
@@ -334,7 +328,7 @@ public class SoneInserter extends AbstractService {
* @return The manifest entries for the Sone insert
*/
public HashMap generateManifestEntries() {
- HashMap manifestEntries = new HashMap();
+ HashMap manifestEntries = new HashMap<>();
/* first, create an index.html. */
manifestEntries.put("index.html", manifestCreator.createManifestElement(
@@ -358,15 +352,13 @@ public class SoneInserter extends AbstractService {
/**
* Creates manifest elements for an insert by rendering a template.
- *
- * @author David âBombeâ Roden
*/
@VisibleForTesting
static class ManifestCreator implements Closeable {
private final Core core;
private final Map soneProperties;
- private final Set buckets = new HashSet();
+ private final Set buckets = new HashSet<>();
ManifestCreator(Core core, Map soneProperties) {
this.core = core;
@@ -393,7 +385,7 @@ public class SoneInserter extends AbstractService {
templateContext.set("core", core);
templateContext.set("currentSone", soneProperties);
templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
- templateContext.set("version", SonePlugin.VERSION);
+ templateContext.set("version", SonePlugin.getPluginVersion());
StringWriter writer = new StringWriter();
try {
template.render(templateContext, writer);