alex/Gaea
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix typo nullable issue

Browse Source
This commit is contained in:
alex
2022-07-19 15:31:48 +08:00
parent c4ff209d72
commit 072c48f888
9 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gaea.app/build.gradle
View File

@@ -15,7 +15,7 @@ dependencies {
api group: 'net.sf.dozer', name: 'dozer', version: '5.5.1'
api group: 'org.apache.poi', name: 'poi-ooxml', version: '5.0.0'
api group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
api group: 'com.google.guava', name: 'guava', version: '30.1.1-jre'
api group: 'com.google.guava', name: 'guava', version: '31.1-jre'
api group: 'com.auth0', name: 'java-jwt', version: '3.14.0'
}

2
src/gaea.app/src/main/kotlin/com/synebula/gaea/app/Application.kt
View File

@@ -22,7 +22,7 @@ open class Application<TCommand : ICommand, TView, TKey>(
override var clazz: Class<TView>,
override var service: IService<TKey>,
override var query: IQuery,
override var logger: ILogger?
override var logger: ILogger,
) : ICommandApp<TCommand, TKey>, IQueryApp<TView, TKey> {
@Resource

16
src/gaea.app/src/main/kotlin/com/synebula/gaea/app/IApplication.kt
View File

@@ -16,7 +16,7 @@ interface IApplication {
/**
* 日志组件
*/
var logger: ILogger?
var logger: ILogger
/**
@@ -26,11 +26,11 @@ interface IApplication {
val msg = HttpMessage()
try {
process(msg)
logger?.debug(this, "$name business execute success")
logger.debug(this, "$name business execute success")
} catch (ex: Exception) {
msg.status = Status.Error
msg.message = if (error.isEmpty()) ex.message ?: "" else "$error: ${ex.message}"
logger?.error(this, ex, "[$name]$error: ${ex.message}")
logger.error(this, ex, "[$name]$error: ${ex.message}")
}
return msg
}
@@ -42,9 +42,9 @@ interface IApplication {
val msg = HttpMessage()
try {
process(msg)
logger?.debug(this, "$name business execute success")
logger.debug(this, "$name business execute success")
} catch (ex: Exception) {
logger?.error(this, ex, "[$name]$error。异常消息将抛出！: ${ex.message}")
logger.error(this, ex, "[$name]$error。异常消息将抛出！: ${ex.message}")
throw RuntimeException(error, ex)
}
return msg
@@ -59,12 +59,12 @@ interface IApplication {
val authentication = SecurityContextHolder.getContext().authentication.principal.toString()
try {
val gson = Gson()
return gson.fromJson<T>(authentication, clazz)
return gson.fromJson(authentication, clazz)
} catch (ex: Exception) {
logger?.error(this, ex, "[$name]解析用户信息异常！用户信息：$authentication: ${ex.message}")
logger.error(this, ex, "[$name]解析用户信息异常！用户信息：$authentication: ${ex.message}")
}
} catch (ex: Exception) {
logger?.error(this, ex, "[$name]获取用户信息异常！${ex.message}")
logger.error(this, ex, "[$name]获取用户信息异常！${ex.message}")
}
return null
}

2
src/gaea.app/src/main/kotlin/com/synebula/gaea/app/LazyApplication.kt
View File

@@ -22,7 +22,7 @@ open class LazyApplication<TRoot : IAggregateRoot<TKey>, TKey>(
override var clazz: Class<TRoot>, //view class type
override var service: ILazyService<TRoot, TKey>,
override var query: IQuery,
override var logger: ILogger?
override var logger: ILogger,
) : ILazyCommandApp<TRoot, TKey>, IQueryApp<TRoot, TKey> {
@Resource

2
src/gaea.app/src/main/kotlin/com/synebula/gaea/app/cmd/CommandApp.kt
View File

@@ -16,7 +16,7 @@ import javax.annotation.Resource
open class CommandApp<TCommand : ICommand, TKey>(
override var name: String,
override var service: IService<TKey>,
override var logger: ILogger?
override var logger: ILogger,
) : ICommandApp<TCommand, TKey> {
@Resource
override var jsonSerializer: IJsonSerializer? = null

2
src/gaea.app/src/main/kotlin/com/synebula/gaea/app/cmd/LazyCommandApp.kt
View File

@@ -16,7 +16,7 @@ import javax.annotation.Resource
open class LazyCommandApp<TRoot : IAggregateRoot<TKey>, TKey>(
override var name: String,
override var service: ILazyService<TRoot, TKey>,
override var logger: ILogger?
override var logger: ILogger,
) : ILazyCommandApp<TRoot, TKey> {
@Resource
override var jsonSerializer: IJsonSerializer? = null

2
src/gaea.app/src/main/kotlin/com/synebula/gaea/app/query/QueryApp.kt
View File

@@ -14,5 +14,5 @@ open class QueryApp<TView, TKey>(
override var name: String,
override var clazz: Class<TView>,
override var query: IQuery,
override var logger: ILogger?
override var logger: ILogger,
) : IQueryApp<TView, TKey>

8
src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongoQuery.kt → src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/query/MongodbQuery.kt
View File

@@ -16,11 +16,11 @@ import org.springframework.data.mongodb.core.query.Criteria
import org.springframework.data.mongodb.core.query.Query
/**
* 实现IQuery的Mongo查询类
* @param template MongoRepo对象
* 实现IQuery的Mongodb查询类
* @param template MongodbRepo对象
*/
open class MongoQuery(var template: MongoTemplate, var logger: ILogger? = null) : IQuery {
open class MongodbQuery(var template: MongoTemplate, var logger: ILogger) : IQuery {
/**
* 使用View解析是collection时是否校验存在，默认不校验
@@ -87,7 +87,7 @@ open class MongoQuery(var template: MongoTemplate, var logger: ILogger? = null)
return if (table != null)
return table.name
else {
this.logger?.info(this, "视图类没有标记[Collection]注解，无法获取Collection名称。尝试使用View<${clazz.name}>名称解析集合")
this.logger.info(this, "视图类没有标记[Collection]注解，无法获取Collection名称。尝试使用View<${clazz.name}>名称解析集合")
val name = clazz.simpleName.removeSuffix("View").firstCharLowerCase()
if (!validViewCollection || this.template.collectionExists(name))
name

10
src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/repository/MongoRepository.kt → src/gaea.mongo/src/main/kotlin/com/synebula/gaea/mongo/repository/MongodbRepository.kt
View File

@@ -8,18 +8,18 @@ import org.springframework.data.mongodb.core.MongoTemplate
import org.springframework.data.mongodb.core.query.Query
/**
* 实现ITypedRepository的mongo仓储类
* @param repo MongoRepo对象
* 实现ITypedRepository的Mongodb仓储类
* @param repo MongodbRepo对象
*/
open class MongoRepository(private var repo: MongoTemplate) : IRepository {
open class MongodbRepository(private var repo: MongoTemplate) : IRepository {
override fun <TAggregateRoot : IAggregateRoot<TKey>, TKey> remove(id: TKey, clazz: Class<TAggregateRoot>) {
this.repo.remove(whereId(id), clazz)
}
override fun <TAggregateRoot : IAggregateRoot<TKey>, TKey> get(
id: TKey,
clazz: Class<TAggregateRoot>
id: TKey,
clazz: Class<TAggregateRoot>,
): TAggregateRoot? {
return this.repo.findOne(whereId(id), clazz)
}