Skip to content
This repository was archived by the owner on Jan 24, 2023. It is now read-only.

Commit 1ddcab1

Browse files
ftgibranftgibran
committed
feat: Added Simpli packages to Maven
1 parent 6a1509a commit 1ddcab1

21 files changed

Lines changed: 153 additions & 109 deletions

File tree

‎packages/@simpli/cli-server/generator/index.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ module.exports = (api, options) => {
3737
// Exception
3838
api.renderFrom('./injected', 'src/main/exception/HttpException.kt', `../java/${dir}/exception/HttpException.kt`)
3939

40+
// Lang
41+
api.renderFrom('./injected', 'src/main/lang/EnUs.kt', `../java/${dir}/lang/EnUs.kt`)
42+
api.renderFrom('./injected', 'src/main/lang/PtBr.kt', `../java/${dir}/lang/PtBr.kt`)
43+
4044
// Test
4145
api.renderFrom('./injected', 'src/test/module/process/LoginServiceTest.kt', `../../java/${dir}/${moduleName}/process/LoginServiceTest.kt`)
4246
api.renderFrom('./injected', 'src/test/OtherTest.kt', `./java/${dir}/OtherTest.kt`)

‎packages/@simpli/cli-server/generator/injected/src/main/AppMail.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<%_ var serverName = options.serverSetup.serverName _%>
44
package <%-packageAddress%>
55

6-
import com.simpli.model.LanguageHolder
6+
import br.com.simpli.model.LanguageHolder
77
import com.amazonaws.regions.Regions
8-
import com.simpli.ws.AWSSendEmailRequest
8+
import br.com.simpli.ws.AWSSendEmailRequest
99

1010
import java.util.HashMap
1111

‎packages/@simpli/cli-server/generator/injected/src/main/RouterWrapper.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
package <%-packageAddress%>
55

66
import <%-packageAddress%>.<%-moduleName%>.AuthPipe
7-
import com.simpli.model.LanguageHolder
8-
import com.simpli.model.EnglishLanguage
9-
import com.simpli.model.PortugueseLanguage
10-
import com.simpli.model.RespException
11-
import com.simpli.sql.TransactionPipe
7+
import <%-packageAddress%>.lang.EnUs
8+
import <%-packageAddress%>.lang.PtBr
9+
import br.com.simpli.model.LanguageHolder
10+
import br.com.simpli.model.RespException
11+
import br.com.simpli.sql.TransactionPipe
1212
import java.util.*
1313
import java.util.logging.Level
1414
import java.util.logging.Logger
@@ -26,13 +26,13 @@ open class RouterWrapper : ExceptionMapper<Throwable> {
2626

2727
protected val langs: HashMap<String, LanguageHolder> = object : HashMap<String, LanguageHolder>() {
2828
init {
29-
put("en-US", EnglishLanguage())
30-
put("pt-BR", PortugueseLanguage())
29+
put("en-US", EnUs())
30+
put("pt-BR", PtBr())
3131
}
3232
}
3333

3434
fun getLang(lang: String = "en-US"): LanguageHolder {
35-
return langs[lang] ?: EnglishLanguage()
35+
return langs[lang] ?: EnUs()
3636
}
3737

3838
override fun toResponse(e: Throwable): Response {

‎packages/@simpli/cli-server/generator/injected/src/main/dao/LoginServiceDao.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package <%-packageAddress%>.dao
66

77
import <%-packageAddress%>.model.<%-userTable.modelName%>
8-
import com.simpli.model.LanguageHolder
9-
import com.simpli.sql.Dao
8+
import br.com.simpli.model.LanguageHolder
9+
import br.com.simpli.sql.Dao
1010
import java.sql.Connection
1111

1212
/**

‎packages/@simpli/cli-server/generator/injected/src/main/dao/TemplateDao.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ import com.google.common.base.Strings
77
import java.sql.Connection
88
import java.util.ArrayList
99
import java.util.HashMap
10-
import com.simpli.model.LanguageHolder
11-
import com.simpli.sql.Dao
10+
import br.com.simpli.model.LanguageHolder
11+
import br.com.simpli.sql.Dao
1212
<%_ } else { _%>
1313
<%_ for (var i in table.foreignColumns) { var column = table.foreignColumns[i] _%>
1414
import <%-packageAddress%>.model.<%-column.foreign.referencedTableModelName%>
1515
<%_ } _%>
16-
import com.simpli.model.LanguageHolder
17-
import com.simpli.sql.Dao
16+
import br.com.simpli.model.LanguageHolder
17+
import br.com.simpli.sql.Dao
1818
import java.sql.Connection
1919
<%_ } _%>
2020

‎packages/@simpli/cli-server/generator/injected/src/main/lang/EnUs.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<%_ var packageAddress = options.serverSetup.packageAddress _%>
2+
package <%-packageAddress%>.lang
3+
4+
import br.com.simpli.model.EnglishLanguage
5+
6+
class EnUs : EnglishLanguage() {
7+
8+
init {
9+
dictionary = hashMapOf(
10+
"sample_message" to "Sample Message"
11+
)
12+
}
13+
}

‎packages/@simpli/cli-server/generator/injected/src/main/lang/PtBr.kt‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<%_ var packageAddress = options.serverSetup.packageAddress _%>
2+
package <%-packageAddress%>.lang
3+
4+
import br.com.simpli.model.PortugueseLanguage
5+
6+
class PtBr : PortugueseLanguage() {
7+
8+
init {
9+
dictionary = hashMapOf(
10+
"sample_message" to "Mensagem de exemplo"
11+
)
12+
}
13+
}

‎packages/@simpli/cli-server/generator/injected/src/main/model/Template.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import io.swagger.annotations.ApiModel
55
import io.swagger.annotations.ApiModelProperty
66
import java.sql.SQLException
77
import java.util.Date
8-
import com.simpli.model.LanguageHolder
9-
import com.simpli.model.RespException
10-
import com.simpli.sql.*
8+
import br.com.simpli.model.LanguageHolder
9+
import br.com.simpli.model.RespException
10+
import br.com.simpli.sql.*
1111
import java.sql.ResultSet
12-
import com.simpli.tools.Validator
12+
import br.com.simpli.tools.Validator
1313
import <%-packageAddress%>.exception.HttpException
1414
import javax.ws.rs.core.Response
1515

‎packages/@simpli/cli-server/generator/injected/src/main/module/AuthPipe.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ package <%-packageAddress%>.<%-moduleName%>
55

66
import <%-packageAddress%>.<%-moduleName%>.process.LoginService
77
import com.google.common.base.Strings
8-
import com.simpli.model.LanguageHolder
9-
import com.simpli.sql.TransactionPipe
8+
import br.com.simpli.model.LanguageHolder
9+
import br.com.simpli.sql.TransactionPipe
1010
import java.sql.Connection
1111
import java.util.logging.Level
1212
import java.util.logging.Logger
1313
import java.util.regex.Pattern
1414

1515
class AuthPipe(val transactionPipe: TransactionPipe) {
1616

17-
fun <T> handle(authorization: String, lang: LanguageHolder, clientVersion:String, c: (con: Connection, loginHolder: LoginService.LoginHolderWithId) -> T): T {
17+
fun <T> handle(authorization: String, lang: LanguageHolder, clientVersion:String, c: (con: Connection, loginHolder: LoginService.LoginInfo) -> T): T {
1818
var result: T? = null
1919

2020
transactionPipe.handle { con ->
@@ -26,7 +26,7 @@ class AuthPipe(val transactionPipe: TransactionPipe) {
2626
"""
2727
Following Exception occured with user
2828
id: ${auth.id};
29-
email: ${auth.loginHolder.<%-accountColumn.name%>};
29+
email: ${auth.loginSerialized.<%-accountColumn.name%>};
3030
clientVersion: ${clientVersion}
3131
""")
3232
throw e

‎packages/@simpli/cli-server/generator/injected/src/main/module/Router.kt‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package <%-packageAddress%>.<%-moduleName%>
88

99
import <%-packageAddress%>.RouterWrapper
10-
import com.simpli.model.PagedResp
10+
import br.com.simpli.model.PagedResp
1111
import javax.ws.rs.GET
1212
import javax.ws.rs.POST
1313
import javax.ws.rs.DELETE
@@ -22,7 +22,7 @@ import io.swagger.annotations.ApiOperation
2222
import io.swagger.annotations.ApiParam
2323

2424
import <%-packageAddress%>.<%-moduleName%>.process.LoginService
25-
import <%-packageAddress%>.<%-moduleName%>.process.LoginService.LoginHolder
25+
import <%-packageAddress%>.<%-moduleName%>.process.LoginService.LoginSerialized
2626
import <%-packageAddress%>.<%-moduleName%>.response.LoginResp
2727
<%_ for (var i in commonTables) { var table = commonTables[i] _%>
2828
import <%-packageAddress%>.<%-moduleName%>.process.<%-table.modelName%>Process
@@ -67,7 +67,7 @@ class Router : RouterWrapper() {
6767
clientVersion: String,
6868

6969
@ApiParam(required = true)
70-
body: LoginHolder
70+
body: LoginSerialized
7171
): LoginResp {
7272
//TODO: review generated method
7373
return transacPipe.handle { con ->
@@ -85,7 +85,7 @@ class Router : RouterWrapper() {
8585
@HeaderParam("X-Client-Version") @ApiParam(required = true, example = "w1.1.0")
8686
clientVersion: String,
8787

88-
body: LoginHolder
88+
body: LoginSerialized
8989
): Long {
9090
return transacPipe.handle { con ->
9191
LoginService(con, getLang(lang), clientVersion)
@@ -102,7 +102,7 @@ class Router : RouterWrapper() {
102102
@HeaderParam("X-Client-Version") @ApiParam(required = true, example = "w1.1.0")
103103
clientVersion: String,
104104

105-
body: LoginHolder
105+
body: LoginSerialized
106106
): String? {
107107
return transacPipe.handle { con ->
108108
LoginService(con, getLang(lang), clientVersion)
@@ -130,10 +130,10 @@ class Router : RouterWrapper() {
130130
authorization: String
131131
): <%-table.modelName%>Resp {
132132
//TODO: review generated method
133-
return authPipe.handle(authorization, getLang(lang), clientVersion, {
134-
con, loginHolder -> <%-table.modelName%>Process(con, getLang(lang), loginHolder)
133+
return authPipe.handle(authorization, getLang(lang), clientVersion) {
134+
con, loginInfo -> <%-table.modelName%>Process(con, getLang(lang))
135135
.getOne(<%-table.primariesByComma()%>)
136-
})
136+
}
137137
}
138138

139139
@GET
@@ -159,10 +159,10 @@ class Router : RouterWrapper() {
159159
asc: Boolean?
160160
): PagedResp<<%-table.modelName%>> {
161161
//TODO: review generated method
162-
return authPipe.handle(authorization, getLang(lang), clientVersion, {
163-
con, loginHolder -> <%-table.modelName%>Process(con, getLang(lang), loginHolder)
162+
return authPipe.handle(authorization, getLang(lang), clientVersion) {
163+
con, loginInfo -> <%-table.modelName%>Process(con, getLang(lang))
164164
.list(query, page, limit, orderRequest, asc != null && asc)
165-
})
165+
}
166166
}
167167

168168
<%_ if (table.hasPersist) { _%>
@@ -181,10 +181,10 @@ class Router : RouterWrapper() {
181181
<%-table.instanceName%>: <%-table.modelName%>
182182
): Long {
183183
//TODO: review generated method
184-
return authPipe.handle(authorization, getLang(lang), clientVersion, {
185-
con, loginHolder -> <%-table.modelName%>Process(con, getLang(lang), loginHolder)
184+
return authPipe.handle(authorization, getLang(lang), clientVersion) {
185+
con, loginInfo -> <%-table.modelName%>Process(con, getLang(lang))
186186
.persist(<%-table.instanceName%>)
187-
})
187+
}
188188
}
189189

190190
<%_ } _%>
@@ -207,10 +207,10 @@ class Router : RouterWrapper() {
207207
authorization: String
208208
): Any? {
209209
//TODO: review generated method
210-
return authPipe.handle(authorization, getLang(lang), clientVersion, {
211-
con, loginHolder -> <%-table.modelName%>Process(con, getLang(lang), loginHolder)
210+
return authPipe.handle(authorization, getLang(lang), clientVersion) {
211+
con, loginInfo -> <%-table.modelName%>Process(con, getLang(lang))
212212
.remove(<%-table.primariesByComma()%>)
213-
})
213+
}
214214
}
215215

216216
<%_ } _%>

0 commit comments

Comments
 (0)