X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=79a6259f0b09286e164e7f11dce74629ccbadc46;hp=3c32f7f3dea049221ef21475593ee2f97f1969de;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hpb=6f1f26e3998cfef155b0cf59152827accea70d30 diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java index 3c32f7f..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 @@ -72,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 { @@ -280,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; @@ -299,7 +295,7 @@ 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()); @@ -307,8 +303,8 @@ public class SoneInserter extends AbstractService { soneProperties.put("profile", sone.getProfile()); 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); } @@ -332,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( @@ -356,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;