Skip to content

Commit eec814b

Browse files
committed
完善测试用例和文档
1 parent bef2f79 commit eec814b

File tree

5 files changed

+28
-16
lines changed

5 files changed

+28
-16
lines changed

bboss-elasticsearch-rest/src/main/java/org/frameworkset/elasticsearch/serial/SerialUtil.java

+12
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,12 @@ else if(ESId.class.isAssignableFrom(beanClass) ) {
182182

183183

184184
}
185+
186+
/**
187+
* 将对象转换为json写入writer后不会关闭writer,也不会flushwriter
188+
* @param bean
189+
* @param writer
190+
*/
185191
public static void object2jsonDisableCloseAndFlush(Object bean, Writer writer) {
186192
try {
187193

@@ -191,6 +197,12 @@ public static void object2jsonDisableCloseAndFlush(Object bean, Writer writer)
191197
throw new IllegalArgumentException("Error JSON serialization operation",e);
192198
}
193199
}
200+
201+
/**
202+
* 将对象转换为json写入writer后会关闭writer(慎用)
203+
* @param bean
204+
* @param writer
205+
*/
194206
public static void normalObject2json(Object bean, Writer writer) {
195207
try {
196208

docs/bboss-build.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ bboss采用模块化管理,模块之间依赖关系如下:
88

99
<img src="images\bboss_modules.png" style="zoom:80%;" />
1010

11-
模块源码工程地址和功能说明如下:
12-
13-
| 源码地址 | 说明 |
14-
| ------------------------------------------ |---------------------------------------------------------------------------------------------------------------------------------|
15-
| https://gitee.com/bboss/bboss | [基础框架](https://doc.bbossgroups.com/#/):包含ioc、持久层、mvc、任务调度管理、序列化/反序列化以及[配置管理](https://doc.bbossgroups.com/#/aop/IntroduceIoc)等功能 |
16-
| https://gitee.com/bboss/bboss-data | [Redis](https://doc.bbossgroups.com/#/redis)、MongoDBMilvus、Minio客户端封装 |
17-
| https://gitee.com/bboss/bboss-http | 轻量级[http](https://esdoc.bbossgroups.com/#/httpproxy)微服务框架 |
18-
| https://gitee.com/bboss/bboss-plugins | [kafka](https://doc.bbossgroups.com/#/kafka)、apollo、nacos、Rocketmq对接框架 |
19-
| https://gitee.com/bboss/bboss-elastic | Elasticsearch Java [RestClient](https://esdoc.bbossgroups.com/#/quickstart) |
20-
| https://gitee.com/bboss/bboss-elastic-tran | [数据采集](https://esdoc.bbossgroups.com/#/db-es-tool)ETL、[流批一体化](https://esdoc.bbossgroups.com/#/etl-metrics)计算框架 |
11+
模块源码工程地址和功能说明如下:2025年03月20日 00:00 至 2025年03月27日 00:00 期间码云架构升级维护,要下载bboss最新代码,请从Github下载
12+
13+
| 码云源码地址 | Github源码地址 | 说明 |
14+
| ------------------------------------------ | -------------------------------------------------- | ------------------------------------------------------------ |
15+
| https://gitee.com/bboss/bboss | https://github.com/bbossgroups/bboss | [基础框架](https://doc.bbossgroups.com/#/):包含ioc、持久层、mvc、任务调度管理、序列化/反序列化以及[配置管理](https://doc.bbossgroups.com/#/aop/IntroduceIoc)等功能 |
16+
| https://gitee.com/bboss/bboss-data | https://github.com/bbossgroups/bboss-data | [Redis](https://doc.bbossgroups.com/#/redis)[MongoDB](https://doc.bbossgroups.com/#/MongoDB)[Milvus](https://doc.bbossgroups.com/#/Milvus)[Minio](https://doc.bbossgroups.com/#/Minio)客户端封装 |
17+
| https://gitee.com/bboss/bboss-http | https://github.com/bbossgroups/bboss-http | 轻量级[http](https://esdoc.bbossgroups.com/#/httpproxy)微服务框架 |
18+
| https://gitee.com/bboss/bboss-plugins | https://github.com/bbossgroups/bboss-plugins | [kafka](https://doc.bbossgroups.com/#/kafka)、apollo、nacos、Rocketmq对接框架 |
19+
| https://gitee.com/bboss/bboss-elastic | https://github.com/bbossgroups/bboss-elasticsearch | 高性能、高兼容性Elasticsearch Java [RestClient](https://esdoc.bbossgroups.com/#/quickstart) |
20+
| https://gitee.com/bboss/bboss-elastic-tran | https://github.com/bbossgroups/bboss-elastic-tran | [数据采集](https://esdoc.bbossgroups.com/#/db-es-tool)ETL、[流批一体化](https://esdoc.bbossgroups.com/#/etl-metrics)计算框架 |
2121

2222
可以从以上地址下载各模块源码工程,然后按表格顺序,依次在命令行源码根目录下,执行gradle publishToMavenLocal指令,构建模块版本:
2323

docs/datatran-plugins.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2261,7 +2261,7 @@ ImportBuilder importBuilder = new ImportBuilder();
22612261
public void buildRecord(TaskContext taskContext, CommonRecord record, Writer writer) {
22622262
//record.getDatas()方法返回当前记录,Map类型,key/value ,key代表字段名称,Value代表值;
22632263
//可以将当前记录构建为需要的格式,写入到writer对象即可,这里直接将记录转换为json输出
2264-
SerialUtil.normalObject2json(record.getDatas(),writer);
2264+
SerialUtil.object2jsonDisableCloseAndFlush(record.getDatas(),writer);
22652265
//获取记录对应的元数据信息
22662266
Map<String, Object> metadatas = record.getMetaDatas();
22672267

docs/db-es-tool.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1720,7 +1720,7 @@ fileFtpOupputConfig.setFilenameGenerator(new FilenameGenerator() {
17201720
fileFtpOupputConfig.setReocordGenerator(new ReocordGenerator() {
17211721
@Override
17221722
public void buildRecord(TaskContext context, CommonRecord record, Writer builder) {
1723-
//SerialUtil.normalObject2json(record.getDatas(),builder);
1723+
//SerialUtil.object2jsonDisableCloseAndFlush(record.getDatas(),builder);
17241724
String data = (String)context.getTaskData("data");//获取全局参数
17251725
// System.out.println(data);
17261726

docs/elasticsearch-sftp.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ public class ES2FileFtpBatchSplitFileDemo {
124124
@Override
125125
public void buildRecord(TaskContext taskContext, CommonRecord record, Writer builder) {
126126
//直接将记录按照json格式输出到文本文件中
127-
SerialUtil.normalObject2json(record.getDatas(),//获取记录中的字段数据
127+
SerialUtil.object2jsonDisableCloseAndFlush(record.getDatas(),//获取记录中的字段数据
128128
builder);
129129
String data = (String)taskContext.getTaskData("data");//从任务上下文中获取本次任务执行前设置时间戳
130130
// System.out.println(data);
@@ -402,7 +402,7 @@ String ftpIp = CommonLauncher.getProperty("ftpIP","192.168.137.1");//同时指
402402
@Override
403403
public void buildRecord(TaskContext taskContext, CommonRecord record, Writer builder) {
404404
//直接将记录按照json格式输出到文本文件中
405-
SerialUtil.normalObject2json(record.getDatas(),//获取记录中的字段数据
405+
SerialUtil.object2jsonDisableCloseAndFlush(record.getDatas(),//获取记录中的字段数据
406406
builder);
407407
String data = (String)taskContext.getTaskData("data");//从任务上下文中获取本次任务执行前设置时间戳
408408
// System.out.println(data);
@@ -522,7 +522,7 @@ ftpOutConfig.setFailedFileResendInterval(10000L);
522522
@Override
523523
public void buildRecord(TaskContext recordContext, CommonRecord record, Writer builder) {
524524
//直接将记录按照json格式输出到文本文件中
525-
SerialUtil.normalObject2json(record.getDatas(),//获取记录中的字段数据
525+
SerialUtil.object2jsonDisableCloseAndFlush(record.getDatas(),//获取记录中的字段数据
526526
builder);
527527
//String data = (String)recordContext.getTaskData("data");//从任务上下文中获取本次任务执行前设置时间戳
528528
// System.out.println(data);
@@ -918,7 +918,7 @@ FileOutputConfig.setFilenameGenerator(new FilenameGenerator() {
918918
FileOutputConfig.setReocordGenerator(new ReocordGenerator() {
919919
@Override
920920
public void buildRecord(TaskContext context, CommonRecord record, Writer builder) {
921-
//SerialUtil.normalObject2json(record.getDatas(),builder);
921+
//SerialUtil.object2jsonDisableCloseAndFlush(record.getDatas(),builder);
922922
String data = (String)context.getTaskData("data");//获取全局参数
923923
// System.out.println(data);
924924

0 commit comments

Comments
 (0)