Merge branch 'master' into develop

Author: kobylynskyi

.github/dependabot.yml

@@ -28,7 +28,7 @@ public class GraphqlJacksonTypeIdResolver extends TypeIdResolverBase {
             Class<?> clazz = Class.forName(
                 <#if package?has_content>"${package}." +
                 </#if><#if modelNamePrefix?has_content>"${modelNamePrefix}" +
-                </#if>typename<#if modelNamePrefix?has_content> +
+                </#if>typename<#if modelNameSuffix?has_content> +
                 "${modelNameSuffix}"</#if>
             );
             return context.constructSpecializedType(superType, clazz);

src/main/resources/templates/java-lang/jackson_type_id_resolver.ftl

@@ -25,7 +25,7 @@ open class GraphqlJacksonTypeIdResolver : TypeIdResolverBase() {
         return try {
             val clazz = Class.forName(<#if package?has_content>"${package}." +
                     </#if><#if modelNamePrefix?has_content>"${modelNamePrefix}" +
-                    </#if>typename<#if modelNamePrefix?has_content> +
+                    </#if>typename<#if modelNameSuffix?has_content> +
                     "${modelNameSuffix}"</#if>)
             context.constructSpecializedType(superType, clazz)
         } catch (e: ClassNotFoundException) {

src/main/resources/templates/kotlin-lang/jackson_type_id_resolver.ftl

@@ -24,7 +24,7 @@ class GraphqlJacksonTypeIdResolver extends TypeIdResolverBase {
     override def typeFromId(context: DatabindContext, typename: String): JavaType = try {
         val clazz = Class.forName(<#if package?has_content>"${package}." +
                     </#if><#if modelNamePrefix?has_content>"${modelNamePrefix}" +
-                    </#if>typename<#if modelNamePrefix?has_content> +
+                    </#if>typename<#if modelNameSuffix?has_content> +
                     "${modelNameSuffix}"</#if>)
         context.constructSpecializedType(superType, clazz)
     } catch {