Add ContentNegotiation KClass methods for ignoring types

Author: e5l

ktor-client/ktor-client-plugins/ktor-client-content-negotiation/api/ktor-client-content-negotiation.api

@@ -9,9 +9,10 @@ public final class io/ktor/client/plugins/contentnegotiation/ContentNegotiation
 public final class io/ktor/client/plugins/contentnegotiation/ContentNegotiation$Config : io/ktor/serialization/Configuration {
 	public fun <init> ()V
 	public final fun clearIgnoredTypes ()V
-	public final fun getIgnoredTypes ()Ljava/util/Set;
+	public final fun ignoreType (Lkotlin/reflect/KClass;)V
 	public final fun register (Lio/ktor/http/ContentType;Lio/ktor/serialization/ContentConverter;Lio/ktor/http/ContentTypeMatcher;Lkotlin/jvm/functions/Function1;)V
 	public fun register (Lio/ktor/http/ContentType;Lio/ktor/serialization/ContentConverter;Lkotlin/jvm/functions/Function1;)V
+	public final fun removeIgnoredType (Lkotlin/reflect/KClass;)V
 }
 
 public final class io/ktor/client/plugins/contentnegotiation/ContentNegotiation$Plugin : io/ktor/client/plugins/HttpClientPlugin {

ktor-client/ktor-client-plugins/ktor-client-content-negotiation/common/src/io/ktor/client/plugins/contentnegotiation/ContentNegotiation.kt

@@ -53,7 +53,6 @@ public class ContentNegotiation internal constructor(
             val contentTypeMatcher: ContentTypeMatcher
         )
 
-        @PublishedApi
         internal val ignoredTypes: MutableSet<KClass<*>> =
             (DefaultIgnoredTypes + DefaultCommonIgnoredTypes).toMutableSet()
 
@@ -98,14 +97,30 @@ public class ContentNegotiation internal constructor(
          * The list contains the [HttpStatusCode], [ByteArray], [String] and streaming types by default.
          */
         public inline fun <reified T> ignoreType() {
-            ignoredTypes.add(T::class)
+            ignoreType(T::class)
         }
 
         /**
          * Remove [T] from the list of types that should be ignored by [ContentNegotiation].
          */
         public inline fun <reified T> removeIgnoredType() {
-            ignoredTypes.remove(T::class)
+            removeIgnoredType(T::class)
+        }
+
+        /**
+         * Remove [type] from the list of types that should be ignored by [ContentNegotiation].
+         */
+        public fun removeIgnoredType(type: KClass<*>) {
+            ignoredTypes.remove(type)
+        }
+
+        /**
+         * Adds a [type] to the list of types that should be ignored by [ContentNegotiation].
+         *
+         * The list contains the [HttpStatusCode], [ByteArray], [String] and streaming types by default.
+         */
+        public fun ignoreType(type: KClass<*>) {
+            ignoredTypes.add(type)
         }
 
         /**

ktor-client/ktor-client-plugins/ktor-client-json/api/ktor-client-json.api

@@ -13,10 +13,11 @@ public final class io/ktor/client/plugins/json/JsonPlugin$Config {
 	public final fun accept ([Lio/ktor/http/ContentType;)V
 	public final fun clearIgnoredTypes ()V
 	public final fun getAcceptContentTypes ()Ljava/util/List;
-	public final fun getIgnoredTypes ()Ljava/util/Set;
 	public final fun getReceiveContentTypeMatchers ()Ljava/util/List;
 	public final fun getSerializer ()Lio/ktor/client/plugins/json/JsonSerializer;
+	public final fun ignoreType (Lkotlin/reflect/KClass;)V
 	public final fun receive (Lio/ktor/http/ContentTypeMatcher;)V
+	public final fun removeIgnoredType (Lkotlin/reflect/KClass;)V
 	public final fun setAcceptContentTypes (Ljava/util/List;)V
 	public final fun setReceiveContentTypeMatchers (Ljava/util/List;)V
 	public final fun setSerializer (Lio/ktor/client/plugins/json/JsonSerializer;)V

ktor-client/ktor-client-plugins/ktor-client-json/common/src/io/ktor/client/plugins/json/JsonPlugin.kt

@@ -70,7 +70,6 @@ public class JsonPlugin internal constructor(
     @KtorDsl
     public class Config {
 
-        @PublishedApi
         internal val ignoredTypes: MutableSet<KClass<*>> =
             (DefaultIgnoredTypes + DefaultCommonIgnoredTypes).toMutableSet()
 
@@ -136,14 +135,30 @@ public class JsonPlugin internal constructor(
          * The list contains the [HttpStatusCode], [ByteArray], [String] and streaming types by default.
          */
         public inline fun <reified T> ignoreType() {
-            ignoredTypes.add(T::class)
+            ignoreType(T::class)
         }
 
         /**
          * Remove [T] from the list of types that should be ignored by [ContentNegotiation].
          */
         public inline fun <reified T> removeIgnoredType() {
-            ignoredTypes.remove(T::class)
+            removeIgnoredType(T::class)
+        }
+
+        /**
+         * Remove [type] from the list of types that should be ignored by [ContentNegotiation].
+         */
+        public fun removeIgnoredType(type: KClass<*>) {
+            ignoredTypes.remove(type)
+        }
+
+        /**
+         * Adds a [type] to the list of types that should be ignored by [ContentNegotiation].
+         *
+         * The list contains the [HttpStatusCode], [ByteArray], [String] and streaming types by default.
+         */
+        public fun ignoreType(type: KClass<*>) {
+            ignoredTypes.add(type)
         }
 
         /**

ktor-server/ktor-server-plugins/ktor-server-content-negotiation/api/ktor-server-content-negotiation.api

@@ -3,8 +3,9 @@ public final class io/ktor/server/plugins/contentnegotiation/ContentNegotiationC
 	public final fun accept (Lkotlin/jvm/functions/Function2;)V
 	public final fun clearIgnoredTypes ()V
 	public final fun getCheckAcceptHeaderCompliance ()Z
-	public final fun getIgnoredTypes ()Ljava/util/Set;
+	public final fun ignoreType (Lkotlin/reflect/KClass;)V
 	public fun register (Lio/ktor/http/ContentType;Lio/ktor/serialization/ContentConverter;Lkotlin/jvm/functions/Function1;)V
+	public final fun removeIgnoredType (Lkotlin/reflect/KClass;)V
 	public final fun setCheckAcceptHeaderCompliance (Z)V
 }
 

ktor-server/ktor-server-plugins/ktor-server-content-negotiation/jvmAndNix/src/io/ktor/server/plugins/contentnegotiation/ContentNegotiationConfig.kt

@@ -29,7 +29,6 @@ public class ContentNegotiationConfig : Configuration {
     internal val registrations = mutableListOf<ConverterRegistration>()
     internal val acceptContributors = mutableListOf<AcceptHeaderContributor>()
 
-    @PublishedApi
     internal val ignoredTypes: MutableSet<KClass<*>> = (DefaultCommonIgnoredTypes + DefaultIgnoredTypes).toMutableSet()
 
     /**
@@ -71,14 +70,30 @@ public class ContentNegotiationConfig : Configuration {
      * The list contains the [HttpStatusCode] type by default.
      */
     public inline fun <reified T> ignoreType() {
-        ignoredTypes.add(T::class)
+        ignoreType(T::class)
     }
 
     /**
      * Remove [T] from the list of types that should be ignored by [ContentNegotiation].
      */
     public inline fun <reified T> removeIgnoredType() {
-        ignoredTypes.remove(T::class)
+        removeIgnoredType(T::class)
+    }
+
+    /**
+     * Remove [type] from the list of types that should be ignored by [ContentNegotiation].
+     */
+    public fun removeIgnoredType(type: KClass<*>) {
+        ignoredTypes.remove(type)
+    }
+
+    /**
+     * Adds a [type] to the list of types that should be ignored by [ContentNegotiation].
+     *
+     * The list contains the [HttpStatusCode], [ByteArray], [String] and streaming types by default.
+     */
+    public fun ignoreType(type: KClass<*>) {
+        ignoredTypes.add(type)
     }
 
     /**