Split generated JsonXExtensions into smaller modular files #88
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| package com.infinum.jsonapix.processor.specs.jsonxextensions | ||
|
|
||
| import com.infinum.jsonapix.core.common.JsonApiConstants | ||
| import com.infinum.jsonapix.core.resources.Error | ||
| import com.infinum.jsonapix.core.resources.Errors | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.DeserializeFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.DeserializeListFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.ManyRelationshipModelFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.OneRelationshipModelFunSpecBuilder | ||
| import com.infinum.jsonapix.retrofit.JsonXHttpException | ||
| import com.squareup.kotlinpoet.AnnotationSpec | ||
| import com.squareup.kotlinpoet.ClassName | ||
| import com.squareup.kotlinpoet.FileSpec | ||
| import com.squareup.kotlinpoet.FunSpec | ||
| import com.squareup.kotlinpoet.KModifier | ||
| import com.squareup.kotlinpoet.ParameterSpec | ||
| import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy | ||
| import com.squareup.kotlinpoet.TypeVariableName | ||
| import com.squareup.kotlinpoet.asClassName | ||
| import com.squareup.kotlinpoet.asTypeName | ||
| import retrofit2.HttpException | ||
|
|
||
| /** | ||
| * Builds JsonXCoreExtensions.kt containing shared utility functions: | ||
| * - toManyRelationshipModel() | ||
| * - toOneRelationshipModel() | ||
| * - decodeJsonApiError() | ||
| * - asJsonXHttpException() (conditional on retrofit module) | ||
| * - decodeJsonApiXString() | ||
| * - decodeJsonApiXListString() | ||
| */ | ||
| internal object JsonXCoreExtensionsSpecBuilder { | ||
|
|
||
| @SuppressWarnings("SpreadOperator") | ||
| fun build(): FileSpec { | ||
| val fileSpec = FileSpec.builder( | ||
| JsonApiConstants.Packages.JSONX, | ||
| JsonApiConstants.FileNames.JSON_X_CORE_EXTENSIONS, | ||
| ) | ||
|
|
||
| fileSpec.addAnnotation( | ||
| AnnotationSpec.builder(JvmName::class) | ||
| .addMember("%S", JsonApiConstants.FileNames.JSON_X_EXTENSIONS) | ||
| .useSiteTarget(AnnotationSpec.UseSiteTarget.FILE).build(), | ||
| ) | ||
| fileSpec.addAnnotation( | ||
| AnnotationSpec.builder(JvmMultifileClass::class) | ||
| .useSiteTarget(AnnotationSpec.UseSiteTarget.FILE).build(), | ||
| ) | ||
|
Comment on lines
+41
to
+49
Contributor
Author
There was a problem hiding this comment. This is added as before, the JsonXExtensions file used the JVM name: Now all the files have: Not sure if its even needed though @thisAAY 🤔 |
||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.KOTLINX_SERIALIZATION, | ||
| *JsonApiConstants.Imports.KOTLINX, | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.CORE_DISCRIMINATORS, | ||
| *JsonApiConstants.Imports.CORE_EXTENSIONS, | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.JSONX, | ||
| *JsonApiConstants.Imports.JSON_X, | ||
| ) | ||
|
|
||
| fileSpec.addFunction(ManyRelationshipModelFunSpecBuilder.build()) | ||
| fileSpec.addFunction(OneRelationshipModelFunSpecBuilder.build()) | ||
|
|
||
| fileSpec.addFunction(decodeJsonApiErrorFunSpec()) | ||
|
|
||
| if (hasRetrofitModule()) { | ||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.CORE_RESOURCES, | ||
| JsonApiConstants.Imports.ERRORS, | ||
| ) | ||
| fileSpec.addFunction(asJsonXHttpExceptionFunSpec()) | ||
| } | ||
|
|
||
| fileSpec.addFunction(DeserializeFunSpecBuilder.build()) | ||
| fileSpec.addFunction(DeserializeListFunSpecBuilder.build()) | ||
|
|
||
| return fileSpec.build() | ||
| } | ||
|
|
||
| private fun decodeJsonApiErrorFunSpec(): FunSpec { | ||
| val typeVariableName = | ||
| TypeVariableName.invoke(JsonApiConstants.Members.GENERIC_TYPE_VARIABLE) | ||
|
|
||
| return FunSpec.builder(JsonApiConstants.Members.DECODE_JSON_API_ERROR) | ||
| .addParameter( | ||
| ParameterSpec( | ||
| name = JsonApiConstants.Members.ERROR_BODY, | ||
| type = String::class.asTypeName(), | ||
| ), | ||
| ) | ||
| .returns(List::class.asClassName().parameterizedBy(typeVariableName)) | ||
| .addModifiers(KModifier.INLINE) | ||
| .beginControlFlow("return try") | ||
| .addTypeVariable( | ||
| typeVariableName.copy( | ||
| reified = true, | ||
| bounds = listOf(Error::class.asTypeName()), | ||
| ), | ||
| ) | ||
| .addStatement( | ||
| "format.decodeFromString<%T<%L>>(%L).errors", | ||
| Errors::class, | ||
| JsonApiConstants.Members.GENERIC_TYPE_VARIABLE, | ||
| JsonApiConstants.Members.ERROR_BODY, | ||
| ) | ||
| .nextControlFlow("catch (e: %T)", IllegalArgumentException::class.asClassName()) | ||
| .addStatement("emptyList()") | ||
| .endControlFlow() | ||
| .build() | ||
| } | ||
|
|
||
| private fun asJsonXHttpExceptionFunSpec(): FunSpec { | ||
| val typeVariableName = | ||
| TypeVariableName.invoke(JsonApiConstants.Members.GENERIC_TYPE_VARIABLE) | ||
|
|
||
| return FunSpec.builder(JsonApiConstants.Members.AS_JSON_X_HTTP_EXCEPTION) | ||
| .receiver(HttpException::class) | ||
| .returns(JsonXHttpException::class.asClassName().parameterizedBy(typeVariableName)) | ||
| .addModifiers(KModifier.INLINE) | ||
| .addTypeVariable( | ||
| typeVariableName.copy( | ||
| reified = true, | ||
| bounds = listOf(Error::class.asTypeName()), | ||
| ), | ||
| ) | ||
| .addStatement("val response = response()") | ||
| .addStatement("val body = response?.errorBody()?.charStream()?.readText()") | ||
| .addStatement( | ||
| "val errors = if (body != null) %L<Model>(body) else emptyList()", | ||
| JsonApiConstants.Members.DECODE_JSON_API_ERROR, | ||
| ) | ||
| .addStatement("return JsonXHttpException(response(), errors)") | ||
|
DrakslerT marked this conversation as resolved.
Outdated
|
||
| .build() | ||
| } | ||
|
|
||
| @Suppress("SwallowedException") | ||
| private fun hasRetrofitModule(): Boolean { | ||
| return try { | ||
| Class.forName("com.infinum.jsonapix.retrofit.JsonXHttpException") | ||
| true | ||
| } catch (e: Exception) { | ||
| false | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| package com.infinum.jsonapix.processor.specs.jsonxextensions | ||
|
|
||
| import com.infinum.jsonapix.core.common.JsonApiConstants | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.ListItemResourceObjectFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.OriginalDataResourceObjectFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.ResourceObjectFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.SerializeFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.SerializeListFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.WrapperFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.jsonxextensions.funspecbuilders.WrapperListFunSpecBuilder | ||
| import com.infinum.jsonapix.processor.specs.models.ClassInfo | ||
| import com.squareup.kotlinpoet.AnnotationSpec | ||
| import com.squareup.kotlinpoet.ClassName | ||
| import com.squareup.kotlinpoet.FileSpec | ||
|
|
||
| /** | ||
| * Builds one FileSpec per model containing that model's extension functions: | ||
| * - Original.toResourceObject(meta, links) | ||
| * - Model.toResourceObject() | ||
| * - Item.toResourceObject() | ||
| * - Model.toJsonApiX() | ||
| * - List.toJsonApiXList() | ||
| * - Model.toJsonApiXString(...) | ||
| * - List.toJsonApiXString(...) | ||
| */ | ||
| @SuppressWarnings("SpreadOperator") | ||
| internal object JsonXModelExtensionsSpecBuilder { | ||
|
|
||
| fun build(originalClass: ClassName, classInfo: ClassInfo): FileSpec { | ||
| val fileName = "${originalClass.simpleName}Extensions" | ||
|
|
||
| val fileSpec = FileSpec.builder( | ||
| JsonApiConstants.Packages.JSONX, | ||
| fileName, | ||
|
DrakslerT marked this conversation as resolved.
|
||
| ) | ||
|
|
||
| fileSpec.addAnnotation( | ||
| AnnotationSpec.builder(JvmName::class) | ||
| .addMember("%S", JsonApiConstants.FileNames.JSON_X_EXTENSIONS) | ||
| .useSiteTarget(AnnotationSpec.UseSiteTarget.FILE).build(), | ||
| ) | ||
| fileSpec.addAnnotation( | ||
| AnnotationSpec.builder(JvmMultifileClass::class) | ||
| .useSiteTarget(AnnotationSpec.UseSiteTarget.FILE).build(), | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.KOTLINX_SERIALIZATION, | ||
| *JsonApiConstants.Imports.KOTLINX, | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.CORE_DISCRIMINATORS, | ||
| *JsonApiConstants.Imports.CORE_EXTENSIONS, | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.JSONX, | ||
| *JsonApiConstants.Imports.JSON_X, | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.CORE_SHARED, | ||
| JsonApiConstants.Imports.MAP_SAFE, | ||
| ) | ||
|
|
||
| fileSpec.addImport( | ||
| JsonApiConstants.Packages.CORE_SHARED, | ||
| JsonApiConstants.Imports.FLAT_MAP_SAFE, | ||
| ) | ||
|
|
||
| fileSpec.addFunction( | ||
| OriginalDataResourceObjectFunSpecBuilder.build( | ||
| originalClass, | ||
| classInfo.resourceObjectClassName, | ||
| classInfo.attributesWrapperClassName, | ||
| classInfo.relationshipsObjectClassName, | ||
| classInfo.metaInfo?.resourceObjectClassName, | ||
| classInfo.linksInfo?.resourceObjectLinks, | ||
| ), | ||
| ) | ||
| fileSpec.addFunction( | ||
| ResourceObjectFunSpecBuilder.build( | ||
| originalClass, | ||
| classInfo.resourceObjectClassName, | ||
| classInfo.attributesWrapperClassName, | ||
| classInfo.relationshipsObjectClassName, | ||
| ), | ||
| ) | ||
| fileSpec.addFunction( | ||
| ListItemResourceObjectFunSpecBuilder.build( | ||
| originalClass, | ||
| classInfo.resourceObjectClassName, | ||
| classInfo.attributesWrapperClassName, | ||
| classInfo.relationshipsObjectClassName, | ||
| ), | ||
| ) | ||
| fileSpec.addFunction( | ||
| WrapperFunSpecBuilder.build( | ||
| originalClass, | ||
| classInfo.jsonWrapperClassName, | ||
| classInfo.includedStatement?.toString(), | ||
| ), | ||
| ) | ||
| fileSpec.addFunction( | ||
| WrapperListFunSpecBuilder.build( | ||
| originalClass, | ||
| classInfo.jsonWrapperListClassName, | ||
| classInfo.includedListStatement?.toString(), | ||
| ), | ||
| ) | ||
| fileSpec.addFunction(SerializeFunSpecBuilder.build(originalClass, classInfo.isNullable)) | ||
| fileSpec.addFunction(SerializeListFunSpecBuilder.build(originalClass)) | ||
|
|
||
| return fileSpec.build() | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.