From 1cb03c9055e7f8a8cac2fda669977b812319d64d Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 2 Oct 2024 16:39:10 +0200 Subject: [PATCH] =?utf8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20a=20whole=20bunch?= =?utf8?q?=20of=20dependencies?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * Kotlin to 2.0.20. * JUnit to 4.13.2. * Mockito to 4.11.0. * Hamcrest to 3.0. * Jsoup to 1.18.1. * javax.activation to jakarta.activation 2.1.3. * jsr305 from findBugs to spotbugs 4.8.6. * Codahale Metrics to 4.2.27. * Jackson to 2.18.0. * Guava to 33.3.1. * Guice to 7.0.0. --- build.gradle | 26 +++++++++++----------- .../pterodactylus/sone/core/FreenetInterface.java | 2 +- .../net/pterodactylus/sone/core/ImageInserter.java | 2 +- .../sone/core/SoneDownloaderImpl.java | 2 +- .../net/pterodactylus/sone/core/SoneParser.java | 2 +- .../net/pterodactylus/sone/fcp/FcpInterface.java | 2 +- .../sone/notify/DefaultPostVisibilityFilter.java | 2 +- .../sone/notify/DefaultReplyVisibilityFilter.java | 4 ++-- .../sone/template/IdentityAccessor.java | 4 ++-- .../sone/core/DefaultElementLoader.kt | 7 +++--- .../net/pterodactylus/sone/core/UpdateChecker.kt | 2 +- .../sone/core/UpdatedSoneProcessor.kt | 2 +- .../sone/database/memory/MemoryDatabase.kt | 4 ++-- .../sone/freenet/plugin/FredPluginConnector.kt | 2 +- .../sone/freenet/plugin/PluginRespiratorFacade.kt | 2 +- .../sone/freenet/wot/WebOfTrustPinger.kt | 2 +- .../net/pterodactylus/sone/main/FreenetModule.kt | 4 ++-- .../net/pterodactylus/sone/main/SoneModule.kt | 4 ++-- .../net/pterodactylus/sone/main/TickerShutdown.kt | 2 +- .../sone/notify/DefaultListNotificationFilter.kt | 4 ++-- .../pterodactylus/sone/notify/ListNotification.kt | 5 ++--- .../pterodactylus/sone/template/ParserFilter.kt | 4 ++-- .../pterodactylus/sone/text/SoneMentionDetector.kt | 2 +- .../net/pterodactylus/sone/text/SoneTextParser.kt | 2 +- .../kotlin/net/pterodactylus/sone/web/AllPages.kt | 2 +- .../sone/web/FreenetSessionProvider.kt | 2 +- .../net/pterodactylus/sone/web/NewElements.kt | 4 ++-- .../pterodactylus/sone/web/PageToadletRegistry.kt | 2 +- .../pterodactylus/sone/web/WebInterfaceModule.kt | 4 ++-- .../sone/web/ajax/BookmarkAjaxPage.kt | 2 +- .../sone/web/ajax/CreatePostAjaxPage.kt | 2 +- .../sone/web/ajax/CreateReplyAjaxPage.kt | 2 +- .../sone/web/ajax/DeletePostAjaxPage.kt | 2 +- .../sone/web/ajax/DeleteProfileFieldAjaxPage.kt | 2 +- .../sone/web/ajax/DeleteReplyAjaxPage.kt | 2 +- .../sone/web/ajax/DismissNotificationAjaxPage.kt | 2 +- .../sone/web/ajax/EditAlbumAjaxPage.kt | 2 +- .../sone/web/ajax/EditImageAjaxPage.kt | 2 +- .../sone/web/ajax/EditProfileFieldAjaxPage.kt | 2 +- .../sone/web/ajax/FollowSoneAjaxPage.kt | 2 +- .../sone/web/ajax/GetLikesAjaxPage.kt | 2 +- .../sone/web/ajax/GetLinkedElementAjaxPage.kt | 2 +- .../sone/web/ajax/GetNotificationsAjaxPage.kt | 2 +- .../pterodactylus/sone/web/ajax/GetPostAjaxPage.kt | 2 +- .../sone/web/ajax/GetReplyAjaxPage.kt | 2 +- .../sone/web/ajax/GetStatusAjaxPage.kt | 2 +- .../sone/web/ajax/GetTimesAjaxPage.kt | 5 +++-- .../sone/web/ajax/GetTranslationAjaxPage.kt | 2 +- .../pterodactylus/sone/web/ajax/LikeAjaxPage.kt | 2 +- .../sone/web/ajax/LockSoneAjaxPage.kt | 2 +- .../sone/web/ajax/MarkAsKnownAjaxPage.kt | 2 +- .../sone/web/ajax/MoveProfileFieldAjaxPage.kt | 2 +- .../sone/web/ajax/UnbookmarkAjaxPage.kt | 2 +- .../sone/web/ajax/UnfollowSoneAjaxPage.kt | 2 +- .../pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt | 2 +- .../sone/web/ajax/UnlockSoneAjaxPage.kt | 2 +- .../sone/web/notification/ConfigNotReadHandler.kt | 2 +- .../sone/web/notification/FirstStartHandler.kt | 2 +- .../sone/web/notification/ImageInsertHandler.kt | 2 +- .../sone/web/notification/LocalPostHandler.kt | 4 ++-- .../sone/web/notification/LocalReplyHandler.kt | 2 +- .../MarkPostKnownDuringFirstStartHandler.kt | 2 +- .../MarkPostReplyKnownDuringFirstStartHandler.kt | 2 +- .../sone/web/notification/NewRemotePostHandler.kt | 2 +- .../sone/web/notification/NewSoneHandler.kt | 2 +- .../sone/web/notification/NewVersionHandler.kt | 2 +- .../sone/web/notification/NotificationHandler.kt | 2 +- .../web/notification/NotificationHandlerModule.kt | 4 ++-- .../web/notification/RemotePostReplyHandler.kt | 2 +- .../sone/web/notification/SoneInsertHandler.kt | 2 +- .../sone/web/notification/SoneLockedHandler.kt | 2 +- .../web/notification/SoneLockedOnStartupHandler.kt | 2 +- .../sone/web/notification/SoneMentionedHandler.kt | 2 +- .../sone/web/notification/StartupHandler.kt | 2 +- .../sone/web/notification/WebOfTrustHandler.kt | 2 +- .../sone/web/page/PageToadletFactory.kt | 2 +- .../sone/web/page/TemplateRenderer.kt | 2 +- .../net/pterodactylus/sone/web/pages/AboutPage.kt | 2 +- .../pterodactylus/sone/web/pages/BookmarkPage.kt | 2 +- .../pterodactylus/sone/web/pages/BookmarksPage.kt | 2 +- .../sone/web/pages/CreateAlbumPage.kt | 2 +- .../pterodactylus/sone/web/pages/CreatePostPage.kt | 2 +- .../sone/web/pages/CreateReplyPage.kt | 2 +- .../pterodactylus/sone/web/pages/CreateSonePage.kt | 2 +- .../net/pterodactylus/sone/web/pages/DebugPage.kt | 2 +- .../sone/web/pages/DeleteAlbumPage.kt | 2 +- .../sone/web/pages/DeleteImagePage.kt | 2 +- .../pterodactylus/sone/web/pages/DeletePostPage.kt | 2 +- .../sone/web/pages/DeleteProfileFieldPage.kt | 2 +- .../sone/web/pages/DeleteReplyPage.kt | 2 +- .../pterodactylus/sone/web/pages/DeleteSonePage.kt | 2 +- .../sone/web/pages/DismissNotificationPage.kt | 2 +- .../pterodactylus/sone/web/pages/EditAlbumPage.kt | 2 +- .../pterodactylus/sone/web/pages/EditImagePage.kt | 2 +- .../sone/web/pages/EditProfileFieldPage.kt | 2 +- .../sone/web/pages/EditProfilePage.kt | 2 +- .../pterodactylus/sone/web/pages/FollowSonePage.kt | 2 +- .../pterodactylus/sone/web/pages/GetImagePage.kt | 2 +- .../sone/web/pages/ImageBrowserPage.kt | 2 +- .../net/pterodactylus/sone/web/pages/IndexPage.kt | 2 +- .../pterodactylus/sone/web/pages/KnownSonesPage.kt | 2 +- .../net/pterodactylus/sone/web/pages/LikePage.kt | 2 +- .../pterodactylus/sone/web/pages/LockSonePage.kt | 2 +- .../net/pterodactylus/sone/web/pages/LoginPage.kt | 2 +- .../net/pterodactylus/sone/web/pages/LogoutPage.kt | 2 +- .../sone/web/pages/MarkAsKnownPage.kt | 2 +- .../pterodactylus/sone/web/pages/MetricsPage.kt | 2 +- .../net/pterodactylus/sone/web/pages/NewPage.kt | 2 +- .../pterodactylus/sone/web/pages/OptionsPage.kt | 2 +- .../pterodactylus/sone/web/pages/ReloadingPage.kt | 2 +- .../net/pterodactylus/sone/web/pages/RescuePage.kt | 2 +- .../net/pterodactylus/sone/web/pages/SearchPage.kt | 2 +- .../pterodactylus/sone/web/pages/UnbookmarkPage.kt | 2 +- .../sone/web/pages/UnfollowSonePage.kt | 2 +- .../net/pterodactylus/sone/web/pages/UnlikePage.kt | 2 +- .../pterodactylus/sone/web/pages/UnlockSonePage.kt | 2 +- .../sone/web/pages/UploadImagePage.kt | 2 +- .../pterodactylus/sone/web/pages/ViewPostPage.kt | 2 +- .../pterodactylus/sone/web/pages/ViewSonePage.kt | 2 +- .../sone/template/HistogramRendererTest.kt | 2 +- .../kotlin/net/pterodactylus/sone/test/Guice.kt | 2 +- .../sone/web/ajax/JsonReturnObjectTest.kt | 4 ++-- .../pterodactylus/sone/web/page/PageToadletTest.kt | 1 + 123 files changed, 153 insertions(+), 151 deletions(-) diff --git a/build.gradle b/build.gradle index b357d1b..321c3da 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.10' - id 'org.jetbrains.kotlin.plugin.noarg' version '1.7.10' + id 'org.jetbrains.kotlin.jvm' version '2.0.20' + id 'org.jetbrains.kotlin.plugin.noarg' version '2.0.20' id 'info.solidsoft.pitest' version '1.7.4' id 'jacoco' } @@ -49,19 +49,19 @@ dependencies { implementation group: 'org.jetbrains.kotlinx', name: 'kotlinx-coroutines-core', version: '1.3.0-RC' implementation group: 'net.pterodactylus', name: 'utils', version: '0.13.1' - implementation group: 'com.google.inject', name: 'guice', version: '4.2.2' - implementation group: 'com.google.guava', name: 'guava', version: '27.0.1-jre' - implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.1' - implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.9.1' - implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' - implementation group: 'org.jsoup', name: 'jsoup', version: '1.10.2' - implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '4.1.0' - implementation group: 'javax.activation', name: 'javax.activation-api', version: '1.2.0' + implementation group: 'com.google.inject', name: 'guice', version: '7.0.0' + implementation group: 'com.google.guava', name: 'guava', version: '33.3.1-jre' + implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.18.0' + implementation group: 'com.fasterxml.jackson.dataformat', name: 'jackson-dataformat-yaml', version: '2.18.0' + implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.8.6' + implementation group: 'org.jsoup', name: 'jsoup', version: '1.18.1' + implementation group: 'io.dropwizard.metrics', name: 'metrics-core', version: '4.2.27' + implementation group: 'jakarta.activation', name: 'jakarta.activation-api', version: '2.1.3' testImplementation group: 'org.jetbrains.kotlin', name: 'kotlin-test-junit' - testImplementation group: 'junit', name: 'junit', version: '4.11' - testImplementation group: 'org.mockito', name: 'mockito-core', version: '3.12.4' - testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' + testImplementation group: 'junit', name: 'junit', version: '4.13.2' + testImplementation group: 'org.mockito', name: 'mockito-core', version: '4.11.0' + testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '3.0' } apply from: 'version.gradle' diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java index 32f97b2..0abc4b8 100644 --- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java +++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java @@ -32,7 +32,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nonnull; -import javax.inject.Inject; +import jakarta.inject.Inject; import net.pterodactylus.sone.core.event.ImageInsertAbortedEvent; import net.pterodactylus.sone.core.event.ImageInsertFailedEvent; diff --git a/src/main/java/net/pterodactylus/sone/core/ImageInserter.java b/src/main/java/net/pterodactylus/sone/core/ImageInserter.java index 76519f4..9900b8a 100644 --- a/src/main/java/net/pterodactylus/sone/core/ImageInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/ImageInserter.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; +import jakarta.inject.Inject; import net.pterodactylus.sone.core.FreenetInterface.InsertToken; import net.pterodactylus.sone.core.FreenetInterface.InsertTokenSupplier; diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java index 43a87fb..47b6d37 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java @@ -28,7 +28,7 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import javax.inject.Inject; +import jakarta.inject.Inject; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.data.Sone.SoneStatus; diff --git a/src/main/java/net/pterodactylus/sone/core/SoneParser.java b/src/main/java/net/pterodactylus/sone/core/SoneParser.java index e1fd9ff..1d7985c 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneParser.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneParser.java @@ -9,7 +9,7 @@ import java.util.*; import java.util.logging.*; import javax.annotation.*; -import javax.inject.*; +import jakarta.inject.*; import net.pterodactylus.sone.data.*; import net.pterodactylus.sone.data.Profile.*; diff --git a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java index 3bb8777..f12fcb8 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java +++ b/src/main/java/net/pterodactylus/sone/fcp/FcpInterface.java @@ -31,7 +31,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import javax.annotation.Nonnull; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.fcp.event.FcpInterfaceActivatedEvent; diff --git a/src/main/java/net/pterodactylus/sone/notify/DefaultPostVisibilityFilter.java b/src/main/java/net/pterodactylus/sone/notify/DefaultPostVisibilityFilter.java index 7479d31..5d7be0d 100644 --- a/src/main/java/net/pterodactylus/sone/notify/DefaultPostVisibilityFilter.java +++ b/src/main/java/net/pterodactylus/sone/notify/DefaultPostVisibilityFilter.java @@ -2,7 +2,7 @@ package net.pterodactylus.sone.notify; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.inject.Singleton; +import jakarta.inject.Singleton; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; diff --git a/src/main/java/net/pterodactylus/sone/notify/DefaultReplyVisibilityFilter.java b/src/main/java/net/pterodactylus/sone/notify/DefaultReplyVisibilityFilter.java index a447108..98738c1 100644 --- a/src/main/java/net/pterodactylus/sone/notify/DefaultReplyVisibilityFilter.java +++ b/src/main/java/net/pterodactylus/sone/notify/DefaultReplyVisibilityFilter.java @@ -4,8 +4,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.PostReply; diff --git a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java index 5b229dd..5011f64 100644 --- a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java @@ -19,8 +19,8 @@ package net.pterodactylus.sone.template; import java.util.Set; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.freenet.wot.Identity; diff --git a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt index e497fdc..83178ae 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/DefaultElementLoader.kt @@ -6,15 +6,16 @@ import com.google.common.cache.CacheBuilder import freenet.keys.FreenetURI import org.jsoup.Jsoup import org.jsoup.nodes.Document +import org.jsoup.nodes.Element import java.io.ByteArrayInputStream import java.net.URLDecoder import java.nio.charset.Charset import java.text.Normalizer import java.util.concurrent.TimeUnit.MINUTES import java.util.logging.Logger -import javax.activation.MimeType import javax.imageio.ImageIO -import javax.inject.Inject +import jakarta.activation.MimeType +import jakarta.inject.Inject /** * [ElementLoader] implementation that uses a simple Guava [com.google.common.cache.Cache]. @@ -116,7 +117,7 @@ private val Document.metaDescription: String? private val Document.firstNonHeadingParagraph: String? get() = body().select("div, p") - .filter { it.textNodes().isNotEmpty() } + .filter { it: Element -> it.textNodes().isNotEmpty() } .map { it to it.text() } .firstOrNull { it.second != "" } ?.second diff --git a/src/main/kotlin/net/pterodactylus/sone/core/UpdateChecker.kt b/src/main/kotlin/net/pterodactylus/sone/core/UpdateChecker.kt index 0e67d0a..9a3a5bc 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/UpdateChecker.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/UpdateChecker.kt @@ -29,7 +29,7 @@ import java.io.* import java.util.* import java.util.logging.* import java.util.logging.Logger.* -import javax.inject.Singleton +import jakarta.inject.Singleton /** * Watches the official Sone homepage for new releases. diff --git a/src/main/kotlin/net/pterodactylus/sone/core/UpdatedSoneProcessor.kt b/src/main/kotlin/net/pterodactylus/sone/core/UpdatedSoneProcessor.kt index 0773adb..8f0422e 100644 --- a/src/main/kotlin/net/pterodactylus/sone/core/UpdatedSoneProcessor.kt +++ b/src/main/kotlin/net/pterodactylus/sone/core/UpdatedSoneProcessor.kt @@ -8,7 +8,7 @@ import net.pterodactylus.sone.data.Sone.* import net.pterodactylus.sone.database.* import net.pterodactylus.sone.utils.* import java.util.logging.Logger -import javax.inject.Inject +import jakarta.inject.Inject /** * An `UpdatedSoneProcessor` is called to process a [Sone] after it has been diff --git a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt index 04a94c7..7120147 100644 --- a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt +++ b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt @@ -23,8 +23,8 @@ import com.google.common.collect.Multimap import com.google.common.collect.TreeMultimap import com.google.common.util.concurrent.AbstractService import com.google.common.util.concurrent.RateLimiter -import com.google.inject.Inject import com.google.inject.Singleton +import jakarta.inject.Inject import net.pterodactylus.sone.data.Album import net.pterodactylus.sone.data.Image import net.pterodactylus.sone.data.Post @@ -60,7 +60,7 @@ import kotlin.concurrent.withLock @Singleton class MemoryDatabase constructor(private val configuration: Configuration, private val saveKnownPostRepliesRateLimiter: RateLimiter) : AbstractService(), Database { - @javax.inject.Inject constructor(configuration: Configuration): this(configuration, RateLimiter.create(1.0)) + @Inject constructor(configuration: Configuration): this(configuration, RateLimiter.create(1.0)) private val lock = ReentrantReadWriteLock() private val readLock: ReadLock by lazy { lock.readLock() } diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt index 98849c4..b04d971 100644 --- a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt +++ b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/FredPluginConnector.kt @@ -8,7 +8,7 @@ import freenet.support.* import freenet.support.api.* import kotlinx.coroutines.* import kotlinx.coroutines.channels.* -import javax.inject.* +import jakarta.inject.* /** * [PluginConnector] implementation that uses a [PluginRespiratorFacade] and coroutines to send diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginRespiratorFacade.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginRespiratorFacade.kt index e1d5591..a71ed30 100644 --- a/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginRespiratorFacade.kt +++ b/src/main/kotlin/net/pterodactylus/sone/freenet/plugin/PluginRespiratorFacade.kt @@ -23,7 +23,7 @@ package net.pterodactylus.sone.freenet.plugin import freenet.pluginmanager.* import freenet.support.* import freenet.support.api.* -import javax.inject.* +import jakarta.inject.* /** * Facade for the only method of a [plugin respirator][PluginRespirator] that Sone actually uses, diff --git a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt index db9809e..c452456 100644 --- a/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt +++ b/src/main/kotlin/net/pterodactylus/sone/freenet/wot/WebOfTrustPinger.kt @@ -23,7 +23,7 @@ import net.pterodactylus.sone.freenet.plugin.* import net.pterodactylus.sone.utils.* import java.util.concurrent.atomic.* import java.util.function.* -import javax.inject.* +import jakarta.inject.* /** * [Runnable] that is scheduled via an [Executor][java.util.concurrent.Executor], diff --git a/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt index f2ff6fc..4933e8f 100644 --- a/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt +++ b/src/main/kotlin/net/pterodactylus/sone/main/FreenetModule.kt @@ -10,8 +10,8 @@ import freenet.pluginmanager.* import net.pterodactylus.sone.freenet.DefaultHighLevelSimpleClientCreator import net.pterodactylus.sone.freenet.HighLevelSimpleClientCreator import net.pterodactylus.sone.freenet.plugin.* -import javax.inject.Provider -import javax.inject.Singleton +import jakarta.inject.Provider +import jakarta.inject.Singleton /** * Guice [Module] that supplies some objects that are in fact supplied by the Freenet node. diff --git a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt index a482dd9..5087479 100644 --- a/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt +++ b/src/main/kotlin/net/pterodactylus/sone/main/SoneModule.kt @@ -21,8 +21,8 @@ import java.io.* import java.util.concurrent.* import java.util.concurrent.Executors.* import java.util.logging.Logger -import javax.inject.* -import javax.inject.Singleton +import jakarta.inject.* +import jakarta.inject.Singleton open class SoneModule(private val sonePlugin: SonePlugin, private val eventBus: EventBus) : AbstractModule() { diff --git a/src/main/kotlin/net/pterodactylus/sone/main/TickerShutdown.kt b/src/main/kotlin/net/pterodactylus/sone/main/TickerShutdown.kt index de15cbe..aee329f 100644 --- a/src/main/kotlin/net/pterodactylus/sone/main/TickerShutdown.kt +++ b/src/main/kotlin/net/pterodactylus/sone/main/TickerShutdown.kt @@ -20,7 +20,7 @@ package net.pterodactylus.sone.main import com.google.common.eventbus.* import net.pterodactylus.sone.core.event.* import java.util.concurrent.* -import javax.inject.* +import jakarta.inject.* /** * Wrapper around all [tickers][ScheduledExecutorService] used in Sone, diff --git a/src/main/kotlin/net/pterodactylus/sone/notify/DefaultListNotificationFilter.kt b/src/main/kotlin/net/pterodactylus/sone/notify/DefaultListNotificationFilter.kt index acd2bce..b35460d 100644 --- a/src/main/kotlin/net/pterodactylus/sone/notify/DefaultListNotificationFilter.kt +++ b/src/main/kotlin/net/pterodactylus/sone/notify/DefaultListNotificationFilter.kt @@ -21,8 +21,8 @@ import net.pterodactylus.sone.data.PostReply import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.utils.ifTrue import net.pterodactylus.util.notify.Notification -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Filter for [ListNotification]s. diff --git a/src/main/kotlin/net/pterodactylus/sone/notify/ListNotification.kt b/src/main/kotlin/net/pterodactylus/sone/notify/ListNotification.kt index 60d7093..d60cc20 100644 --- a/src/main/kotlin/net/pterodactylus/sone/notify/ListNotification.kt +++ b/src/main/kotlin/net/pterodactylus/sone/notify/ListNotification.kt @@ -85,11 +85,10 @@ class ListNotification : TemplateNotification { if (other !is ListNotification<*>) { return false } - val listNotification = other as ListNotification<*>? - if (!super.equals(listNotification)) { + if (!super.equals(other)) { return false } - return (key == listNotification.key) && (realElements == listNotification.realElements) + return (key == other.key) && (realElements == other.realElements) } } diff --git a/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt b/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt index 67b03f3..f165e8a 100644 --- a/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt +++ b/src/main/kotlin/net/pterodactylus/sone/template/ParserFilter.kt @@ -7,8 +7,8 @@ import net.pterodactylus.sone.text.SoneTextParser import net.pterodactylus.sone.text.SoneTextParserContext import net.pterodactylus.util.template.Filter import net.pterodactylus.util.template.TemplateContext -import javax.inject.Inject -import javax.inject.Singleton +import jakarta.inject.Inject +import jakarta.inject.Singleton /** * Parses a [String] into a number of [Part]s. diff --git a/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt b/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt index 3e15ed3..3c46bba 100644 --- a/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt +++ b/src/main/kotlin/net/pterodactylus/sone/text/SoneMentionDetector.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.database.* import net.pterodactylus.sone.utils.* -import javax.inject.* +import jakarta.inject.* /** * Listens to [NewPostFoundEvent]s and [NewPostReplyFoundEvent], parses the diff --git a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt index 9992e94..88e4a03 100644 --- a/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt +++ b/src/main/kotlin/net/pterodactylus/sone/text/SoneTextParser.kt @@ -9,7 +9,7 @@ import net.pterodactylus.sone.text.LinkType.USK import net.pterodactylus.sone.utils.* import org.bitpedia.util.* import java.net.* -import javax.inject.* +import jakarta.inject.* /** * [Parser] implementation that can recognize Freenet URIs. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/AllPages.kt b/src/main/kotlin/net/pterodactylus/sone/web/AllPages.kt index c538f0e..002a7b1 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/AllPages.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/AllPages.kt @@ -1,7 +1,7 @@ package net.pterodactylus.sone.web import net.pterodactylus.sone.web.pages.* -import javax.inject.Inject +import jakarta.inject.Inject /** * Container for all web pages. This uses field injection because there are way too many pages diff --git a/src/main/kotlin/net/pterodactylus/sone/web/FreenetSessionProvider.kt b/src/main/kotlin/net/pterodactylus/sone/web/FreenetSessionProvider.kt index 8928f12..7551ad8 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/FreenetSessionProvider.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/FreenetSessionProvider.kt @@ -22,7 +22,7 @@ import freenet.clients.http.ToadletContext import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.database.SoneProvider import java.util.UUID -import javax.inject.Inject +import jakarta.inject.Inject /** * [SoneProvider] implementation based on Freenet’s [SessionManager]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/NewElements.kt b/src/main/kotlin/net/pterodactylus/sone/web/NewElements.kt index 6799ada..6c70298 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/NewElements.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/NewElements.kt @@ -21,8 +21,8 @@ import net.pterodactylus.sone.data.PostReply import net.pterodactylus.sone.notify.ListNotification import net.pterodactylus.sone.notify.PostVisibilityFilter import net.pterodactylus.sone.notify.ReplyVisibilityFilter -import javax.inject.Inject -import javax.inject.Named +import jakarta.inject.Inject +import jakarta.inject.Named /** * Container for new elements that should be shown in the web interface. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/PageToadletRegistry.kt b/src/main/kotlin/net/pterodactylus/sone/web/PageToadletRegistry.kt index 651bffd..e55fefa 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/PageToadletRegistry.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/PageToadletRegistry.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.main.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.web.* import java.util.concurrent.atomic.* -import javax.inject.* +import jakarta.inject.* private const val soneMenu = "Navigation.Menu.Sone" private const val soneMenuName = "$soneMenu.Name" diff --git a/src/main/kotlin/net/pterodactylus/sone/web/WebInterfaceModule.kt b/src/main/kotlin/net/pterodactylus/sone/web/WebInterfaceModule.kt index 3d87aa7..72d28d8 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/WebInterfaceModule.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/WebInterfaceModule.kt @@ -12,8 +12,8 @@ import net.pterodactylus.sone.template.* import net.pterodactylus.sone.text.* import net.pterodactylus.util.notify.* import net.pterodactylus.util.template.* -import javax.inject.* -import javax.inject.Singleton +import jakarta.inject.* +import jakarta.inject.Singleton class WebInterfaceModule : AbstractModule() { diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt index e9a1a50..098dcec 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.utils.emptyToNull import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user bookmark a post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt index 28af3e3..5a72099 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.text.* import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* -import javax.inject.* +import jakarta.inject.* /** * AJAX handler that creates a new post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.kt index df86dc0..a8336bd 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.text.* import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* -import javax.inject.* +import jakarta.inject.* /** * This AJAX page create a reply. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.kt index 3dca438..eb74ead 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.data.* import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* -import javax.inject.* +import jakarta.inject.* /** * This AJAX page deletes a post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt index 6daa4da..06ac0fd 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user delete a profile field. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt index b558356..f4e4932 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.data.* import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* -import javax.inject.* +import jakarta.inject.* /** * This AJAX page deletes a reply. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt index 06fe51b..c731656 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.utils.let import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user dismiss a notification. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.kt index 39442f0..d575753 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.ifTrue import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * Page that stores a user’s album modifications. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.kt index 7012cdc..636e2f7 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.kt @@ -10,7 +10,7 @@ import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.TemplateContext -import javax.inject.Inject +import jakarta.inject.Inject /** * Page that stores a user’s image modifications. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.kt index 9d5346c..a6281d5 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.utils.ifFalse import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user rename a profile field. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt index eea5120..d4a45db 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets a Sone follow another Sone. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.kt index 1175b2b..47a6719 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.utils.jsonObject import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that retrieves the number of “likes” a [net.pterodactylus.sone.data.Post] diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLinkedElementAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLinkedElementAjaxPage.kt index 115370a..b1e0aa2 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLinkedElementAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetLinkedElementAjaxPage.kt @@ -9,7 +9,7 @@ import net.pterodactylus.sone.utils.jsonArray import net.pterodactylus.sone.utils.jsonObject import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * Renders linked elements after they have been loaded. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt index adf3e26..baaf569 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.kt @@ -10,7 +10,7 @@ import net.pterodactylus.util.notify.Notification import net.pterodactylus.util.notify.TemplateNotification import net.pterodactylus.util.template.TemplateContextFactory import java.io.StringWriter -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX handler to return all current notifications. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt index d5595d2..dba8af2 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.kt @@ -9,7 +9,7 @@ import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.Template import net.pterodactylus.util.template.TemplateContextFactory -import javax.inject.Inject +import jakarta.inject.Inject /** * This AJAX handler retrieves information and rendered representation of a [Post]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.kt index 43960ab..ebbae83 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.kt @@ -9,7 +9,7 @@ import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.Template import net.pterodactylus.util.template.TemplateContextFactory -import javax.inject.Inject +import jakarta.inject.Inject /** * This AJAX page returns the details of a reply. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt index 19cd7f9..8adf686 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.kt @@ -18,7 +18,7 @@ import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* import java.text.SimpleDateFormat import java.util.TimeZone -import javax.inject.Inject +import jakarta.inject.Inject /** * The “get status” AJAX handler returns all information that is necessary to diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt index ef4a0db..f303040 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.kt @@ -1,5 +1,6 @@ package net.pterodactylus.sone.web.ajax +import com.fasterxml.jackson.databind.node.ObjectNode import net.pterodactylus.sone.freenet.L10nFilter import net.pterodactylus.sone.text.TimeTextConverter import net.pterodactylus.sone.utils.jsonObject @@ -8,7 +9,7 @@ import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* import java.text.SimpleDateFormat import java.util.TimeZone -import javax.inject.Inject +import jakarta.inject.Inject /** * Ajax page that returns a formatted, relative timestamp for replies or posts. @@ -44,7 +45,7 @@ class GetTimesAjaxPage @Inject constructor(webInterface: WebInterface, "tooltip" to synchronized(dateTimeFormatter) { dateTimeFormatter.format(time) }) - }.forEach { this@jsonObject.set(it.first, it.second) } + }.forEach { this@jsonObject.set(it.first, it.second) } } } diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.kt index e2c41b6..e0bac9a 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/GetTranslationAjaxPage.kt @@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.ajax import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * Returns the translation for a given key as JSON object. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/LikeAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/LikeAjaxPage.kt index b2993f4..4072f42 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/LikeAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/LikeAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user like a [net.pterodactylus.sone.data.Post]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt index c177041..e26e3b2 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.kt @@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.ajax import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * Lets the user [lock][net.pterodactylus.sone.core.Core.lockSone] a [Sone][net.pterodactylus.sone.data.Sone]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt index 808d2fa..a36c54d 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.kt @@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.ajax import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user mark a number of [net.pterodactylus.sone.data.Sone]s, diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt index 0b2c5ab..0357736 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user move a profile field up or down. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.kt index bc61b21..afa947c 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.kt @@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.ajax import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user unbookmark a post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.kt index d8b8290..9d99bee 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.data.Sone import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets a Sone unfollow another Sone. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt index a8da594..90d3157 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.utils.emptyToNull import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * AJAX page that lets the user unlike a [net.pterodactylus.sone.data.Post]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt index 130d102..db47c3b 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.kt @@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.ajax import net.pterodactylus.sone.utils.parameters import net.pterodactylus.sone.web.WebInterface import net.pterodactylus.sone.web.page.* -import javax.inject.Inject +import jakarta.inject.Inject /** * Lets the user [unlock][net.pterodactylus.sone.core.Core.unlockSone] a [Sone][net.pterodactylus.sone.data.Sone]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/ConfigNotReadHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/ConfigNotReadHandler.kt index 6092311..2795226 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/ConfigNotReadHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/ConfigNotReadHandler.kt @@ -20,7 +20,7 @@ package net.pterodactylus.sone.web.notification import com.google.common.eventbus.* import net.pterodactylus.sone.core.event.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for [ConfigNotRead] events. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/FirstStartHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/FirstStartHandler.kt index 3dc8689..bf901eb 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/FirstStartHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/FirstStartHandler.kt @@ -20,7 +20,7 @@ package net.pterodactylus.sone.web.notification import com.google.common.eventbus.* import net.pterodactylus.sone.core.event.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handles the notification shown on first start of Sone. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/ImageInsertHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/ImageInsertHandler.kt index bab7599..6f65fdb 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/ImageInsertHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/ImageInsertHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Notification handler for the various image-insert-related events. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalPostHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalPostHandler.kt index 5951997..6e8c643 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalPostHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalPostHandler.kt @@ -25,8 +25,8 @@ import net.pterodactylus.sone.data.Post import net.pterodactylus.sone.notify.ListNotification import net.pterodactylus.sone.notify.hasFirstStartNotification import net.pterodactylus.util.notify.NotificationManager -import javax.inject.Inject -import javax.inject.Named +import jakarta.inject.Inject +import jakarta.inject.Named /** * Handler for local posts. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalReplyHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalReplyHandler.kt index 7e392d0..45e9170 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalReplyHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/LocalReplyHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for local replies. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt index 57962c2..67ecb11 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostKnownDuringFirstStartHandler.kt @@ -24,7 +24,7 @@ import net.pterodactylus.sone.notify.* import net.pterodactylus.sone.utils.* import net.pterodactylus.util.notify.* import java.util.function.* -import javax.inject.* +import jakarta.inject.* /** * Handler that marks a [new][NewPostFoundEvent] [post][Post] as known while diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostReplyKnownDuringFirstStartHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostReplyKnownDuringFirstStartHandler.kt index 64285ee..d2d65a5 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostReplyKnownDuringFirstStartHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/MarkPostReplyKnownDuringFirstStartHandler.kt @@ -24,7 +24,7 @@ import net.pterodactylus.sone.notify.* import net.pterodactylus.sone.utils.* import net.pterodactylus.util.notify.* import java.util.function.* -import javax.inject.* +import jakarta.inject.* /** * Handler that marks post replies [as known][net.pterodactylus.sone.core.Core.markReplyKnown] diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt index 91eaae0..61b5160 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewRemotePostHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for [NewPostFoundEvent]s that adds the new post to the “new posts” notification and diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewSoneHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewSoneHandler.kt index eb384c7..765f59f 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewSoneHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewSoneHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Notification handler for “new Sone discovered” events. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewVersionHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewVersionHandler.kt index f48d89c..7e489f7 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NewVersionHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NewVersionHandler.kt @@ -20,7 +20,7 @@ package net.pterodactylus.sone.web.notification import com.google.common.eventbus.* import net.pterodactylus.sone.core.event.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for the “new version” notification. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt index a24a6d8..04aca0c 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandler.kt @@ -19,7 +19,7 @@ package net.pterodactylus.sone.web.notification import net.pterodactylus.sone.freenet.wot.* import net.pterodactylus.sone.text.* -import javax.inject.* +import jakarta.inject.* /** * Container that causes notification handlers to be created and (more importantly) registered diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt index 18aefd6..4c3d196 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/NotificationHandlerModule.kt @@ -29,8 +29,8 @@ import net.pterodactylus.util.notify.* import java.util.concurrent.* import java.util.concurrent.TimeUnit.* import java.util.function.* -import javax.inject.* -import javax.inject.Singleton +import jakarta.inject.* +import jakarta.inject.Singleton /** * Guice module for creating all notification handlers. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/RemotePostReplyHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/RemotePostReplyHandler.kt index 7dec7c9..5f69ac8 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/RemotePostReplyHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/RemotePostReplyHandler.kt @@ -23,7 +23,7 @@ import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.sone.utils.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for remote replies. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneInsertHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneInsertHandler.kt index b12acb4..486add4 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneInsertHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneInsertHandler.kt @@ -21,7 +21,7 @@ import com.google.common.eventbus.* import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for all notifications concerning Sone-insert events. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedHandler.kt index cb799a8..7dd9209 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedHandler.kt @@ -24,7 +24,7 @@ import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* import java.util.concurrent.* import java.util.concurrent.atomic.* -import javax.inject.* +import jakarta.inject.* /** * Handler for [SoneLockedEvent]s and [SoneUnlockedEvent]s that can schedule notifications after diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandler.kt index 8adea76..d6c6f8f 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneLockedOnStartupHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for [SoneLockedOnStartup][net.pterodactylus.sone.core.event.SoneLockedOnStartup] events diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneMentionedHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneMentionedHandler.kt index a03e490..4db4fd4 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneMentionedHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/SoneMentionedHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.sone.data.* import net.pterodactylus.sone.notify.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for the [MentionOfLocalSoneFoundEvent] and diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt index 3776d43..2f6435b 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/StartupHandler.kt @@ -22,7 +22,7 @@ import net.pterodactylus.sone.core.event.* import net.pterodactylus.util.notify.* import java.util.concurrent.* import java.util.concurrent.TimeUnit.* -import javax.inject.* +import jakarta.inject.* /** * Handler for the [Startup] event notification. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/notification/WebOfTrustHandler.kt b/src/main/kotlin/net/pterodactylus/sone/web/notification/WebOfTrustHandler.kt index 900a885..bbb7b7e 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/notification/WebOfTrustHandler.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/notification/WebOfTrustHandler.kt @@ -20,7 +20,7 @@ package net.pterodactylus.sone.web.notification import com.google.common.eventbus.* import net.pterodactylus.sone.core.event.* import net.pterodactylus.util.notify.* -import javax.inject.* +import jakarta.inject.* /** * Handler for web of trust-related notifications and the [WebOfTrustAppeared] diff --git a/src/main/kotlin/net/pterodactylus/sone/web/page/PageToadletFactory.kt b/src/main/kotlin/net/pterodactylus/sone/web/page/PageToadletFactory.kt index 61d8718..1c8c51b 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/page/PageToadletFactory.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/page/PageToadletFactory.kt @@ -19,7 +19,7 @@ package net.pterodactylus.sone.web.page import freenet.client.* import net.pterodactylus.util.web.* -import javax.inject.* +import jakarta.inject.* class PageToadletFactory @Inject constructor( private val highLevelSimpleClient: HighLevelSimpleClient, diff --git a/src/main/kotlin/net/pterodactylus/sone/web/page/TemplateRenderer.kt b/src/main/kotlin/net/pterodactylus/sone/web/page/TemplateRenderer.kt index 21eeb2a..6f44aa5 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/page/TemplateRenderer.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/page/TemplateRenderer.kt @@ -2,7 +2,7 @@ package net.pterodactylus.sone.web.page import net.pterodactylus.util.template.* import java.io.* -import javax.inject.* +import jakarta.inject.* class TemplateRenderer @Inject constructor(private val templateContextFactory: TemplateContextFactory) { diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt index f622319..2184751 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.main.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * A [SoneTemplatePage] that stores information about Sone in the [TemplateContext]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt index c03a299..0110ee8 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user bookmark a post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt index b892263..5e67242 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user browse all his bookmarked posts. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt index b6ce673..ddf0ff4 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt @@ -8,7 +8,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user create a new album. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt index 515de60..8ce9162 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user create a new [Post]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt index 7714b77..c394335 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user post a reply to a post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt index 98b15fb..a42150b 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* import java.util.logging.* -import javax.inject.* +import jakarta.inject.* import java.util.Locale /** diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DebugPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DebugPage.kt index 824f6ef..6d851e9 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DebugPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DebugPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.main.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* @ToadletPath("debug") class DebugPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt index bd86c95..8077864 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user delete an {@link Album}. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt index 6459bfd..9650600 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user delete an {@link Image}. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt index 2396370..3cb18d4 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Lets the user delete a post they made. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt index 6303b11..8570307 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user confirm the deletion of a profile field. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt index e6fbce8..c2036e8 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user delete a reply. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt index 3f99730..c7b9f32 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Lets the user delete a Sone. Of course the Sone is not really deleted from diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt index cd348e7..6c0cc32 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.main.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user dismiss a notification. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt index 4569e9a..de9ea83 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user edit the name and description of an album. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt index 5443d28..793f4df 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt @@ -8,7 +8,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user edit title and description of an {@link Image}. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt index be97e80..4bcdad1 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user edit the name of a profile field. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt index 93393ba..6a11929 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt @@ -8,7 +8,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user edit her profile. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt index 5fd06ce..3893e68 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user follow another Sone. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/GetImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/GetImagePage.kt index f7857c3..fc9b2f2 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/GetImagePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/GetImagePage.kt @@ -4,7 +4,7 @@ import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.web.* import java.net.* -import javax.inject.* +import jakarta.inject.* /** * Page that delivers a {@link TemporaryImage} to the browser. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt index a0ca0d7..cd4d0f2 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* import java.net.* -import javax.inject.* +import jakarta.inject.* /** * The image browser page is the entry page for the image management. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt index 89d6b93..6a64b16 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * The index page shows the main page of Sone. This page will contain the posts diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt index 01d1d22..a4d0dd7 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page shows all known Sones. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt index c8369e9..b11cc53 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user like [net.pterodactylus.sone.data.Post]s and [net.pterodactylus.sone.data.Reply]s. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt index 9f6f30e..2da04d5 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user lock a [net.pterodactylus.sone.data.Sone] to prevent it from being inserted. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt index 977d9e6..952d8e7 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * The login page lets the user log in. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt index a7722d4..b65a7ed 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.main.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Logs a user out. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt index f919318..5222e12 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user mark a number of [net.pterodactylus.sone.data.Sone]s, [Post]s, or diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt index 837e2c8..1185cfc 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/MetricsPage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.main.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* @MenuName("Metrics") @TemplatePath("/templates/metrics.html") diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt index b6507f0..9724c56 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt @@ -12,7 +12,7 @@ import net.pterodactylus.sone.web.page.TemplatePath import net.pterodactylus.sone.web.page.TemplateRenderer import net.pterodactylus.sone.web.page.ToadletPath import net.pterodactylus.util.template.TemplateContext -import javax.inject.Inject +import jakarta.inject.Inject /** * Page that displays all new posts and replies. The posts are filtered using diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt index 9465a6a..6362cdb 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user edit the options of the Sone plugin. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ReloadingPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ReloadingPage.kt index 71a7a9b..c27f396 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ReloadingPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ReloadingPage.kt @@ -2,7 +2,7 @@ package net.pterodactylus.sone.web.pages import net.pterodactylus.util.web.* import java.io.* -import javax.inject.* +import jakarta.inject.* /** * [Page] implementation that delivers static files from the filesystem. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt index 2ed4940..698f349 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user control the rescue mode for a Sone. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt index a0c76dc..a546ce9 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt @@ -12,7 +12,7 @@ import net.pterodactylus.sone.web.pages.SearchPage.Optionality.* import net.pterodactylus.util.template.* import net.pterodactylus.util.text.* import java.util.concurrent.TimeUnit.* -import javax.inject.* +import jakarta.inject.* import java.util.Locale /** diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt index aa7bbf6..7c34a22 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user unbookmark a post. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt index 9dbe9f1..5eb9b65 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user unfollow another Sone. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt index 46bd3ab..30b219c 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt @@ -6,7 +6,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * Page that lets the user unlike a [net.pterodactylus.sone.data.Post] or [net.pterodactylus.sone.data.Reply]. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt index 450a466..7626634 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt @@ -5,7 +5,7 @@ import net.pterodactylus.sone.utils.* import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user unlock a [net.pterodactylus.sone.data.Sone] to allow its insertion. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt index 0021c6b..0320790 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt @@ -11,7 +11,7 @@ import net.pterodactylus.util.template.* import java.awt.image.* import java.io.* import javax.imageio.* -import javax.inject.* +import jakarta.inject.* /** * Page implementation that lets the user upload an image. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt index 7e4d6a5..8b8d059 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt @@ -7,7 +7,7 @@ import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* import java.net.* -import javax.inject.* +import jakarta.inject.* /** * This page lets the user view a post and all its replies. diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt index efaee3f..1015633 100644 --- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt +++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt @@ -8,7 +8,7 @@ import net.pterodactylus.sone.web.* import net.pterodactylus.sone.web.page.* import net.pterodactylus.util.template.* import java.net.* -import javax.inject.* +import jakarta.inject.* /** * Lets the user browser another Sone. diff --git a/src/test/kotlin/net/pterodactylus/sone/template/HistogramRendererTest.kt b/src/test/kotlin/net/pterodactylus/sone/template/HistogramRendererTest.kt index fd6311a..5865ae8 100644 --- a/src/test/kotlin/net/pterodactylus/sone/template/HistogramRendererTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/template/HistogramRendererTest.kt @@ -193,7 +193,7 @@ class HistogramRendererTest { metricRenderer.format(templateContext, histogram, parameters) .let { "$it
" } .let(Jsoup::parseBodyFragment) - .getElementById("t").child(0).child(0) + .getElementById("t")!!.child(0).child(0) .let(verify) private fun verifyColumnIsNumeric(column: Int) = diff --git a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt index e6c0fdb..1c094e8 100644 --- a/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt +++ b/src/test/kotlin/net/pterodactylus/sone/test/Guice.kt @@ -8,7 +8,7 @@ import com.google.inject.name.Names import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.sameInstance import org.mockito.Mockito -import javax.inject.Provider +import jakarta.inject.Provider import kotlin.reflect.KClass fun KClass.isProvidedBy(instance: T) = Module { it.bind(this.java).toProvider(Provider { instance }) } diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt index 7849139..401049f 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/JsonReturnObjectTest.kt @@ -79,12 +79,12 @@ class JsonReturnObjectTest { jsonReturnObject.put("object", objectNode) val json = objectMapper.writeValueAsString(jsonReturnObject) val parsedJson = objectMapper.readTree(json) - assertThat(parsedJson, equalTo(ObjectNode(JsonNodeFactory.instance).apply { + assertThat(parsedJson, equalTo(ObjectNode(JsonNodeFactory.instance).apply { put("success", true) put("text", "text") put("int", 123) put("boolean", true) - set("object", objectNode) + set("object", objectNode) })) } diff --git a/src/test/kotlin/net/pterodactylus/sone/web/page/PageToadletTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/page/PageToadletTest.kt index cfadfec..b7efb67 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/page/PageToadletTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/page/PageToadletTest.kt @@ -200,6 +200,7 @@ private open class DelegatingToadletContext(private val toadletContext: ToadletC override fun sendReplyHeaders(code: Int, desc: String?, mvt: MultiValueTable?, mimeType: String?, length: Long) = toadletContext.sendReplyHeaders(code, desc, mvt, mimeType, length) override fun sendReplyHeaders(code: Int, desc: String?, mvt: MultiValueTable?, mimeType: String?, length: Long, forceDisableJavascript: Boolean) = toadletContext.sendReplyHeaders(code, desc, mvt, mimeType, length, forceDisableJavascript) @Suppress("DEPRECATION") + @Deprecated("Deprecated in ToadletContext") override fun sendReplyHeaders(code: Int, desc: String?, mvt: MultiValueTable?, mimeType: String?, length: Long, mTime: Date?) = toadletContext.sendReplyHeaders(code, desc, mvt, mimeType, length, mTime) override fun getUri(): URI = toadletContext.uri override fun getPageMaker(): PageMaker = toadletContext.pageMaker -- 2.7.4