/*
- * Sone - SoneInserter.java - Copyright © 2010–2013 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
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;
/**
* A Sone inserter is responsible for inserting a Sone if it has changed.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class SoneInserter extends AbstractService {
this(core, eventBus, freenetInterface, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
@Override
public boolean isLocked() {
- final Optional<Sone> 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> 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);
}
* @return The fingerprint of the last insert
*/
public String getLastInsertFingerprint() {
- return soneModificationDetector.getOriginalFingerprint();
+ return soneModificationDetector.getLastInsertFingerprint();
}
/**
sleep(delay);
if (soneModificationDetector.isEligibleForInsert()) {
- Optional<Sone> 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()));
* 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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
@VisibleForTesting
class InsertInformation implements Closeable {
/** All properties of the Sone, copied for thread safety. */
- private final Map<String, Object> soneProperties = new HashMap<String, Object>();
+ private final Map<String, Object> soneProperties = new HashMap<>();
private final String fingerprint;
private final ManifestCreator manifestCreator;
*/
public InsertInformation(Sone sone) {
this.fingerprint = sone.getFingerprint();
- Map<String, Object> soneProperties = new HashMap<String, Object>();
+ Map<String, Object> 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<String>(sone.getLikedPostIds()));
- soneProperties.put("likedReplyIds", new HashSet<String>(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);
}
* @return The manifest entries for the Sone insert
*/
public HashMap<String, Object> generateManifestEntries() {
- HashMap<String, Object> manifestEntries = new HashMap<String, Object>();
+ HashMap<String, Object> manifestEntries = new HashMap<>();
/* first, create an index.html. */
manifestEntries.put("index.html", manifestCreator.createManifestElement(
/**
* Creates manifest elements for an insert by rendering a template.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
@VisibleForTesting
static class ManifestCreator implements Closeable {
private final Core core;
private final Map<String, Object> soneProperties;
- private final Set<Bucket> buckets = new HashSet<Bucket>();
+ private final Set<Bucket> buckets = new HashSet<>();
ManifestCreator(Core core, Map<String, Object> soneProperties) {
this.core = core;
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);