Merge pull request #28 from Omega-R/feature/repository_code_generation

Gradle version updated to 3.6.1; kotlin updated to 1.3.71.

Author: anton-knyazev

app/src/main/java/com/omega_r/base/simple/InspectionRepository.kt

@@ -5,7 +5,7 @@ import com.omega_r.base.data.OmegaRepository.Strategy
 import kotlinx.coroutines.channels.ReceiveChannel
 
 @AppOmegaRepository
-interface InspectionRepository {
+interface InspectionRepository : ParentRepository {
 
     val isAuth: Boolean?
         get() = true

app/src/main/java/com/omega_r/base/simple/ParentRepository.kt

@@ -0,0 +1,7 @@
+package com.omega_r.base.simple
+
+interface ParentRepository {
+
+    suspend fun parentMethod(): String
+
+}

build.gradle

@@ -5,14 +5,14 @@ ext {
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.61'
+    ext.kotlin_version = '1.3.71'
     repositories {
         google()
         jcenter()
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Dec 03 09:01:16 MSK 2019
+#Fri Mar 27 12:50:10 MSK 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

processor/src/main/java/com/omega_r/base/processor/extensions/TypeMirrorExtensions.kt

@@ -0,0 +1,7 @@
+package com.omega_r.base.processor.extensions
+
+import javax.lang.model.element.TypeElement
+import javax.lang.model.type.DeclaredType
+import javax.lang.model.type.TypeMirror
+
+fun TypeMirror.asTypeElement(): TypeElement = (this as DeclaredType).asElement() as TypeElement

processor/src/main/java/com/omega_r/base/processor/factories/RepositoryFactory.kt

@@ -18,12 +18,18 @@ import javax.annotation.processing.Messager
 import javax.lang.model.element.Element
 import javax.lang.model.element.TypeElement
 import javax.lang.model.util.Elements
-import javax.tools.Diagnostic.Kind.*
+import javax.tools.Diagnostic.Kind.ERROR
 
 private const val FUNC_CLEAR_CACHE = "clearCache"
 
 class RepositoryFactory(private val messager: Messager, private val elements: Elements) {
 
+    private val Element.repositoryPackage
+        get() = elements.packageOf(this)
+
+    private val Element.superInterfaceClassName
+        get() = ClassName.bestGuess("${elements.packageOf(this)}.${this.simpleName}")
+
     fun create(elements: Set<Element>): List<Repository> = elements.mapNotNull { create(it) }
 
     fun create(element: Element): Repository? {
@@ -34,27 +40,33 @@ class RepositoryFactory(private val messager: Messager, private val elements: El
             return null
         }
 
-        val proto = kotlinMetadata.data.classProto
-        if (proto.classKind != INTERFACE) {
+        val classData: ClassData = kotlinMetadata.data
+        if (classData.classProto.classKind != INTERFACE) {
             messager.printMessage(ERROR, "@AppOmegaRepository can't be applied to $element: must be a Kotlin interface")
             return null
         }
 
-        val repositoryPackage = elements.packageOf(element)
-        val repositoryName = element.repositoryName
+        val functions = classData.getFunctions(element).toMutableList()
+        val parameters = classData.getParameters().toMutableList()
+        element.interfaces.forEach {
+            val parentElement = create(it.asTypeElement()) ?: return@forEach
+            functions += parentElement.functions
+            parameters += parentElement.properties
+        }
 
-        val classProto = kotlinMetadata.data.classProto
-        val nameResolver = kotlinMetadata.data.nameResolver
-        val superInterfaceClassName = ClassName.bestGuess("${elements.packageOf(element)}.${element.simpleName}")
+        return Repository(
+            element.repositoryPackage,
+            element.repositoryName,
+            element.superInterfaceClassName,
+            parameters,
+            functions
+        )
+    }
 
-        val properties = classProto.propertyList.mapNotNull { property ->
+    private fun ClassData.getParameters(): List<Parameter> {
+        return classProto.propertyList.mapNotNull { property ->
             property.toParameter(nameResolver)
         }
-        val functions = classProto.functionList.mapNotNull {
-            it.toFunction(element, nameResolver)
-        }
-
-        return Repository(repositoryPackage, repositoryName, superInterfaceClassName, properties, functions)
     }
 
     private fun ProtoBuf.Property.toParameter(nameResolver: NameResolver): Parameter? {
@@ -63,16 +75,20 @@ class RepositoryFactory(private val messager: Messager, private val elements: El
         val className = returnType.getClassName(nameResolver)
         val parameterizedBy = getParameterTypes(returnType, nameResolver)
 
-        messager.printMessage(WARNING, "parameterName $parameterName $parameterizedBy")
-
         return Parameter(parameterName, Type(className, parameterizedBy, returnType.nullable))
     }
 
+    private fun ClassData.getFunctions(element: Element): List<Function> {
+        return classProto.functionList.mapNotNull { function ->
+            function.toFunction(element, nameResolver)
+        }
+    }
+
     private fun ProtoBuf.Function.toFunction(element: Element, nameResolver: NameResolver): Function? {
         if (modality != ProtoBuf.Modality.ABSTRACT) return null
 
         val functionName = nameResolver.getName(this)
-        if(functionName == FUNC_CLEAR_CACHE) return null
+        if (functionName == FUNC_CLEAR_CACHE) return null
 
         val parameters = valueParameterList.map {
             it.toParameter(nameResolver)