From 457fa7543ab73a306f632aea96c2f0175205b574 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Fri, 3 Dec 2021 02:36:22 +0300
Subject: [PATCH 01/15] CI gradle.yml updated codestyle.xml 80->100 comment
 line gradle wrapper updated to 7.3 build.gradle cleanup and updated

---
 .github/workflows/gradle.yml             |  41 ++++----
 .gitignore                               |  19 +++-
 build.gradle                             | 120 +++++++++++------------
 config/codestyle.xml                     |   2 +-
 gradle.properties                        |   4 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 8 files changed, 103 insertions(+), 87 deletions(-)

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index c18d9a82..8669bab5 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -1,16 +1,13 @@
 name: Java CI
 
-on:   
+on:
   push:
     branches:
-    - master
-    - dev
-  schedule:
-  - cron: "0 12 1 * *"
+      - master
   pull_request:
     branches:
-    - master
-    - dev
+      - master
+      - dev
 
 jobs:
   build:
@@ -21,18 +18,24 @@ jobs:
     name: Java ${{ matrix.java }} setup
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK
-      uses: actions/setup-java@v1
+      - uses: actions/checkout@v1
+      - name: Set up JDK
+        uses: actions/setup-java@v1
 
-      with:
-        java-version: ${{ matrix.java }}
+        with:
+          java-version: ${{ matrix.java }}
 
-    - name: Build with Gradle
-      run: ./gradlew build jacocoTestReport
+      - name: Build
+        run: ./gradlew classes
 
-    - name: Analyze with SonarQube
-      run: ./gradlew sonarqube
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+      - name: Codestyle
+        run: ./gradlew spotlessCheck
+
+      - name: Test
+        run: ./gradlew test jacocoTestReport
+
+      - name: SonarQube
+        run: ./gradlew sonarqube
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 21d3e4e8..569f8139 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,17 @@
-.idea
-*.iml
-out
+# Package Files #
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+### Gradle template
 .gradle
-target
 build/
+
+# Idea generatted files
+.idea
+/out/
+*.iml
+.settings/
diff --git a/build.gradle b/build.gradle
index 237babec..ccc8a497 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,73 +1,62 @@
 plugins {
-    id 'jacoco'
-    id 'java-library'
-    id 'maven-publish'
+    id "jacoco"
+    id "maven-publish"
+    id "java-library"
 
-    id 'org.sonarqube' version '3.0'
-    id 'com.diffplug.gradle.spotless' version '4.4.0'
+    id "org.sonarqube" version "3.3"
+    id "com.diffplug.spotless" version "5.14.3"
 }
 
 group = groupId
 version = artifactVersion
 
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 spotless {
     java {
-        encoding 'UTF-8'
+        encoding("UTF-8")
+        importOrder()
         removeUnusedImports()
-        eclipse().configFile "${projectDir}/config/codestyle.xml"
+        eclipse().configFile("${projectDir}/config/codestyle.xml")
     }
 }
 
 sonarqube {
     properties {
-        property 'sonar.host.url', 'https://sonarcloud.io'
-        property 'sonar.organization', 'goodforgod'
-        property 'sonar.projectKey', 'GoodforGod_dummymaker'
+        property "sonar.host.url", "https://sonarcloud.io"
+        property "sonar.organization", "goodforgod"
+        property "sonar.projectKey", "GoodforGod_dummymaker"
     }
 }
 
 repositories {
     mavenLocal()
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:20.1.0'
-    implementation 'org.slf4j:slf4j-api:1.7.30'
-    implementation 'me.xdrop:fuzzywuzzy:1.3.1'
-    implementation 'javax.inject:javax.inject:1'
+    implementation "org.jetbrains:annotations:22.0.0"
+    implementation "org.slf4j:slf4j-api:1.7.32"
+    implementation "me.xdrop:fuzzywuzzy:1.3.1"
+    implementation "javax.inject:javax.inject:1"
 
-    testRuntimeOnly 'ch.qos.logback:logback-classic:1.2.3'
-    testImplementation 'junit:junit:4.13'
+    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.3"
+    testImplementation "junit:junit:4.13.2"
 }
 
 test {
-    useJUnit()
+    useJUnitPlatform()
     testLogging {
-        events 'passed', 'skipped', 'failed'
-        exceptionFormat 'full'
-        showStandardStreams = false
+        events("passed", "skipped", "failed")
+        exceptionFormat("full")
+        showStandardStreams(false)
     }
-}
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-    options.incremental = true
-    options.fork = true
-}
-
-tasks.withType(Test) {
-    reports.html.enabled = false
-    reports.junitXml.enabled = false
-}
 
-java {
-    withJavadocJar()
-    withSourcesJar()
+    reports {
+        html.enabled(false)
+        junitXml.enabled(false)
+    }
 }
 
 publishing {
@@ -76,27 +65,27 @@ publishing {
             from components.java
 
             pom {
-                name = 'DummyMaker'
-                url = 'https://github.com/GoodforGod/dummymaker'
-                description = 'Library can fill Java Classes with random data and also export data in CSV/JSON/XML/SQL formats'
+                name = "DummyMaker"
+                url = "https://github.com/GoodforGod/dummymaker"
+                description = "Library can fill Java Classes with random data and also export data in CSV/JSON/XML/SQL formats"
 
                 license {
-                    name = 'MIT License'
-                    url = 'https://github.com/GoodforGod/dummymaker/blob/master/LICENSE'
-                    distribution = 'repo'
+                    name = "MIT License"
+                    url = "https://github.com/GoodforGod/dummymaker/blob/master/LICENSE"
+                    distribution = "repo"
                 }
 
                 developer {
-                    id = 'GoodforGod'
-                    name = 'Anton Kurako'
-                    email = 'goodforgod.dev@gmail.com'
-                    url = 'https://github.com/GoodforGod'
+                    id = "GoodforGod"
+                    name = "Anton Kurako"
+                    email = "goodforgod.dev@gmail.com"
+                    url = "https://github.com/GoodforGod"
                 }
 
                 scm {
-                    connection = 'scm:git:git://github.com/GoodforGod/dummymaker.git'
-                    developerConnection = 'scm:git:ssh://GoodforGod/dummymaker.git'
-                    url = 'https://github.com/GoodforGod/dummymaker/tree/master'
+                    connection = "scm:git:git://github.com/GoodforGod/dummymaker.git"
+                    developerConnection = "scm:git:ssh://GoodforGod/dummymaker.git"
+                    url = "https://github.com/GoodforGod/dummymaker/tree/master"
                 }
             }
         }
@@ -106,7 +95,7 @@ publishing {
         maven {
             def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
             def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/"
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+            url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
             credentials {
                 username System.getenv("OSS_USERNAME")
                 password System.getenv("OSS_PASSWORD")
@@ -115,6 +104,17 @@ publishing {
     }
 }
 
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+tasks.withType(JavaCompile) {
+    options.encoding("UTF-8")
+    options.incremental(true)
+    options.fork = true
+}
+
 check.dependsOn jacocoTestReport
 jacocoTestReport {
     reports {
@@ -123,16 +123,16 @@ jacocoTestReport {
     }
 }
 
+javadoc {
+    options.encoding = "UTF-8"
+    if (JavaVersion.current().isJava9Compatible()) {
+        options.addBooleanOption("html5", true)
+    }
+}
+
 if (project.hasProperty("signing.keyId")) {
-    apply plugin: 'signing'
+    apply plugin: "signing"
     signing {
         sign publishing.publications.mavenJava
     }
 }
-
-javadoc {
-    options.encoding = "UTF-8"
-    if (JavaVersion.current().isJava9Compatible()) {
-        options.addBooleanOption('html5', true)
-    }
-}
\ No newline at end of file
diff --git a/config/codestyle.xml b/config/codestyle.xml
index 0c19bebf..a90c4f5b 100644
--- a/config/codestyle.xml
+++ b/config/codestyle.xml
@@ -74,7 +74,7 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
         <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
diff --git a/gradle.properties b/gradle.properties
index 74b0282a..da3deeae 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,9 @@ artifactId=dummymaker
 artifactVersion=3.0.2
 
 
-##### GRADLE
+##### GRADLE #####
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureondemand=true
+org.gradle.caching=true
+org.gradle.jvmargs=-Dfile.encoding=UTF-8
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
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
B8dv}T

delta 17845
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
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index be52383e..e750102e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c..744e882e 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

From f6318114c04cd2d2a17f42f0637425394ff1d7c9 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Fri, 3 Dec 2021 02:39:04 +0300
Subject: [PATCH 02/15] Code style applied

---
 gradle.properties                             |  2 +-
 .../annotation/complex/GenArray.java          |  1 -
 .../annotation/complex/GenArray2D.java        |  1 -
 .../annotation/complex/GenEnum.java           |  1 -
 .../annotation/complex/GenList.java           |  1 -
 .../dummymaker/annotation/complex/GenMap.java |  1 -
 .../dummymaker/annotation/complex/GenSet.java |  1 -
 .../annotation/complex/GenTime.java           |  7 ++----
 .../annotation/core/ComplexGen.java           | 11 ++++------
 .../dummymaker/annotation/core/PrimeGen.java  |  5 ++---
 .../annotation/export/GenExportForce.java     |  3 +--
 .../annotation/export/GenExportName.java      |  4 ++--
 .../annotation/simple/GenBoolean.java         |  1 -
 .../dummymaker/annotation/simple/GenNull.java |  1 -
 .../dummymaker/annotation/simple/GenUuid.java |  1 -
 .../simple/number/GenBigDecimal.java          |  1 -
 .../simple/number/GenBigInteger.java          |  1 -
 .../annotation/simple/number/GenByte.java     |  1 -
 .../annotation/simple/number/GenChar.java     |  1 -
 .../simple/number/GenCharacter.java           |  1 -
 .../annotation/simple/number/GenDouble.java   |  1 -
 .../simple/number/GenDoubleBig.java           |  1 -
 .../annotation/simple/number/GenFloat.java    |  1 -
 .../annotation/simple/number/GenFloatBig.java |  1 -
 .../annotation/simple/number/GenInt.java      |  1 -
 .../annotation/simple/number/GenLong.java     |  1 -
 .../annotation/simple/number/GenShort.java    |  1 -
 .../annotation/simple/string/GenAddress.java  |  1 -
 .../simple/string/GenAddressFull.java         |  1 -
 .../simple/string/GenBtcAddress.java          |  1 -
 .../simple/string/GenBtcTxHash.java           |  1 -
 .../simple/string/GenCadastral.java           |  1 -
 .../annotation/simple/string/GenCity.java     |  1 -
 .../annotation/simple/string/GenCompany.java  |  1 -
 .../annotation/simple/string/GenCountry.java  |  1 -
 .../simple/string/GenDescription.java         |  1 -
 .../annotation/simple/string/GenDistrict.java |  1 -
 .../annotation/simple/string/GenEmail.java    |  1 -
 .../simple/string/GenEthAddress.java          |  1 -
 .../simple/string/GenEthTxHash.java           |  1 -
 .../annotation/simple/string/GenGender.java   |  1 -
 .../annotation/simple/string/GenHexData.java  |  1 -
 .../simple/string/GenHexNumber.java           |  1 -
 .../annotation/simple/string/GenHouse.java    |  1 -
 .../annotation/simple/string/GenId.java       |  1 -
 .../annotation/simple/string/GenIdBig.java    |  1 -
 .../annotation/simple/string/GenJob.java      |  1 -
 .../annotation/simple/string/GenJson.java     |  1 -
 .../annotation/simple/string/GenLogin.java    |  1 -
 .../simple/string/GenMiddleName.java          |  1 -
 .../annotation/simple/string/GenName.java     |  1 -
 .../annotation/simple/string/GenNickname.java |  1 -
 .../annotation/simple/string/GenNoun.java     |  1 -
 .../annotation/simple/string/GenPass.java     |  1 -
 .../annotation/simple/string/GenPhone.java    |  1 -
 .../annotation/simple/string/GenProduct.java  |  1 -
 .../annotation/simple/string/GenRole.java     |  1 -
 .../annotation/simple/string/GenStreet.java   |  1 -
 .../annotation/simple/string/GenString.java   |  1 -
 .../annotation/simple/string/GenSurname.java  |  1 -
 .../annotation/simple/string/GenTag.java      |  1 -
 .../annotation/simple/string/GenUri.java      |  1 -
 .../annotation/simple/string/GenUrl.java      |  1 -
 .../annotation/simple/string/GenVersion.java  |  1 -
 .../annotation/simple/time/GenDate.java       |  5 ++---
 .../annotation/simple/time/GenDateSql.java    |  1 -
 .../annotation/simple/time/GenLocalDate.java  |  1 -
 .../simple/time/GenLocalDateTime.java         |  1 -
 .../annotation/simple/time/GenLocalTime.java  |  1 -
 .../annotation/simple/time/GenTimeSql.java    |  1 -
 .../annotation/simple/time/GenTimestamp.java  |  1 -
 .../annotation/special/GenAuto.java           |  4 +---
 .../annotation/special/GenCustom.java         |  4 +---
 .../annotation/special/GenEmbedded.java       | 15 +++++--------
 .../annotation/special/GenSequence.java       |  6 ++---
 .../java/io/dummymaker/export/Format.java     |  1 -
 .../java/io/dummymaker/export/IExporter.java  |  3 +--
 .../io/dummymaker/export/cases/CamelCase.java |  3 +--
 .../io/dummymaker/export/cases/KebabCase.java |  5 ++---
 .../dummymaker/export/cases/PascalCase.java   |  3 +--
 .../io/dummymaker/export/cases/SnakeCase.java |  5 ++---
 .../export/cases/UpperSnakeCase.java          |  5 ++---
 .../dummymaker/export/impl/BaseExporter.java  |  3 +--
 .../dummymaker/export/impl/CsvExporter.java   |  3 +--
 .../dummymaker/export/impl/JsonExporter.java  |  3 +--
 .../dummymaker/export/impl/SqlExporter.java   | 11 ++++------
 .../dummymaker/export/impl/XmlExporter.java   |  3 +--
 .../io/dummymaker/factory/IGenFactory.java    | 13 +++++------
 .../io/dummymaker/factory/IGenStorage.java    |  4 ++--
 .../io/dummymaker/factory/IGenSupplier.java   | 11 +++++-----
 .../dummymaker/factory/impl/GenFactory.java   | 22 +++++++++----------
 .../factory/impl/GenGraphBuilder.java         |  9 ++++----
 .../dummymaker/factory/impl/GenStorage.java   | 14 +++++-------
 .../dummymaker/factory/impl/GenSupplier.java  | 20 ++++++++---------
 .../generator/IComplexGenerator.java          | 12 +++++-----
 .../io/dummymaker/generator/IGenerator.java   |  3 +--
 .../complex/Array2DComplexGenerator.java      |  5 ++---
 .../complex/ArrayComplexGenerator.java        |  5 ++---
 .../complex/BasicComplexGenerator.java        | 12 +++++-----
 .../complex/CollectionComplexGenerator.java   |  7 +++---
 .../complex/EnumComplexGenerator.java         |  3 +--
 .../complex/ListComplexGenerator.java         |  9 ++++----
 .../complex/LongComplexGenerator.java         |  9 ++++----
 .../complex/MapComplexGenerator.java          |  9 ++++----
 .../complex/SetComplexGenerator.java          |  9 ++++----
 .../complex/TimeComplexGenerator.java         | 15 ++++++-------
 .../generator/simple/BooleanGenerator.java    |  3 +--
 .../generator/simple/NullGenerator.java       |  5 ++---
 .../generator/simple/SequenceGenerator.java   |  3 +--
 .../generator/simple/UuidGenerator.java       |  3 +--
 .../simple/number/BigDecimalGenerator.java    |  7 +++---
 .../simple/number/BigIntegerGenerator.java    |  3 +--
 .../simple/number/CharacterGenerator.java     |  7 +++---
 .../simple/number/DoubleGenerator.java        |  3 +--
 .../simple/number/FloatGenerator.java         |  3 +--
 .../simple/number/IntegerGenerator.java       |  7 +++---
 .../simple/number/IntegerSmallGenerator.java  |  7 +++---
 .../simple/number/IntegetMediumGenerator.java |  7 +++---
 .../simple/number/UnixTimeGenerator.java      |  7 +++---
 .../simple/string/AddressFullGenerator.java   |  7 +++---
 .../simple/string/AddressGenerator.java       |  7 +++---
 .../simple/string/BtcAddressGenerator.java    |  5 ++---
 .../simple/string/BtcTxHashGenerator.java     |  5 ++---
 .../simple/string/CadastralGenerator.java     |  7 +++---
 .../simple/string/CityGenerator.java          |  7 +++---
 .../simple/string/CompanyGenerator.java       |  7 +++---
 .../simple/string/CountryGenerator.java       |  7 +++---
 .../simple/string/DescriptionGenerator.java   |  7 +++---
 .../simple/string/DistrictGenerator.java      |  7 +++---
 .../simple/string/DocumentGenerator.java      |  9 ++++----
 .../simple/string/EmailGenerator.java         |  7 +++---
 .../simple/string/EthAddressGenerator.java    |  5 ++---
 .../simple/string/EthTxHashGenerator.java     |  5 ++---
 .../simple/string/ExtensionGenerator.java     |  7 +++---
 .../simple/string/FileGenerator.java          |  7 +++---
 .../simple/string/FormatGenerator.java        |  7 +++---
 .../simple/string/GenderGenerator.java        |  7 +++---
 .../simple/string/HexDataGenerator.java       |  5 ++---
 .../simple/string/HexNumberGenerator.java     |  7 +++---
 .../simple/string/HouseGenerator.java         |  7 +++---
 .../simple/string/IdBigGenerator.java         |  3 +--
 .../generator/simple/string/IdGenerator.java  |  3 +--
 .../generator/simple/string/JobGenerator.java |  7 +++---
 .../simple/string/JsonGenerator.java          |  7 +++---
 .../simple/string/LoginGenerator.java         |  9 ++++----
 .../simple/string/MiddleNameGenerator.java    |  7 +++---
 .../simple/string/NameGenerator.java          |  7 +++---
 .../simple/string/NounGenerator.java          |  7 +++---
 .../simple/string/PhoneGenerator.java         |  7 +++---
 .../simple/string/ProductGenerator.java       |  7 +++---
 .../simple/string/RoleGenerator.java          |  7 +++---
 .../simple/string/StreetGenerator.java        |  7 +++---
 .../simple/string/StringGenerator.java        |  7 +++---
 .../simple/string/SurnameGenerator.java       |  7 +++---
 .../generator/simple/string/TagGenerator.java |  7 +++---
 .../simple/string/TypeGenerator.java          |  7 +++---
 .../generator/simple/string/UriGenerator.java |  5 ++---
 .../generator/simple/string/UrlGenerator.java |  7 +++---
 .../simple/string/VersionGenerator.java       |  7 +++---
 .../generator/simple/time/DateGenerator.java  |  7 +++---
 .../simple/time/DateSqlGenerator.java         |  3 +--
 .../simple/time/LocalDateGenerator.java       |  7 +++---
 .../simple/time/LocalDateTimeGenerator.java   | 10 ++++-----
 .../simple/time/LocalTimeGenerator.java       |  7 +++---
 .../generator/simple/time/TimeGenerator.java  |  3 +--
 .../simple/time/TimestampGenerator.java       |  3 +--
 .../io/dummymaker/model/GenContainer.java     |  5 ++---
 .../io/dummymaker/model/GenFieldRule.java     |  1 -
 .../java/io/dummymaker/model/GenRule.java     | 17 ++++++--------
 .../java/io/dummymaker/model/GenRules.java    | 10 ++++-----
 src/main/java/io/dummymaker/model/Pair.java   |  5 ++---
 .../model/export/DateFieldContainer.java      |  1 -
 .../model/export/FieldContainer.java          |  1 -
 .../model/export/FieldContainerFactory.java   |  5 ++---
 .../dummymaker/scan/IAnnotationScanner.java   |  7 +++---
 .../io/dummymaker/scan/IExportScanner.java    |  3 +--
 .../io/dummymaker/scan/IGenAutoScanner.java   |  6 ++---
 .../java/io/dummymaker/scan/IGenScanner.java  |  3 +--
 .../java/io/dummymaker/scan/IMapScanner.java  |  3 +--
 .../java/io/dummymaker/scan/IScanner.java     |  3 +--
 .../scan/impl/AnnotationScanner.java          |  7 +++---
 .../io/dummymaker/scan/impl/BasicScanner.java |  3 +--
 .../io/dummymaker/scan/impl/ClassScanner.java |  3 +--
 .../dummymaker/scan/impl/ExportScanner.java   |  6 ++---
 .../dummymaker/scan/impl/GenAutoScanner.java  |  3 +--
 .../dummymaker/scan/impl/GenRuledScanner.java |  3 +--
 .../io/dummymaker/scan/impl/GenScanner.java   | 10 ++++-----
 .../dummymaker/scan/impl/ResourceScanner.java |  9 +++-----
 .../dummymaker/scan/impl/SequenceScanner.java |  3 +--
 .../dummymaker/scan/impl/UniqueScanner.java   |  7 +++---
 .../java/io/dummymaker/util/CastUtils.java    | 12 +++++-----
 .../io/dummymaker/util/CollectionUtils.java   |  9 ++++----
 .../java/io/dummymaker/util/DateUtils.java    |  5 ++---
 .../java/io/dummymaker/util/GenUtils.java     |  5 ++---
 .../io/dummymaker/writer/impl/FileWriter.java |  4 +---
 .../io/dummymaker/bundle/BundleImplTest.java  | 11 +++++-----
 .../export/BasicExporterValidationTest.java   |  9 ++++----
 .../export/CaseParameterizedTest.java         |  5 ++---
 .../export/UniqueExporterTests.java           |  3 +--
 .../export/ValidatorExporterTest.java         |  5 ++---
 .../export/asfile/CsvExportAsFileTest.java    |  3 +--
 .../export/asfile/ExportAsFileTests.java      |  9 ++++----
 .../export/asfile/ExportAssert.java           |  9 ++++----
 .../export/asfile/FileExportAssert.java       |  3 +--
 .../export/asfile/JsonExportAsFileTest.java   |  3 +--
 .../export/asfile/SqlExportAsFileTest.java    |  3 +--
 .../export/asfile/XmlExportAsFileTest.java    |  1 -
 .../asstring/CsvExportAsStringTest.java       |  3 +--
 .../export/asstring/ExportAsStringTests.java  |  9 ++++----
 .../asstring/JsonExportAsStringTest.java      |  3 +--
 .../asstring/SqlExportAsStringTest.java       |  3 +--
 .../export/asstring/StringExportAssert.java   |  5 ++---
 .../asstring/XmlExportAsStringTest.java       |  3 +--
 .../export/validators/CsvValidator.java       |  8 +++----
 .../export/validators/JsonValidator.java      |  8 +++----
 .../export/validators/SqlValidator.java       | 10 ++++-----
 .../export/validators/XmlValidator.java       |  8 +++----
 .../dummymaker/factory/DummyArrayTests.java   |  3 +--
 .../factory/DummyAutoNamedTests.java          |  3 +--
 .../factory/DummyCollectionTests.java         |  4 ++--
 .../DummyEmbeddedComplexAutoTests.java        |  3 +--
 .../factory/DummyGlobalRulesTests.java        |  5 ++---
 .../factory/DummyNoFillFieldsTests.java       |  4 ++--
 .../io/dummymaker/factory/DummyTests.java     |  7 +++---
 .../io/dummymaker/factory/FactoryTests.java   |  9 ++++----
 .../factory/GenFactoryBuildTests.java         |  7 +++---
 .../factory/GenFactoryFillTests.java          |  7 +++---
 .../generator/GeneratorPatternValidTest.java  | 15 ++++++-------
 .../generator/UniqueGeneratorsTest.java       |  7 +++---
 src/test/java/io/dummymaker/model/Dummy.java  |  1 -
 .../io/dummymaker/model/DummyAutoComplex.java |  1 -
 .../io/dummymaker/model/DummyCollection.java  |  1 -
 .../model/DummyCollectionWrong.java           |  1 -
 .../java/io/dummymaker/model/DummyCustom.java |  3 +--
 .../io/dummymaker/model/DummyEmbedded.java    |  1 -
 .../dummymaker/model/DummyNoFillFields.java   |  3 +--
 .../model/DummyNoZeroConstructor.java         |  1 -
 .../java/io/dummymaker/model/DummyRules.java  |  1 -
 .../java/io/dummymaker/model/DummyTime.java   |  5 ++---
 .../dummymaker/model/DummyTimeFormatter.java  |  5 ++---
 .../io/dummymaker/model/DummyUnixTime.java    |  1 -
 .../model/deprecated/DummyAuto.java           |  1 -
 .../io/dummymaker/rules/GenRulesTests.java    |  3 +--
 .../scan/AnnotationScannerTests.java          |  9 ++++----
 .../io/dummymaker/scan/ClassScannerTests.java |  3 +--
 .../dummymaker/scan/ExportScannerTests.java   |  9 ++++----
 .../io/dummymaker/scan/GenScannerTests.java   |  9 ++++----
 .../dummymaker/scan/ResourceScannerTests.java |  5 ++---
 .../dummymaker/scan/SequenceScannerTests.java |  7 +++---
 .../dummymaker/scan/UniqueScannerTests.java   |  5 ++---
 .../io/dummymaker/util/CastUtilsTest.java     |  3 +--
 .../dummymaker/util/CollectionUtilsTest.java  |  3 +--
 .../dummymaker/util/DateUtilsErrorTests.java  |  5 ++---
 .../dummymaker/util/DateUtilsValidTest.java   |  5 ++---
 254 files changed, 458 insertions(+), 728 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index da3deeae..7f33e7a4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 groupId=com.github.goodforgod
 artifactId=dummymaker
-artifactVersion=3.0.2
+artifactVersion=3.1.0-SNAPSHOT
 
 
 ##### GRADLE #####
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenArray.java b/src/main/java/io/dummymaker/annotation/complex/GenArray.java
index 946bdff4..c63564f7 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenArray.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenArray.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.complex.ArrayComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java b/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java
index 4834558e..4de4c5bb 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.complex.Array2DComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenEnum.java b/src/main/java/io/dummymaker/annotation/complex/GenEnum.java
index b6f22466..049f0c65 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenEnum.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenEnum.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.complex.EnumComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenList.java b/src/main/java/io/dummymaker/annotation/complex/GenList.java
index fd89eb67..79ee5b6e 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenList.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenList.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.complex.ListComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenMap.java b/src/main/java/io/dummymaker/annotation/complex/GenMap.java
index 2ad12c5d..2c5ea5a1 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenMap.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenMap.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.complex.MapComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenSet.java b/src/main/java/io/dummymaker/annotation/complex/GenSet.java
index 9b5f8c91..8ae93335 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenSet.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenSet.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.complex.SetComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenTime.java b/src/main/java/io/dummymaker/annotation/complex/GenTime.java
index 523af2ea..b733e786 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenTime.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenTime.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.complex.TimeComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -36,10 +35,8 @@
      * ISO 8601 datetime format for DateTime and timestamps
      * 
      * @see java.time.format.DateTimeFormatter#ISO_DATE_TIME default for datetimes
-     * @see java.time.format.DateTimeFormatter#ISO_DATE default for date only
-     *      formats
-     * @see java.time.format.DateTimeFormatter#ISO_TIME default for time only
-     *      formats
+     * @see java.time.format.DateTimeFormatter#ISO_DATE default for date only formats
+     * @see java.time.format.DateTimeFormatter#ISO_TIME default for time only formats
      */
     String DEFAULT_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSSXXX";
 
diff --git a/src/main/java/io/dummymaker/annotation/core/ComplexGen.java b/src/main/java/io/dummymaker/annotation/core/ComplexGen.java
index b905eeb7..bf4841d9 100644
--- a/src/main/java/io/dummymaker/annotation/core/ComplexGen.java
+++ b/src/main/java/io/dummymaker/annotation/core/ComplexGen.java
@@ -5,20 +5,18 @@
 import io.dummymaker.generator.simple.NullGenerator;
 import io.dummymaker.scan.IAnnotationScanner;
 import io.dummymaker.scan.IMapScanner;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Complex Gen annotation used to create new annotations of specific complex
- * generator provided type Used as a marker annotation for other annotations
+ * Complex Gen annotation used to create new annotations of specific complex generator provided type
+ * Used as a marker annotation for other annotations
  * <p>
  * Is used by scanners and populate/produce factories
  * <p>
- * This annotation is a also core one (as prime one) to support population
- * factory
+ * This annotation is a also core one (as prime one) to support population factory
  *
  * @author GoodforGod
  * @see PrimeGen
@@ -32,8 +30,7 @@
 public @interface ComplexGen {
 
     /**
-     * Contains complex generator class to be called to generate values on populate
-     * factory
+     * Contains complex generator class to be called to generate values on populate factory
      *
      * @return generator
      */
diff --git a/src/main/java/io/dummymaker/annotation/core/PrimeGen.java b/src/main/java/io/dummymaker/annotation/core/PrimeGen.java
index 23a22e78..5feafa94 100644
--- a/src/main/java/io/dummymaker/annotation/core/PrimeGen.java
+++ b/src/main/java/io/dummymaker/annotation/core/PrimeGen.java
@@ -4,15 +4,14 @@
 import io.dummymaker.generator.simple.NullGenerator;
 import io.dummymaker.scan.IAnnotationScanner;
 import io.dummymaker.scan.IMapScanner;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Prime annotations, used to create new annotations of specific generator
- * provided type Used as a marker annotation for other annotations
+ * Prime annotations, used to create new annotations of specific generator provided type Used as a
+ * marker annotation for other annotations
  * <p>
  * Is used by scanners and populate/produce factories
  * <p>
diff --git a/src/main/java/io/dummymaker/annotation/export/GenExportForce.java b/src/main/java/io/dummymaker/annotation/export/GenExportForce.java
index d0f09896..cf7e63c3 100644
--- a/src/main/java/io/dummymaker/annotation/export/GenExportForce.java
+++ b/src/main/java/io/dummymaker/annotation/export/GenExportForce.java
@@ -6,8 +6,7 @@
 import java.lang.annotation.Target;
 
 /**
- * Force object field to export, despite it been annotated with generate
- * annotations
+ * Force object field to export, despite it been annotated with generate annotations
  *
  * @author GoodforGod
  * @see io.dummymaker.export.IExporter
diff --git a/src/main/java/io/dummymaker/annotation/export/GenExportName.java b/src/main/java/io/dummymaker/annotation/export/GenExportName.java
index 6a8d86ed..4257fd0c 100644
--- a/src/main/java/io/dummymaker/annotation/export/GenExportName.java
+++ b/src/main/java/io/dummymaker/annotation/export/GenExportName.java
@@ -6,8 +6,8 @@
 import java.lang.annotation.Target;
 
 /**
- * Allow to rename fields and class names when export To rename class you should
- * annotate its constructor
+ * Allow to rename fields and class names when export To rename class you should annotate its
+ * constructor
  *
  * @author GoodforGod
  * @since 06.07.2017
diff --git a/src/main/java/io/dummymaker/annotation/simple/GenBoolean.java b/src/main/java/io/dummymaker/annotation/simple/GenBoolean.java
index fb7003f5..923ccb1d 100644
--- a/src/main/java/io/dummymaker/annotation/simple/GenBoolean.java
+++ b/src/main/java/io/dummymaker/annotation/simple/GenBoolean.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.BooleanGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/GenNull.java b/src/main/java/io/dummymaker/annotation/simple/GenNull.java
index de3dbe7f..74159a03 100644
--- a/src/main/java/io/dummymaker/annotation/simple/GenNull.java
+++ b/src/main/java/io/dummymaker/annotation/simple/GenNull.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.NullGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/GenUuid.java b/src/main/java/io/dummymaker/annotation/simple/GenUuid.java
index 8b8d7f7d..184328c6 100644
--- a/src/main/java/io/dummymaker/annotation/simple/GenUuid.java
+++ b/src/main/java/io/dummymaker/annotation/simple/GenUuid.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.UuidGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenBigDecimal.java b/src/main/java/io/dummymaker/annotation/simple/number/GenBigDecimal.java
index b5b12fd8..af5cff74 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenBigDecimal.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenBigDecimal.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.BigDecimalGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenBigInteger.java b/src/main/java/io/dummymaker/annotation/simple/number/GenBigInteger.java
index 976f5696..66834c78 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenBigInteger.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenBigInteger.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.BigIntegerGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenByte.java b/src/main/java/io/dummymaker/annotation/simple/number/GenByte.java
index e364b553..a594370b 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenByte.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenByte.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.ByteGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenChar.java b/src/main/java/io/dummymaker/annotation/simple/number/GenChar.java
index 6c7210e4..7f708e51 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenChar.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenChar.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.CharGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenCharacter.java b/src/main/java/io/dummymaker/annotation/simple/number/GenCharacter.java
index 5d6aac02..2f06f5c1 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenCharacter.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenCharacter.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.CharacterGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenDouble.java b/src/main/java/io/dummymaker/annotation/simple/number/GenDouble.java
index 8e1774fe..72661726 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenDouble.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenDouble.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.DoubleGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenDoubleBig.java b/src/main/java/io/dummymaker/annotation/simple/number/GenDoubleBig.java
index 1da96737..eb5ba72b 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenDoubleBig.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenDoubleBig.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.DoubleBigGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenFloat.java b/src/main/java/io/dummymaker/annotation/simple/number/GenFloat.java
index 7db5bb58..92556fdf 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenFloat.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenFloat.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.FloatGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenFloatBig.java b/src/main/java/io/dummymaker/annotation/simple/number/GenFloatBig.java
index 22625d41..cded230f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenFloatBig.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenFloatBig.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.FloatBigGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenInt.java b/src/main/java/io/dummymaker/annotation/simple/number/GenInt.java
index 49959400..8f22ac62 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenInt.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenInt.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.complex.LongComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenLong.java b/src/main/java/io/dummymaker/annotation/simple/number/GenLong.java
index 7b2a08fc..f0340841 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenLong.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenLong.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.generator.complex.LongComplexGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/number/GenShort.java b/src/main/java/io/dummymaker/annotation/simple/number/GenShort.java
index 5bb9adea..a9c54b4d 100644
--- a/src/main/java/io/dummymaker/annotation/simple/number/GenShort.java
+++ b/src/main/java/io/dummymaker/annotation/simple/number/GenShort.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.number.ShortGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenAddress.java b/src/main/java/io/dummymaker/annotation/simple/string/GenAddress.java
index 7de0a318..92973846 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenAddress.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenAddress.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.AddressGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenAddressFull.java b/src/main/java/io/dummymaker/annotation/simple/string/GenAddressFull.java
index dbff6a7d..975944aa 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenAddressFull.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenAddressFull.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.AddressFullGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenBtcAddress.java b/src/main/java/io/dummymaker/annotation/simple/string/GenBtcAddress.java
index 37d4ce0a..f6e157ee 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenBtcAddress.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenBtcAddress.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.BtcAddressGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenBtcTxHash.java b/src/main/java/io/dummymaker/annotation/simple/string/GenBtcTxHash.java
index 3d57de04..2d17ee5a 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenBtcTxHash.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenBtcTxHash.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.BtcTxHashGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenCadastral.java b/src/main/java/io/dummymaker/annotation/simple/string/GenCadastral.java
index 32793d00..c1dfbf46 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenCadastral.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenCadastral.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.CadastralGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenCity.java b/src/main/java/io/dummymaker/annotation/simple/string/GenCity.java
index f3f4c92e..e5b24a95 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenCity.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenCity.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.CityGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenCompany.java b/src/main/java/io/dummymaker/annotation/simple/string/GenCompany.java
index b05e0852..3fa1987f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenCompany.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenCompany.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.CompanyGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenCountry.java b/src/main/java/io/dummymaker/annotation/simple/string/GenCountry.java
index bc181b46..e2ef2cd1 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenCountry.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenCountry.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.CountryGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenDescription.java b/src/main/java/io/dummymaker/annotation/simple/string/GenDescription.java
index d533cace..52143d47 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenDescription.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenDescription.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.DescriptionGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenDistrict.java b/src/main/java/io/dummymaker/annotation/simple/string/GenDistrict.java
index e9029cbd..4844332f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenDistrict.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenDistrict.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.DistrictGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenEmail.java b/src/main/java/io/dummymaker/annotation/simple/string/GenEmail.java
index 1182b797..6882644e 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenEmail.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenEmail.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.EmailGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenEthAddress.java b/src/main/java/io/dummymaker/annotation/simple/string/GenEthAddress.java
index ddb832d5..d676d991 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenEthAddress.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenEthAddress.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.EthAddressGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenEthTxHash.java b/src/main/java/io/dummymaker/annotation/simple/string/GenEthTxHash.java
index cee51a3d..6cd1f29f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenEthTxHash.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenEthTxHash.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.EthTxHashGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenGender.java b/src/main/java/io/dummymaker/annotation/simple/string/GenGender.java
index dbeec2a6..a272db6e 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenGender.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenGender.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.GenderGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenHexData.java b/src/main/java/io/dummymaker/annotation/simple/string/GenHexData.java
index f4be686b..9101d97c 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenHexData.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenHexData.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.HexDataGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenHexNumber.java b/src/main/java/io/dummymaker/annotation/simple/string/GenHexNumber.java
index 2fd0f8a3..c9d478a8 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenHexNumber.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenHexNumber.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.HexNumberGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenHouse.java b/src/main/java/io/dummymaker/annotation/simple/string/GenHouse.java
index 5a3e2960..39905e39 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenHouse.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenHouse.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.HouseGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenId.java b/src/main/java/io/dummymaker/annotation/simple/string/GenId.java
index db4437c8..05b6b542 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenId.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenId.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.IdBigGenerator;
 import io.dummymaker.generator.simple.string.IdGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenIdBig.java b/src/main/java/io/dummymaker/annotation/simple/string/GenIdBig.java
index 1ac1ec5c..7bc1b07f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenIdBig.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenIdBig.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.IdBigGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenJob.java b/src/main/java/io/dummymaker/annotation/simple/string/GenJob.java
index 8ea1f46f..fda0e3ee 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenJob.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenJob.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.JobGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenJson.java b/src/main/java/io/dummymaker/annotation/simple/string/GenJson.java
index e4abf60a..925da00f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenJson.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenJson.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.JsonGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenLogin.java b/src/main/java/io/dummymaker/annotation/simple/string/GenLogin.java
index 8f840d20..c185b499 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenLogin.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenLogin.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.LoginGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenMiddleName.java b/src/main/java/io/dummymaker/annotation/simple/string/GenMiddleName.java
index 352f5b92..beb71afb 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenMiddleName.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenMiddleName.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.MiddleNameGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenName.java b/src/main/java/io/dummymaker/annotation/simple/string/GenName.java
index 0211b20b..c945cc9c 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenName.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenName.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.NameGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenNickname.java b/src/main/java/io/dummymaker/annotation/simple/string/GenNickname.java
index 36a904ff..4039d4c7 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenNickname.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenNickname.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.LoginGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenNoun.java b/src/main/java/io/dummymaker/annotation/simple/string/GenNoun.java
index 53e74637..5c181036 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenNoun.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenNoun.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.NounGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenPass.java b/src/main/java/io/dummymaker/annotation/simple/string/GenPass.java
index a4437bd6..171897d9 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenPass.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenPass.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.DocumentGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenPhone.java b/src/main/java/io/dummymaker/annotation/simple/string/GenPhone.java
index efdd75de..1ec0c41c 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenPhone.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenPhone.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.PhoneGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenProduct.java b/src/main/java/io/dummymaker/annotation/simple/string/GenProduct.java
index 28c2ca9d..a77d8050 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenProduct.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenProduct.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.ProductGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenRole.java b/src/main/java/io/dummymaker/annotation/simple/string/GenRole.java
index eb070454..d95079f6 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenRole.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenRole.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.RoleGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenStreet.java b/src/main/java/io/dummymaker/annotation/simple/string/GenStreet.java
index a2f2fb9f..029c6ed0 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenStreet.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenStreet.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.StreetGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenString.java b/src/main/java/io/dummymaker/annotation/simple/string/GenString.java
index 4b183696..e17a3b7a 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenString.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenString.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.StringGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenSurname.java b/src/main/java/io/dummymaker/annotation/simple/string/GenSurname.java
index 26e78f8e..cd7d4dda 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenSurname.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenSurname.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.SurnameGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenTag.java b/src/main/java/io/dummymaker/annotation/simple/string/GenTag.java
index dd0be19d..c8395fb4 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenTag.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenTag.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.TagGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenUri.java b/src/main/java/io/dummymaker/annotation/simple/string/GenUri.java
index f6b04afb..9e40c538 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenUri.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenUri.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.UriGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenUrl.java b/src/main/java/io/dummymaker/annotation/simple/string/GenUrl.java
index 3d479cfa..9d75ba8a 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenUrl.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenUrl.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.UrlGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenVersion.java b/src/main/java/io/dummymaker/annotation/simple/string/GenVersion.java
index ecf330b8..47f20f7f 100644
--- a/src/main/java/io/dummymaker/annotation/simple/string/GenVersion.java
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenVersion.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.string.VersionGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenDate.java b/src/main/java/io/dummymaker/annotation/simple/time/GenDate.java
index 9baf02d8..999ae249 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenDate.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenDate.java
@@ -2,15 +2,14 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.DateGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * This date is exported in long milliseconds format So date is the milliseconds
- * since January 1, 1970, 00:00:00 GMT to 1/1/3000
+ * This date is exported in long milliseconds format So date is the milliseconds since January 1,
+ * 1970, 00:00:00 GMT to 1/1/3000
  *
  * @author GoodforGod
  * @see DateGenerator
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenDateSql.java b/src/main/java/io/dummymaker/annotation/simple/time/GenDateSql.java
index 344ffe8f..527f3651 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenDateSql.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenDateSql.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.DateSqlGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDate.java b/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDate.java
index 52c467c0..8c8b7285 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDate.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDate.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.LocalDateGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDateTime.java b/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDateTime.java
index a8bdd2e5..eccfeaf6 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDateTime.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenLocalDateTime.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.LocalDateTimeGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenLocalTime.java b/src/main/java/io/dummymaker/annotation/simple/time/GenLocalTime.java
index 5b5ae810..51324ab2 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenLocalTime.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenLocalTime.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.LocalTimeGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenTimeSql.java b/src/main/java/io/dummymaker/annotation/simple/time/GenTimeSql.java
index f9f9a9a1..3348b353 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenTimeSql.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenTimeSql.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.TimeGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/simple/time/GenTimestamp.java b/src/main/java/io/dummymaker/annotation/simple/time/GenTimestamp.java
index 8d7da3b0..2ce06e32 100644
--- a/src/main/java/io/dummymaker/annotation/simple/time/GenTimestamp.java
+++ b/src/main/java/io/dummymaker/annotation/simple/time/GenTimestamp.java
@@ -2,7 +2,6 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.time.TimestampGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/src/main/java/io/dummymaker/annotation/special/GenAuto.java b/src/main/java/io/dummymaker/annotation/special/GenAuto.java
index 67e12b7f..fe7d4f6f 100644
--- a/src/main/java/io/dummymaker/annotation/special/GenAuto.java
+++ b/src/main/java/io/dummymaker/annotation/special/GenAuto.java
@@ -1,15 +1,13 @@
 package io.dummymaker.annotation.special;
 
 import io.dummymaker.annotation.core.PrimeGen;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Annotations is used on classes And uses default suitable generators to fill
- * class fields
+ * Annotations is used on classes And uses default suitable generators to fill class fields
  *
  * @author GoodforGod
  * @see io.dummymaker.factory.IGenSupplier
diff --git a/src/main/java/io/dummymaker/annotation/special/GenCustom.java b/src/main/java/io/dummymaker/annotation/special/GenCustom.java
index 02f943ba..b4402d77 100644
--- a/src/main/java/io/dummymaker/annotation/special/GenCustom.java
+++ b/src/main/java/io/dummymaker/annotation/special/GenCustom.java
@@ -4,15 +4,13 @@
 import io.dummymaker.generator.IComplexGenerator;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.NullGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Use when you have your custom generator But dont want to implement your
- * custom annotation
+ * Use when you have your custom generator But dont want to implement your custom annotation
  * <p>
  * Works with simple and complex generators
  *
diff --git a/src/main/java/io/dummymaker/annotation/special/GenEmbedded.java b/src/main/java/io/dummymaker/annotation/special/GenEmbedded.java
index bf54baa9..542e7656 100644
--- a/src/main/java/io/dummymaker/annotation/special/GenEmbedded.java
+++ b/src/main/java/io/dummymaker/annotation/special/GenEmbedded.java
@@ -2,15 +2,13 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.EmbeddedGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Generate object with fields type and populate its fields marked by gen
- * annotations
+ * Generate object with fields type and populate its fields marked by gen annotations
  *
  * @author GoodforGod
  * @since 09.03.2018
@@ -21,17 +19,16 @@
 public @interface GenEmbedded {
 
     /**
-     * Maximum depth available Means that object can not be nested more than 18
-     * times from origin one
+     * Maximum depth available Means that object can not be nested more than 18 times from origin one
      */
     int MAX = 20;
 
     /**
-     * If annotation is present, than it will be 1 level depth used by factory And
-     * MAX level is limit depth embedded object can have
+     * If annotation is present, than it will be 1 level depth used by factory And MAX level is limit
+     * depth embedded object can have
      * <p>
-     * Means that object can not be nested more than 18 times from origin one Depth
-     * equals nested level from starting origin object
+     * Means that object can not be nested more than 18 times from origin one Depth equals nested level
+     * from starting origin object
      *
      * @return desired embedded depth
      */
diff --git a/src/main/java/io/dummymaker/annotation/special/GenSequence.java b/src/main/java/io/dummymaker/annotation/special/GenSequence.java
index e6a15b0e..77714164 100644
--- a/src/main/java/io/dummymaker/annotation/special/GenSequence.java
+++ b/src/main/java/io/dummymaker/annotation/special/GenSequence.java
@@ -2,16 +2,14 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.generator.simple.SequenceGenerator;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * Generates numeric sequence from given number (default 0) to all
- * produced/populated Dummies Works only when populate/produce list of dummies,
- * not a single dummy
+ * Generates numeric sequence from given number (default 0) to all produced/populated Dummies Works
+ * only when populate/produce list of dummies, not a single dummy
  *
  * @author GoodforGod (Anton Kurako)
  * @since 07.06.2017
diff --git a/src/main/java/io/dummymaker/export/Format.java b/src/main/java/io/dummymaker/export/Format.java
index 70a578c6..4a982b55 100644
--- a/src/main/java/io/dummymaker/export/Format.java
+++ b/src/main/java/io/dummymaker/export/Format.java
@@ -1,7 +1,6 @@
 package io.dummymaker.export;
 
 import io.dummymaker.model.export.FieldContainer.Type;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/main/java/io/dummymaker/export/IExporter.java b/src/main/java/io/dummymaker/export/IExporter.java
index a48c474e..b531f179 100644
--- a/src/main/java/io/dummymaker/export/IExporter.java
+++ b/src/main/java/io/dummymaker/export/IExporter.java
@@ -1,10 +1,9 @@
 package io.dummymaker.export;
 
+import java.util.Collection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-
 /**
  * Allow to export objects in desired format
  *
diff --git a/src/main/java/io/dummymaker/export/cases/CamelCase.java b/src/main/java/io/dummymaker/export/cases/CamelCase.java
index 195b5df0..f238561e 100644
--- a/src/main/java/io/dummymaker/export/cases/CamelCase.java
+++ b/src/main/java/io/dummymaker/export/cases/CamelCase.java
@@ -4,8 +4,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * First letter is low case, next letters are as is: Bobby - bobby, TonNy -
- * tonNy
+ * First letter is low case, next letters are as is: Bobby - bobby, TonNy - tonNy
  *
  * @author GoodforGod
  * @since 21.02.2018
diff --git a/src/main/java/io/dummymaker/export/cases/KebabCase.java b/src/main/java/io/dummymaker/export/cases/KebabCase.java
index 95e03afa..9dfe7210 100644
--- a/src/main/java/io/dummymaker/export/cases/KebabCase.java
+++ b/src/main/java/io/dummymaker/export/cases/KebabCase.java
@@ -4,9 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Each upper letter separated with underscore symbol, and transform to low case
- * EXCLUDE FIRST LETTER, first letter to low case Example: ( DummyList -
- * dummy-list )
+ * Each upper letter separated with underscore symbol, and transform to low case EXCLUDE FIRST
+ * LETTER, first letter to low case Example: ( DummyList - dummy-list )
  *
  * @author GoodforGod
  * @since 21.04.2018
diff --git a/src/main/java/io/dummymaker/export/cases/PascalCase.java b/src/main/java/io/dummymaker/export/cases/PascalCase.java
index ab65486a..3ff564cd 100644
--- a/src/main/java/io/dummymaker/export/cases/PascalCase.java
+++ b/src/main/java/io/dummymaker/export/cases/PascalCase.java
@@ -4,8 +4,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * First letter is upper case, next letters are as is: Bobby - Bobby, tonNy -
- * TonNy
+ * First letter is upper case, next letters are as is: Bobby - Bobby, tonNy - TonNy
  *
  * @author GoodforGod
  * @since 21.04.2018
diff --git a/src/main/java/io/dummymaker/export/cases/SnakeCase.java b/src/main/java/io/dummymaker/export/cases/SnakeCase.java
index b93be094..020321e8 100644
--- a/src/main/java/io/dummymaker/export/cases/SnakeCase.java
+++ b/src/main/java/io/dummymaker/export/cases/SnakeCase.java
@@ -4,9 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Each upper letter separated with underscore symbol, and transform to low case
- * EXCLUDE FIRST LETTER, first letter to low case Example: ( DummyList -
- * dummy_list )
+ * Each upper letter separated with underscore symbol, and transform to low case EXCLUDE FIRST
+ * LETTER, first letter to low case Example: ( DummyList - dummy_list )
  *
  * @author GoodforGod
  * @since 21.02.2018
diff --git a/src/main/java/io/dummymaker/export/cases/UpperSnakeCase.java b/src/main/java/io/dummymaker/export/cases/UpperSnakeCase.java
index 344de11c..c7287bf5 100644
--- a/src/main/java/io/dummymaker/export/cases/UpperSnakeCase.java
+++ b/src/main/java/io/dummymaker/export/cases/UpperSnakeCase.java
@@ -4,9 +4,8 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Each upper letter separated with underscore symbol, and transform to upper
- * case EXCLUDING FIRST LETTER, first letter to low case Example: ( DummyList -
- * DUMMY_LIST )
+ * Each upper letter separated with underscore symbol, and transform to upper case EXCLUDING FIRST
+ * LETTER, first letter to low case Example: ( DummyList - DUMMY_LIST )
  *
  * @author GoodforGod
  * @since 21.02.2018
diff --git a/src/main/java/io/dummymaker/export/impl/BaseExporter.java b/src/main/java/io/dummymaker/export/impl/BaseExporter.java
index f261d708..34bc6fc6 100644
--- a/src/main/java/io/dummymaker/export/impl/BaseExporter.java
+++ b/src/main/java/io/dummymaker/export/impl/BaseExporter.java
@@ -13,8 +13,6 @@
 import io.dummymaker.util.StringUtils;
 import io.dummymaker.writer.IWriter;
 import io.dummymaker.writer.impl.FileWriter;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.sql.Time;
 import java.time.*;
@@ -25,6 +23,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Core exporter class with mapping and converting functionality
diff --git a/src/main/java/io/dummymaker/export/impl/CsvExporter.java b/src/main/java/io/dummymaker/export/impl/CsvExporter.java
index 01e86a94..ea722676 100644
--- a/src/main/java/io/dummymaker/export/impl/CsvExporter.java
+++ b/src/main/java/io/dummymaker/export/impl/CsvExporter.java
@@ -3,12 +3,11 @@
 import io.dummymaker.model.export.FieldContainer;
 import io.dummymaker.model.export.FieldContainer.Type;
 import io.dummymaker.writer.IWriter;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Anton Kurako (GoodforGod)
diff --git a/src/main/java/io/dummymaker/export/impl/JsonExporter.java b/src/main/java/io/dummymaker/export/impl/JsonExporter.java
index abcfbf56..3291e154 100644
--- a/src/main/java/io/dummymaker/export/impl/JsonExporter.java
+++ b/src/main/java/io/dummymaker/export/impl/JsonExporter.java
@@ -3,12 +3,11 @@
 import io.dummymaker.model.export.FieldContainer;
 import io.dummymaker.util.StringUtils;
 import io.dummymaker.writer.IWriter;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Anton Kurako (GoodforGod)
diff --git a/src/main/java/io/dummymaker/export/impl/SqlExporter.java b/src/main/java/io/dummymaker/export/impl/SqlExporter.java
index aa8b66b2..9ca0f392 100644
--- a/src/main/java/io/dummymaker/export/impl/SqlExporter.java
+++ b/src/main/java/io/dummymaker/export/impl/SqlExporter.java
@@ -4,8 +4,6 @@
 import io.dummymaker.model.export.FieldContainer;
 import io.dummymaker.util.CollectionUtils;
 import io.dummymaker.writer.IWriter;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.sql.Date;
@@ -19,6 +17,7 @@
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Description in progress
@@ -29,15 +28,13 @@
 public class SqlExporter extends BaseExporter {
 
     /**
-     * Insert values limit per single insert query (due to 1000 row insert limit in
-     * SQL)
+     * Insert values limit per single insert query (due to 1000 row insert limit in SQL)
      */
     private static final Integer INSERT_QUERY_LIMIT = 999;
 
     /**
-     * Java & Sql Type Representation Map is used to convert Java Field Data Type to
-     * Sql Data Type You can add your specific values here by using constructor with
-     * Map'String, String'
+     * Java & Sql Type Representation Map is used to convert Java Field Data Type to Sql Data Type You
+     * can add your specific values here by using constructor with Map'String, String'
      */
     private final Map<Class<?>, String> dataTypes = buildDefaultDataTypeMap();
 
diff --git a/src/main/java/io/dummymaker/export/impl/XmlExporter.java b/src/main/java/io/dummymaker/export/impl/XmlExporter.java
index 8251f9bc..d2031bd9 100644
--- a/src/main/java/io/dummymaker/export/impl/XmlExporter.java
+++ b/src/main/java/io/dummymaker/export/impl/XmlExporter.java
@@ -3,12 +3,11 @@
 import io.dummymaker.model.export.FieldContainer;
 import io.dummymaker.util.StringUtils;
 import io.dummymaker.writer.IWriter;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Anton Kurako (GoodforGod)
diff --git a/src/main/java/io/dummymaker/factory/IGenFactory.java b/src/main/java/io/dummymaker/factory/IGenFactory.java
index d13c4bc2..fcdd191d 100644
--- a/src/main/java/io/dummymaker/factory/IGenFactory.java
+++ b/src/main/java/io/dummymaker/factory/IGenFactory.java
@@ -1,13 +1,12 @@
 package io.dummymaker.factory;
 
 import io.dummymaker.export.IExporter;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Factory that generates data objects Core that handles all top level logic
@@ -47,8 +46,8 @@ public interface IGenFactory {
     <T> @NotNull List<T> build(@Nullable Class<T> target, int amount);
 
     /**
-     * Instantiates class instance and populate its fields Use in case class have no
-     * empty constructor of have complex initialization logic
+     * Instantiates class instance and populate its fields Use in case class have no empty constructor
+     * of have complex initialization logic
      *
      * @param supplier of class to build
      * @param amount   of objects to produce
@@ -68,8 +67,8 @@ public interface IGenFactory {
     <T> @NotNull Stream<T> stream(@Nullable Class<T> target, int amount);
 
     /**
-     * Instantiates class instance and populate its fields Use in case class have no
-     * empty constructor of have complex initialization logic
+     * Instantiates class instance and populate its fields Use in case class have no empty constructor
+     * of have complex initialization logic
      *
      * @param supplier of class to build
      * @param amount   of objects to produce
diff --git a/src/main/java/io/dummymaker/factory/IGenStorage.java b/src/main/java/io/dummymaker/factory/IGenStorage.java
index a93e6a29..cee5fcb4 100644
--- a/src/main/java/io/dummymaker/factory/IGenStorage.java
+++ b/src/main/java/io/dummymaker/factory/IGenStorage.java
@@ -6,8 +6,8 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
- * Used to extend complex generator functionality by providing Generators
- * storage for performance improvement and Embedded object generation
+ * Used to extend complex generator functionality by providing Generators storage for performance
+ * improvement and Embedded object generation
  *
  * @author GoodforGod
  * @see io.dummymaker.annotation.special.GenEmbedded
diff --git a/src/main/java/io/dummymaker/factory/IGenSupplier.java b/src/main/java/io/dummymaker/factory/IGenSupplier.java
index 37dd4275..4d0632f1 100644
--- a/src/main/java/io/dummymaker/factory/IGenSupplier.java
+++ b/src/main/java/io/dummymaker/factory/IGenSupplier.java
@@ -1,14 +1,13 @@
 package io.dummymaker.factory;
 
 import io.dummymaker.generator.IGenerator;
+import java.lang.reflect.Field;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Field;
-
 /**
- * Config that providers contract for generators discovery Based on fields and
- * classes for auto generation
+ * Config that providers contract for generators discovery Based on fields and classes for auto
+ * generation
  *
  * @author GoodforGod
  * @see io.dummymaker.annotation.special.GenAuto
@@ -29,8 +28,8 @@ public interface IGenSupplier {
      * Finds suitable generator for field from all available generators
      *
      * @param field target
-     * @param type  target that can sometimes differ from field type Like parent
-     *              class, or implementation not interface
+     * @param type  target that can sometimes differ from field type Like parent class, or
+     *              implementation not interface
      * @return suitable generator
      */
     @NotNull
diff --git a/src/main/java/io/dummymaker/factory/impl/GenFactory.java b/src/main/java/io/dummymaker/factory/impl/GenFactory.java
index 5b34e69d..8ab57c60 100644
--- a/src/main/java/io/dummymaker/factory/impl/GenFactory.java
+++ b/src/main/java/io/dummymaker/factory/impl/GenFactory.java
@@ -1,8 +1,14 @@
 package io.dummymaker.factory.impl;
 
+import static io.dummymaker.generator.simple.EmbeddedGenerator.toDepth;
+import static io.dummymaker.util.CastUtils.castObject;
+import static io.dummymaker.util.CastUtils.instantiate;
+import static io.dummymaker.util.CollectionUtils.isEmpty;
+
 import io.dummymaker.annotation.complex.*;
 import io.dummymaker.annotation.special.GenCustom;
 import io.dummymaker.annotation.special.GenEmbedded;
+import io.dummymaker.error.GenException;
 import io.dummymaker.export.IExporter;
 import io.dummymaker.factory.IGenFactory;
 import io.dummymaker.generator.IComplexGenerator;
@@ -11,14 +17,9 @@
 import io.dummymaker.model.GenContainer;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
-import io.dummymaker.error.GenException;
 import io.dummymaker.scan.IGenAutoScanner;
 import io.dummymaker.scan.impl.GenRuledScanner;
 import io.dummymaker.util.CastUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.inject.Singleton;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.*;
@@ -26,15 +27,12 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
-
-import static io.dummymaker.generator.simple.EmbeddedGenerator.toDepth;
-import static io.dummymaker.util.CastUtils.castObject;
-import static io.dummymaker.util.CastUtils.instantiate;
-import static io.dummymaker.util.CollectionUtils.isEmpty;
+import javax.inject.Singleton;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Produce data object objects and fill their fields with data Successor of
- * initial PopulateFactory
+ * Produce data object objects and fill their fields with data Successor of initial PopulateFactory
  *
  * @author GoodforGod
  * @see IGenerator
diff --git a/src/main/java/io/dummymaker/factory/impl/GenGraphBuilder.java b/src/main/java/io/dummymaker/factory/impl/GenGraphBuilder.java
index 611475fc..7696d609 100644
--- a/src/main/java/io/dummymaker/factory/impl/GenGraphBuilder.java
+++ b/src/main/java/io/dummymaker/factory/impl/GenGraphBuilder.java
@@ -1,5 +1,7 @@
 package io.dummymaker.factory.impl;
 
+import static io.dummymaker.util.CastUtils.isUnknownComplex;
+
 import io.dummymaker.annotation.special.GenAuto;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
@@ -7,12 +9,9 @@
 import io.dummymaker.model.graph.Payload;
 import io.dummymaker.scan.IGenAutoScanner;
 import io.dummymaker.scan.impl.GenAutoScanner;
-
 import java.util.Optional;
 import java.util.function.Predicate;
 
-import static io.dummymaker.util.CastUtils.isUnknownComplex;
-
 /**
  * Builds embedded gen auto depth graph for storage
  *
@@ -98,8 +97,8 @@ private Payload buildPayload(Class<?> target, Payload parentPayload) {
     /**
      * Checks by predicate whenever node is safe to add
      * <p>
-     * Node is safe to add as child if such link is not presented as for parent ->
-     * child -> parent This is done to avoid recursive
+     * Node is safe to add as child if such link is not presented as for parent -> child -> parent This
+     * is done to avoid recursive
      *
      * @param node   as graph starting point
      * @param filter check against
diff --git a/src/main/java/io/dummymaker/factory/impl/GenStorage.java b/src/main/java/io/dummymaker/factory/impl/GenStorage.java
index 8a236f5b..02451496 100644
--- a/src/main/java/io/dummymaker/factory/impl/GenStorage.java
+++ b/src/main/java/io/dummymaker/factory/impl/GenStorage.java
@@ -1,5 +1,7 @@
 package io.dummymaker.factory.impl;
 
+import static io.dummymaker.util.CastUtils.instantiate;
+
 import io.dummymaker.annotation.special.GenSequence;
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.factory.IGenSupplier;
@@ -11,20 +13,16 @@
 import io.dummymaker.model.graph.Node;
 import io.dummymaker.scan.IGenAutoScanner;
 import io.dummymaker.scan.impl.SequenceScanner;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
-
-import static io.dummymaker.util.CastUtils.instantiate;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Storage that facilitates generator storage, scanners, field mapping and
- * nullable fields To improve factory performance and extend complex generators
- * abilities
+ * Storage that facilitates generator storage, scanners, field mapping and nullable fields To
+ * improve factory performance and extend complex generators abilities
  *
  * @author GoodforGod
  * @since 17.07.2019
diff --git a/src/main/java/io/dummymaker/factory/impl/GenSupplier.java b/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
index 7dad8c7f..033adb97 100644
--- a/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
+++ b/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
@@ -1,5 +1,8 @@
 package io.dummymaker.factory.impl;
 
+import static io.dummymaker.util.CollectionUtils.getIndexWithSalt;
+import static io.dummymaker.util.CollectionUtils.isEmpty;
+
 import io.dummymaker.factory.IGenSupplier;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.complex.*;
@@ -10,10 +13,6 @@
 import io.dummymaker.scan.impl.ClassScanner;
 import io.dummymaker.util.CastUtils;
 import io.dummymaker.util.GenUtils;
-import me.xdrop.fuzzywuzzy.FuzzySearch;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
 import java.util.*;
@@ -21,13 +20,13 @@
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
-import static io.dummymaker.util.CollectionUtils.getIndexWithSalt;
-import static io.dummymaker.util.CollectionUtils.isEmpty;
+import me.xdrop.fuzzywuzzy.FuzzySearch;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Default gen config implementation for generators discovery With all library
- * generators and their patterns availability
+ * Default gen config implementation for generators discovery With all library generators and their
+ * patterns availability
  *
  * @author GoodforGod
  * @see IGenSupplier
@@ -69,8 +68,7 @@ public GenSupplier() {
     }
 
     /**
-     * Try to find most suitable generator class for target field Using field value
-     * class and field name
+     * Try to find most suitable generator class for target field Using field value class and field name
      * <p>
      * In case field can not be found then treat field as embedded object
      *
diff --git a/src/main/java/io/dummymaker/generator/IComplexGenerator.java b/src/main/java/io/dummymaker/generator/IComplexGenerator.java
index 95a977c0..c9c96c40 100644
--- a/src/main/java/io/dummymaker/generator/IComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/IComplexGenerator.java
@@ -2,15 +2,14 @@
 
 import io.dummymaker.annotation.core.ComplexGen;
 import io.dummymaker.factory.IGenStorage;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Complex Generator used by ComplexGen annotation to populate fields When
- * annotation have attributes or value generates for multiple field types
+ * Complex Generator used by ComplexGen annotation to populate fields When annotation have
+ * attributes or value generates for multiple field types
  *
  * @author GoodforGod
  * @see ComplexGen
@@ -23,8 +22,7 @@ public interface IComplexGenerator extends IGenerator<Object> {
      *
      * @param annotation field was marked by
      * @param field      for which value is generated
-     * @param storage    factory storage with generators and embedded entity
-     *                   production
+     * @param storage    factory storage with generators and embedded entity production
      * @param depth      current depth of the generated field
      * @param parent     parent object class
      * @return generated object
diff --git a/src/main/java/io/dummymaker/generator/IGenerator.java b/src/main/java/io/dummymaker/generator/IGenerator.java
index a592ee79..83067743 100644
--- a/src/main/java/io/dummymaker/generator/IGenerator.java
+++ b/src/main/java/io/dummymaker/generator/IGenerator.java
@@ -1,9 +1,8 @@
 package io.dummymaker.generator;
 
 import io.dummymaker.annotation.core.PrimeGen;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.regex.Pattern;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generator used by PrimeGen to populate field
diff --git a/src/main/java/io/dummymaker/generator/complex/Array2DComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/Array2DComplexGenerator.java
index a8eab899..27d1fa93 100644
--- a/src/main/java/io/dummymaker/generator/complex/Array2DComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/Array2DComplexGenerator.java
@@ -7,12 +7,11 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.string.IdGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates two dimension arrays based on field type
diff --git a/src/main/java/io/dummymaker/generator/complex/ArrayComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/ArrayComplexGenerator.java
index f4851a9e..ca5fbeaa 100644
--- a/src/main/java/io/dummymaker/generator/complex/ArrayComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/ArrayComplexGenerator.java
@@ -7,12 +7,11 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.string.IdGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates arrays based on field type
diff --git a/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java
index 6257805a..522505a3 100644
--- a/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java
@@ -1,5 +1,8 @@
 package io.dummymaker.generator.complex;
 
+import static io.dummymaker.util.CastUtils.generateObject;
+import static io.dummymaker.util.CastUtils.instantiate;
+
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.factory.IGenSupplier;
 import io.dummymaker.generator.IComplexGenerator;
@@ -9,16 +12,11 @@
 import io.dummymaker.generator.simple.string.IdGenerator;
 import io.dummymaker.util.CastUtils;
 import io.dummymaker.util.CollectionUtils;
-
 import java.lang.reflect.Field;
 
-import static io.dummymaker.util.CastUtils.generateObject;
-import static io.dummymaker.util.CastUtils.instantiate;
-
 /**
- * Basic complex generator implementation Can be used by other Complex
- * generators Providing basic methods, to build new generators on top of this
- * one
+ * Basic complex generator implementation Can be used by other Complex generators Providing basic
+ * methods, to build new generators on top of this one
  *
  * @author GoodforGod
  * @see IComplexGenerator
diff --git a/src/main/java/io/dummymaker/generator/complex/CollectionComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/CollectionComplexGenerator.java
index 2531d8e9..bedd23de 100644
--- a/src/main/java/io/dummymaker/generator/complex/CollectionComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/CollectionComplexGenerator.java
@@ -3,13 +3,12 @@
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.generator.IComplexGenerator;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.*;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Basic collection complex generator implementation Can be used by other
- * collection complex generators
+ * Basic collection complex generator implementation Can be used by other collection complex
+ * generators
  *
  * @author GoodforGod
  * @see IComplexGenerator
diff --git a/src/main/java/io/dummymaker/generator/complex/EnumComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/EnumComplexGenerator.java
index 2b63f5af..0f4e5adf 100644
--- a/src/main/java/io/dummymaker/generator/complex/EnumComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/EnumComplexGenerator.java
@@ -3,8 +3,6 @@
 import io.dummymaker.annotation.complex.GenEnum;
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -13,6 +11,7 @@
 import java.util.Set;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates enum values
diff --git a/src/main/java/io/dummymaker/generator/complex/ListComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/ListComplexGenerator.java
index 8a7646cd..ce23e304 100644
--- a/src/main/java/io/dummymaker/generator/complex/ListComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/ListComplexGenerator.java
@@ -1,5 +1,7 @@
 package io.dummymaker.generator.complex;
 
+import static io.dummymaker.util.CastUtils.getGenericType;
+
 import io.dummymaker.annotation.complex.GenList;
 import io.dummymaker.annotation.special.GenEmbedded;
 import io.dummymaker.factory.IGenStorage;
@@ -7,17 +9,14 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.string.IdGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-
-import static io.dummymaker.util.CastUtils.getGenericType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates List for GenList annotation
diff --git a/src/main/java/io/dummymaker/generator/complex/LongComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/LongComplexGenerator.java
index 92ca27ed..206a4783 100644
--- a/src/main/java/io/dummymaker/generator/complex/LongComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/LongComplexGenerator.java
@@ -1,17 +1,16 @@
 package io.dummymaker.generator.complex;
 
+import static io.dummymaker.util.CastUtils.castObject;
+
 import io.dummymaker.annotation.simple.number.GenInt;
 import io.dummymaker.annotation.simple.number.GenLong;
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.generator.IComplexGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-
-import static io.dummymaker.util.CastUtils.castObject;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates integer/long values in specified range
diff --git a/src/main/java/io/dummymaker/generator/complex/MapComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/MapComplexGenerator.java
index c3bc6586..b70e3f04 100644
--- a/src/main/java/io/dummymaker/generator/complex/MapComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/MapComplexGenerator.java
@@ -1,5 +1,7 @@
 package io.dummymaker.generator.complex;
 
+import static io.dummymaker.util.CastUtils.getGenericType;
+
 import io.dummymaker.annotation.complex.GenMap;
 import io.dummymaker.annotation.special.GenEmbedded;
 import io.dummymaker.factory.IGenStorage;
@@ -7,16 +9,13 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.string.IdGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
-
-import static io.dummymaker.util.CastUtils.getGenericType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * "default comment"
diff --git a/src/main/java/io/dummymaker/generator/complex/SetComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/SetComplexGenerator.java
index 6dec2f2d..1d6f46d2 100644
--- a/src/main/java/io/dummymaker/generator/complex/SetComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/SetComplexGenerator.java
@@ -1,5 +1,7 @@
 package io.dummymaker.generator.complex;
 
+import static io.dummymaker.util.CastUtils.getGenericType;
+
 import io.dummymaker.annotation.complex.GenSet;
 import io.dummymaker.annotation.special.GenEmbedded;
 import io.dummymaker.factory.IGenStorage;
@@ -7,9 +9,6 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.string.IdGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.HashSet;
@@ -18,8 +17,8 @@
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentSkipListSet;
 import java.util.concurrent.CopyOnWriteArraySet;
-
-import static io.dummymaker.util.CastUtils.getGenericType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates Set or GenSet annotation
diff --git a/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java
index 57eb7757..ee2e26f6 100644
--- a/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java
@@ -1,5 +1,8 @@
 package io.dummymaker.generator.complex;
 
+import static io.dummymaker.util.CastUtils.castObject;
+import static io.dummymaker.util.StringUtils.isNotBlank;
+
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.generator.IComplexGenerator;
@@ -7,11 +10,6 @@
 import io.dummymaker.generator.ITimeGenerator;
 import io.dummymaker.generator.simple.time.*;
 import io.dummymaker.util.CastUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.sql.Time;
@@ -21,9 +19,10 @@
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
-
-import static io.dummymaker.util.CastUtils.castObject;
-import static io.dummymaker.util.StringUtils.isNotBlank;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Generate time object for GenTime annotation
diff --git a/src/main/java/io/dummymaker/generator/simple/BooleanGenerator.java b/src/main/java/io/dummymaker/generator/simple/BooleanGenerator.java
index 30c4b7a9..8835a824 100644
--- a/src/main/java/io/dummymaker/generator/simple/BooleanGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/BooleanGenerator.java
@@ -1,9 +1,8 @@
 package io.dummymaker.generator.simple;
 
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates boolean values
diff --git a/src/main/java/io/dummymaker/generator/simple/NullGenerator.java b/src/main/java/io/dummymaker/generator/simple/NullGenerator.java
index 72e63c53..80d9be29 100644
--- a/src/main/java/io/dummymaker/generator/simple/NullGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/NullGenerator.java
@@ -2,11 +2,10 @@
 
 import io.dummymaker.factory.IGenStorage;
 import io.dummymaker.generator.IComplexGenerator;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates null values
diff --git a/src/main/java/io/dummymaker/generator/simple/SequenceGenerator.java b/src/main/java/io/dummymaker/generator/simple/SequenceGenerator.java
index 22e47b09..98d44a58 100644
--- a/src/main/java/io/dummymaker/generator/simple/SequenceGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/SequenceGenerator.java
@@ -5,8 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Used to generate enumerated sequence for dummies Used by populate factory and
- * genEnumerate
+ * Used to generate enumerated sequence for dummies Used by populate factory and genEnumerate
  *
  * @author GoodforGod
  * @see GenSequence
diff --git a/src/main/java/io/dummymaker/generator/simple/UuidGenerator.java b/src/main/java/io/dummymaker/generator/simple/UuidGenerator.java
index 6559c256..fcdff398 100644
--- a/src/main/java/io/dummymaker/generator/simple/UuidGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/UuidGenerator.java
@@ -1,9 +1,8 @@
 package io.dummymaker.generator.simple;
 
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.UUID;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates UUIDs
diff --git a/src/main/java/io/dummymaker/generator/simple/number/BigDecimalGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/BigDecimalGenerator.java
index 4219c0ca..cc64ca44 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/BigDecimalGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/BigDecimalGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.number;
 
+import static java.util.concurrent.ThreadLocalRandom.current;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.math.BigDecimal;
-
-import static java.util.concurrent.ThreadLocalRandom.current;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates big decimal numbers
diff --git a/src/main/java/io/dummymaker/generator/simple/number/BigIntegerGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/BigIntegerGenerator.java
index 7ff87cf8..9726a9cb 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/BigIntegerGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/BigIntegerGenerator.java
@@ -2,9 +2,8 @@
 
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.math.BigInteger;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates big integer numbers
diff --git a/src/main/java/io/dummymaker/generator/simple/number/CharacterGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/CharacterGenerator.java
index 1ab20019..adc13763 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/CharacterGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/CharacterGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.number;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates random UTF-8 character in range of (97-122)
diff --git a/src/main/java/io/dummymaker/generator/simple/number/DoubleGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/DoubleGenerator.java
index 178b74e3..7cba32eb 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/DoubleGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/DoubleGenerator.java
@@ -1,9 +1,8 @@
 package io.dummymaker.generator.simple.number;
 
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates double from 0 to 1
diff --git a/src/main/java/io/dummymaker/generator/simple/number/FloatGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/FloatGenerator.java
index dfdd484d..6171a45b 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/FloatGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/FloatGenerator.java
@@ -1,9 +1,8 @@
 package io.dummymaker.generator.simple.number;
 
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates float number from 0 to 1
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
index 5983209f..7a3e7830 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.number;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates int from 0 to Integer.MAX_VALUE
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
index 3a655aa7..1ccd19b2 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.number;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates small integer numbers from 1 up to 100
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
index 7e5cbf97..45b9ce70 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.number;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates medium integer values between 100000 and 999999
diff --git a/src/main/java/io/dummymaker/generator/simple/number/UnixTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/UnixTimeGenerator.java
index a2216a9a..429c80a2 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/UnixTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/UnixTimeGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.number;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.time.Instant;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates Unix Time as long
diff --git a/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java
index 73ee1b6a..779e2376 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.CountryBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Country with address
diff --git a/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java
index 81311261..d6ccc1a7 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java
@@ -1,16 +1,15 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.CityBundle;
 import io.dummymaker.bundle.impl.DistrictBundle;
 import io.dummymaker.bundle.impl.StreetBundle;
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Full address with street, city, district and house number
diff --git a/src/main/java/io/dummymaker/generator/simple/string/BtcAddressGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/BtcAddressGenerator.java
index b67ee785..5c54ede3 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/BtcAddressGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/BtcAddressGenerator.java
@@ -1,10 +1,9 @@
 package io.dummymaker.generator.simple.string;
 
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates bitcoin address
diff --git a/src/main/java/io/dummymaker/generator/simple/string/BtcTxHashGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/BtcTxHashGenerator.java
index 961d5d1d..a1044842 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/BtcTxHashGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/BtcTxHashGenerator.java
@@ -1,10 +1,9 @@
 package io.dummymaker.generator.simple.string;
 
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates bitcoin txhash or block hash
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CadastralGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CadastralGenerator.java
index f9519bcb..6ed02f0a 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CadastralGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CadastralGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Cadastral number generator
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java
index a45fd1d1..883d505d 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.CityBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates city in english as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
index 8141f0d1..0dc10588 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.CompanyBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates company name as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
index d64948c5..f3cf0151 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.CountryBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates country as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
index 51b1a717..4d367990 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.PhraseBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates phrase description analog
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java
index 8b945115..00ef2f71 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.DistrictBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates district
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
index 72b119cf..21e1ac16 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.concurrent.ThreadLocalRandom.current;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.number.CharacterGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.concurrent.ThreadLocalRandom.current;
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates document, password identifiers as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java
index b15cc3dd..06666910 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java
@@ -1,15 +1,14 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.DomainBundle;
 import io.dummymaker.bundle.impl.EmailServicesBundle;
 import io.dummymaker.bundle.impl.LoginBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates email as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/EthAddressGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/EthAddressGenerator.java
index ed922faa..8fa69e03 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/EthAddressGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/EthAddressGenerator.java
@@ -1,10 +1,9 @@
 package io.dummymaker.generator.simple.string;
 
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates ethereum address
diff --git a/src/main/java/io/dummymaker/generator/simple/string/EthTxHashGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/EthTxHashGenerator.java
index b0f41ba5..fce5e804 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/EthTxHashGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/EthTxHashGenerator.java
@@ -1,10 +1,9 @@
 package io.dummymaker.generator.simple.string;
 
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates ethereum txhash
diff --git a/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java
index 998d27ab..c64cb59a 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.ExtensionBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates files extensions
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
index a0d2bea2..928b6801 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
@@ -1,14 +1,13 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.ExtensionBundle;
 import io.dummymaker.bundle.impl.NounBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates file names with extensions
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
index 4ac9b804..cb4012a2 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.FormatBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates programming format name
diff --git a/src/main/java/io/dummymaker/generator/simple/string/GenderGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/GenderGenerator.java
index 37b2705a..5bfcf4f3 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/GenderGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/GenderGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
-import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
+import io.dummymaker.generator.IGenerator;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates gender as string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java
index a337c0a3..35e1006f 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates hex data
diff --git a/src/main/java/io/dummymaker/generator/simple/string/HexNumberGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/HexNumberGenerator.java
index 4b7dc57e..ae881f99 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/HexNumberGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/HexNumberGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.number.LongGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates number represented as hex string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/HouseGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/HouseGenerator.java
index e27f8b24..2860ee34 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/HouseGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/HouseGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * House, block, room generator
diff --git a/src/main/java/io/dummymaker/generator/simple/string/IdBigGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/IdBigGenerator.java
index fe44ac1a..d82a5cc1 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/IdBigGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/IdBigGenerator.java
@@ -1,9 +1,8 @@
 package io.dummymaker.generator.simple.string;
 
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.UUID;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates random string 36 character length
diff --git a/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
index eb29e893..33214971 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
@@ -1,10 +1,9 @@
 package io.dummymaker.generator.simple.string;
 
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.UUID;
 import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates id based on UUID
diff --git a/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
index cb514e9f..d1a50a3e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.JobBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Job name generator
diff --git a/src/main/java/io/dummymaker/generator/simple/string/JsonGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/JsonGenerator.java
index b6d66cac..778ebe85 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/JsonGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/JsonGenerator.java
@@ -1,14 +1,13 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates dummy JSON object as String
diff --git a/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java
index 7000b7fd..839965bc 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java
@@ -1,14 +1,13 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.concurrent.ThreadLocalRandom.current;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.LoginBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.concurrent.ThreadLocalRandom.current;
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates nicknames as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
index 03eded4e..97183b8e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.MiddleNameBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Middle name generator
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
index 7413f24a..a20ab40d 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
@@ -1,15 +1,14 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.FemaleNameBundle;
 import io.dummymaker.bundle.impl.MaleNameBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates names male and female as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
index 8f04cf35..0d13fc1e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.NounBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates single noun word
diff --git a/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
index e5347a95..f88c8f3e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates simple mobile phone as a string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
index 4ac1a7a9..d4468f0d 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
@@ -1,15 +1,14 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.ProductBundle;
 import io.dummymaker.generator.IGenerator;
+import java.util.regex.Pattern;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
-
 /**
  * Generates product names
  *
diff --git a/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java
index 8098df98..b7a9684e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.JobBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Generates roles
diff --git a/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java
index 4e9fc140..230efa10 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.StreetBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Street name generator
diff --git a/src/main/java/io/dummymaker/generator/simple/string/StringGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/StringGenerator.java
index 61f43026..b122fba8 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/StringGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/StringGenerator.java
@@ -1,12 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
-import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
+import io.dummymaker.generator.IGenerator;
 import java.util.UUID;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates random string like "aag2151tgdsfa9352tf"
diff --git a/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java
index 0a103550..a02f1bbb 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.SurnameBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Surname generator
diff --git a/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java
index f8ce56c1..be69f415 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.TagsBundle;
 import io.dummymaker.generator.IGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates tag as a string like #tag
diff --git a/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java
index d92ffa2e..62cc88ec 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java
@@ -1,14 +1,13 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates type as one of adjectives ladders level of 'Good, Bad'
diff --git a/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java
index c0212bde..1a2366ef 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java
@@ -1,11 +1,10 @@
 package io.dummymaker.generator.simple.string;
 
-import org.jetbrains.annotations.NotNull;
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates URI as string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
index dc011ee0..ae717ae8 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.bundle.IBundle;
 import io.dummymaker.bundle.impl.DomainBundle;
 import io.dummymaker.bundle.impl.LoginBundle;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates URL as string
diff --git a/src/main/java/io/dummymaker/generator/simple/string/VersionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/VersionGenerator.java
index e725f3cc..d9b72933 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/VersionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/VersionGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.string;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates version as string (like 1.1.0-SNAPSHOT) or without SNAPSHOT suffix
diff --git a/src/main/java/io/dummymaker/generator/simple/time/DateGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/DateGenerator.java
index 5c93582d..63bc7ee0 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/DateGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/DateGenerator.java
@@ -3,13 +3,12 @@
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Date;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Generates old java date type This date is exported in long milliseconds
- * format So date is the milliseconds since January 1, 1970, 00:00:00 GMT
+ * Generates old java date type This date is exported in long milliseconds format So date is the
+ * milliseconds since January 1, 1970, 00:00:00 GMT
  *
  * @author GoodforGod
  * @see Date
diff --git a/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java
index 8ef7b3c0..409f61ee 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java
@@ -2,9 +2,8 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.sql.Date;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates Sql Time from 1970 to 3000 Year
diff --git a/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java
index fb4bbb58..de750fc0 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.time;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.time.LocalDate;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates LocalDate objects with range from 1970 to 3000
diff --git a/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java
index 6764d676..a36d6e8e 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java
@@ -1,19 +1,17 @@
 package io.dummymaker.generator.simple.time;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Generates LocalDateTime from 1970 to 3000 (exclusive) year with seconds
- * precision
+ * Generates LocalDateTime from 1970 to 3000 (exclusive) year with seconds precision
  *
  * @author GoodforGod
  * @see LocalDateTime
diff --git a/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java
index f6b95094..22865ebf 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java
@@ -1,13 +1,12 @@
 package io.dummymaker.generator.simple.time;
 
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.time.LocalTime;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.CASE_INSENSITIVE;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates localTime object with range from 00:00:00 to 24:00:00
diff --git a/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java
index 0a74787f..d1c9d5b6 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java
@@ -2,9 +2,8 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.sql.Time;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates Sql Time from 1970 to 3000 Year
diff --git a/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java
index ab409a63..c481915e 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java
@@ -2,9 +2,8 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.sql.Timestamp;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Generates Sql Timestamp from 1970 to 3000 Year with nanoseconds precision
diff --git a/src/main/java/io/dummymaker/model/GenContainer.java b/src/main/java/io/dummymaker/model/GenContainer.java
index 24c9d135..c8a70a18 100644
--- a/src/main/java/io/dummymaker/model/GenContainer.java
+++ b/src/main/java/io/dummymaker/model/GenContainer.java
@@ -7,13 +7,12 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.EmbeddedGenerator;
 import io.dummymaker.generator.simple.NullGenerator;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 
 /**
- * Container with core annotation and its child marker annotation Used by
- * populate scanners and factories
+ * Container with core annotation and its child marker annotation Used by populate scanners and
+ * factories
  *
  * @author GoodforGod
  * @see PrimeGen
diff --git a/src/main/java/io/dummymaker/model/GenFieldRule.java b/src/main/java/io/dummymaker/model/GenFieldRule.java
index 48fb4b41..7f6363a8 100644
--- a/src/main/java/io/dummymaker/model/GenFieldRule.java
+++ b/src/main/java/io/dummymaker/model/GenFieldRule.java
@@ -1,7 +1,6 @@
 package io.dummymaker.model;
 
 import io.dummymaker.generator.IGenerator;
-
 import java.util.*;
 
 /**
diff --git a/src/main/java/io/dummymaker/model/GenRule.java b/src/main/java/io/dummymaker/model/GenRule.java
index 34397a04..95ed8424 100644
--- a/src/main/java/io/dummymaker/model/GenRule.java
+++ b/src/main/java/io/dummymaker/model/GenRule.java
@@ -2,11 +2,10 @@
 
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.util.CollectionUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Rule for settings generator type for specific field name or field type
@@ -47,8 +46,8 @@ private GenRule(Class<?> target, boolean isAuto, int depth) {
     }
 
     /**
-     * Gen auto class rule with default 1 depth All fields will be auto generated
-     * for such class if not ignored otherwise
+     * Gen auto class rule with default 1 depth All fields will be auto generated for such class if not
+     * ignored otherwise
      *
      * @param target for rule
      * @return gen auto class rule
@@ -62,8 +61,8 @@ private GenRule(Class<?> target, boolean isAuto, int depth) {
     }
 
     /**
-     * Gen auto class rule with specified depth All fields will be auto generated
-     * for such class if not ignored otherwise
+     * Gen auto class rule with specified depth All fields will be auto generated for such class if not
+     * ignored otherwise
      *
      * @param target for rule
      * @param depth  to set
@@ -130,8 +129,7 @@ public boolean isIgnored(Field field) {
      * Retries desired generator for field
      *
      * @param field targeted
-     * @return generator for named field or optional generator for specific type
-     *         from rules
+     * @return generator for named field or optional generator for specific type from rules
      */
     public @NotNull Optional<IGenerator<?>> getDesiredExample(Field field) {
         if (field == null || isIgnored(field))
@@ -156,8 +154,7 @@ public boolean isIgnored(Field field) {
      * Retries desired generator for field
      *
      * @param field targeted
-     * @return generator for named field or optional generator for specific type
-     *         from rules
+     * @return generator for named field or optional generator for specific type from rules
      */
     public @NotNull Optional<Class<? extends IGenerator>> getDesired(Field field) {
         if (field == null || isIgnored(field))
diff --git a/src/main/java/io/dummymaker/model/GenRules.java b/src/main/java/io/dummymaker/model/GenRules.java
index 5426593f..52960bba 100644
--- a/src/main/java/io/dummymaker/model/GenRules.java
+++ b/src/main/java/io/dummymaker/model/GenRules.java
@@ -1,15 +1,13 @@
 package io.dummymaker.model;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.*;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
- * Rules for field type and field name generators overrides Allows to override
- * gen auto generator setup without annotations Just by passing this config to
- * factory
+ * Rules for field type and field name generators overrides Allows to override gen auto generator
+ * setup without annotations Just by passing this config to factory
  *
  * @author GoodforGod
  * @see io.dummymaker.factory.IGenFactory
diff --git a/src/main/java/io/dummymaker/model/Pair.java b/src/main/java/io/dummymaker/model/Pair.java
index 88732a8e..12760e6e 100644
--- a/src/main/java/io/dummymaker/model/Pair.java
+++ b/src/main/java/io/dummymaker/model/Pair.java
@@ -1,10 +1,9 @@
 package io.dummymaker.model;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import java.util.Objects;
 import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Class for storing pairs
diff --git a/src/main/java/io/dummymaker/model/export/DateFieldContainer.java b/src/main/java/io/dummymaker/model/export/DateFieldContainer.java
index c216d7d4..88ae430c 100644
--- a/src/main/java/io/dummymaker/model/export/DateFieldContainer.java
+++ b/src/main/java/io/dummymaker/model/export/DateFieldContainer.java
@@ -1,7 +1,6 @@
 package io.dummymaker.model.export;
 
 import io.dummymaker.annotation.complex.GenTime;
-
 import java.lang.reflect.Field;
 
 /**
diff --git a/src/main/java/io/dummymaker/model/export/FieldContainer.java b/src/main/java/io/dummymaker/model/export/FieldContainer.java
index 4058b775..564b0cf2 100644
--- a/src/main/java/io/dummymaker/model/export/FieldContainer.java
+++ b/src/main/java/io/dummymaker/model/export/FieldContainer.java
@@ -3,7 +3,6 @@
 import io.dummymaker.export.Cases;
 import io.dummymaker.export.ICase;
 import io.dummymaker.util.StringUtils;
-
 import java.lang.reflect.Field;
 
 /**
diff --git a/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java b/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java
index fc4f0987..d0b49afe 100644
--- a/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java
+++ b/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java
@@ -1,10 +1,11 @@
 package io.dummymaker.model.export;
 
+import static io.dummymaker.util.StringUtils.isEmpty;
+
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.annotation.export.GenExportName;
 import io.dummymaker.annotation.special.GenSequence;
 import io.dummymaker.util.CastUtils;
-
 import java.lang.reflect.Field;
 import java.math.BigInteger;
 import java.sql.Time;
@@ -16,8 +17,6 @@
 import java.util.Date;
 import java.util.Map;
 
-import static io.dummymaker.util.StringUtils.isEmpty;
-
 /**
  * Description in progress
  *
diff --git a/src/main/java/io/dummymaker/scan/IAnnotationScanner.java b/src/main/java/io/dummymaker/scan/IAnnotationScanner.java
index 98903c83..677f7a42 100644
--- a/src/main/java/io/dummymaker/scan/IAnnotationScanner.java
+++ b/src/main/java/io/dummymaker/scan/IAnnotationScanner.java
@@ -1,16 +1,15 @@
 package io.dummymaker.scan;
 
 import io.dummymaker.scan.impl.AnnotationScanner;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Field scanner used to scan for field annotations Mostly used by factories to
- * retrieve info for them
+ * Field scanner used to scan for field annotations Mostly used by factories to retrieve info for
+ * them
  *
  * @author GoodforGod
  * @see AnnotationScanner
diff --git a/src/main/java/io/dummymaker/scan/IExportScanner.java b/src/main/java/io/dummymaker/scan/IExportScanner.java
index 735d2eb7..b5d7e9f0 100644
--- a/src/main/java/io/dummymaker/scan/IExportScanner.java
+++ b/src/main/java/io/dummymaker/scan/IExportScanner.java
@@ -1,9 +1,8 @@
 package io.dummymaker.scan;
 
 import io.dummymaker.model.export.FieldContainer;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scanner for special export annotations
diff --git a/src/main/java/io/dummymaker/scan/IGenAutoScanner.java b/src/main/java/io/dummymaker/scan/IGenAutoScanner.java
index ca7f5b1e..efcf8204 100644
--- a/src/main/java/io/dummymaker/scan/IGenAutoScanner.java
+++ b/src/main/java/io/dummymaker/scan/IGenAutoScanner.java
@@ -1,10 +1,9 @@
 package io.dummymaker.scan;
 
 import io.dummymaker.model.GenContainer;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scanners used by populate factory primarily
@@ -19,8 +18,7 @@ public interface IGenAutoScanner extends IGenScanner {
      * Same as default scan but also scan for suitable gen auto generators
      *
      * @param target        to scan
-     * @param isDefaultAuto mark target as GenAuto as default even if it is not
-     *                      annotated
+     * @param isDefaultAuto mark target as GenAuto as default even if it is not annotated
      * @return map of fields and its gen containers
      * @see io.dummymaker.annotation.special.GenAuto
      */
diff --git a/src/main/java/io/dummymaker/scan/IGenScanner.java b/src/main/java/io/dummymaker/scan/IGenScanner.java
index 494b5de7..0ecade33 100644
--- a/src/main/java/io/dummymaker/scan/IGenScanner.java
+++ b/src/main/java/io/dummymaker/scan/IGenScanner.java
@@ -1,10 +1,9 @@
 package io.dummymaker.scan;
 
 import io.dummymaker.model.GenContainer;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scanners used by populate factory primarily
diff --git a/src/main/java/io/dummymaker/scan/IMapScanner.java b/src/main/java/io/dummymaker/scan/IMapScanner.java
index 18bfb325..efe02e02 100644
--- a/src/main/java/io/dummymaker/scan/IMapScanner.java
+++ b/src/main/java/io/dummymaker/scan/IMapScanner.java
@@ -1,8 +1,7 @@
 package io.dummymaker.scan;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Map;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Map based scanner contract
diff --git a/src/main/java/io/dummymaker/scan/IScanner.java b/src/main/java/io/dummymaker/scan/IScanner.java
index eeb1e777..d557a8a6 100644
--- a/src/main/java/io/dummymaker/scan/IScanner.java
+++ b/src/main/java/io/dummymaker/scan/IScanner.java
@@ -1,8 +1,7 @@
 package io.dummymaker.scan;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * List based scanner contract
diff --git a/src/main/java/io/dummymaker/scan/impl/AnnotationScanner.java b/src/main/java/io/dummymaker/scan/impl/AnnotationScanner.java
index bec40fb5..4d2fdb2e 100644
--- a/src/main/java/io/dummymaker/scan/impl/AnnotationScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/AnnotationScanner.java
@@ -1,10 +1,6 @@
 package io.dummymaker.scan.impl;
 
 import io.dummymaker.scan.IAnnotationScanner;
-import org.jetbrains.annotations.NotNull;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -12,6 +8,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Scan field for all annotations Core scanner implementation
diff --git a/src/main/java/io/dummymaker/scan/impl/BasicScanner.java b/src/main/java/io/dummymaker/scan/impl/BasicScanner.java
index 528cad22..5614fbbd 100644
--- a/src/main/java/io/dummymaker/scan/impl/BasicScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/BasicScanner.java
@@ -1,7 +1,5 @@
 package io.dummymaker.scan.impl;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -9,6 +7,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Basic scanner utility class
diff --git a/src/main/java/io/dummymaker/scan/impl/ClassScanner.java b/src/main/java/io/dummymaker/scan/impl/ClassScanner.java
index 7b3b38aa..62093ce2 100644
--- a/src/main/java/io/dummymaker/scan/impl/ClassScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/ClassScanner.java
@@ -2,10 +2,9 @@
 
 import io.dummymaker.scan.IScanner;
 import io.dummymaker.util.PackageUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scan for classes at runtime by packages
diff --git a/src/main/java/io/dummymaker/scan/impl/ExportScanner.java b/src/main/java/io/dummymaker/scan/impl/ExportScanner.java
index 7d1cd127..61911b48 100644
--- a/src/main/java/io/dummymaker/scan/impl/ExportScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/ExportScanner.java
@@ -6,15 +6,13 @@
 import io.dummymaker.model.export.FieldContainer;
 import io.dummymaker.model.export.FieldContainerFactory;
 import io.dummymaker.scan.IExportScanner;
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Scanner for special export annotations and produces export containers Which
- * are used in exporters
+ * Scanner for special export annotations and produces export containers Which are used in exporters
  *
  * @author GoodforGod
  * @see io.dummymaker.export.IExporter
diff --git a/src/main/java/io/dummymaker/scan/impl/GenAutoScanner.java b/src/main/java/io/dummymaker/scan/impl/GenAutoScanner.java
index 1e9c7da6..6fbb3564 100644
--- a/src/main/java/io/dummymaker/scan/impl/GenAutoScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/GenAutoScanner.java
@@ -5,12 +5,11 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.model.GenContainer;
 import io.dummymaker.scan.IGenAutoScanner;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.function.Predicate;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Implementation of scanner that suits gen auto annotations where needed
diff --git a/src/main/java/io/dummymaker/scan/impl/GenRuledScanner.java b/src/main/java/io/dummymaker/scan/impl/GenRuledScanner.java
index 0ac61afd..ff164fd2 100644
--- a/src/main/java/io/dummymaker/scan/impl/GenRuledScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/GenRuledScanner.java
@@ -4,12 +4,11 @@
 import io.dummymaker.model.GenContainer;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scanner that sets gen rules where needed
diff --git a/src/main/java/io/dummymaker/scan/impl/GenScanner.java b/src/main/java/io/dummymaker/scan/impl/GenScanner.java
index 6ab3d494..a1e986d9 100644
--- a/src/main/java/io/dummymaker/scan/impl/GenScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/GenScanner.java
@@ -6,16 +6,14 @@
 import io.dummymaker.annotation.special.GenIgnore;
 import io.dummymaker.model.GenContainer;
 import io.dummymaker.scan.IGenScanner;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.*;
 import java.util.function.Predicate;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Scanner used by populate factory Scan for prime gen annotation and its child
- * annotation
+ * Scanner used by populate factory Scan for prime gen annotation and its child annotation
  *
  * @author GoodforGod
  * @see PrimeGen
@@ -32,8 +30,8 @@ public class GenScanner extends BasicScanner implements IGenScanner {
     /**
      * Scan for prime/complex gen annotation and its child annotation
      *
-     * @param target class to scan KEY is field that has populate annotations VALUE
-     *               is Gen container with generate params for that field
+     * @param target class to scan KEY is field that has populate annotations VALUE is Gen container
+     *               with generate params for that field
      * @return populate field map, where
      * @see GenContainer
      */
diff --git a/src/main/java/io/dummymaker/scan/impl/ResourceScanner.java b/src/main/java/io/dummymaker/scan/impl/ResourceScanner.java
index e216dcf1..0ca5eb2f 100644
--- a/src/main/java/io/dummymaker/scan/impl/ResourceScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/ResourceScanner.java
@@ -4,8 +4,6 @@
 import io.dummymaker.util.CollectionUtils;
 import io.dummymaker.util.PackageUtils;
 import io.dummymaker.util.StringUtils;
-import org.jetbrains.annotations.NotNull;
-
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -15,6 +13,7 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scan for resources at runtime by package
@@ -45,8 +44,7 @@ public class ResourceScanner implements IScanner<String, String> {
     }
 
     /**
-     * Given a package name and a directory returns all classes within that
-     * directory
+     * Given a package name and a directory returns all classes within that directory
      *
      * @param directory   to process
      * @param packageName to process
@@ -71,8 +69,7 @@ private static Collection<String> loadFromDirectory(File directory, String packa
     }
 
     /**
-     * Given a jar file's URL and a package name returns all classes within jar
-     * file.
+     * Given a jar file's URL and a package name returns all classes within jar file.
      *
      * @param resource as jar to process
      */
diff --git a/src/main/java/io/dummymaker/scan/impl/SequenceScanner.java b/src/main/java/io/dummymaker/scan/impl/SequenceScanner.java
index 7cde9c3d..a0ebc2d8 100644
--- a/src/main/java/io/dummymaker/scan/impl/SequenceScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/SequenceScanner.java
@@ -1,8 +1,6 @@
 package io.dummymaker.scan.impl;
 
 import io.dummymaker.annotation.special.GenSequence;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.Collections;
@@ -10,6 +8,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Scanner to filter fields for enumerate annotation fields
diff --git a/src/main/java/io/dummymaker/scan/impl/UniqueScanner.java b/src/main/java/io/dummymaker/scan/impl/UniqueScanner.java
index 526af9bd..795cddf2 100644
--- a/src/main/java/io/dummymaker/scan/impl/UniqueScanner.java
+++ b/src/main/java/io/dummymaker/scan/impl/UniqueScanner.java
@@ -1,18 +1,17 @@
 package io.dummymaker.scan.impl;
 
 import io.dummymaker.scan.IAnnotationScanner;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+import org.jetbrains.annotations.NotNull;
 
 /**
- * Scan for field and its unique annotations (without duplicates) And return
- * fields in correct order Core scanner implementation
+ * Scan for field and its unique annotations (without duplicates) And return fields in correct order
+ * Core scanner implementation
  *
  * @author GoodforGod
  * @see IAnnotationScanner
diff --git a/src/main/java/io/dummymaker/util/CastUtils.java b/src/main/java/io/dummymaker/util/CastUtils.java
index b244b363..9c0b006e 100644
--- a/src/main/java/io/dummymaker/util/CastUtils.java
+++ b/src/main/java/io/dummymaker/util/CastUtils.java
@@ -1,9 +1,6 @@
 package io.dummymaker.util;
 
 import io.dummymaker.generator.IGenerator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
@@ -12,7 +9,10 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utils for object casting
@@ -194,8 +194,8 @@ public static <T> T castObject(final Object castObject, final Class<T> fieldType
     }
 
     /**
-     * Try to box downcast or box object if it is boxed primitive type And field is
-     * also boxed primitive (can't cast one to another explicitly)
+     * Try to box downcast or box object if it is boxed primitive type And field is also boxed primitive
+     * (can't cast one to another explicitly)
      */
     private static <T> Object boxObject(final Object castObject, final Class<T> fieldType) {
         final CastType firstType = CastType.of(castObject.getClass());
diff --git a/src/main/java/io/dummymaker/util/CollectionUtils.java b/src/main/java/io/dummymaker/util/CollectionUtils.java
index 6725615c..dd177d5c 100644
--- a/src/main/java/io/dummymaker/util/CollectionUtils.java
+++ b/src/main/java/io/dummymaker/util/CollectionUtils.java
@@ -1,12 +1,11 @@
 package io.dummymaker.util;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ThreadLocalRandom;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Basic util methods for collections
@@ -76,9 +75,9 @@ public static <T> T random(@NotNull T[] array) {
     }
 
     /**
-     * Consider that accessing random element for {@link java.util.LinkedList} or
-     * {@link java.util.Set} is O(N) where N is index of random element, this is due
-     * to this collections does not have random access.
+     * Consider that accessing random element for {@link java.util.LinkedList} or {@link java.util.Set}
+     * is O(N) where N is index of random element, this is due to this collections does not have random
+     * access.
      *
      * @param collection to get random element from
      * @param <T>        type of element
diff --git a/src/main/java/io/dummymaker/util/DateUtils.java b/src/main/java/io/dummymaker/util/DateUtils.java
index 80f4891d..900c2669 100644
--- a/src/main/java/io/dummymaker/util/DateUtils.java
+++ b/src/main/java/io/dummymaker/util/DateUtils.java
@@ -1,8 +1,5 @@
 package io.dummymaker.util;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -10,6 +7,8 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Contains basic date util methods and functions
diff --git a/src/main/java/io/dummymaker/util/GenUtils.java b/src/main/java/io/dummymaker/util/GenUtils.java
index 0bd6a952..e0c0db04 100644
--- a/src/main/java/io/dummymaker/util/GenUtils.java
+++ b/src/main/java/io/dummymaker/util/GenUtils.java
@@ -2,9 +2,6 @@
 
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.ITimeGenerator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
@@ -12,6 +9,8 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Utils for auto gen mapping
diff --git a/src/main/java/io/dummymaker/writer/impl/FileWriter.java b/src/main/java/io/dummymaker/writer/impl/FileWriter.java
index dd814155..879c2d62 100644
--- a/src/main/java/io/dummymaker/writer/impl/FileWriter.java
+++ b/src/main/java/io/dummymaker/writer/impl/FileWriter.java
@@ -3,7 +3,6 @@
 import io.dummymaker.error.ExportException;
 import io.dummymaker.util.StringUtils;
 import io.dummymaker.writer.IWriter;
-
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -27,8 +26,7 @@ public FileWriter(String filename, boolean deleteFileBeforeWrite) {
 
     /**
      * @param filename              file name
-     * @param path                  path where to create file (NULL or EMPTY for
-     *                              home dir)
+     * @param path                  path where to create file (NULL or EMPTY for home dir)
      * @param deleteFileBeforeWrite clean file when writer is created
      */
     public FileWriter(String path, String filename, boolean deleteFileBeforeWrite) {
diff --git a/src/test/java/io/dummymaker/bundle/BundleImplTest.java b/src/test/java/io/dummymaker/bundle/BundleImplTest.java
index 86e515e3..0e2148b3 100644
--- a/src/test/java/io/dummymaker/bundle/BundleImplTest.java
+++ b/src/test/java/io/dummymaker/bundle/BundleImplTest.java
@@ -1,17 +1,16 @@
 package io.dummymaker.bundle;
 
+import static java.util.concurrent.ThreadLocalRandom.current;
+import static org.junit.runners.Parameterized.Parameters;
+
 import io.dummymaker.bundle.impl.*;
+import java.util.Arrays;
+import java.util.Collection;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import java.util.Arrays;
-import java.util.Collection;
-
-import static java.util.concurrent.ThreadLocalRandom.current;
-import static org.junit.runners.Parameterized.Parameters;
-
 /**
  * "Default Description"
  *
diff --git a/src/test/java/io/dummymaker/export/BasicExporterValidationTest.java b/src/test/java/io/dummymaker/export/BasicExporterValidationTest.java
index e29d7a40..0a9456b5 100644
--- a/src/test/java/io/dummymaker/export/BasicExporterValidationTest.java
+++ b/src/test/java/io/dummymaker/export/BasicExporterValidationTest.java
@@ -5,17 +5,16 @@
 import io.dummymaker.export.impl.SqlExporter;
 import io.dummymaker.export.impl.XmlExporter;
 import io.dummymaker.model.DummyNoZeroConstructor;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/export/CaseParameterizedTest.java b/src/test/java/io/dummymaker/export/CaseParameterizedTest.java
index 5fd9f12c..51043072 100644
--- a/src/test/java/io/dummymaker/export/CaseParameterizedTest.java
+++ b/src/test/java/io/dummymaker/export/CaseParameterizedTest.java
@@ -1,14 +1,13 @@
 package io.dummymaker.export;
 
+import java.util.Arrays;
+import java.util.Collection;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/export/UniqueExporterTests.java b/src/test/java/io/dummymaker/export/UniqueExporterTests.java
index c89870d8..b06de233 100644
--- a/src/test/java/io/dummymaker/export/UniqueExporterTests.java
+++ b/src/test/java/io/dummymaker/export/UniqueExporterTests.java
@@ -5,11 +5,10 @@
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.model.DummyEmbedded.DummyEmbeddedIntoSimple;
 import io.dummymaker.model.GenRule;
+import java.util.concurrent.ThreadLocalRandom;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.concurrent.ThreadLocalRandom;
-
 /**
  * Description in progress
  *
diff --git a/src/test/java/io/dummymaker/export/ValidatorExporterTest.java b/src/test/java/io/dummymaker/export/ValidatorExporterTest.java
index d179dad7..ecaae2d1 100644
--- a/src/test/java/io/dummymaker/export/ValidatorExporterTest.java
+++ b/src/test/java/io/dummymaker/export/ValidatorExporterTest.java
@@ -9,15 +9,14 @@
 import io.dummymaker.model.DummyTime;
 import io.dummymaker.model.DummyTimeFormatter;
 import io.dummymaker.model.DummyUnixTime;
+import java.util.Arrays;
+import java.util.Collection;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.Arrays;
-import java.util.Collection;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/export/asfile/CsvExportAsFileTest.java b/src/test/java/io/dummymaker/export/asfile/CsvExportAsFileTest.java
index 29e15465..45ee2dc9 100644
--- a/src/test/java/io/dummymaker/export/asfile/CsvExportAsFileTest.java
+++ b/src/test/java/io/dummymaker/export/asfile/CsvExportAsFileTest.java
@@ -8,9 +8,8 @@
 import io.dummymaker.export.validators.CsvValidator;
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/export/asfile/ExportAsFileTests.java b/src/test/java/io/dummymaker/export/asfile/ExportAsFileTests.java
index 742cbcdd..31069a79 100644
--- a/src/test/java/io/dummymaker/export/asfile/ExportAsFileTests.java
+++ b/src/test/java/io/dummymaker/export/asfile/ExportAsFileTests.java
@@ -10,17 +10,16 @@
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoExportFields;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/export/asfile/ExportAssert.java b/src/test/java/io/dummymaker/export/asfile/ExportAssert.java
index 52a8e823..3de98f18 100644
--- a/src/test/java/io/dummymaker/export/asfile/ExportAssert.java
+++ b/src/test/java/io/dummymaker/export/asfile/ExportAssert.java
@@ -1,10 +1,5 @@
 package io.dummymaker.export.asfile;
 
-import org.junit.After;
-import org.junit.Assert;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -12,6 +7,10 @@
 import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
+import org.junit.After;
+import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @author GoodforGod
diff --git a/src/test/java/io/dummymaker/export/asfile/FileExportAssert.java b/src/test/java/io/dummymaker/export/asfile/FileExportAssert.java
index a3772291..82a7a587 100644
--- a/src/test/java/io/dummymaker/export/asfile/FileExportAssert.java
+++ b/src/test/java/io/dummymaker/export/asfile/FileExportAssert.java
@@ -7,10 +7,9 @@
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoExportFields;
-import org.junit.Test;
-
 import java.util.Collections;
 import java.util.List;
+import org.junit.Test;
 
 /**
  * "default comment"
diff --git a/src/test/java/io/dummymaker/export/asfile/JsonExportAsFileTest.java b/src/test/java/io/dummymaker/export/asfile/JsonExportAsFileTest.java
index fd77d45b..0792e536 100644
--- a/src/test/java/io/dummymaker/export/asfile/JsonExportAsFileTest.java
+++ b/src/test/java/io/dummymaker/export/asfile/JsonExportAsFileTest.java
@@ -9,9 +9,8 @@
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.writer.impl.FileWriter;
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java b/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java
index 854682e3..ec1d8ee4 100644
--- a/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java
+++ b/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java
@@ -9,11 +9,10 @@
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyTime;
-import org.junit.Test;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/export/asfile/XmlExportAsFileTest.java b/src/test/java/io/dummymaker/export/asfile/XmlExportAsFileTest.java
index b97b8d4b..3b8799ee 100644
--- a/src/test/java/io/dummymaker/export/asfile/XmlExportAsFileTest.java
+++ b/src/test/java/io/dummymaker/export/asfile/XmlExportAsFileTest.java
@@ -8,7 +8,6 @@
 import io.dummymaker.export.validators.XmlValidator;
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
-
 import java.util.List;
 
 /**
diff --git a/src/test/java/io/dummymaker/export/asstring/CsvExportAsStringTest.java b/src/test/java/io/dummymaker/export/asstring/CsvExportAsStringTest.java
index 6331f8ef..101769c4 100644
--- a/src/test/java/io/dummymaker/export/asstring/CsvExportAsStringTest.java
+++ b/src/test/java/io/dummymaker/export/asstring/CsvExportAsStringTest.java
@@ -7,9 +7,8 @@
 import io.dummymaker.export.validators.CsvValidator;
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 /**
  * @author GoodforGod
diff --git a/src/test/java/io/dummymaker/export/asstring/ExportAsStringTests.java b/src/test/java/io/dummymaker/export/asstring/ExportAsStringTests.java
index bcb8d0a7..7631e161 100644
--- a/src/test/java/io/dummymaker/export/asstring/ExportAsStringTests.java
+++ b/src/test/java/io/dummymaker/export/asstring/ExportAsStringTests.java
@@ -10,6 +10,10 @@
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoExportFields;
 import io.dummymaker.model.deprecated.DummyAuto;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -17,11 +21,6 @@
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/export/asstring/JsonExportAsStringTest.java b/src/test/java/io/dummymaker/export/asstring/JsonExportAsStringTest.java
index 0be817f8..31d73d47 100644
--- a/src/test/java/io/dummymaker/export/asstring/JsonExportAsStringTest.java
+++ b/src/test/java/io/dummymaker/export/asstring/JsonExportAsStringTest.java
@@ -6,9 +6,8 @@
 import io.dummymaker.export.validators.JsonValidator;
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/export/asstring/SqlExportAsStringTest.java b/src/test/java/io/dummymaker/export/asstring/SqlExportAsStringTest.java
index fc7f14b8..ca3bafbf 100644
--- a/src/test/java/io/dummymaker/export/asstring/SqlExportAsStringTest.java
+++ b/src/test/java/io/dummymaker/export/asstring/SqlExportAsStringTest.java
@@ -8,9 +8,8 @@
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyArray;
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/export/asstring/StringExportAssert.java b/src/test/java/io/dummymaker/export/asstring/StringExportAssert.java
index 2e9a437b..3d4b83c4 100644
--- a/src/test/java/io/dummymaker/export/asstring/StringExportAssert.java
+++ b/src/test/java/io/dummymaker/export/asstring/StringExportAssert.java
@@ -6,11 +6,10 @@
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoExportFields;
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.Collections;
 import java.util.List;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * "default comment"
diff --git a/src/test/java/io/dummymaker/export/asstring/XmlExportAsStringTest.java b/src/test/java/io/dummymaker/export/asstring/XmlExportAsStringTest.java
index a355f216..997e41e5 100644
--- a/src/test/java/io/dummymaker/export/asstring/XmlExportAsStringTest.java
+++ b/src/test/java/io/dummymaker/export/asstring/XmlExportAsStringTest.java
@@ -7,9 +7,8 @@
 import io.dummymaker.export.validators.XmlValidator;
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
-import org.junit.Test;
-
 import java.util.List;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/export/validators/CsvValidator.java b/src/test/java/io/dummymaker/export/validators/CsvValidator.java
index e9f80636..1224b14d 100644
--- a/src/test/java/io/dummymaker/export/validators/CsvValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/CsvValidator.java
@@ -1,15 +1,15 @@
 package io.dummymaker.export.validators;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import io.dummymaker.export.Cases;
 import io.dummymaker.export.ICase;
 import io.dummymaker.export.impl.CsvExporter;
 import io.dummymaker.model.DummyTime.Patterns;
 import io.dummymaker.model.DummyTimeFormatter;
 
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 /**
  * "Default Description"
  *
diff --git a/src/test/java/io/dummymaker/export/validators/JsonValidator.java b/src/test/java/io/dummymaker/export/validators/JsonValidator.java
index 8105c742..13868a5c 100644
--- a/src/test/java/io/dummymaker/export/validators/JsonValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/JsonValidator.java
@@ -1,14 +1,14 @@
 package io.dummymaker.export.validators;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static io.dummymaker.model.DummyTimeFormatter.Patterns.*;
+import static org.junit.Assert.assertTrue;
+
 import io.dummymaker.export.Cases;
 import io.dummymaker.export.ICase;
 import io.dummymaker.model.DummyTime.Fields;
 import io.dummymaker.model.DummyTime.Patterns;
 
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static io.dummymaker.model.DummyTimeFormatter.Patterns.*;
-import static org.junit.Assert.assertTrue;
-
 /**
  * "Default Description"
  *
diff --git a/src/test/java/io/dummymaker/export/validators/SqlValidator.java b/src/test/java/io/dummymaker/export/validators/SqlValidator.java
index 6491d87f..c1016c7c 100644
--- a/src/test/java/io/dummymaker/export/validators/SqlValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/SqlValidator.java
@@ -1,16 +1,16 @@
 package io.dummymaker.export.validators;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static io.dummymaker.model.DummyTime.*;
+import static io.dummymaker.model.DummyTime.Fields.*;
+import static org.junit.Assert.assertTrue;
+
 import io.dummymaker.export.Cases;
 import io.dummymaker.export.ICase;
 import io.dummymaker.export.cases.DefaultCase;
 import io.dummymaker.model.DummyArray;
 import io.dummymaker.model.DummyTimeFormatter;
 
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static io.dummymaker.model.DummyTime.*;
-import static io.dummymaker.model.DummyTime.Fields.*;
-import static org.junit.Assert.assertTrue;
-
 /**
  * "Default Description"
  *
diff --git a/src/test/java/io/dummymaker/export/validators/XmlValidator.java b/src/test/java/io/dummymaker/export/validators/XmlValidator.java
index 08aad62c..4b8a8d31 100644
--- a/src/test/java/io/dummymaker/export/validators/XmlValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/XmlValidator.java
@@ -1,14 +1,14 @@
 package io.dummymaker.export.validators;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static io.dummymaker.model.DummyTime.Fields.*;
+import static org.junit.Assert.assertTrue;
+
 import io.dummymaker.export.Cases;
 import io.dummymaker.export.ICase;
 import io.dummymaker.model.DummyTime.Patterns;
 import io.dummymaker.model.DummyTimeFormatter;
 
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static io.dummymaker.model.DummyTime.Fields.*;
-import static org.junit.Assert.assertTrue;
-
 /**
  * "Default Description"
  *
diff --git a/src/test/java/io/dummymaker/factory/DummyArrayTests.java b/src/test/java/io/dummymaker/factory/DummyArrayTests.java
index 2a7228b2..2e136082 100644
--- a/src/test/java/io/dummymaker/factory/DummyArrayTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyArrayTests.java
@@ -5,11 +5,10 @@
 import io.dummymaker.model.DummyArray;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
+import java.util.regex.Pattern;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.regex.Pattern;
-
 /**
  * Dummy array tests
  *
diff --git a/src/test/java/io/dummymaker/factory/DummyAutoNamedTests.java b/src/test/java/io/dummymaker/factory/DummyAutoNamedTests.java
index 6d44f7f6..13ceafec 100644
--- a/src/test/java/io/dummymaker/factory/DummyAutoNamedTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyAutoNamedTests.java
@@ -4,11 +4,10 @@
 import io.dummymaker.model.DummyAutoNamed;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
+import java.util.UUID;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.UUID;
-
 /**
  * ! NO DESCRIPTION !
  *
diff --git a/src/test/java/io/dummymaker/factory/DummyCollectionTests.java b/src/test/java/io/dummymaker/factory/DummyCollectionTests.java
index 6938f070..9d068a20 100644
--- a/src/test/java/io/dummymaker/factory/DummyCollectionTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyCollectionTests.java
@@ -1,11 +1,11 @@
 package io.dummymaker.factory;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.DummyCollection;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * Dummy collection tests
  *
diff --git a/src/test/java/io/dummymaker/factory/DummyEmbeddedComplexAutoTests.java b/src/test/java/io/dummymaker/factory/DummyEmbeddedComplexAutoTests.java
index 1b42827d..7feb4032 100644
--- a/src/test/java/io/dummymaker/factory/DummyEmbeddedComplexAutoTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyEmbeddedComplexAutoTests.java
@@ -5,11 +5,10 @@
 import io.dummymaker.model.DummyEmbedded;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.List;
-
 /**
  * ! NO DESCRIPTION !
  *
diff --git a/src/test/java/io/dummymaker/factory/DummyGlobalRulesTests.java b/src/test/java/io/dummymaker/factory/DummyGlobalRulesTests.java
index b8b32ab7..1a22d919 100644
--- a/src/test/java/io/dummymaker/factory/DummyGlobalRulesTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyGlobalRulesTests.java
@@ -9,13 +9,12 @@
 import io.dummymaker.model.DummyEmbedded;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.Arrays;
 import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Global Gen rules tests
diff --git a/src/test/java/io/dummymaker/factory/DummyNoFillFieldsTests.java b/src/test/java/io/dummymaker/factory/DummyNoFillFieldsTests.java
index 19374410..d7781ea7 100644
--- a/src/test/java/io/dummymaker/factory/DummyNoFillFieldsTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyNoFillFieldsTests.java
@@ -1,11 +1,11 @@
 package io.dummymaker.factory;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.DummyNoFillFields;
 import org.junit.Test;
 
-import static org.junit.Assert.*;
-
 /**
  * ! NO DESCRIPTION !
  *
diff --git a/src/test/java/io/dummymaker/factory/DummyTests.java b/src/test/java/io/dummymaker/factory/DummyTests.java
index adda076d..fbc62579 100644
--- a/src/test/java/io/dummymaker/factory/DummyTests.java
+++ b/src/test/java/io/dummymaker/factory/DummyTests.java
@@ -1,14 +1,13 @@
 package io.dummymaker.factory;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoFillFields;
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.List;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * ! NO DESCRIPTION !
diff --git a/src/test/java/io/dummymaker/factory/FactoryTests.java b/src/test/java/io/dummymaker/factory/FactoryTests.java
index ae2f5f82..3e1493a7 100644
--- a/src/test/java/io/dummymaker/factory/FactoryTests.java
+++ b/src/test/java/io/dummymaker/factory/FactoryTests.java
@@ -1,15 +1,14 @@
 package io.dummymaker.factory;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoZeroConstructor;
-import org.junit.Test;
-
 import java.util.Collections;
 import java.util.List;
-
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.junit.Test;
 
 /**
  * ! NO DESCRIPTION !
diff --git a/src/test/java/io/dummymaker/factory/GenFactoryBuildTests.java b/src/test/java/io/dummymaker/factory/GenFactoryBuildTests.java
index 82857b7a..d5e004f7 100644
--- a/src/test/java/io/dummymaker/factory/GenFactoryBuildTests.java
+++ b/src/test/java/io/dummymaker/factory/GenFactoryBuildTests.java
@@ -1,14 +1,13 @@
 package io.dummymaker.factory;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.*;
 import io.dummymaker.model.deprecated.DummyAuto;
-import org.junit.Test;
-
 import java.util.List;
 import java.util.regex.Pattern;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * Default Comment
diff --git a/src/test/java/io/dummymaker/factory/GenFactoryFillTests.java b/src/test/java/io/dummymaker/factory/GenFactoryFillTests.java
index e0395c02..1935ba59 100644
--- a/src/test/java/io/dummymaker/factory/GenFactoryFillTests.java
+++ b/src/test/java/io/dummymaker/factory/GenFactoryFillTests.java
@@ -1,15 +1,14 @@
 package io.dummymaker.factory;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.factory.impl.GenFactory;
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.DummyNoFillFields;
-import org.junit.Test;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/generator/GeneratorPatternValidTest.java b/src/test/java/io/dummymaker/generator/GeneratorPatternValidTest.java
index 60864fa7..b181af37 100644
--- a/src/test/java/io/dummymaker/generator/GeneratorPatternValidTest.java
+++ b/src/test/java/io/dummymaker/generator/GeneratorPatternValidTest.java
@@ -1,5 +1,9 @@
 package io.dummymaker.generator;
 
+import static java.util.regex.Pattern.compile;
+import static org.junit.Assert.*;
+import static org.junit.runners.Parameterized.Parameters;
+
 import io.dummymaker.generator.complex.ListComplexGenerator;
 import io.dummymaker.generator.complex.MapComplexGenerator;
 import io.dummymaker.generator.complex.SetComplexGenerator;
@@ -10,10 +14,6 @@
 import io.dummymaker.generator.simple.string.*;
 import io.dummymaker.generator.simple.time.*;
 import io.dummymaker.model.DummyTime.Patterns;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Time;
@@ -23,10 +23,9 @@
 import java.time.LocalTime;
 import java.util.*;
 import java.util.regex.Pattern;
-
-import static java.util.regex.Pattern.compile;
-import static org.junit.Assert.*;
-import static org.junit.runners.Parameterized.Parameters;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 /**
  * Generators Tests
diff --git a/src/test/java/io/dummymaker/generator/UniqueGeneratorsTest.java b/src/test/java/io/dummymaker/generator/UniqueGeneratorsTest.java
index fcad2eb0..3872ea45 100644
--- a/src/test/java/io/dummymaker/generator/UniqueGeneratorsTest.java
+++ b/src/test/java/io/dummymaker/generator/UniqueGeneratorsTest.java
@@ -1,14 +1,13 @@
 package io.dummymaker.generator;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.generator.simple.EmbeddedGenerator;
 import io.dummymaker.generator.simple.NullGenerator;
 import io.dummymaker.generator.simple.SequenceGenerator;
 import io.dummymaker.generator.simple.time.LocalDateTimeGenerator;
-import org.junit.Test;
-
 import java.time.LocalDateTime;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * "Default Description"
diff --git a/src/test/java/io/dummymaker/model/Dummy.java b/src/test/java/io/dummymaker/model/Dummy.java
index 0317b2be..044e16dd 100644
--- a/src/test/java/io/dummymaker/model/Dummy.java
+++ b/src/test/java/io/dummymaker/model/Dummy.java
@@ -7,7 +7,6 @@
 import io.dummymaker.annotation.simple.string.GenCity;
 import io.dummymaker.annotation.simple.string.GenName;
 import io.dummymaker.annotation.special.GenSequence;
-
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/src/test/java/io/dummymaker/model/DummyAutoComplex.java b/src/test/java/io/dummymaker/model/DummyAutoComplex.java
index aae7f46d..0cc0ec6a 100644
--- a/src/test/java/io/dummymaker/model/DummyAutoComplex.java
+++ b/src/test/java/io/dummymaker/model/DummyAutoComplex.java
@@ -4,7 +4,6 @@
 import io.dummymaker.annotation.special.GenAuto;
 import io.dummymaker.generator.simple.EmbeddedGenerator;
 import io.dummymaker.generator.simple.string.BtcAddressGenerator;
-
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/src/test/java/io/dummymaker/model/DummyCollection.java b/src/test/java/io/dummymaker/model/DummyCollection.java
index 13b689cc..92609ae0 100644
--- a/src/test/java/io/dummymaker/model/DummyCollection.java
+++ b/src/test/java/io/dummymaker/model/DummyCollection.java
@@ -6,7 +6,6 @@
 import io.dummymaker.annotation.special.GenEmbedded;
 import io.dummymaker.generator.simple.BooleanGenerator;
 import io.dummymaker.generator.simple.string.HexDataGenerator;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/test/java/io/dummymaker/model/DummyCollectionWrong.java b/src/test/java/io/dummymaker/model/DummyCollectionWrong.java
index 863a8aba..fa8bbd6a 100644
--- a/src/test/java/io/dummymaker/model/DummyCollectionWrong.java
+++ b/src/test/java/io/dummymaker/model/DummyCollectionWrong.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.complex.GenList;
 import io.dummymaker.annotation.complex.GenMap;
 import io.dummymaker.annotation.complex.GenSet;
-
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
diff --git a/src/test/java/io/dummymaker/model/DummyCustom.java b/src/test/java/io/dummymaker/model/DummyCustom.java
index 8ccfe2df..19edea92 100644
--- a/src/test/java/io/dummymaker/model/DummyCustom.java
+++ b/src/test/java/io/dummymaker/model/DummyCustom.java
@@ -6,12 +6,11 @@
 import io.dummymaker.generator.simple.BooleanGenerator;
 import io.dummymaker.generator.simple.number.FloatGenerator;
 import io.dummymaker.generator.simple.number.ShortGenerator;
-import org.jetbrains.annotations.NotNull;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Custom annotation dummy tester
diff --git a/src/test/java/io/dummymaker/model/DummyEmbedded.java b/src/test/java/io/dummymaker/model/DummyEmbedded.java
index 99485031..e02b9530 100644
--- a/src/test/java/io/dummymaker/model/DummyEmbedded.java
+++ b/src/test/java/io/dummymaker/model/DummyEmbedded.java
@@ -1,7 +1,6 @@
 package io.dummymaker.model;
 
 import io.dummymaker.annotation.special.GenAuto;
-
 import java.util.List;
 
 /**
diff --git a/src/test/java/io/dummymaker/model/DummyNoFillFields.java b/src/test/java/io/dummymaker/model/DummyNoFillFields.java
index 39405a3c..e602b892 100644
--- a/src/test/java/io/dummymaker/model/DummyNoFillFields.java
+++ b/src/test/java/io/dummymaker/model/DummyNoFillFields.java
@@ -5,8 +5,7 @@
 import io.dummymaker.annotation.export.GenExportName;
 
 /**
- * Dummy Object used as data to proceed in tests This object HAS NO FIELDS TO
- * POPULATE
+ * Dummy Object used as data to proceed in tests This object HAS NO FIELDS TO POPULATE
  *
  * @author GoodforGod
  * @since 18.08.2017
diff --git a/src/test/java/io/dummymaker/model/DummyNoZeroConstructor.java b/src/test/java/io/dummymaker/model/DummyNoZeroConstructor.java
index dcd5e044..67cdb04f 100644
--- a/src/test/java/io/dummymaker/model/DummyNoZeroConstructor.java
+++ b/src/test/java/io/dummymaker/model/DummyNoZeroConstructor.java
@@ -6,7 +6,6 @@
 import io.dummymaker.annotation.special.GenAuto;
 import io.dummymaker.annotation.special.GenIgnore;
 import io.dummymaker.generator.simple.EmbeddedGenerator;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
diff --git a/src/test/java/io/dummymaker/model/DummyRules.java b/src/test/java/io/dummymaker/model/DummyRules.java
index c27590be..74ee8ed7 100644
--- a/src/test/java/io/dummymaker/model/DummyRules.java
+++ b/src/test/java/io/dummymaker/model/DummyRules.java
@@ -3,7 +3,6 @@
 import io.dummymaker.annotation.complex.GenList;
 import io.dummymaker.annotation.special.GenAuto;
 import io.dummymaker.generator.simple.EmbeddedGenerator;
-
 import java.util.List;
 
 /**
diff --git a/src/test/java/io/dummymaker/model/DummyTime.java b/src/test/java/io/dummymaker/model/DummyTime.java
index 1af0196f..7d2123c5 100644
--- a/src/test/java/io/dummymaker/model/DummyTime.java
+++ b/src/test/java/io/dummymaker/model/DummyTime.java
@@ -1,7 +1,8 @@
 package io.dummymaker.model;
 
-import io.dummymaker.annotation.complex.GenTime;
+import static java.util.regex.Pattern.compile;
 
+import io.dummymaker.annotation.complex.GenTime;
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -9,8 +10,6 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
-import static java.util.regex.Pattern.compile;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/model/DummyTimeFormatter.java b/src/test/java/io/dummymaker/model/DummyTimeFormatter.java
index 10b1e4f8..c4eaccf8 100644
--- a/src/test/java/io/dummymaker/model/DummyTimeFormatter.java
+++ b/src/test/java/io/dummymaker/model/DummyTimeFormatter.java
@@ -1,7 +1,8 @@
 package io.dummymaker.model;
 
-import io.dummymaker.annotation.complex.GenTime;
+import static java.util.regex.Pattern.compile;
 
+import io.dummymaker.annotation.complex.GenTime;
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -9,8 +10,6 @@
 import java.util.Date;
 import java.util.regex.Pattern;
 
-import static java.util.regex.Pattern.compile;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/model/DummyUnixTime.java b/src/test/java/io/dummymaker/model/DummyUnixTime.java
index 1fc8781c..9334b897 100644
--- a/src/test/java/io/dummymaker/model/DummyUnixTime.java
+++ b/src/test/java/io/dummymaker/model/DummyUnixTime.java
@@ -1,7 +1,6 @@
 package io.dummymaker.model;
 
 import io.dummymaker.annotation.complex.GenTime;
-
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
diff --git a/src/test/java/io/dummymaker/model/deprecated/DummyAuto.java b/src/test/java/io/dummymaker/model/deprecated/DummyAuto.java
index 9e991b43..d2b23faa 100644
--- a/src/test/java/io/dummymaker/model/deprecated/DummyAuto.java
+++ b/src/test/java/io/dummymaker/model/deprecated/DummyAuto.java
@@ -4,7 +4,6 @@
 import io.dummymaker.annotation.complex.GenMap;
 import io.dummymaker.annotation.simple.number.GenLong;
 import io.dummymaker.annotation.special.GenAuto;
-
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/test/java/io/dummymaker/rules/GenRulesTests.java b/src/test/java/io/dummymaker/rules/GenRulesTests.java
index d4b617a6..6e60a081 100644
--- a/src/test/java/io/dummymaker/rules/GenRulesTests.java
+++ b/src/test/java/io/dummymaker/rules/GenRulesTests.java
@@ -7,11 +7,10 @@
 import io.dummymaker.model.GenFieldRule;
 import io.dummymaker.model.GenRule;
 import io.dummymaker.model.GenRules;
+import java.util.List;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.List;
-
 /**
  * @author GoodforGod
  * @see io.dummymaker.model.GenRule
diff --git a/src/test/java/io/dummymaker/scan/AnnotationScannerTests.java b/src/test/java/io/dummymaker/scan/AnnotationScannerTests.java
index 33a6b7d5..add175b1 100644
--- a/src/test/java/io/dummymaker/scan/AnnotationScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/AnnotationScannerTests.java
@@ -1,16 +1,15 @@
 package io.dummymaker.scan;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static org.junit.Assert.*;
+
 import io.dummymaker.model.Dummy;
 import io.dummymaker.scan.impl.AnnotationScanner;
-import org.junit.Test;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
-
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * ! NO DESCRIPTION !
diff --git a/src/test/java/io/dummymaker/scan/ClassScannerTests.java b/src/test/java/io/dummymaker/scan/ClassScannerTests.java
index 92891927..d0955399 100644
--- a/src/test/java/io/dummymaker/scan/ClassScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/ClassScannerTests.java
@@ -3,11 +3,10 @@
 import io.dummymaker.scan.impl.ClassScanner;
 import io.dummymaker.writer.IWriter;
 import io.dummymaker.writer.impl.FileWriter;
+import java.util.Collection;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.Collection;
-
 /**
  * Tests that recursion class scanner works
  *
diff --git a/src/test/java/io/dummymaker/scan/ExportScannerTests.java b/src/test/java/io/dummymaker/scan/ExportScannerTests.java
index 63c9a8d2..25b56ebf 100644
--- a/src/test/java/io/dummymaker/scan/ExportScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/ExportScannerTests.java
@@ -1,14 +1,13 @@
 package io.dummymaker.scan;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static org.junit.Assert.*;
+
 import io.dummymaker.model.Dummy;
 import io.dummymaker.model.export.FieldContainer;
 import io.dummymaker.scan.impl.ExportScanner;
-import org.junit.Test;
-
 import java.util.Collection;
-
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * @author GoodforGod
diff --git a/src/test/java/io/dummymaker/scan/GenScannerTests.java b/src/test/java/io/dummymaker/scan/GenScannerTests.java
index 1d8e900c..d772a51f 100644
--- a/src/test/java/io/dummymaker/scan/GenScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/GenScannerTests.java
@@ -1,5 +1,8 @@
 package io.dummymaker.scan;
 
+import static io.dummymaker.model.Dummy.DummyFields.*;
+import static org.junit.Assert.*;
+
 import io.dummymaker.annotation.core.PrimeGen;
 import io.dummymaker.annotation.simple.number.GenDoubleBig;
 import io.dummymaker.annotation.simple.string.GenCity;
@@ -10,13 +13,9 @@
 import io.dummymaker.model.DummyNoFillFields;
 import io.dummymaker.model.GenContainer;
 import io.dummymaker.scan.impl.GenScanner;
-import org.junit.Test;
-
 import java.lang.reflect.Field;
 import java.util.Map;
-
-import static io.dummymaker.model.Dummy.DummyFields.*;
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * ! NO DESCRIPTION !
diff --git a/src/test/java/io/dummymaker/scan/ResourceScannerTests.java b/src/test/java/io/dummymaker/scan/ResourceScannerTests.java
index d5c400cb..a0940564 100644
--- a/src/test/java/io/dummymaker/scan/ResourceScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/ResourceScannerTests.java
@@ -3,12 +3,11 @@
 import io.dummymaker.scan.impl.ResourceScanner;
 import io.dummymaker.writer.IWriter;
 import io.dummymaker.writer.impl.FileWriter;
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Resource scanner tests
diff --git a/src/test/java/io/dummymaker/scan/SequenceScannerTests.java b/src/test/java/io/dummymaker/scan/SequenceScannerTests.java
index 468fc889..0d958fb6 100644
--- a/src/test/java/io/dummymaker/scan/SequenceScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/SequenceScannerTests.java
@@ -1,17 +1,16 @@
 package io.dummymaker.scan;
 
+import static org.junit.Assert.*;
+
 import io.dummymaker.annotation.special.GenSequence;
 import io.dummymaker.model.DummyArray;
 import io.dummymaker.model.DummySimple;
 import io.dummymaker.scan.impl.SequenceScanner;
-import org.junit.Test;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
-
-import static org.junit.Assert.*;
+import org.junit.Test;
 
 /**
  * ! NO DESCRIPTION !
diff --git a/src/test/java/io/dummymaker/scan/UniqueScannerTests.java b/src/test/java/io/dummymaker/scan/UniqueScannerTests.java
index 8e31c62c..0c214089 100644
--- a/src/test/java/io/dummymaker/scan/UniqueScannerTests.java
+++ b/src/test/java/io/dummymaker/scan/UniqueScannerTests.java
@@ -5,14 +5,13 @@
 import io.dummymaker.annotation.simple.number.GenShort;
 import io.dummymaker.model.DummyCast;
 import io.dummymaker.scan.impl.UniqueScanner;
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unique field annotation scanner tests
diff --git a/src/test/java/io/dummymaker/util/CastUtilsTest.java b/src/test/java/io/dummymaker/util/CastUtilsTest.java
index b321e7fc..1bda3f7d 100644
--- a/src/test/java/io/dummymaker/util/CastUtilsTest.java
+++ b/src/test/java/io/dummymaker/util/CastUtilsTest.java
@@ -1,11 +1,10 @@
 package io.dummymaker.util;
 
 import io.dummymaker.generator.simple.NullGenerator;
+import java.time.LocalDate;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.time.LocalDate;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/util/CollectionUtilsTest.java b/src/test/java/io/dummymaker/util/CollectionUtilsTest.java
index 7acee480..e3516c9b 100644
--- a/src/test/java/io/dummymaker/util/CollectionUtilsTest.java
+++ b/src/test/java/io/dummymaker/util/CollectionUtilsTest.java
@@ -1,10 +1,9 @@
 package io.dummymaker.util;
 
+import java.util.*;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.*;
-
 /**
  * "default comment"
  *
diff --git a/src/test/java/io/dummymaker/util/DateUtilsErrorTests.java b/src/test/java/io/dummymaker/util/DateUtilsErrorTests.java
index bbe584b2..25b69eb2 100644
--- a/src/test/java/io/dummymaker/util/DateUtilsErrorTests.java
+++ b/src/test/java/io/dummymaker/util/DateUtilsErrorTests.java
@@ -1,13 +1,12 @@
 package io.dummymaker.util;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Date;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * "default comment"
diff --git a/src/test/java/io/dummymaker/util/DateUtilsValidTest.java b/src/test/java/io/dummymaker/util/DateUtilsValidTest.java
index 04a7ad8d..99eb115b 100644
--- a/src/test/java/io/dummymaker/util/DateUtilsValidTest.java
+++ b/src/test/java/io/dummymaker/util/DateUtilsValidTest.java
@@ -1,13 +1,12 @@
 package io.dummymaker.util;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.Date;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * "default comment"

From ff4221e6635d020825811984125b90b0e0a6f91c Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sat, 4 Dec 2021 11:46:20 +0300
Subject: [PATCH 03/15] [3.1.0-SNAPSHOT] Existing generators pattern matching
 improved FullnameGenerator added

---
 build.gradle                                  |  2 +-
 .../simple/number/IntegerGenerator.java       |  2 +-
 .../simple/number/IntegerSmallGenerator.java  |  2 +-
 .../simple/string/DescriptionGenerator.java   |  3 +-
 .../simple/string/DocumentGenerator.java      |  2 +-
 .../simple/string/FileGenerator.java          |  3 +-
 .../simple/string/FormatGenerator.java        |  2 +-
 .../simple/string/FullnameGenerator.java      | 32 +++++++++++++++++++
 .../simple/string/MiddleNameGenerator.java    |  2 +-
 .../simple/string/NameGenerator.java          |  2 +-
 .../simple/string/NounGenerator.java          |  3 +-
 .../simple/string/PhoneGenerator.java         |  2 +-
 .../simple/string/ProductGenerator.java       |  3 +-
 .../generator/simple/string/UrlGenerator.java |  2 +-
 14 files changed, 49 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java

diff --git a/build.gradle b/build.gradle
index ccc8a497..f330b378 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ dependencies {
     implementation "me.xdrop:fuzzywuzzy:1.3.1"
     implementation "javax.inject:javax.inject:1"
 
-    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.3"
+    testRuntimeOnly "ch.qos.logback:logback-classic:1.2.7"
     testImplementation "junit:junit:4.13.2"
 }
 
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
index 7a3e7830..4941b871 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
@@ -16,7 +16,7 @@
  */
 public class IntegerGenerator implements IGenerator<Integer> {
 
-    private final Pattern pattern = Pattern.compile("num(ber)?|counter", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("num(ber)?|counter|series", CASE_INSENSITIVE);
 
     @Override
     public @NotNull Integer generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
index 1ccd19b2..affa7a87 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
@@ -15,7 +15,7 @@
  */
 public class IntegerSmallGenerator implements IGenerator<Integer> {
 
-    private final Pattern pattern = Pattern.compile("age|grade|group|amount", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("age|grade|group|amount|inn|snils", CASE_INSENSITIVE);
 
     @Override
     public @NotNull Integer generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
index 4d367990..0fbd257b 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
@@ -16,7 +16,8 @@
  */
 public class DescriptionGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("info|desc(ription)?|phrase|comment|sentence", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("diploma|info|desc(ription)?|phrase|comment|sentence|reason",
+            CASE_INSENSITIVE);
 
     private final IBundle bundle = new PhraseBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
index 21e1ac16..fbefa8d8 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
@@ -16,7 +16,7 @@
  */
 public class DocumentGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("pass(word)?|doc(ument)?|org|project", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("pass(word)?|org|project", CASE_INSENSITIVE);
 
     private final IGenerator<Character> prefixGenerator = new CharacterGenerator();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
index 928b6801..927d6796 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
@@ -17,7 +17,8 @@
  */
 public class FileGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("file", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("file|doc(ument)?", CASE_INSENSITIVE);
+
     private final IBundle extensions = new ExtensionBundle();
     private final IBundle names = new NounBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
index cb4012a2..53b2aa1a 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
@@ -16,7 +16,7 @@
  */
 public class FormatGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("format", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("protocol|format", CASE_INSENSITIVE);
 
     private final IBundle formats = new FormatBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java
new file mode 100644
index 00000000..f11c0bd6
--- /dev/null
+++ b/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java
@@ -0,0 +1,32 @@
+package io.dummymaker.generator.simple.string;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+import io.dummymaker.generator.IGenerator;
+import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generates fullname
+ *
+ * @author GoodforGod
+ * @since 26.05.2017
+ */
+public class FullnameGenerator implements IGenerator<String> {
+
+    private final Pattern pattern = Pattern.compile("person|candidate|fullname|fio", CASE_INSENSITIVE);
+
+    private final NameGenerator nameGenerator = new NameGenerator();
+    private final MiddleNameGenerator middleNameGenerator = new MiddleNameGenerator();
+    private final SurnameGenerator surnameGenerator = new SurnameGenerator();
+
+    @Override
+    public @NotNull String generate() {
+        return nameGenerator + " " + middleNameGenerator + " " + surnameGenerator;
+    }
+
+    @Override
+    public @NotNull Pattern pattern() {
+        return pattern;
+    }
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
index 97183b8e..da607c85 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
@@ -16,7 +16,7 @@
  */
 public class MiddleNameGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("middle(name)?", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("middle(name)?|patronymic", CASE_INSENSITIVE);
 
     private final IBundle bundle = new MiddleNameBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
index a20ab40d..decc186d 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
@@ -18,7 +18,7 @@
  */
 public class NameGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("name|assignee|employe|worker", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("user|account|name|assignee|employe|worker", CASE_INSENSITIVE);
 
     private final IBundle maleBundle = new MaleNameBundle();
     private final IBundle femaleBundle = new FemaleNameBundle();
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
index 0d13fc1e..f468f0e8 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
@@ -16,7 +16,8 @@
  */
 public class NounGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("word|noun|field|data(base)?|schema|collection|class", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile(
+            "commission|education|subj(ect)?|program|word|noun|field|data(base)?|schema|collection|class", CASE_INSENSITIVE);
 
     private final IBundle bundle = new NounBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
index f88c8f3e..5868fb35 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
@@ -15,7 +15,7 @@
  */
 public class PhoneGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("phone|mobile(phone)?|dial", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("telefax|phone|mobile(phone)?|dial", CASE_INSENSITIVE);
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
index d4468f0d..525c3751 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
@@ -17,7 +17,8 @@
  */
 public class ProductGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("product|good|supply|topic", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern
+            .compile("association|administrative|academy|university|org(anization)?|product|good|supply|topic", CASE_INSENSITIVE);
     private final IBundle bundle = new ProductBundle();
 
     @Nullable
diff --git a/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
index ae717ae8..54bf9b8f 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
@@ -16,7 +16,7 @@
  */
 public class UrlGenerator extends UriGenerator {
 
-    private final Pattern pattern = Pattern.compile("url|server|link", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("site|website|url|server|link", CASE_INSENSITIVE);
 
     private final IBundle domains = new LoginBundle();
     private final IBundle zones = new DomainBundle();

From 8a5bce90e3bfbade53fff5225c64e56b7d9d55f8 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sat, 4 Dec 2021 13:40:49 +0300
Subject: [PATCH 04/15] [3.1.0-SNAPSHOT] StatusGenerator, LevelGenerator,
 PhotoGenerator created TypeGenerator simplified

---
 .../annotation/simple/string/GenFullname.java | 20 +++++++++++
 .../annotation/simple/string/GenLevel.java    | 20 +++++++++++
 .../annotation/simple/string/GenPhoto.java    | 20 +++++++++++
 .../annotation/simple/string/GenStatus.java   | 20 +++++++++++
 .../simple/string/LevelGenerator.java         | 34 +++++++++++++++++++
 .../simple/string/PhotoGenerator.java         | 30 ++++++++++++++++
 .../simple/string/StatusGenerator.java        | 34 +++++++++++++++++++
 .../simple/string/TypeGenerator.java          |  6 ++--
 8 files changed, 181 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/io/dummymaker/annotation/simple/string/GenFullname.java
 create mode 100644 src/main/java/io/dummymaker/annotation/simple/string/GenLevel.java
 create mode 100644 src/main/java/io/dummymaker/annotation/simple/string/GenPhoto.java
 create mode 100644 src/main/java/io/dummymaker/annotation/simple/string/GenStatus.java
 create mode 100644 src/main/java/io/dummymaker/generator/simple/string/LevelGenerator.java
 create mode 100644 src/main/java/io/dummymaker/generator/simple/string/PhotoGenerator.java
 create mode 100644 src/main/java/io/dummymaker/generator/simple/string/StatusGenerator.java

diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenFullname.java b/src/main/java/io/dummymaker/annotation/simple/string/GenFullname.java
new file mode 100644
index 00000000..2ba4f7b8
--- /dev/null
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenFullname.java
@@ -0,0 +1,20 @@
+package io.dummymaker.annotation.simple.string;
+
+import io.dummymaker.annotation.core.PrimeGen;
+import io.dummymaker.generator.simple.string.FullnameGenerator;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author GoodforGod
+ * @see FullnameGenerator
+ * @since 04.12.2021
+ */
+@PrimeGen(FullnameGenerator.class)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface GenFullname {
+
+}
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenLevel.java b/src/main/java/io/dummymaker/annotation/simple/string/GenLevel.java
new file mode 100644
index 00000000..f9bf36f6
--- /dev/null
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenLevel.java
@@ -0,0 +1,20 @@
+package io.dummymaker.annotation.simple.string;
+
+import io.dummymaker.annotation.core.PrimeGen;
+import io.dummymaker.generator.simple.string.LevelGenerator;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author GoodforGod
+ * @see LevelGenerator
+ * @since 04.12.2021
+ */
+@PrimeGen(LevelGenerator.class)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface GenLevel {
+
+}
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenPhoto.java b/src/main/java/io/dummymaker/annotation/simple/string/GenPhoto.java
new file mode 100644
index 00000000..cc4545e7
--- /dev/null
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenPhoto.java
@@ -0,0 +1,20 @@
+package io.dummymaker.annotation.simple.string;
+
+import io.dummymaker.annotation.core.PrimeGen;
+import io.dummymaker.generator.simple.string.PhotoGenerator;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author GoodforGod
+ * @see PhotoGenerator
+ * @since 04.12.2021
+ */
+@PrimeGen(PhotoGenerator.class)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface GenPhoto {
+
+}
diff --git a/src/main/java/io/dummymaker/annotation/simple/string/GenStatus.java b/src/main/java/io/dummymaker/annotation/simple/string/GenStatus.java
new file mode 100644
index 00000000..ab235c31
--- /dev/null
+++ b/src/main/java/io/dummymaker/annotation/simple/string/GenStatus.java
@@ -0,0 +1,20 @@
+package io.dummymaker.annotation.simple.string;
+
+import io.dummymaker.annotation.core.PrimeGen;
+import io.dummymaker.generator.simple.string.StatusGenerator;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author GoodforGod
+ * @see StatusGenerator
+ * @since 04.12.2021
+ */
+@PrimeGen(StatusGenerator.class)
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface GenStatus {
+
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/string/LevelGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/LevelGenerator.java
new file mode 100644
index 00000000..594ae5fb
--- /dev/null
+++ b/src/main/java/io/dummymaker/generator/simple/string/LevelGenerator.java
@@ -0,0 +1,34 @@
+package io.dummymaker.generator.simple.string;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+import io.dummymaker.generator.IGenerator;
+import io.dummymaker.util.CollectionUtils;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generates level from one of present
+ *
+ * @author Anton Kurako (GoodforGod)
+ * @since 04.12.2021
+ */
+public class LevelGenerator implements IGenerator<String> {
+
+    private final Pattern pattern = Pattern.compile("level|lvl", CASE_INSENSITIVE);
+
+    private static final List<String> types = Arrays.asList("error", "warn", "info", "debug", "trace");
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public @NotNull String generate() {
+        return CollectionUtils.random(types);
+    }
+
+    @Override
+    public @NotNull Pattern pattern() {
+        return pattern;
+    }
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/string/PhotoGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/PhotoGenerator.java
new file mode 100644
index 00000000..86d56672
--- /dev/null
+++ b/src/main/java/io/dummymaker/generator/simple/string/PhotoGenerator.java
@@ -0,0 +1,30 @@
+package io.dummymaker.generator.simple.string;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+import io.dummymaker.generator.IGenerator;
+import java.util.regex.Pattern;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Generates photo as base64
+ *
+ * @author Anton Kurako (GoodforGod)
+ * @since 04.12.2021
+ */
+public class PhotoGenerator implements IGenerator<String> {
+
+    private final Pattern pattern = Pattern.compile("pic(ture)?|photo|avatar|base64", CASE_INSENSITIVE);
+
+    private static final String PHOTO_JPG_AS_BASE64 = "/9j/4AAQSkZJRgABAQEAYABgAAD/4QAiRXhpZgAATU0AKgAAAAgAAQESAAMAAAABAAEAAAAAAAD/2wBDAAIBAQIBAQICAgICAgICAwUDAwMDAwYEBAMFBwYHBwcGBwcICQsJCAgKCAcHCg0KCgsMDAwMBwkODw0MDgsMDAz/2wBDAQICAgMDAwYDAwYMCAcIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAz/wAARCAAeAB4DASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD9pAMmvlz9oL/gqz4J+DHjW88P6PpOoeM9Q02VoL2a2uUtbKCVTho1lYOZGUghtqbQRgMSCB9F/EUaofh34h/sPzP7b/su6/s7y/v/AGnyX8nHv5m3HvX4b2m37LHt+7tGPyoA/Xb9lL9u3wd+1jLcafpsd9oniOzi8+bSb/aXkiBAMkMinbKikgHhWGclcYY+1V+Pv7Bv9pf8Nl/Dn+yfM+1f2uvmbOv2by3+059vs/m59s1+wVAHnn7Sv7Tvhn9lbwEuu+IpZ5JLqQwadp9qA11qMoGSqAkAKoILuxCqCOrMit8J+LLH9m79qjVpvE3/AAlusfBvxLqTmfVNLudNa+sJJm5eWJkUKNzEknemc58pSTnmP+ConxKvfH37YGuafO7iw8JQwaVYxE/KgMSTSvjpuaWVuepVUB+6MfPNAH2h8Fv2g/2e/wBh3xPE/hdvFXxG1rUv9G1PxH9kFuunWx5ZLaKURk5YKWVQSwB/ekAIfvvwh4v0vx/4V0/XNEvrfU9I1aBbm0uoSSk8bdCM4IPUFSAykEEAggfhpX6Df8EXviTfaz4G8aeELh2ks9BurbUbHcc+SLoTCWMei74A4A43SSHqeQD/2Q==";
+
+    @Override
+    public @Nullable String generate() {
+        return PHOTO_JPG_AS_BASE64;
+    }
+
+    @Override
+    public @Nullable Pattern pattern() {
+        return pattern;
+    }
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/string/StatusGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/StatusGenerator.java
new file mode 100644
index 00000000..214f84b2
--- /dev/null
+++ b/src/main/java/io/dummymaker/generator/simple/string/StatusGenerator.java
@@ -0,0 +1,34 @@
+package io.dummymaker.generator.simple.string;
+
+import static java.util.regex.Pattern.CASE_INSENSITIVE;
+
+import io.dummymaker.generator.IGenerator;
+import io.dummymaker.util.CollectionUtils;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generates status from one of lists
+ *
+ * @author Anton Kurako (GoodforGod)
+ * @since 04.12.2021
+ */
+public class StatusGenerator implements IGenerator<String> {
+
+    private final Pattern pattern = Pattern.compile("status|type", CASE_INSENSITIVE);
+
+    private static final List<String> types = Arrays.asList("success", "failed", "rejected", "invalid");
+
+    @SuppressWarnings("ConstantConditions")
+    @Override
+    public @NotNull String generate() {
+        return CollectionUtils.random(types);
+    }
+
+    @Override
+    public @NotNull Pattern pattern() {
+        return pattern;
+    }
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java
index 62cc88ec..502f4c9c 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/TypeGenerator.java
@@ -17,10 +17,10 @@
  */
 public class TypeGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("type|adjective|level|lvl", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("adjective|intense|difficult|level|lvl", CASE_INSENSITIVE);
 
-    private final List<String> types = Arrays.asList("terrible", "bad", "poor", "limited", "neutral", "average", "Decent", "fine",
-            "superior");
+    private static final List<String> types = Arrays.asList("terrible", "bad", "poor", "limited",
+            "neutral", "average", "decent", "fine", "superior");
 
     @SuppressWarnings("ConstantConditions")
     @Override

From dff783e01d0ed81a4874f33a4e709ff6a2ecdba3 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sat, 4 Dec 2021 13:43:54 +0300
Subject: [PATCH 05/15] [3.1.0-SNAPSHOT] Generators resources make static
 IGenerator#compareTo and IGenerator#order contracts added Some generators
 order contract override to prioritize GenSupplier comparator for generators
 change to support IGenerator#compareTo

---
 .../java/io/dummymaker/factory/impl/GenSupplier.java |  4 ++--
 .../java/io/dummymaker/generator/IGenerator.java     | 12 +++++++++++-
 .../simple/number/IntegerSmallGenerator.java         |  5 +++++
 .../simple/number/IntegetMediumGenerator.java        |  5 +++++
 .../simple/string/AddressFullGenerator.java          |  2 +-
 .../generator/simple/string/AddressGenerator.java    |  6 +++---
 .../generator/simple/string/CityGenerator.java       |  2 +-
 .../generator/simple/string/CompanyGenerator.java    |  2 +-
 .../generator/simple/string/CountryGenerator.java    |  2 +-
 .../simple/string/DescriptionGenerator.java          |  2 +-
 .../generator/simple/string/DistrictGenerator.java   |  2 +-
 .../generator/simple/string/EmailGenerator.java      |  6 +++---
 .../generator/simple/string/ExtensionGenerator.java  |  2 +-
 .../generator/simple/string/FileGenerator.java       |  4 ++--
 .../generator/simple/string/FormatGenerator.java     |  2 +-
 .../generator/simple/string/FullnameGenerator.java   |  5 +++++
 .../generator/simple/string/IdGenerator.java         |  5 +++++
 .../generator/simple/string/JobGenerator.java        |  2 +-
 .../generator/simple/string/LoginGenerator.java      |  2 +-
 .../generator/simple/string/MiddleNameGenerator.java |  7 ++++++-
 .../generator/simple/string/NameGenerator.java       |  9 +++++++--
 .../generator/simple/string/NounGenerator.java       |  2 +-
 .../generator/simple/string/ProductGenerator.java    |  2 +-
 .../generator/simple/string/RoleGenerator.java       |  2 +-
 .../generator/simple/string/StreetGenerator.java     |  2 +-
 .../generator/simple/string/SurnameGenerator.java    |  7 ++++++-
 .../generator/simple/string/TagGenerator.java        |  2 +-
 .../generator/simple/string/UrlGenerator.java        |  4 ++--
 28 files changed, 77 insertions(+), 32 deletions(-)

diff --git a/src/main/java/io/dummymaker/factory/impl/GenSupplier.java b/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
index 033adb97..65b502f8 100644
--- a/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
+++ b/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
@@ -49,7 +49,7 @@ public GenSupplier() {
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream()
                         .map(CastUtils::instantiate)
                         .filter(Objects::nonNull)
-                        .sorted(Comparator.comparing(g -> g.getClass().getSimpleName()))
+                        .sorted(IGenerator::compareTo)
                         .collect(Collectors.toList())));
     }
 
@@ -127,7 +127,7 @@ private Optional<Class<? extends IGenerator>> getSuitableGeneratorClass(String f
 
         final Stream<IGenerator> typedGeneratorStream = classifiers.get(type).stream();
         return getSuitableGenerator(fieldName, typedGeneratorStream)
-                .map(g -> g.getClass());
+                .map(IGenerator::getClass);
     }
 
     @SuppressWarnings("ConstantConditions")
diff --git a/src/main/java/io/dummymaker/generator/IGenerator.java b/src/main/java/io/dummymaker/generator/IGenerator.java
index 83067743..d869fa1d 100644
--- a/src/main/java/io/dummymaker/generator/IGenerator.java
+++ b/src/main/java/io/dummymaker/generator/IGenerator.java
@@ -2,6 +2,7 @@
 
 import io.dummymaker.annotation.core.PrimeGen;
 import java.util.regex.Pattern;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -11,7 +12,7 @@
  * @see PrimeGen
  * @since 26.05.2017
  */
-public interface IGenerator<T> {
+public interface IGenerator<T> extends Comparable<IGenerator> {
 
     @Nullable
     T generate();
@@ -20,4 +21,13 @@ public interface IGenerator<T> {
     default Pattern pattern() {
         return null;
     }
+
+    default int order() {
+        return 0;
+    }
+
+    @Override
+    default int compareTo(@NotNull IGenerator o) {
+        return Integer.compare(order(), o.order());
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
index affa7a87..e8671f1d 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
@@ -26,4 +26,9 @@ public class IntegerSmallGenerator implements IGenerator<Integer> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -50;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
index 45b9ce70..fc13876a 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
@@ -26,4 +26,9 @@ public class IntegetMediumGenerator implements IGenerator<Integer> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -50;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java
index 779e2376..daff9c2e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/AddressFullGenerator.java
@@ -20,7 +20,7 @@ public class AddressFullGenerator implements IGenerator<String> {
     private final Pattern pattern = Pattern.compile("addr(ess)?full|place|residence|home|location", CASE_INSENSITIVE);
 
     private final IGenerator<String> generator = new AddressGenerator();
-    private final IBundle countryBundle = new CountryBundle();
+    private static final IBundle countryBundle = new CountryBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java
index d6ccc1a7..d4446703 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/AddressGenerator.java
@@ -22,9 +22,9 @@ public class AddressGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("addr(ess)?", CASE_INSENSITIVE);
 
-    private final IBundle streetBundle = new StreetBundle();
-    private final IBundle districtBundle = new DistrictBundle();
-    private final IBundle cityBundle = new CityBundle();
+    private static final IBundle streetBundle = new StreetBundle();
+    private static final IBundle districtBundle = new DistrictBundle();
+    private static final IBundle cityBundle = new CityBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java
index 883d505d..18bfd507 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CityGenerator.java
@@ -18,7 +18,7 @@ public class CityGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("city|town|village|settlement", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new CityBundle();
+    private static final IBundle bundle = new CityBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
index 0dc10588..51be1bd4 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
@@ -19,7 +19,7 @@ public class CompanyGenerator implements IGenerator<String> {
     private final Pattern pattern = Pattern.compile("organization|company|corp(oration)?|fund|business|shop|store",
             CASE_INSENSITIVE);
 
-    private final IBundle bundle = new CompanyBundle();
+    private static final IBundle bundle = new CompanyBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
index f3cf0151..50c981a1 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
@@ -18,7 +18,7 @@ public class CountryGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("country", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new CountryBundle();
+    private static final IBundle bundle = new CountryBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
index 0fbd257b..e394f089 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
@@ -19,7 +19,7 @@ public class DescriptionGenerator implements IGenerator<String> {
     private final Pattern pattern = Pattern.compile("diploma|info|desc(ription)?|phrase|comment|sentence|reason",
             CASE_INSENSITIVE);
 
-    private final IBundle bundle = new PhraseBundle();
+    private static final IBundle bundle = new PhraseBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java
index 00ef2f71..e56d6bcb 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DistrictGenerator.java
@@ -18,7 +18,7 @@ public class DistrictGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("state|region|district|locale?", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new DistrictBundle();
+    private static final IBundle bundle = new DistrictBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java
index 06666910..19ccc6df 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/EmailGenerator.java
@@ -20,9 +20,9 @@ public class EmailGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("e?mail", CASE_INSENSITIVE);
 
-    private final IBundle nickBundle = new LoginBundle();
-    private final IBundle emailBundle = new EmailServicesBundle();
-    private final IBundle domainBundle = new DomainBundle();
+    private static final IBundle nickBundle = new LoginBundle();
+    private static final IBundle emailBundle = new EmailServicesBundle();
+    private static final IBundle domainBundle = new DomainBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java
index c64cb59a..9afa776a 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/ExtensionGenerator.java
@@ -17,7 +17,7 @@
 public class ExtensionGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("ext(ension)?", CASE_INSENSITIVE);
-    private final IBundle bundle = new ExtensionBundle();
+    private static final IBundle bundle = new ExtensionBundle();
 
     @Nullable
     @Override
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
index 927d6796..6ebc6bae 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
@@ -19,8 +19,8 @@ public class FileGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("file|doc(ument)?", CASE_INSENSITIVE);
 
-    private final IBundle extensions = new ExtensionBundle();
-    private final IBundle names = new NounBundle();
+    private static final IBundle extensions = new ExtensionBundle();
+    private static final IBundle names = new NounBundle();
 
     @Nullable
     @Override
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
index 53b2aa1a..533811a4 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
@@ -18,7 +18,7 @@ public class FormatGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("protocol|format", CASE_INSENSITIVE);
 
-    private final IBundle formats = new FormatBundle();
+    private static final IBundle formats = new FormatBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java
index f11c0bd6..5faab3ec 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FullnameGenerator.java
@@ -29,4 +29,9 @@ public class FullnameGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
index 33214971..28b53ebd 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
@@ -24,4 +24,9 @@ public class IdGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -100;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
index d1a50a3e..cf5a773a 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
@@ -18,7 +18,7 @@ public class JobGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("job|work|position", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new JobBundle();
+    private static final IBundle bundle = new JobBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java
index 839965bc..ce21a1da 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/LoginGenerator.java
@@ -19,7 +19,7 @@ public class LoginGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("nick(name)?|login", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new LoginBundle();
+    private static final IBundle bundle = new LoginBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
index da607c85..c1de5223 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/MiddleNameGenerator.java
@@ -18,7 +18,7 @@ public class MiddleNameGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("middle(name)?|patronymic", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new MiddleNameBundle();
+    private static final IBundle bundle = new MiddleNameBundle();
 
     @Override
     public @NotNull String generate() {
@@ -29,4 +29,9 @@ public class MiddleNameGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
index decc186d..34b1835e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NameGenerator.java
@@ -20,8 +20,8 @@ public class NameGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("user|account|name|assignee|employe|worker", CASE_INSENSITIVE);
 
-    private final IBundle maleBundle = new MaleNameBundle();
-    private final IBundle femaleBundle = new FemaleNameBundle();
+    private static final IBundle maleBundle = new MaleNameBundle();
+    private static final IBundle femaleBundle = new FemaleNameBundle();
 
     @Override
     public @NotNull String generate() {
@@ -34,4 +34,9 @@ public class NameGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
index f468f0e8..657d76ec 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
@@ -19,7 +19,7 @@ public class NounGenerator implements IGenerator<String> {
     private final Pattern pattern = Pattern.compile(
             "commission|education|subj(ect)?|program|word|noun|field|data(base)?|schema|collection|class", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new NounBundle();
+    private static final IBundle bundle = new NounBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
index 525c3751..94dedd39 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
@@ -19,7 +19,7 @@ public class ProductGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern
             .compile("association|administrative|academy|university|org(anization)?|product|good|supply|topic", CASE_INSENSITIVE);
-    private final IBundle bundle = new ProductBundle();
+    private static final IBundle bundle = new ProductBundle();
 
     @Nullable
     @Override
diff --git a/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java
index b7a9684e..d002f4e4 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/RoleGenerator.java
@@ -18,7 +18,7 @@ public class RoleGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("role", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new JobBundle();
+    private static final IBundle bundle = new JobBundle();
 
     @Nullable
     @Override
diff --git a/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java
index 230efa10..91d33f46 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/StreetGenerator.java
@@ -18,7 +18,7 @@ public class StreetGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("street", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new StreetBundle();
+    private static final IBundle bundle = new StreetBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java
index a02f1bbb..7e41f2b3 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/SurnameGenerator.java
@@ -18,7 +18,7 @@ public class SurnameGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("surname", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new SurnameBundle();
+    private static final IBundle bundle = new SurnameBundle();
 
     @Override
     public @NotNull String generate() {
@@ -29,4 +29,9 @@ public class SurnameGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java
index be69f415..cb5bdd8c 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/TagGenerator.java
@@ -18,7 +18,7 @@ public class TagGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile("(hash)?tag", CASE_INSENSITIVE);
 
-    private final IBundle bundle = new TagsBundle();
+    private static final IBundle bundle = new TagsBundle();
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
index 54bf9b8f..93b18ce2 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/UrlGenerator.java
@@ -18,8 +18,8 @@ public class UrlGenerator extends UriGenerator {
 
     private final Pattern pattern = Pattern.compile("site|website|url|server|link", CASE_INSENSITIVE);
 
-    private final IBundle domains = new LoginBundle();
-    private final IBundle zones = new DomainBundle();
+    private static final IBundle domains = new LoginBundle();
+    private static final IBundle zones = new DomainBundle();
 
     @Override
     public @NotNull String generate() {

From 21928072ddbebce53dac2043ce3e7ca7b3c3fa05 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 02:50:55 +0300
Subject: [PATCH 06/15] [3.1.0-SNAPSHOT] Time patterns improved Time generators
 inner generators as static OffsetDateTimeGenerator and OffsetTimeGenerator
 added

---
 .../simple/time/DateSqlGenerator.java         |   2 +-
 .../simple/time/LocalDateGenerator.java       |   7 +-
 .../simple/time/LocalDateTimeGenerator.java   |   7 +-
 .../simple/time/LocalTimeGenerator.java       |   7 +-
 .../simple/time/OffsetDateTimeGenerator.java  |  31 +++++
 .../simple/time/OffsetTimeGenerator.java      |  31 +++++
 .../generator/simple/time/TimeGenerator.java  |   2 +-
 .../simple/time/TimestampGenerator.java       |   2 +-
 .../export/asfile/SqlExportAsFileTest.java    |   2 +-
 .../export/validators/CsvValidator.java       |  30 +++--
 .../export/validators/JsonValidator.java      |   8 ++
 .../export/validators/SqlValidator.java       | 116 +++++++++++-------
 .../export/validators/XmlValidator.java       |  55 ++++++---
 .../java/io/dummymaker/model/DummyTime.java   |  18 ++-
 .../dummymaker/model/DummyTimeFormatter.java  |  14 ++-
 .../io/dummymaker/model/DummyUnixTime.java    |  14 ++-
 16 files changed, 259 insertions(+), 87 deletions(-)
 create mode 100644 src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java
 create mode 100644 src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java

diff --git a/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java
index 409f61ee..2d7fd2fb 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/DateSqlGenerator.java
@@ -14,7 +14,7 @@
  */
 public class DateSqlGenerator implements ITimeGenerator<Date> {
 
-    private final LocalDateGenerator generator = new LocalDateGenerator();
+    private static final LocalDateGenerator generator = new LocalDateGenerator();
 
     @Override
     public @NotNull Date generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java
index de750fc0..5b729a45 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/LocalDateGenerator.java
@@ -19,7 +19,7 @@ public class LocalDateGenerator implements ITimeGenerator<LocalDate> {
 
     private final Pattern pattern = Pattern.compile("birth(date)?|date", CASE_INSENSITIVE);
 
-    private final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
+    private static final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
 
     @Override
     public @NotNull LocalDate generate() {
@@ -35,4 +35,9 @@ public class LocalDateGenerator implements ITimeGenerator<LocalDate> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -60;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java
index a36d6e8e..1702ce0a 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/LocalDateTimeGenerator.java
@@ -19,7 +19,7 @@
  */
 public class LocalDateTimeGenerator implements ITimeGenerator<LocalDateTime> {
 
-    private final Pattern pattern = Pattern.compile("stamp|timestamp|expired?", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("datetime|stamp|timestamp|expired?", CASE_INSENSITIVE);
 
     @Override
     public @NotNull LocalDateTime generate() {
@@ -49,4 +49,9 @@ public class LocalDateTimeGenerator implements ITimeGenerator<LocalDateTime> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -60;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java
index 22865ebf..a30647b0 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/LocalTimeGenerator.java
@@ -19,7 +19,7 @@ public class LocalTimeGenerator implements ITimeGenerator<LocalTime> {
 
     private final Pattern pattern = Pattern.compile("time", CASE_INSENSITIVE);
 
-    private final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
+    private static final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
 
     @Override
     public @NotNull LocalTime generate() {
@@ -35,4 +35,9 @@ public class LocalTimeGenerator implements ITimeGenerator<LocalTime> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -60;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java
new file mode 100644
index 00000000..c769246b
--- /dev/null
+++ b/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java
@@ -0,0 +1,31 @@
+package io.dummymaker.generator.simple.time;
+
+import io.dummymaker.annotation.complex.GenTime;
+import io.dummymaker.generator.ITimeGenerator;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.concurrent.ThreadLocalRandom;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generates LocalDateTime from 1970 to 3000 (exclusive) year with seconds precision
+ *
+ * @author GoodforGod
+ * @see OffsetDateTime
+ * @since 05.12.2021
+ */
+public class OffsetDateTimeGenerator implements ITimeGenerator<OffsetDateTime> {
+
+    private static final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
+
+    @Override
+    public @NotNull OffsetDateTime generate() {
+        return generate(0, GenTime.MAX_UNIX);
+    }
+
+    @Override
+    public @NotNull OffsetDateTime generate(final long minUnix, final long maxUnix) {
+        final ZoneOffset zoneOffset = ZoneOffset.ofHours(ThreadLocalRandom.current().nextInt(-18, 18));
+        return OffsetDateTime.of(generator.generate(), zoneOffset);
+    }
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java
new file mode 100644
index 00000000..da0cd147
--- /dev/null
+++ b/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java
@@ -0,0 +1,31 @@
+package io.dummymaker.generator.simple.time;
+
+import io.dummymaker.annotation.complex.GenTime;
+import io.dummymaker.generator.ITimeGenerator;
+import java.time.OffsetTime;
+import java.time.ZoneOffset;
+import java.util.concurrent.ThreadLocalRandom;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generates localTime object with range from 00:00:00 to 24:00:00
+ *
+ * @author GoodforGod
+ * @see OffsetTime
+ * @since 05.12.2021
+ */
+public class OffsetTimeGenerator implements ITimeGenerator<OffsetTime> {
+
+    private static final LocalTimeGenerator generator = new LocalTimeGenerator();
+
+    @Override
+    public @NotNull OffsetTime generate() {
+        return generate(0, GenTime.MAX_UNIX);
+    }
+
+    @Override
+    public @NotNull OffsetTime generate(final long minUnix, final long maxUnix) {
+        final ZoneOffset zoneOffset = ZoneOffset.ofHours(ThreadLocalRandom.current().nextInt(-18, 18));
+        return OffsetTime.of(generator.generate(minUnix, maxUnix), zoneOffset);
+    }
+}
diff --git a/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java
index d1c9d5b6..46fa3c17 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/TimeGenerator.java
@@ -14,7 +14,7 @@
  */
 public class TimeGenerator implements ITimeGenerator<Time> {
 
-    private final LocalTimeGenerator generator = new LocalTimeGenerator();
+    private static final LocalTimeGenerator generator = new LocalTimeGenerator();
 
     @Override
     public @NotNull Time generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java
index c481915e..2a8ebb1c 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/TimestampGenerator.java
@@ -14,7 +14,7 @@
  */
 public class TimestampGenerator implements ITimeGenerator<Timestamp> {
 
-    private final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
+    private static final LocalDateTimeGenerator generator = new LocalDateTimeGenerator();
 
     @Override
     public @NotNull Timestamp generate() {
diff --git a/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java b/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java
index ec1d8ee4..eac6e1db 100644
--- a/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java
+++ b/src/test/java/io/dummymaker/export/asfile/SqlExportAsFileTest.java
@@ -74,7 +74,7 @@ public void exportSqlWithTimestampWithNamingStrategy() throws Exception {
         assertFalse(dummyAsString.isEmpty());
 
         final String[] sqlArray = dummyAsString.split("\n");
-        assertEquals(14, sqlArray.length);
+        assertEquals(16, sqlArray.length);
 
         validation.isDummyTimeValidWithNamingStrategy(sqlArray, strategy);
     }
diff --git a/src/test/java/io/dummymaker/export/validators/CsvValidator.java b/src/test/java/io/dummymaker/export/validators/CsvValidator.java
index 1224b14d..599e7b11 100644
--- a/src/test/java/io/dummymaker/export/validators/CsvValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/CsvValidator.java
@@ -130,11 +130,13 @@ public void isDummyTimeValid(String[] dummy) {
         assertTrue(dummy[0].matches(Patterns.LOCAL_TIME.getPattern().pattern()));
         assertTrue(dummy[1].matches(Patterns.LOCAL_DATE.getPattern().pattern()));
         assertTrue(dummy[2].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
-        assertTrue(dummy[3].matches(Patterns.TIMESTAMP.getPattern().pattern()));
-        assertTrue(dummy[4].matches(Patterns.DATE.getPattern().pattern()));
-        assertTrue(dummy[5].matches(Patterns.DATE_SQL.getPattern().pattern()));
-        assertTrue(dummy[6].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
-        assertTrue(dummy[7].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[3].matches(Patterns.OFFSET_TIME.getPattern().pattern()));
+        assertTrue(dummy[4].matches(Patterns.OFFSET_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[5].matches(Patterns.TIMESTAMP.getPattern().pattern()));
+        assertTrue(dummy[6].matches(Patterns.DATE.getPattern().pattern()));
+        assertTrue(dummy[7].matches(Patterns.DATE_SQL.getPattern().pattern()));
+        assertTrue(dummy[8].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[9].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
     }
 
     @Override
@@ -145,8 +147,10 @@ public void isDummyUnixTimeValid(String[] dummy) {
         assertTrue(dummy[3].matches("[0-9]+"));
         assertTrue(dummy[4].matches("[0-9]+"));
         assertTrue(dummy[5].matches("[0-9]+"));
-        assertTrue(dummy[6].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
-        assertTrue(dummy[7].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[6].matches("[0-9]+"));
+        assertTrue(dummy[7].matches("[0-9]+"));
+        assertTrue(dummy[8].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[9].matches(Patterns.LOCAL_DATETIME.getPattern().pattern()));
     }
 
     @Override
@@ -154,10 +158,12 @@ public void isDummyTimeFormatterValid(String[] dummy) {
         assertTrue(dummy[0].matches(DummyTimeFormatter.Patterns.LOCAL_TIME.getPattern().pattern()));
         assertTrue(dummy[1].matches(DummyTimeFormatter.Patterns.LOCAL_DATE.getPattern().pattern()));
         assertTrue(dummy[2].matches(DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern().pattern()));
-        assertTrue(dummy[3].matches(DummyTimeFormatter.Patterns.TIMESTAMP.getPattern().pattern()));
-        assertTrue(dummy[4].matches(DummyTimeFormatter.Patterns.DATE.getPattern().pattern()));
-        assertTrue(dummy[5].matches(DummyTimeFormatter.Patterns.DATE_SQL.getPattern().pattern()));
-        assertTrue(dummy[6].matches(DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern().pattern()));
-        assertTrue(dummy[7].matches(DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[3].matches(Patterns.OFFSET_TIME.getPattern().pattern()));
+        assertTrue(dummy[4].matches(Patterns.OFFSET_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[5].matches(DummyTimeFormatter.Patterns.TIMESTAMP.getPattern().pattern()));
+        assertTrue(dummy[6].matches(DummyTimeFormatter.Patterns.DATE.getPattern().pattern()));
+        assertTrue(dummy[7].matches(DummyTimeFormatter.Patterns.DATE_SQL.getPattern().pattern()));
+        assertTrue(dummy[8].matches(DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern().pattern()));
+        assertTrue(dummy[9].matches(DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern().pattern()));
     }
 }
diff --git a/src/test/java/io/dummymaker/export/validators/JsonValidator.java b/src/test/java/io/dummymaker/export/validators/JsonValidator.java
index 13868a5c..60fcf14f 100644
--- a/src/test/java/io/dummymaker/export/validators/JsonValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/JsonValidator.java
@@ -1,6 +1,8 @@
 package io.dummymaker.export.validators;
 
 import static io.dummymaker.model.Dummy.DummyFields.*;
+import static io.dummymaker.model.DummyTime.Patterns.OFFSET_DATETIME;
+import static io.dummymaker.model.DummyTime.Patterns.OFFSET_TIME;
 import static io.dummymaker.model.DummyTimeFormatter.Patterns.*;
 import static org.junit.Assert.assertTrue;
 
@@ -72,6 +74,8 @@ public void isDummyTimeValid(String[] dummy) {
                 + "\"" + Fields.LOCAL_TIME.getName() + "\":\"" + Patterns.LOCAL_TIME.getPattern() + "\","
                 + "\"" + Fields.LOCAL_DATE.getName() + "\":\"" + Patterns.LOCAL_DATE.getPattern() + "\","
                 + "\"" + Fields.LOCAL_DATETIME.getName() + "\":\"" + Patterns.LOCAL_DATETIME.getPattern() + "\","
+                + "\"" + Fields.OFFSET_TIME.getName() + "\":\"" + OFFSET_TIME.getPattern() + "\","
+                + "\"" + Fields.OFFSET_DATETIME.getName() + "\":\"" + Patterns.OFFSET_DATETIME.getPattern() + "\","
                 + "\"" + Fields.TIMESTAMP.getName() + "\":\"" + Patterns.TIMESTAMP.getPattern() + "\","
                 + "\"" + Fields.DATE.getName() + "\":\"" + Patterns.DATE_SQL.getPattern() + "\","
                 + "\"" + Fields.DATE_COVERAGE.getName() + "\":\"" + Patterns.DATE.getPattern() + "\","
@@ -86,6 +90,8 @@ public void isDummyUnixTimeValid(String[] dummy) {
                 + "\"" + Fields.LOCAL_TIME.getName() + "\":[0-9]+,"
                 + "\"" + Fields.LOCAL_DATE.getName() + "\":[0-9]+,"
                 + "\"" + Fields.LOCAL_DATETIME.getName() + "\":[0-9]+,"
+                + "\"" + Fields.OFFSET_TIME.getName() + "\":[0-9]+,"
+                + "\"" + Fields.OFFSET_DATETIME.getName() + "\":[0-9]+,"
                 + "\"" + Fields.TIMESTAMP.getName() + "\":[0-9]+,"
                 + "\"" + Fields.DATE.getName() + "\":[0-9]+,"
                 + "\"" + Fields.DATE_COVERAGE.getName() + "\":[0-9]+,"
@@ -100,6 +106,8 @@ public void isDummyTimeFormatterValid(String[] dummy) {
                 + "\"" + Fields.LOCAL_TIME.getName() + "\":\"" + LOCAL_TIME.getPattern() + "\","
                 + "\"" + Fields.LOCAL_DATE.getName() + "\":\"" + LOCAL_DATE.getPattern() + "\","
                 + "\"" + Fields.LOCAL_DATETIME.getName() + "\":\"" + LOCAL_DATETIME.getPattern() + "\","
+                + "\"" + Fields.OFFSET_TIME.getName() + "\":\"" + OFFSET_TIME.getPattern() + "\","
+                + "\"" + Fields.OFFSET_DATETIME.getName() + "\":\"" + OFFSET_DATETIME.getPattern() + "\","
                 + "\"" + Fields.TIMESTAMP.getName() + "\":\"" + TIMESTAMP.getPattern() + "\","
                 + "\"" + Fields.DATE.getName() + "\":\"" + DATE_SQL.getPattern() + "\","
                 + "\"" + Fields.DATE_COVERAGE.getName() + "\":\"" + DATE.getPattern() + "\","
diff --git a/src/test/java/io/dummymaker/export/validators/SqlValidator.java b/src/test/java/io/dummymaker/export/validators/SqlValidator.java
index c1016c7c..26fb7384 100644
--- a/src/test/java/io/dummymaker/export/validators/SqlValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/SqlValidator.java
@@ -99,6 +99,8 @@ public void isDummyTimeValidWithNamingStrategy(String[] dummies, ICase strategy)
         final String timeField = strategy.format(LOCAL_TIME.getName());
         final String dateField = strategy.format(LOCAL_DATE.getName());
         final String dateTimeField = strategy.format(LOCAL_DATETIME.getName());
+        final String offsetTimeField = strategy.format(OFFSET_TIME.getName());
+        final String offsetDateTimeField = strategy.format(OFFSET_DATETIME.getName());
         final String timestampField = strategy.format(TIMESTAMP.getName());
         final String dateOldField = strategy.format(DATE.getName());
         final String dateOldCoverageField = strategy.format(DATE_COVERAGE.getName());
@@ -109,19 +111,23 @@ public void isDummyTimeValidWithNamingStrategy(String[] dummies, ICase strategy)
         assertTrue(dummies[1].matches("\\t" + timeField + "\\tTIME,"));
         assertTrue(dummies[2].matches("\\t" + dateField + "\\tDATE,"));
         assertTrue(dummies[3].matches("\\t" + dateTimeField + "\\tTIMESTAMP,"));
-        assertTrue(dummies[4].matches("\\t" + timestampField + "\\tTIMESTAMP,"));
-        assertTrue(dummies[5].matches("\\t" + dateOldField + "\\tDATETIME,"));
-        assertTrue(dummies[6].matches("\\t" + dateOldCoverageField + "\\tDATETIME,"));
-        assertTrue(dummies[7].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
-        assertTrue(dummies[8].matches("\\t" + dateTimeObjectField + "\\tTIMESTAMP,"));
-        assertTrue(dummies[9].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
-        assertTrue(dummies[10].matches("\\);"));
-
-        assertTrue(dummies[11].matches("INSERT INTO " + strategy.format("DummyTime")
+        assertTrue(dummies[4].matches("\\t" + offsetTimeField + "\\tVARCHAR,"));
+        assertTrue(dummies[5].matches("\\t" + offsetDateTimeField + "\\tVARCHAR,"));
+        assertTrue(dummies[6].matches("\\t" + timestampField + "\\tTIMESTAMP,"));
+        assertTrue(dummies[7].matches("\\t" + dateOldField + "\\tDATETIME,"));
+        assertTrue(dummies[8].matches("\\t" + dateOldCoverageField + "\\tDATETIME,"));
+        assertTrue(dummies[9].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
+        assertTrue(dummies[10].matches("\\t" + dateTimeObjectField + "\\tTIMESTAMP,"));
+        assertTrue(dummies[11].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
+        assertTrue(dummies[12].matches("\\);"));
+
+        assertTrue(dummies[13].matches("INSERT INTO " + strategy.format("DummyTime")
                 + " \\("
                 + timeField + ", "
                 + dateField + ", "
                 + dateTimeField + ", "
+                + offsetTimeField + ", "
+                + offsetDateTimeField + ", "
                 + timestampField + ", "
                 + dateOldField + ", "
                 + dateOldCoverageField + ", "
@@ -129,20 +135,24 @@ public void isDummyTimeValidWithNamingStrategy(String[] dummies, ICase strategy)
                 + dateTimeObjectField
                 + "\\) VALUES"));
 
-        assertTrue(dummies[12].matches("\\('"
+        assertTrue(dummies[14].matches("\\('"
                 + ISO_TIME_PATTERN + "', '"
                 + ISO_DATE_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
+                + ISO_OFFSET_TIME_PATTERN + "', '"
+                + ISO_OFFSET_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "'\\),"));
 
-        assertTrue(dummies[13].matches("\\('"
+        assertTrue(dummies[15].matches("\\('"
                 + ISO_TIME_PATTERN + "', '"
                 + ISO_DATE_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
+                + ISO_OFFSET_TIME_PATTERN + "', '"
+                + ISO_OFFSET_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
@@ -157,6 +167,8 @@ public void isDummyTimeValid(String[] dummy) {
         final String timeField = strategy.format(LOCAL_TIME.getName());
         final String dateField = strategy.format(LOCAL_DATE.getName());
         final String dateTimeField = strategy.format(LOCAL_DATETIME.getName());
+        final String offsetTimeField = strategy.format(OFFSET_TIME.getName());
+        final String offsetDateTimeField = strategy.format(OFFSET_DATETIME.getName());
         final String timestampField = strategy.format(TIMESTAMP.getName());
         final String dateOldField = strategy.format(DATE.getName());
         final String dateOldCoverageField = strategy.format(DATE_COVERAGE.getName());
@@ -171,19 +183,23 @@ public void isDummyTimeValid(String[] dummy) {
         assertTrue(dummy[1].matches("\\t" + timeField + "\\tTIME,"));
         assertTrue(dummy[2].matches("\\t" + dateField + "\\tDATE,"));
         assertTrue(dummy[3].matches("\\t" + dateTimeField + "\\tTIMESTAMP,"));
-        assertTrue(dummy[4].matches("\\t" + timestampField + "\\tTIMESTAMP,"));
-        assertTrue(dummy[5].matches("\\t" + dateOldField + "\\tDATETIME,"));
-        assertTrue(dummy[6].matches("\\t" + dateOldCoverageField + "\\tDATETIME,"));
-        assertTrue(dummy[7].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
-        assertTrue(dummy[8].matches("\\t" + dateTimeObjectField + "\\tVARCHAR,"));
-        assertTrue(dummy[9].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
-        assertTrue(dummy[10].matches("\\);"));
-
-        assertTrue(dummy[11].matches("INSERT INTO " + strategy.format("dummytime")
+        assertTrue(dummy[4].matches("\\t" + offsetTimeField + "\\tVARCHAR,"));
+        assertTrue(dummy[5].matches("\\t" + offsetDateTimeField + "\\tVARCHAR,"));
+        assertTrue(dummy[6].matches("\\t" + timestampField + "\\tTIMESTAMP,"));
+        assertTrue(dummy[7].matches("\\t" + dateOldField + "\\tDATETIME,"));
+        assertTrue(dummy[8].matches("\\t" + dateOldCoverageField + "\\tDATETIME,"));
+        assertTrue(dummy[9].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
+        assertTrue(dummy[10].matches("\\t" + dateTimeObjectField + "\\tVARCHAR,"));
+        assertTrue(dummy[11].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
+        assertTrue(dummy[12].matches("\\);"));
+
+        assertTrue(dummy[13].matches("INSERT INTO " + strategy.format("dummytime")
                 + " \\("
                 + timeField + ", "
                 + dateField + ", "
                 + dateTimeField + ", "
+                + offsetTimeField + ", "
+                + offsetDateTimeField + ", "
                 + timestampField + ", "
                 + dateOldField + ", "
                 + dateOldCoverageField + ", "
@@ -191,10 +207,12 @@ public void isDummyTimeValid(String[] dummy) {
                 + dateTimeObjectField
                 + "\\) VALUES"));
 
-        assertTrue(dummy[12].matches("\\('"
+        assertTrue(dummy[14].matches("\\('"
                 + ISO_TIME_PATTERN + "', '"
                 + ISO_DATE_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
+                + ISO_OFFSET_TIME_PATTERN + "', '"
+                + ISO_OFFSET_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
                 + ISO_DATE_TIME_PATTERN + "', '"
@@ -209,6 +227,8 @@ public void isDummyUnixTimeValid(String[] dummy) {
         final String timeField = strategy.format(LOCAL_TIME.getName());
         final String dateField = strategy.format(LOCAL_DATE.getName());
         final String dateTimeField = strategy.format(LOCAL_DATETIME.getName());
+        final String offsetTimeField = strategy.format(OFFSET_TIME.getName());
+        final String offsetDateTimeField = strategy.format(OFFSET_DATETIME.getName());
         final String timestampField = strategy.format(TIMESTAMP.getName());
         final String dateOldField = strategy.format(DATE.getName());
         final String dateOldCoverageField = strategy.format(DATE_COVERAGE.getName());
@@ -219,19 +239,23 @@ public void isDummyUnixTimeValid(String[] dummy) {
         assertTrue(dummy[1].matches("\\t" + timeField + "\\tBIGINT,"));
         assertTrue(dummy[2].matches("\\t" + dateField + "\\tBIGINT,"));
         assertTrue(dummy[3].matches("\\t" + dateTimeField + "\\tBIGINT,"));
-        assertTrue(dummy[4].matches("\\t" + timestampField + "\\tBIGINT,"));
-        assertTrue(dummy[5].matches("\\t" + dateOldField + "\\tBIGINT,"));
-        assertTrue(dummy[6].matches("\\t" + dateOldCoverageField + "\\tBIGINT,"));
-        assertTrue(dummy[7].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
-        assertTrue(dummy[8].matches("\\t" + dateTimeObjectField + "\\tVARCHAR,"));
-        assertTrue(dummy[9].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
-        assertTrue(dummy[10].matches("\\);"));
-
-        assertTrue(dummy[11].matches("INSERT INTO " + strategy.format("dummyunixtime")
+        assertTrue(dummy[4].matches("\\t" + offsetTimeField + "\\tBIGINT,"));
+        assertTrue(dummy[5].matches("\\t" + offsetDateTimeField + "\\tBIGINT,"));
+        assertTrue(dummy[6].matches("\\t" + timestampField + "\\tBIGINT,"));
+        assertTrue(dummy[7].matches("\\t" + dateOldField + "\\tBIGINT,"));
+        assertTrue(dummy[8].matches("\\t" + dateOldCoverageField + "\\tBIGINT,"));
+        assertTrue(dummy[9].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
+        assertTrue(dummy[10].matches("\\t" + dateTimeObjectField + "\\tVARCHAR,"));
+        assertTrue(dummy[11].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
+        assertTrue(dummy[12].matches("\\);"));
+
+        assertTrue(dummy[13].matches("INSERT INTO " + strategy.format("dummyunixtime")
                 + " \\("
                 + timeField + ", "
                 + dateField + ", "
                 + dateTimeField + ", "
+                + offsetTimeField + ", "
+                + offsetDateTimeField + ", "
                 + timestampField + ", "
                 + dateOldField + ", "
                 + dateOldCoverageField + ", "
@@ -239,7 +263,9 @@ public void isDummyUnixTimeValid(String[] dummy) {
                 + dateTimeObjectField
                 + "\\) VALUES"));
 
-        assertTrue(dummy[12].matches("\\("
+        assertTrue(dummy[14].matches("\\("
+                + "[0-9]+" + ", "
+                + "[0-9]+" + ", "
                 + "[0-9]+" + ", "
                 + "[0-9]+" + ", "
                 + "[0-9]+" + ", "
@@ -257,6 +283,8 @@ public void isDummyTimeFormatterValid(String[] dummy) {
         final String timeField = strategy.format(LOCAL_TIME.getName());
         final String dateField = strategy.format(LOCAL_DATE.getName());
         final String dateTimeField = strategy.format(LOCAL_DATETIME.getName());
+        final String offsetTimeField = strategy.format(OFFSET_TIME.getName());
+        final String offsetDateTimeField = strategy.format(OFFSET_DATETIME.getName());
         final String timestampField = strategy.format(TIMESTAMP.getName());
         final String dateOldField = strategy.format(DATE.getName());
         final String dateOldCoverageField = strategy.format(DATE_COVERAGE.getName());
@@ -267,19 +295,23 @@ public void isDummyTimeFormatterValid(String[] dummy) {
         assertTrue(dummy[1].matches("\\t" + timeField + "\\tTIME,"));
         assertTrue(dummy[2].matches("\\t" + dateField + "\\tDATE,"));
         assertTrue(dummy[3].matches("\\t" + dateTimeField + "\\tTIMESTAMP,"));
-        assertTrue(dummy[4].matches("\\t" + timestampField + "\\tTIMESTAMP,"));
-        assertTrue(dummy[5].matches("\\t" + dateOldField + "\\tDATETIME,"));
-        assertTrue(dummy[6].matches("\\t" + dateOldCoverageField + "\\tDATETIME,"));
-        assertTrue(dummy[7].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
-        assertTrue(dummy[8].matches("\\t" + dateTimeObjectField + "\\tVARCHAR,"));
-        assertTrue(dummy[9].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
-        assertTrue(dummy[10].matches("\\);"));
-
-        assertTrue(dummy[11].matches("INSERT INTO " + strategy.format("dummytimeformatter")
+        assertTrue(dummy[4].matches("\\t" + offsetTimeField + "\\tVARCHAR,"));
+        assertTrue(dummy[5].matches("\\t" + offsetDateTimeField + "\\tVARCHAR,"));
+        assertTrue(dummy[6].matches("\\t" + timestampField + "\\tTIMESTAMP,"));
+        assertTrue(dummy[7].matches("\\t" + dateOldField + "\\tDATETIME,"));
+        assertTrue(dummy[8].matches("\\t" + dateOldCoverageField + "\\tDATETIME,"));
+        assertTrue(dummy[9].matches("\\t" + dateTimeStringField + "\\tVARCHAR,"));
+        assertTrue(dummy[10].matches("\\t" + dateTimeObjectField + "\\tVARCHAR,"));
+        assertTrue(dummy[11].matches("\\tPRIMARY KEY \\([a-zA-Z]+\\)"));
+        assertTrue(dummy[12].matches("\\);"));
+
+        assertTrue(dummy[13].matches("INSERT INTO " + strategy.format("dummytimeformatter")
                 + " \\("
                 + timeField + ", "
                 + dateField + ", "
                 + dateTimeField + ", "
+                + offsetTimeField + ", "
+                + offsetDateTimeField + ", "
                 + timestampField + ", "
                 + dateOldField + ", "
                 + dateOldCoverageField + ", "
@@ -287,10 +319,12 @@ public void isDummyTimeFormatterValid(String[] dummy) {
                 + dateTimeObjectField
                 + "\\) VALUES"));
 
-        assertTrue(dummy[12].matches("\\('"
+        assertTrue(dummy[14].matches("\\('"
                 + DummyTimeFormatter.Patterns.TIME.getPattern().pattern() + "', '"
                 + DummyTimeFormatter.Patterns.LOCAL_DATE.getPattern().pattern() + "', '"
                 + DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern().pattern() + "', '"
+                + Patterns.OFFSET_TIME.getPattern().pattern() + "', '"
+                + Patterns.OFFSET_DATETIME.getPattern().pattern() + "', '"
                 + DummyTimeFormatter.Patterns.TIMESTAMP.getPattern().pattern() + "', '"
                 + DummyTimeFormatter.Patterns.DATE.getPattern().pattern() + "', '"
                 + DummyTimeFormatter.Patterns.DATE_SQL.getPattern().pattern() + "', '"
diff --git a/src/test/java/io/dummymaker/export/validators/XmlValidator.java b/src/test/java/io/dummymaker/export/validators/XmlValidator.java
index 4b8a8d31..b7880f40 100644
--- a/src/test/java/io/dummymaker/export/validators/XmlValidator.java
+++ b/src/test/java/io/dummymaker/export/validators/XmlValidator.java
@@ -6,6 +6,7 @@
 
 import io.dummymaker.export.Cases;
 import io.dummymaker.export.ICase;
+import io.dummymaker.model.DummyTime;
 import io.dummymaker.model.DummyTime.Patterns;
 import io.dummymaker.model.DummyTimeFormatter;
 
@@ -82,22 +83,28 @@ public void isDummyTimeValid(String[] dummy) {
         assertTrue(dummy[3].matches("\\t<" + LOCAL_DATETIME.getName() + ">"
                 + Patterns.LOCAL_DATETIME.getPattern()
                 + "</" + LOCAL_DATETIME.getName() + ">"));
-        assertTrue(dummy[4].matches("\\t<" + TIMESTAMP.getName() + ">"
+        assertTrue(dummy[4].matches("\\t<" + OFFSET_TIME.getName() + ">"
+                + Patterns.OFFSET_TIME.getPattern()
+                + "</" + OFFSET_TIME.getName() + ">"));
+        assertTrue(dummy[5].matches("\\t<" + OFFSET_DATETIME.getName() + ">"
+                + Patterns.OFFSET_DATETIME.getPattern()
+                + "</" + OFFSET_DATETIME.getName() + ">"));
+        assertTrue(dummy[6].matches("\\t<" + TIMESTAMP.getName() + ">"
                 + Patterns.TIMESTAMP.getPattern()
                 + "</" + TIMESTAMP.getName() + ">"));
-        assertTrue(dummy[5].matches("\\t<" + DATE.getName() + ">"
+        assertTrue(dummy[7].matches("\\t<" + DATE.getName() + ">"
                 + Patterns.DATE_SQL.getPattern()
                 + "</" + DATE.getName() + ">"));
-        assertTrue(dummy[6].matches("\\t<" + DATE_COVERAGE.getName() + ">"
+        assertTrue(dummy[8].matches("\\t<" + DATE_COVERAGE.getName() + ">"
                 + Patterns.DATE.getPattern()
                 + "</" + DATE_COVERAGE.getName() + ">"));
-        assertTrue(dummy[7].matches("\\t<" + LOCAL_DATETIME_STRING.getName() + ">"
+        assertTrue(dummy[9].matches("\\t<" + LOCAL_DATETIME_STRING.getName() + ">"
                 + Patterns.LOCAL_DATETIME.getPattern()
                 + "</" + LOCAL_DATETIME_STRING.getName() + ">"));
-        assertTrue(dummy[8].matches("\\t<" + LOCAL_DATETIME_OBJECT.getName() + ">"
+        assertTrue(dummy[10].matches("\\t<" + LOCAL_DATETIME_OBJECT.getName() + ">"
                 + Patterns.LOCAL_DATETIME.getPattern()
                 + "</" + LOCAL_DATETIME_OBJECT.getName() + ">"));
-        assertTrue(dummy[9].matches("</DummyTime>"));
+        assertTrue(dummy[11].matches("</DummyTime>"));
     }
 
     @Override
@@ -112,22 +119,28 @@ public void isDummyUnixTimeValid(String[] dummy) {
         assertTrue(dummy[3].matches("\\t<" + LOCAL_DATETIME.getName() + ">"
                 + "[0-9]+"
                 + "</" + LOCAL_DATETIME.getName() + ">"));
-        assertTrue(dummy[4].matches("\\t<" + TIMESTAMP.getName() + ">"
+        assertTrue(dummy[4].matches("\\t<" + OFFSET_TIME.getName() + ">"
+                + "[0-9]+"
+                + "</" + OFFSET_TIME.getName() + ">"));
+        assertTrue(dummy[5].matches("\\t<" + OFFSET_DATETIME.getName() + ">"
+                + "[0-9]+"
+                + "</" + OFFSET_DATETIME.getName() + ">"));
+        assertTrue(dummy[6].matches("\\t<" + TIMESTAMP.getName() + ">"
                 + "[0-9]+"
                 + "</" + TIMESTAMP.getName() + ">"));
-        assertTrue(dummy[5].matches("\\t<" + DATE.getName() + ">"
+        assertTrue(dummy[7].matches("\\t<" + DATE.getName() + ">"
                 + "[0-9]+"
                 + "</" + DATE.getName() + ">"));
-        assertTrue(dummy[6].matches("\\t<" + DATE_COVERAGE.getName() + ">"
+        assertTrue(dummy[8].matches("\\t<" + DATE_COVERAGE.getName() + ">"
                 + "[0-9]+"
                 + "</" + DATE_COVERAGE.getName() + ">"));
-        assertTrue(dummy[7].matches("\\t<" + LOCAL_DATETIME_STRING.getName() + ">"
+        assertTrue(dummy[9].matches("\\t<" + LOCAL_DATETIME_STRING.getName() + ">"
                 + Patterns.LOCAL_DATETIME.getPattern().pattern()
                 + "</" + LOCAL_DATETIME_STRING.getName() + ">"));
-        assertTrue(dummy[8].matches("\\t<" + LOCAL_DATETIME_OBJECT.getName() + ">"
+        assertTrue(dummy[10].matches("\\t<" + LOCAL_DATETIME_OBJECT.getName() + ">"
                 + Patterns.LOCAL_DATETIME.getPattern().pattern()
                 + "</" + LOCAL_DATETIME_OBJECT.getName() + ">"));
-        assertTrue(dummy[9].matches("</DummyUnixTime>"));
+        assertTrue(dummy[11].matches("</DummyUnixTime>"));
     }
 
     @Override
@@ -142,21 +155,27 @@ public void isDummyTimeFormatterValid(String[] dummy) {
         assertTrue(dummy[3].matches("\\t<" + LOCAL_DATETIME.getName() + ">"
                 + DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern()
                 + "</" + LOCAL_DATETIME.getName() + ">"));
-        assertTrue(dummy[4].matches("\\t<" + TIMESTAMP.getName() + ">"
+        assertTrue(dummy[4].matches("\\t<" + OFFSET_TIME.getName() + ">"
+                + DummyTime.Patterns.OFFSET_TIME.getPattern()
+                + "</" + OFFSET_TIME.getName() + ">"));
+        assertTrue(dummy[5].matches("\\t<" + OFFSET_DATETIME.getName() + ">"
+                + DummyTime.Patterns.OFFSET_DATETIME.getPattern()
+                + "</" + OFFSET_DATETIME.getName() + ">"));
+        assertTrue(dummy[6].matches("\\t<" + TIMESTAMP.getName() + ">"
                 + DummyTimeFormatter.Patterns.TIMESTAMP.getPattern()
                 + "</" + TIMESTAMP.getName() + ">"));
-        assertTrue(dummy[5].matches("\\t<" + DATE.getName() + ">"
+        assertTrue(dummy[7].matches("\\t<" + DATE.getName() + ">"
                 + DummyTimeFormatter.Patterns.DATE_SQL.getPattern()
                 + "</" + DATE.getName() + ">"));
-        assertTrue(dummy[6].matches("\\t<" + DATE_COVERAGE.getName() + ">"
+        assertTrue(dummy[8].matches("\\t<" + DATE_COVERAGE.getName() + ">"
                 + DummyTimeFormatter.Patterns.DATE.getPattern()
                 + "</" + DATE_COVERAGE.getName() + ">"));
-        assertTrue(dummy[7].matches("\\t<" + LOCAL_DATETIME_STRING.getName() + ">"
+        assertTrue(dummy[9].matches("\\t<" + LOCAL_DATETIME_STRING.getName() + ">"
                 + DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern()
                 + "</" + LOCAL_DATETIME_STRING.getName() + ">"));
-        assertTrue(dummy[8].matches("\\t<" + LOCAL_DATETIME_OBJECT.getName() + ">"
+        assertTrue(dummy[10].matches("\\t<" + LOCAL_DATETIME_OBJECT.getName() + ">"
                 + DummyTimeFormatter.Patterns.LOCAL_DATETIME.getPattern()
                 + "</" + LOCAL_DATETIME_OBJECT.getName() + ">"));
-        assertTrue(dummy[9].matches("</DummyTimeFormatter>"));
+        assertTrue(dummy[11].matches("</DummyTimeFormatter>"));
     }
 }
diff --git a/src/test/java/io/dummymaker/model/DummyTime.java b/src/test/java/io/dummymaker/model/DummyTime.java
index 7d2123c5..b42efe0e 100644
--- a/src/test/java/io/dummymaker/model/DummyTime.java
+++ b/src/test/java/io/dummymaker/model/DummyTime.java
@@ -4,9 +4,7 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
 import java.util.Date;
 import java.util.regex.Pattern;
 
@@ -22,12 +20,18 @@ public class DummyTime {
     public static final String ISO_DATE_PATTERN = "[1-9][0-9]{3}-[0-9]{2}-[0-9]{2}";
     public static final String ISO_DATE_TIME_PATTERN = ISO_DATE_PATTERN + "T" + ISO_TIME_PATTERN;
 
+    public static final String ISO_OFFSET_TIME_PATTERN = "[0-9]{2}:[0-9]{2}:[0-9]{2}(\\.[0-9]{0,3})?[+-]\\d\\d:\\d\\d";
+    public static final String ISO_OFFSET_DATE_TIME_PATTERN = ISO_DATE_PATTERN + "T" + ISO_OFFSET_TIME_PATTERN;
+
     public enum Patterns {
 
         LOCAL_TIME(compile(ISO_TIME_PATTERN), compile("\\d{1,2}:\\d{1,2}(:\\d{1,2})?(\\.\\d{1,10})?")),
         LOCAL_DATE(compile(ISO_DATE_PATTERN), compile("\\d{4}-\\d{1,2}-\\d{1,2}")),
         LOCAL_DATETIME(compile(ISO_DATE_TIME_PATTERN),
                 compile("\\d{4}-\\d{1,2}-\\d{1,2}[A-Z]\\d{1,2}:\\d{1,2}(:\\d{1,2}(\\.\\d+)?)?")),
+        OFFSET_TIME(compile(ISO_OFFSET_TIME_PATTERN), compile("\\d{1,2}:\\d{1,2}(:\\d{1,2})?(\\.\\d{1,10})?[+-]\\d\\d:\\d\\d")),
+        OFFSET_DATETIME(compile(ISO_OFFSET_DATE_TIME_PATTERN),
+                compile("\\d{4}-\\d{1,2}-\\d{1,2}[A-Z]\\d{1,2}:\\d{1,2}(:\\d{1,2}(\\.\\d+)?)?[+-]\\d\\d:\\d\\d")),
         DATE(compile(ISO_DATE_TIME_PATTERN),
                 compile("[A-Za-z]{3} [A-Za-z]{3} \\d{2} \\d{1,2}:\\d{1,2}:\\d{1,2} [A-Za-z]{3,5} \\d{4}")),
         TIMESTAMP(compile(ISO_DATE_TIME_PATTERN), compile("\\d{4}-\\d{1,2}-\\d{1,2} \\d{1,2}:\\d{1,2}:\\d{1,2}(\\.\\d{1,10})?")),
@@ -56,6 +60,8 @@ public enum Fields {
         LOCAL_TIME("time"),
         LOCAL_DATE("date"),
         LOCAL_DATETIME("dateTime"),
+        OFFSET_TIME("offsetTime"),
+        OFFSET_DATETIME("offsetDateTime"),
         TIMESTAMP("timestamp"),
         DATE("dateOld"),
         DATE_COVERAGE("dateOldCoverage"),
@@ -82,6 +88,12 @@ public String getName() {
     @GenTime(minUnix = -100)
     private LocalDateTime dateTime;
 
+    @GenTime
+    private OffsetTime offsetTime;
+
+    @GenTime
+    private OffsetDateTime offsetDateTime;
+
     @GenTime(minUnix = 1)
     private Timestamp timestamp;
 
diff --git a/src/test/java/io/dummymaker/model/DummyTimeFormatter.java b/src/test/java/io/dummymaker/model/DummyTimeFormatter.java
index c4eaccf8..93d74dcc 100644
--- a/src/test/java/io/dummymaker/model/DummyTimeFormatter.java
+++ b/src/test/java/io/dummymaker/model/DummyTimeFormatter.java
@@ -4,9 +4,7 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
 import java.util.Date;
 import java.util.regex.Pattern;
 
@@ -82,6 +80,12 @@ public String getName() {
     @GenTime(formatter = "yyyy-MM HH:mm")
     private LocalDateTime dateTime;
 
+    @GenTime
+    private OffsetTime offsetTime;
+
+    @GenTime
+    private OffsetDateTime offsetDateTime;
+
     @GenTime(formatter = "yyyy-MM HH:mm")
     private Timestamp timestamp;
 
@@ -124,4 +128,8 @@ public String getDateTimeString() {
     public Object getDateTimeObject() {
         return dateTimeObject;
     }
+
+    public Date getDateOldCoverage() {
+        return dateOldCoverage;
+    }
 }
diff --git a/src/test/java/io/dummymaker/model/DummyUnixTime.java b/src/test/java/io/dummymaker/model/DummyUnixTime.java
index 9334b897..2279c96e 100644
--- a/src/test/java/io/dummymaker/model/DummyUnixTime.java
+++ b/src/test/java/io/dummymaker/model/DummyUnixTime.java
@@ -2,9 +2,7 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
 import java.util.Date;
 
 /**
@@ -46,6 +44,12 @@ public String getName() {
     @GenTime(exportAsUnixTime = true)
     private LocalDateTime dateTime;
 
+    @GenTime(exportAsUnixTime = true)
+    private OffsetTime offsetTime;
+
+    @GenTime(exportAsUnixTime = true)
+    private OffsetDateTime offsetDateTime;
+
     @GenTime(exportAsUnixTime = true)
     private Timestamp timestamp;
 
@@ -88,4 +92,8 @@ public String getDateTimeString() {
     public Object getDateTimeObject() {
         return dateTimeObject;
     }
+
+    public Date getDateOldCoverage() {
+        return dateOldCoverage;
+    }
 }

From 26de3ebb32e474c1945b9e133c3a96071ff657fa Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 02:51:40 +0300
Subject: [PATCH 07/15] [3.1.0-SNAPSHOT] Support for new time types added

---
 .../io/dummymaker/export/impl/BaseExporter.java | 17 +++++++++++++++++
 .../generator/complex/TimeComplexGenerator.java |  8 +++++---
 .../model/export/FieldContainerFactory.java     |  6 +++---
 src/main/java/io/dummymaker/util/CastUtils.java |  8 ++++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/dummymaker/export/impl/BaseExporter.java b/src/main/java/io/dummymaker/export/impl/BaseExporter.java
index 34bc6fc6..889aee7f 100644
--- a/src/main/java/io/dummymaker/export/impl/BaseExporter.java
+++ b/src/main/java/io/dummymaker/export/impl/BaseExporter.java
@@ -152,6 +152,10 @@ protected String convertDate(Object date, String formatterPattern) {
             return ((LocalTime) date).format(formatter);
         } else if (date instanceof LocalDateTime) {
             return ((LocalDateTime) date).format(formatter);
+        } else if (date instanceof OffsetDateTime) {
+            return ((OffsetDateTime) date).format(formatter);
+        } else if (date instanceof OffsetTime) {
+            return ((OffsetTime) date).format(formatter);
         } else {
             return String.valueOf(date);
         }
@@ -167,6 +171,11 @@ protected String convertDateUnix(Object date) {
                     ((LocalTime) date)).toEpochSecond(ZoneOffset.UTC));
         } else if (date instanceof LocalDateTime) {
             return String.valueOf(((LocalDateTime) date).toEpochSecond(ZoneOffset.UTC));
+        } else if (date instanceof OffsetDateTime) {
+            return String.valueOf(((OffsetDateTime) date).toEpochSecond());
+        } else if (date instanceof OffsetTime) {
+            return String.valueOf(LocalDateTime.of(LocalDate.of(1970, 1, 1),
+                    ((OffsetTime) date).toLocalTime()).toEpochSecond(ZoneOffset.UTC));
         } else {
             return String.valueOf(date);
         }
@@ -185,6 +194,14 @@ protected DateTimeFormatter getDateFormatter(Object date, String formatter) {
             return GenTime.DEFAULT_FORMAT.equals(formatter)
                     ? DateTimeFormatter.ISO_DATE
                     : DateTimeFormatter.ofPattern(formatter);
+        } else if (date instanceof OffsetTime) {
+            return GenTime.DEFAULT_FORMAT.equals(formatter)
+                    ? DateTimeFormatter.ISO_OFFSET_TIME
+                    : DateTimeFormatter.ofPattern(formatter);
+        } else if (date instanceof OffsetDateTime) {
+            return GenTime.DEFAULT_FORMAT.equals(formatter)
+                    ? DateTimeFormatter.ISO_OFFSET_DATE_TIME
+                    : DateTimeFormatter.ofPattern(formatter);
         } else {
             return DateTimeFormatter.ofPattern(formatter);
         }
diff --git a/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java
index ee2e26f6..b67840b7 100644
--- a/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/TimeComplexGenerator.java
@@ -14,9 +14,7 @@
 import java.lang.reflect.Field;
 import java.sql.Time;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import org.jetbrains.annotations.NotNull;
@@ -66,6 +64,10 @@ public class TimeComplexGenerator implements IComplexGenerator {
             return castObject(genTime(storage, LocalDateGenerator.class, minUnix, maxUnix), fieldClass);
         } else if (fieldClass.isAssignableFrom(LocalTime.class)) {
             return castObject(genTime(storage, LocalTimeGenerator.class, minUnix, maxUnix), fieldClass);
+        } else if (fieldClass.isAssignableFrom(OffsetDateTime.class)) {
+            return castObject(genTime(storage, OffsetDateTimeGenerator.class, minUnix, maxUnix), fieldClass);
+        } else if (fieldClass.isAssignableFrom(OffsetTime.class)) {
+            return castObject(genTime(storage, OffsetTimeGenerator.class, minUnix, maxUnix), fieldClass);
         } else if (fieldClass.isAssignableFrom(Date.class)) {
             return castObject(genTime(storage, DateGenerator.class, minUnix, maxUnix), fieldClass);
         } else if (fieldClass.isAssignableFrom(Timestamp.class)) {
diff --git a/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java b/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java
index d0b49afe..7f568b10 100644
--- a/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java
+++ b/src/main/java/io/dummymaker/model/export/FieldContainerFactory.java
@@ -10,9 +10,7 @@
 import java.math.BigInteger;
 import java.sql.Time;
 import java.sql.Timestamp;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Map;
@@ -72,6 +70,8 @@ else if (type.equals(Short.class)
         else if (type.equals(LocalDate.class)
                 || type.equals(LocalTime.class)
                 || type.equals(LocalDateTime.class)
+                || type.equals(OffsetDateTime.class)
+                || type.equals(OffsetTime.class)
                 || type.equals(Date.class)
                 || type.equals(java.sql.Date.class)
                 || type.equals(Timestamp.class)
diff --git a/src/main/java/io/dummymaker/util/CastUtils.java b/src/main/java/io/dummymaker/util/CastUtils.java
index 9c0b006e..b596efc3 100644
--- a/src/main/java/io/dummymaker/util/CastUtils.java
+++ b/src/main/java/io/dummymaker/util/CastUtils.java
@@ -6,9 +6,7 @@
 import java.lang.reflect.Type;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
+import java.time.*;
 import java.util.Arrays;
 import java.util.Date;
 import org.slf4j.Logger;
@@ -226,7 +224,9 @@ public static boolean isKnownComplex(Class<?> type) {
         return Date.class.isAssignableFrom(type)
                 || LocalTime.class.isAssignableFrom(type)
                 || LocalDate.class.isAssignableFrom(type)
-                || LocalDateTime.class.isAssignableFrom(type);
+                || LocalDateTime.class.isAssignableFrom(type)
+                || OffsetDateTime.class.isAssignableFrom(type)
+                || OffsetTime.class.isAssignableFrom(type);
     }
 
     @SuppressWarnings("unchecked")

From 4f7455acaf3d51467ddca3a13193f9dd4d44963c Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 02:52:39 +0300
Subject: [PATCH 08/15] [3.1.0-SNAPSHOT] Collection default max value reduced
 from 5 to 2

---
 src/main/java/io/dummymaker/annotation/complex/GenArray.java  | 2 +-
 .../java/io/dummymaker/annotation/complex/GenArray2D.java     | 4 ++--
 src/main/java/io/dummymaker/annotation/complex/GenList.java   | 2 +-
 src/main/java/io/dummymaker/annotation/complex/GenMap.java    | 2 +-
 src/main/java/io/dummymaker/annotation/complex/GenSet.java    | 2 +-
 .../dummymaker/generator/complex/BasicComplexGenerator.java   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/dummymaker/annotation/complex/GenArray.java b/src/main/java/io/dummymaker/annotation/complex/GenArray.java
index c63564f7..00205976 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenArray.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenArray.java
@@ -34,7 +34,7 @@
      *
      * @return max amount
      */
-    int max() default 10;
+    int max() default 2;
 
     /**
      * Fixed number entities to generate Turned off by default
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java b/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java
index 4de4c5bb..059593fd 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenArray2D.java
@@ -34,7 +34,7 @@
      *
      * @return max amount for 1 dimension
      */
-    int maxFirst() default 10;
+    int maxFirst() default 2;
 
     /**
      * Second dimension minimum entities to generate
@@ -48,7 +48,7 @@
      *
      * @return max amount for 2 dimension
      */
-    int maxSecond() default 10;
+    int maxSecond() default 2;
 
     /**
      * First dimension fixed amount entities to generate Turned off by default
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenList.java b/src/main/java/io/dummymaker/annotation/complex/GenList.java
index 79ee5b6e..b1bb1202 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenList.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenList.java
@@ -34,7 +34,7 @@
      *
      * @return max amount
      */
-    int max() default 5;
+    int max() default 2;
 
     /**
      * Fixed number entities to generate Turned off by default
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenMap.java b/src/main/java/io/dummymaker/annotation/complex/GenMap.java
index 2c5ea5a1..54eb76ca 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenMap.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenMap.java
@@ -36,7 +36,7 @@
      *
      * @return max amount
      */
-    int max() default 5;
+    int max() default 2;
 
     /**
      * Fixed number entities to generate Turned off by default
diff --git a/src/main/java/io/dummymaker/annotation/complex/GenSet.java b/src/main/java/io/dummymaker/annotation/complex/GenSet.java
index 8ae93335..2aeb210d 100644
--- a/src/main/java/io/dummymaker/annotation/complex/GenSet.java
+++ b/src/main/java/io/dummymaker/annotation/complex/GenSet.java
@@ -34,7 +34,7 @@
      *
      * @return max amount
      */
-    int max() default 5;
+    int max() default 2;
 
     /**
      * Fixed number entities to generate Turned off by default
diff --git a/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java b/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java
index 522505a3..e66b6539 100644
--- a/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java
+++ b/src/main/java/io/dummymaker/generator/complex/BasicComplexGenerator.java
@@ -25,7 +25,7 @@
 abstract class BasicComplexGenerator implements IComplexGenerator {
 
     static final int MIN_DEFAULT = 1;
-    static final int MAX_DEFAULT = 5;
+    static final int MAX_DEFAULT = 2;
 
     static int getDesiredSize(int min, int max, int fixed) {
         return (fixed > -1) ? fixed : CollectionUtils.random(min, max);

From 68c1b5eb4d0abe752c13ed0677d898e044dadc50 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 02:53:23 +0300
Subject: [PATCH 09/15] [3.1.0-SNAPSHOT] Generators patterns improved, order
 improved

---
 .../generator/simple/number/IntegerGenerator.java         | 5 +++++
 .../generator/simple/number/IntegerSmallGenerator.java    | 2 +-
 .../generator/simple/number/IntegetMediumGenerator.java   | 2 +-
 .../generator/simple/string/CompanyGenerator.java         | 7 ++++++-
 .../generator/simple/string/CountryGenerator.java         | 2 +-
 .../generator/simple/string/DescriptionGenerator.java     | 5 +++++
 .../generator/simple/string/DocumentGenerator.java        | 2 +-
 .../dummymaker/generator/simple/string/FileGenerator.java | 5 +++++
 .../generator/simple/string/FormatGenerator.java          | 5 +++++
 .../dummymaker/generator/simple/string/IdGenerator.java   | 2 +-
 .../dummymaker/generator/simple/string/JobGenerator.java  | 2 +-
 .../dummymaker/generator/simple/string/NounGenerator.java | 8 +++++++-
 .../generator/simple/string/PhoneGenerator.java           | 5 +++++
 .../generator/simple/string/ProductGenerator.java         | 4 +++-
 14 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
index 4941b871..f96d3a23 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerGenerator.java
@@ -27,4 +27,9 @@ public class IntegerGenerator implements IGenerator<Integer> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -60;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
index e8671f1d..7a1aa77a 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegerSmallGenerator.java
@@ -15,7 +15,7 @@
  */
 public class IntegerSmallGenerator implements IGenerator<Integer> {
 
-    private final Pattern pattern = Pattern.compile("age|grade|group|amount|inn|snils", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("rank|age|grade|group|amount|inn|snils", CASE_INSENSITIVE);
 
     @Override
     public @NotNull Integer generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java b/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
index fc13876a..9cf4068d 100644
--- a/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/number/IntegetMediumGenerator.java
@@ -15,7 +15,7 @@
  */
 public class IntegetMediumGenerator implements IGenerator<Integer> {
 
-    private final Pattern pattern = Pattern.compile("postal|code|index|zip(code)?", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("number|postal|code|index|zip(code)?", CASE_INSENSITIVE);
 
     @Override
     public @NotNull Integer generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
index 51be1bd4..7c24bc8c 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CompanyGenerator.java
@@ -16,7 +16,7 @@
  */
 public class CompanyGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("organization|company|corp(oration)?|fund|business|shop|store",
+    private final Pattern pattern = Pattern.compile("org(anization)?|company|corp(oration)?|fund|business|shop|store",
             CASE_INSENSITIVE);
 
     private static final IBundle bundle = new CompanyBundle();
@@ -30,4 +30,9 @@ public class CompanyGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -5;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
index 50c981a1..4f879a79 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/CountryGenerator.java
@@ -16,7 +16,7 @@
  */
 public class CountryGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("country", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("country|citizen", CASE_INSENSITIVE);
 
     private static final IBundle bundle = new CountryBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
index e394f089..de3252d3 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DescriptionGenerator.java
@@ -30,4 +30,9 @@ public class DescriptionGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
index fbefa8d8..d4dade33 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
@@ -16,7 +16,7 @@
  */
 public class DocumentGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("pass(word)?|org|project", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("pass(word)?|project", CASE_INSENSITIVE);
 
     private final IGenerator<Character> prefixGenerator = new CharacterGenerator();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
index 6ebc6bae..714294da 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
@@ -32,4 +32,9 @@ public String generate() {
     public @Nullable Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
index 533811a4..e037214d 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FormatGenerator.java
@@ -29,4 +29,9 @@ public class FormatGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -60;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
index 28b53ebd..3945fc21 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/IdGenerator.java
@@ -13,7 +13,7 @@
  */
 public class IdGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("[ug]?u?id|[Ii]d");
+    private final Pattern pattern = Pattern.compile("[UuGg]?[Uu]?[Ii]d$|^[UuGg]?[Uu]?[Ii]d");
 
     @Override
     public @NotNull String generate() {
diff --git a/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
index cf5a773a..3dcd667c 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/JobGenerator.java
@@ -16,7 +16,7 @@
  */
 public class JobGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("job|work|position", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("qualification|job|work|position", CASE_INSENSITIVE);
 
     private static final IBundle bundle = new JobBundle();
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
index 657d76ec..48e9b196 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/NounGenerator.java
@@ -17,7 +17,8 @@
 public class NounGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern.compile(
-            "commission|education|subj(ect)?|program|word|noun|field|data(base)?|schema|collection|class", CASE_INSENSITIVE);
+            "record|commission|education|subj(ect)?|program|word|noun|field|data(base)?|schema|collection|class",
+            CASE_INSENSITIVE);
 
     private static final IBundle bundle = new NounBundle();
 
@@ -30,4 +31,9 @@ public class NounGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -10;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
index 5868fb35..bbbf0e81 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/PhoneGenerator.java
@@ -31,4 +31,9 @@ public class PhoneGenerator implements IGenerator<String> {
     public @NotNull Pattern pattern() {
         return pattern;
     }
+
+    @Override
+    public int order() {
+        return -65;
+    }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
index 94dedd39..2ea03c00 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/ProductGenerator.java
@@ -18,7 +18,9 @@
 public class ProductGenerator implements IGenerator<String> {
 
     private final Pattern pattern = Pattern
-            .compile("association|administrative|academy|university|org(anization)?|product|good|supply|topic", CASE_INSENSITIVE);
+            .compile("association|administrative|academy?|university|org(anization)?|product|good|supply|topic",
+                    CASE_INSENSITIVE);
+
     private static final IBundle bundle = new ProductBundle();
 
     @Nullable

From f9a9400f603a39b814961a508126629e7a58402a Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 02:55:11 +0300
Subject: [PATCH 10/15] [3.1.0-SNAPSHOT] GenSupplier#getSuitableGenerator
 improved and optimized GenSupplier#classifiersClasses as optimization for
 precompute classes from package scan FuzzyWuzzy search removed as redundant

---
 build.gradle                                  |  3 +-
 .../dummymaker/factory/impl/GenSupplier.java  | 87 +++++++++----------
 2 files changed, 44 insertions(+), 46 deletions(-)

diff --git a/build.gradle b/build.gradle
index f330b378..0f05cd3d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,6 @@ repositories {
 dependencies {
     implementation "org.jetbrains:annotations:22.0.0"
     implementation "org.slf4j:slf4j-api:1.7.32"
-    implementation "me.xdrop:fuzzywuzzy:1.3.1"
     implementation "javax.inject:javax.inject:1"
 
     testRuntimeOnly "ch.qos.logback:logback-classic:1.2.7"
@@ -46,7 +45,7 @@ dependencies {
 }
 
 test {
-    useJUnitPlatform()
+    useJUnit()
     testLogging {
         events("passed", "skipped", "failed")
         exceptionFormat("full")
diff --git a/src/main/java/io/dummymaker/factory/impl/GenSupplier.java b/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
index 65b502f8..0a0c6c01 100644
--- a/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
+++ b/src/main/java/io/dummymaker/factory/impl/GenSupplier.java
@@ -1,7 +1,6 @@
 package io.dummymaker.factory.impl;
 
 import static io.dummymaker.util.CollectionUtils.getIndexWithSalt;
-import static io.dummymaker.util.CollectionUtils.isEmpty;
 
 import io.dummymaker.factory.IGenSupplier;
 import io.dummymaker.generator.IGenerator;
@@ -12,6 +11,7 @@
 import io.dummymaker.model.Pair;
 import io.dummymaker.scan.impl.ClassScanner;
 import io.dummymaker.util.CastUtils;
+import io.dummymaker.util.CollectionUtils;
 import io.dummymaker.util.GenUtils;
 import java.lang.reflect.Field;
 import java.lang.reflect.Type;
@@ -20,7 +20,6 @@
 import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import me.xdrop.fuzzywuzzy.FuzzySearch;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -34,6 +33,8 @@
  */
 public class GenSupplier implements IGenSupplier {
 
+    private static final String DUMMY_GENERATOR_PACKAGE = "io.dummymaker.generator";
+
     /**
      * Salt used to select always the same generator for specific field
      */
@@ -42,16 +43,14 @@ public class GenSupplier implements IGenSupplier {
     /**
      * Map of classified generators and their target classes
      */
-    private final Map<Class, List<IGenerator>> classifiers;
-
-    public GenSupplier() {
-        this.classifiers = getClassifiedGenerators().entrySet().stream()
-                .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream()
-                        .map(CastUtils::instantiate)
-                        .filter(Objects::nonNull)
-                        .sorted(IGenerator::compareTo)
-                        .collect(Collectors.toList())));
-    }
+    private static final Map<Class, List<Class<? extends IGenerator>>> classifiersClasses = getClassifiedGenerators();
+
+    private final Map<Class, List<IGenerator>> classifiers = classifiersClasses.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().stream()
+                    .map(CastUtils::instantiate)
+                    .filter(Objects::nonNull)
+                    .sorted(IGenerator::compareTo)
+                    .collect(Collectors.toList())));
 
     @Override
     public @NotNull Class<? extends IGenerator> getSuitable(@NotNull Field field) {
@@ -90,22 +89,17 @@ public GenSupplier() {
             return ArrayComplexGenerator.class;
         if (type.isEnum())
             return EnumComplexGenerator.class;
-        if (isEmpty(generators))
+        if (CollectionUtils.isEmpty(generators))
             return getDefault();
 
-        return getSuitableGeneratorClass(fieldName, type).orElseGet(() -> {
-            final Optional<Class<? extends IGenerator>> pluralSuitable = fieldName.endsWith("s")
-                    ? getSuitableGeneratorClass(fieldName.substring(0, fieldName.length() - 1), type)
-                    : Optional.empty();
-
-            return pluralSuitable.orElseGet(() -> {
-                final List<? extends IGenerator> nonJsonGenerators = generators.stream()
-                        .filter(g -> !(g instanceof JsonGenerator))
-                        .collect(Collectors.toList());
+        return getSuitableGeneratorClass(fieldName, type)
+                .orElseGet(() -> {
+                    final List<? extends IGenerator> nonJsonGenerators = generators.stream()
+                            .filter(g -> !(g instanceof JsonGenerator))
+                            .collect(Collectors.toList());
 
-                return getIndexWithSalt(nonJsonGenerators, fieldName + type.getName(), SALT).getClass();
-            });
-        });
+                    return getIndexWithSalt(nonJsonGenerators, fieldName + type.getName(), SALT).getClass();
+                });
     }
 
     /**
@@ -116,35 +110,40 @@ public GenSupplier() {
      * @return suitable pattern generator
      */
     private Optional<Class<? extends IGenerator>> getSuitableGeneratorClass(String fieldName, Class<?> type) {
-        final Stream<IGenerator> allGeneratorStream = classifiers.values().stream().flatMap(List::stream);
-        final Optional<? extends IGenerator> patternSuitable = getSuitableGenerator(fieldName, allGeneratorStream);
-        if (!patternSuitable.isPresent())
+        final Collection<IGenerator> allGenerators = classifiers.values().stream()
+                .flatMap(List::stream)
+                .collect(Collectors.toList());
+
+        final Optional<? extends IGenerator> patternSuitable = getSuitableGenerator(fieldName, allGenerators);
+        if (!patternSuitable.isPresent()) {
             return Optional.empty();
+        }
 
         final Object casted = CastUtils.castObject(patternSuitable.get().generate(), type);
-        if (casted != null)
+        if (casted != null) {
             return Optional.of(patternSuitable.get().getClass());
+        }
 
-        final Stream<IGenerator> typedGeneratorStream = classifiers.get(type).stream();
+        final Collection<IGenerator> typedGeneratorStream = classifiers.get(type);
         return getSuitableGenerator(fieldName, typedGeneratorStream)
                 .map(IGenerator::getClass);
     }
 
     @SuppressWarnings("ConstantConditions")
-    private Optional<IGenerator> getSuitableGenerator(String fieldName, Stream<IGenerator> stream) {
-        return stream.filter(g -> g.pattern() != null)
-                .map(g -> Pair.of(g, g.pattern().matcher(fieldName)))
-                .filter(p -> p.right().find())
-                .sorted(Comparator.comparingInt((Pair<IGenerator, Matcher> p) -> FuzzySearch.ratio(fieldName, p.right().group()))
-                        .reversed())
-                .map(Pair::left)
-                .findFirst();
+    private Optional<IGenerator> getSuitableGenerator(String fieldName, Collection<IGenerator> generators) {
+        return generators.stream()
+                .filter(g -> g.pattern() != null)
+                .filter(g -> {
+                    final Matcher matcher = g.pattern().matcher(fieldName);
+                    return matcher.find();
+                })
+                .min(IGenerator::compareTo);
     }
 
     @SuppressWarnings("unchecked")
-    protected Map<Class, List<Class<? extends IGenerator>>> getClassifiedGenerators() {
-        final String genPackage = "io.dummymaker.generator";
-        final Map<Class, List<Class<? extends IGenerator>>> scannedClasses = new ClassScanner().scan(genPackage).stream()
+    protected static Map<Class, List<Class<? extends IGenerator>>> getClassifiedGenerators() {
+        final ClassScanner scanner = new ClassScanner();
+        final Map<Class, List<Class<? extends IGenerator>>> scannedClasses = scanner.scan(DUMMY_GENERATOR_PACKAGE).stream()
                 .filter(IGenerator.class::isAssignableFrom)
                 .filter(c -> !c.isInterface())
                 .filter(c -> !c.isAnonymousClass())
@@ -160,7 +159,7 @@ protected Map<Class, List<Class<? extends IGenerator>>> getClassifiedGenerators(
         return setPrimitiveClassifiers(scannedClasses);
     }
 
-    protected Map<Class, List<Class<? extends IGenerator>>> setPrimitiveClassifiers(Map<Class, List<Class<? extends IGenerator>>> classifiers) {
+    protected static Map<Class, List<Class<? extends IGenerator>>> setPrimitiveClassifiers(Map<Class, List<Class<? extends IGenerator>>> classifiers) {
         classifiers.put(boolean.class, classifiers.get(Boolean.class));
         classifiers.put(byte.class, classifiers.get(Byte.class));
         classifiers.put(short.class, classifiers.get(Short.class));
@@ -174,7 +173,7 @@ protected Map<Class, List<Class<? extends IGenerator>>> setPrimitiveClassifiers(
         return classifiers;
     }
 
-    private List<Class> getGeneratorType(Class<?> generator) {
+    private static List<Class> getGeneratorType(Class<?> generator) {
         if (Object.class.equals(generator) || !IGenerator.class.isAssignableFrom(generator))
             return Collections.emptyList();
 
@@ -190,7 +189,7 @@ private List<Class> getGeneratorType(Class<?> generator) {
                 .orElseGet(() -> Arrays.asList(Object.class));
     }
 
-    protected List<Class> getSpecialGeneratorTypes(Class<?> generator) {
+    protected static List<Class> getSpecialGeneratorTypes(Class<?> generator) {
         if (generator.equals(ListComplexGenerator.class)) {
             return Arrays.asList(List.class, LinkedList.class, ArrayList.class, CopyOnWriteArrayList.class);
         } else if (generator.equals(SetComplexGenerator.class)) {

From 088059ca64adf898b3894a5e027de268888a8b55 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 12:17:45 +0300
Subject: [PATCH 11/15] [3.1.0-SNAPSHOT] FileGenerator pattern improved

---
 .../io/dummymaker/generator/simple/string/FileGenerator.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
index 714294da..61189fb8 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/FileGenerator.java
@@ -17,7 +17,7 @@
  */
 public class FileGenerator implements IGenerator<String> {
 
-    private final Pattern pattern = Pattern.compile("file|doc(ument)?", CASE_INSENSITIVE);
+    private final Pattern pattern = Pattern.compile("file|docum(ent)?", CASE_INSENSITIVE);
 
     private static final IBundle extensions = new ExtensionBundle();
     private static final IBundle names = new NounBundle();

From cc3e311e3a981b4f1280e4ff8248214a2befadb4 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 12:43:38 +0300
Subject: [PATCH 12/15] [3.1.0-SNAPSHOT] CollectionUtils#random simplified

---
 .../io/dummymaker/util/CollectionUtils.java   | 39 ++++++++++++++-----
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/dummymaker/util/CollectionUtils.java b/src/main/java/io/dummymaker/util/CollectionUtils.java
index dd177d5c..029b208e 100644
--- a/src/main/java/io/dummymaker/util/CollectionUtils.java
+++ b/src/main/java/io/dummymaker/util/CollectionUtils.java
@@ -99,21 +99,38 @@ public static <T> T random(@NotNull Collection<T> collection) {
         }
     }
 
+    /**
+     * @param max to get (excluded)
+     * @return random from 0 to max (excluded)
+     */
     public static int random(int max) {
-        return random(0, max);
+        return (int) generateRandom(0, max);
     }
 
     /**
-     * @param min to get (inclusive)
-     * @param max to get (exclusive)
+     * @param max to get (excluded)
+     * @return random from 0 to max (excluded)
+     */
+    public static long random(long max) {
+        return generateRandom(0, max);
+    }
+
+    /**
+     * @param from to get (inclusive)
+     * @param to   to get (inclusive)
      * @return random from min (included) to max (excluded)
      */
-    public static int random(int min, int max) {
-        return ((int) random(min, ((long) max)));
+    public static int random(int from, int to) {
+        return (int) generateRandom(from, ((long) to) + 1);
     }
 
-    public static long random(long max) {
-        return random(0, max);
+    /**
+     * @param from to get (inclusive)
+     * @param to   to get (inclusive)
+     * @return random from min (included) to max (excluded)
+     */
+    public static long random(long from, long to) {
+        return generateRandom(from, to + 1);
     }
 
     /**
@@ -121,10 +138,12 @@ public static long random(long max) {
      * @param max to get (exclusive)
      * @return random from min (included) to max (excluded)
      */
-    public static long random(long min, long max) {
+    private static long generateRandom(long min, long max) {
         final long usedMin = (min < 1) ? 0 : min;
-        final long usedMax = (max < 1) ? 0 : max;
+        final long usedMax = (max < 1) ? 1 : max;
 
-        return (usedMin >= usedMax) ? usedMin : ThreadLocalRandom.current().nextLong(usedMin, usedMax);
+        return (usedMin >= usedMax)
+                ? usedMin
+                : ThreadLocalRandom.current().nextLong(usedMin, usedMax);
     }
 }

From adc83839553bca0937f10d1f780801954fde266e Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 12:48:33 +0300
Subject: [PATCH 13/15] [3.1.0] README.md updated Release 3.1.0 prepared

---
 README.md         | 37 ++-----------------------------------
 gradle.properties |  2 +-
 2 files changed, 3 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 19051a5e..d56a0178 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Documentation for **versions 1.X.X** in [this document](/README-VERSION-1.X.md).
 **Gradle**
 ```groovy
 dependencies {
-    compile 'com.github.goodforgod:dummymaker:3.0.2'
+    implementation 'com.github.goodforgod:dummymaker:3.1.0'
 }
 ```
 
@@ -27,7 +27,7 @@ dependencies {
 <dependency>
     <groupId>com.github.goodforgod</groupId>
     <artifactId>dummymaker</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.0</version>
 </dependency>
 ```
 
@@ -459,39 +459,6 @@ public @interface GenInteger {
 In case you want custom annotation for simple generator you can do it as well, 
 just use *@PrimeGen* instead of *@ComplexGen* to mark your annotation.
 
-
-## Version History
-
-**3.0.2** - OSX ResourceScanner path fixed, dependencies updated.
-
-**3.0.1** - Minor bug fixes.
-
-**3.0.0** - Exporters redesigned, Factory export huge amount of dummies contracts added, generators improved, matching for generators improved.
-
-**2.2.0** - More generators, improved pattern matching, Javax CDI annotations added.
-
-**2.1.0** - Lambda generator *GenRule* configuration added, some default generators added, minor improvements.
-
-**2.0.2** - @GenTime export formatter added and export as unix time, SqlExporter fixed issue with INSERT queries.
-
-**2.0.0** - Redesign factory and contracts, improved complex and other generators, GenRules added for configuration without annotations, @Ignore annotation, @GenEnum enum generation, minor improvements and more.
-
-**1.1.3** - Embedded objects in arrays, collections full support, collections\arrays embedded depth support, Json & SQL exporters arrays & collections support.
-
-**1.1.2** - Full primitive support, single or two dimension array support, jsonExporter collection, map, array support.
-
-**1.1.1** - Factory performance improvements (about 40%), *GenAuto* annotation, *IComplexGenerator* the successor of *IGenerateFactory*, primitive support, Embedded multi level depth support, bug fixes.
-
-**1.1.0** - Performance and architecture improvements, *IGenerateFactory* introduced, collection *Gen* annotations, time *Gen* annotations, Embedded *Gen* support, architecture improvements in custom user extension support.
-
-**1.0.3** - Lots of tests for all functionality, Added *DataTypeMap* parameter for users in SqlExporter (expandable data type for sql), *NamingStrategy* for exporters, bug fixes.
-
-**1.0.2** - Added special *GenRenameExport* annotation, export as single string, export values order fix, minor fixes and improvements.
-
-**1.0.1** - Added new generator and annotations, special *GenEnumerate* annotation, other minor fixes (Like SQL export).
-
-**1.0.0** - Initial project with core functions.
-
 ## License
 
 This project licensed under the MIT - see the [LICENSE](LICENSE) file for details.
diff --git a/gradle.properties b/gradle.properties
index 7f33e7a4..d75ef8a5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 groupId=com.github.goodforgod
 artifactId=dummymaker
-artifactVersion=3.1.0-SNAPSHOT
+artifactVersion=3.1.0
 
 
 ##### GRADLE #####

From 469e8f40f48dd4b4d84544cc8c55a077638d8cb0 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 12:56:33 +0300
Subject: [PATCH 14/15] [3.1.0] ThreadLocal replaced with CollectionUtil#random

---
 .../generator/simple/string/DocumentGenerator.java         | 7 ++++---
 .../generator/simple/string/HexDataGenerator.java          | 6 +++---
 .../dummymaker/generator/simple/string/UriGenerator.java   | 6 +++---
 .../generator/simple/time/OffsetDateTimeGenerator.java     | 4 ++--
 .../generator/simple/time/OffsetTimeGenerator.java         | 4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
index d4dade33..a44ab18e 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/DocumentGenerator.java
@@ -1,10 +1,11 @@
 package io.dummymaker.generator.simple.string;
 
-import static java.util.concurrent.ThreadLocalRandom.current;
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
 import io.dummymaker.generator.IGenerator;
 import io.dummymaker.generator.simple.number.CharacterGenerator;
+import io.dummymaker.util.CollectionUtils;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
 import org.jetbrains.annotations.NotNull;
 
@@ -22,8 +23,8 @@ public class DocumentGenerator implements IGenerator<String> {
 
     @Override
     public @NotNull String generate() {
-        final int id = current().nextInt(10_000_000, 999_999_999);
-        return current().nextBoolean()
+        final int id = CollectionUtils.random(10_000_000, 999_999_999);
+        return ThreadLocalRandom.current().nextBoolean()
                 ? prefixGenerator.generate() + String.valueOf(id)
                 : String.valueOf(id);
     }
diff --git a/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java
index 35e1006f..2047a32a 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/HexDataGenerator.java
@@ -2,8 +2,8 @@
 
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
+import io.dummymaker.util.CollectionUtils;
 import java.util.UUID;
-import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
 import org.jetbrains.annotations.NotNull;
 
@@ -20,9 +20,9 @@ public class HexDataGenerator extends IdBigGenerator {
     @Override
     public @NotNull String generate() {
         final StringBuilder builder = new StringBuilder();
-        final int total = ThreadLocalRandom.current().nextInt(1, 5);
+        final int total = CollectionUtils.random(1, 5);
         for (int i = 0; i < total; i++)
-            builder.append(UUID.randomUUID().toString());
+            builder.append(UUID.randomUUID());
         return builder.toString().replace("-", "");
     }
 
diff --git a/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java b/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java
index 1a2366ef..f39cd696 100644
--- a/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/string/UriGenerator.java
@@ -2,7 +2,7 @@
 
 import static java.util.regex.Pattern.CASE_INSENSITIVE;
 
-import java.util.concurrent.ThreadLocalRandom;
+import io.dummymaker.util.CollectionUtils;
 import java.util.regex.Pattern;
 import org.jetbrains.annotations.NotNull;
 
@@ -18,8 +18,8 @@ public class UriGenerator extends NounGenerator {
 
     @Override
     public @NotNull String generate() {
-        final StringBuilder builder = new StringBuilder("");
-        final int total = ThreadLocalRandom.current().nextInt(1, 5);
+        final StringBuilder builder = new StringBuilder();
+        final int total = CollectionUtils.random(1, 5);
         for (int i = 0; i < total; i++)
             builder.append("/").append(super.generate());
 
diff --git a/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java
index c769246b..155bae47 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/OffsetDateTimeGenerator.java
@@ -2,9 +2,9 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
+import io.dummymaker.util.CollectionUtils;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.util.concurrent.ThreadLocalRandom;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -25,7 +25,7 @@ public class OffsetDateTimeGenerator implements ITimeGenerator<OffsetDateTime> {
 
     @Override
     public @NotNull OffsetDateTime generate(final long minUnix, final long maxUnix) {
-        final ZoneOffset zoneOffset = ZoneOffset.ofHours(ThreadLocalRandom.current().nextInt(-18, 18));
+        final ZoneOffset zoneOffset = ZoneOffset.ofHours(CollectionUtils.random(-18, 18));
         return OffsetDateTime.of(generator.generate(), zoneOffset);
     }
 }
diff --git a/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java b/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java
index da0cd147..c9172f58 100644
--- a/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java
+++ b/src/main/java/io/dummymaker/generator/simple/time/OffsetTimeGenerator.java
@@ -2,9 +2,9 @@
 
 import io.dummymaker.annotation.complex.GenTime;
 import io.dummymaker.generator.ITimeGenerator;
+import io.dummymaker.util.CollectionUtils;
 import java.time.OffsetTime;
 import java.time.ZoneOffset;
-import java.util.concurrent.ThreadLocalRandom;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -25,7 +25,7 @@ public class OffsetTimeGenerator implements ITimeGenerator<OffsetTime> {
 
     @Override
     public @NotNull OffsetTime generate(final long minUnix, final long maxUnix) {
-        final ZoneOffset zoneOffset = ZoneOffset.ofHours(ThreadLocalRandom.current().nextInt(-18, 18));
+        final ZoneOffset zoneOffset = ZoneOffset.ofHours(CollectionUtils.random(-18, 18));
         return OffsetTime.of(generator.generate(minUnix, maxUnix), zoneOffset);
     }
 }

From 4e4d79fb509a7b371d84ef8649dd1abcbed3cba8 Mon Sep 17 00:00:00 2001
From: Anton Kurako <goodforgod.dev@gmail.com>
Date: Sun, 5 Dec 2021 13:06:22 +0300
Subject: [PATCH 15/15] [3.1.0] DummyTime OFFSET pattern improved with Z offset
 check

---
 src/test/java/io/dummymaker/model/DummyTime.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/dummymaker/model/DummyTime.java b/src/test/java/io/dummymaker/model/DummyTime.java
index b42efe0e..04288d9a 100644
--- a/src/test/java/io/dummymaker/model/DummyTime.java
+++ b/src/test/java/io/dummymaker/model/DummyTime.java
@@ -20,7 +20,7 @@ public class DummyTime {
     public static final String ISO_DATE_PATTERN = "[1-9][0-9]{3}-[0-9]{2}-[0-9]{2}";
     public static final String ISO_DATE_TIME_PATTERN = ISO_DATE_PATTERN + "T" + ISO_TIME_PATTERN;
 
-    public static final String ISO_OFFSET_TIME_PATTERN = "[0-9]{2}:[0-9]{2}:[0-9]{2}(\\.[0-9]{0,3})?[+-]\\d\\d:\\d\\d";
+    public static final String ISO_OFFSET_TIME_PATTERN = "[0-9]{2}:[0-9]{2}:[0-9]{2}(\\.[0-9]{0,3})?(([+-][0-9]{2}:[0-9]{2})|Z)";
     public static final String ISO_OFFSET_DATE_TIME_PATTERN = ISO_DATE_PATTERN + "T" + ISO_OFFSET_TIME_PATTERN;
 
     public enum Patterns {