From 485927dd9e231007c559490c12e278c8965472cb Mon Sep 17 00:00:00 2001 From: Gavriil Sitnikov Date: Wed, 3 May 2017 16:02:29 +0300 Subject: [PATCH] some parts additionally commented --- gradle/jsonModelsGeneration.gradle | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gradle/jsonModelsGeneration.gradle b/gradle/jsonModelsGeneration.gradle index c219855..20fb624 100644 --- a/gradle/jsonModelsGeneration.gradle +++ b/gradle/jsonModelsGeneration.gradle @@ -299,6 +299,12 @@ enum FieldType { class TypeNameUtils { + /** + * Returns type arguments part from full string that represents type. + * Sample: 'List' -> '' or 'Map' -> ''. + * @param fullTypeString Full string represents type. E.g. 'Map'; + * @return Type arguments part of string. Like '' + */ private static String extractTypeArgumentsString(final String fullTypeString) { final int startOfTypeArguments = fullTypeString.indexOf("<"); return startOfTypeArguments > 0 ? fullTypeString.substring(startOfTypeArguments).replace(" ", "") : null @@ -321,8 +327,15 @@ class TypeNameUtils { return result } - private static TypeName resolveBaseTypeName(final String typeStringWithoutArguments, final Map objects) { - final String baseTypeString = extractBaseTypeString(typeStringWithoutArguments) + /** + * Resolving type name of base type from string. + * Sample: 'List' -> 'java.util.List' typeName. + * @param typeString String represents type; + * @param objects Objects to resolve some external imported classes; + * @return Type name of base type. + */ + private static TypeName resolveBaseTypeName(final String typeString, final Map objects) { + final String baseTypeString = extractBaseTypeString(typeString) final SchemeObject associatedObject = objects.get(baseTypeString) if (associatedObject instanceof ImportObject) { return ClassName.bestGuess(associatedObject.fullName)