From 571dc11c29e612b2fd68ab6fb7b5c1c0296844b4 Mon Sep 17 00:00:00 2001 From: dpnolte Date: Sat, 24 Apr 2021 19:14:39 +0200 Subject: [PATCH] set logging to debug (#36) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit makes sense 👍 --- .../org/leafygreens/kompendium/Kontent.kt | 24 +++++++++---------- .../leafygreens/kompendium/util/Helpers.kt | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/Kontent.kt b/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/Kontent.kt index b7f4d1401..450275082 100644 --- a/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/Kontent.kt +++ b/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/Kontent.kt @@ -46,7 +46,7 @@ object Kontent { type: KType, cache: SchemaMap = emptyMap() ): SchemaMap = Helpers.logged(object {}.javaClass.enclosingMethod.name, mapOf("cache" to cache)) { - logger.info("Parsing Kontent of $type") + logger.debug("Parsing Kontent of $type") when (val clazz = type.classifier as KClass<*>) { Unit::class -> cache Int::class -> cache.plus(clazz.simpleName!! to FormatSchema("int32", "integer")) @@ -68,26 +68,26 @@ object Kontent { private fun handleComplexType(clazz: KClass<*>, cache: SchemaMap): SchemaMap = when (cache.containsKey(clazz.simpleName)) { true -> { - logger.info("Cache already contains ${clazz.simpleName}, returning cache untouched") + logger.debug("Cache already contains ${clazz.simpleName}, returning cache untouched") cache } false -> { - logger.info("${clazz.simpleName} was not found in cache, generating now") + logger.debug("${clazz.simpleName} was not found in cache, generating now") var newCache = cache val fieldMap = clazz.memberProperties.associate { prop -> - logger.info("Analyzing $prop in class $clazz") + logger.debug("Analyzing $prop in class $clazz") val field = prop.javaField?.type?.kotlin ?: error("Unable to parse field type from $prop") - logger.info("Detected field $field") + logger.debug("Detected field $field") if (!newCache.containsKey(field.simpleName)) { - logger.info("Cache was missing ${field.simpleName}, adding now") + logger.debug("Cache was missing ${field.simpleName}, adding now") newCache = generateKTypeKontent(prop.returnType, newCache) } val propSchema = ReferencedSchema(field.getReferenceSlug(prop)) Pair(prop.name, propSchema) } - logger.info("${clazz.simpleName} contains $fieldMap") + logger.debug("${clazz.simpleName} contains $fieldMap") val schema = ObjectSchema(fieldMap) - logger.info("${clazz.simpleName} schema: $schema") + logger.debug("${clazz.simpleName} schema: $schema") newCache.plus(clazz.simpleName!! to schema) } } @@ -98,9 +98,9 @@ object Kontent { } private fun handleMapType(type: KType, clazz: KClass<*>, cache: SchemaMap): SchemaMap { - logger.info("Map detected for $type, generating schema and appending to cache") + logger.debug("Map detected for $type, generating schema and appending to cache") val (keyType, valType) = type.arguments.map { it.type } - logger.info("Obtained map types -> key: $keyType and value: $valType") + logger.debug("Obtained map types -> key: $keyType and value: $valType") if (keyType?.classifier != String::class) { error("Invalid Map $type: OpenAPI dictionaries must have keys of type String") } @@ -113,10 +113,10 @@ object Kontent { } private fun handleCollectionType(type: KType, clazz: KClass<*>, cache: SchemaMap): SchemaMap { - logger.info("Collection detected for $type, generating schema and appending to cache") + logger.debug("Collection detected for $type, generating schema and appending to cache") val collectionType = type.arguments.first().type!! val collectionClass = collectionType.classifier as KClass<*> - logger.info("Obtained collection class: $collectionClass") + logger.debug("Obtained collection class: $collectionClass") val referenceName = genericNameAdapter(type, clazz) val valueReference = ReferencedSchema("${COMPONENT_SLUG}/${collectionClass.simpleName}") val schema = ArraySchema(items = valueReference) diff --git a/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/util/Helpers.kt b/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/util/Helpers.kt index f17f17de1..a5120bb32 100644 --- a/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/util/Helpers.kt +++ b/kompendium-core/src/main/kotlin/org/leafygreens/kompendium/util/Helpers.kt @@ -47,9 +47,9 @@ object Helpers { * along with the result of the function invocation */ fun logged(functionName: String, entities: Map, block: () -> T): T { - entities.forEach { (name, entity) -> logger.info("Ahead of $functionName invocation, $name: $entity") } + entities.forEach { (name, entity) -> logger.debug("Ahead of $functionName invocation, $name: $entity") } val result = block.invoke() - logger.info("Result of $functionName invocation: $result") + logger.debug("Result of $functionName invocation: $result") return result }