diff --git a/kripton-android-core/pom.xml b/kripton-android-core/pom.xml index 5726bc4c5..fc32c2179 100644 --- a/kripton-android-core/pom.xml +++ b/kripton-android-core/pom.xml @@ -13,7 +13,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -25,7 +25,7 @@ Kripton Persistence Library for Android platform - core module for android modules - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-android-library/pom.xml b/kripton-android-library/pom.xml index f760d8836..74175b7d9 100644 --- a/kripton-android-library/pom.xml +++ b/kripton-android-library/pom.xml @@ -14,7 +14,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -30,7 +30,7 @@ 2.2.19 1.0.3 - 8.2.0-rc.3 + 8.2.0-rc.4 3.1.4 4.13.1 3.4.2 diff --git a/kripton-android-library/src/test/java/sqlite/git104/DocumentTable.java b/kripton-android-library/src/test/java/sqlite/git104/DocumentTable.java index 36e5aef1f..b0ed62ba4 100644 --- a/kripton-android-library/src/test/java/sqlite/git104/DocumentTable.java +++ b/kripton-android-library/src/test/java/sqlite/git104/DocumentTable.java @@ -130,11 +130,11 @@ public static DocumentInfo parseInfo(byte[] input) { JsonParser jacksonParser=wrapper.jacksonParser; // START_OBJECT jacksonParser.nextToken(); - DocumentInfo result=null; + DocumentInfo __info = null; if (jacksonParser.currentToken()==JsonToken.START_OBJECT) { - result=documentInfoBindMap.parseOnJackson(jacksonParser); + __info = documentInfoBindMap.parseOnJackson(jacksonParser); } - return result; + return __info; } catch(Exception e) { e.printStackTrace(); throw(new KriptonRuntimeException(e.getMessage())); diff --git a/kripton-arch-integration/pom.xml b/kripton-arch-integration/pom.xml index c113a785d..a164f40f3 100644 --- a/kripton-arch-integration/pom.xml +++ b/kripton-arch-integration/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml diff --git a/kripton-arch-test/pom.xml b/kripton-arch-test/pom.xml index 8755bd0f6..98d716390 100644 --- a/kripton-arch-test/pom.xml +++ b/kripton-arch-test/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml diff --git a/kripton-core/pom.xml b/kripton-core/pom.xml index c19c256a9..2286b49df 100644 --- a/kripton-core/pom.xml +++ b/kripton-core/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml diff --git a/kripton-dataformat-cbor/pom.xml b/kripton-dataformat-cbor/pom.xml index c76c69397..0210f5a94 100644 --- a/kripton-dataformat-cbor/pom.xml +++ b/kripton-dataformat-cbor/pom.xml @@ -6,7 +6,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -16,7 +16,7 @@ jar - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-dataformat-properties/pom.xml b/kripton-dataformat-properties/pom.xml index 05bb8b088..3023b3f54 100644 --- a/kripton-dataformat-properties/pom.xml +++ b/kripton-dataformat-properties/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -16,7 +16,7 @@ jar - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-dataformat-smile/pom.xml b/kripton-dataformat-smile/pom.xml index c7a2bde11..d2ead58c0 100644 --- a/kripton-dataformat-smile/pom.xml +++ b/kripton-dataformat-smile/pom.xml @@ -5,14 +5,14 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml kripton-dataformat-smile - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-dataformat-yaml/pom.xml b/kripton-dataformat-yaml/pom.xml index 3f59418b6..62f2b6392 100644 --- a/kripton-dataformat-yaml/pom.xml +++ b/kripton-dataformat-yaml/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -15,7 +15,7 @@ jar - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-example01/pom.xml b/kripton-example01/pom.xml index 7ed4697aa..068e131ed 100644 --- a/kripton-example01/pom.xml +++ b/kripton-example01/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml diff --git a/kripton-orm/pom.xml b/kripton-orm/pom.xml index 8033d32eb..7101ae69f 100644 --- a/kripton-orm/pom.xml +++ b/kripton-orm/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -16,7 +16,7 @@ jar - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-parent/pom.xml b/kripton-parent/pom.xml index 7c624ed53..54691f07f 100644 --- a/kripton-parent/pom.xml +++ b/kripton-parent/pom.xml @@ -12,7 +12,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 pom Kripton (Parent) @@ -40,7 +40,7 @@ 3.2.0 3.0.1 - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-processor/pom.xml b/kripton-processor/pom.xml index c09348879..a34408910 100644 --- a/kripton-processor/pom.xml +++ b/kripton-processor/pom.xml @@ -14,7 +14,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -26,7 +26,7 @@ false - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BaseProcessor.java b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BaseProcessor.java index 5bdec5b84..7c5ceddf6 100644 --- a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BaseProcessor.java +++ b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BaseProcessor.java @@ -15,18 +15,10 @@ *******************************************************************************/ package com.abubusoft.kripton.processor; -import java.lang.annotation.Annotation; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.logging.Logger; +import com.abubusoft.kripton.annotation.BindType; +import com.abubusoft.kripton.processor.core.AssertKripton; -import javax.annotation.processing.AbstractProcessor; -import javax.annotation.processing.Filer; -import javax.annotation.processing.Messager; -import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.*; import javax.lang.model.SourceVersion; import javax.lang.model.element.Element; import javax.lang.model.element.ElementKind; @@ -34,28 +26,46 @@ import javax.lang.model.util.Elements; import javax.lang.model.util.Types; import javax.tools.Diagnostic; - -import com.abubusoft.kripton.annotation.BindType; -import com.abubusoft.kripton.processor.core.AssertKripton; +import java.lang.annotation.Annotation; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.logging.Logger; /** * The Class BaseProcessor. */ public abstract class BaseProcessor extends AbstractProcessor { - /** if we want to display debug info. */ + /** + * if we want to display debug info. + */ public static boolean DEBUG_MODE = false; - - /** if we want to display debug info. */ + + /** + * if we want to display debug info. + */ public static boolean LOG_GENERATION_ENABLED_MODE = true; - /** The element utils. */ + /** + * if true, schema is generated with date + */ + public static boolean SCHEMA_INCLUDE_DATE_MODE = true; + + /** + * The element utils. + */ public static Elements elementUtils; - - /** if true we are in a test. */ + + /** + * if true we are in a test. + */ public static boolean JUNIT_TEST_MODE = false; - - /** The logger. */ + + /** + * The logger. + */ protected static Logger logger = Logger.getGlobal(); /** The count. */ @@ -116,7 +126,6 @@ public Set filter(RoundEnvironment roundEnv) { @Override public boolean process(Set annotations, RoundEnvironment roundEnv) { - // TODO Auto-generated method stub return false; } @@ -132,7 +141,7 @@ public boolean process(Set annotations, RoundEnvironment */ @Override public Set getSupportedAnnotationTypes() { - Set result=new HashSet(); + Set result=new HashSet<>(); for (Class annotation: getSupportedAnnotationClasses()) { result.add(annotation.getCanonicalName()); } @@ -158,11 +167,7 @@ public SourceVersion getSupportedSourceVersion() { * @return true, if successful */ public boolean hasWorkInThisRound(RoundEnvironment roundEnv) { - if (this.filter(roundEnv).size()>0) { - return true; - } - - return false; + return !this.filter(roundEnv).isEmpty(); } /** diff --git a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BindDataSourceSubProcessor.java b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BindDataSourceSubProcessor.java index 419711729..1a0e7c6f4 100644 --- a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BindDataSourceSubProcessor.java +++ b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/BindDataSourceSubProcessor.java @@ -15,43 +15,9 @@ *******************************************************************************/ package com.abubusoft.kripton.processor; -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.annotation.processing.ProcessingEnvironment; -import javax.annotation.processing.RoundEnvironment; -import javax.lang.model.element.Element; -import javax.lang.model.element.ElementKind; -import javax.lang.model.element.ExecutableElement; -import javax.lang.model.element.TypeElement; - import com.abubusoft.kripton.android.ColumnAffinityType; import com.abubusoft.kripton.android.ColumnType; -import com.abubusoft.kripton.android.annotation.BindContentProvider; -import com.abubusoft.kripton.android.annotation.BindContentProviderEntry; -import com.abubusoft.kripton.android.annotation.BindContentProviderPath; -import com.abubusoft.kripton.android.annotation.BindDao; -import com.abubusoft.kripton.android.annotation.BindDaoMany2Many; -import com.abubusoft.kripton.android.annotation.BindDataSource; -import com.abubusoft.kripton.android.annotation.BindDataSourceOptions; -import com.abubusoft.kripton.android.annotation.BindGeneratedDao; -import com.abubusoft.kripton.android.annotation.BindSqlAdapter; -import com.abubusoft.kripton.android.annotation.BindSqlChildSelect; -import com.abubusoft.kripton.android.annotation.BindSqlColumn; -import com.abubusoft.kripton.android.annotation.BindSqlDelete; -import com.abubusoft.kripton.android.annotation.BindSqlInsert; -import com.abubusoft.kripton.android.annotation.BindSqlRelation; -import com.abubusoft.kripton.android.annotation.BindSqlSelect; -import com.abubusoft.kripton.android.annotation.BindSqlType; -import com.abubusoft.kripton.android.annotation.BindSqlUpdate; +import com.abubusoft.kripton.android.annotation.*; import com.abubusoft.kripton.android.sqlite.ForeignKeyAction; import com.abubusoft.kripton.android.sqlite.NoPopulator; import com.abubusoft.kripton.annotation.BindDisabled; @@ -64,12 +30,7 @@ import com.abubusoft.kripton.processor.bind.model.BindEntity; import com.abubusoft.kripton.processor.bind.model.BindProperty; import com.abubusoft.kripton.processor.bind.model.many2many.M2MEntity; -import com.abubusoft.kripton.processor.core.AnnotationAttributeType; -import com.abubusoft.kripton.processor.core.AssertKripton; -import com.abubusoft.kripton.processor.core.ImmutableUtility; -import com.abubusoft.kripton.processor.core.ModelAnnotation; -import com.abubusoft.kripton.processor.core.ModelProperty; -import com.abubusoft.kripton.processor.core.Touple; +import com.abubusoft.kripton.processor.core.*; import com.abubusoft.kripton.processor.core.reflect.AnnotationUtility; import com.abubusoft.kripton.processor.core.reflect.AnnotationUtility.AnnotationFilter; import com.abubusoft.kripton.processor.core.reflect.AnnotationUtility.AnnotationFoundListener; @@ -79,44 +40,29 @@ import com.abubusoft.kripton.processor.core.reflect.PropertyUtility.PropertyCreatedListener; import com.abubusoft.kripton.processor.core.reflect.TypeUtility; import com.abubusoft.kripton.processor.element.GeneratedTypeElement; -import com.abubusoft.kripton.processor.exceptions.DaoDefinitionWithoutAnnotatedMethodException; -import com.abubusoft.kripton.processor.exceptions.InvalidBeanTypeException; -import com.abubusoft.kripton.processor.exceptions.InvalidDefinition; -import com.abubusoft.kripton.processor.exceptions.InvalidKindForAnnotationException; -import com.abubusoft.kripton.processor.exceptions.InvalidNameException; -import com.abubusoft.kripton.processor.exceptions.NoDaoElementFound; -import com.abubusoft.kripton.processor.exceptions.PropertyNotFoundException; -import com.abubusoft.kripton.processor.exceptions.SQLPrimaryKeyNotFoundException; -import com.abubusoft.kripton.processor.exceptions.SQLPrimaryKeyNotValidTypeException; -import com.abubusoft.kripton.processor.exceptions.TooManySQLPrimaryKeyFoundException; -import com.abubusoft.kripton.processor.sqlite.BindAsyncTaskBuilder; -import com.abubusoft.kripton.processor.sqlite.BindContentProviderBuilder; -import com.abubusoft.kripton.processor.sqlite.BindCursorBuilder; -import com.abubusoft.kripton.processor.sqlite.BindDaoBuilder; -import com.abubusoft.kripton.processor.sqlite.BindDataSourceBuilder; -import com.abubusoft.kripton.processor.sqlite.BindTableGenerator; -import com.abubusoft.kripton.processor.sqlite.SelectBuilderUtility; +import com.abubusoft.kripton.processor.exceptions.*; +import com.abubusoft.kripton.processor.sqlite.*; import com.abubusoft.kripton.processor.sqlite.SelectBuilderUtility.SelectType; -import com.abubusoft.kripton.processor.sqlite.SqlAnalyzer; -import com.abubusoft.kripton.processor.sqlite.SqlBuilderHelper; -import com.abubusoft.kripton.processor.sqlite.SqlKeywordsHelper; import com.abubusoft.kripton.processor.sqlite.grammars.jql.JQL.JQLDeclarationType; import com.abubusoft.kripton.processor.sqlite.grammars.jql.JQLChecker; import com.abubusoft.kripton.processor.sqlite.grammars.jsql.JqlBaseListener; import com.abubusoft.kripton.processor.sqlite.grammars.jsql.JqlParser.Where_stmt_clausesContext; -import com.abubusoft.kripton.processor.sqlite.model.SQLProperty; -import com.abubusoft.kripton.processor.sqlite.model.SQLRelationType; -import com.abubusoft.kripton.processor.sqlite.model.SQLiteDaoDefinition; -import com.abubusoft.kripton.processor.sqlite.model.SQLiteDatabaseSchema; -import com.abubusoft.kripton.processor.sqlite.model.SQLiteEntity; -import com.abubusoft.kripton.processor.sqlite.model.SQLiteModelContentProvider; -import com.abubusoft.kripton.processor.sqlite.model.SQLiteModelMethod; +import com.abubusoft.kripton.processor.sqlite.model.*; import com.google.common.base.CaseFormat; import com.google.common.base.Converter; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; +import javax.annotation.processing.ProcessingEnvironment; +import javax.annotation.processing.RoundEnvironment; +import javax.lang.model.element.Element; +import javax.lang.model.element.ElementKind; +import javax.lang.model.element.ExecutableElement; +import javax.lang.model.element.TypeElement; +import java.lang.annotation.Annotation; +import java.util.*; + /** * The Class BindDataSourceSubProcessor. */ @@ -128,26 +74,27 @@ public static BindDataSourceSubProcessor getInstance() { return instance; } + /** + * The global dao elements. + */ + public final Map globalDaoElements = new HashMap<>(); + + /** + * The property annotation filter. + */ + private final AnnotationFilter propertyAnnotationFilter = AnnotationFilter.builder().add(BindDisabled.class) + .add(BindSqlColumn.class).add(BindSqlAdapter.class).add(BindSqlRelation.class).build(); + public Set getSupportedOptions() { HashSet result = new HashSet<>(); + result.add(KriptonOptions.SCHEMA_INCLUDE_DATE_NAME); result.add(KriptonOptions.SCHEMA_LOCATION_OPTION_NAME); result.add(KriptonOptions.LOG_ENABLED_OPTION_NAME); return result; } - /** - * The property annotation filter. - */ - private final AnnotationFilter propertyAnnotationFilter = AnnotationFilter.builder().add(BindDisabled.class) - .add(BindSqlColumn.class).add(BindSqlAdapter.class).add(BindSqlRelation.class).build(); - - /** - * The global dao elements. - */ - public final Map globalDaoElements = new HashMap(); - /** * The data sets. */ diff --git a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/KriptonOptions.java b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/KriptonOptions.java index 720475e9f..3831f3c7a 100644 --- a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/KriptonOptions.java +++ b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/KriptonOptions.java @@ -1,16 +1,16 @@ package com.abubusoft.kripton.processor; -import java.io.File; +import com.abubusoft.kripton.common.StringUtils; import javax.annotation.processing.ProcessingEnvironment; - -import com.abubusoft.kripton.common.StringUtils; +import java.io.File; public abstract class KriptonOptions { public static String DEBUG_OPTION_NAME = "kripton.debug"; public static String SCHEMA_LOCATION_OPTION_NAME = "kripton.schemaLocation"; - //public static String ANDROID_X_OPTION_NAME = "kripton.androidx"; - //public static String ANDROID_X_DB_OPTION_NAME = "kripton.androidx.db"; + + public static String SCHEMA_INCLUDE_DATE_NAME = "kripton.schemaIncludeDate"; + public static String LOG_ENABLED_OPTION_NAME = "kripton.log"; public static String schemaLocationDirectory; @@ -26,23 +26,26 @@ public static void init(KriptonProcessor kriptonProcessor, ProcessingEnvironment // DEBUG MODE // if it is already in debug mode, we keep it KriptonProcessor.DEBUG_MODE = KriptonProcessor.DEBUG_MODE - || "true".equals(getOptionValue(processingEnv, KriptonOptions.DEBUG_OPTION_NAME)); - + || "true".equals(getOptionValue(processingEnv, KriptonOptions.DEBUG_OPTION_NAME)); + // LOG MODE // get kripton.log value KriptonProcessor.LOG_GENERATION_ENABLED_MODE = KriptonProcessor.LOG_GENERATION_ENABLED_MODE && !"false".equals(getOptionValue(processingEnv, KriptonOptions.LOG_ENABLED_OPTION_NAME)); // SCHEMA MODE - schemaLocationDirectory = getOptionValue(processingEnv, KriptonOptions.SCHEMA_LOCATION_OPTION_NAME) ; + schemaLocationDirectory = getOptionValue(processingEnv, KriptonOptions.SCHEMA_LOCATION_OPTION_NAME); if (!StringUtils.hasText(schemaLocationDirectory)) { schemaLocationDirectory = "schemas"; } + KriptonProcessor.SCHEMA_INCLUDE_DATE_MODE = !"false".equals(getOptionValue(processingEnv, KriptonOptions.SCHEMA_INCLUDE_DATE_NAME)); + + // ANDROIDX MODE // KriptonDynamicClassManager.init(getOptionValue(processingEnv, KriptonOptions.ANDROID_X_OPTION_NAME), // getOptionValue(processingEnv, KriptonOptions.ANDROID_X_DB_OPTION_NAME)); KriptonDynamicClassManager.init(); - + if (KriptonProcessor.DEBUG_MODE && !KriptonProcessor.JUNIT_TEST_MODE) { KriptonProcessor.info("Kripton Persistence Library v. " + Version.getVersion()); diff --git a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/sqlite/BindDataSourceBuilder.java b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/sqlite/BindDataSourceBuilder.java index 3d5f271a8..dfa7f3268 100644 --- a/kripton-processor/src/main/java/com/abubusoft/kripton/processor/sqlite/BindDataSourceBuilder.java +++ b/kripton-processor/src/main/java/com/abubusoft/kripton/processor/sqlite/BindDataSourceBuilder.java @@ -15,52 +15,18 @@ *******************************************************************************/ package com.abubusoft.kripton.processor.sqlite; -import static com.abubusoft.kripton.processor.core.reflect.TypeUtility.className; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - -import javax.annotation.processing.Filer; -import javax.lang.model.element.Modifier; -import javax.lang.model.element.PackageElement; -import javax.lang.model.util.Elements; - import androidx.annotation.NonNull; import com.abubusoft.kripton.android.KriptonLibrary; import com.abubusoft.kripton.android.Logger; import com.abubusoft.kripton.android.annotation.BindDataSource; -import com.abubusoft.kripton.android.sqlite.AbstractDataSource; +import com.abubusoft.kripton.android.sqlite.*; import com.abubusoft.kripton.android.sqlite.AbstractDataSource.AbstractExecutable; import com.abubusoft.kripton.android.sqlite.AbstractDataSource.OnErrorListener; -import com.abubusoft.kripton.android.sqlite.DataSourceOptions; -import com.abubusoft.kripton.android.sqlite.SQLContext; -import com.abubusoft.kripton.android.sqlite.SQLContextInSessionImpl; -import com.abubusoft.kripton.android.sqlite.SQLiteEvent; -import com.abubusoft.kripton.android.sqlite.SQLiteTable; -import com.abubusoft.kripton.android.sqlite.SQLiteUpdateTask; -import com.abubusoft.kripton.android.sqlite.SQLiteUpdateTaskHelper; -import com.abubusoft.kripton.android.sqlite.TransactionResult; import com.abubusoft.kripton.common.CaseFormat; import com.abubusoft.kripton.common.Converter; import com.abubusoft.kripton.common.Pair; import com.abubusoft.kripton.exception.KriptonRuntimeException; -import com.abubusoft.kripton.processor.BaseProcessor; -import com.abubusoft.kripton.processor.BindDataSourceSubProcessor; -import com.abubusoft.kripton.processor.KriptonDynamicClassManager; -import com.abubusoft.kripton.processor.KriptonOptions; -import com.abubusoft.kripton.processor.KriptonProcessorVersion; +import com.abubusoft.kripton.processor.*; import com.abubusoft.kripton.processor.bind.JavaWriterHelper; import com.abubusoft.kripton.processor.core.reflect.TypeUtility; import com.abubusoft.kripton.processor.element.GeneratedTypeElement; @@ -73,19 +39,21 @@ import com.abubusoft.kripton.processor.utils.AnnotationProcessorUtilis; import com.squareup.javapoet.*; import com.squareup.javapoet.FieldSpec.Builder; - -import io.reactivex.BackpressureStrategy; -import io.reactivex.Flowable; -import io.reactivex.FlowableEmitter; -import io.reactivex.Maybe; -import io.reactivex.MaybeEmitter; import io.reactivex.Observable; -import io.reactivex.ObservableEmitter; -import io.reactivex.Scheduler; -import io.reactivex.Single; -import io.reactivex.SingleEmitter; +import io.reactivex.*; import io.reactivex.subjects.PublishSubject; +import javax.annotation.processing.Filer; +import javax.lang.model.element.Modifier; +import javax.lang.model.element.PackageElement; +import javax.lang.model.util.Elements; +import java.io.*; +import java.util.*; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; + +import static com.abubusoft.kripton.processor.core.reflect.TypeUtility.className; + /** * Generates database class. * @@ -167,12 +135,14 @@ private static void generateSchema(SQLiteDatabaseSchema schema) throws FileNotFo bw.write("------------------------------------------------------------------------------------\n"); bw.write("--\n"); - bw.write("-- Filename: " + schemaCreation + "\n"); + bw.write(String.format("-- Filename: %s%n", schemaCreation)); if (!BindDataSourceSubProcessor.JUNIT_TEST_MODE) { - bw.write("-- Generated by: kripton annotation processor " + KriptonProcessorVersion.VERSION + "\n"); - bw.write(String.format("-- Date: %s", (new Date()).toString()) + "\n"); + bw.write(String.format("-- Generated by: kripton annotation processor %s%n", KriptonProcessorVersion.VERSION)); + } + if (!BindDataSourceSubProcessor.JUNIT_TEST_MODE && BindDataSourceSubProcessor.SCHEMA_INCLUDE_DATE_MODE) { + bw.write(String.format("-- Date: %s%n", new Date())); } - bw.write(String.format("--\n")); + bw.write(String.format("--%n")); bw.write("------------------------------------------------------------------------------------\n"); bw.newLine(); for (String sql : schema.sqlForCreate) { diff --git a/kripton-retrofit-converter/pom.xml b/kripton-retrofit-converter/pom.xml index 7e87515c9..f82c3eb4f 100644 --- a/kripton-retrofit-converter/pom.xml +++ b/kripton-retrofit-converter/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -15,8 +15,8 @@ 1.8 - - 8.2.0-rc.3 + + 8.2.0-rc.4 2.13.4 diff --git a/kripton-shared-preferences/pom.xml b/kripton-shared-preferences/pom.xml index 6c04a7dc7..14df5f2f2 100644 --- a/kripton-shared-preferences/pom.xml +++ b/kripton-shared-preferences/pom.xml @@ -5,7 +5,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -16,7 +16,7 @@ jar - 8.2.0-rc.3 + 8.2.0-rc.4 2.13.4 diff --git a/kripton-sqlite-test-library/pom.xml b/kripton-sqlite-test-library/pom.xml index f6ff9817d..ca3733cd3 100644 --- a/kripton-sqlite-test-library/pom.xml +++ b/kripton-sqlite-test-library/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.abubusoft kripton-sqlite-test-library - 8.2.0-rc.3 + 8.2.0-rc.4 Kripton SQLite Test Library Kripton SQLite Test Library @@ -12,7 +12,7 @@ - 8.2.0-rc.3 + 8.2.0-rc.4 1.8 diff --git a/kripton/pom.xml b/kripton/pom.xml index b76871f9d..aa22baf27 100644 --- a/kripton/pom.xml +++ b/kripton/pom.xml @@ -14,7 +14,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ../kripton-parent/pom.xml @@ -25,7 +25,7 @@ Kripton Persistence Library - 8.2.0-rc.3 + 8.2.0-rc.4 1.8 1.8 diff --git a/pom.xml b/pom.xml index 6df3e6853..98bf4ff3f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.abubusoft kripton-parent - 8.2.0-rc.3 + 8.2.0-rc.4 ./kripton-parent/pom.xml