Merge branch 'dev' of https://github.com/darkredz/Zeko-Data-Mapper

darkredz · Dec 22, 2019 · 2cfca8c · 2cfca8c
2 parents 18e78c7 + 182fdd3
commit 2cfca8c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/examples/zeko-vertx-query/pom.xml b/examples/zeko-vertx-query/pom.xml
@@ -127,7 +127,7 @@
         <dependency>
             <groupId>com.zeko.model</groupId>
             <artifactId>data-mapper</artifactId>
-            <version>1.3</version>
+            <version>1.4.1</version>
         </dependency>
         <!--<dependency>-->
             <!--<groupId>com.zeko.model</groupId>-->
@@ -210,7 +210,7 @@
                 </executions>
 
                 <configuration>
-                    <redeploy>true</redeploy>
+                    <redeploy>false</redeploy>
                 </configuration>
             </plugin>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.zeko.model</groupId>
     <artifactId>data-mapper</artifactId>
-    <version>1.4</version>
+    <version>1.4.1</version>
     <packaging>jar</packaging>
 
     <name>com.zeko.model data-mapper</name>
@@ -189,6 +189,7 @@
                     <includes><include>**/*</include></includes>
                     <repositoryName>Zeko-Data-Mapper</repositoryName>      <!-- github repo name -->
                     <repositoryOwner>darkredz</repositoryOwner>    <!-- github username  -->
+                    <oauth2Token></oauth2Token>
                 </configuration>
                 <executions>
                     <!-- run site-maven-plugin's 'site' target as part of the build's normal 'deploy' phase -->

diff --git a/src/main/kotlin/com.zeko.model/DataMapper.kt b/src/main/kotlin/com.zeko.model/DataMapper.kt
@@ -389,6 +389,11 @@ open class DataMapper {
         return toAdd2
     }
 
+
+    open fun mapStruct(mapConf: MapperConfig, arr: List<Any>, delimiter: String = "-"): ArrayList<Any> {
+        return mapStruct(mapConf.toTableInfo(), arr)
+    }
+
     open fun mapStruct(allTableInfo: LinkedHashMap<String, TableInfo>, arr: List<Any>, delimiter: String = "-"): ArrayList<Any> {
         if (arr.size == 0) {
             return arrayListOf()

diff --git a/src/main/kotlin/com.zeko.model/MapperConfig.kt b/src/main/kotlin/com.zeko.model/MapperConfig.kt
@@ -122,13 +122,18 @@ class MapperConfig(defaultPrimaryKey: String, autoRemoveLinkKey: Boolean) {
         return this
     }
 
-
     fun moveUnder(fieldName: String): MapperConfig {
         val table = this.currentTable()
         table.move_under = fieldName
         return this
     }
 
+    fun mapTo(mapClass: Class<*>): MapperConfig {
+        val table = this.currentTable()
+        table.mapClass = mapClass
+        return this
+    }
+
     fun toArrayMap(): LinkedHashMap<String, TableInfo> {
         this.tableInfo = this.sortTableInfo(this.tableInfo)
         return this.tableInfo
@@ -138,7 +143,7 @@ class MapperConfig(defaultPrimaryKey: String, autoRemoveLinkKey: Boolean) {
         this.tableInfo = this.sortTableInfo(this.tableInfo)
         return this.tableInfo
     }
-    
+
     fun sortTableInfo(tables: LinkedHashMap<String, TableInfo>): LinkedHashMap<String, TableInfo> {
         val tableList = tables.keys.asIterable()
         val firstTable = tableList.first()
@@ -173,4 +178,4 @@ class MapperConfig(defaultPrimaryKey: String, autoRemoveLinkKey: Boolean) {
         }
         return tables
     }
-}
+}