Fixing file generation

devmike01 · devmike01 · commit 005c567f6e7e · 2019-03-11T15:18:44.000+01:00
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/SettingsPreference.kt b/annotations/src/main/java/devmike/jade/com/annotations/SettingsPreference.kt
@@ -1,4 +1,6 @@
 package devmike.jade.com.annotations
 
-class SettingsPreference {
+@Target(AnnotationTarget.CONSTRUCTOR)
+@Retention(AnnotationRetention.SOURCE)
+annotation class SettingsPreference {
 }
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadAll.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadAll.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadBoolean.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadBoolean.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadFloat.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadFloat.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadInt.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadInt.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadLong.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadLong.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadString.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadString.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadStringSet.kt b/annotations/src/main/java/devmike/jade/com/annotations/preference/ReadStringSet.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.sharedpreference
+package devmike.jade.com.annotations.preference
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
 annotation class ReadStringSet (val key: String){
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadAll.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadAll.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadBoolean.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadBoolean.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadFloat.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadFloat.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadInt.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadInt.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadLong.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadLong.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadString.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadString.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
diff --git a/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadStringSet.kt b/annotations/src/main/java/devmike/jade/com/annotations/sharedpreference/ReadStringSet.kt
@@ -1,4 +1,4 @@
-package devmike.jade.com.annotations.read
+package devmike.jade.com.annotations.sharedpreference
 @Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)
 @Retention(AnnotationRetention.SOURCE)
 annotation class ReadStringSet (val key: String){
diff --git a/app/src/main/java/devmike/jade/com/jadesharedpreference/MainActivity.kt b/app/src/main/java/devmike/jade/com/jadesharedpreference/MainActivity.kt
@@ -1,23 +1,18 @@
 package devmike.jade.com.jadesharedpreference
 
-import android.content.Context
-import android.content.SharedPreferences
 import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
-import android.text.TextUtils
+import android.preference.PreferenceManager
 import android.util.Log
 import android.view.View
-import android.widget.Toast
+import devmike.jade.com.annotations.SettingsPreference
 import devmike.jade.com.annotations.SharedPref
-import devmike.jade.com.annotations.read.*
+import devmike.jade.com.annotations.sharedpreference.*
 import devmike.jade.com.binder.JadeSharedPreference
-import io.reactivex.Flowable
-import io.reactivex.Single
-import io.reactivex.functions.Consumer
 import kotlinx.android.synthetic.main.activity_main.*
 
 
-class MainActivity @SharedPref("sharedSetKey") constructor(): AppCompatActivity() {
+class MainActivity constructor(): AppCompatActivity() {
 
 
     private lateinit var jsp :JadeSharedPreference
@@ -46,12 +41,16 @@ class MainActivity @SharedPref("sharedSetKey") constructor(): AppCompatActivity(
     lateinit var mMapAll: Map<String, *>
 
 
+    private val settingPref = PreferenceManager.getDefaultSharedPreferences(this)
+
+
     //@SharedPref("key")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
         jsp =JadeSharedPreference.plug(this, this)
 
+
         read_1.text = mString
         read_2.text = mInteger.toString()
         read_3.text = mFloat.toString()
@@ -64,8 +63,8 @@ class MainActivity @SharedPref("sharedSetKey") constructor(): AppCompatActivity(
         save_btn4.setOnClickListener(this::btnTestOne)
         save_btn5.setOnClickListener(this::btnTestOne)
 
-        val vClass =JSPTestClass()
-        vClass.insertValue("hello", "World Of Django")
+       // val vClass =JSPTestClass()
+        //vClass.insertValue("hello", "World Of Django")
 
         Log.d("MainActivity", mMapAll.toString())
 
diff --git a/app/src/main/java/devmike/jade/com/jadesharedpreference/TestClass.kt b/app/src/main/java/devmike/jade/com/jadesharedpreference/TestClass.kt
@@ -1,16 +1,16 @@
 package devmike.jade.com.jadesharedpreference
 
 import android.content.Context
+import devmike.jade.com.annotations.SettingsPreference
 import devmike.jade.com.annotations.SharedPref
-import devmike.jade.com.annotations.read.ReadInt
-import devmike.jade.com.annotations.read.ReadString
+import devmike.jade.com.annotations.sharedpreference.ReadString
 import devmike.jade.com.binder.JadeSharedPreference
 
- class TestClass
-@SharedPref("test0") constructor(context: Context){
+ class TestClass constructor(context: Context){
 
      var jsp: JadeSharedPreference = JadeSharedPreference.plug(this, context)
 
+    // @ReadString("string")
     val TEST_KEY: String ="test_key"
 
     fun init(context: Context){
diff --git a/binder/src/main/java/devmike/jade/com/binder/JadeSharedPreference.kt b/binder/src/main/java/devmike/jade/com/binder/JadeSharedPreference.kt
@@ -14,7 +14,7 @@ public object JadeSharedPreference {
     private  var bindingClass: Class<*>? =null
 
     fun <T : Any> plug(targetClas: T, context: Context) : JadeSharedPreference{
-        val className: String ="${targetClas::class.java.`package`.name}.JSP${targetClas::class.simpleName}"
+        val className ="${targetClas::class.java.`package`.name}.JSP${targetClas::class.simpleName}"
         this.bindingClass = targetClas.javaClass.classLoader?.loadClass( className)
         val method = bindingClass?.getMethod("plug", Context::class.java, Any::class.java)
 
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/AnnotationProcessor.kt b/compiler/src/main/java/devmike/jade/com/compiler/AnnotationProcessor.kt
@@ -1,46 +1,58 @@
 package devmike.jade.com.compiler
 
-import com.google.auto.service.AutoService
+import com.squareup.kotlinpoet.*
+import devmike.jade.com.annotations.SettingsPreference
+import devmike.jade.com.compiler.sharedpreference.ProcessorHelper
 import devmike.jade.com.annotations.SharedPref
-import devmike.jade.com.annotations.read.*
+import devmike.jade.com.annotations.sharedpreference.*
+import devmike.jade.com.compiler.preferences.PreferenceProcessorHelper
+import java.lang.IllegalArgumentException
 import javax.annotation.processing.*
-import javax.lang.model.SourceVersion
 import javax.lang.model.element.TypeElement
 import javax.lang.model.util.Elements
 
 
-@AutoService(Processor::class)
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
-@SupportedOptions(ProcessorHelper.KAPT_KOTLIN_GENERATED)
-
-class AnnotationProcessor : AbstractProcessor() {
-    private lateinit var filer: Filer
-    private lateinit var messager: Messager
-    private lateinit var elementUtil: Elements
-
-
-    override fun init (processingEnv: ProcessingEnvironment){
-        super.init(processingEnv)
-        this.filer = processingEnv.filer
-        this.messager = processingEnv.messager
-        this.elementUtil = processingEnv.elementUtils
-    }
+abstract class AnnotationProcessor : AbstractProcessor() {
 
     override fun process(annotations: MutableSet<out TypeElement>, roundEnv: RoundEnvironment): Boolean {
-        ProcessorHelper.process(processingEnv, annotations, roundEnv)
+        //ProcessorHelper.process(processingEnv, annotations, roundEnv)
+
+        if (prefName() == NameStore.SUFFIX_SHAREDPREF_CLASSNAME) {
+            ProcessorHelper.Builder()
+                .addParameters(annotations, roundEnv, processingEnv)
+                .build()
+        }else if (prefName() == NameStore.SUFFIX_PREFERENCE_CLASSNAME){
+            PreferenceProcessorHelper.Builder()
+                .addParameters(annotations, roundEnv, processingEnv)
+                .build()
+        }
         return true
     }
 
+    abstract fun prefName(): String
+
 
     override fun getSupportedAnnotationTypes(): MutableSet<String?>  {
 
-        //_____
-        return mutableSetOf(
-            SharedPref::class.java.name,
-            ReadFloat::class.java.name, ReadInt::class.java.name,
-            ReadString::class.java.name,
-            ReadLong::class.java.name,
-            ReadStringSet::class.java.name)
+        if (prefName() == NameStore.SUFFIX_PREFERENCE_CLASSNAME){
+            //Generates codes for Preference
+            return mutableSetOf(
+                SettingsPreference::class.java.name,
+                devmike.jade.com.annotations.preference.ReadFloat::class.java.name, ReadInt::class.java.name,
+                devmike.jade.com.annotations.preference.ReadString::class.java.name,
+                devmike.jade.com.annotations.preference.ReadLong::class.java.name,
+                devmike.jade.com.annotations.preference.ReadStringSet::class.java.name)
+        }else if(prefName() == NameStore.SUFFIX_SHAREDPREF_CLASSNAME){
+            //Generate codes for SharedPreference
+            return mutableSetOf(
+                SharedPref::class.java.name,
+                ReadFloat::class.java.name, ReadInt::class.java.name,
+                ReadString::class.java.name,
+                ReadLong::class.java.name,
+                ReadStringSet::class.java.name)
+        }
+
+        throw IllegalArgumentException("AnnotationProcessor: ${prefName()} is not supported")
     }
 
 
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/FileGenerator.kt b/compiler/src/main/java/devmike/jade/com/compiler/FileGenerator.kt
@@ -1,4 +1,64 @@
 package devmike.jade.com.compiler
 
-class FileGenerator {
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.TypeSpec
+import java.io.File
+import java.util.HashSet
+import javax.lang.model.element.Element
+import javax.lang.model.element.TypeElement
+
+/**
+ * This writes the generated class to the developer project directory.
+ */
+object FileGenerator {
+
+    private lateinit var fileSpecBuilder: FileSpec.Builder
+
+    private lateinit var file: File
+
+    fun builder(packageName: String, name: String): FileGenerator{
+        fileSpecBuilder = FileSpec.builder(packageName, name)
+        return this
+    }
+
+    fun addType(typeSpec: TypeSpec): FileGenerator{
+        fileSpecBuilder.addType(typeSpec)
+        return this
+    }
+
+    fun addFile(file :File): FileGenerator{
+        this.file = file
+        return this
+    }
+
+    fun build(){
+        fileSpecBuilder.build()
+            .writeTo(file)
+    }
+
+
+    object TypeElement{
+        public fun getTypeElementsToProcess(elements: Set<Element>, supportedAnnotations: Set<Element>): Set<javax.lang.model.element.TypeElement> {
+            val typeElements = HashSet<javax.lang.model.element.TypeElement>()
+            for (element in elements) {
+                if (element is javax.lang.model.element.TypeElement) {
+                    var found = false
+                    for (subElement in element.getEnclosedElements()) {
+                        for (mirror in subElement.getAnnotationMirrors()) {
+                            for (annotation in supportedAnnotations) {
+                                if (mirror.getAnnotationType().asElement() == annotation) {
+                                    typeElements.add(element)
+                                    found = true
+                                    break
+                                }
+                            }
+                            if (found) break
+                        }
+                        if (found) break
+                    }
+                }
+            }
+            return typeElements
+        }
+    }
 }
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/NameStore.kt b/compiler/src/main/java/devmike/jade/com/compiler/NameStore.kt
@@ -1,23 +1,27 @@
-package devmike.jade.com.processor
+package devmike.jade.com.compiler
 
 public object NameStore {
 
     //public fun getGeneratedClassName(className: String) = className.plus(BindingSuffix.
        // GENERATED_CLASS_SUFFIX)
 
-    public fun getGeneratedClassName(param: String) =
+    const val SUFFIX_SHAREDPREF_CLASSNAME: String ="JSP"
+    const val SUFFIX_PREFERENCE_CLASSNAME: String ="JSP_Preference"
+
+    public fun getGeneratedSharedPrefClassName(param: String) =
         "JSP$param"
 
 
+    public fun getGeneratedPreferenceClassName(param: String) =
+        "JSP_Preference$param"
+
+
+    const val KAPT_KOTLIN_GENERATED = "kapt.kotlin.generated"
+
     object Package {
-        const val LOGGER : String = "android.util"
         const val CONTEXT ="android.content"
-        const val JADEKNIFE_BASE ="devmike.jade.com_JadeSharedPreference"
         const val ANDROID_SHAREDPREF="android.content"
-        const val GENERATED_CLASS ="JadeSharedPreference"
-        const val CLASS_ ="kotlin"
-
-
+        const val ANDROID_PREFERENCE ="android.preference"
     }
 
     object Variable {
@@ -29,7 +33,7 @@ public object NameStore {
         const val SHAREDPREF_LISTENER ="sharedPrefListener"
         const val ARGUMENT ="arg0"
         const val READ_ALL = "Hey! Read All"
-
+        const val PREFERENCE ="settingPref"
     }
 
 
@@ -41,10 +45,11 @@ public object NameStore {
         const val ANDROID_SHARED_PREF_EDITOR ="SharedPreferences.Editor"
         const val STRING_SET ="Set<String>"
         const val STRING ="String"
+        const val PREFERENCE_MANAGER ="PreferenceManager"
     }
 
     object Method {
-
+        const val GET_DEFAULTSHAREDPREFERENCES ="getDefaultSharedPreferences"
         const val UNREGISTER_SHARED_PREF_LISTENER ="unregisterOnSharedPreferenceChangeListener"
         const val CONTEXT ="context"
         const val SHARED_PREF ="generateSharePref"
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/factory/Factory.kt b/compiler/src/main/java/devmike/jade/com/compiler/factory/Factory.kt
@@ -1,4 +1,5 @@
 package devmike.jade.com.compiler.factory
 
-enum class FactoryProcessor {
+enum class Factory {
+    SHAREDPREFERENCE, PREFERENCE
 }
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/factory/JadeProcessor.kt b/compiler/src/main/java/devmike/jade/com/compiler/factory/JadeProcessor.kt
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/factory/ProcessorFactory.kt b/compiler/src/main/java/devmike/jade/com/compiler/factory/ProcessorFactory.kt
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/preferences/PreferenceProcessor.kt b/compiler/src/main/java/devmike/jade/com/compiler/preferences/PreferenceProcessor.kt
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/preferences/PreferenceProcessorHelper.kt b/compiler/src/main/java/devmike/jade/com/compiler/preferences/PreferenceProcessorHelper.kt
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/sharedpreference/ProcessorHelper.kt b/compiler/src/main/java/devmike/jade/com/compiler/sharedpreference/ProcessorHelper.kt
diff --git a/compiler/src/main/java/devmike/jade/com/compiler/sharedpreference/SharedPreferenceProcessor.kt b/compiler/src/main/java/devmike/jade/com/compiler/sharedpreference/SharedPreferenceProcessor.kt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`package devmike.jade.com.annotations`
`2`	`2`
`3`		`-class SettingsPreference {`
	`3`	`+@Target(AnnotationTarget.CONSTRUCTOR)`
	`4`	`+@Retention(AnnotationRetention.SOURCE)`
	`5`	`+annotation class SettingsPreference {`
`4`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package devmike.jade.com.annotations.sharedpreference`
	`1`	`+package devmike.jade.com.annotations.preference`
`2`	`2`
`3`	`3`	`@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)`
`4`	`4`	`@Retention(AnnotationRetention.SOURCE)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package devmike.jade.com.annotations.read`
	`1`	`+package devmike.jade.com.annotations.sharedpreference`
`2`	`2`
`3`	`3`	`@Target(AnnotationTarget.FIELD, AnnotationTarget.FUNCTION)`
`4`	`4`	`@Retention(AnnotationRetention.SOURCE)`