From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 8 Apr 2020 08:08:59 +0000 (+0200)
Subject: 🔥 Remove unnecessary imports
X-Git-Tag: v82^2~18
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=64740709990291688170ebd1f192af5eb9090618;p=Sone.git

🔥 Remove unnecessary imports
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java
index 88e33a0..398374a 100644
--- a/src/main/java/net/pterodactylus/sone/core/Options.java
+++ b/src/main/java/net/pterodactylus/sone/core/Options.java
@@ -23,8 +23,6 @@ import java.util.Map;
 
 import net.pterodactylus.sone.utils.Option;
 
-import com.google.common.base.Predicate;
-
 /**
  * Stores various options that influence Sone’s behaviour.
  */
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 670b2c8..fcbe1b5 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -43,8 +43,6 @@ import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertingEvent;
 import net.pterodactylus.sone.data.AlbumKt;
-import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.data.SoneKt;
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index e5e20d9..793d332 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
@@ -1,7 +1,5 @@
 package net.pterodactylus.sone.core;
 
-import static com.google.common.base.Optional.absent;
-import static com.google.common.base.Optional.of;
 import static com.google.common.base.Ticker.systemTicker;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
 
@@ -11,7 +9,6 @@ import net.pterodactylus.sone.data.Sone;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Objects;
-import com.google.common.base.Optional;
 import com.google.common.base.Ticker;
 
 /**
diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java
index b87ef4f..34246cb 100644
--- a/src/main/java/net/pterodactylus/sone/data/Profile.java
+++ b/src/main/java/net/pterodactylus/sone/data/Profile.java
@@ -19,7 +19,6 @@ package net.pterodactylus.sone.data;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Preconditions.checkState;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.util.ArrayList;
diff --git a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
index a197c46..f2f2ea6 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/SoneImpl.java
@@ -44,7 +44,6 @@ import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
-import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.SoneOptions;
 import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions;
diff --git a/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java
index 39a6a1e..3cb1d6b 100644
--- a/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java
+++ b/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java
@@ -17,8 +17,6 @@
 
 package net.pterodactylus.sone.fcp;
 
-import com.google.common.base.Optional;
-
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
index b8d4e6d..63bceb1 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Identity.java
@@ -17,13 +17,9 @@
 
 package net.pterodactylus.sone.freenet.wot;
 
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
 
-import com.google.common.base.Function;
-
 /**
  * Interface for web of trust identities, defining all functions that can be
  * performed on an identity. An identity is only a container for identity data
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 25c6dac..2d3e562 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -42,7 +42,6 @@ import com.google.common.annotations.*;
 import com.google.common.eventbus.*;
 import com.google.common.cache.*;
 import com.google.inject.*;
-import com.google.inject.Module;
 import com.google.inject.name.*;
 import kotlin.jvm.functions.*;
 
diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParserContext.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParserContext.java
index d3a1557..598765a 100644
--- a/src/main/java/net/pterodactylus/sone/text/SoneTextParserContext.java
+++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParserContext.java
@@ -18,7 +18,6 @@
 package net.pterodactylus.sone.text;
 
 import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.web.page.FreenetRequest;
 
 /**
  * {@link ParserContext} implementation for the {@link SoneTextParser}. It
diff --git a/src/main/java/net/pterodactylus/sone/utils/NumberParsers.java b/src/main/java/net/pterodactylus/sone/utils/NumberParsers.java
index 471fc26..d9091c0 100644
--- a/src/main/java/net/pterodactylus/sone/utils/NumberParsers.java
+++ b/src/main/java/net/pterodactylus/sone/utils/NumberParsers.java
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.utils;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.google.common.primitives.Ints;
diff --git a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
index b711ca8..24b04fa 100644
--- a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt
@@ -1,7 +1,6 @@
 package net.pterodactylus.sone.text
 
 import freenet.keys.*
-import freenet.support.*
 import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.data.impl.*
 import net.pterodactylus.sone.database.*
diff --git a/src/main/kotlin/net/pterodactylus/sone/utils/DefaultOption.kt b/src/main/kotlin/net/pterodactylus/sone/utils/DefaultOption.kt
index 5f75e12..fd4215f 100644
--- a/src/main/kotlin/net/pterodactylus/sone/utils/DefaultOption.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/utils/DefaultOption.kt
@@ -1,7 +1,5 @@
 package net.pterodactylus.sone.utils
 
-import java.util.function.Predicate
-
 /**
  * Basic implementation of an [Option].
  *
diff --git a/src/test/java/net/pterodactylus/sone/core/WebOfTrustUpdaterTest.java b/src/test/java/net/pterodactylus/sone/core/WebOfTrustUpdaterTest.java
index d7d9b48..5f8d93d 100644
--- a/src/test/java/net/pterodactylus/sone/core/WebOfTrustUpdaterTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/WebOfTrustUpdaterTest.java
@@ -6,7 +6,6 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.CountDownLatch;
@@ -17,7 +16,6 @@ import net.pterodactylus.sone.core.WebOfTrustUpdaterImpl.SetPropertyJob;
 import net.pterodactylus.sone.core.WebOfTrustUpdaterImpl.WebOfTrustContextUpdateJob;
 import net.pterodactylus.sone.core.WebOfTrustUpdaterImpl.WebOfTrustUpdateJob;
 import net.pterodactylus.sone.freenet.plugin.PluginException;
-import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 
diff --git a/src/test/java/net/pterodactylus/sone/test/Matchers.java b/src/test/java/net/pterodactylus/sone/test/Matchers.java
index 65fb3a6..bd571e7 100644
--- a/src/test/java/net/pterodactylus/sone/test/Matchers.java
+++ b/src/test/java/net/pterodactylus/sone/test/Matchers.java
@@ -29,7 +29,6 @@ import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.PostReply;
 
-import com.google.common.base.Optional;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeDiagnosingMatcher;
diff --git a/src/test/java/net/pterodactylus/sone/text/TextFilterTest.java b/src/test/java/net/pterodactylus/sone/text/TextFilterTest.java
index 35623a7..0319db9 100644
--- a/src/test/java/net/pterodactylus/sone/text/TextFilterTest.java
+++ b/src/test/java/net/pterodactylus/sone/text/TextFilterTest.java
@@ -3,8 +3,6 @@ package net.pterodactylus.sone.text;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-import org.hamcrest.MatcherAssert;
-import org.hamcrest.Matchers;
 import org.junit.Test;
 
 /**
diff --git a/src/test/kotlin/net/pterodactylus/sone/core/ConfigurationSoneParserTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/ConfigurationSoneParserTest.kt
index 90e3fa6..29ade5f 100644
--- a/src/test/kotlin/net/pterodactylus/sone/core/ConfigurationSoneParserTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/core/ConfigurationSoneParserTest.kt
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.core
 
-import com.google.common.base.Optional.*
 import net.pterodactylus.sone.core.ConfigurationSoneParser.*
 import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.database.*
diff --git a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
index cfbda94..fabdd09 100644
--- a/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/fcp/CreatePostCommandTest.kt
@@ -1,7 +1,5 @@
 package net.pterodactylus.sone.fcp
 
-import com.google.common.base.Optional.absent
-import com.google.common.base.Optional.of
 import net.pterodactylus.sone.core.Core
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.test.mock
diff --git a/src/test/kotlin/net/pterodactylus/sone/template/ProfileAccessorTest.kt b/src/test/kotlin/net/pterodactylus/sone/template/ProfileAccessorTest.kt
index 4513ce0..53d473e 100644
--- a/src/test/kotlin/net/pterodactylus/sone/template/ProfileAccessorTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/template/ProfileAccessorTest.kt
@@ -1,7 +1,6 @@
 package net.pterodactylus.sone.template
 
 import net.pterodactylus.sone.core.Core
-import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions
diff --git a/src/test/kotlin/net/pterodactylus/sone/template/UnknownDateFilterTest.kt b/src/test/kotlin/net/pterodactylus/sone/template/UnknownDateFilterTest.kt
index b1c2cc5..96a3cd5 100644
--- a/src/test/kotlin/net/pterodactylus/sone/template/UnknownDateFilterTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/template/UnknownDateFilterTest.kt
@@ -1,7 +1,6 @@
 package net.pterodactylus.sone.template
 
 import net.pterodactylus.sone.freenet.*
-import net.pterodactylus.sone.test.*
 import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
 import org.junit.*
diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
index 85ed9e7..1f479f6 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Matchers.kt
@@ -5,7 +5,6 @@ import net.pterodactylus.sone.freenet.wot.*
 import net.pterodactylus.sone.utils.*
 import net.pterodactylus.util.web.*
 import org.hamcrest.*
-import org.hamcrest.Matchers
 import org.hamcrest.Matchers.*
 
 /**
diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
index d556f6b..a25fa5d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/test/Mocks.kt
@@ -23,7 +23,6 @@ import freenet.keys.*
 import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.data.SoneOptions.*
 import net.pterodactylus.sone.data.impl.*
-import net.pterodactylus.sone.text.*
 import net.pterodactylus.sone.utils.*
 
 val remoteSone1 = createRemoteSone()
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
index c931aaf..9c0860c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
@@ -12,7 +12,6 @@ import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.template.*
 import net.pterodactylus.sone.test.*
 import net.pterodactylus.sone.text.*
-import net.pterodactylus.sone.web.notification.*
 import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.notify.*
 import net.pterodactylus.util.template.*
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
index b79e6df..e5f1c82 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.web.ajax
 
-import com.google.common.base.Optional
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.getInstance
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
index e63bb8a..08b8f45 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
@@ -1,7 +1,5 @@
 package net.pterodactylus.sone.web.ajax
 
-import net.pterodactylus.sone.data.Album
-import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.data.impl.*
 import net.pterodactylus.sone.template.ParserFilter
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetRequestTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetRequestTest.kt
index ce2d7a9..1e3caab 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetRequestTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetRequestTest.kt
@@ -2,7 +2,6 @@ package net.pterodactylus.sone.web.page
 
 import freenet.clients.http.*
 import freenet.support.api.*
-import net.pterodactylus.sone.test.*
 import net.pterodactylus.util.web.*
 import org.hamcrest.MatcherAssert.*
 import org.hamcrest.Matchers.*
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/page/SoneRequestTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/page/SoneRequestTest.kt
index 89b1d70..0ec86db 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/page/SoneRequestTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/page/SoneRequestTest.kt
@@ -1,7 +1,6 @@
 package net.pterodactylus.sone.web.page
 
 import freenet.clients.http.*
-import freenet.l10n.*
 import freenet.support.api.*
 import net.pterodactylus.sone.core.*
 import net.pterodactylus.sone.test.*
diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
index 6212c90..a6f5d9d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
@@ -1,9 +1,7 @@
 package net.pterodactylus.sone.web.pages
 
-import com.google.common.base.Optional.*
 import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.test.*
-import net.pterodactylus.sone.utils.*
 import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.web.Method.*