Compile fixes

This commit is contained in:
Syer10
2024-11-17 12:45:34 -05:00
parent 398bf36f2f
commit 1a146321c5
5 changed files with 28 additions and 29 deletions

View File

@@ -37,6 +37,7 @@ class JavalinGraphQLRequestParser : GraphQLRequestParser<Context> {
formParam, formParam,
GraphQLServerRequest::class.java, GraphQLServerRequest::class.java,
) )
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val map = val map =
context context

View File

@@ -5,20 +5,18 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
@file:Suppress("DEPRECATION")
package suwayomi.tachidesk.graphql.server package suwayomi.tachidesk.graphql.server
import com.expediagroup.graphql.generator.execution.GraphQLContext
import com.expediagroup.graphql.server.execution.GraphQLContextFactory import com.expediagroup.graphql.server.execution.GraphQLContextFactory
import graphql.GraphQLContext
import io.javalin.http.Context import io.javalin.http.Context
import io.javalin.websocket.WsContext import io.javalin.websocket.WsContext
/** /**
* Custom logic for how Suwayomi-Server should create its context given the [Context] * Custom logic for how Suwayomi-Server should create its context given the [Context]
*/ */
class TachideskGraphQLContextFactory : GraphQLContextFactory<GraphQLContext, Context> { class TachideskGraphQLContextFactory : GraphQLContextFactory<Context> {
override suspend fun generateContextMap(request: Context): Map<*, Any> = emptyMap<Any, Any>() override suspend fun generateContext(request: Context): GraphQLContext = emptyMap<Any, Any>().toGraphQLContext()
// mutableMapOf<Any, Any>( // mutableMapOf<Any, Any>(
// "user" to User( // "user" to User(
// email = "fake@site.com", // email = "fake@site.com",
@@ -30,7 +28,7 @@ class TachideskGraphQLContextFactory : GraphQLContextFactory<GraphQLContext, Con
// request.headers["my-custom-header"]?.let { customHeader -> // request.headers["my-custom-header"]?.let { customHeader ->
// map["customHeader"] = customHeader // map["customHeader"] = customHeader
// } // }
// } // }.toGraphQLContext()
fun generateContextMap( fun generateContextMap(
@Suppress("UNUSED_PARAMETER") request: WsContext, @Suppress("UNUSED_PARAMETER") request: WsContext,

View File

@@ -29,8 +29,8 @@ open class GraphQLSubscriptionHandler(
graphQLRequest: GraphQLRequest, graphQLRequest: GraphQLRequest,
graphQLContext: GraphQLContext = GraphQLContext.of(emptyMap<Any, Any>()), graphQLContext: GraphQLContext = GraphQLContext.of(emptyMap<Any, Any>()),
): Flow<GraphQLResponse<*>> { ): Flow<GraphQLResponse<*>> {
val dataLoaderRegistry = dataLoaderRegistryFactory?.generate() val dataLoaderRegistry = dataLoaderRegistryFactory?.generate(graphQLContext)
val input = graphQLRequest.toExecutionInput(dataLoaderRegistry, graphQLContext) val input = graphQLRequest.toExecutionInput(graphQLContext, dataLoaderRegistry)
val res = graphQL.execute(input) val res = graphQL.execute(input)
val data = res.getData<Flow<ExecutionResult>>() val data = res.getData<Flow<ExecutionResult>>()

View File

@@ -44,10 +44,10 @@ class ChapterType(
mangaId: Int, mangaId: Int,
dataFetchingEnvironment: DataFetchingEnvironment, dataFetchingEnvironment: DataFetchingEnvironment,
) { ) {
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("ChapterDataLoader").clear(chapterId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("ChapterDataLoader")?.clear(chapterId)
dataFetchingEnvironment.getDataLoader<Int, ChapterNodeList>("ChaptersForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterNodeList>("ChaptersForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, Int>("DownloadedChapterCountForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, Int>("DownloadedChapterCountForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LastReadChapterForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LastReadChapterForMangaDataLoader")?.clear(mangaId)
} }
} }

View File

@@ -57,31 +57,31 @@ class MangaType(
mangaId: Int, mangaId: Int,
dataFetchingEnvironment: DataFetchingEnvironment, dataFetchingEnvironment: DataFetchingEnvironment,
) { ) {
dataFetchingEnvironment.getDataLoader<Int, MangaType>("MangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, MangaType>("MangaDataLoader")?.clear(mangaId)
val mangaForIdsDataLoader = val mangaForIdsDataLoader =
dataFetchingEnvironment.getDataLoader<List<Int>, MangaNodeList>("MangaForIdsDataLoader") dataFetchingEnvironment.getDataLoader<List<Int>, MangaNodeList>("MangaForIdsDataLoader")
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
(mangaForIdsDataLoader.cacheMap as CustomCacheMap<List<Int>, MangaNodeList>) (mangaForIdsDataLoader?.cacheMap as? CustomCacheMap<List<Int>, MangaNodeList>?)
.getKeys() ?.getKeys()
.filter { it.contains(mangaId) } ?.filter { it.contains(mangaId) }
.forEach { mangaForIdsDataLoader.clear(it) } ?.forEach { mangaForIdsDataLoader.clear(it) }
dataFetchingEnvironment.getDataLoader<Int, Int>("DownloadedChapterCountForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, Int>("DownloadedChapterCountForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, Int>("UnreadChapterCountForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, Int>("UnreadChapterCountForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, Int>("BookmarkedChapterCountForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, Int>("BookmarkedChapterCountForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, Int>("HasDuplicateChaptersForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, Int>("HasDuplicateChaptersForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LastReadChapterForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LastReadChapterForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LatestReadChapterForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LatestReadChapterForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LatestFetchedChapterForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LatestFetchedChapterForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LatestUploadedChapterForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("LatestUploadedChapterForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, ChapterType>("FirstUnreadChapterForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, ChapterType>("FirstUnreadChapterForMangaDataLoader")?.clear(mangaId)
dataFetchingEnvironment dataFetchingEnvironment
.getDataLoader<Int, ChapterNodeList>( .getDataLoader<Int, ChapterNodeList>(
"ChaptersForMangaDataLoader", "ChaptersForMangaDataLoader",
).clear(mangaId) )?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, List<MangaMetaType>>("MangaMetaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, List<MangaMetaType>>("MangaMetaDataLoader")?.clear(mangaId)
dataFetchingEnvironment.getDataLoader<Int, CategoryNodeList>("CategoriesForMangaDataLoader").clear(mangaId) dataFetchingEnvironment.getDataLoader<Int, CategoryNodeList>("CategoriesForMangaDataLoader")?.clear(mangaId)
} }
} }