diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..dd84ea78 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md new file mode 100644 index 00000000..48d5f81f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/custom.md @@ -0,0 +1,10 @@ +--- +name: Custom issue template +about: Describe this issue template's purpose here. +title: '' +labels: '' +assignees: '' + +--- + + diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..bbcbbe7d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..ea5b62f4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +/*/target/ +/*/bin/ +/*/.settings/ +/*/.classpath +/*/.project +/*/.idea/ +/*/package-lock.json +/*/node_modules/ +/*/.vuepress/dist/* +/*/*.iml +**.versionsBackup +/target/ +*.iml +/.idea/ +.settings/ +.classpath +.project \ No newline at end of file diff --git a/README.md b/README.md index eeec7cf0..3e6f6e50 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@

- + logo

- Maven Central - License - Troy.Zhou + Maven Central + License + Troy.Zhou

## 文档 -网址：https://ok.zhxu.cn +官网 https://okhttps.ejlchina.com/ ## 为什么用 @@ -25,8 +25,6 @@ * 单方法回调，充分利用 Lambda 表达式，让你代码超级简洁！ * 超级轻量，但性能卓越！ -* **阿里云最低 1 折**：https://www.aliyun.com/minisite/goods?userCode=zugtbi5w - ## 如何使用 ### 如艺术一般优雅，像 1、2、3 一样简单 @@ -92,35 +90,25 @@ Websocket 方法： 项目 | 最新版本 | 描述 -|-|- -[okhttps](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps) | 4.1.0 | OkHttps 核心模块 -[okhttps-fastjson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-fastjson) | 4.1.0 | 与 fastjson 集成 -[okhttps-fastjson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-fastjson2) | 4.1.0 | 与 fastjson2 集成 -[okhttps-fastjson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-fastjson2-jsonb) | 4.1.0 | 与 fastjson2-jsonb 集成 -[okhttps-gson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-gson) | 4.1.0 | 与 gson 集成 -[okhttps-jackson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-jackson) | 4.1.0 | 与 jackson 集成 -[okhttps-jackson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-jackson-xml) | 4.1.0 | 与 jackson-xml 集成 -[okhttps-jackson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-jackson-yaml) | 4.1.0 | 与 jackson-yaml 集成 -[okhttps-jackson](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-snack3) | 4.1.0 | 与 jackson-yaml 集成 -[okhttps-stomp](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-stomp) | 4.1.0 | 超级轻量的 Stomp 客户端 -[okhttps-xml](https://gitee.com/troyzhxu/okhttps/tree/dev/okhttps-xml) | 3.5.3 | XML 解析扩展 - -## 超详细教程，请查看：https://ok.zhxu.cn +[okhttps](https://gitee.com/ejlchina-zhxu/okhttps/tree/dev/okhttps) | 2.5.0 | OkHttps 核心模块 +[okhttps-fastjson](https://gitee.com/ejlchina-zhxu/okhttps/tree/dev/okhttps-fastjson) | 2.5.0 | 与 fastjson 集成 +[okhttps-gson](https://gitee.com/ejlchina-zhxu/okhttps/tree/dev/okhttps-gson) | 2.5.0 | 与 gson 集成 +[okhttps-jackson](https://gitee.com/ejlchina-zhxu/okhttps/tree/dev/okhttps-jackson) | 2.5.0 | 与 jackson 集成 +[okhttps-stomp](https://gitee.com/ejlchina-zhxu/okhttps/tree/dev/okhttps-stomp) | 2.5.0 | 超级轻量的 Stomp 客户端 +[okhttps-xml](https://gitee.com/ejlchina-zhxu/okhttps/tree/dev/okhttps-xml) | 2.5.0 | XML 解析扩展 + +## 超详细教程，请查看：https://okhttps.ejlchina.com/ ## 联系方式 * 微信： * 由于近期交流群的二维码被爬，扫码入群方式已被关闭 库的使用上若有疑问，可先加微信【18556739726】（请备注 OkHttps）再入群交流 +* 邮箱：zhou.xu@ejlchina.com ## 友情链接 -[**[ Bean Searcher ]** 比 MyBatis 效率快 100 倍的条件检索引擎，天生支持联表，使一行代码实现复杂列表检索成为可能！](https://github.com/ejlchina/bean-searcher) - -[**[ SA Token ]** 一个轻量级 Java 权限认证框架，让鉴权变得简单、优雅！](https://github.com/dromara/Sa-Token) - -[**[ hrun4j ]** 接口自动化测试解决方案 --工具选得好，下班回家早；测试用得对，半夜安心睡 ](https://github.com/lematechvip/hrun4j) - -[**[ Json Kit ]** 超轻量级 JSON 门面工具，用法简单，不依赖具体实现，让业务代码与 Jackson、Gson、Fastjson 等解耦！](https://gitee.com/troyzhxu/jsonkit) +[**[ sa-token ]** 一个 JavaWeb 轻量级权限认证框架，功能全面，上手简单](https://gitee.com/sz6/sa-token) ## 参与贡献 @@ -128,4 +116,3 @@ Websocket 方法： 2. 新建 Feat_xxx 分支 3. 提交代码 4. 新建 Pull Request - diff --git a/okhttps-fastjson/.gitignore b/okhttps-fastjson/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/okhttps-fastjson/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/okhttps-fastjson/README.md b/okhttps-fastjson/README.md index bbf641f0..505ae900 100644 --- a/okhttps-fastjson/README.md +++ b/okhttps-fastjson/README.md @@ -9,16 +9,16 @@ ```xml - cn.zhxu + com.ejlchina okhttps-fastjson - 3.5.3 + 2.5.0 ``` ##### Gradle ```groovy -implementation 'cn.zhxu:okhttps-fastjson:3.5.3' +implementation 'com.ejlchina:okhttps-fastjson:2.5.0' ``` -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) +#### 更多请参阅 [http://okhttps.ejlchina.com/](http://okhttps.ejlchina.com/) diff --git a/okhttps-fastjson/pom.xml b/okhttps-fastjson/pom.xml index 219950e4..551db3c4 100644 --- a/okhttps-fastjson/pom.xml +++ b/okhttps-fastjson/pom.xml @@ -6,26 +6,26 @@ jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - cn.zhxu + com.ejlchina okhttps - ${project.version} + ${okhttps.version} - cn.zhxu - data-fastjson - ${data.version} + com.alibaba + fastjson + ${fastjson.version} - cn.zhxu + com.ejlchina okhttps-test - ${project.version} + ${okhttps.version} test diff --git a/okhttps-fastjson/src/main/java/cn/zhxu/okhttps/fastjson/FastjsonMsgConvertor.java b/okhttps-fastjson/src/main/java/cn/zhxu/okhttps/fastjson/FastjsonMsgConvertor.java deleted file mode 100644 index 1ed65148..00000000 --- a/okhttps-fastjson/src/main/java/cn/zhxu/okhttps/fastjson/FastjsonMsgConvertor.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.zhxu.okhttps.fastjson; - -import cn.zhxu.data.fastjson.FastjsonDataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; - -public class FastjsonMsgConvertor extends FastjsonDataConvertor implements MsgConvertor, ConvertProvider { - - @Override - public String mediaType() { - return "application/json"; - } - - @Override - public MsgConvertor getConvertor() { - return new FastjsonMsgConvertor(); - } - -} diff --git a/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonArray.java b/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonArray.java new file mode 100644 index 00000000..cae7910c --- /dev/null +++ b/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonArray.java @@ -0,0 +1,77 @@ +package com.ejlchina.okhttps; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +public class FastjsonArray implements Array { + + private final JSONArray json; + + public FastjsonArray(JSONArray json) { + this.json = json; + } + + @Override + public int size() { + return json.size(); + } + + @Override + public boolean isEmpty() { + return json.isEmpty(); + } + + @Override + public Mapper getMapper(int index) { + JSONObject subJson = json.getJSONObject(index); + if (subJson != null) { + return new FastjsonMapper(subJson); + } + return null; + } + + @Override + public Array getArray(int index) { + JSONArray subJson = json.getJSONArray(index); + if (subJson != null) { + return new FastjsonArray(subJson); + } + return null; + } + + @Override + public boolean getBool(int index) { + return json.getBooleanValue(index); + } + + @Override + public int getInt(int index) { + return json.getIntValue(index); + } + + @Override + public long getLong(int index) { + return json.getLongValue(index); + } + + @Override + public float getFloat(int index) { + return json.getFloatValue(index); + } + + @Override + public double getDouble(int index) { + return json.getDoubleValue(index); + } + + @Override + public String getString(int index) { + return json.getString(index); + } + + @Override + public String toString() { + return json.toJSONString(); + } + +} diff --git a/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonMapper.java b/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonMapper.java new file mode 100644 index 00000000..602881c8 --- /dev/null +++ b/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonMapper.java @@ -0,0 +1,89 @@ +package com.ejlchina.okhttps; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + +import java.util.Set; + +public class FastjsonMapper implements Mapper { + + private final JSONObject json; + + public FastjsonMapper(JSONObject json) { + this.json = json; + } + + @Override + public int size() { + return json.size(); + } + + @Override + public boolean isEmpty() { + return json.isEmpty(); + } + + @Override + public Mapper getMapper(String key) { + JSONObject subJson = json.getJSONObject(key); + if (subJson != null) { + return new FastjsonMapper(subJson); + } + return null; + } + + @Override + public Array getArray(String key) { + JSONArray subJson = json.getJSONArray(key); + if (subJson != null) { + return new FastjsonArray(subJson); + } + return null; + } + + @Override + public boolean getBool(String key) { + return json.getBooleanValue(key); + } + + @Override + public int getInt(String key) { + return json.getIntValue(key); + } + + @Override + public long getLong(String key) { + return json.getLongValue(key); + } + + @Override + public float getFloat(String key) { + return json.getFloatValue(key); + } + + @Override + public double getDouble(String key) { + return json.getDoubleValue(key); + } + + @Override + public String getString(String key) { + return json.getString(key); + } + + @Override + public boolean has(String key) { + return json.containsKey(key); + } + + @Override + public Set keySet() { + return json.keySet(); + } + + @Override + public String toString() { + return json.toJSONString(); + } + +} diff --git a/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonMsgConvertor.java b/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonMsgConvertor.java new file mode 100644 index 00000000..d8040572 --- /dev/null +++ b/okhttps-fastjson/src/main/java/com/ejlchina/okhttps/FastjsonMsgConvertor.java @@ -0,0 +1,58 @@ +package com.ejlchina.okhttps; + +import com.alibaba.fastjson.JSON; +import com.ejlchina.okhttps.internal.HttpException; +import okio.Okio; + +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Type; +import java.nio.charset.Charset; +import java.util.List; + +public class FastjsonMsgConvertor implements MsgConvertor, ConvertProvider { + + @Override + public String mediaType() { + return "application/json"; + } + + @Override + public Mapper toMapper(InputStream in, Charset charset) { + return new FastjsonMapper(JSON.parseObject(toString(in, charset))); + } + + @Override + public Array toArray(InputStream in, Charset charset) { + return new FastjsonArray(JSON.parseArray(toString(in, charset))); + } + + @Override + public byte[] serialize(Object object, Charset charset) { + return JSON.toJSONString(object).getBytes(charset); + } + + @Override + public T toBean(Type type, InputStream in, Charset charset) { + return JSON.parseObject(toString(in, charset), type); + } + + @Override + public List toList(Class type, InputStream in, Charset charset) { + return JSON.parseArray(toString(in, charset), type); + } + + @Override + public MsgConvertor getConvertor() { + return new FastjsonMsgConvertor(); + } + + private String toString(InputStream in, Charset charset) { + try { + return Okio.buffer(Okio.source(in)).readString(charset); + } catch (IOException e) { + throw new HttpException("读取文本异常", e); + } + } + +} diff --git a/okhttps-fastjson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-fastjson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index 5ae917c7..00000000 --- a/okhttps-fastjson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.fastjson.FastjsonMsgConvertor \ No newline at end of file diff --git a/okhttps-fastjson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider b/okhttps-fastjson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider new file mode 100644 index 00000000..88f3b11d --- /dev/null +++ b/okhttps-fastjson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider @@ -0,0 +1 @@ +com.ejlchina.okhttps.FastjsonMsgConvertor \ No newline at end of file diff --git a/okhttps-fastjson/src/test/java/cn/zhxu/okhttps/fastjson/TestCase.java b/okhttps-fastjson/src/test/java/com/ejlchina/okhttps/TestCase.java similarity index 64% rename from okhttps-fastjson/src/test/java/cn/zhxu/okhttps/fastjson/TestCase.java rename to okhttps-fastjson/src/test/java/com/ejlchina/okhttps/TestCase.java index 2f0cc7e6..8b65ec5c 100644 --- a/okhttps-fastjson/src/test/java/cn/zhxu/okhttps/fastjson/TestCase.java +++ b/okhttps-fastjson/src/test/java/com/ejlchina/okhttps/TestCase.java @@ -1,9 +1,9 @@ -package cn.zhxu.okhttps.fastjson; +package com.ejlchina.okhttps; -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; +import com.ejlchina.okhttps.test.JsonTestCases; import org.junit.Test; + public class TestCase { @Test diff --git a/okhttps-fastjson2-jsonb/README.md b/okhttps-fastjson2-jsonb/README.md deleted file mode 100644 index 56d4f135..00000000 --- a/okhttps-fastjson2-jsonb/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# OkHttps FastJson - -#### 介绍 - -基于 OkHttps 与 Fastjson2Jsonb 集成扩展 - - -##### Maven - -```xml - - cn.zhxu - okhttps-fastjson2-jsonb - 3.5.3 - -``` - -##### Gradle - -```groovy -implementation 'cn.zhxu:okhttps-fastjson2-jsonb:3.5.3' -``` - -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) diff --git a/okhttps-fastjson2-jsonb/pom.xml b/okhttps-fastjson2-jsonb/pom.xml deleted file mode 100644 index dc2a91c0..00000000 --- a/okhttps-fastjson2-jsonb/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - - okhttps-fastjson2-jsonb - OkHttps Fastjson2 JSONB - jar - - - cn.zhxu - okhttps-parent - 4.1.0 - - - - - cn.zhxu - okhttps - ${project.version} - - - cn.zhxu - data-fastjson2-jsonb - ${data.version} - - - cn.zhxu - okhttps-test - ${project.version} - test - - - - - okhttps-fastjson2-jsonb - - \ No newline at end of file diff --git a/okhttps-fastjson2-jsonb/src/main/java/cn/zhxu/okhttps/fastjson2/jsonb/Fastjson2JsonbMsgConvertor.java b/okhttps-fastjson2-jsonb/src/main/java/cn/zhxu/okhttps/fastjson2/jsonb/Fastjson2JsonbMsgConvertor.java deleted file mode 100644 index 17867cd8..00000000 --- a/okhttps-fastjson2-jsonb/src/main/java/cn/zhxu/okhttps/fastjson2/jsonb/Fastjson2JsonbMsgConvertor.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.zhxu.okhttps.fastjson2.jsonb; - -import cn.zhxu.data.fastjson2.jsonb.Fastjson2JsonbDataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; - -public class Fastjson2JsonbMsgConvertor extends Fastjson2JsonbDataConvertor implements MsgConvertor, ConvertProvider { - - @Override - public String mediaType() { - return "application/jsonb"; - } - - @Override - public MsgConvertor getConvertor() { - return new Fastjson2JsonbMsgConvertor(); - } - -} diff --git a/okhttps-fastjson2-jsonb/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-fastjson2-jsonb/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index 3683502a..00000000 --- a/okhttps-fastjson2-jsonb/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.fastjson2.jsonb.Fastjson2JsonbMsgConvertor \ No newline at end of file diff --git a/okhttps-fastjson2-jsonb/src/test/java/cn/zhxu/okhttps/fastjson2/jsonb/TestCase.java b/okhttps-fastjson2-jsonb/src/test/java/cn/zhxu/okhttps/fastjson2/jsonb/TestCase.java deleted file mode 100644 index 835408ba..00000000 --- a/okhttps-fastjson2-jsonb/src/test/java/cn/zhxu/okhttps/fastjson2/jsonb/TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.zhxu.okhttps.fastjson2.jsonb; - -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; -import org.junit.Test; - - -public class TestCase { - - @Test - public void doTest() throws Exception { - MsgConvertor msgConvertor = new Fastjson2JsonbMsgConvertor(); -// new JsonTestCases(msgConvertor).run(); - } - -} diff --git a/okhttps-fastjson2/README.md b/okhttps-fastjson2/README.md deleted file mode 100644 index cdaa2cf2..00000000 --- a/okhttps-fastjson2/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# OkHttps FastJson - -#### 介绍 - -基于 OkHttps 与 Fastjson2 集成扩展 - - -##### Maven - -```xml - - cn.zhxu - okhttps-fastjson2 - 3.5.3 - -``` - -##### Gradle - -```groovy -implementation 'cn.zhxu:okhttps-fastjson2:3.5.3' -``` - -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) diff --git a/okhttps-fastjson2/pom.xml b/okhttps-fastjson2/pom.xml deleted file mode 100644 index dd971348..00000000 --- a/okhttps-fastjson2/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - - okhttps-fastjson2 - OkHttps Fastjson2 - jar - - - cn.zhxu - okhttps-parent - 4.1.0 - - - - - cn.zhxu - okhttps - ${project.version} - - - cn.zhxu - data-fastjson2 - ${data.version} - - - cn.zhxu - okhttps-test - ${project.version} - test - - - - - okhttps-fastjson2 - - \ No newline at end of file diff --git a/okhttps-fastjson2/src/main/java/cn/zhxu/okhttps/fastjson2/Fastjson2MsgConvertor.java b/okhttps-fastjson2/src/main/java/cn/zhxu/okhttps/fastjson2/Fastjson2MsgConvertor.java deleted file mode 100644 index a7199847..00000000 --- a/okhttps-fastjson2/src/main/java/cn/zhxu/okhttps/fastjson2/Fastjson2MsgConvertor.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.zhxu.okhttps.fastjson2; - -import cn.zhxu.data.fastjson2.Fastjson2DataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; - -public class Fastjson2MsgConvertor extends Fastjson2DataConvertor implements MsgConvertor, ConvertProvider { - - @Override - public String mediaType() { - return "application/json"; - } - - @Override - public MsgConvertor getConvertor() { - return new Fastjson2MsgConvertor(); - } - -} diff --git a/okhttps-fastjson2/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-fastjson2/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index 37efd499..00000000 --- a/okhttps-fastjson2/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.fastjson2.Fastjson2MsgConvertor \ No newline at end of file diff --git a/okhttps-fastjson2/src/test/java/cn/zhxu/okhttps/fastjson2/TestCase.java b/okhttps-fastjson2/src/test/java/cn/zhxu/okhttps/fastjson2/TestCase.java deleted file mode 100644 index cc5051ad..00000000 --- a/okhttps-fastjson2/src/test/java/cn/zhxu/okhttps/fastjson2/TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.zhxu.okhttps.fastjson2; - -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; -import org.junit.Test; - - -public class TestCase { - - @Test - public void doTest() throws Exception { - MsgConvertor msgConvertor = new Fastjson2MsgConvertor(); - new JsonTestCases(msgConvertor).run(); - } - -} diff --git a/okhttps-gson/.gitignore b/okhttps-gson/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/okhttps-gson/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/okhttps-gson/README.md b/okhttps-gson/README.md index 938f5181..ed3e8ba1 100644 --- a/okhttps-gson/README.md +++ b/okhttps-gson/README.md @@ -9,16 +9,16 @@ ```xml - cn.zhxu + com.ejlchina okhttps-gson - 3.5.3 + 2.5.0 ``` ##### Gradle ```groovy -implementation 'cn.zhxu:okhttps-gson:3.5.3' +implementation 'com.ejlchina:okhttps-gson:2.5.0' ``` -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) +#### 更多请参阅 [http://okhttps.ejlchina.com/](http://okhttps.ejlchina.com/) diff --git a/okhttps-gson/pom.xml b/okhttps-gson/pom.xml index ef0d2ad7..d9d192b7 100644 --- a/okhttps-gson/pom.xml +++ b/okhttps-gson/pom.xml @@ -6,26 +6,26 @@ jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - cn.zhxu + com.ejlchina okhttps - ${project.version} + ${okhttps.version} + + com.google.code.gson + gson + ${gson.version} + - cn.zhxu - data-gson - ${data.version} - - - cn.zhxu + com.ejlchina okhttps-test - ${project.version} + ${okhttps.version} test diff --git a/okhttps-gson/src/main/java/cn/zhxu/okhttps/gson/GsonMsgConvertor.java b/okhttps-gson/src/main/java/cn/zhxu/okhttps/gson/GsonMsgConvertor.java deleted file mode 100644 index 15272f4b..00000000 --- a/okhttps-gson/src/main/java/cn/zhxu/okhttps/gson/GsonMsgConvertor.java +++ /dev/null @@ -1,40 +0,0 @@ -package cn.zhxu.okhttps.gson; - -import cn.zhxu.data.gson.GsonDataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; -import com.google.gson.Gson; - -public class GsonMsgConvertor extends GsonDataConvertor implements MsgConvertor, ConvertProvider { - - public GsonMsgConvertor() { } - - public GsonMsgConvertor(Gson gson) { - super(gson); - } - - @Override - public String mediaType() { - return "application/json"; - } - - @Override - public MsgConvertor getConvertor() { - return new GsonMsgConvertor(); - } - -} - - - - - - - - - - - - - - diff --git a/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonArray.java b/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonArray.java new file mode 100644 index 00000000..ebc34286 --- /dev/null +++ b/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonArray.java @@ -0,0 +1,101 @@ +package com.ejlchina.okhttps; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; + +public class GsonArray implements Array { + + private final JsonArray json; + + public GsonArray(JsonArray json) { + this.json = json; + } + + @Override + public int size() { + return json.size(); + } + + @Override + public boolean isEmpty() { + return json.size() == 0; + } + + @Override + public Mapper getMapper(int index) { + JsonElement subJson = json.get(index); + if (subJson != null && subJson.isJsonObject()) { + return new GsonMapper(subJson.getAsJsonObject()); + } + return null; + } + + @Override + public Array getArray(int index) { + JsonElement subJson = json.get(index); + if (subJson != null && subJson.isJsonArray()) { + return new GsonArray(subJson.getAsJsonArray()); + } + return null; + } + + @Override + public boolean getBool(int index) { + JsonElement val = json.get(index); + if (val != null && val.isJsonPrimitive()) { + return val.getAsBoolean(); + } + return false; + } + + @Override + public int getInt(int index) { + JsonElement val = json.get(index); + if (val != null && val.isJsonPrimitive()) { + return val.getAsInt(); + } + return 0; + } + + @Override + public long getLong(int index) { + JsonElement val = json.get(index); + if (val != null && val.isJsonPrimitive()) { + return val.getAsLong(); + } + return 0; + } + + @Override + public float getFloat(int index) { + JsonElement val = json.get(index); + if (val != null && val.isJsonPrimitive()) { + return val.getAsFloat(); + } + return 0; + } + + @Override + public double getDouble(int index) { + JsonElement val = json.get(index); + if (val != null && val.isJsonPrimitive()) { + return val.getAsDouble(); + } + return 0; + } + + @Override + public String getString(int index) { + JsonElement val = json.get(index); + if (val != null && val.isJsonPrimitive()) { + return val.getAsString(); + } + return null; + } + + @Override + public String toString() { + return json.toString(); + } + +} diff --git a/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonMapper.java b/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonMapper.java new file mode 100644 index 00000000..111d9e68 --- /dev/null +++ b/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonMapper.java @@ -0,0 +1,113 @@ +package com.ejlchina.okhttps; + +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + +import java.util.Set; + +public class GsonMapper implements Mapper { + + private final JsonObject json; + + public GsonMapper(JsonObject json) { + this.json = json; + } + + @Override + public int size() { + return json.size(); + } + + @Override + public boolean isEmpty() { + return json.size() == 0; + } + + @Override + public Mapper getMapper(String key) { + JsonElement subJson = json.get(key); + if (subJson != null && subJson.isJsonObject()) { + return new GsonMapper(subJson.getAsJsonObject()); + } + return null; + } + + @Override + public Array getArray(String key) { + JsonElement subJson = json.get(key); + if (subJson != null && subJson.isJsonArray()) { + return new GsonArray(subJson.getAsJsonArray()); + } + return null; + } + + @Override + public boolean getBool(String key) { + JsonElement val = json.get(key); + if (val != null && val.isJsonPrimitive()) { + return val.getAsBoolean(); + } + return false; + } + + @Override + public int getInt(String key) { + JsonElement val = json.get(key); + if (val != null && val.isJsonPrimitive()) { + return val.getAsInt(); + } + return 0; + } + + @Override + public long getLong(String key) { + JsonElement val = json.get(key); + if (val != null && val.isJsonPrimitive()) { + return val.getAsLong(); + } + return 0; + } + + @Override + public float getFloat(String key) { + JsonElement val = json.get(key); + if (val != null && val.isJsonPrimitive()) { + return val.getAsFloat(); + } + return 0; + } + + @Override + public double getDouble(String key) { + JsonElement val = json.get(key); + if (val != null && val.isJsonPrimitive()) { + return val.getAsDouble(); + } + return 0; + } + + @Override + public String getString(String key) { + JsonElement val = json.get(key); + if (val != null && val.isJsonPrimitive()) { + return val.getAsString(); + } + return null; + } + + @Override + public boolean has(String key) { + return json.has(key); + } + + @Override + public Set keySet() { + return json.keySet(); + } + + @Override + public String toString() { + return json.toString(); + } + +} diff --git a/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonMsgConvertor.java b/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonMsgConvertor.java new file mode 100644 index 00000000..3f69b086 --- /dev/null +++ b/okhttps-gson/src/main/java/com/ejlchina/okhttps/GsonMsgConvertor.java @@ -0,0 +1,88 @@ +package com.ejlchina.okhttps; + +import com.google.gson.Gson; +import com.google.gson.JsonArray; +import com.google.gson.JsonObject; +import com.google.gson.reflect.TypeToken; + +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Type; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class GsonMsgConvertor implements MsgConvertor, ConvertProvider { + + private Gson gson; + + public GsonMsgConvertor() { + this(new Gson()); + } + + public GsonMsgConvertor(Gson gson) { + this.gson = gson; + } + + @Override + public String mediaType() { + return "application/json"; + } + + @Override + public Mapper toMapper(InputStream in, Charset charset) { + return new GsonMapper(gson.fromJson(new InputStreamReader(in, charset), JsonObject.class)); + } + + @Override + public Array toArray(InputStream in, Charset charset) { + return new GsonArray(gson.fromJson(new InputStreamReader(in, charset), JsonArray.class)); + } + + @Override + public byte[] serialize(Object object, Charset charset) { + return gson.toJson(object).getBytes(charset); + } + + @Override + public T toBean(Type type, InputStream in, Charset charset) { + return gson.fromJson(new InputStreamReader(in, charset), type); + } + + @Override + public List toList(Class type, InputStream in, Charset charset) { + T[] beans = gson.fromJson(new InputStreamReader(in, charset), TypeToken.getArray(type).getType()); + List list = new ArrayList<>(); + Collections.addAll(list, beans); + return list; + } + + @Override + public MsgConvertor getConvertor() { + return new GsonMsgConvertor(); + } + + public Gson getGson() { + return gson; + } + + public void setGson(Gson gson) { + this.gson = gson; + } + +} + + + + + + + + + + + + + + diff --git a/okhttps-gson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-gson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index 122472d4..00000000 --- a/okhttps-gson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.gson.GsonMsgConvertor \ No newline at end of file diff --git a/okhttps-gson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider b/okhttps-gson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider new file mode 100644 index 00000000..5eb90888 --- /dev/null +++ b/okhttps-gson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider @@ -0,0 +1 @@ +com.ejlchina.okhttps.GsonMsgConvertor \ No newline at end of file diff --git a/okhttps-gson/src/test/java/cn/zhxu/okhttps/gson/TestCase.java b/okhttps-gson/src/test/java/com/ejlchina/okhttps/TestCase.java similarity index 64% rename from okhttps-gson/src/test/java/cn/zhxu/okhttps/gson/TestCase.java rename to okhttps-gson/src/test/java/com/ejlchina/okhttps/TestCase.java index 71406abe..01d7b40a 100644 --- a/okhttps-gson/src/test/java/cn/zhxu/okhttps/gson/TestCase.java +++ b/okhttps-gson/src/test/java/com/ejlchina/okhttps/TestCase.java @@ -1,7 +1,6 @@ -package cn.zhxu.okhttps.gson; +package com.ejlchina.okhttps; -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; +import com.ejlchina.okhttps.test.JsonTestCases; import org.junit.Test; diff --git a/okhttps-jackson-xml/README.md b/okhttps-jackson-xml/README.md deleted file mode 100644 index e2505225..00000000 --- a/okhttps-jackson-xml/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# OkHttps Jackson - -#### 介绍 - -基于 OkHttps 与 JacksonXml 集成扩展 - - -##### Maven - -```xml - - cn.zhxu - okhttps-jackson-xml - 3.5.3 - -``` - -##### Gradle - -```groovy -implementation 'cn.zhxu:okhttps-jackson-xml:3.5.3' -``` - -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) diff --git a/okhttps-jackson-xml/pom.xml b/okhttps-jackson-xml/pom.xml deleted file mode 100644 index 54aa1fce..00000000 --- a/okhttps-jackson-xml/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - - okhttps-jackson-xml - OkHttps Jackson Xml - jar - - - cn.zhxu - okhttps-parent - 4.1.0 - - - - - cn.zhxu - okhttps - ${project.version} - - - cn.zhxu - data-jackson-xml - ${data.version} - - - cn.zhxu - okhttps-test - ${project.version} - test - - - - - okhttps-jackson-xml - - \ No newline at end of file diff --git a/okhttps-jackson-xml/src/main/java/cn/zhxu/okhttps/jackson/xml/JacksonXmlMsgConvertor.java b/okhttps-jackson-xml/src/main/java/cn/zhxu/okhttps/jackson/xml/JacksonXmlMsgConvertor.java deleted file mode 100644 index 44a29fca..00000000 --- a/okhttps-jackson-xml/src/main/java/cn/zhxu/okhttps/jackson/xml/JacksonXmlMsgConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.zhxu.okhttps.jackson.xml; - -import cn.zhxu.data.jackson.xml.JacksonXmlDataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; - -public class JacksonXmlMsgConvertor extends JacksonXmlDataConvertor implements MsgConvertor, ConvertProvider { - - public JacksonXmlMsgConvertor() { } - - public JacksonXmlMsgConvertor(XmlMapper xmlMapper) { - super(xmlMapper); - } - - @Override - public String mediaType() { - return "application/xml"; - } - - @Override - public MsgConvertor getConvertor() { - return new JacksonXmlMsgConvertor(); - } - -} diff --git a/okhttps-jackson-xml/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-jackson-xml/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index 344c3d0b..00000000 --- a/okhttps-jackson-xml/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.jackson.xml.JacksonXmlMsgConvertor \ No newline at end of file diff --git a/okhttps-jackson-xml/src/test/java/cn/zhxu/okhttps/jackson/xml/TestCase.java b/okhttps-jackson-xml/src/test/java/cn/zhxu/okhttps/jackson/xml/TestCase.java deleted file mode 100644 index 20af4b4c..00000000 --- a/okhttps-jackson-xml/src/test/java/cn/zhxu/okhttps/jackson/xml/TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.zhxu.okhttps.jackson.xml; - -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.XmlTestCases; -import org.junit.Test; - - -public class TestCase { - - @Test - public void doTest() throws Exception { - MsgConvertor convertor = new JacksonXmlMsgConvertor(); -// new XmlTestCases(convertor).run(); - } - -} diff --git a/okhttps-jackson-yaml/README.md b/okhttps-jackson-yaml/README.md deleted file mode 100644 index dbd3b23f..00000000 --- a/okhttps-jackson-yaml/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# OkHttps Jackson - -#### 介绍 - -基于 OkHttps 与 JacksonYamls 集成扩展 - - -##### Maven - -```xml - - cn.zhxu - okhttps-jackson-yaml - 3.5.3 - -``` - -##### Gradle - -```groovy -implementation 'cn.zhxu:okhttps-jackson-yaml:3.5.3' -``` - -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) diff --git a/okhttps-jackson-yaml/pom.xml b/okhttps-jackson-yaml/pom.xml deleted file mode 100644 index c550aa50..00000000 --- a/okhttps-jackson-yaml/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - 4.0.0 - - okhttps-jackson-yaml - OkHttps Jackson Yaml - jar - - - cn.zhxu - okhttps-parent - 4.1.0 - - - - - cn.zhxu - okhttps - ${project.version} - - - cn.zhxu - data-jackson-yaml - ${data.version} - - - cn.zhxu - okhttps-test - ${project.version} - test - - - - - okhttps-jackson-yaml - - \ No newline at end of file diff --git a/okhttps-jackson-yaml/src/main/java/cn/zhxu/okhttps/jackson/yaml/JacksonYamlMsgConvertor.java b/okhttps-jackson-yaml/src/main/java/cn/zhxu/okhttps/jackson/yaml/JacksonYamlMsgConvertor.java deleted file mode 100644 index e0dc08e1..00000000 --- a/okhttps-jackson-yaml/src/main/java/cn/zhxu/okhttps/jackson/yaml/JacksonYamlMsgConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.zhxu.okhttps.jackson.yaml; - -import cn.zhxu.data.jackson.yaml.JacksonYamlDataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; -import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; - -public class JacksonYamlMsgConvertor extends JacksonYamlDataConvertor implements MsgConvertor, ConvertProvider { - - public JacksonYamlMsgConvertor() { } - - public JacksonYamlMsgConvertor(YAMLMapper yamlMapper) { - super(yamlMapper); - } - - @Override - public String mediaType() { - return "application/yaml"; - } - - @Override - public MsgConvertor getConvertor() { - return new JacksonYamlMsgConvertor(); - } - -} diff --git a/okhttps-jackson-yaml/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-jackson-yaml/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index 8b8befc7..00000000 --- a/okhttps-jackson-yaml/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.jackson.yaml.JacksonYamlMsgConvertor \ No newline at end of file diff --git a/okhttps-jackson-yaml/src/test/java/cn/zhxu/okhttps/jackson/yaml/TestCase.java b/okhttps-jackson-yaml/src/test/java/cn/zhxu/okhttps/jackson/yaml/TestCase.java deleted file mode 100644 index 9f781a72..00000000 --- a/okhttps-jackson-yaml/src/test/java/cn/zhxu/okhttps/jackson/yaml/TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.zhxu.okhttps.jackson.yaml; - -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; -import org.junit.Test; - - -public class TestCase { - - @Test - public void doTest() throws Exception { - MsgConvertor convertor = new JacksonYamlMsgConvertor(); -// new JsonTestCases(convertor).run(); - } - -} diff --git a/okhttps-jackson/.gitignore b/okhttps-jackson/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/okhttps-jackson/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/okhttps-jackson/README.md b/okhttps-jackson/README.md index 54c1cf5e..7a5d3f66 100644 --- a/okhttps-jackson/README.md +++ b/okhttps-jackson/README.md @@ -9,16 +9,16 @@ ```xml - cn.zhxu + com.ejlchina okhttps-jackson - 3.5.3 + 2.5.0 ``` ##### Gradle ```groovy -implementation 'cn.zhxu:okhttps-jackson:3.5.3' +implementation 'com.ejlchina:okhttps-jackson:2.5.0' ``` -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) +#### 更多请参阅 [http://okhttps.ejlchina.com/](http://okhttps.ejlchina.com/) diff --git a/okhttps-jackson/pom.xml b/okhttps-jackson/pom.xml index d9cef0e0..27fddc06 100644 --- a/okhttps-jackson/pom.xml +++ b/okhttps-jackson/pom.xml @@ -6,26 +6,26 @@ jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - cn.zhxu + com.ejlchina okhttps - ${project.version} + ${okhttps.version} + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + - cn.zhxu - data-jackson - ${data.version} - - - cn.zhxu + com.ejlchina okhttps-test - ${project.version} + ${okhttps.version} test diff --git a/okhttps-jackson/src/main/java/cn/zhxu/okhttps/jackson/JacksonMsgConvertor.java b/okhttps-jackson/src/main/java/cn/zhxu/okhttps/jackson/JacksonMsgConvertor.java deleted file mode 100644 index 1c0e561d..00000000 --- a/okhttps-jackson/src/main/java/cn/zhxu/okhttps/jackson/JacksonMsgConvertor.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.zhxu.okhttps.jackson; - -import cn.zhxu.data.jackson.JacksonDataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; -import com.fasterxml.jackson.databind.ObjectMapper; - -public class JacksonMsgConvertor extends JacksonDataConvertor implements MsgConvertor, ConvertProvider { - - public JacksonMsgConvertor() { } - - public JacksonMsgConvertor(ObjectMapper objectMapper) { - super(objectMapper); - } - - @Override - public String mediaType() { - return "application/json"; - } - - @Override - public MsgConvertor getConvertor() { - return new JacksonMsgConvertor(); - } - -} diff --git a/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonArray.java b/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonArray.java new file mode 100644 index 00000000..6a8f68d2 --- /dev/null +++ b/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonArray.java @@ -0,0 +1,105 @@ +package com.ejlchina.okhttps; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +public class JacksonArray implements Array { + + private final ArrayNode json; + + public JacksonArray(ArrayNode json) { + this.json = json; + } + + @Override + public int size() { + return json.size(); + } + + @Override + public boolean isEmpty() { + return json.isEmpty(); + } + + @Override + public Mapper getMapper(int index) { + JsonNode subJson = json.get(index); + if (subJson != null && subJson.isObject()) { + return new JacksonMapper((ObjectNode) subJson); + } + return null; + } + + @Override + public Array getArray(int index) { + JsonNode subJson = json.get(index); + if (subJson != null && subJson.isArray()) { + return new JacksonArray((ArrayNode) subJson); + } + return null; + } + + @Override + public boolean getBool(int index) { + JsonNode subJson = json.get(index); + if (subJson != null) { + return subJson.asBoolean(false); + } + return false; + } + + @Override + public int getInt(int index) { + JsonNode subJson = json.get(index); + if (subJson != null) { + return subJson.asInt(0); + } + return 0; + } + + @Override + public long getLong(int index) { + JsonNode subJson = json.get(index); + if (subJson != null) { + return subJson.asLong(0); + } + return 0; + } + + @Override + public float getFloat(int index) { + JsonNode subJson = json.get(index); + if (subJson != null && subJson.isNumber()) { + return subJson.floatValue(); + } + if (subJson != null) { + return (float) subJson.asDouble(0); + } + return 0; + } + + @Override + public double getDouble(int index) { + JsonNode subJson = json.get(index); + if (subJson != null) { + return subJson.asDouble(0); + } + return 0; + } + + @Override + public String getString(int index) { + JsonNode subJson = json.get(index); + if (subJson != null) { + return subJson.asText(); + } + return null; + } + + @Override + public String toString() { + return json.toString(); + } + +} diff --git a/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonMapper.java b/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonMapper.java new file mode 100644 index 00000000..c34291d7 --- /dev/null +++ b/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonMapper.java @@ -0,0 +1,124 @@ +package com.ejlchina.okhttps; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; + +public class JacksonMapper implements Mapper { + + private final ObjectNode json; + + public JacksonMapper(ObjectNode json) { + this.json = json; + } + + @Override + public int size() { + return json.size(); + } + + @Override + public boolean isEmpty() { + return json.isEmpty(); + } + + @Override + public Mapper getMapper(String key) { + JsonNode subJson = json.get(key); + if (subJson != null && subJson.isObject()) { + return new JacksonMapper((ObjectNode) subJson); + } + return null; + } + + @Override + public Array getArray(String key) { + JsonNode subJson = json.get(key); + if (subJson != null && subJson.isArray()) { + return new JacksonArray((ArrayNode) subJson); + } + return null; + } + + @Override + public boolean getBool(String key) { + JsonNode subJson = json.get(key); + if (subJson != null) { + return subJson.asBoolean(false); + } + return false; + } + + @Override + public int getInt(String key) { + JsonNode subJson = json.get(key); + if (subJson != null) { + return subJson.asInt(0); + } + return 0; + } + + @Override + public long getLong(String key) { + JsonNode subJson = json.get(key); + if (subJson != null) { + return subJson.asLong(0); + } + return 0; + } + + @Override + public float getFloat(String key) { + JsonNode subJson = json.get(key); + if (subJson != null && subJson.isNumber()) { + return subJson.floatValue(); + } + if (subJson != null) { + return (float) subJson.asDouble(0); + } + return 0; + } + + @Override + public double getDouble(String key) { + JsonNode subJson = json.get(key); + if (subJson != null) { + return subJson.asDouble(0); + } + return 0; + } + + @Override + public String getString(String key) { + JsonNode subJson = json.get(key); + if (subJson != null) { + return subJson.asText(); + } + return null; + } + + @Override + public boolean has(String key) { + return json.has(key); + } + + @Override + public Set keySet() { + Iterator it = json.fieldNames(); + Set set = new HashSet<>(); + while (it.hasNext()) { + set.add(it.next()); + } + return set; + } + + @Override + public String toString() { + return json.toString(); + } + +} diff --git a/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonMsgConvertor.java b/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonMsgConvertor.java new file mode 100644 index 00000000..c6c731e7 --- /dev/null +++ b/okhttps-jackson/src/main/java/com/ejlchina/okhttps/JacksonMsgConvertor.java @@ -0,0 +1,149 @@ +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.internal.HttpException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.type.CollectionType; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.lang.reflect.Type; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class JacksonMsgConvertor implements MsgConvertor, ConvertProvider { + + private ObjectMapper objectMapper; + + private final Map> cache = new HashMap<>(); + + private boolean typeCached; + + public JacksonMsgConvertor() { + this(new ObjectMapper()); + } + + public JacksonMsgConvertor(ObjectMapper objectMapper) { + this(objectMapper, false); + } + + public JacksonMsgConvertor(ObjectMapper objectMapper, boolean typeCached) { + this.objectMapper = objectMapper; + this.typeCached = typeCached; + } + + @Override + public String mediaType() { + return "application/json"; + } + + @Override + public Mapper toMapper(InputStream in, Charset charset) { + try { + JsonNode json = objectMapper.readTree(new InputStreamReader(in, charset)); + if (json.isObject()) { + return new JacksonMapper((ObjectNode) json); + } + if (json.isNull() || json.isMissingNode()) { + return null; + } + throw new HttpException("不是 一个 json 对象：" + json); + } catch (IOException e) { + throw new HttpException("Jackson 解析异常", e); + } + } + + @Override + public Array toArray(InputStream in, Charset charset) { + try { + JsonNode json = objectMapper.readTree(new InputStreamReader(in, charset)); + if (json.isArray()) { + return new JacksonArray((ArrayNode) json); + } + if (json.isNull() || json.isMissingNode()) { + return null; + } + throw new HttpException("不是 一个 json 数组：" + json); + } catch (IOException e) { + throw new HttpException("Jackson 解析异常", e); + } + } + + @Override + public byte[] serialize(Object object, Charset charset) { + try { + return objectMapper.writeValueAsString(object).getBytes(charset); + } catch (JsonProcessingException e) { + throw new HttpException("Java Bean [" + object + "] Jackson 序列化异常", e); + } + } + + private TypeReference toTypeRef(Type type) { + TypeReference typeRef; + synchronized (cache) { + //noinspection unchecked + typeRef = (TypeReference) cache.get(type); + if (typeRef == null) { + typeRef = new TypeReference() { + @Override + public Type getType() { + return type; + } + }; + if (typeCached) { + cache.put(type, typeRef); + } + } + } + return typeRef; + } + + @Override + public T toBean(Type type, InputStream in, Charset charset) { + try { + return objectMapper.readValue(new InputStreamReader(in, charset), toTypeRef(type)); + } catch (IOException e) { + throw new HttpException("Jackson 解析异常", e); + } + } + + @Override + public List toList(Class type, InputStream in, Charset charset) { + CollectionType javaType = objectMapper.getTypeFactory().constructCollectionType(ArrayList.class, type); + try { + return objectMapper.readValue(new InputStreamReader(in, charset), javaType); + } catch (IOException e) { + throw new HttpException("Jackson 解析异常", e); + } + } + + @Override + public MsgConvertor getConvertor() { + return new JacksonMsgConvertor(); + } + + public ObjectMapper getObjectMapper() { + return objectMapper; + } + + public void setObjectMapper(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + public boolean isTypeCached() { + return typeCached; + } + + public void setTypeCached(boolean typeCached) { + this.typeCached = typeCached; + } + +} diff --git a/okhttps-jackson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-jackson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index dd5ee602..00000000 --- a/okhttps-jackson/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.jackson.JacksonMsgConvertor \ No newline at end of file diff --git a/okhttps-jackson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider b/okhttps-jackson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider new file mode 100644 index 00000000..ddfa7bde --- /dev/null +++ b/okhttps-jackson/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider @@ -0,0 +1 @@ +com.ejlchina.okhttps.JacksonMsgConvertor \ No newline at end of file diff --git a/okhttps-jackson/src/test/java/cn/zhxu/okhttps/jackson/TestCase.java b/okhttps-jackson/src/test/java/cn/zhxu/okhttps/jackson/TestCase.java deleted file mode 100644 index 74ea88f9..00000000 --- a/okhttps-jackson/src/test/java/cn/zhxu/okhttps/jackson/TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.zhxu.okhttps.jackson; - -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; -import org.junit.Test; - - -public class TestCase { - - @Test - public void doTest() throws Exception { - MsgConvertor convertor = new JacksonMsgConvertor(); - new JsonTestCases(convertor).run(); - } - -} diff --git a/okhttps-jackson/src/test/java/com/ejlchina/okhttps/TestCase.java b/okhttps-jackson/src/test/java/com/ejlchina/okhttps/TestCase.java new file mode 100644 index 00000000..538dd66b --- /dev/null +++ b/okhttps-jackson/src/test/java/com/ejlchina/okhttps/TestCase.java @@ -0,0 +1,15 @@ +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.test.JsonTestCases; +import org.junit.Test; + + +public class TestCase { + + @Test + public void doTest() throws Exception { + MsgConvertor msgConvertor = new JacksonMsgConvertor(); + new JsonTestCases(msgConvertor).run(); + } + +} diff --git a/okhttps-snack3/README.md b/okhttps-snack3/README.md deleted file mode 100644 index 22af945b..00000000 --- a/okhttps-snack3/README.md +++ /dev/null @@ -1,24 +0,0 @@ -# OkHttps Gson - -#### 介绍 - -基于 OkHttps 与 Gson 集成扩展 - - -##### Maven - -```xml - - cn.zhxu - okhttps-snack3 - 3.5.3 - -``` - -##### Gradle - -```groovy -implementation 'cn.zhxu:okhttps-snack3:3.5.3' -``` - -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) diff --git a/okhttps-snack3/src/main/java/cn/zhxu/okhttps/snack3/Snack3MsgConvertor.java b/okhttps-snack3/src/main/java/cn/zhxu/okhttps/snack3/Snack3MsgConvertor.java deleted file mode 100644 index 2c56dd55..00000000 --- a/okhttps-snack3/src/main/java/cn/zhxu/okhttps/snack3/Snack3MsgConvertor.java +++ /dev/null @@ -1,33 +0,0 @@ -package cn.zhxu.okhttps.snack3; - -import cn.zhxu.data.snack3.Snack3DataConvertor; -import cn.zhxu.okhttps.ConvertProvider; -import cn.zhxu.okhttps.MsgConvertor; - -public class Snack3MsgConvertor extends Snack3DataConvertor implements MsgConvertor, ConvertProvider { - - @Override - public String mediaType() { - return "application/json"; - } - - @Override - public MsgConvertor getConvertor() { - return new Snack3MsgConvertor(); - } - -} - - - - - - - - - - - - - - diff --git a/okhttps-snack3/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider b/okhttps-snack3/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider deleted file mode 100644 index a546ae29..00000000 --- a/okhttps-snack3/src/main/resources/META-INF/services/cn.zhxu.okhttps.ConvertProvider +++ /dev/null @@ -1 +0,0 @@ -cn.zhxu.okhttps.snack3.Snack3MsgConvertor \ No newline at end of file diff --git a/okhttps-snack3/src/test/java/cn/zhxu/okhttps/snack3/TestCase.java b/okhttps-snack3/src/test/java/cn/zhxu/okhttps/snack3/TestCase.java deleted file mode 100644 index 9ebb192f..00000000 --- a/okhttps-snack3/src/test/java/cn/zhxu/okhttps/snack3/TestCase.java +++ /dev/null @@ -1,16 +0,0 @@ -package cn.zhxu.okhttps.snack3; - -import cn.zhxu.okhttps.MsgConvertor; -import cn.zhxu.okhttps.test.JsonTestCases; -import org.junit.Test; - - -public class TestCase { - - @Test - public void doTest() throws Exception { - MsgConvertor msgConvertor = new Snack3MsgConvertor(); - new JsonTestCases(msgConvertor).run(); - } - -} diff --git a/okhttps-stomp/README.md b/okhttps-stomp/README.md index ccc3ce2c..e1be9d11 100644 --- a/okhttps-stomp/README.md +++ b/okhttps-stomp/README.md @@ -9,16 +9,16 @@ ```xml - cn.zhxu + com.ejlchina okhttps-stomp - 3.5.3 + 2.5.0 ``` ##### Gradle ```groovy -implementation 'cn.zhxu:okhttps-stomp:3.5.3' +implementation 'com.ejlchina:okhttps-stomp:2.5.0' ``` -#### 更多请参阅 [https://ok.zhxu.cn/v2/stomp.html](https://ok.zhxu.cn/v2/stomp.html) +#### 更多请参阅 [http://okhttps.ejlchina.com/v2/stomp.html](http://okhttps.ejlchina.com/v2/stomp.html) diff --git a/okhttps-stomp/pom.xml b/okhttps-stomp/pom.xml index 3ccaa125..bce460af 100644 --- a/okhttps-stomp/pom.xml +++ b/okhttps-stomp/pom.xml @@ -6,30 +6,24 @@ jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - cn.zhxu + com.ejlchina okhttps - ${project.version} + ${okhttps.version} - cn.zhxu + com.ejlchina okhttps-test - ${project.version} + ${okhttps.version} test - - org.jetbrains - annotations - 13.0 - compile - - + okhttps-stomp diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Message.java b/okhttps-stomp/src/main/java/cn/zhxu/stomp/Message.java deleted file mode 100644 index 6df8a05a..00000000 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Message.java +++ /dev/null @@ -1,57 +0,0 @@ -package cn.zhxu.stomp; - -import java.util.List; - - -public class Message { - - private final String command; - private final List
headers; - private final String payload; - - public Message(String command, List
headers) { - this(command, headers, null); - } - - public Message(String command, List
headers, String payload) { - this.command = command; - this.headers = headers; - this.payload = payload; - } - - public List
getHeaders() { - return headers; - } - - public String getPayload() { - return payload; - } - - public String getCommand() { - return command; - } - - - public String headerValue(String key) { - Header header = header(key); - if (header != null) { - return header.getValue(); - } - return null; - } - - public Header header(String key) { - if (headers != null) { - for (Header header : headers) { - if (header.getKey().equals(key)) return header; - } - } - return null; - } - - @Override - public String toString() { - return "Message {command='" + command + "', headers=" + headers +", payload='" + payload + "'}"; - } - -} diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/MsgCodec.java b/okhttps-stomp/src/main/java/cn/zhxu/stomp/MsgCodec.java deleted file mode 100644 index 1f83addd..00000000 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/MsgCodec.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.zhxu.stomp; - -import java.util.function.Consumer; - -/** - * Stomp 消息编解码器 - * @since v3.1.0 - */ -public interface MsgCodec { - - /** - * 编码 - * @param input Stomp 消息 - * @return 编码后的文本 - */ - String encode(Message input); - - /** - * 解码 - * @param input 输入 - * @param out 输出 - */ - void decode(String input, Consumer out); - -} diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/MsgCodecImpl.java b/okhttps-stomp/src/main/java/cn/zhxu/stomp/MsgCodecImpl.java deleted file mode 100644 index bcdb6fa3..00000000 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/MsgCodecImpl.java +++ /dev/null @@ -1,222 +0,0 @@ -package cn.zhxu.stomp; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - -/** - * Stomp 消息编解码器 - * @since v3.1.0 - */ -public class MsgCodecImpl implements MsgCodec { - - /** - * Command 结束符 - */ - private String commandEnd = "\n"; - - /** - * Headers 结束符 - */ - private String headersEnd = "\n\n"; - - /** - * Header 之间的分隔符 - */ - private String headerDelimiter = "\n"; - - /** - * Header 键值 间的分隔符 - */ - private String headerKvDelimiter = ":"; - - /** - * Body 结束符 - */ - private String bodyEnd = "\u0000"; - - /** - * 待解析的 Stomp 报文容器 - */ - private final StringBuilder pending = new StringBuilder(); - - @Override - public String encode(Message input) { - StringBuilder sb = new StringBuilder(); - sb.append(input.getCommand()).append(commandEnd); - List
headers = msgHeaders(input); - int hCnt = headers.size(); - for (int index = 0; index < hCnt; index++) { - Header header = headers.get(index); - sb.append(header.getKey()) - .append(headerKvDelimiter) - .append(header.getValue()); - if (index < hCnt - 1) { - sb.append(headerDelimiter); - } - } - sb.append(headersEnd); - String payload = input.getPayload(); - if (payload != null) { - sb.append(payload); - } - sb.append(bodyEnd); - return sb.toString(); - } - - protected List
msgHeaders(Message input) { - List
headers = input.getHeaders(); - return new ArrayList<>(headers); - } - - @Override - public synchronized void decode(String input, Consumer out) { - if (input == null || input.isEmpty()) { - return; - } - // 装入待解析容器 - pending.append(input); - // 开始解析 - decode(out, 0); - } - - /** - * @param out 输出 - * @param start 开始解析的问题 - */ - protected void decode(Consumer out, int start) { - cleanPendingStartData(start); - // Body 结尾符下标 - int bEndIdx = pending.indexOf(bodyEnd); - if (bEndIdx < 0) { - // 数据包尚未接收完毕，直接返回 - return; - } - // Command 结尾符下标 - int cEndIdx = pending.indexOf(commandEnd); - // Headers 结尾符下标 - int hEndIdx = pending.indexOf(headersEnd); - if (cEndIdx <= 0 || hEndIdx <= cEndIdx || bEndIdx <= hEndIdx) { - // 非法数据包，跳过一个字符重新解析 - decode(out, 1); - return; - } - // 解析 Command - String command = pending.substring(0, cEndIdx).trim(); - if (!isCommand(command)) { - // 非法数据包，跳过一个字符重新解析 - decode(out, 1); - return; - } - // 解析 Headers - List
headers = decodeHeaders(cEndIdx, hEndIdx); - // 解析 Body - String payload = pending.substring(hEndIdx + headersEnd.length(), bEndIdx); - // 输出解析结果 - out.accept(createMessage(command, headers, payload)); - // 重新解析 bodyEnd 之后的数据 - decode(out, bEndIdx + bodyEnd.length()); - } - - protected void cleanPendingStartData(int start) { - if (start > 0) { - // 清空 start 之前的数据 - pending.delete(0, start); - } - // Command 开始符下标 - int index = 0; - for (int i = 0; i < pending.length(); i++) { - char c = pending.charAt(i); - if (isCommandChar(c)) { - index = i; - break; - } - } - if (index > 0) { - // 清空 Command 之前的数据 - pending.delete(0, index); - } - } - - /** - * 解析 Headers - * @param cEndIdx Command 结尾符下标 - * @param hEndIdx Headers 结尾符下标 - * @return Headers - */ - protected List
decodeHeaders(int cEndIdx, int hEndIdx) { - String[] strHeaders = pending.substring(cEndIdx + commandEnd.length(), hEndIdx) - .split(headerDelimiter); - List
headers = new ArrayList<>(strHeaders.length); - for (String header : strHeaders) { - String[] hv = header.split(headerKvDelimiter); - if (hv.length == 2) { - headers.add(new Header(hv[0], hv[1])); - } - } - return headers; - } - - protected boolean isCommand(String command) { - return !command.isEmpty() && command.matches("[A-Z]+"); - } - - protected boolean isCommandChar(char c) { - return c >= 'A' && c <= 'Z'; - } - - protected Message createMessage(String command, List
headers, String payload) { - return new Message(command, headers, payload); - } - - public String getCommandEnd() { - return commandEnd; - } - - public void setCommandEnd(String commandEnd) { - if (commandEnd != null) { - this.commandEnd = commandEnd; - } - } - - public String getHeadersEnd() { - return headersEnd; - } - - public void setHeadersEnd(String headersEnd) { - if (headersEnd != null) { - this.headersEnd = headersEnd; - } - } - - public String getBodyEnd() { - return bodyEnd; - } - - public void setBodyEnd(String bodyEnd) { - if (bodyEnd != null) { - this.bodyEnd = bodyEnd; - } - } - - public String getHeaderDelimiter() { - return headerDelimiter; - } - - public void setHeaderDelimiter(String headerDelimiter) { - if (headerDelimiter != null) { - this.headerDelimiter = headerDelimiter; - } - } - - public String getHeaderKvDelimiter() { - return headerKvDelimiter; - } - - public void setHeaderKvDelimiter(String headerKvDelimiter) { - if (headerKvDelimiter != null) { - this.headerKvDelimiter = headerKvDelimiter; - } - } - -} diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Subscriber.java b/okhttps-stomp/src/main/java/cn/zhxu/stomp/Subscriber.java deleted file mode 100644 index 0378012a..00000000 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Subscriber.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.zhxu.stomp; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; -import java.util.function.Consumer; - - -public class Subscriber { - - private final Stomp stomp; - private final String id; - private final String destination; - private final Consumer callback; - private final List
headers; - private boolean subscribed; - - public Subscriber(Stomp stomp, String destination, Consumer callback, List
headers) { - this.stomp = stomp; - this.id = UUID.randomUUID().toString(); - this.destination = destination; - this.callback = callback; - this.headers = headers; - } - - public void subscribe() { - synchronized (stomp) { - if (subscribed) { - return; - } - if (stomp.isConnected()) { - doSubscribe(); - } - } - } - - private void doSubscribe() { - List
headers = new ArrayList<>(); - headers.add(new Header(Header.ID, id)); - headers.add(new Header(Header.DESTINATION, destination)); - boolean ackNotAdded = true; - if (this.headers != null) { - for (Header header : this.headers) { - if (Header.ACK.equals(header.getKey())) { - ackNotAdded = false; - } - String key = header.getKey(); - if (!Header.ID.equals(key) && !Header.DESTINATION.equals(key)) { - headers.add(header); - } - } - } - if (ackNotAdded) { - headers.add(new Header(Header.ACK, stomp.isAutoAck() ? Stomp.AUTO_ACK : Stomp.CLIENT_ACK)); - } - stomp.send(new Message(Commands.SUBSCRIBE, headers, null)); - subscribed = true; - } - - public void unsubscribe() { - synchronized (stomp) { - if (stomp.isConnected()) { - List
headers = Collections.singletonList(new Header(Header.ID, id)); - stomp.send(new Message(Commands.UNSUBSCRIBE, headers, null)); - } - } - resetStatus(); - } - - public void resetStatus() { - subscribed = false; - } - - public boolean destinationEqual(String destination) { - return destination != null && destination.equals(this.destination); - } - - public boolean tryCallback(String id, Message msg) { - if (this.id.equals(id)) { - callback.accept(msg); - return true; - } - return false; - } - -} diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Commands.java b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Commands.java similarity index 97% rename from okhttps-stomp/src/main/java/cn/zhxu/stomp/Commands.java rename to okhttps-stomp/src/main/java/com/ejlchina/stomp/Commands.java index 9a59bb4c..6cfb0dde 100644 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Commands.java +++ b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Commands.java @@ -1,4 +1,4 @@ -package cn.zhxu.stomp; +package com.ejlchina.stomp; /** * 命令 diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Header.java b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Header.java similarity index 97% rename from okhttps-stomp/src/main/java/cn/zhxu/stomp/Header.java rename to okhttps-stomp/src/main/java/com/ejlchina/stomp/Header.java index e3441c96..994d9079 100644 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Header.java +++ b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Header.java @@ -1,4 +1,4 @@ -package cn.zhxu.stomp; +package com.ejlchina.stomp; public class Header { diff --git a/okhttps-stomp/src/main/java/com/ejlchina/stomp/Message.java b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Message.java new file mode 100644 index 00000000..056fcac0 --- /dev/null +++ b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Message.java @@ -0,0 +1,109 @@ +package com.ejlchina.stomp; + +import java.util.ArrayList; +import java.util.List; + +import com.ejlchina.okhttps.Platform; + + +public class Message { + + private final String command; + private final List
headers; + private final String payload; + + public Message(String command, List
headers) { + this(command, headers, null); + } + + public Message(String command, List
headers, String payload) { + this.command = command; + this.headers = headers; + this.payload = payload; + } + + public List
getHeaders() { + return headers; + } + + public String getPayload() { + return payload; + } + + public String getCommand() { + return command; + } + + + public String headerValue(String key) { + Header header = header(key); + if (header != null) { + return header.getValue(); + } + return null; + } + + public Header header(String key) { + if (headers != null) { + for (Header header : headers) { + if (header.getKey().equals(key)) return header; + } + } + return null; + } + + + public String compile(boolean legacyWhitespace) { + StringBuilder builder = new StringBuilder(); + builder.append(command).append('\n'); + for (Header header : headers) { + builder.append(header.getKey()).append(':').append(header.getValue()).append('\n'); + } + builder.append('\n'); + if (payload != null) { + builder.append(payload); + if (legacyWhitespace) builder.append("\n\n"); + } + builder.append("\u0000"); + return builder.toString(); + } + + public static Message from(String data) { + if (data == null || data.trim().isEmpty()) { + return new Message(Commands.UNKNOWN, null, data); + } + + int cmdIndex = data.indexOf("\n"); + int mhIndex = data.indexOf("\n\n"); + + if (cmdIndex >= mhIndex) { + Platform.logError("非法的 STOMP 消息：" + data); + return null; + } + String command = data.substring(0, cmdIndex); + String[] headers = data.substring(cmdIndex + 1, mhIndex).split("\n"); + + List
headerList = new ArrayList<>(headers.length); + for (String header : headers) { + String[] hv = header.split(":"); + if (hv.length == 2) { + headerList.add(new Header(hv[0], hv[1])); + } + } + String payload = null; + if (data.length() > mhIndex + 2) { + if (data.endsWith("\u0000\n") && data.length() > mhIndex + 4) { + payload = data.substring(mhIndex + 2, data.length() - 2); + } else if (data.endsWith("\u0000") && data.length() > mhIndex + 3) { + payload = data.substring(mhIndex + 2, data.length() - 1); + } + } + return new Message(command, headerList, payload); + } + + @Override + public String toString() { + return "Message {command='" + command + "', headers=" + headers +", payload='" + payload + "'}"; + } + +} diff --git a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Stomp.java b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Stomp.java similarity index 52% rename from okhttps-stomp/src/main/java/cn/zhxu/stomp/Stomp.java rename to okhttps-stomp/src/main/java/com/ejlchina/stomp/Stomp.java index f8555564..ed0ad2fe 100644 --- a/okhttps-stomp/src/main/java/cn/zhxu/stomp/Stomp.java +++ b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Stomp.java @@ -1,11 +1,13 @@ -package cn.zhxu.stomp; +package com.ejlchina.stomp; -import cn.zhxu.okhttps.Platform; -import cn.zhxu.okhttps.WHttpTask; -import cn.zhxu.okhttps.WebSocket; +import com.ejlchina.okhttps.OnCallback; +import com.ejlchina.okhttps.Platform; +import com.ejlchina.okhttps.WebSocket; +import com.ejlchina.okhttps.internal.WebSocketTask; + +import okio.ByteString; import java.util.*; -import java.util.function.Consumer; /** * 基于 OkHttps websockt 的 Stomp 客户端 @@ -20,25 +22,21 @@ public class Stomp { public static final String CLIENT_ACK = "client"; private final boolean autoAck; - private boolean connected = false; // 是否已连接 - private boolean connecting = false; // 是否连接中 - private boolean disconnecting = false; // 是否断开连接中 - private final WHttpTask task; + private boolean connected; + private final WebSocketTask task; private WebSocket websocket; - + private boolean legacyWhitespace = false; private final List subscribers; - private Consumer onConnected; - private Consumer onDisconnected; - private Consumer onException; - private Consumer onError; - private final String disReceipt; + private OnCallback onConnected; + private OnCallback onDisconnected; + private OnCallback onError; - private MsgCodec msgCodec = new MsgCodecImpl(); + private final String disReceipt; - private Stomp(WHttpTask task, boolean autoAck) { + private Stomp(WebSocketTask task, boolean autoAck) { this.task = task; this.autoAck = autoAck; this.subscribers = Collections.synchronizedList(new ArrayList<>()); @@ -50,7 +48,7 @@ private Stomp(WHttpTask task, boolean autoAck) { * @param task 底层的 WebSocket 连接 * @return Stomp */ - public static Stomp over(WHttpTask task) { + public static Stomp over(WebSocketTask task) { return over(task, true); } @@ -60,7 +58,7 @@ public static Stomp over(WHttpTask task) { * @param autoAck 是否自动确定消息 * @return Stomp */ - public static Stomp over(WHttpTask task, boolean autoAck) { + public static Stomp over(WebSocketTask task, boolean autoAck) { return new Stomp(task, autoAck); } @@ -85,126 +83,52 @@ public Stomp connect() { * @param headers Stomp 头信息 * @return Stomp */ - public synchronized Stomp connect(List
headers) { - if (connected || connecting) { + public Stomp connect(List
headers) { + if (connected) { return this; } - websocket = task - .setOnOpen((ws, res) -> doOnOpened(headers)) - .setOnMessage((ws, msg) -> msgCodec.decode(msg.toString(), this::receive)) - .setOnException((ws, e) -> doOnException(e)) - .setOnClosed((ws, close) -> doOnClosed(close)) + websocket = task.setOnOpen((ws, res) -> { + int pingSecs = task.pingSeconds(); + int pongSecs = task.pongSeconds(); + List
cHeaders = new ArrayList<>(); + cHeaders.add(new Header(Header.VERSION, SUPPORTED_VERSIONS)); + if (pingSecs > 0 && pongSecs > 0) { + cHeaders.add(new Header(Header.HEART_BEAT, pingSecs * 1000 + "," + pongSecs * 1000)); + } + if (headers != null) { + cHeaders.addAll(headers); + } + send(new Message(Commands.CONNECT, cHeaders, null)); + }) + .setOnMessage((ws, msg) -> { + Message message = Message.from(msg.toString()); + if (message != null) { + receive(message); + } + }) + .setOnClosed((ws, close) -> { + if (onDisconnected != null) { + onDisconnected.on(close); + } + connected = false; + }) .listen(); - connecting = true; - disconnecting = false; return this; } - private synchronized void doOnOpened(List
headers) { - if (websocket != null) { - int pingSecs = task.pingSeconds(); - int pongSecs = task.pongSeconds(); - List
cHeaders = new ArrayList<>(); - cHeaders.add(new Header(Header.VERSION, SUPPORTED_VERSIONS)); - if (pingSecs > 0 && pongSecs > 0) { - cHeaders.add(new Header(Header.HEART_BEAT, pingSecs * 1000 + "," + pongSecs * 1000)); - } - if (headers != null) { - cHeaders.addAll(headers); - } - send(new Message(Commands.CONNECT, cHeaders, null)); - } - } - - private synchronized void doOnException(Throwable throwable) { - Consumer listener = onException; - if (listener != null) { - listener.accept(throwable); - } - disconnecting = false; - connecting = false; - } - - private synchronized void doOnClosed(WebSocket.Close close) { - connected = false; - connecting = false; - disconnecting = false; - websocket = null; - for (Subscriber subscriber : subscribers) { - subscriber.resetStatus(); - } - Consumer listener = onDisconnected; - if (listener != null) { - listener.accept(close); - } - } - /** * @since 2.5.0 * @return 是否已连接 */ public boolean isConnected() { - return connected && websocket != null; - } - - /** - * @since 3.1.0 - * @return 是否正在连接 - */ - public boolean isConnecting() { - return connecting && websocket != null; - } - - /** - * @since 3.1.0 - * @return 是否正在断开连接 - */ - public boolean isDisconnecting() { - return disconnecting && websocket != null; - } - - /** - * 断开连接，将先发送 DISCONNECT 消息给服务器，服务器回复后断开连接 - * 默认等待服务器为 10 秒，10秒后自动关闭 - */ - public void disconnect() { - disconnect(10); - } - - /** - * @since v3.1.0 - * 断开连接，将先发送 DISCONNECT 消息给服务器，服务器回复后断开连接 - * @param maxWaitSeconds 最大等待服务器回复时间，超出后自动关闭 - */ - public void disconnect(int maxWaitSeconds) { - new Timer().schedule(new TimerTask() { - @Override - public void run() { - disconnect(true); - } - }, 1000L * maxWaitSeconds); - Header header = new Header(Header.RECEIPT, disReceipt); - List
headers = Collections.singletonList(header); - send(new Message(Commands.DISCONNECT, headers)); - disconnecting = true; - connecting = false; + return connected && websocket.status() == WebSocket.STATUS_CONNECTED; } /** * 断开连接 - * @param immediate 是否立即断开 - * @since v3.1.0 */ - public synchronized void disconnect(boolean immediate) { - if (immediate) { - WebSocket ws = websocket; - if (ws != null) { - ws.close(1000, "disconnect by user"); - websocket = null; - } - } else { - disconnect(10); - } + public void disconnect() { + send(new Message(Commands.DISCONNECT, Collections.singletonList(new Header(Header.RECEIPT, disReceipt)))); } /** @@ -212,7 +136,7 @@ public synchronized void disconnect(boolean immediate) { * @param onConnected 连接成功回调 * @return Stomp */ - public Stomp setOnConnected(Consumer onConnected) { + public Stomp setOnConnected(OnCallback onConnected) { this.onConnected = onConnected; return this; } @@ -222,28 +146,17 @@ public Stomp setOnConnected(Consumer onConnected) { * @param onDisconnected 断开连接回调 * @return Stomp */ - public Stomp setOnDisconnected(Consumer onDisconnected) { + public Stomp setOnDisconnected(OnCallback onDisconnected) { this.onDisconnected = onDisconnected; return this; } - - /** - * 错误回调（底层连接异常） - * @since v3.1.1 - * @param onException 异常回调 - * @return Stomp - */ - public Stomp setOnException(Consumer onException) { - this.onException = onException; - return this; - } - + /** * 错误回调（服务器返回的错误信息） * @param onError 错误回调 * @return Stomp */ - public Stomp setOnError(Consumer onError) { + public Stomp setOnError(OnCallback onError) { this.onError = onError; return this; } @@ -282,11 +195,10 @@ public void sendTo(String destination, String data) { * @param message 消息 */ public void send(Message message) { - WebSocket ws = websocket; - if (ws == null) { + if (websocket == null) { throw new IllegalArgumentException("You must call connect before send"); } - ws.send(msgCodec.encode(message)); + websocket.send(message.compile(legacyWhitespace)); } /** @@ -295,7 +207,7 @@ public void send(Message message) { * @param callback 消息回调 * @return Stomp */ - public Stomp topic(String destination, Consumer callback) { + public Stomp topic(String destination, OnCallback callback) { return topic(destination, null, callback); } @@ -306,7 +218,7 @@ public Stomp topic(String destination, Consumer callback) { * @param callback 消息回调 * @return Stomp */ - public Stomp topic(String destination, List
headers, Consumer callback) { + public Stomp topic(String destination, List
headers, OnCallback callback) { return subscribe(TOPIC + destination, headers, callback); } @@ -316,7 +228,7 @@ public Stomp topic(String destination, List
headers, Consumer c * @param callback 消息回调 * @return Stomp */ - public Stomp queue(String destination, Consumer callback) { + public Stomp queue(String destination, OnCallback callback) { return queue(destination, null, callback); } @@ -327,7 +239,7 @@ public Stomp queue(String destination, Consumer callback) { * @param callback 消息回调 * @return Stomp */ - public Stomp queue(String destination, List
headers, Consumer callback) { + public Stomp queue(String destination, List
headers, OnCallback callback) { return subscribe(QUEUE + destination, headers, callback); } @@ -338,14 +250,13 @@ public Stomp queue(String destination, List
headers, Consumer c * @param callback 消息回调 * @return Stomp */ - public synchronized Stomp subscribe(String destination, List
headers, Consumer callback) { + public synchronized Stomp subscribe(String destination, List
headers, OnCallback callback) { if (destination == null || destination.isEmpty()) { throw new IllegalArgumentException("destination can not be empty!"); } for (Subscriber s: subscribers) { if (s.destinationEqual(destination)) { - Platform.logError("The destination [" + destination + "] has already been subscribed!"); - return this; + throw new IllegalStateException("The destination [" + destination + "] has already been subscribed!"); } } Subscriber subscriber = new Subscriber(this, destination, callback, headers); @@ -367,7 +278,7 @@ public void ack(Message message) { headers.add(msgId); send(new Message(Commands.ACK, headers, null)); } else { - Platform.logError("subscription and message-id not found in " + message + ", so it can not be ack!"); + Platform.logError("subscription and message-id not found in " + message.toString() + ", so it can not be ack!"); } } @@ -403,14 +314,31 @@ public synchronized void unsubscribe(String destination) { } } - private synchronized void receive(Message msg) { + private void receive(Message msg) { String command = msg.getCommand(); if (Commands.CONNECTED.equals(command)) { String hbHeader = msg.headerValue(Header.HEART_BEAT); + int pingSecs = task.pingSeconds(); + int pongSecs = task.pongSeconds(); + if (hbHeader != null && (pingSecs > 0 || pongSecs > 0)) { + String[] heartbeats = hbHeader.split(","); + int pingSeconds = Integer.parseInt(heartbeats[1]) / 1000; + int pongSeconds = Integer.parseInt(heartbeats[0]) / 1000; + if (pingSeconds > 0 || pongSeconds > 0) { + if (task.pingSupplier() == null) { + task.pingSupplier(() -> ByteString.of((byte) 0x0A)); + } + task.heatbeat(Math.max(pingSeconds, pingSecs), Math.max(pongSeconds, pongSecs)); + } + } synchronized (this) { connected = true; - connecting = false; - onConnectedFrameReceived(hbHeader); + for (Subscriber s: subscribers) { + s.subscribe(); + } + } + if (onConnected != null) { + onConnected.on(this); } } else if (Commands.MESSAGE.equals(command)) { String id = msg.headerValue(Header.SUBSCRIPTION); @@ -424,47 +352,19 @@ private synchronized void receive(Message msg) { } else if (Commands.RECEIPT.equals(command)) { if (disReceipt.equals(msg.headerValue(Header.RECEIPT_ID))) { // 断开连接 - disconnect(true); + if (websocket != null) { + websocket.close(1000, "disconnect by user"); + } } } else if (Commands.ERROR.equals(command)) { - Consumer listener = onError; - if (listener != null) { - listener.accept(msg); + if (onError != null) { + onError.on(msg); } - connecting = false; } } - private void onConnectedFrameReceived(String hbHeader) { - int pingSecs = task.pingSeconds(); - int pongSecs = task.pongSeconds(); - if (hbHeader != null && (pingSecs > 0 || pongSecs > 0)) { - String[] heartbeats = hbHeader.split(","); - int pingSeconds = Integer.parseInt(heartbeats[1]) / 1000; - int pongSeconds = Integer.parseInt(heartbeats[0]) / 1000; - if (pingSeconds > 0 || pongSeconds > 0) { - if (task.pingSupplier() == null) { - task.pingSupplier(() -> "\n"); - } - task.heatbeat(Math.max(pingSeconds, pingSecs), Math.max(pongSeconds, pongSecs)); - } - } - Consumer listener = onConnected; - if (listener != null) { - listener.accept(this); - } - // 为兼容 Android 低版本，这里不使用 JDK8 的 List.forEach(..) 方法 - for (Subscriber subscriber: subscribers) { - subscriber.subscribe(); - } - } - - public MsgCodec getMsgCodec() { - return msgCodec; - } - - public void setMsgCodec(MsgCodec msgCodec) { - this.msgCodec = msgCodec; + public void setLegacyWhitespace(boolean legacyWhitespace) { + this.legacyWhitespace = legacyWhitespace; } } diff --git a/okhttps-stomp/src/main/java/com/ejlchina/stomp/Subscriber.java b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Subscriber.java new file mode 100644 index 00000000..7f6023a7 --- /dev/null +++ b/okhttps-stomp/src/main/java/com/ejlchina/stomp/Subscriber.java @@ -0,0 +1,71 @@ +package com.ejlchina.stomp; + +import com.ejlchina.okhttps.OnCallback; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; + + +public class Subscriber { + + private final Stomp stomp; + private final String id; + private final String destination; + private final OnCallback callback; + private final List
headers; + private boolean subscribed; + + public Subscriber(Stomp stomp, String destination, OnCallback callback, List
headers) { + this.stomp = stomp; + this.id = UUID.randomUUID().toString(); + this.destination = destination; + this.callback = callback; + this.headers = headers; + } + + public void subscribe() { + if (stomp.isConnected() && !subscribed) { + List
headers = new ArrayList<>(); + headers.add(new Header(Header.ID, id)); + headers.add(new Header(Header.DESTINATION, destination)); + boolean ackNotAdded = true; + if (this.headers != null) { + for (Header header : this.headers) { + if (Header.ACK.equals(header.getKey())) { + ackNotAdded = false; + } + String key = header.getKey(); + if (!Header.ID.equals(key) && !Header.DESTINATION.equals(key)) { + headers.add(header); + } + } + } + if (ackNotAdded) { + headers.add(new Header(Header.ACK, stomp.isAutoAck() ? Stomp.AUTO_ACK : Stomp.CLIENT_ACK)); + } + stomp.send(new Message(Commands.SUBSCRIBE, headers, null)); + subscribed = true; + } + } + + public void unsubscribe() { + List
headers = Collections.singletonList(new Header(Header.ID, id)); + stomp.send(new Message(Commands.UNSUBSCRIBE, headers, null)); + subscribed = false; + } + + public boolean destinationEqual(String destination) { + return destination != null && destination.equals(this.destination); + } + + public boolean tryCallback(String id, Message msg) { + if (this.id.equals(id)) { + callback.on(msg); + return true; + } + return false; + } + +} diff --git a/okhttps-stomp/src/test/java/cn/zhxu/stomp/MsgCodecTestCases.java b/okhttps-stomp/src/test/java/cn/zhxu/stomp/MsgCodecTestCases.java deleted file mode 100644 index 86eff6c8..00000000 --- a/okhttps-stomp/src/test/java/cn/zhxu/stomp/MsgCodecTestCases.java +++ /dev/null @@ -1,78 +0,0 @@ -package cn.zhxu.stomp; - -import org.junit.Assert; -import org.junit.Test; - -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; - - -public class MsgCodecTestCases { - - static class DecodeCallback implements Consumer { - - private final List list = new ArrayList<>(); - - @Override - public void accept(Message data) { - list.add(data); - } - - public List getList() { - return list; - } - } - - - @Test - public void testMsgCodecImplDecode1() { - MsgCodec msgCodec = new MsgCodecImpl(); - DecodeCallback callback = new DecodeCallback(); - msgCodec.decode("MESSAGE\nk1:v1\nk2:v2\n\n123456\u0000", callback); - List list = callback.getList(); - Assert.assertEquals(1, list.size()); - Message message = list.get(0); - Assert.assertEquals("MESSAGE", message.getCommand()); - Assert.assertEquals("123456", message.getPayload()); - Assert.assertEquals("v1", message.headerValue("k1")); - Assert.assertEquals("v2", message.headerValue("k2")); - } - - @Test - public void testMsgCodecImplDecode2() { - MsgCodec msgCodec = new MsgCodecImpl(); - DecodeCallback callback = new DecodeCallback(); - msgCodec.decode(" \n MESSAGE\nk1:v1\nk2:v2\n\n123456\u0000", callback); - List list = callback.getList(); - Assert.assertEquals(1, list.size()); - Message message = list.get(0); - Assert.assertEquals("MESSAGE", message.getCommand()); - Assert.assertEquals("123456", message.getPayload()); - Assert.assertEquals("v1", message.headerValue("k1")); - Assert.assertEquals("v2", message.headerValue("k2")); - } - - @Test - public void testMsgCodecImplDecode3() { - MsgCodec msgCodec = new MsgCodecImpl(); - DecodeCallback callback = new DecodeCallback(); - msgCodec.decode(" \n ", callback); - msgCodec.decode(" MESSAGE\nk1:", callback); - msgCodec.decode("v1\nk2:v2\n\n12345", callback); - msgCodec.decode("6\u0000", callback); - msgCodec.decode("\n\nMS", callback); - msgCodec.decode("\n\nMES", callback); - msgCodec.decode("SAGE\nk1:", callback); - msgCodec.decode("v1\nk2:v2\n\n12345", callback); - msgCodec.decode("6\u0000", callback); - List list = callback.getList(); - Assert.assertEquals(2, list.size()); - Message message = list.get(1); - Assert.assertEquals("MESSAGE", message.getCommand()); - Assert.assertEquals("123456", message.getPayload()); - Assert.assertEquals("v1", message.headerValue("k1")); - Assert.assertEquals("v2", message.headerValue("k2")); - } - -} diff --git a/okhttps-stomp/src/test/java/cn/zhxu/stomp/Test.java b/okhttps-stomp/src/test/java/cn/zhxu/stomp/Test.java deleted file mode 100644 index 0564b09e..00000000 --- a/okhttps-stomp/src/test/java/cn/zhxu/stomp/Test.java +++ /dev/null @@ -1,32 +0,0 @@ -package cn.zhxu.stomp; - -import cn.zhxu.okhttps.OkHttps; - -import java.util.ArrayList; -import java.util.List; - -public class Test { - - public static void main(String[] args) throws InterruptedException { - - List
headers = new ArrayList<>(); - headers.add(new Header("login", "xxx")); - headers.add(new Header("passcode", "xxx")); - headers.add(new Header("host", "test")); - - Stomp stomp = Stomp.over(OkHttps.webSocket("ws://172.31.0.202:15674/ws").heatbeat(10, 10)) - .setOnConnected(s -> { - System.out.println("OnConnected"); - }) - .connect(headers); - - stomp.topic("/aaa", msg -> { - System.out.println("收到消息：" + msg); - System.out.println("内容：" + msg.getPayload()); - }); - - Thread.sleep(1000000); - - } - -} diff --git a/okhttps-stomp/src/test/java/com/ejlchina/stomp/TestCases.java b/okhttps-stomp/src/test/java/com/ejlchina/stomp/TestCases.java new file mode 100644 index 00000000..0c4ff051 --- /dev/null +++ b/okhttps-stomp/src/test/java/com/ejlchina/stomp/TestCases.java @@ -0,0 +1,52 @@ +package com.ejlchina.stomp; + +import com.ejlchina.okhttps.test.BaseTest; +import org.junit.Test; + +import com.ejlchina.okhttps.OkHttps; + +import java.util.concurrent.CountDownLatch; + + +public class TestCases extends BaseTest { + + + static final int COUNT = 100000; + static final int INTERVAL = 1; + + @Test + public void testA() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(COUNT); + Stomp.over(OkHttps.webSocket("ws://localhost:8080/ws").heatbeat(10, 10)) + .setOnConnected(stomp -> { + log("A 已连接"); + for (int i = 0; i < COUNT; i++) { + String message = "Hello : " + i; + stomp.sendTo("/queue/test", message); + log("A 发送：" + message); + latch.countDown(); + sleep(INTERVAL); + } + }) + .setOnDisconnected(c -> log("A 已断开：" + c)) + .setOnError(msg -> log("A 错误：" + msg)) + .connect(); + latch.await(); + } + + @Test + public void testB() throws InterruptedException { + CountDownLatch latch = new CountDownLatch(COUNT); + Stomp stomp = Stomp.over(OkHttps.webSocket("ws://localhost:8080/ws").heatbeat(10, 10)) + .setOnConnected(s -> log("B 已连接")) + .setOnDisconnected(c -> log("B 已断开：" + c)) + .setOnError(msg -> log("B 错误：" + msg)) + .connect(); + stomp.queue("/test", msg -> { + log("B 接收：" + msg.getPayload()); + latch.countDown(); + }); + latch.await(); + } + +} diff --git a/okhttps-test/.gitignore b/okhttps-test/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/okhttps-test/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/okhttps-test/pom.xml b/okhttps-test/pom.xml index cddf23cb..2bd6616b 100644 --- a/okhttps-test/pom.xml +++ b/okhttps-test/pom.xml @@ -6,16 +6,16 @@ jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - cn.zhxu + com.ejlchina okhttps - ${project.version} + ${okhttps.version} com.squareup.okhttp3 @@ -27,13 +27,6 @@ junit ${junit.version} - - - com.sun.xml.bind - jaxb-impl - 2.3.5 - - diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/BaseTestCases.java b/okhttps-test/src/main/java/cn/zhxu/okhttps/test/BaseTestCases.java deleted file mode 100644 index ad49040c..00000000 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/BaseTestCases.java +++ /dev/null @@ -1,347 +0,0 @@ -package cn.zhxu.okhttps.test; - -import cn.zhxu.data.Array; -import cn.zhxu.data.Mapper; -import cn.zhxu.data.TypeRef; -import cn.zhxu.okhttps.HTTP; -import cn.zhxu.okhttps.MsgConvertor; -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.MockWebServer; -import org.junit.Assert; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.lang.reflect.Type; -import java.nio.charset.StandardCharsets; -import java.util.List; -import java.util.Set; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -public abstract class BaseTestCases { - - final MockWebServer server = new MockWebServer(); - - final HTTP http; - - final MsgConvertor msgConvertor; - - final User user1 = new User(1, "Jack"); - final User user2 = new User(1, "Tom"); - - public BaseTestCases(MsgConvertor msgConvertor) { - this.http = HTTP.builder() - .baseUrl("http://" + server.getHostName() + ":" + server.getPort()) - .addMsgConvertor(msgConvertor) - .addMsgConvertor(new MsgConvertor.FormConvertor(msgConvertor)) - .build(); - this.msgConvertor = msgConvertor; - } - - public void run() throws Exception { - test_01_toMapper(); - test_02_toArray(); - test_03_serializeBean(); - test_04_toBean(); - test_05_toResult(); - test_06_toList(); - test_07_httpOnResponse(); - test_08_httpOnResBody(); - test_09_httpOnResMapper(); - test_10_httpOnResArray(); - test_11_httpOnResBean(); - test_12_httpOnResList(); - test_13_httpOnResString(); - test_14_httpMultiCallback(); - test_15_httpMultiCallback(); - testHttpSync(); - } - - abstract String getUser1Str(); - - abstract String getUser1ResultStr(); - - abstract String getUserListStr(); - - void assertUser1(User user) { - Assert.assertEquals(1, user.getId()); - Assert.assertEquals("Jack", user.getName()); - } - - void assertUser2(User user) { - Assert.assertEquals(2, user.getId()); - Assert.assertEquals("Tom", user.getName()); - } - - void assertMapper(Mapper mapper, int id, String name) { - Assert.assertEquals(2, mapper.size()); - mapper.forEach((key, data) -> { - if ("id".equals(key)) { - Assert.assertEquals(id, data.toInt()); - } - if ("name".equals(key)) { - Assert.assertEquals(name, data.toString()); - } - }); - Set keys = mapper.keySet(); - Assert.assertEquals(2, keys.size()); - Assert.assertTrue(keys.contains("id")); - Assert.assertTrue(keys.contains("name")); - Assert.assertFalse(mapper.isEmpty()); - Assert.assertEquals(2, mapper.size()); - Assert.assertEquals(id, mapper.getInt("id")); - Assert.assertFalse(mapper.has("age")); - Assert.assertEquals(0, mapper.getInt("age")); - Assert.assertEquals(name, mapper.getString("name")); - } - - void assertMapper1(Mapper mapper) { - assertMapper(mapper, 1, "Jack"); - assertUser1(mapper.toBean(User.class)); - } - - void assertMapper2(Mapper mapper) { - assertMapper(mapper, 2, "Tom"); - assertUser2(mapper.toBean(User.class)); - } - - void assertList(List list) { - Assert.assertEquals(2, list.size()); - assertUser1(list.get(0)); - assertUser2(list.get(1)); - } - - void assertArray(Array array) { - Assert.assertEquals(2, array.size()); - array.forEach((index, data) -> { - if (index == 0) { - assertMapper1(data.toMapper()); - } - if (index == 1) { - assertMapper2(data.toMapper()); - } - }); - assertMapper1(array.getMapper(0)); - assertMapper2(array.getMapper(1)); - assertList(array.toList(User.class)); - } - - void assertUser1Result(Result result) { - Assert.assertEquals(200, result.getCode()); - Assert.assertEquals("ok", result.getMsg()); - assertUser1(result.getData()); - } - - void test_01_toMapper() { - InputStream in = new ByteArrayInputStream(getUser1Str().getBytes(StandardCharsets.UTF_8)); - assertMapper1(msgConvertor.toMapper(in, StandardCharsets.UTF_8)); - assertMapper1(msgConvertor.toMapper(getUser1Str())); - System.out.println("case 01 passed!"); - } - - void test_02_toArray() { - InputStream in = new ByteArrayInputStream(getUserListStr().getBytes(StandardCharsets.UTF_8)); - assertArray(msgConvertor.toArray(in, StandardCharsets.UTF_8)); - assertArray(msgConvertor.toArray(getUserListStr())); - System.out.println("case 02 passed!"); - } - - void test_03_serializeBean() { - byte[] data = msgConvertor.serialize(user1, StandardCharsets.UTF_8); - Assert.assertEquals(getUser1Str(), new String(data, StandardCharsets.UTF_8)); - Assert.assertEquals(getUser1Str(), msgConvertor.serialize(user1)); - System.out.println("case 03 passed!"); - } - - void test_04_toBean() { - String json = getUser1Str(); - InputStream in = new ByteArrayInputStream(json.getBytes()); - assertUser1(msgConvertor.toBean(User.class, in, StandardCharsets.UTF_8)); - assertUser1(msgConvertor.toBean(User.class, json)); - System.out.println("case 04 passed!"); - } - - void test_05_toResult() { - String json = getUser1ResultStr(); - InputStream in = new ByteArrayInputStream(json.getBytes()); - Type type = new TypeRef>() {}.getType(); - assertUser1Result(msgConvertor.toBean(type, in, StandardCharsets.UTF_8)); - assertUser1Result(msgConvertor.toBean(type, json)); - System.out.println("case 05 passed!"); - } - - void test_06_toList() { - String json = getUserListStr(); - InputStream in = new ByteArrayInputStream(json.getBytes()); - assertList(msgConvertor.toList(User.class, in, StandardCharsets.UTF_8)); - assertList(msgConvertor.toList(User.class, json)); - System.out.println("case 06 passed!"); - } - - void test_07_httpOnResponse() throws InterruptedException { - server.enqueue(new MockResponse().setBody(getUser1Str())); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResponse(res -> { - assertUser1(res.getBody().toBean(User.class)); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 07 passed!"); - } - - void test_08_httpOnResBody() throws InterruptedException { - server.enqueue(new MockResponse().setBody(getUser1Str())); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResBody(body -> { - assertUser1(body.toBean(User.class)); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 08 passed!"); - } - - void test_09_httpOnResMapper() throws InterruptedException { - server.enqueue(new MockResponse().setBody(getUser1Str())); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResMapper(mapper -> { - assertMapper1(mapper); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 09 passed!"); - } - - void test_10_httpOnResArray() throws InterruptedException { - server.enqueue(new MockResponse().setBody(getUserListStr())); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResArray(array -> { - assertArray(array); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 10 passed!"); - } - - void test_11_httpOnResBean() throws InterruptedException { - server.enqueue(new MockResponse().setBody(getUser1Str())); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResBean(User.class, user -> { - assertUser1(user); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1000, TimeUnit.SECONDS)); - System.out.println("case 11 passed!"); - } - - void test_12_httpOnResList() throws InterruptedException { - server.enqueue(new MockResponse().setBody(getUserListStr())); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResList(User.class, list -> { - assertList(list); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 12 passed!"); - } - - void test_13_httpOnResString() throws InterruptedException { - String body = getUser1Str(); - server.enqueue(new MockResponse().setBody(body)); - CountDownLatch latch = new CountDownLatch(1); - http.async("/") - .setOnResString(str -> { - Assert.assertEquals(body, str); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 13 passed!"); - } - - void test_14_httpMultiCallback() throws InterruptedException { - String user1Str = getUser1Str(); - server.enqueue(new MockResponse().setBody(user1Str)); - CountDownLatch latch = new CountDownLatch(5); - http.async("/") - .setOnResponse(res -> { - assertUser1(res.getBody().toBean(User.class)); - latch.countDown(); - }) - .setOnResBody(body -> { - assertMapper1(body.toMapper()); - latch.countDown(); - }) - .setOnResMapper(mapper -> { - assertMapper1(mapper); - latch.countDown(); - }) - .setOnResBean(User.class, user -> { - assertUser1(user); - latch.countDown(); - }) - .setOnResString(str -> { - Assert.assertEquals(user1Str, str); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 14 passed!"); - } - - - void test_15_httpMultiCallback() throws InterruptedException { - String userListStr = getUserListStr(); - server.enqueue(new MockResponse().setBody(userListStr)); - CountDownLatch latch = new CountDownLatch(5); - http.async("/") - .setOnResponse(res -> { - assertList(res.getBody().toList(User.class)); - latch.countDown(); - }) - .setOnResBody(body -> { - assertArray(body.toArray()); - latch.countDown(); - }) - .setOnResList(User.class ,list -> { - assertList(list); - latch.countDown(); - }) - .setOnResArray(array -> { - assertArray(array); - latch.countDown(); - }) - .setOnResString(str -> { - Assert.assertEquals(userListStr, str); - latch.countDown(); - }) - .setOnException(Throwable::printStackTrace) - .get(); - Assert.assertTrue(latch.await(1, TimeUnit.SECONDS)); - System.out.println("case 15 passed!"); - } - - void testHttpSync() { - - } - -} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/BaseTest.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/BaseTest.java similarity index 88% rename from okhttps/src/test/java/cn/zhxu/okhttps/BaseTest.java rename to okhttps-test/src/main/java/com/ejlchina/okhttps/test/BaseTest.java index 72da672c..158b0f3a 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/BaseTest.java +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/BaseTest.java @@ -1,19 +1,16 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.HTTP; -import okhttp3.mockwebserver.MockWebServer; +package com.ejlchina.okhttps.test; import java.text.SimpleDateFormat; import java.util.Date; +import okhttp3.mockwebserver.MockWebServer; + public class BaseTest { protected MockWebServer server = new MockWebServer(); protected String mockUrl = "http://" + server.getHostName() + ":" + server.getPort(); - - protected HTTP http = HTTP.builder().baseUrl(mockUrl).build(); - + public static void sleep(int millis) { try { diff --git a/okhttps-test/src/main/java/com/ejlchina/okhttps/test/BaseTestCases.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/BaseTestCases.java new file mode 100644 index 00000000..1fc81465 --- /dev/null +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/BaseTestCases.java @@ -0,0 +1,112 @@ +package com.ejlchina.okhttps.test; + +import com.ejlchina.okhttps.Array; +import com.ejlchina.okhttps.Mapper; +import com.ejlchina.okhttps.MsgConvertor; +import com.ejlchina.okhttps.TypeRef; +import org.junit.Assert; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.List; +import java.util.Set; + +public abstract class BaseTestCases { + + MsgConvertor msgConvertor; + + public BaseTestCases(MsgConvertor msgConvertor) { + this.msgConvertor = msgConvertor; + } + + public void run() throws Exception { + testToMapper(); + testToArray(); + testSerializeBean(); + testToBean(); + testToResult(); + testToList(); + } + + abstract String getUserObjectStr(); + + abstract String getResultUserObjectStr(); + + abstract String getUserListStr(); + + void testToMapper() { + String json = getUserObjectStr(); + InputStream in = new ByteArrayInputStream(json.getBytes()); + Mapper mapper = msgConvertor.toMapper(in, StandardCharsets.UTF_8); + Set keys = mapper.keySet(); + Assert.assertEquals(2, keys.size()); + Assert.assertTrue(keys.contains("id")); + Assert.assertTrue(keys.contains("name")); + Assert.assertFalse(mapper.isEmpty()); + Assert.assertEquals(2, mapper.size()); + Assert.assertEquals(1, mapper.getInt("id")); + Assert.assertFalse(mapper.has("age")); + Assert.assertEquals(0, mapper.getInt("age")); + Assert.assertEquals("Jack", mapper.getString("name")); + System.out.println("case 1 passed!"); + } + + void testToArray() { + String json = getUserListStr(); + InputStream in = new ByteArrayInputStream(json.getBytes()); + Array jsonObj = msgConvertor.toArray(in, StandardCharsets.UTF_8); + Assert.assertFalse(jsonObj.isEmpty()); + Assert.assertEquals(2, jsonObj.size()); + Mapper json1 = jsonObj.getMapper(0); + Mapper json2 = jsonObj.getMapper(1); + Assert.assertEquals(1, json1.getInt("id")); + Assert.assertEquals("Jack", json1.getString("name")); + Assert.assertEquals(2, json2.getInt("id")); + Assert.assertEquals("Tom", json2.getString("name")); + System.out.println("case 2 passed!"); + } + + void testSerializeBean() { + byte[] data = msgConvertor.serialize(new User(1, "Jack"), StandardCharsets.UTF_8); + String json = new String(data, StandardCharsets.UTF_8); + Assert.assertEquals(getUserObjectStr(), json); + System.out.println("case 3 passed!"); + } + + void testToBean() { + String json = getUserObjectStr(); + InputStream in = new ByteArrayInputStream(json.getBytes()); + User user = msgConvertor.toBean(User.class, in, StandardCharsets.UTF_8); + Assert.assertEquals(1, user.getId()); + Assert.assertEquals("Jack", user.getName()); + System.out.println("case 6 passed!"); + } + + void testToResult() { + String json = getResultUserObjectStr(); + InputStream in = new ByteArrayInputStream(json.getBytes()); + Result result = msgConvertor.toBean(new TypeRef>(){}.getType(), in, StandardCharsets.UTF_8); + Assert.assertEquals(200, result.getCode()); + Assert.assertEquals("ok", result.getMsg()); + User user = result.getData(); + Assert.assertEquals(1, user.getId()); + Assert.assertEquals("Jack", user.getName()); + System.out.println("case 7 passed!"); + } + + void testToList() { + String json = getUserListStr(); + InputStream in = new ByteArrayInputStream(json.getBytes()); + List users = msgConvertor.toList(User.class, in, StandardCharsets.UTF_8); + Assert.assertEquals(2, users.size()); + User u1 = users.get(0); + User u2 = users.get(1); + Assert.assertEquals(1, u1.getId()); + Assert.assertEquals("Jack", u1.getName()); + Assert.assertEquals(2, u2.getId()); + Assert.assertEquals("Tom", u2.getName()); + System.out.println("case 8 passed!"); + } + +} diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/DateBean.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/DateBean.java similarity index 93% rename from okhttps-test/src/main/java/cn/zhxu/okhttps/test/DateBean.java rename to okhttps-test/src/main/java/com/ejlchina/okhttps/test/DateBean.java index 9030919d..34cfdb53 100644 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/DateBean.java +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/DateBean.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps.test; +package com.ejlchina.okhttps.test; import java.util.Date; diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/JsonTestCases.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/JsonTestCases.java similarity index 86% rename from okhttps-test/src/main/java/cn/zhxu/okhttps/test/JsonTestCases.java rename to okhttps-test/src/main/java/com/ejlchina/okhttps/test/JsonTestCases.java index 72019c51..28c90a0f 100644 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/JsonTestCases.java +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/JsonTestCases.java @@ -1,6 +1,6 @@ -package cn.zhxu.okhttps.test; +package com.ejlchina.okhttps.test; -import cn.zhxu.okhttps.MsgConvertor; +import com.ejlchina.okhttps.MsgConvertor; import org.junit.Assert; import java.nio.charset.StandardCharsets; @@ -19,12 +19,12 @@ public void run() throws Exception { } @Override - String getUser1Str() { + String getUserObjectStr() { return "{\"id\":1,\"name\":\"Jack\"}"; } @Override - String getUser1ResultStr() { + String getResultUserObjectStr() { return "{\"code\": 200, \"data\": {\"id\":1,\"name\":\"Jack\"}, \"msg\": \"ok\"}"; } diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/Result.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/Result.java similarity index 93% rename from okhttps-test/src/main/java/cn/zhxu/okhttps/test/Result.java rename to okhttps-test/src/main/java/com/ejlchina/okhttps/test/Result.java index 42232d56..d0a3b47d 100644 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/Result.java +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/Result.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps.test; +package com.ejlchina.okhttps.test; import javax.xml.bind.annotation.XmlRootElement; diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/User.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/User.java similarity index 97% rename from okhttps-test/src/main/java/cn/zhxu/okhttps/test/User.java rename to okhttps-test/src/main/java/com/ejlchina/okhttps/test/User.java index e76583f1..c886339d 100644 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/User.java +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/User.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps.test; +package com.ejlchina.okhttps.test; import javax.xml.bind.annotation.XmlRootElement; diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/XmlTestCases.java b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/XmlTestCases.java similarity index 64% rename from okhttps-test/src/main/java/cn/zhxu/okhttps/test/XmlTestCases.java rename to okhttps-test/src/main/java/com/ejlchina/okhttps/test/XmlTestCases.java index 399a311d..830203bf 100644 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/XmlTestCases.java +++ b/okhttps-test/src/main/java/com/ejlchina/okhttps/test/XmlTestCases.java @@ -1,6 +1,6 @@ -package cn.zhxu.okhttps.test; +package com.ejlchina.okhttps.test; -import cn.zhxu.okhttps.MsgConvertor; +import com.ejlchina.okhttps.MsgConvertor; public class XmlTestCases extends BaseTestCases { @@ -10,12 +10,12 @@ public XmlTestCases(MsgConvertor msgConvertor) { } @Override - String getUser1Str() { + String getUserObjectStr() { return "1Jack"; } @Override - String getUser1ResultStr() { + String getResultUserObjectStr() { return "\n" + "\t200\n" + "\tok\n" + @@ -27,7 +27,7 @@ String getUser1ResultStr() { @Override String getUserListStr() { - return "1Jack2Tom"; + return "1Jack2Tom"; } } diff --git a/okhttps-xml/.gitignore b/okhttps-xml/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/okhttps-xml/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/okhttps-xml/README.md b/okhttps-xml/README.md new file mode 100644 index 00000000..e0c74564 --- /dev/null +++ b/okhttps-xml/README.md @@ -0,0 +1,24 @@ +# OkHttps Xml + +#### 介绍 + +基于 OkHttps 与 Xml 集成扩展（仅支持 Java 8） + + +##### Maven + +```xml + + com.ejlchina + okhttps-xml + 2.5.0 + +``` + +##### Gradle + +```groovy +implementation 'com.ejlchina:okhttps-xml:2.5.0' +``` + +#### 更多请参阅 [http://okhttps.ejlchina.com/](http://okhttps.ejlchina.com/) diff --git a/okhttps-snack3/pom.xml b/okhttps-xml/pom.xml similarity index 54% rename from okhttps-snack3/pom.xml rename to okhttps-xml/pom.xml index 364fdeae..6aed9aed 100644 --- a/okhttps-snack3/pom.xml +++ b/okhttps-xml/pom.xml @@ -1,36 +1,31 @@ 4.0.0 - okhttps-snack3 - OkHttps Snack3 + okhttps-xml + OkHttps Xml jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - cn.zhxu + com.ejlchina okhttps - ${project.version} + ${okhttps.version} - cn.zhxu - data-snack3 - ${data.version} - - - cn.zhxu + com.ejlchina okhttps-test - ${project.version} + ${okhttps.version} test - okhttps-snack3 + okhttps-xml \ No newline at end of file diff --git a/okhttps-xml/src/main/java/com/ejlchina/okhttps/Deserializer.java b/okhttps-xml/src/main/java/com/ejlchina/okhttps/Deserializer.java new file mode 100644 index 00000000..d16f86c6 --- /dev/null +++ b/okhttps-xml/src/main/java/com/ejlchina/okhttps/Deserializer.java @@ -0,0 +1,144 @@ +package com.ejlchina.okhttps; + +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class Deserializer { + + + public Object deserialize(Mapper mapper, Type type) { + Type[] typeArgs = null; + if (type instanceof ParameterizedType) { + typeArgs = ((ParameterizedType) type).getActualTypeArguments(); + } + Class clazz = toClass(type); + return toBean(clazz, typeArgs, mapper); + } + + + protected Object toBean(Class clazz, Type[] typeArgs, Mapper mapper) { + if (clazz == Map.class || clazz == HashMap.class) { + Map map = new HashMap<>(); + for (String key : mapper.keySet()) { + if (typeArgs.length > 1) { + map.put(key, fieldValue(mapper, key, typeArgs[1])); + } else { + map.put(key, fieldValue(mapper, key, String.class)); + } + } + return map; + } + Object bean; + try { + bean = clazz.newInstance(); + } catch (InstantiationException | IllegalAccessException e) { + throw new IllegalStateException("无法构造 " + clazz + " 对象", e); + } + TypeVariable[] typeParas = clazz.getTypeParameters(); + Map methods = getSetMehthods(clazz); + for (String field : methods.keySet()) { + Method method = methods.get(field); + Type fieldType = method.getParameterTypes()[0]; + if (fieldType == Object.class && typeParas.length > 0) { + Type[] gTypes = method.getGenericParameterTypes(); + if (gTypes.length > 0) { + Type gType = gTypes[0]; + for (int i = 0; i < typeParas.length; i++) { + if (typeParas[i] == gType) { + fieldType = typeArgs[i]; + } + } + } + } + Object fieldValue = fieldValue(mapper, field, fieldType); + try { + method.invoke(bean, fieldValue); + } catch (ReflectiveOperationException e) { + throw new IllegalStateException("无法为 " + clazz + " 对象的 " + field + "属性赋值", e); + } + } + return bean; + } + + protected Object fieldValue(Mapper mapper, String field, Type type) { + if (type == int.class || type == Integer.class) { + return mapper.getInt(field); + } + if (type == long.class || type == Long.class) { + return mapper.getLong(field); + } + if (type == float.class || type == Float.class) { + return mapper.getFloat(field); + } + if (type == double.class || type == Double.class) { + return mapper.getDouble(field); + } + if (type == boolean.class || type == Boolean.class) { + return mapper.getBool(field); + } + if (type == String.class) { + return mapper.getString(field); + } + if (type == BigDecimal.class) { + return new BigDecimal(mapper.getString(field)); + } + if (type == BigInteger.class) { + return new BigInteger(mapper.getString(field)); + } + Class clazz = toClass(type); + if (clazz == List.class || clazz == ArrayList.class) { + Array array = mapper.getArray(field); + if (array != null) { + List list = new ArrayList<>(); + for (int i = 0; i < array.size(); i++) { + list.add(deserialize(array.getMapper(i), ((ParameterizedType) type).getActualTypeArguments()[0])); + } + return list; + } + } else { + Mapper value = mapper.getMapper(field); + if (value != null) { + return deserialize(value, type); + } + } + return null; + } + + protected Map getSetMehthods(Class clazz) { + Map methods = new HashMap<>(); + for (Method method: clazz.getMethods()) { + String methodName = method.getName(); + Class[] paraTypes = method.getParameterTypes(); + if (paraTypes.length != 1 || methodName.length() <= 3 + || !methodName.startsWith("set")) { + continue; + } + String field = XmlUtils.firstCharToLowerCase(methodName.substring(3)); + methods.put(field, method); + } + return methods; + } + + protected Class toClass(Type type) { + if (type instanceof Class) { + return (Class) type; + } + if (type instanceof ParameterizedType) { + Type rawType = ((ParameterizedType) type).getRawType(); + if (rawType instanceof Class) { + return (Class) rawType; + } + } + return null; + } + + +} diff --git a/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlArray.java b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlArray.java new file mode 100644 index 00000000..b0eb6ed3 --- /dev/null +++ b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlArray.java @@ -0,0 +1,120 @@ +package com.ejlchina.okhttps; + +import org.w3c.dom.Element; + +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import java.io.ByteArrayOutputStream; +import java.util.List; + +public class XmlArray implements Array { + + private final String[] nameKeys; + private final String[] valueKeys; + private final List list; + + public XmlArray(String[] nameKeys, String[] valueKeys, List list) { + this.nameKeys = nameKeys; + this.valueKeys = valueKeys; + this.list = list; + } + + @Override + public int size() { + return list.size(); + } + + @Override + public boolean isEmpty() { + return list.isEmpty(); + } + + @Override + public Mapper getMapper(int index) { + if (index < list.size()) { + return new XmlMapper(nameKeys, valueKeys, list.get(index)); + } + return null; + } + + @Override + public Array getArray(int index) { + if (index < list.size()) { + Element node = list.get(index); + return new XmlArray(nameKeys, valueKeys, XmlUtils.children(node)); + } + return null; + } + + @Override + public boolean getBool(int index) { + if (index < list.size()) { + String value = XmlUtils.value(list.get(index), valueKeys); + return XmlUtils.toBoolean(value); + } + return false; + } + + @Override + public int getInt(int index) { + if (index < list.size()) { + String value = XmlUtils.value(list.get(index), valueKeys); + return XmlUtils.toInt(value); + } + return 0; + } + + @Override + public long getLong(int index) { + if (index < list.size()) { + String value = XmlUtils.value(list.get(index), valueKeys); + return XmlUtils.toLong(value); + } + return 0; + } + + @Override + public float getFloat(int index) { + if (index < list.size()) { + String value = XmlUtils.value(list.get(index), valueKeys); + return XmlUtils.toFloat(value); + } + return 0; + } + + @Override + public double getDouble(int index) { + if (index < list.size()) { + String value = XmlUtils.value(list.get(index), valueKeys); + return XmlUtils.toDouble(value); + } + return 0; + } + + @Override + public String getString(int index) { + if (index < list.size()) { + return XmlUtils.value(list.get(index), valueKeys); + } + return null; + } + + @Override + public String toString() { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + for (int i = 0; i < list.size(); i++) { + TransformerFactory.newInstance().newTransformer() + .transform(new DOMSource(list.get(i)), new StreamResult(baos)); + if (i < list.size() - 1) { + baos.write('\n'); + } + } + return baos.toString(); + } catch (Exception e) { + throw new IllegalStateException(e); + } + } + +} diff --git a/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlMapper.java b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlMapper.java new file mode 100644 index 00000000..bbf30a90 --- /dev/null +++ b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlMapper.java @@ -0,0 +1,145 @@ +package com.ejlchina.okhttps; + +import org.w3c.dom.*; + +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; +import java.io.ByteArrayOutputStream; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +public class XmlMapper implements Mapper { + + final private String[] nameKeys; + final private String[] valueKeys; + final private Element element; + private List children; + + public XmlMapper(String[] nameKeys, String[] valueKeys, Element element) { + this.nameKeys = nameKeys; + this.valueKeys = valueKeys; + this.element = element; + } + + @Override + public int size() { + NamedNodeMap attrs = element.getAttributes(); + return children().size() + attrs.getLength(); + } + + @Override + public boolean isEmpty() { + NamedNodeMap attrs = element.getAttributes(); + return attrs.getLength() == 0 && children().size() == 0; + } + + @Override + public Mapper getMapper(String key) { + Element child = XmlUtils.findElement(children(), nameKeys, key); + if (child != null) { + return new XmlMapper(nameKeys, valueKeys, child); + } + return null; + } + + @Override + public Array getArray(String key) { + List children = XmlUtils.findElements(children(), nameKeys, key); + if (children.size() > 1) { + return new XmlArray(nameKeys, valueKeys, children); + } else if (children.size() == 1) { + Element element = children.get(0); + return new XmlArray(nameKeys, valueKeys, XmlUtils.children(element)); + } + return null; + } + + @Override + public boolean getBool(String key) { + return XmlUtils.toBoolean(getString(key)); + } + + @Override + public int getInt(String key) { + return XmlUtils.toInt(getString(key)); + } + + @Override + public long getLong(String key) { + return XmlUtils.toLong(getString(key)); + } + + @Override + public float getFloat(String key) { + return XmlUtils.toFloat(getString(key)); + } + + @Override + public double getDouble(String key) { + return XmlUtils.toDouble(getString(key)); + } + + @Override + public String getString(String key) { + String value = element.getAttribute(key); + if (!XmlUtils.isBlank(value)) { + return value; + } + Element ele = XmlUtils.findElement(children(), nameKeys, key); + if (ele != null) { + return XmlUtils.value(ele, valueKeys); + } + return null; + } + + @Override + public boolean has(String key) { + return getString(key) != null; + } + + @Override + public Set keySet() { + HashSet set = new HashSet<>(); + NamedNodeMap attrs = element.getAttributes(); + for (int i = 0; i < attrs.getLength(); i++) { + Attr attr = (Attr) attrs.item(i); + set.add(attr.getName()); + } + List nodes = children(); + for (Element node : nodes) { + set.add(node.getNodeName()); + for (String nameKey : nameKeys) { + String key = node.getAttribute(nameKey); + if (!XmlUtils.isBlank(key)) { + set.add(key); + } + } + } + return set; + } + + @Override + public String toString() { + try { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + TransformerFactory.newInstance().newTransformer() + .transform(new DOMSource(element), new StreamResult(baos)); + return baos.toString(); + } catch (Exception e) { + throw new IllegalStateException(e); + } + } + + protected List children() { + synchronized (element) { + if (children == null) { + children = XmlUtils.children(element); + } + } + return children; + } + + +} diff --git a/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlMsgConvertor.java b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlMsgConvertor.java new file mode 100644 index 00000000..381bd2bf --- /dev/null +++ b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlMsgConvertor.java @@ -0,0 +1,154 @@ +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.internal.HttpException; +import org.w3c.dom.Element; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBException; +import javax.xml.bind.Marshaller; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.lang.reflect.Type; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +public class XmlMsgConvertor implements MsgConvertor, ConvertProvider { + + private String[] nameKeys = {"name", "key"}; + private String[] valueKeys = {"value"}; + + private boolean serializeFormatted = false; + + private Deserializer deserializer; + + private DocumentBuilderFactory dbFactory; + + + public XmlMsgConvertor() { + this(new Deserializer(), DocumentBuilderFactory.newInstance()); + } + + public XmlMsgConvertor(Deserializer deserializer, DocumentBuilderFactory dbFactory) { + this.deserializer = deserializer; + this.dbFactory = dbFactory; + } + + @Override + public String mediaType() { + return "application/xml"; + } + + private Element parseElement(InputStream in, Charset charset) { + DocumentBuilder builder; + try { + // DocumentBuilder 是线程不安全的，所有每次解析都得新起一个 Builder + builder = dbFactory.newDocumentBuilder(); + } catch (ParserConfigurationException e) { + throw new HttpException("DocumentBuilderFactory 配置异常", e); + } + try { + InputSource source = new InputSource(in); + source.setEncoding(charset.name()); + return builder.parse(source).getDocumentElement(); + } catch (SAXException|IOException e) { + throw new HttpException("XML 解析异常", e); + } + } + + @Override + public Mapper toMapper(InputStream in, Charset charset) { + Element root = parseElement(in, charset); + return new XmlMapper(nameKeys, valueKeys, root); + } + + @Override + public Array toArray(InputStream in, Charset charset) { + Element root = parseElement(in, charset); + return new XmlArray(nameKeys, valueKeys, XmlUtils.children(root)); + } + + @Override + public byte[] serialize(Object object, Charset charset) { + try { + JAXBContext context = JAXBContext.newInstance(object.getClass()); + Marshaller marshaller = context.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, serializeFormatted); + marshaller.setProperty(Marshaller.JAXB_ENCODING, charset.name()); + StringWriter writer = new StringWriter(); + marshaller.marshal(object, writer); + return writer.toString().getBytes(charset); + } catch (JAXBException e) { + throw new HttpException("XML 序列化异常：", e); + } + } + + @Override + @SuppressWarnings("unchecked") + public T toBean(Type type, InputStream in, Charset charset) { + return (T) deserializer.deserialize(toMapper(in, charset), type); + } + + @Override + @SuppressWarnings("unchecked") + public List toList(Class type, InputStream in, Charset charset) { + Array array = toArray(in, charset); + List list = new ArrayList<>(); + for (int i = 0; i < array.size(); i++) { + list.add((T) deserializer.deserialize(array.getMapper(i), type)); + } + return list; + } + + @Override + public MsgConvertor getConvertor() { + return new XmlMsgConvertor(); + } + + public String[] getNameKeys() { + return nameKeys; + } + + public void setNameKeys(String[] nameKeys) { + this.nameKeys = nameKeys; + } + + public String[] getValueKeys() { + return valueKeys; + } + + public void setValueKeys(String[] valueKeys) { + this.valueKeys = valueKeys; + } + + public Deserializer getDeserializer() { + return deserializer; + } + + public void setDeserializer(Deserializer deserializer) { + this.deserializer = deserializer; + } + + public DocumentBuilderFactory getDbFactory() { + return dbFactory; + } + + public void setDbFactory(DocumentBuilderFactory dbFactory) { + this.dbFactory = dbFactory; + } + + public boolean isSerializeFormatted() { + return serializeFormatted; + } + + public void setSerializeFormatted(boolean serializeFormatted) { + this.serializeFormatted = serializeFormatted; + } + +} diff --git a/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlUtils.java b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlUtils.java new file mode 100644 index 00000000..cd880fdf --- /dev/null +++ b/okhttps-xml/src/main/java/com/ejlchina/okhttps/XmlUtils.java @@ -0,0 +1,235 @@ +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.Platform; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +import java.util.ArrayList; +import java.util.List; + +public class XmlUtils { + + + public static List children(Element element) { + NodeList nodes = element.getChildNodes(); + List list = new ArrayList<>(); + for (int i = 0; i < nodes.getLength(); i++) { + Node node = nodes.item(i); + if (node instanceof Element) { + list.add((Element) node); + } + } + return list; + } + + public static Element findElement(List nodes, String[] nameKeys, String key) { + for (Element node : nodes) { + if (nodeNameEquals(node, key)) { + return node; + } + } + for (String nameKey : nameKeys) { + for (Element node : nodes) { + if (elementKeyEquals(node, nameKey, key)) { + return node; + } + } + } + return null; + } + + public static List findElements(List nodes, String[] nameKeys, String key) { + List elements = new ArrayList<>(); + for (Element node : nodes) { + if (nodeNameEquals(node, key)) { + elements.add(node); + } + } + if (elements.size() > 0) { + return elements; + } + for (String nameKey : nameKeys) { + for (Element node : nodes) { + if (elementKeyEquals(node, nameKey, key)) { + elements.add(node); + } + } + if (elements.size() > 0) { + return elements; + } + } + return elements; + } + + public static String value(Element node, String[] valueKeys) { + for (String valueKey : valueKeys) { + String value = node.getAttribute(valueKey); + if (!isBlank(value)) { + return value; + } + } + return node.getTextContent(); + } + + public static boolean nodeNameEquals(Node node, String name) { + String nodeName = node.getNodeName(); + return nameEquals(name, nodeName); + } + + public static boolean elementKeyEquals(Element node, String key, String name) { + String nodeName = node.getAttribute(key); + return nameEquals(name, nodeName); + } + + private static boolean nameEquals(String name, String nodeName) { + return nodeName.equals(name) || toCamera(nodeName, "-", true).equals(name) + || toCamera(nodeName, "_", true).equals(name); + } + + /** + * 连字符风格转驼峰风格 + * @param src 源字符串 + * @param hyphenation 源字符串中的连字符 + * @param initLetterLower 是否首字母小写 + */ + public static String toCamera(String src, String hyphenation, boolean initLetterLower) { + if (isBlank(src)) { + return src; + } + StringBuilder sb = new StringBuilder(); + String[] list = src.split(hyphenation); + for (int i = 0; i < list.length; i++) { + if (i == 0 && initLetterLower) { + sb.append(firstCharToLowerCase(list[i])); + } else { + sb.append(firstCharToUpperCase(list[i])); + } + } + return sb.toString(); + } + + /** + * 首字母变小写 + */ + public static String firstCharToLowerCase(String str) { + char firstChar = str.charAt(0); + if (firstChar >= 'A' && firstChar <= 'Z') { + char[] arr = str.toCharArray(); + arr[0] += ('a' - 'A'); + return new String(arr); + } + return str; + } + + /** + * 首字母变大写 + */ + public static String firstCharToUpperCase(String str) { + char firstChar = str.charAt(0); + if (firstChar >= 'a' && firstChar <= 'z') { + char[] arr = str.toCharArray(); + arr[0] -= ('a' - 'A'); + return new String(arr); + } + return str; + } + + /** + * 字符串为 null 或者内部字符全部为 ' ' '\t' '\n' '\r' 这四类字符时返回 true + */ + public static boolean isBlank(String str) { + if (str == null) { + return true; + } + int len = str.length(); + if (len == 0) { + return true; + } + for (int i = 0; i < len; i++) { + switch (str.charAt(i)) { + case ' ': + case '\t': + case '\n': + case '\r': + break; + default: + return false; + } + } + return true; + } + + public static boolean toBoolean(String s) { + return s != null && (s.equalsIgnoreCase("true") + || s.equalsIgnoreCase("yes") + || s.equalsIgnoreCase("on") + || s.equalsIgnoreCase("y") + || s.equalsIgnoreCase("t")); + } + + public static int toInt(String s) { + if (s != null) { + try { + s = s.replace(",", ""); + if (s.startsWith("0x")) { + return Integer.parseInt(s.substring(2), 16); + } + if (s.startsWith("0b")) { + return Integer.parseInt(s.substring(2), 2); + } + if (s.startsWith("0") && !s.startsWith("0.")) { + return Integer.parseInt(s.substring(1), 8); + } + return Integer.parseInt(s); + } catch (NumberFormatException e) { + Platform.logError("无法将字符串\"" + s + "\"转换为 Int 数字"); + } + } + return 0; + } + + public static long toLong(String s) { + if (s != null) { + try { + s = s.replace(",", ""); + if (s.startsWith("0x")) { + return Long.parseLong(s.substring(2), 16); + } + if (s.startsWith("0b")) { + return Long.parseLong(s.substring(2), 2); + } + if (s.startsWith("0") && !s.startsWith("0.")) { + return Long.parseLong(s.substring(1), 8); + } + return Long.parseLong(s); + } catch (NumberFormatException e) { + Platform.logError("无法将字符串\"" + s + "\"转换为 Long 数字"); + } + } + return 0; + } + + public static float toFloat(String s) { + if (s != null) { + try { + return Float.parseFloat(s.replace(",", "")); + } catch (NumberFormatException e) { + Platform.logError("无法将字符串\"" + s + "\"转换为 Float 数字"); + } + } + return 0; + } + + public static double toDouble(String s) { + if (s != null) { + try { + return Double.parseDouble(s.replace(",", "")); + } catch (NumberFormatException e) { + Platform.logError("无法将字符串\"" + s + "\"转换为 Float 数字"); + } + } + return 0; + } + +} diff --git a/okhttps-xml/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider b/okhttps-xml/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider new file mode 100644 index 00000000..38e8a3e4 --- /dev/null +++ b/okhttps-xml/src/main/resources/META-INF/services/com.ejlchina.okhttps.ConvertProvider @@ -0,0 +1 @@ +com.ejlchina.okhttps.XmlMsgConvertor \ No newline at end of file diff --git a/okhttps-xml/src/test/java/com/ejlchina/okhttps/TestCases.java b/okhttps-xml/src/test/java/com/ejlchina/okhttps/TestCases.java new file mode 100644 index 00000000..d1c97773 --- /dev/null +++ b/okhttps-xml/src/test/java/com/ejlchina/okhttps/TestCases.java @@ -0,0 +1,15 @@ +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.test.XmlTestCases; +import org.junit.Test; + +public class TestCases { + + @Test + public void doTest() throws Exception { + MsgConvertor msgConvertor = new XmlMsgConvertor(); + new XmlTestCases(msgConvertor).run(); + } + +} + diff --git a/okhttps/.gitignore b/okhttps/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/okhttps/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/okhttps/README.md b/okhttps/README.md index 4950d947..760b0159 100644 --- a/okhttps/README.md +++ b/okhttps/README.md @@ -9,16 +9,16 @@ ```xml - cn.zhxu + com.ejlchina okhttps - 3.5.3 + 2.5.0 ``` ##### Gradle ```groovy -implementation 'cn.zhxu:okhttps:3.5.3' +implementation 'com.ejlchina:okhttps:2.5.0' ``` -#### 更多请参阅 [https://ok.zhxu.cn/](https://ok.zhxu.cn/) +#### 更多请参阅 [http://okhttps.ejlchina.com/](http://okhttps.ejlchina.com/) diff --git a/okhttps/pom.xml b/okhttps/pom.xml index be91b92b..36d358aa 100644 --- a/okhttps/pom.xml +++ b/okhttps/pom.xml @@ -6,32 +6,16 @@ jar - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 - - cn.zhxu - data-core - ${data.version} - com.squareup.okhttp3 okhttp ${okhttp.version} - - - okio - com.squareup.okio - - - - - com.squareup.okio - okio - ${okio.version} com.squareup.okhttp3 diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/BodyPara.java b/okhttps/src/main/java/cn/zhxu/okhttps/BodyPara.java deleted file mode 100644 index ca88bd81..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/BodyPara.java +++ /dev/null @@ -1,25 +0,0 @@ -package cn.zhxu.okhttps; - -/** - * 请求体表单参数 - * @since v4.1.0 - */ -public class BodyPara { - - private final String type; - private final Object value; - - public BodyPara(String type, Object value) { - this.type = type; - this.value = value; - } - - public String getType() { - return type; - } - - public Object getValue() { - return value; - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/DownloadHelper.java b/okhttps/src/main/java/cn/zhxu/okhttps/DownloadHelper.java deleted file mode 100644 index 37dfac6d..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/DownloadHelper.java +++ /dev/null @@ -1,135 +0,0 @@ -package cn.zhxu.okhttps; - -import java.io.File; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.nio.charset.StandardCharsets; -import java.util.HashMap; -import java.util.Map; - -/** - * 下载助手，用户解析下载路径与文件名 - */ -public class DownloadHelper { - - private Map extMappings = new HashMap<>(); - - - public DownloadHelper() { - extMappings.put("text/plain", "txt"); - extMappings.put("audio/mpeg", "mp3"); - extMappings.put("video/mpeg4", "mp4"); - extMappings.put("video/quicktime", "mov"); - extMappings.put("application/x-genesis-rom", "md"); - extMappings.put("application/x-xls", "xls"); - extMappings.put("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "xlsx"); - extMappings.put("application/vnd.android.package-archive", "apk"); - extMappings.put("application/msword", "doc"); - extMappings.put("application/vnd.openxmlformats-officedocument.wordprocessingml.document", "docx"); - extMappings.put("application/x-java-archive", "jar"); - extMappings.put("application/x-zip-compressed", "zip"); - extMappings.put("application/x-compressed-tar", "tar.gz"); - extMappings.put("application/x-rar", "rar"); - } - - /** - * 解析下载文件名 - * @param result HTTP 响应结果 - * @return 文件名 - */ - public String resolveFileName(HttpResult result) { - String contentDisposition = result.getHeader("Content-Disposition"); - // 通过 Content-Disposition 获取文件名，这点跟服务器有关，需要灵活变通 - if (contentDisposition == null || contentDisposition.length() < 1) { - String urlPath = result.getTask().getUrl(); - String urlName = urlPath.substring(urlPath.lastIndexOf("/") + 1); - return toFileName(urlName, result).replaceAll("[\"\\\\]", ""); - } - try { - String filename = URLDecoder.decode(contentDisposition.substring( - contentDisposition.indexOf("filename=") + 9), StandardCharsets.UTF_8.name()); - // 有些文件名会被包含在""里面，所以要去掉，不然无法读取文件后缀 - // 同时去掉 / 与 \ 符，避免发生目录穿越问题：https://github.com/troyzhxu/okhttps/issues/89 - return filename.replaceAll("[\"/\\\\]", ""); - } catch (UnsupportedEncodingException e) { - throw new IllegalStateException(e); - } - } - - public String toFileName(String name, HttpResult result) { - int dotIdx = name.lastIndexOf('.'); - if (dotIdx > -1 && dotIdx < name.length() - 1) { - return name; - } - // 获取文件扩展名 - String ext = getExt(result.getHeader("Content-Type")); - if (ext != null) { - if (dotIdx == -1) { - return name + "." + ext; - } - return name + ext; - } - return name; - } - - - public String getExt(String contentType) { - String ext = extMappings.get(contentType); - if (ext == null) { - int i = contentType.indexOf('/'); - if (i > 0 && i < contentType.length() - 1) { - return contentType.substring(i + 1); - } - } - return ext; - } - - /** - * 解析文件路径 - * @param dirPath 目录 - * @param fileName 文件名 - * @return 文件路径 - */ - public String resolveFilePath(String dirPath, String fileName) { - if (dirPath.endsWith("\\") || dirPath.endsWith("/")) { - return dirPath + fileName; - } - return dirPath + File.separator + fileName; - } - - /** - * 当文件已存在时，根据该方法生成一个新的文件名 - * @param fileName 原文件名 - * @param index 重复次数 - * @return 新的文件名 - */ - public String indexFileName(String fileName, int index) { - int i = fileName.lastIndexOf('.'); - if (i < 0) { - return fileName + "(" + index + ")"; - } - String ext = fileName.substring(i); - if (i > 0) { - String name = fileName.substring(0, i); - return name + "(" + index + ")" + ext; - } - return "(" + index + ")" + ext; - } - - public Map getExtMappings() { - return extMappings; - } - - public void setExtMappings(Map extMappings) { - this.extMappings = extMappings; - } - - public void addExtMappings(Map extMappings) { - this.extMappings.putAll(extMappings); - } - - public void addExtMapping(String mediaType, String ext) { - extMappings.put(mediaType, ext); - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/FilePara.java b/okhttps/src/main/java/cn/zhxu/okhttps/FilePara.java deleted file mode 100644 index 6c8443eb..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/FilePara.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.internal.StreamRequestBody; -import okhttp3.MediaType; -import okhttp3.RequestBody; - -import java.io.File; -import java.io.InputStream; -import java.util.Arrays; - -/** - * @since 2.5.0 从 HttpTask 中分离 - */ -public class FilePara { - - private final String type; - private final String fileName; - private final byte[] content; - private final File file; - private final InputStream stream; - - public FilePara(String type, String fileName, byte[] content) { - this(type, fileName, null, content, null); - } - - public FilePara(String type, String fileName, File file) { - this(type, fileName, file, null, null); - } - - public FilePara(String type, String fileName, InputStream stream) { - this(type, fileName, null, null, stream); - } - - private FilePara(String type, String fileName, File file, byte[] content, InputStream stream) { - this.type = type; - this.fileName = fileName; - this.file = file; - this.content = content; - this.stream = stream; - } - - public RequestBody toRequestBody(MediaType contentType) { - if (file != null) { - return RequestBody.create(contentType, file); - } - if (content != null) { - return RequestBody.create(contentType, content); - } - if (stream != null) { - return new StreamRequestBody(contentType, stream); - } - throw new IllegalStateException("Invalid FilePara"); - } - - public String getType() { - return type; - } - - public String getFileName() { - return fileName; - } - - public byte[] getContent() { - return content; - } - - public File getFile() { - return file; - } - - public InputStream getStream() { - return stream; - } - - @Override - public String toString() { - return "FilePara{" + - "type='" + type + '\'' + - ", fileName='" + fileName + '\'' + - ", content=" + Arrays.toString(content) + - ", file=" + file + - ", stream=" + stream + - '}'; - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/HTTP.java b/okhttps/src/main/java/cn/zhxu/okhttps/HTTP.java deleted file mode 100644 index 910d87f0..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/HTTP.java +++ /dev/null @@ -1,335 +0,0 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.okhttp.OkHttpBuilderImpl; -import okhttp3.WebSocket; -import okhttp3.*; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executor; - -/** - * HTTP 客户端接口 - * - * @author 15735 - */ -public interface HTTP { - - String GET = "GET"; - String HEAD = "HEAD"; - String POST = "POST"; - String PUT = "PUT"; - String PATCH = "PATCH"; - String DELETE = "DELETE"; - - /** - * 同步请求 - * @param url 请求地址 - * @return 同步HTTP任务 - */ - SHttpTask sync(String url); - - /** - * 异步请求 - * @param url 请求地址 - * @return 异步HTTP任务 - */ - AHttpTask async(String url); - - /** - * Websocket 连接 - * @param url 连接地址 - * @return WebSocket 任务 - */ - WHttpTask webSocket(String url); - - /** - * 根据标签取消HTTP任务，只要任务的标签包含指定的Tag就会被取消 - * 从 v1.0.2 开始支持取消同步请求 - * @param tag 标签 - * @return 被取消的任务数量 - */ - int cancel(String tag); - - /** - * @since 1.0.2 - * 取消所有HTTP任务，包括同步和异步 - */ - void cancelAll(); - - /** - * OkHttp 的 HTTP 原生请求 （该请求不经过 预处理器） - * @param request 请求 - * @return Call - */ - Call request(Request request); - - /** - * OkHttp 的 Websocket 原生请求（该请求不经过 预处理器） - * @param request 请求 - * @param listener 监听器 - * @return Websocket - */ - WebSocket webSocket(Request request, WebSocketListener listener); - - /** - * 获取任务执行器 - * @return TaskExecutor - */ - TaskExecutor executor(); - - /** - * 新的构建器 - * @return Builder - */ - Builder newBuilder(); - - /** - * HTTP 构建器 - * 自 v3.5.0 起可通过系统环境变量 切换该方法返回的 构建器实现类 - * @return HTTP 构建器 - */ - static Builder builder() { - String className = System.getProperty(Builder.class.getName()); - if (Platform.isNotBlank(className)) { - try { - Class dClass = Class.forName(className); - if (Builder.class.isAssignableFrom(dClass)) { - return (Builder) dClass.getDeclaredConstructor().newInstance(); - } else { - throw new OkHttpsException("The implementation class [" + className + "] you specified is not a subclass of " + Builder.class.getName()); - } - } catch (ClassNotFoundException e) { - throw new OkHttpsException("The implementation class [" + className + "] you specified can not be found", e); - } catch (NoSuchMethodException e) { - throw new OkHttpsException("There is none default constructor in [" + className + "] you specified", e); - } catch (ReflectiveOperationException e) { - throw new OkHttpsException("[" + className + "] can not be instanced", e); - } - } - return new OkHttpBuilderImpl(); // 默认构建器 - } - - /** - * Http 配置器 - * - */ - interface OkConfig { - - /** - * 使用 builder 配置 HttpClient - * @param builder OkHttpClient 构建器 - */ - void config(OkHttpClient.Builder builder); - - } - - /** - * HTTP 构建器 - * 自 v3.3.0 开始接口化，在以后版本中将逐步与 okhttp3 解耦 - */ - interface Builder { - - /** - * 自 v3.2.0 后可以多次调用 - * 配置 OkHttpClient - * @param config 配置器 - * @return Builder - */ - Builder config(OkConfig config); - - /** - * 设置 baseUrl - * @param baseUrl 全局URL前缀 - * @return Builder - */ - Builder baseUrl(String baseUrl); - - String baseUrl(); - - /** - * 配置媒体类型 - * @param mediaTypes 媒体类型 - * @return Builder - */ - Builder mediaTypes(Map mediaTypes); - - /** - * 配置媒体类型 - * @param key 媒体类型KEY - * @param value 媒体类型VALUE - * @return Builder - */ - Builder mediaTypes(String key, String value); - - Map getMediaTypes(); - - /** - * 清空 ContentType - * @return Builder - * @since v3.5.0 - */ - HTTP.Builder clearContentTypes(); - - /** - * 配置支持的报文体类型 - * @param contentTypes 报文体类型列表 - * @return Builder - */ - Builder contentTypes(List contentTypes); - - /** - * 配置支持的报文体类型 - * @param contentType 报文体类型 - * @return Builder - */ - Builder contentTypes(String contentType); - - String[] contentTypes(); - - /** - * 设置回调执行器，例如实现切换线程功能，只对异步请求有效 - * @param executor 回调执行器 - * @return Builder - */ - Builder callbackExecutor(Executor executor); - - Executor mainExecutor(); - - /** - * 配置 任务调度器，可用的调度由 {@link WHttpTask#heatbeat(int, int) } 指定的心跳任务 - * 若不配置，则生成一个 线程容量为 1 的 ScheduledThreadPoolExecutor 调度器 - * @since v2.3.0 - * @param scheduler 调度器 - * @return Builder - */ - Builder taskScheduler(Scheduler scheduler); - - Scheduler taskScheduler(); - - /** - * 添加可并行处理请求任务的预处理器 - * @param preprocessor 预处理器 - * @return Builder - */ - Builder addPreprocessor(Preprocessor preprocessor); - - /** - * 添加串行预处理器 - * @param preprocessor 预处理器 - * @return Builder - */ - Builder addSerialPreprocessor(Preprocessor preprocessor); - - /** - * 清空预处理器（包括串行预处理器） - * @since v2.5.0 - * @return Builder - */ - Builder clearPreprocessors(); - - Preprocessor[] preprocessors(); - - /** - * 最大预处理时间（倍数，相当普通请求的超时时间） - * @param times 普通超时时间的倍数，默认为 10 - * @return Builder - */ - Builder preprocTimeoutTimes(int times); - - int preprocTimeoutTimes(); - - /** - * 设置全局响应监听 - * @param listener 监听器 - * @return Builder - */ - Builder responseListener(TaskListener listener); - - TaskListener responseListener(); - - /** - * 设置全局异常监听 - * @param listener 监听器 - * @return Builder - */ - Builder exceptionListener(TaskListener listener); - - TaskListener exceptionListener(); - - /** - * 设置全局完成监听 - * @param listener 监听器 - * @return Builder - */ - Builder completeListener(TaskListener listener); - - TaskListener completeListener(); - - /** - * 设置下载监听器 - * @param listener 监听器 - * @return Builder - */ - Builder downloadListener(DownListener listener); - - DownListener downloadListener(); - - /** - * @since v2.0.0 - * 添加消息转换器 - * @param msgConvertor JSON 服务 - * @return Builder - */ - Builder addMsgConvertor(MsgConvertor msgConvertor); - - /** - * 清空消息转换器 - * @since v2.5.0 - * @return Builder - */ - Builder clearMsgConvertors(); - - MsgConvertor[] msgConvertors(); - - /** - * @since v2.0.0 - * 设置默认编码格式 - * @param charset 编码 - * @return Builder - */ - Builder charset(Charset charset); - - Charset charset(); - - /** - * @since v2.0.0 - * 设置默认请求体类型 - * @param bodyType 请求体类型 - * @return Builder - */ - Builder bodyType(String bodyType); - - String bodyType(); - - /** - * @since v3.4.2 - * 设置下载文件名解析器 - * @param resolver 解析器 - * @return Builder - */ - Builder downloadHelper(DownloadHelper resolver); - - DownloadHelper downloadHelper(); - - /** - * 构建 HTTP 实例 - * @return HTTP - */ - HTTP build(); - - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/MsgConvertor.java b/okhttps/src/main/java/cn/zhxu/okhttps/MsgConvertor.java deleted file mode 100644 index 090660f7..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/MsgConvertor.java +++ /dev/null @@ -1,108 +0,0 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.data.Array; -import cn.zhxu.data.DataConvertor; -import cn.zhxu.data.DataSet; -import cn.zhxu.data.Mapper; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.lang.reflect.Type; -import java.net.URLEncoder; -import java.nio.charset.Charset; -import java.util.List; - -/** - * 消息转换器接口 - */ -public interface MsgConvertor extends DataConvertor { - - /** - * 消息的媒体类型 - * @return 媒体类型 - */ - String mediaType(); - - /** - * 表单转换器，可用于自动序列化表单参数 - */ - class FormConvertor implements MsgConvertor { - - private final DataConvertor convertor; - private final boolean urlEncoded; - - public FormConvertor(DataConvertor convertor) { - this(convertor, false); - } - - /** - * @param convertor DataConvertor - * @param urlEncoded 是否进行 URLEncode 编码 - */ - public FormConvertor(DataConvertor convertor, boolean urlEncoded) { - this.convertor = convertor; - this.urlEncoded = urlEncoded; - } - - @Override - public String mediaType() { - return "application/x-www-form-urlencoded"; - } - - @Override - public Mapper toMapper(InputStream in, Charset charset) { - return convertor.toMapper(in, charset); - } - - @Override - public Array toArray(InputStream in, Charset charset) { - return convertor.toArray(in, charset); - } - - @Override - public byte[] serialize(Object object, Charset charset, boolean pretty) { - byte[] result = convertor.serialize(object, charset); - Mapper mapper = convertor.toMapper(new ByteArrayInputStream(result), charset); - StringBuilder sb = new StringBuilder(); - mapper.forEach((key, data) -> { - String value = encodeValue(data, charset); - sb.append(key).append('=').append(value).append('&'); - }); - int endIndex = sb.length() > 1 ? sb.length() - 1 : sb.length(); - return sb.substring(0, endIndex).getBytes(charset); - } - - private String encodeValue(DataSet.Data data, Charset charset) { - String value = data.toString(); - if (urlEncoded) { - try { - return URLEncoder.encode(value, charset.name()); - } catch (UnsupportedEncodingException e) { - throw new OkHttpsException("UnsupportedEncoding: " + charset.name(), e); - } - } - return value; - } - - @Override - public T toBean(Type type, InputStream in, Charset charset) { - return convertor.toBean(type, in, charset); - } - - @Override - public List toList(Class type, InputStream in, Charset charset) { - return convertor.toList(type, in, charset); - } - - public DataConvertor getConvertor() { - return convertor; - } - - public boolean isUrlEncoded() { - return urlEncoded; - } - - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Process.java b/okhttps/src/main/java/cn/zhxu/okhttps/Process.java deleted file mode 100644 index 65c8b73a..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Process.java +++ /dev/null @@ -1,34 +0,0 @@ -package cn.zhxu.okhttps; - -/** - * 进度（上传或下载） - */ -public interface Process { - - int DEFAULT_STEP_BYTES = 8192; - - /** - * 当请求体大小未知（流式上传）时，该方法始终返回 -1 - * 当请求体大小为 0 时，该方法始终返回 1 - * @return 完成比例 - */ - double getRate(); - - /** - * 当请求体大小未知（流式上传）时，该方法返回 -1 - * @return 总字节数 - */ - long getTotalBytes(); - - /** - * @return 已完成字节数 - */ - long getDoneBytes(); - - /** - * 只有当 当请求体大小已知 的情况下，该方法才可能返回 true - * @return 任务是否完成 - */ - boolean isDone(); - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/FixedRequestBody.java b/okhttps/src/main/java/cn/zhxu/okhttps/internal/FixedRequestBody.java deleted file mode 100644 index 89eb7d34..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/FixedRequestBody.java +++ /dev/null @@ -1,53 +0,0 @@ -package cn.zhxu.okhttps.internal; - -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okio.BufferedSink; - -import java.io.IOException; - -/** - * 修复报文体在写出过程中会发生无法被异常回调捕获的非 IO 异常的问题 - * @author Troy.Zhou @ 2021-09-01 - * @since v3.1.5 - */ -public class FixedRequestBody extends RequestBody { - - private final RequestBody requestBody; - - public FixedRequestBody(RequestBody requestBody) { - this.requestBody = requestBody; - } - - @Override - public long contentLength() throws IOException { - return requestBody.contentLength(); - } - - @Override - public boolean isDuplex() { - return requestBody.isDuplex(); - } - - @Override - public boolean isOneShot() { - return requestBody.isOneShot(); - } - - @Override - public MediaType contentType() { - return requestBody.contentType(); - } - - @Override - public void writeTo(@SuppressWarnings("NullableProblems") BufferedSink sink) throws IOException { - try { - requestBody.writeTo(sink); - } catch (IOException e) { - throw e; - } catch (Exception e) { - throw new IOException("请求体写出异常", e); - } - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/ProcessInputStream.java b/okhttps/src/main/java/cn/zhxu/okhttps/internal/ProcessInputStream.java deleted file mode 100644 index ec828e5b..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/ProcessInputStream.java +++ /dev/null @@ -1,87 +0,0 @@ -package cn.zhxu.okhttps.internal; - -import cn.zhxu.okhttps.Process; - -import java.io.IOException; -import java.io.InputStream; -import java.util.concurrent.Executor; -import java.util.function.Consumer; - -public class ProcessInputStream extends InputStream { - - private final InputStream input; - private final Consumer onProcess; - private final Executor callbackExecutor; - private final long stepBytes; - private final RealProcess process; - private boolean doneCalled = false; - private long step; - - public ProcessInputStream(InputStream input, Consumer onProcess, long totalBytes, long stepBytes, - long doneBytes, Executor callbackExecutor) { - this.input = input; - this.onProcess = onProcess; - this.stepBytes = stepBytes; - this.callbackExecutor = callbackExecutor; - this.process = new RealProcess(totalBytes, doneBytes); - this.step = doneBytes / stepBytes; - } - - @Override - public int read() throws IOException { - byte[] buf = new byte[1]; - int count = read(buf, 0, 1); - if (count > 0) { - return buf[0]; - } - return -1; - } - - @Override - public int read(@SuppressWarnings("NullableProblems") byte[] buf, int off, int len) throws IOException { - int total = 0; - while (total < len) { - // 一次读取长度 - int length = Math.min(len - total, (int) stepBytes); - int read = input.read(buf, off + total, length); - if (read == -1) { - // 已经读完 - if (total == 0) { - return read; - } - break; - } - updateProcess(read); - total += read; - } - return total; - } - - private void updateProcess(long count) { - process.addDoneBytes(count); - if (process.isUndoneAndUnreached(step * stepBytes)) { - return; - } - if (process.isDone()) { - if (doneCalled) { - return; - } - doneCalled = true; - } - step = (process.getDoneBytes() - 1) / stepBytes + 1; - // 因为 process 一直被更新，所有此处应克隆一个新的对象用于回调 - Process p = process.newProcess(); - callbackExecutor.execute(() -> onProcess.accept(p)); - } - - @Override - public int available() throws IOException { - return input.available(); - } - - @Override - public void close() throws IOException { - input.close(); - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/ProcessRequestBody.java b/okhttps/src/main/java/cn/zhxu/okhttps/internal/ProcessRequestBody.java deleted file mode 100644 index c7533d4b..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/ProcessRequestBody.java +++ /dev/null @@ -1,74 +0,0 @@ -package cn.zhxu.okhttps.internal; - -import cn.zhxu.okhttps.Process; -import okhttp3.RequestBody; -import okio.*; - -import java.io.IOException; -import java.util.concurrent.Executor; -import java.util.function.Consumer; - -public class ProcessRequestBody extends FixedRequestBody { - - private final Consumer onProcess; - private final Executor callbackExecutor; - private final RealProcess process; - private final long stepBytes; - - public ProcessRequestBody(RequestBody requestBody, Consumer onProcess, Executor callbackExecutor, - long contentLength, long stepBytes) { - super(requestBody); - this.onProcess = onProcess; - this.callbackExecutor = callbackExecutor; - this.stepBytes = stepBytes; - this.process = new RealProcess(contentLength, 0); - } - - class ProcessableSink extends ForwardingSink { - - private long step = 0; - private boolean doneCalled = false; - - public ProcessableSink(Sink delegate) { - super(delegate); - } - - @Override - public void write(Buffer source, long byteCount) throws IOException { - // byteCount 可能很大，也可能很小 - long written = 0; - while (written < byteCount) { - long count = Math.min(stepBytes, byteCount - written); - super.write(source, count); - updateProcess(count); - written += count; - } - } - - private void updateProcess(long count) { - process.addDoneBytes(count); - if (process.isUndoneAndUnreached(step * stepBytes)) { - return; - } - if (process.isDone()) { - if (doneCalled) { - return; - } - doneCalled = true; - } - step = (process.getDoneBytes() - 1) / stepBytes + 1; - // 因为 process 一直被更新，所有此处应克隆一个新的对象用于回调 - Process p = process.newProcess(); - callbackExecutor.execute(() -> onProcess.accept(p)); - } - - } - - @Override - public void writeTo(BufferedSink sink) throws IOException { - BufferedSink buffer = Okio.buffer(new ProcessableSink(sink)); - super.writeTo(buffer); - buffer.flush(); - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/RealProcess.java b/okhttps/src/main/java/cn/zhxu/okhttps/internal/RealProcess.java deleted file mode 100644 index c9a925ed..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/RealProcess.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.zhxu.okhttps.internal; - -import cn.zhxu.okhttps.Process; - -public class RealProcess implements Process { - - // 总字节数（流式上传时该字段为 -1） - private final long totalBytes; - // 已经完成字节数 - private long doneBytes; - - public RealProcess(long totalBytes, long doneBytes) { - this.totalBytes = totalBytes; - this.doneBytes = doneBytes; - } - - public Process newProcess() { - return new RealProcess(totalBytes, doneBytes); - } - - @Override - public double getRate() { - if (totalBytes == 0) { - return 1; - } - if (totalBytes < 0) { - return -1; - } - return (double) doneBytes / totalBytes; - } - - @Override - public long getTotalBytes() { - return totalBytes; - } - - @Override - public long getDoneBytes() { - return doneBytes; - } - - @Override - public boolean isDone() { - return doneBytes >= totalBytes && totalBytes >= 0; - } - - public void addDoneBytes(long delt) { - doneBytes += delt; - } - - public boolean isUndoneAndUnreached(long bytes) { - return doneBytes < bytes && (totalBytes < 0 || doneBytes < totalBytes); - } - - @Override - public String toString() { - return "Process[" + doneBytes + " / " + totalBytes + " | " + getRate() + ']'; - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/SerialPreprocessor.java b/okhttps/src/main/java/cn/zhxu/okhttps/internal/SerialPreprocessor.java deleted file mode 100644 index 388a4cb8..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/SerialPreprocessor.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.zhxu.okhttps.internal; - -import cn.zhxu.okhttps.Preprocessor; - -import java.util.LinkedList; -import java.util.Queue; - -/** - * 串行预处理器 - * @author Troy.Zhou - */ -public class SerialPreprocessor implements Preprocessor { - - // 预处理器 - final Preprocessor preprocessor; - // 待处理的任务队列 - final Queue pendings; - // 是否有任务正在执行 - boolean running = false; - - public SerialPreprocessor(Preprocessor preprocessor) { - this.preprocessor = preprocessor; - this.pendings = new LinkedList<>(); - } - - @Override - public void doProcess(Preprocessor.PreChain chain) { - boolean should = true; - synchronized (this) { - if (running) { - pendings.add(chain); - should = false; - } else { - running = true; - } - } - if (should) { - preprocessor.doProcess(chain); - } - } - - public void afterProcess() { - Preprocessor.PreChain chain = null; - synchronized (this) { - if (pendings.size() > 0) { - chain = pendings.poll(); - } else { - running = false; - } - } - if (chain != null) { - preprocessor.doProcess(chain); - } - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/StreamRequestBody.java b/okhttps/src/main/java/cn/zhxu/okhttps/internal/StreamRequestBody.java deleted file mode 100644 index 2e17e12b..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/StreamRequestBody.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.zhxu.okhttps.internal; - -import okhttp3.MediaType; -import okhttp3.RequestBody; -import okio.BufferedSink; -import okio.Okio; - -import java.io.IOException; -import java.io.InputStream; - -/** - * 流式请求体 - * @author Troy.Zhou @ 2021-09-01 - * @since v3.5.0 - */ -public class StreamRequestBody extends RequestBody { - - private final MediaType contentType; - private final InputStream inputStream; - - public StreamRequestBody(MediaType contentType, InputStream inputStream) { - this.contentType = contentType; - this.inputStream = inputStream; - } - - @Override - public MediaType contentType() { - return contentType; - } - - @Override - public void writeTo(BufferedSink sink) throws IOException { - try { - sink.writeAll(Okio.source(inputStream)); - } finally { - inputStream.close(); - } - } - - @Override - public boolean isOneShot() { - return true; - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/okhttp/OkHttpBuilderImpl.java b/okhttps/src/main/java/cn/zhxu/okhttps/okhttp/OkHttpBuilderImpl.java deleted file mode 100644 index 4d691ec7..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/okhttp/OkHttpBuilderImpl.java +++ /dev/null @@ -1,335 +0,0 @@ -package cn.zhxu.okhttps.okhttp; - -import cn.zhxu.okhttps.*; -import cn.zhxu.okhttps.internal.CopyInterceptor; -import cn.zhxu.okhttps.internal.SerialPreprocessor; -import okhttp3.Interceptor; -import okhttp3.OkHttpClient; - -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.Executor; - - -public class OkHttpBuilderImpl implements HTTP.Builder { - - private OkHttpClient okClient; - - private String baseUrl; - - private final List configs; - - private final Map mediaTypes; - - private final List contentTypes; - - private final List msgConvertors; - - private final List preprocessors; - - private int preprocTimeoutTimes = 10; - - private Executor mainExecutor; - - private Scheduler taskScheduler; - - private DownListener downloadListener; - - private TaskListener responseListener; - - private TaskListener exceptionListener; - - private TaskListener completeListener; - - private Charset charset = StandardCharsets.UTF_8; - - private String bodyType = OkHttps.FORM; - - private DownloadHelper downloadHelper; - - public OkHttpBuilderImpl() { - mediaTypes = new HashMap<>(); - mediaTypes.put("png", "image/png"); - mediaTypes.put("jpg", "image/jpeg"); - mediaTypes.put("jpeg", "image/jpeg"); - mediaTypes.put("wav", "audio/wav"); - mediaTypes.put("mp3", "audio/mp3"); - mediaTypes.put("mp4", "video/mp4"); - mediaTypes.put("txt", "text/plain"); - mediaTypes.put("xls", "application/x-xls"); - mediaTypes.put("xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - mediaTypes.put("xml", "text/xml"); - mediaTypes.put("apk", "application/vnd.android.package-archive"); - mediaTypes.put("doc", "application/msword"); - mediaTypes.put("docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"); - mediaTypes.put("html", "text/html"); - mediaTypes.put("rar", "application/x-rar"); - mediaTypes.put("jar", "application/x-java-archive"); - contentTypes = new ArrayList<>(); - contentTypes.add("application/x-www-form-urlencoded"); - contentTypes.add("application/json"); - contentTypes.add("application/xml"); - contentTypes.add("application/protobuf"); - contentTypes.add("application/msgpack"); - preprocessors = new ArrayList<>(); - msgConvertors = new ArrayList<>(); - configs = new ArrayList<>(); - downloadHelper = new DownloadHelper(); - } - - public OkHttpBuilderImpl(OkHttpClientWrapper hc) { - okClient = hc.okClient(); - baseUrl = hc.baseUrl(); - mediaTypes = hc.mediaTypes(); - preprocessors = new ArrayList<>(); - Collections.addAll(preprocessors, hc.preprocessors()); - TaskExecutor executor = hc.executor(); - contentTypes = new ArrayList<>(); - Collections.addAll(contentTypes, executor.getContentTypes()); - mainExecutor = executor.getMainExecutor(); - taskScheduler = executor.getTaskScheduler(); - downloadListener = executor.getDownloadListener(); - responseListener = executor.getResponseListener(); - exceptionListener = executor.getExceptionListener(); - completeListener = executor.getCompleteListener(); - msgConvertors = new ArrayList<>(); - Collections.addAll(msgConvertors, executor.getMsgConvertors()); - preprocTimeoutTimes = hc.preprocTimeoutTimes(); - configs = new ArrayList<>(); - bodyType = hc.bodyType(); - charset = hc.charset(); - downloadHelper = hc.downloadHelper(); - } - - - public HTTP.Builder config(HTTP.OkConfig config) { - if (config != null) { - configs.add(config); - } - return this; - } - - public HTTP.Builder baseUrl(String baseUrl) { - if (baseUrl != null) { - this.baseUrl = baseUrl.trim(); - } - return this; - } - - public HTTP.Builder mediaTypes(Map mediaTypes) { - if (mediaTypes != null) { - this.mediaTypes.putAll(mediaTypes); - } - return this; - } - - public HTTP.Builder mediaTypes(String key, String value) { - if (key != null && value != null) { - this.mediaTypes.put(key, value); - } - return this; - } - - public HTTP.Builder clearContentTypes() { - contentTypes.clear(); - return this; - } - - public HTTP.Builder contentTypes(List contentTypes) { - if (contentTypes != null) { - this.contentTypes.addAll(contentTypes); - } - return this; - } - - public HTTP.Builder contentTypes(String contentType) { - if (contentType != null) { - this.contentTypes.add(contentType); - } - return this; - } - - public HTTP.Builder callbackExecutor(Executor executor) { - this.mainExecutor = executor; - return this; - } - - public HTTP.Builder taskScheduler(Scheduler scheduler) { - this.taskScheduler = scheduler; - return this; - } - - public HTTP.Builder addPreprocessor(Preprocessor preprocessor) { - if (preprocessor != null) { - preprocessors.add(preprocessor); - } - return this; - } - - public HTTP.Builder addSerialPreprocessor(Preprocessor preprocessor) { - if (preprocessor != null) { - preprocessors.add(new SerialPreprocessor(preprocessor)); - } - return this; - } - - public HTTP.Builder clearPreprocessors() { - preprocessors.clear(); - return this; - } - - public HTTP.Builder preprocTimeoutTimes(int times) { - if (times > 0) { - preprocTimeoutTimes = times; - } - return this; - } - - public HTTP.Builder responseListener(TaskListener listener) { - responseListener = listener; - return this; - } - - public HTTP.Builder exceptionListener(TaskListener listener) { - exceptionListener = listener; - return this; - } - - public HTTP.Builder completeListener(TaskListener listener) { - completeListener = listener; - return this; - } - - public HTTP.Builder downloadListener(DownListener listener) { - downloadListener = listener; - return this; - } - - public HTTP.Builder addMsgConvertor(MsgConvertor msgConvertor) { - if (msgConvertor != null) { - msgConvertors.add(msgConvertor); - } - return this; - } - - public HTTP.Builder clearMsgConvertors() { - msgConvertors.clear(); - return this; - } - - public HTTP.Builder charset(Charset charset) { - if (charset != null) { - this.charset = charset; - } - return this; - } - - public HTTP.Builder bodyType(String bodyType) { - if (bodyType != null) { - this.bodyType = bodyType.toLowerCase(); - } - return this; - } - - public HTTP build() { - if (configs.size() > 0 || okClient == null) { - OkHttpClient.Builder builder; - if (okClient != null) { - builder = okClient.newBuilder(); - } else { - builder = new OkHttpClient.Builder(); - } - for (HTTP.OkConfig config: configs) { - config.config(builder); - } - // fix issue: https://github.com/ejlchina/okhttps/issues/8 - if (needCopyInterceptor(builder.interceptors())) { - builder.addInterceptor(new CopyInterceptor()); - } - okClient = builder.build(); - } else if (needCopyInterceptor(okClient.interceptors())) { - okClient = okClient.newBuilder() - .addInterceptor(new CopyInterceptor()) - .build(); - } - return new OkHttpClientWrapper(this); - } - - private boolean needCopyInterceptor(List list) { - return mainExecutor != null && Platform.ANDROID_SDK_INT > 24 && CopyInterceptor.notIn(list); - } - - public OkHttpClient okClient() { - return okClient; - } - - public String baseUrl() { - return baseUrl; - } - - public Map getMediaTypes() { - return mediaTypes; - } - - public Executor mainExecutor() { - return mainExecutor; - } - - public Preprocessor[] preprocessors() { - return preprocessors.toArray(new Preprocessor[0]); - } - - public DownListener downloadListener() { - return downloadListener; - } - - public TaskListener responseListener() { - return responseListener; - } - - public TaskListener exceptionListener() { - return exceptionListener; - } - - public TaskListener completeListener() { - return completeListener; - } - - public MsgConvertor[] msgConvertors() { - return msgConvertors.toArray(new MsgConvertor[0]); - } - - public Scheduler taskScheduler() { - return taskScheduler; - } - - public String[] contentTypes() { - return contentTypes.toArray(new String[0]); - } - - public int preprocTimeoutTimes() { - return preprocTimeoutTimes; - } - - public Charset charset() { - return charset; - } - - public String bodyType() { - return bodyType; - } - - @Override - public HTTP.Builder downloadHelper(DownloadHelper downloadHelper) { - this.downloadHelper = downloadHelper; - return this; - } - - @Override - public DownloadHelper downloadHelper() { - return downloadHelper; - } - -} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/okhttp/OkHttpClientWrapper.java b/okhttps/src/main/java/cn/zhxu/okhttps/okhttp/OkHttpClientWrapper.java deleted file mode 100644 index 14489c93..00000000 --- a/okhttps/src/main/java/cn/zhxu/okhttps/okhttp/OkHttpClientWrapper.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.zhxu.okhttps.okhttp; - -import cn.zhxu.okhttps.HTTP; -import cn.zhxu.okhttps.internal.AbstractHttpClient; -import okhttp3.*; - -import java.util.concurrent.Executor; - - -public class OkHttpClientWrapper extends AbstractHttpClient { - - // OkHttpClient - final OkHttpClient okClient; - - public OkHttpClientWrapper(OkHttpBuilderImpl builder) { - super(builder); - this.okClient = builder.okClient(); - } - - @Override - public Executor ioExecutor(HTTP.Builder builder) { - OkHttpBuilderImpl builderImpl = (OkHttpBuilderImpl) builder; - return builderImpl.okClient().dispatcher().executorService(); - } - - @Override - public void doCancelAll() { - okClient.dispatcher().cancelAll(); - } - - @Override - public Call request(Request request) { - return okClient.newCall(request); - } - - @Override - public WebSocket webSocket(Request request, WebSocketListener listener) { - return okClient.newWebSocket(request, listener); - } - - public OkHttpClient okClient() { - return okClient; - } - - @Override - public int totalTimeoutMillis() { - return okClient.connectTimeoutMillis() + okClient.writeTimeoutMillis() + okClient.readTimeoutMillis(); - } - - @Override - public HTTP.Builder newBuilder() { - return new OkHttpBuilderImpl(this); - } - -} diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/Array.java b/okhttps/src/main/java/com/ejlchina/okhttps/Array.java new file mode 100644 index 00000000..5c47331d --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Array.java @@ -0,0 +1,60 @@ +package com.ejlchina.okhttps; + +/** + * 列表结构的只读数据集 + * + * @since 2.0.0 + * Array 接口 类似于 JsonArray + * 但为什么不取名为 json 呢，因它不止是 json，它还可以是 xml、yml、protobuf 等任何一种格式的数据 + */ +public interface Array extends DataSet { + + /** + * @param index 元素下标 + * @return 子 JsonObj + */ + Mapper getMapper(int index); + + /** + * @param index 元素下标 + * @return 子 JsonArr + */ + Array getArray(int index); + + /** + * @param index 元素下标 + * @return boolean 值 + */ + boolean getBool(int index); + + /** + * @param index 元素下标 + * @return int 值 + */ + int getInt(int index); + + /** + * @param index 元素下标 + * @return long 值 + */ + long getLong(int index); + + /** + * @param index 元素下标 + * @return float 值 + */ + float getFloat(int index); + + /** + * @param index 元素下标 + * @return double 值 + */ + double getDouble(int index); + + /** + * @param index 元素下标 + * @return String 值 + */ + String getString(int index); + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Cancelable.java b/okhttps/src/main/java/com/ejlchina/okhttps/Cancelable.java similarity index 80% rename from okhttps/src/main/java/cn/zhxu/okhttps/Cancelable.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Cancelable.java index e6b3db84..0c81a7ac 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Cancelable.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Cancelable.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; public interface Cancelable { diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Config.java b/okhttps/src/main/java/com/ejlchina/okhttps/Config.java similarity index 67% rename from okhttps/src/main/java/cn/zhxu/okhttps/Config.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Config.java index c2eeb36d..71a803c7 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Config.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Config.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; import java.util.ServiceLoader; @@ -7,10 +7,6 @@ */ public interface Config { - /** - * 配置 {@link OkHttps } 内部的 {@link HTTP } 实例 - * @param builder HTTP.Builder - */ void with(HTTP.Builder builder); static void config(HTTP.Builder builder) { diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/ConvertProvider.java b/okhttps/src/main/java/com/ejlchina/okhttps/ConvertProvider.java similarity index 94% rename from okhttps/src/main/java/cn/zhxu/okhttps/ConvertProvider.java rename to okhttps/src/main/java/com/ejlchina/okhttps/ConvertProvider.java index 0ce5d1ad..aa1600b9 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/ConvertProvider.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/ConvertProvider.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; import java.util.ServiceLoader; diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/DataSet.java b/okhttps/src/main/java/com/ejlchina/okhttps/DataSet.java new file mode 100644 index 00000000..52aa5367 --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/DataSet.java @@ -0,0 +1,19 @@ +package com.ejlchina.okhttps; + +/** + * 只读数据集 + * @since 2.5.0 + */ +public interface DataSet { + + /** + * @return 集合内直接子元素的数量 + */ + int size(); + + /** + * @return 数据集是否为空 + */ + boolean isEmpty(); + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/DownListener.java b/okhttps/src/main/java/com/ejlchina/okhttps/DownListener.java similarity index 89% rename from okhttps/src/main/java/cn/zhxu/okhttps/DownListener.java rename to okhttps/src/main/java/com/ejlchina/okhttps/DownListener.java index a4f4735b..53cbebed 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/DownListener.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/DownListener.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; /** * 下载监听接口 diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Download.java b/okhttps/src/main/java/com/ejlchina/okhttps/Download.java similarity index 52% rename from okhttps/src/main/java/cn/zhxu/okhttps/Download.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Download.java index fe622132..49523676 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Download.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Download.java @@ -1,7 +1,9 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.internal.HttpException; +import com.ejlchina.okhttps.internal.TaskExecutor; import java.io.*; -import java.util.function.Consumer; /** * 文件下载 @@ -9,25 +11,23 @@ */ public class Download { - private final File file; - private final InputStream input; - private final TaskExecutor taskExecutor; - private final Ctrl ctrl; - - private Consumer onSuccess; - private Consumer onFailure; - private Consumer onComplete; + private File file; + private InputStream input; + private OnCallback onSuccess; + private OnCallback onFailure; + private TaskExecutor taskExecutor; private long doneBytes; private int buffSize = 0; private long seekBytes = 0; private boolean appended; - private volatile Status status; + private volatile int status; private final Object lock = new Object(); protected boolean nextOnIO = false; private boolean sOnIO; private boolean fOnIO; - private boolean cOnIO; + + private Ctrl ctrl; public Download(File file, InputStream input, TaskExecutor taskExecutor, long skipBytes) { this.file = file; @@ -61,7 +61,6 @@ public Download setAppended() { /** * 设置文件指针，从文件的 seekBytes 位置追加内容 - * 只有配合 setAppended() 方法一起才会有作用 * @param seekBytes 跨越的字节数 * @return Download */ @@ -84,7 +83,7 @@ public Download nextOnIO() { * @param onSuccess 成功回调函数 * @return Download */ - public Download setOnSuccess(Consumer onSuccess) { + public Download setOnSuccess(OnCallback onSuccess) { this.onSuccess = onSuccess; sOnIO = nextOnIO; nextOnIO = false; @@ -92,30 +91,17 @@ public Download setOnSuccess(Consumer onSuccess) { } /** - * 设置下载失败回调（取消不执行） + * 设置下载失败回调 * @param onFailure 失败回调函数 * @return Download */ - public Download setOnFailure(Consumer onFailure) { + public Download setOnFailure(OnCallback onFailure) { this.onFailure = onFailure; fOnIO = nextOnIO; nextOnIO = false; return this; } - - /** - * @since 3.2.0 - * 设置下载结束回调（成功、失败、取消都执行） - * @param onComplete 结束回调函数 - * @return Download - */ - public Download setOnComplete(Consumer onComplete) { - this.onComplete = onComplete; - cOnIO = nextOnIO; - nextOnIO = false; - return this; - } - + /** * 开始下载 * @return 下载控制器 @@ -125,10 +111,8 @@ public Ctrl start() { buffSize = Process.DEFAULT_STEP_BYTES; } RandomAccessFile raFile = randomAccessFile(); - if (raFile != null) { - status = Status.DOWNLOADING; - taskExecutor.execute(() -> doDownload(raFile), true); - } + status = Ctrl.STATUS__DOWNLOADING; + taskExecutor.execute(() -> doDownload(raFile), true); return ctrl; } @@ -140,108 +124,82 @@ public Ctrl getCtrl() { return ctrl; } - /** - * 下载状态 - * @since v3.2.0 - */ - public enum Status { - + public class Ctrl { + /** * 已取消 */ - CANCELED(-1), - + public static final int STATUS__CANCELED = -1; + /** * 下载中 */ - DOWNLOADING(1), - + public static final int STATUS__DOWNLOADING = 1; + /** * 已暂停 */ - PAUSED(2), - + public static final int STATUS__PAUSED = 2; + /** - * 成功下载完成 + * 已完成 */ - DONE(3), - + public static final int STATUS__DONE = 3; + /** - * 发送错误 + * 错误 */ - ERROR(4); - - private final int value; - - Status(int value) { - this.value = value; - } - - public int value() { - return value; - } - - } - - /** - * 下载控制器 - */ - public class Ctrl { - + public static final int STATUS__ERROR = 4; + /** - * @return 下载状态（v3.2.0 之前方法 返回整型常量，v3.2.0 开始修改为枚举） + * @see #STATUS__CANCELED + * @see #STATUS__DOWNLOADING + * @see #STATUS__PAUSED + * @see #STATUS__DONE + * @return 下载状态 */ - public Status status() { + public int status() { return status; } /** - * 暂停下载任务（只有处于下载中状态才能暂停成功） - * @return 是否暂停成功 + * 暂停下载任务 */ - public boolean pause() { + public void pause() { synchronized (lock) { - if (status == Status.DOWNLOADING) { - status = Status.PAUSED; - return true; + if (status == STATUS__DOWNLOADING) { + status = STATUS__PAUSED; } } - return false; } /** - * 继续下载任务（只有处于暂停状态才能恢复成功） - * @return 是否恢复成功 + * 继续下载任务 */ - public boolean resume() { + public void resume() { synchronized (lock) { - if (status == Status.PAUSED) { - status = Status.DOWNLOADING; - return true; + if (status == STATUS__PAUSED) { + status = STATUS__DOWNLOADING; } } - return false; } /** - * 取消下载任务（只有处于暂停或下载中状态才能取消成功） - * @return 是否取消成功 + * 取消下载任务 */ - public boolean cancel() { + public void cancel() { synchronized (lock) { - if (status == Status.PAUSED || status == Status.DOWNLOADING) { - status = Status.CANCELED; - return true; + if (status == STATUS__PAUSED || status == STATUS__DOWNLOADING) { + status = STATUS__CANCELED; } } - return false; } } public class Failure { - private final IOException exception; + private IOException exception; Failure(IOException exception) { this.exception = exception; @@ -255,7 +213,7 @@ public File getFile() { } /** - * @return 本次已下载字节数 + * @return 已下载字节数 */ public long getDoneBytes() { return doneBytes; @@ -274,36 +232,40 @@ private RandomAccessFile randomAccessFile() { try { return new RandomAccessFile(file, "rw"); } catch (FileNotFoundException e) { - status = Status.ERROR; + status = Ctrl.STATUS__ERROR; closeQuietly(input); - fireOnComplete(); - fireOnFailure(e); + throw new HttpException("无法获取文件[" + file.getAbsolutePath() + "]的输入流", e); } - return null; } private void doDownload(RandomAccessFile raFile) { try { if (appended && seekBytes > 0) { - // 使支持并行下载到同一个文件 - raFile.seek(seekBytes); + long length = raFile.length(); + if (seekBytes <= length) { + raFile.seek(seekBytes); + doneBytes = seekBytes; + } else { + raFile.seek(length); + doneBytes = length; + } } - while (status != Status.CANCELED && status != Status.DONE) { - if (status == Status.DOWNLOADING) { + while (status != Ctrl.STATUS__CANCELED && status != Ctrl.STATUS__DONE) { + if (status == Ctrl.STATUS__DOWNLOADING) { byte[] buff = new byte[buffSize]; int len; while ((len = input.read(buff)) != -1) { raFile.write(buff, 0, len); doneBytes += len; - if (status == Status.CANCELED - || status == Status.PAUSED) { + if (status == Ctrl.STATUS__CANCELED + || status == Ctrl.STATUS__PAUSED) { break; } } if (len == -1) { synchronized (lock) { - if (status != Status.CANCELED) { - status = Status.DONE; + if (status != Ctrl.STATUS__CANCELED) { + status = Ctrl.STATUS__DONE; } } } @@ -311,46 +273,26 @@ private void doDownload(RandomAccessFile raFile) { } } catch (IOException e) { synchronized (lock) { - if (status != Status.CANCELED) { - status = Status.ERROR; + if (status != Ctrl.STATUS__CANCELED) { + status = Ctrl.STATUS__ERROR; } } - if (status == Status.ERROR) { - fireOnFailure(e); + if (status == Ctrl.STATUS__ERROR) { + if (onFailure != null) { + taskExecutor.execute(() -> onFailure.on(new Failure(e)), fOnIO); + } else { + throw new HttpException("流传输失败", e); + } } } finally { closeQuietly(raFile); closeQuietly(input); - if (status == Status.CANCELED && !file.delete()) { - Platform.logError("can not delete canceled file: " + file); + if (status == Ctrl.STATUS__CANCELED) { + file.delete(); } - fireOnComplete(); - } - if (status == Status.DONE) { - fireOnSuccess(); - } - } - - private void fireOnComplete() { - Consumer onComplete = this.onComplete; - if (onComplete != null) { - taskExecutor.execute(() -> onComplete.accept(status), cOnIO); - } - } - - private void fireOnSuccess() { - Consumer onSuccess = this.onSuccess; - if (onSuccess != null) { - taskExecutor.execute(() -> onSuccess.accept(file), sOnIO); } - } - - private void fireOnFailure(IOException e) { - Consumer onFailure = this.onFailure; - if (onFailure != null) { - taskExecutor.execute(() -> onFailure.accept(new Failure(e)), fOnIO); - } else { - throw new OkHttpsException("Download failed: ", e); + if (status == Ctrl.STATUS__DONE && onSuccess != null) { + taskExecutor.execute(() -> onSuccess.on(file), sOnIO); } } diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/FilePara.java b/okhttps/src/main/java/com/ejlchina/okhttps/FilePara.java new file mode 100644 index 00000000..7d40ca8d --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/FilePara.java @@ -0,0 +1,48 @@ +package com.ejlchina.okhttps; + +import java.io.File; + +/** + * @since 2.5.0 从 HttpTask 中分离 + */ +public class FilePara { + + String type; + String fileName; + byte[] content; + File file; + + public FilePara(String type, String fileName, byte[] content) { + this.type = type; + this.fileName = fileName; + this.content = content; + } + + public FilePara(String type, String fileName, File file) { + this.type = type; + this.fileName = fileName; + this.file = file; + } + + public String getType() { + return type; + } + + public String getFileName() { + return fileName; + } + + public byte[] getContent() { + return content; + } + + public File getFile() { + return file; + } + + @Override + public String toString() { + return "FilePara{" + "type='" + type + "', fileName='" + fileName + "'}"; + } + +} diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/HTTP.java b/okhttps/src/main/java/com/ejlchina/okhttps/HTTP.java new file mode 100644 index 00000000..d2f2b4fc --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/HTTP.java @@ -0,0 +1,548 @@ +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.internal.*; + +import okhttp3.*; +import okhttp3.WebSocket; + +import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.*; +import java.util.concurrent.Executor; + +/** + * HTTP 客户端接口 + * + * @author 15735 + */ +public interface HTTP { + + String GET = "GET"; + String HEAD = "HEAD"; + String POST = "POST"; + String PUT = "PUT"; + String PATCH = "PATCH"; + String DELETE = "DELETE"; + + /** + * 同步请求 + * @param url 请求地址 + * @return 同步HTTP任务 + */ + SyncHttpTask sync(String url); + + /** + * 异步请求 + * @param url 请求地址 + * @return 异步HTTP任务 + */ + AsyncHttpTask async(String url); + + /** + * Websocket 连接 + * @param url 连接地址 + * @return WebSocket 任务 + */ + WebSocketTask webSocket(String url); + + /** + * 根据标签取消HTTP任务，只要任务的标签包含指定的Tag就会被取消 + * 从 v1.0.2 开始支持取消同步请求 + * @param tag 标签 + * @return 被取消的任务数量 + */ + int cancel(String tag); + + /** + * @since 1.0.2 + * 取消所有HTTP任务，包括同步和异步 + */ + void cancelAll(); + + /** + * OkHttp 的 HTTP 原生请求 （该请求不经过 预处理器） + * @param request 请求 + * @return Call + */ + Call request(Request request); + + /** + * OkHttp 的 Websocket 原生请求（该请求不经过 预处理器） + * @param request 请求 + * @param listener 监听器 + * @return Websocket + */ + WebSocket webSocket(Request request, WebSocketListener listener); + + /** + * 获取任务执行器 + * @return TaskExecutor + */ + TaskExecutor executor(); + + /** + * 新的构建器 + * @return Builder + */ + Builder newBuilder(); + + /** + * HTTP 构建器 + * @return HTTP 构建器 + */ + static Builder builder() { + return new Builder(); + } + + /** + * Http 配置器 + * + */ + interface OkConfig { + + /** + * 使用 builder 配置 HttpClient + * @param builder OkHttpClient 构建器 + */ + void config(OkHttpClient.Builder builder); + + } + + class Builder { + + private OkHttpClient okClient; + + private String baseUrl; + + private Map mediaTypes; + + private List contentTypes; + + private OkConfig config; + + private Executor mainExecutor; + + private Scheduler taskScheduler; + + private List preprocessors; + + private DownListener downloadListener; + + private TaskListener responseListener; + + private TaskListener exceptionListener; + + private TaskListener completeListener; + + private List msgConvertors; + + private int preprocTimeoutTimes = 10; + + private Charset charset = StandardCharsets.UTF_8; + + private String bodyType = OkHttps.FORM; + + private Map retryPolicys; + + + public Builder() { + mediaTypes = new HashMap<>(); + mediaTypes.put("*", "application/octet-stream"); + mediaTypes.put("png", "image/png"); + mediaTypes.put("jpg", "image/jpeg"); + mediaTypes.put("jpeg", "image/jpeg"); + mediaTypes.put("wav", "audio/wav"); + mediaTypes.put("mp3", "audio/mp3"); + mediaTypes.put("mp4", "video/mpeg4"); + mediaTypes.put("txt", "text/plain"); + mediaTypes.put("xls", "application/x-xls"); + mediaTypes.put("xml", "text/xml"); + mediaTypes.put("apk", "application/vnd.android.package-archive"); + mediaTypes.put("doc", "application/msword"); + mediaTypes.put("pdf", "application/pdf"); + mediaTypes.put("html", "text/html"); + contentTypes = new ArrayList<>(); + contentTypes.add("application/x-www-form-urlencoded"); + contentTypes.add("application/json"); + contentTypes.add("application/xml"); + contentTypes.add("application/x-protobuf"); + preprocessors = new ArrayList<>(); + msgConvertors = new ArrayList<>(); + retryPolicys = new HashMap<>(); + } + + public Builder(HttpClient hc) { + okClient = hc.okClient(); + baseUrl = hc.baseUrl(); + mediaTypes = hc.mediaTypes(); + preprocessors = new ArrayList<>(); + Collections.addAll(preprocessors, hc.preprocessors()); + TaskExecutor executor = hc.executor(); + contentTypes = new ArrayList<>(); + Collections.addAll(contentTypes, executor.getContentTypes()); + mainExecutor = executor.getMainExecutor(); + taskScheduler = executor.getTaskScheduler(); + downloadListener = executor.getDownloadListener(); + responseListener = executor.getResponseListener(); + exceptionListener = executor.getExceptionListener(); + completeListener = executor.getCompleteListener(); + msgConvertors = new ArrayList<>(); + Collections.addAll(msgConvertors, executor.getMsgConvertors()); + preprocTimeoutTimes = hc.preprocTimeoutTimes(); + retryPolicys = new HashMap<>(); + retryPolicys.putAll(hc.retryPolicys()); + bodyType = hc.bodyType(); + charset = hc.charset(); + } + + /** + * 配置 OkHttpClient + * @param config 配置器 + * @return Builder + */ + public Builder config(OkConfig config) { + this.config = config; + return this; + } + + /** + * 设置 baseUrl + * @param baseUrl 全局URL前缀 + * @return Builder + */ + public Builder baseUrl(String baseUrl) { + this.baseUrl = baseUrl; + return this; + } + + /** + * 配置媒体类型 + * @param mediaTypes 媒体类型 + * @return Builder + */ + public Builder mediaTypes(Map mediaTypes) { + if (mediaTypes != null) { + this.mediaTypes.putAll(mediaTypes); + } + return this; + } + + /** + * 配置媒体类型 + * @param key 媒体类型KEY + * @param value 媒体类型VALUE + * @return Builder + */ + public Builder mediaTypes(String key, String value) { + if (key != null && value != null) { + this.mediaTypes.put(key, value); + } + return this; + } + + /** + * 配置支持的报文体类型 + * @param contentTypes 报文体类型列表 + * @return Builder + */ + public Builder contentTypes(List contentTypes) { + if (contentTypes != null) { + this.contentTypes.addAll(contentTypes); + } + return this; + } + + /** + * 配置支持的报文体类型 + * @param contentType 报文体类型 + * @return Builder + */ + public Builder contentTypes(String contentType) { + if (contentType != null) { + this.contentTypes.add(contentType); + } + return this; + } + + /** + * 设置回调执行器，例如实现切换线程功能，只对异步请求有效 + * @param executor 回调执行器 + * @return Builder + */ + public Builder callbackExecutor(Executor executor) { + this.mainExecutor = executor; + return this; + } + + /** + * 配置 任务调度器，可用的调度由 {@link WebSocketTask#heatbeat(int, int) } 指定的心跳任务 + * 若不配置，则生成一个 线程容量为 1 的 ScheduledThreadPoolExecutor 调度器 + * @since v2.3.0 + * @param scheduler 调度器 + * @return Builder + */ + public Builder taskScheduler(Scheduler scheduler) { + this.taskScheduler = scheduler; + return this; + } + + /** + * 添加可并行处理请求任务的预处理器 + * @param preprocessor 预处理器 + * @return Builder + */ + public Builder addPreprocessor(Preprocessor preprocessor) { + if (preprocessor != null) { + preprocessors.add(preprocessor); + } + return this; + } + + /** + * 添加串行预处理器 + * @param preprocessor 预处理器 + * @return Builder + */ + public Builder addSerialPreprocessor(Preprocessor preprocessor) { + if (preprocessor != null) { + preprocessors.add(new HttpClient.SerialPreprocessor(preprocessor)); + } + return this; + } + + /** + * 清空预处理器（包括串行预处理器） + * @since v2.5.0 + * @return Builder + */ + public Builder clearPreprocessors() { + preprocessors.clear(); + return this; + } + + /** + * 最大预处理时间（倍数，相当普通请求的超时时间） + * @param times 普通超时时间的倍数，默认为 10 + * @return Builder + */ + public Builder preprocTimeoutTimes(int times) { + if (times > 0) { + preprocTimeoutTimes = times; + } + return this; + } + + /** + * 设置全局响应监听 + * @param listener 监听器 + * @return Builder + */ + public Builder responseListener(TaskListener listener) { + responseListener = listener; + return this; + } + + /** + * 设置全局异常监听 + * @param listener 监听器 + * @return Builder + */ + public Builder exceptionListener(TaskListener listener) { + exceptionListener = listener; + return this; + } + + /** + * 设置全局完成监听 + * @param listener 监听器 + * @return Builder + */ + public Builder completeListener(TaskListener listener) { + completeListener = listener; + return this; + } + + /** + * 设置下载监听器 + * @param listener 监听器 + * @return Builder + */ + public Builder downloadListener(DownListener listener) { + downloadListener = listener; + return this; + } + + /** + * @since v2.0.0 + * 添加消息转换器 + * @param msgConvertor JSON 服务 + * @return Builder + */ + public Builder addMsgConvertor(MsgConvertor msgConvertor) { + if (msgConvertor != null) { + msgConvertors.add(msgConvertor); + } + return this; + } + + /** + * 清空消息转换器 + * @since v2.5.0 + * @return Builder + */ + public Builder clearMsgConvertors() { + msgConvertors.clear(); + return this; + } + + /** + * @since v2.0.0 + * 设置默认编码格式 + * @param charset 编码 + * @return Builder + */ + public Builder charset(Charset charset) { + if (charset != null) { + this.charset = charset; + } + return this; + } + + /** + * @since v2.0.0 + * 设置默认请求体类型 + * @param bodyType 请求体类型 + * @return Builder + */ + public Builder bodyType(String bodyType) { + if (bodyType != null) { + this.bodyType = bodyType.toLowerCase(); + } + return this; + } + + /** + * 添加重试策略 + * @since v2.5.0 + * @param name 策略名 + * @param policy 策略 + * @return Builder + */ + public Builder addRetryPolicy(String name, RetryPolicy policy) { + if (retryPolicys.containsKey(name)) { + throw new IllegalStateException("RetryPolicy[" + name + "] already exists!"); + } + retryPolicys.put(name, policy); + return this; + } + + /** + * 清空重试策略 + * @since v2.5.0 + * @return Builder + */ + public Builder clearRetryPolicys() { + retryPolicys.clear(); + return this; + } + + /** + * 构建 HTTP 实例 + * @return HTTP + */ + public HTTP build() { + if (config != null || okClient == null) { + OkHttpClient.Builder builder; + if (okClient != null) { + builder = okClient.newBuilder(); + } else { + builder = new OkHttpClient.Builder(); + } + if (config != null) { + config.config(builder); + } + // fix issue: https://github.com/ejlchina/okhttps/issues/8 + if (needCopyInterceptor(builder.interceptors())) { + builder.addInterceptor(new CopyInterceptor()); + } + okClient = builder.build(); + } else if (needCopyInterceptor(okClient.interceptors())) { + okClient = okClient.newBuilder() + .addInterceptor(new CopyInterceptor()) + .build(); + } + return new HttpClient(this); + } + + private boolean needCopyInterceptor(List list) { + return mainExecutor != null && Platform.ANDROID_SDK_INT > 24 && CopyInterceptor.notIn(list); + } + + public OkHttpClient okClient() { + return okClient; + } + + public String baseUrl() { + return baseUrl; + } + + public Map getMediaTypes() { + return mediaTypes; + } + + public Executor mainExecutor() { + return mainExecutor; + } + + public Preprocessor[] preprocessors() { + return preprocessors.toArray(new Preprocessor[0]); + } + + public DownListener downloadListener() { + return downloadListener; + } + + public TaskListener responseListener() { + return responseListener; + } + + public TaskListener exceptionListener() { + return exceptionListener; + } + + public TaskListener completeListener() { + return completeListener; + } + + public MsgConvertor[] msgConvertors() { + return msgConvertors.toArray(new MsgConvertor[0]); + } + + public Scheduler taskScheduler() { + return taskScheduler; + } + + public String[] contentTypes() { + return contentTypes.toArray(new String[0]); + } + + public int preprocTimeoutTimes() { + return preprocTimeoutTimes; + } + + public Charset charset() { + return charset; + } + + public String bodyType() { + return bodyType; + } + + public Map retryPolicys() { + return retryPolicys; + } + + } + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/HttpCall.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpCall.java similarity index 83% rename from okhttps/src/main/java/cn/zhxu/okhttps/HttpCall.java rename to okhttps/src/main/java/com/ejlchina/okhttps/HttpCall.java index 00c15fa8..5bc4214c 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/HttpCall.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/HttpCall.java @@ -1,4 +1,6 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; + +import com.ejlchina.okhttps.internal.AsyncHttpTask; public interface HttpCall extends Cancelable { @@ -24,6 +26,6 @@ public interface HttpCall extends Cancelable { * @since 2.2.0 * @return 当前的异步请求任务 */ - AHttpTask getTask(); + AsyncHttpTask getTask(); } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/HttpResult.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpResult.java similarity index 90% rename from okhttps/src/main/java/cn/zhxu/okhttps/HttpResult.java rename to okhttps/src/main/java/com/ejlchina/okhttps/HttpResult.java index 8294c861..fdcd92d0 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/HttpResult.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/HttpResult.java @@ -1,15 +1,15 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.data.ListMap; -import cn.zhxu.okhttps.internal.RealHttpResult; -import okhttp3.Headers; -import okhttp3.MediaType; -import okhttp3.Response; +package com.ejlchina.okhttps; import java.io.File; import java.io.IOException; import java.util.List; -import java.util.function.Consumer; + +import com.ejlchina.okhttps.internal.RealHttpResult; +import com.ejlchina.okhttps.internal.TaskExecutor; + +import okhttp3.Headers; +import okhttp3.MediaType; +import okhttp3.Response; /** @@ -92,14 +92,11 @@ enum State { interface Body extends Toable { /** - * will be removed in next version * @return 媒体类型 */ - @Deprecated MediaType getType(); /** - * 依赖于 Content-Length 响应头 * @return 报文体字节长度 */ long getLength(); @@ -115,7 +112,7 @@ interface Body extends Toable { * @param onProcess 进度回调函数 * @return Body */ - Body setOnProcess(Consumer onProcess); + Body setOnProcess(OnCallback onProcess); /** * 设置进度回调的步进字节，默认 8K（8192） @@ -197,25 +194,15 @@ interface Body extends Toable { int getStatus(); /** - * WebSocket 返回 101 也返回 true (since v3.5.1) * @return 是否响应成功，状态码在 [200..300) 之间 */ boolean isSuccessful(); /** - * will be removed in next version * @return 响应头 - * @see #allHeaders() */ - @Deprecated Headers getHeaders(); - /** - * @return 所有响应头 - * @since v3.5.0 - */ - ListMap allHeaders(); - /** * @param name 头名称 * @return 响应头 diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/HttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java similarity index 52% rename from okhttps/src/main/java/cn/zhxu/okhttps/HttpTask.java rename to okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java index d7381c22..d416824d 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/HttpTask.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/HttpTask.java @@ -1,55 +1,45 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; -import cn.zhxu.data.ArrayListMap; -import cn.zhxu.data.ListMap; -import cn.zhxu.okhttps.HttpResult.State; -import cn.zhxu.okhttps.internal.*; -import cn.zhxu.okhttps.internal.AbstractHttpClient.TagTask; +import com.ejlchina.okhttps.HttpResult.State; +import com.ejlchina.okhttps.internal.*; +import com.ejlchina.okhttps.internal.HttpClient.TagTask; import okhttp3.*; import okhttp3.internal.http.HttpMethod; import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.net.ConnectException; import java.net.SocketException; import java.net.SocketTimeoutException; import java.net.UnknownHostException; import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.util.Base64; +import java.util.HashMap; import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import java.util.function.Consumer; /** * Created by 周旭（Troy.Zhou） on 2020/3/11. */ @SuppressWarnings("unchecked") -public abstract class HttpTask> implements Cancelable { +public abstract class HttpTask> implements Cancelable { - private static final String DOT = "."; - private static final String MULTIPART = "multipart/"; - private static final String FORM = "x-www-form-urlencoded"; + private static final String PATH_PARAM_REGEX = "[A-Za-z0-9_\\-/]*\\{[A-Za-z0-9_\\-]+\\}[A-Za-z0-9_\\-/]*"; - protected final AbstractHttpClient httpClient; + protected HttpClient httpClient; protected boolean nothrow; protected boolean nextOnIO = false; private final String urlPath; private String tag; - - private ListMap headers; - private ListMap pathParams; - private ListMap urlParams; - private ListMap bodyParams; - private ListMap files; - + private Map headers; + private Map pathParams; + private Map urlParams; + private Map bodyParams; + private Map files; private Object requestBody; - private String bodyType; // 都是小写形式 - private String boundary; // MultipartBody 的 边界符 - private Consumer onProcess; + private String bodyType; + private OnCallback onProcess; private boolean processOnIO; private long stepBytes = 0; private double stepRate = -1; @@ -63,8 +53,9 @@ public abstract class HttpTask> implements Cancelable { protected boolean skipPreproc = false; protected boolean skipSerialPreproc = false; + protected RetryPolicy retryPolicy; - public HttpTask(AbstractHttpClient httpClient, String urlPath) { + public HttpTask(HttpClient httpClient, String urlPath) { this.httpClient = httpClient; this.charset = httpClient.charset(); this.bodyType = httpClient.bodyType(); @@ -121,10 +112,8 @@ public String getBodyType() { * @return 是否匹配 */ public boolean isTagged(String tag) { - String theTag = this.tag; - if (theTag != null && tag != null) { - return theTag.equals(tag) || theTag.startsWith(tag + DOT) || theTag.endsWith(DOT + tag) - || theTag.contains(DOT + tag + DOT); + if (this.tag != null && tag != null) { + return this.tag.contains(tag); } return false; } @@ -133,7 +122,7 @@ public boolean isTagged(String tag) { * 获取请求任务的头信息 * @return 头信息 */ - public ListMap getHeaders() { + public Map getHeaders() { return headers; } @@ -141,7 +130,7 @@ public ListMap getHeaders() { * @since 2.4.0 * @return 路径参数 */ - public ListMap getPathParas() { + public Map getPathParas() { return pathParams; } @@ -149,7 +138,7 @@ public ListMap getPathParas() { * @since 2.4.0 * @return URL参数（查询参数） */ - public ListMap getUrlParas() { + public Map getUrlParas() { return urlParams; } @@ -157,7 +146,7 @@ public ListMap getUrlParas() { * @since 2.4.0 * @return 报文体参数 */ - public ListMap getBodyParas() { + public Map getBodyParas() { return bodyParams; } @@ -165,7 +154,7 @@ public ListMap getBodyParas() { * @since 2.4.0 * @return 文件参数 */ - public ListMap getFileParas() { + public Map getFileParas() { return files; } @@ -222,7 +211,7 @@ public C skipSerialPreproc() { public C tag(String tag) { if (tag != null) { if (this.tag != null) { - this.tag = this.tag + DOT + tag; + this.tag = this.tag + "." + tag; } else { this.tag = tag; } @@ -258,46 +247,44 @@ public C bodyType(String type) { } /** - * 下一个回调在IO线程执行 + * 使用重试机制 + * @since 2.5.0 + * @param policy 重试策略 * @return HttpTask 实例 */ - public C nextOnIO() { - nextOnIO = true; + public C retryPolicy(RetryPolicy policy) { + this.retryPolicy = policy; return (C) this; } /** - * 绑定一个对象 - * @param object 对象 + * 使用重试机制 + * @since 2.5.0 + * @param policyName 重试策略名（从 HTTP 实例中获取，在构建时注入） * @return HttpTask 实例 */ - public C bind(Object object) { - this.object = object; + public C retryPolicy(String policyName) { + retryPolicy = httpClient.requirePolicy(policyName); return (C) this; } /** - * Basic Auth 认证 - * @param username 用户名 - * @param password 密码 + * 下一个回调在IO线程执行 * @return HttpTask 实例 - * @since v3.5.0 */ - public C basicAuth(String username, String password) { - byte[] authData = (username + ':' + password).getBytes(StandardCharsets.UTF_8); - byte[] authBytes = Base64.getEncoder().encode(authData); - String authStr = new String(authBytes, StandardCharsets.UTF_8); - return addHeader("Authorization", "Basic " + authStr); + public C nextOnIO() { + nextOnIO = true; + return (C) this; } /** - * Bearer Auth 认证 - * @param token 令牌 + * 绑定一个对象 + * @param object 对象 * @return HttpTask 实例 - * @since v3.5.0 */ - public C bearerAuth(String token) { - return addHeader("Authorization", "Bearer " + token); + public C bind(Object object) { + this.object = object; + return (C) this; } /** @@ -309,7 +296,7 @@ public C bearerAuth(String token) { public C addHeader(String name, String value) { if (name != null && value != null) { if (headers == null) { - headers = new ArrayListMap<>(); + headers = new HashMap<>(); } headers.put(name, value); } @@ -324,7 +311,7 @@ public C addHeader(String name, String value) { public C addHeader(Map headers) { if (headers != null) { if (this.headers == null) { - this.headers = new ArrayListMap<>(); + this.headers = new HashMap<>(); } this.headers.putAll(headers); } @@ -342,7 +329,7 @@ public C setRange(long rangeStart) { } /** - * 设置 Range 头信息 + * 设置Range头信息 * 设置接收报文体时接收的范围，用于分块下载 * @param rangeStart 表示从 rangeStart 个字节处开始接收 * @param rangeEnd 表示接收到 rangeEnd 个字节处 @@ -357,7 +344,7 @@ public C setRange(long rangeStart, long rangeEnd) { * @param onProcess 进度回调函数 * @return HttpTask 实例 */ - public C setOnProcess(Consumer onProcess) { + public C setOnProcess(OnCallback onProcess) { this.onProcess = onProcess; processOnIO = nextOnIO; nextOnIO = false; @@ -395,7 +382,7 @@ public C stepRate(double stepRate) { public C addPathPara(String name, Object value) { if (name != null && value != null) { if (pathParams == null) { - pathParams = new ArrayListMap<>(); + pathParams = new HashMap<>(); } pathParams.put(name, value.toString()); } @@ -409,11 +396,9 @@ public C addPathPara(String name, Object value) { **/ public C addPathPara(Map params) { if (pathParams == null) { - pathParams = new ArrayListMap<>(); - } - if (params != null) { - pathParams.putAll(params); + pathParams = new HashMap<>(); } + doAddParams(pathParams, params); return (C) this; } @@ -426,7 +411,7 @@ public C addPathPara(Map params) { public C addUrlPara(String name, Object value) { if (name != null && value != null) { if (urlParams == null) { - urlParams = new ArrayListMap<>(); + urlParams = new HashMap<>(); } urlParams.put(name, value.toString()); } @@ -440,11 +425,9 @@ public C addUrlPara(String name, Object value) { **/ public C addUrlPara(Map params) { if (urlParams == null) { - urlParams = new ArrayListMap<>(); - } - if (params != null) { - urlParams.putAll(params); + urlParams = new HashMap<>(); } + doAddParams(urlParams, params); return (C) this; } @@ -457,31 +440,9 @@ public C addUrlPara(Map params) { public C addBodyPara(String name, Object value) { if (name != null && value != null) { if (bodyParams == null) { - bodyParams = new ArrayListMap<>(); - } - bodyParams.put(name, value); - } - return (C) this; - } - - /** - * Body参数：放在 Body 里的参数（该方法只适合表单提交方式） - * @param name 参数名 - * @param type 媒体类型: 如 txt、json、xml 等，参考 {@link HTTP.Builder#getMediaTypes() } - * @param value 参数值 - * @return HttpTask 实例 - * @since v4.1.0 - **/ - public C addBodyPara(String name, String type, Object value) { - if (name != null && value != null) { - if (bodyParams == null) { - bodyParams = new ArrayListMap<>(); - } - if (type == null) { - bodyParams.put(name, value); - } else { - bodyParams.put(name, new BodyPara(type, value)); + bodyParams = new HashMap<>(); } + bodyParams.put(name, value.toString()); } return (C) this; } @@ -493,23 +454,26 @@ public C addBodyPara(String name, String type, Object value) { **/ public C addBodyPara(Map params) { if (bodyParams == null) { - bodyParams = new ArrayListMap<>(); + bodyParams = new HashMap<>(); } + doAddParams(bodyParams, params); + return (C) this; + } + + private void doAddParams(Map taskParams, Map params) { if (params != null) { - bodyParams.putAll(params); + for (String name : params.keySet()) { + Object value = params.get(name); + if (name != null && value != null) { + taskParams.put(name, value.toString()); + } + } } - return (C) this; } /** * 设置 请求报文体 - * @param body 请求报文体，可以是： - * 
-     *  byte[] - 字节数组（直接作为报文体） 

-     *  String - 字符串（比如：JSON 字符串、键值对字符串，也是直接作为报文体）

-     *  POJO - 普通 Java 数据对象（由 {@link MsgConvertor } 来序列化） 

-     *  InputStream - 输入流（v3.5.0 开始支持）
-     *
+ * @param body 请求体，字节数组、字符串 或 Java对象（由 MsgConvertor 来序列化） * @return HttpTask 实例 **/ public C setBodyPara(Object body) { @@ -518,7 +482,7 @@ public C setBodyPara(Object body) { } /** - * 添加文件参数（以 multipart/form-data 形式上传） + * 添加文件参数 * @param name 参数名 * @param filePath 文件路径 * @return HttpTask 实例 @@ -528,83 +492,38 @@ public C addFilePara(String name, String filePath) { } /** - * 添加文件参数（以 multipart/form-data 形式上传） - * @param name 参数名 - * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等，参考 {@link HTTP.Builder#getMediaTypes() } - * @param filePath 文件路径 - * @return HttpTask 实例 - */ - public C addFilePara(String name, String type, String filePath) { - return addFilePara(name, type, new File(filePath)); - } - - /** - * 添加文件参数（以 multipart/form-data 形式上传） + * 添加文件参数 * @param name 参数名 * @param file 文件 * @return HttpTask 实例 */ public C addFilePara(String name, File file) { - if (file != null && file.exists()) { - String fileName = file.getName(); - String type = fileName.substring(fileName.lastIndexOf(DOT) + 1); - return addFilePara(name, type, file); - } - return (C) this; - } - - /** - * 添加文件参数（以 multipart/form-data 形式上传） - * @param name 参数名 - * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等 - * @param file 文件 - * @return HttpTask 实例 - */ - public C addFilePara(String name, String type, File file) { if (name != null && file != null && file.exists()) { + String fileName = file.getName(); + String type = fileName.substring(fileName.lastIndexOf(".") + 1); if (files == null) { - files = new ArrayListMap<>(); + files = new HashMap<>(); } - files.put(name, new FilePara(type, file.getName(), file)); + files.put(name, new FilePara(type, fileName, file)); } return (C) this; } /** - * 添加文件参数（以 multipart/form-data 形式上传） + * 添加文件参数 * @param name 参数名 * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等 * @param content 文件内容 * @return HttpTask 实例 */ public C addFilePara(String name, String type, byte[] content) { - return addFilePara(name, type, name + DOT + type, content); - } - - /** - * 添加文件参数（以 multipart/form-data 形式上传） - * @param name 参数名 - * @param content 文件内容 - * @param fileName 文件名: 如 xxx.txt、xxx.png、xxx.doc 等 - * @return HttpTask 实例 - * @since v3.5.1 - */ - public C addFilePara(String name, byte[] content, String fileName) { - if (fileName != null) { - int dotIdx = fileName.indexOf(DOT); - if (dotIdx >= 0 && dotIdx < fileName.length() - 1) { - String type = fileName.substring(dotIdx + 1); - return addFilePara(name, type, fileName, content); - } - return addFilePara(name, null, fileName, content); - } - return (C) this; + return addFilePara(name, type, name + "." + type, content); } /** - * 添加文件参数（以 multipart/form-data 形式上传） + * 添加文件参数 * @param name 参数名 - * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等 + * @param type 文件类型: 如 png、jpg、jpeg 等 * @param fileName 文件名 * @param content 文件内容 * @return HttpTask 实例 @@ -612,83 +531,13 @@ public C addFilePara(String name, byte[] content, String fileName) { public C addFilePara(String name, String type, String fileName, byte[] content) { if (name != null && content != null) { if (files == null) { - files = new ArrayListMap<>(); + files = new HashMap<>(); } files.put(name, new FilePara(type, fileName, content)); } return (C) this; } - /** - * 添加文件参数（以 multipart/form-data 形式上传） - * @param name 参数名 - * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等 - * @param stream 文件输入流 - * @return HttpTask 实例 - * @since v3.5.0 - */ - public C addFilePara(String name, String type, InputStream stream) { - return addFilePara(name, type, name + DOT + type, stream); - } - - /** - * 添加文件参数（以 multipart/form-data 形式上传） - * @param name 参数名 - * @param stream 文件输入流 - * @param fileName 文件名: 如 xxx.txt、xxx.png、xxx.doc 等 - * @return HttpTask 实例 - * @since v3.5.1 - */ - public C addFilePara(String name, InputStream stream, String fileName) { - if (fileName != null) { - int dotIdx = fileName.indexOf(DOT); - if (dotIdx >= 0 && dotIdx < fileName.length() - 1) { - String type = fileName.substring(dotIdx + 1); - return addFilePara(name, type, fileName, stream); - } - return addFilePara(name, null, fileName, stream); - } - return (C) this; - } - - /** - * 添加文件参数（以 multipart/form-data 形式上传） - * @param name 参数名 - * @param type 文件类型/扩展名: 如 txt、png、jpg、doc 等 - * @param fileName 文件名 - * @param stream 文件输入流 - * @return HttpTask 实例 - * @since v3.5.0 - */ - public C addFilePara(String name, String type, String fileName, InputStream stream) { - if (name != null && stream != null) { - if (files == null) { - files = new ArrayListMap<>(); - } - files.put(name, new FilePara(type, fileName, stream)); - } - return (C) this; - } - - /** - * @since v3.4.2 - * @return MultipartBody 的边界符 - */ - public String boundary() { - return boundary; - } - - /** - * 设置 MultipartBody 的边界符 - * @since v3.4.2 - * @param boundary 边界符 - * @return this - */ - public C boundary(String boundary) { - this.boundary = boundary; - return (C) this; - } - @Override public boolean cancel() { if (canceler != null) { @@ -743,8 +592,6 @@ protected Request prepareRequest(String method) { reqBody = new ProcessRequestBody(reqBody, onProcess, httpClient.executor().getExecutor(processOnIO), contentLength, stepBytes); - } else { - reqBody = new FixedRequestBody(reqBody); } builder.method(method, reqBody); } else { @@ -760,16 +607,18 @@ private long contentLength(RequestBody reqBody) { try { return reqBody.contentLength(); } catch (IOException e) { - throw new OkHttpsException("无法获取请求体长度", e); + throw new HttpException("无法获取请求体长度", e); } } private void buildHeaders(Request.Builder builder) { if (headers != null) { - headers.forEach((name, value) -> { - if (value == null) return; - builder.addHeader(name, value); - }); + for (String name : headers.keySet()) { + String value = headers.get(name); + if (value != null) { + builder.addHeader(name, value); + } + } } } @@ -788,35 +637,25 @@ protected State toState(IOException e) { } private RequestBody buildRequestBody() { - if (bodyParams != null && (OkHttps.FORM_DATA.equals(bodyType) || bodyType.startsWith(MULTIPART)) - || files != null) { - MultipartBody.Builder builder = multipartBodyBuilder(); + if (files != null) { + MultipartBody.Builder builder = new MultipartBody.Builder().setType(MultipartBody.FORM); if (bodyParams != null) { - bodyParams.forEach((key, value) -> { - if (value == null) return; - MediaType contentType = null; - String bodyValue; - if (value instanceof BodyPara) { - BodyPara para = (BodyPara) value; - contentType = httpClient.mediaType(para.getType()); - bodyValue = para.getValue().toString(); - } else { - bodyValue = value.toString(); - } - byte[] content = bodyValue.getBytes(charset); - RequestBody body = RequestBody.create(contentType, content); - builder.addPart(MultipartBody.Part.createFormData(key, null, body)); - }); + for (String name : bodyParams.keySet()) { + byte[] value = bodyParams.get(name).getBytes(charset); + RequestBody body = RequestBody.create(null, value); + builder.addPart(MultipartBody.Part.createFormData(name, null, body)); + } } - if (files != null) { - files.forEach((name, file) -> { - MediaType type = httpClient.mediaType(file.getType()); - builder.addFormDataPart( - name, - file.getFileName(), - file.toRequestBody(type) - ); - }); + for (String name : files.keySet()) { + FilePara file = files.get(name); + MediaType type = httpClient.mediaType(file.type); + RequestBody bodyPart; + if (file.file != null) { + bodyPart = RequestBody.create(type, file.file); + } else { + bodyPart = RequestBody.create(type, file.content); + } + builder.addFormDataPart(name, file.fileName, bodyPart); } return builder.build(); } @@ -824,139 +663,106 @@ private RequestBody buildRequestBody() { return toRequestBody(requestBody); } if (bodyParams == null) { - return emptyRequestBody(); + return new FormBody.Builder(charset).build(); } - if (OkHttps.FORM.equals(bodyType) || bodyType.endsWith(FORM)) { + if (OkHttps.FORM.equalsIgnoreCase(bodyType)) { FormBody.Builder builder = new FormBody.Builder(charset); - bodyParams.forEach((key, value) -> { - if (value == null) return; - builder.add(key, value.toString()); - }); + for (String name : bodyParams.keySet()) { + String value = bodyParams.get(name); + builder.add(name, value); + } return builder.build(); } return toRequestBody(bodyParams); } - private MultipartBody.Builder multipartBodyBuilder() { - MultipartBody.Builder builder; - if (boundary != null) { - builder = new MultipartBody.Builder(boundary); - } else { - builder = new MultipartBody.Builder(); - } - if (bodyType.startsWith(MULTIPART)) { - try { - builder.setType(MediaType.get(bodyType)); - } catch (IllegalArgumentException ignore) { } - } else { - builder.setType(MultipartBody.FORM); - } - return builder; - } - - private RequestBody emptyRequestBody() { - if (OkHttps.FORM_DATA.equalsIgnoreCase(bodyType)) { - return new MultipartBody.Builder().setType(MultipartBody.FORM).build(); + private RequestBody toRequestBody(Object object) { + if (object instanceof byte[] || object instanceof String) { + String mediaType = httpClient.executor().doMsgConvert(bodyType, null).contentType; + byte[] body = object instanceof byte[] ? (byte[]) object : ((String) object).getBytes(charset); + return RequestBody.create(MediaType.parse(mediaType + "; charset=" + charset.name()), body); } - return RequestBody.create(mediaType(), new byte[]{}); - } - - private MediaType mediaType() { - return httpClient.executor().doMsgConvert(bodyType, null).mediaType(charset); - } - - private RequestBody toRequestBody(Object bodyObj) { - if (bodyObj instanceof byte[] || bodyObj instanceof String) { - byte[] body = bodyObj instanceof byte[] ? (byte[]) bodyObj : ((String) bodyObj).getBytes(charset); - return RequestBody.create(mediaType(), body); - } - if (bodyObj instanceof InputStream) { - return new StreamRequestBody(mediaType(), (InputStream) bodyObj); - } - TaskExecutor.Data data = httpClient.executor().doMsgConvert(bodyType, c -> c.serialize(bodyObj, charset)); - return RequestBody.create(data.mediaType(charset), data.data); + TaskExecutor.Data data = httpClient.executor().doMsgConvert(bodyType, c -> c.serialize(object, charset)); + return RequestBody.create(MediaType.parse(data.contentType + "; charset=" + charset.name()), data.data); } private String buildUrlPath() { - if (Platform.isBlank(urlPath)) { - throw new OkHttpsException("url 不能为空！"); + String url = urlPath; + if (url == null || url.trim().isEmpty()) { + throw new HttpException("url 不能为空！"); } - StringBuilder sb = new StringBuilder(urlPath); if (pathParams != null) { - pathParams.forEach((name, value) -> { + for (String name : pathParams.keySet()) { String target = "{" + name + "}"; - int start = sb.indexOf(target); - if (start >= 0) { - String newValue = value != null ? value.toString() : ""; - sb.replace(start, start + target.length(), newValue); + if (url.contains(target)) { + url = url.replace(target, pathParams.get(name)); } else { - throw new OkHttpsException("PathPara [ " + name + " ] 不存在于 url [ " + urlPath + " ]"); + throw new HttpException("pathParameter [ " + name + " ] 不存在于 url [ " + urlPath + " ]"); } - }); + } + } + if (url.matches(PATH_PARAM_REGEX)) { + throw new HttpException("url 里有 pathParameter 没有设置，你必须先调用 addPathParam 为其设置！"); } if (urlParams != null) { - if (sb.indexOf("?") >= 0) { // contains("?") - int lastIndex = sb.length() - 1; - if (sb.lastIndexOf("?") < lastIndex) { // !endsWith("?") - if (sb.lastIndexOf("=") < sb.lastIndexOf("?") + 2) { - throw new OkHttpsException("url 格式错误，'?' 后没有发现 '='"); - } - if (sb.lastIndexOf("&") < lastIndex) { // !endsWith("&") - sb.append('&'); - } + url = buildUrl(url.trim()); + } + return url; + } + + private String buildUrl(String url) { + StringBuilder sb = new StringBuilder(url); + if (url.contains("?")) { + if (!url.endsWith("?")) { + if (url.lastIndexOf("=") < url.lastIndexOf("?") + 2) { + throw new HttpException("url 格式错误，'？' 后没有发现 '='"); + } + if (!url.endsWith("&")) { + sb.append('&'); } - } else { - sb.append('?'); } - urlParams.forEach((name, value) -> { - if (value == null) return; - sb.append(name).append('=').append(value).append('&'); - }); - sb.delete(sb.length() - 1, sb.length()); + } else { + sb.append('?'); } + for (String name : urlParams.keySet()) { + sb.append(name).append('=').append(urlParams.get(name)).append('&'); + } + sb.delete(sb.length() - 1, sb.length()); return sb.toString(); } - /** - * 参数冲突校验 - * @param bodyCantUsed 报文体是否不可用 - */ protected void assertNotConflict(boolean bodyCantUsed) { if (bodyCantUsed) { if (requestBody != null) { - throw new OkHttpsException("GET | HEAD request can not call setBodyPara(..) method!"); + throw new HttpException("GET | HEAD 请求 不能调用 setBodyPara 方法！"); } - if (isNotEmpty(bodyParams)) { - throw new OkHttpsException("GET | HEAD request can not call addBodyPara(..) method!"); + if (bodyParams != null) { + throw new HttpException("GET | HEAD 请求 不能调用 addBodyPara 方法！"); } - if (isNotEmpty(files)) { - throw new OkHttpsException("GET | HEAD request can not call addFilePara(..) method!"); + if (files != null) { + throw new HttpException("GET | HEAD 请求 不能调用 addFilePara 方法！"); } } if (requestBody != null) { - if (isNotEmpty(bodyParams)) { - throw new OkHttpsException("can not call addBodyPara(..) and setBodyPara(..) at the same time!"); + if (bodyParams != null) { + throw new HttpException("方法 addBodyPara 与 setBodyPara 不能同时调用！"); } - if (isNotEmpty(files)) { - throw new OkHttpsException("can not call addFilePara(..) and setBodyPara(..) at the same time!"); + if (files != null) { + throw new HttpException("方法 addFilePara 与 setBodyPara 不能同时调用！"); } } } - private static boolean isNotEmpty(Map map) { - return map != null && !map.isEmpty(); - } - /** * @param latch CountDownLatch - * @return true 表示已超时：false 表示未超时 + * @return 是否未超时：false 表示已超时 */ protected boolean timeoutAwait(CountDownLatch latch) { try { - return !latch.await(httpClient.preprocTimeoutMillis(), + return latch.await(httpClient.preprocTimeoutMillis(), TimeUnit.MILLISECONDS); } catch (InterruptedException e) { - throw new OkHttpsException("execute timeout: " + urlPath, e); + throw new HttpException("执行超时: " + urlPath, e); } } @@ -964,7 +770,7 @@ protected HttpResult timeoutResult() { if (nothrow) { return new RealHttpResult(this, State.TIMEOUT); } - throw new OkHttpsException(State.TIMEOUT, "execute timeout: " + urlPath); + throw new HttpException(State.TIMEOUT, "执行超时: " + urlPath); } public Charset charset(Response response) { @@ -977,8 +783,4 @@ protected void execute(Runnable command, boolean onIo) { httpClient.executor().execute(command, onIo); } - public AbstractHttpClient httpClient() { - return httpClient; - } - } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/HttpUtils.java b/okhttps/src/main/java/com/ejlchina/okhttps/HttpUtils.java similarity index 84% rename from okhttps/src/main/java/cn/zhxu/okhttps/HttpUtils.java rename to okhttps/src/main/java/com/ejlchina/okhttps/HttpUtils.java index 00c2c4f0..d8db6a5a 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/HttpUtils.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/HttpUtils.java @@ -1,5 +1,10 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; +import com.ejlchina.okhttps.internal.AsyncHttpTask; +import com.ejlchina.okhttps.internal.SyncHttpTask; +import com.ejlchina.okhttps.internal.TaskExecutor; + +import com.ejlchina.okhttps.internal.WebSocketTask; import okhttp3.Call; import okhttp3.Request; import okhttp3.WebSocket; @@ -20,6 +25,7 @@ public class HttpUtils { * 配置HttpUtils持有的HTTP实例（不调用此方法前默认使用一个没有没有经过任何配置的HTTP懒实例） * @param http HTTP实例 */ + @Deprecated public static void of(HTTP http) { if (http != null) { HttpUtils.http = http; @@ -29,7 +35,7 @@ public static void of(HTTP http) { } - public static synchronized HTTP getHttp() { + static synchronized HTTP getHttp() { if (http != null) { return http; } @@ -44,7 +50,7 @@ public static synchronized HTTP getHttp() { * @param url 请求地址 * @return 异步 HttpTask */ - public static AHttpTask async(String url) { + public static AsyncHttpTask async(String url) { return getHttp().async(url); } @@ -53,7 +59,7 @@ public static AHttpTask async(String url) { * @param url 请求地址 * @return 同步 HttpTask */ - public static SHttpTask sync(String url) { + public static SyncHttpTask sync(String url) { return getHttp().sync(url); } @@ -62,7 +68,7 @@ public static SHttpTask sync(String url) { * @param url 连接地址 * @return WebSocket 任务 */ - public static WHttpTask webSocket(String url) { + public static WebSocketTask webSocket(String url) { return getHttp().webSocket(url); } diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/Mapper.java b/okhttps/src/main/java/com/ejlchina/okhttps/Mapper.java new file mode 100644 index 00000000..3f87a16d --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Mapper.java @@ -0,0 +1,74 @@ +package com.ejlchina.okhttps; + +import java.util.Set; + +/** + * 映射结构的只读数据集 + * + * @since 2.0.0 + * Mapper 接口，类似于 json + * 但为什么不取名为 json 呢，因它不止是 json，它还可以是 xml、yml、protobuf 等任何一种格式的数据 + * @author 15735 + */ +public interface Mapper extends DataSet { + + /** + * @param key 键名 + * @return 子 JsonObj + */ + Mapper getMapper(String key); + + /** + * @param key 键名 + * @return 子 JsonArr + */ + Array getArray(String key); + + /** + * @param key 键名 + * @return boolean 值 + */ + boolean getBool(String key); + + /** + * @param key 键名 + * @return int 值 + */ + int getInt(String key); + + /** + * @param key 键名 + * @return long 值 + */ + long getLong(String key); + + /** + * @param key 键名 + * @return float 值 + */ + float getFloat(String key); + + /** + * @param key 键名 + * @return double 值 + */ + double getDouble(String key); + + /** + * @param key 键名 + * @return String 值 + */ + String getString(String key); + + /** + * @param key 键名 + * @return 是否有该键 + */ + boolean has(String key); + + /** + * @return JSON 的键集合 + */ + Set keySet(); + +} diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/MsgConvertor.java b/okhttps/src/main/java/com/ejlchina/okhttps/MsgConvertor.java new file mode 100644 index 00000000..8e7a5682 --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/MsgConvertor.java @@ -0,0 +1,116 @@ +package com.ejlchina.okhttps; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.lang.reflect.Type; +import java.nio.charset.Charset; +import java.util.List; + +/** + * 消息转换器接口 + */ +public interface MsgConvertor { + + /** + * 消息的媒体类型 + * @return 媒体类型 + */ + String mediaType(); + + /** + * 解析 Mapper + * @param in JSON 输入流 + * @param charset 编码格式 + * @return Mapper + */ + Mapper toMapper(InputStream in, Charset charset); + + /** + * 解析 Array + * @param in JSON 输入流 + * @param charset 编码格式 + * @return Array + */ + Array toArray(InputStream in, Charset charset); + + /** + * 将 Java 对象序列化为字节数组 + * @param object Java 对象 + * @param charset 编码格式 + * @return 字节数组 + */ + byte[] serialize(Object object, Charset charset); + + /** + * 解析 Java Bean + * @param 目标泛型 + * @param type 目标类型 + * @param in JSON 输入流 + * @param charset 编码格式 + * @return Java Bean + */ + T toBean(Type type, InputStream in, Charset charset); + + /** + * 解析为 Java List + * @param 目标泛型 + * @param type 目标类型 + * @param in JSON 输入流 + * @param charset 编码格式 + * @return Java List + */ + List toList(Class type, InputStream in, Charset charset); + + /** + * 表单转换器，可用于自动系列化表单参数 + */ + class FormConvertor implements MsgConvertor { + + private MsgConvertor convertor; + + public FormConvertor(MsgConvertor convertor) { + this.convertor = convertor; + } + + @Override + public String mediaType() { + return "application/x-www-form-urlencoded"; + } + + @Override + public Mapper toMapper(InputStream in, Charset charset) { + return convertor.toMapper(in, charset); + } + + @Override + public Array toArray(InputStream in, Charset charset) { + return convertor.toArray(in, charset); + } + + @Override + public byte[] serialize(Object object, Charset charset) { + byte[] data = convertor.serialize(object, charset); + Mapper mapper = convertor.toMapper(new ByteArrayInputStream(data), charset); + StringBuilder sb = new StringBuilder(); + for (String key: mapper.keySet()) { + sb.append(key).append('=').append(mapper.getString(key)).append('&'); + } + if (sb.length() > 1) { + sb.deleteCharAt(sb.length() - 1); + } + return sb.toString().getBytes(charset); + } + + @Override + public T toBean(Type type, InputStream in, Charset charset) { + return convertor.toBean(type, in, charset); + } + + @Override + public List toList(Class type, InputStream in, Charset charset) { + return convertor.toList(type, in, charset); + } + + } + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttps.java b/okhttps/src/main/java/com/ejlchina/okhttps/OkHttps.java similarity index 71% rename from okhttps/src/main/java/cn/zhxu/okhttps/OkHttps.java rename to okhttps/src/main/java/com/ejlchina/okhttps/OkHttps.java index e592c917..ba95fe8c 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttps.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/OkHttps.java @@ -1,5 +1,6 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; +import com.ejlchina.okhttps.internal.*; import okhttp3.Call; import okhttp3.Request; import okhttp3.WebSocket; @@ -11,32 +12,24 @@ */ public final class OkHttps { - // 使用 x-www-form-urlencoded 表单格式 public static final String FORM = "form"; - // 使用 form-data 表单格式（一般上传文件时使用） - public static final String FORM_DATA = "form-data"; public static final String JSON = "json"; public static final String XML = "xml"; public static final String PROTOBUF = "protobuf"; - public static final String MSGPACK = "msgpack"; - private static HTTP instance; + private static HTTP http; private OkHttps() {} - public static HTTP getHttp() { - if (instance != null) { - return instance; - } - synchronized (OkHttps.class) { - if (instance == null) { - HTTP.Builder builder = HTTP.builder(); - ConvertProvider.inject(builder); - Config.config(builder); - instance = builder.build(); - } - return instance; + static synchronized HTTP getHttp() { + if (http != null) { + return http; } + HTTP.Builder builder = HTTP.builder(); + ConvertProvider.inject(builder); + Config.config(builder); + http = builder.build(); + return http; } /** @@ -44,7 +37,7 @@ public static HTTP getHttp() { * @param url 请求地址 * @return 异步 HttpTask */ - public static AHttpTask async(String url) { + public static AsyncHttpTask async(String url) { return getHttp().async(url); } @@ -53,7 +46,7 @@ public static AHttpTask async(String url) { * @param url 请求地址 * @return 同步 HttpTask */ - public static SHttpTask sync(String url) { + public static SyncHttpTask sync(String url) { return getHttp().sync(url); } @@ -62,7 +55,7 @@ public static SHttpTask sync(String url) { * @param url 连接地址 * @return WebSocket 任务 */ - public static WHttpTask webSocket(String url) { + public static WebSocketTask webSocket(String url) { return getHttp().webSocket(url); } diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/OnCallback.java b/okhttps/src/main/java/com/ejlchina/okhttps/OnCallback.java new file mode 100644 index 00000000..bfeeaa3e --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/OnCallback.java @@ -0,0 +1,11 @@ +package com.ejlchina.okhttps; + +/** + * 数据回调接口 + * Created by 15735 on 2017/1/3. + */ +public interface OnCallback { + + void on(T data); + +} diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/PingSupplier.java b/okhttps/src/main/java/com/ejlchina/okhttps/PingSupplier.java new file mode 100644 index 00000000..88ec9c1b --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/PingSupplier.java @@ -0,0 +1,15 @@ +package com.ejlchina.okhttps; + +import okio.ByteString; + +/** + * 心跳数据提供者 + */ +public interface PingSupplier { + + /** + * @return 心跳数据 + */ + ByteString getPing(); + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Platform.java b/okhttps/src/main/java/com/ejlchina/okhttps/Platform.java similarity index 55% rename from okhttps/src/main/java/cn/zhxu/okhttps/Platform.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Platform.java index 1766bb0e..0be8087d 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Platform.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Platform.java @@ -1,12 +1,8 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.ConcurrentModificationException; -import java.util.Map; -import java.util.Objects; -import java.util.function.BiConsumer; public class Platform { @@ -52,7 +48,9 @@ private static void doLog(int level, String message, Throwable t) { logMethod = platform.getClass().getMethod("log", String.class, int.class, Throwable.class); } } - logMethod.invoke(platform, message, level, t); + if (logMethod != null) { + logMethod.invoke(platform, message, level, t); + } } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { e.printStackTrace(); } @@ -73,61 +71,4 @@ private static boolean isOkHttpVersionLessThan4() { return !okHttpVersion.startsWith("4"); } - // 该方法是为兼容 Android 低版本 - public static void forEach(Map map, BiConsumer action) { - Objects.requireNonNull(action); - for (Map.Entry entry : map.entrySet()) { - K k; - V v; - try { - k = entry.getKey(); - v = entry.getValue(); - } catch (IllegalStateException ise) { - // this usually means the entry is no longer in the map. - throw new ConcurrentModificationException(ise); - } - action.accept(k, v); - } - } - - /** - * 判断字符串是否为 null 或 空 - * @param str 待判断的字符串 - * @return str 是否是空白字符串 - * @since v3.5.0 - */ - public static boolean isBlank(String str) { - if (str == null) { - return true; - } - int len = str.length(); - if (len == 0) { - return true; - } - for (int i = 0; i < len; i++) { - switch (str.charAt(i)) { - case ' ': - case '\t': - case '\n': - case '\r': - // case '\b': - // case '\f': - break; - default: - return false; - } - } - return true; - } - - /** - * 判断字符串是否非空 - * @param str 待判断的字符串 - * @return str 是否是非空字符串 - * @since v3.5.0 - */ - public static boolean isNotBlank(String str) { - return !isBlank(str); - } - } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Preprocessor.java b/okhttps/src/main/java/com/ejlchina/okhttps/Preprocessor.java similarity index 65% rename from okhttps/src/main/java/cn/zhxu/okhttps/Preprocessor.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Preprocessor.java index ed11e28f..188667cb 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Preprocessor.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Preprocessor.java @@ -1,14 +1,14 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; /** * 预处理器，支持异步 - * 在 HTTP 请求任务正式开始之前执行 + * 在HTTP请求任务正式开始之前执行 * @author Troy.Zhou */ public interface Preprocessor { /** - * 在 HTTP 请求开始之前执行 + * 在HTTP请求开始之前执行 * @param chain 预处理器链 */ void doProcess(PreChain chain); @@ -22,12 +22,12 @@ interface PreChain { HttpTask getTask(); /** - * @return 当前使用的 HTTP 实例 + * @return HTTP */ HTTP getHttp(); /** - * 继续 HTTP 请求任务 + * 继续HTTP请求任务 */ void proceed(); diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/Process.java b/okhttps/src/main/java/com/ejlchina/okhttps/Process.java new file mode 100644 index 00000000..f6eaf3bc --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Process.java @@ -0,0 +1,30 @@ +package com.ejlchina.okhttps; + +/** + * 进度（上传或下载） + */ +public interface Process { + + int DEFAULT_STEP_BYTES = 8192; + + /** + * @return 完成比例 + */ + double getRate(); + + /** + * @return 总 + */ + long getTotalBytes(); + + /** + * @return 已完成任务量 + */ + long getDoneBytes(); + + /** + * @return 任务是否完成 + */ + boolean isDone(); + +} diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/RetryPolicy.java b/okhttps/src/main/java/com/ejlchina/okhttps/RetryPolicy.java new file mode 100644 index 00000000..19b5da1c --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/RetryPolicy.java @@ -0,0 +1,68 @@ +package com.ejlchina.okhttps; + + +import java.io.IOException; + +/** + * @since 2.5.0 + * 重试策略 + */ +public interface RetryPolicy { + + /** + *执行策略 + * @param condition 当前的重试条件 + * @param tryOpt 重试选择器（要么重试、要么放弃） + */ + void doPolicy(Condition condition, TryOpt tryOpt); + + /** + * 重试条件 + */ + interface Condition { + + /** + * @return 已重试次数 + */ + int getRetryTimes(); + + /** + * @return 当前的请求任务 + */ + HttpTask getTask(); + + /** + * @return 当前的 Http 结果 + */ + HttpResult getHttpResult(); + + /** + * @return WebSocket 关闭原因 + */ + WebSocket.Close getClose(); + + /** + * @return 发生的 IO 异常 + */ + IOException getIOException(); + + } + + /** + * 重试选择 + */ + interface TryOpt { + + /** + * 再试一次 + */ + void tryAgain(); + + /** + * 完成，不再重试 + */ + void justDone(); + + } + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Scheduler.java b/okhttps/src/main/java/com/ejlchina/okhttps/Scheduler.java similarity index 90% rename from okhttps/src/main/java/cn/zhxu/okhttps/Scheduler.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Scheduler.java index b479835c..2317b6fc 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Scheduler.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Scheduler.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; import java.util.concurrent.TimeUnit; diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/TaskListener.java b/okhttps/src/main/java/com/ejlchina/okhttps/TaskListener.java similarity index 91% rename from okhttps/src/main/java/cn/zhxu/okhttps/TaskListener.java rename to okhttps/src/main/java/com/ejlchina/okhttps/TaskListener.java index 96e11a84..54f734d1 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/TaskListener.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/TaskListener.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; /** * 任务监听接口 diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/Toable.java b/okhttps/src/main/java/com/ejlchina/okhttps/Toable.java similarity index 89% rename from okhttps/src/main/java/cn/zhxu/okhttps/Toable.java rename to okhttps/src/main/java/com/ejlchina/okhttps/Toable.java index 4b5f562d..f9636063 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/Toable.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/Toable.java @@ -1,8 +1,5 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; -import cn.zhxu.data.Array; -import cn.zhxu.data.Mapper; -import cn.zhxu.data.TypeRef; import okio.ByteString; import java.io.InputStream; @@ -23,10 +20,8 @@ public interface Toable { byte[] toBytes(); /** - * will be removed in next version * @return ByteString */ - @Deprecated ByteString toByteString(); /** diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/TypeRef.java b/okhttps/src/main/java/com/ejlchina/okhttps/TypeRef.java new file mode 100644 index 00000000..5508d64a --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/TypeRef.java @@ -0,0 +1,19 @@ +package com.ejlchina.okhttps; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; + +public abstract class TypeRef { + + final Type type; + + public TypeRef() { + Type superClass = getClass().getGenericSuperclass(); + this.type = ((ParameterizedType) superClass).getActualTypeArguments()[0]; + } + + public Type getType() { + return type; + } + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/WebSocket.java b/okhttps/src/main/java/com/ejlchina/okhttps/WebSocket.java similarity index 99% rename from okhttps/src/main/java/cn/zhxu/okhttps/WebSocket.java rename to okhttps/src/main/java/com/ejlchina/okhttps/WebSocket.java index 4fdc577e..0313aed6 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/WebSocket.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/WebSocket.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps; public interface WebSocket extends Cancelable { diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/AbstractBody.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/AbstractBody.java similarity index 90% rename from okhttps/src/main/java/cn/zhxu/okhttps/internal/AbstractBody.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/AbstractBody.java index 0d28e917..2c22701b 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/AbstractBody.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/AbstractBody.java @@ -1,16 +1,12 @@ -package cn.zhxu.okhttps.internal; - -import cn.zhxu.data.Array; -import cn.zhxu.data.Mapper; -import cn.zhxu.data.TypeRef; -import cn.zhxu.okhttps.TaskExecutor; -import cn.zhxu.okhttps.Toable; +package com.ejlchina.okhttps.internal; import java.io.InputStream; import java.lang.reflect.Type; import java.nio.charset.Charset; import java.util.List; +import com.ejlchina.okhttps.*; + public abstract class AbstractBody implements Toable { protected TaskExecutor taskExecutor; diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/AHttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/AsyncHttpTask.java similarity index 61% rename from okhttps/src/main/java/cn/zhxu/okhttps/AHttpTask.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/AsyncHttpTask.java index e038cc30..b375659f 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/AHttpTask.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/AsyncHttpTask.java @@ -1,21 +1,19 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.data.Array; -import cn.zhxu.data.Mapper; -import cn.zhxu.data.TypeRef; -import cn.zhxu.okhttps.HttpResult.State; -import cn.zhxu.okhttps.internal.AbstractHttpClient; -import cn.zhxu.okhttps.internal.CopyInterceptor; -import cn.zhxu.okhttps.internal.RealHttpResult; -import okhttp3.Call; -import okhttp3.Callback; -import okhttp3.Response; +package com.ejlchina.okhttps.internal; import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.List; import java.util.concurrent.CountDownLatch; -import java.util.function.Consumer; + +import com.ejlchina.okhttps.*; +import com.ejlchina.okhttps.HttpResult.State; + +import okhttp3.Call; +import okhttp3.Callback; +import okhttp3.Response; + /** * 异步 Http 请求任务 @@ -23,35 +21,35 @@ * @author Troy.Zhou * */ -public class AHttpTask extends HttpTask { - - - private Consumer onResponse; - private Consumer onException; - private Consumer onComplete; +public class AsyncHttpTask extends HttpTask { + + private OnCallback onResponse; + private OnCallback onException; + private OnCallback onComplete; + private boolean responseOnIO; private boolean exceptionOnIO; private boolean completeOnIO; - - private Consumer onResBody; - private Consumer onResMapper; - private Consumer onResArray; - private Consumer onResString; - private Consumer onResBean; - private Consumer onResList; - + + private OnCallback onResBody; + private OnCallback onResMapper; + private OnCallback onResArray; + private OnCallback onResString; + private OnCallback onResBean; + private OnCallback onResList; + private boolean resBodyOnIO; private boolean resMapperOnIO; private boolean resArrayOnIO; private boolean resStringOnIO; private boolean resBeanOnIO; private boolean resListOnIO; - + private Type beanType; private Class listType; - - public AHttpTask(AbstractHttpClient client, String url) { + + public AsyncHttpTask(HttpClient client, String url) { super(client, url); } @@ -66,7 +64,7 @@ public boolean isAsyncHttp() { * @param onException 请求异常回调 * @return HttpTask 实例 */ - public AHttpTask setOnException(Consumer onException) { + public AsyncHttpTask setOnException(OnCallback onException) { this.onException = onException; exceptionOnIO = nextOnIO; nextOnIO = false; @@ -78,7 +76,7 @@ public AHttpTask setOnException(Consumer onException) { * @param onComplete 请求完成回调 * @return HttpTask 实例 */ - public AHttpTask setOnComplete(Consumer onComplete) { + public AsyncHttpTask setOnComplete(OnCallback onComplete) { this.onComplete = onComplete; completeOnIO = nextOnIO; nextOnIO = false; @@ -90,7 +88,7 @@ public AHttpTask setOnComplete(Consumer onComplete) { * @param onResponse 请求响应回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResponse(Consumer onResponse) { + public AsyncHttpTask setOnResponse(OnCallback onResponse) { this.onResponse = onResponse; responseOnIO = nextOnIO; nextOnIO = false; @@ -102,7 +100,7 @@ public synchronized AHttpTask setOnResponse(Consumer onResponse) { * @param onResBody 响应报文体回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResBody(Consumer onResBody) { + public AsyncHttpTask setOnResBody(OnCallback onResBody) { this.onResBody = onResBody; resBodyOnIO = nextOnIO; nextOnIO = false; @@ -116,7 +114,7 @@ public synchronized AHttpTask setOnResBody(Consumer onResBody) * @param onResBean 响应 Bean 回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResBean(Class type, Consumer onResBean) { + public AsyncHttpTask setOnResBean(Class type, OnCallback onResBean) { initBeanType(type); this.onResBean = onResBean; resBeanOnIO = nextOnIO; @@ -131,7 +129,7 @@ public synchronized AHttpTask setOnResBean(Class type, Consumer onResB * @param onResBean 响应 Bean 回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResBean(TypeRef type, Consumer onResBean) { + public AsyncHttpTask setOnResBean(TypeRef type, OnCallback onResBean) { initBeanType(type.getType()); this.onResBean = onResBean; resBeanOnIO = nextOnIO; @@ -146,7 +144,7 @@ public synchronized AHttpTask setOnResBean(TypeRef type, Consumer onRe * @param onResList 请求响应回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResList(Class type, Consumer> onResList) { + public AsyncHttpTask setOnResList(Class type, OnCallback> onResList) { if (type == null) { throw new IllegalArgumentException(" list type can not be null!"); } @@ -164,7 +162,7 @@ public synchronized AHttpTask setOnResList(Class type, Consumer> * @param onResMapper 请求响应回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResMapper(Consumer onResMapper) { + public AsyncHttpTask setOnResMapper(OnCallback onResMapper) { this.onResMapper = onResMapper; resMapperOnIO = nextOnIO; nextOnIO = false; @@ -176,7 +174,7 @@ public synchronized AHttpTask setOnResMapper(Consumer onResMapper) { * @param onResArray 请求响应回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResArray(Consumer onResArray) { + public AsyncHttpTask setOnResArray(OnCallback onResArray) { this.onResArray = onResArray; resArrayOnIO = nextOnIO; nextOnIO = false; @@ -188,7 +186,7 @@ public synchronized AHttpTask setOnResArray(Consumer onResArray) { * @param onResString 请求响应回调 * @return HttpTask 实例 */ - public synchronized AHttpTask setOnResString(Consumer onResString) { + public AsyncHttpTask setOnResString(OnCallback onResString) { this.onResString = onResString; resStringOnIO = nextOnIO; nextOnIO = false; @@ -303,29 +301,28 @@ void setCall(HttpCall call) { @Override public HttpResult getResult() { - if (timeoutAwait(latch)) { + if (!timeoutAwait(latch)) { cancel(); return timeoutResult(); } if (canceled || call == null) { - return new RealHttpResult(AHttpTask.this, State.CANCELED); + return new RealHttpResult(AsyncHttpTask.this, State.CANCELED); } return call.getResult(); } @Override - public AHttpTask getTask() { - return AHttpTask.this; + public AsyncHttpTask getTask() { + return AsyncHttpTask.this; } } - public class OkHttpCall implements HttpCall { + class OkHttpCall implements HttpCall { - final Call call; + Call call; HttpResult result; CountDownLatch latch = new CountDownLatch(1); - boolean finished = false; OkHttpCall(Call call) { this.call = call; @@ -333,7 +330,7 @@ public class OkHttpCall implements HttpCall { @Override public synchronized boolean cancel() { - if (result == null || !finished) { + if (result == null) { call.cancel(); return true; } @@ -342,18 +339,18 @@ public synchronized boolean cancel() { @Override public boolean isDone() { - return result != null && finished || call.isCanceled(); + return result != null; } @Override public boolean isCanceled() { - return call.isCanceled() || (result != null && result.getState() == State.CANCELED); + return call.isCanceled(); } @Override public HttpResult getResult() { if (result == null) { - if (timeoutAwait(latch)) { + if (!timeoutAwait(latch)) { cancel(); return timeoutResult(); } @@ -362,8 +359,8 @@ public HttpResult getResult() { } @Override - public AHttpTask getTask() { - return AHttpTask.this; + public AsyncHttpTask getTask() { + return AsyncHttpTask.this; } void setResult(HttpResult result) { @@ -371,41 +368,33 @@ void setResult(HttpResult result) { latch.countDown(); } - public void finish() { - this.finished = true; - } - } + } private HttpCall executeCall(Call call) { OkHttpCall httpCall = new OkHttpCall(call); call.enqueue(new Callback() { - @Override - @SuppressWarnings("NullableProblems") public void onFailure(Call call, IOException error) { State state = toState(error); - HttpResult result = new RealHttpResult(AHttpTask.this, state, error); + HttpResult result = new RealHttpResult(AsyncHttpTask.this, state, error); onCallback(httpCall, result, () -> { TaskExecutor executor = httpClient.executor(); - executor.executeOnComplete(AHttpTask.this, onComplete, state, completeOnIO); - if (!httpCall.isCanceled() && !executor.executeOnException(AHttpTask.this, httpCall, onException, error, exceptionOnIO) + executor.executeOnComplete(AsyncHttpTask.this, onComplete, state, completeOnIO); + if (!executor.executeOnException(AsyncHttpTask.this, onException, error, exceptionOnIO) && !nothrow) { - throw new OkHttpsException(state, "异步请求异常：" + getUrl(), error); + throw new HttpException(state, "异步请求异常：" + getUrl(), error); } }); } - @Override - @SuppressWarnings("NullableProblems") + @Override public void onResponse(Call call, Response response) { TaskExecutor executor = httpClient.executor(); - HttpResult result = new RealHttpResult(AHttpTask.this, response, executor); + HttpResult result = new RealHttpResult(AsyncHttpTask.this, response, executor); onCallback(httpCall, result, () -> { - executor.executeOnComplete(AHttpTask.this, onComplete, State.RESPONSED, completeOnIO); - if (!httpCall.isCanceled()) { - executor.executeOnResponse(AHttpTask.this, httpCall, complexOnResponse(httpCall), result, true); - } + executor.executeOnComplete(AsyncHttpTask.this, onComplete, State.RESPONSED, completeOnIO); + executor.executeOnResponse(AsyncHttpTask.this, complexOnResponse(), result, true); }); } @@ -413,100 +402,101 @@ public void onResponse(Call call, Response response) { return httpCall; } - @SuppressWarnings("all") - private void onCallback(OkHttpCall httpCall, HttpResult result, Runnable runnable) { - synchronized (httpCall) { - removeTagTask(); - if (httpCall.isCanceled() || result.getState() == State.CANCELED) { - httpCall.setResult(new RealHttpResult(AHttpTask.this, State.CANCELED)); - } else { - httpCall.setResult(result); - } - runnable.run(); - } - } - - interface ResponseCallback { - void on(Runnable runnable, boolean onIo); - } - - @SuppressWarnings("unchecked") - private synchronized Consumer complexOnResponse(OkHttpCall call) { + private OnCallback complexOnResponse() { return res -> { - Consumer onResp = onResponse; - Consumer onBody = onResBody; - Consumer onMapper = onResMapper; - Consumer onArray = onResArray; - Consumer onBean = (Consumer) onResBean; - Consumer onList = (Consumer) onResList; - Consumer onString = onResString; - - int count = 0; - if (onResp != null) - count++; - if (onBody != null) - count++; - if (onMapper != null) - count++; - if (onArray != null) - count++; - if (onBean != null) - count++; - if (onList != null) - count++; - if (onString != null) - count++; - int callbackCount = count; - + int count = responseCallbackCount(); HttpResult.Body body = res.getBody(); - if (callbackCount > 1) { - // 如果回调数量多于 1 个，则为报文体自动开启缓存 + if (count > 1) { body.cache(); } - - ResponseCallback callback = (runnable, onIo) -> execute(new Runnable() { - // 记录已经回调的次数 - int count = 0; - @Override - public void run() { - if (!call.isCanceled()) { - runnable.run(); - } - if (++count >= callbackCount) { - call.finish(); - } - } - }, onIo); - - if (onResp != null) { - callback.on(() -> onResp.accept(res), responseOnIO); + if (onResponse != null) { + execute(() -> onResponse.on(res), responseOnIO); } - if (onBody != null) { - callback.on(() -> onBody.accept(body), resBodyOnIO); + if (onResBody != null) { + execute(() -> onResBody.on(body), resBodyOnIO); } - if (onMapper != null) { + if (onResMapper != null) { Mapper mapper = body.toMapper(); - callback.on(() -> onMapper.accept(mapper), resMapperOnIO); + execute(() -> onResMapper.on(mapper), resMapperOnIO); } - if (onArray != null) { + if (onResArray != null) { Array array = body.toArray(); - callback.on(() -> onArray.accept(array), resArrayOnIO); + execute(() -> onResArray.on(array), resArrayOnIO); } - if (onBean != null) { + if (onResBean != null) { Object bean = body.toBean(beanType); - callback.on(() -> onBean.accept(bean), resBeanOnIO); + execute(() -> { + try { + callbackMethod(onResBean.getClass(), bean.getClass()).invoke(onResBean, bean); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new HttpException("回调方法调用失败！", e); + } + }, resBeanOnIO); } - if (onList != null) { + if (onResList != null) { List list = body.toList(listType); - callback.on(() -> onList.accept(list), resListOnIO); + execute(() -> { + try { + callbackMethod(onResList.getClass(), list.getClass()).invoke(onResList, list); + } catch (IllegalAccessException | InvocationTargetException e) { + throw new HttpException("回调方法调用失败！", e); + } + }, resListOnIO); } - if (onString != null) { + if (onResString != null) { String string = body.toString(); - callback.on(() -> onString.accept(string), resStringOnIO); + execute(() -> onResString.on(string), resStringOnIO); } }; } + static final String OnCallbackMethod = OnCallback.class.getDeclaredMethods()[0].getName(); + + private Method callbackMethod(Class clazz, Class paraType) { + Method[] methods = clazz.getDeclaredMethods(); + for (Method method : methods) { + Class[] paraTypes = method.getParameterTypes(); + if (method.getName().equals(OnCallbackMethod) && paraTypes.length == 1 + && paraTypes[0].isAssignableFrom(paraType)) { + method.setAccessible(true); + return method; + } + } + throw new IllegalStateException("没有可调用的方法"); + } + + private int responseCallbackCount() { + int count = 0; + if (onResponse != null) + count++; + if (onResBody != null) + count++; + if (onResMapper != null) + count++; + if (onResArray != null) + count++; + if (onResBean != null) + count++; + if (onResList != null) + count++; + if (onResString != null) + count++; + return count; + } + + @SuppressWarnings("all") + private void onCallback(OkHttpCall httpCall, HttpResult result, Runnable runnable) { + synchronized (httpCall) { + removeTagTask(); + if (httpCall.isCanceled() || result.getState() == State.CANCELED) { + httpCall.setResult(new RealHttpResult(AsyncHttpTask.this, State.CANCELED)); + return; + } + httpCall.setResult(result); + runnable.run(); + } + } + private void initBeanType(Type type) { if (type == null) { throw new IllegalArgumentException(" bean type can not be null!"); diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/CopyInterceptor.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/CopyInterceptor.java similarity index 93% rename from okhttps/src/main/java/cn/zhxu/okhttps/internal/CopyInterceptor.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/CopyInterceptor.java index deb3483e..717d341e 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/CopyInterceptor.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/CopyInterceptor.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps.internal; +package com.ejlchina.okhttps.internal; import okhttp3.Interceptor; import okhttp3.Request; @@ -10,7 +10,7 @@ public class CopyInterceptor implements Interceptor { - public static final String TAG = "okhttps-Async-Response-Copy"; + static final String TAG = "okhttps-Async-Response-Copy"; public static boolean notIn(List list) { for (Interceptor item : list) { diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/AbstractHttpClient.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/HttpClient.java similarity index 55% rename from okhttps/src/main/java/cn/zhxu/okhttps/internal/AbstractHttpClient.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/HttpClient.java index 01f80471..c3705989 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/AbstractHttpClient.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/HttpClient.java @@ -1,17 +1,17 @@ -package cn.zhxu.okhttps.internal; +package com.ejlchina.okhttps.internal; -import cn.zhxu.okhttps.*; -import okhttp3.MediaType; +import com.ejlchina.okhttps.*; +import okhttp3.*; +import okhttp3.WebSocket; import java.nio.charset.Charset; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.concurrent.Executor; +import java.util.*; -public abstract class AbstractHttpClient implements HTTP { +public class HttpClient implements HTTP { + + // OkHttpClient + final OkHttpClient okClient; // 根URL final String baseUrl; // 媒体类型 @@ -28,40 +28,38 @@ public abstract class AbstractHttpClient implements HTTP { final Charset charset; // 默认的请求体类型 final String bodyType; - // 下载助手 - final DownloadHelper downloadHelper; + // 重试策略池 + final Map retryPolicys; + - public AbstractHttpClient(HTTP.Builder builder) { + public HttpClient(Builder builder) { + this.okClient = builder.okClient(); this.baseUrl = builder.baseUrl(); this.mediaTypes = builder.getMediaTypes(); - this.executor = new TaskExecutor(builder, ioExecutor(builder)); + this.executor = new TaskExecutor(builder, okClient.dispatcher().executorService()); this.preprocessors = builder.preprocessors(); this.preprocTimeoutTimes = builder.preprocTimeoutTimes(); this.charset = builder.charset(); this.bodyType = builder.bodyType(); + this.retryPolicys = builder.retryPolicys(); this.tagTasks = new LinkedList<>(); - this.downloadHelper = builder.downloadHelper(); - } - - - public abstract Executor ioExecutor(HTTP.Builder builder); - - - @Override - public AHttpTask async(String url) { - return new AHttpTask(this, urlPath(url, false)); } @Override - public SHttpTask sync(String url) { - return new SHttpTask(this, urlPath(url, false)); + public AsyncHttpTask async(String url) { + return new AsyncHttpTask(this, urlPath(url, false)); } @Override - public WHttpTask webSocket(String url) { - return new WHttpTask(this, urlPath(url, true)); + public SyncHttpTask sync(String url) { + return new SyncHttpTask(this, urlPath(url, false)); } + @Override + public WebSocketTask webSocket(String url) { + return new WebSocketTask(this, urlPath(url, true)); + } + @Override public int cancel(String tag) { if (tag == null) { @@ -69,7 +67,7 @@ public int cancel(String tag) { } int count = 0; synchronized (tagTasks) { - Iterator it = tagTasks.iterator(); + Iterator it = tagTasks.iterator(); while (it.hasNext()) { TagTask tagCall = it.next(); // 只要任务的标签包含指定的Tag就会被取消 @@ -88,19 +86,31 @@ public int cancel(String tag) { @Override public void cancelAll() { - doCancelAll(); + okClient.dispatcher().cancelAll(); synchronized (tagTasks) { - tagTasks.clear(); + tagTasks.clear(); } } - public abstract void doCancelAll(); + @Override + public Call request(Request request) { + return okClient.newCall(request); + } - public int preprocTimeoutMillis() { - return preprocTimeoutTimes * totalTimeoutMillis(); + @Override + public WebSocket webSocket(Request request, WebSocketListener listener) { + return okClient.newWebSocket(request, listener); } - public abstract int totalTimeoutMillis(); + public OkHttpClient okClient() { + return okClient; + } + + public int preprocTimeoutMillis() { + return preprocTimeoutTimes * (okClient.connectTimeoutMillis() + + okClient.writeTimeoutMillis() + + okClient.readTimeoutMillis()); + } public int getTagTaskCount() { return tagTasks.size(); @@ -109,14 +119,14 @@ public int getTagTaskCount() { public TagTask addTagTask(String tag, Cancelable canceler, HttpTask task) { TagTask tagTask = new TagTask(tag, canceler, task); synchronized (tagTasks) { - tagTasks.add(tagTask); + tagTasks.add(tagTask); } - return tagTask; + return tagTask; } public void removeTagTask(HttpTask task) { - synchronized (tagTasks) { - Iterator it = tagTasks.iterator(); + synchronized (tagTasks) { + Iterator it = tagTasks.iterator(); while (it.hasNext()) { TagTask tagCall = it.next(); if (tagCall.task == task) { @@ -127,7 +137,7 @@ public void removeTagTask(HttpTask task) { it.remove(); } } - } + } } public class TagTask { @@ -141,17 +151,17 @@ public class TagTask { this.tag = tag; this.canceler = canceler; this.task = task; - this.createAt = System.currentTimeMillis(); + this.createAt = System.nanoTime(); } boolean isExpired() { // 生存时间大于10倍的总超时限值 - return System.currentTimeMillis() - createAt > preprocTimeoutMillis(); + return System.nanoTime() - createAt > 1_000_000L * preprocTimeoutMillis(); } - public void setTag(String tag) { - this.tag = tag; - } + public void setTag(String tag) { + this.tag = tag; + } } @@ -160,16 +170,7 @@ public MediaType mediaType(String type) { if (mediaType != null) { return MediaType.parse(mediaType); } - if (type != null) { - if (type.indexOf('/') < 0) { - type = "application/" + type; - } - MediaType mType = MediaType.parse(type); - if (mType != null) { - return mType; - } - } - return MediaType.parse("application/unknown"); + return MediaType.parse("application/octet-stream"); } @Override @@ -177,28 +178,90 @@ public TaskExecutor executor() { return executor; } + /** + * 查找策略 + * @param policyName 策略名 + * @return RetryPolicy + */ + public RetryPolicy requirePolicy(String policyName) { + RetryPolicy policy = retryPolicys.get(policyName); + if (policy != null) { + return policy; + } + throw new IllegalStateException("No such RetryPolicy named: " + policyName); + } + + public void preprocess(HttpTask httpTask, Runnable request, + boolean skipPreproc, boolean skipSerialPreproc) { + if (preprocessors.length == 0 || skipPreproc) { + request.run(); + return; + } + int index = 0; + if (skipSerialPreproc) { + while (index < preprocessors.length + && preprocessors[index] instanceof SerialPreprocessor) { + index++; + } + } + if (index < preprocessors.length) { + RealPreChain chain = new RealPreChain(preprocessors, + httpTask, request, index + 1, + skipSerialPreproc); + preprocessors[index].doProcess(chain); + } else { + request.run(); + } + } - public void preprocess(HttpTask httpTask, Runnable request, - boolean skipPreproc, boolean skipSerialPreproc) { - if (preprocessors.length == 0 || skipPreproc) { - request.run(); - return; + /** + * 串行预处理器 + * @author Troy.Zhou + */ + public static class SerialPreprocessor implements Preprocessor { + + // 预处理器 + final Preprocessor preprocessor; + // 待处理的任务队列 + final Queue pendings; + // 是否有任务正在执行 + boolean running = false; + + public SerialPreprocessor(Preprocessor preprocessor) { + this.preprocessor = preprocessor; + this.pendings = new LinkedList<>(); } - int index = 0; - if (skipSerialPreproc) { - while (index < preprocessors.length - && preprocessors[index] instanceof SerialPreprocessor) { - index++; + + @Override + public void doProcess(PreChain chain) { + boolean should = true; + synchronized (this) { + if (running) { + pendings.add(chain); + should = false; + } else { + running = true; + } + } + if (should) { + preprocessor.doProcess(chain); } } - if (index < preprocessors.length) { - RealPreChain chain = new RealPreChain(preprocessors, - httpTask, request, index + 1, - skipSerialPreproc); - preprocessors[index].doProcess(chain); - } else { - request.run(); + + public void afterProcess() { + PreChain chain = null; + synchronized (this) { + if (pendings.size() > 0) { + chain = pendings.poll(); + } else { + running = false; + } + } + if (chain != null) { + preprocessor.doProcess(chain); + } } + } @@ -209,9 +272,9 @@ class RealPreChain implements Preprocessor.PreChain { final HttpTask httpTask; final Runnable request; final boolean noSerialPreprocess; - - public RealPreChain(Preprocessor[] preprocessors, HttpTask httpTask, Runnable request, - int index, boolean noSerialPreprocess) { + + public RealPreChain(Preprocessor[] preprocessors, HttpTask httpTask, Runnable request, + int index, boolean noSerialPreprocess) { this.index = index; // index 大于等于 1 this.preprocessors = preprocessors; this.httpTask = httpTask; @@ -226,22 +289,22 @@ public HttpTask getTask() { @Override public HTTP getHttp() { - return AbstractHttpClient.this; + return HttpClient.this; } @Override public void proceed() { - if (noSerialPreprocess) { - while (index < preprocessors.length - && preprocessors[index] instanceof SerialPreprocessor) { - index++; - } - } else { - Preprocessor last = preprocessors[index - 1]; + if (noSerialPreprocess) { + while (index < preprocessors.length + && preprocessors[index] instanceof SerialPreprocessor) { + index++; + } + } else { + Preprocessor last = preprocessors[index - 1]; if (last instanceof SerialPreprocessor) { ((SerialPreprocessor) last).afterProcess(); } - } + } if (index < preprocessors.length) { preprocessors[index++].doProcess(this); } else { @@ -251,16 +314,20 @@ public void proceed() { } + @Override + public Builder newBuilder() { + return new Builder(this); + } + private String urlPath(String urlPath, boolean websocket) { String fullUrl; if (urlPath == null) { if (baseUrl != null) { fullUrl = baseUrl; } else { - throw new OkHttpsException("在设置 BaseUrl 之前，您必须指定具体路径才能发起请求！"); + throw new HttpException("在设置 BaseUrl 之前，您必须指定具体路径才能发起请求！"); } } else { - urlPath = urlPath.trim(); boolean isFullPath = urlPath.startsWith("https://") || urlPath.startsWith("http://") || urlPath.startsWith("wss://") @@ -270,7 +337,7 @@ private String urlPath(String urlPath, boolean websocket) { } else if (baseUrl != null) { fullUrl = baseUrl + urlPath; } else { - throw new OkHttpsException("在设置 BaseUrl 之前，您必须使用全路径URL发起请求，当前URL为：'" + urlPath + "'"); + throw new HttpException("在设置 BaseUrl 之前，您必须使用全路径URL发起请求，当前URL为：" + urlPath); } } if (websocket && fullUrl.startsWith("http")) { @@ -310,8 +377,8 @@ public String bodyType() { return bodyType; } - public DownloadHelper downloadHelper() { - return downloadHelper; + public Map retryPolicys() { + return retryPolicys; } } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttpsException.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/HttpException.java similarity index 53% rename from okhttps/src/main/java/cn/zhxu/okhttps/OkHttpsException.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/HttpException.java index 67993955..60dc6539 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/OkHttpsException.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/HttpException.java @@ -1,9 +1,11 @@ -package cn.zhxu.okhttps; +package com.ejlchina.okhttps.internal; + +import com.ejlchina.okhttps.HttpResult; /** * Created by 周旭（Troy.Zhou） on 2016/8/30. */ -public class OkHttpsException extends RuntimeException { +public class HttpException extends RuntimeException { /** * @@ -12,20 +14,20 @@ public class OkHttpsException extends RuntimeException { private HttpResult.State state; - public OkHttpsException(String detailMessage) { + public HttpException(String detailMessage) { super(detailMessage); } - public OkHttpsException(String detailMessage, Throwable throwable) { + public HttpException(String detailMessage, Throwable throwable) { super(detailMessage, throwable); } - public OkHttpsException(HttpResult.State state, String detailMessage, Throwable throwable) { + public HttpException(HttpResult.State state, String detailMessage, Throwable throwable) { super(detailMessage, throwable); this.state = state; } - public OkHttpsException(HttpResult.State state, String detailMessage) { + public HttpException(HttpResult.State state, String detailMessage) { super(detailMessage); this.state = state; } diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/internal/ProcessInputStream.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/ProcessInputStream.java new file mode 100644 index 00000000..783a7d0a --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/ProcessInputStream.java @@ -0,0 +1,53 @@ +package com.ejlchina.okhttps.internal; + +import java.io.IOException; +import java.io.InputStream; +import java.util.concurrent.Executor; + +import com.ejlchina.okhttps.OnCallback; +import com.ejlchina.okhttps.Process; + +public class ProcessInputStream extends InputStream { + + private final InputStream input; + private final OnCallback onProcess; + private final Executor callbackExecutor; + private final long stepBytes; + private final RealProcess process; + private boolean doneCalled = false; + private long step = 0; + + public ProcessInputStream(InputStream input, OnCallback onProcess, long totalBytes, long stepBytes, + long doneBytes, Executor callbackExecutor) { + this.input = input; + this.onProcess = onProcess; + this.stepBytes = stepBytes; + this.callbackExecutor = callbackExecutor; + this.process = new RealProcess(totalBytes, doneBytes); + this.step = doneBytes / stepBytes; + } + + + @Override + public int read() throws IOException { + int data = input.read(); + if (data > -1) { + process.increaseDoneBytes(); + } + if (process.notDoneOrReached(step * stepBytes)) { + return data; + } + if (process.isDone()) { + if (doneCalled) { + return data; + } + doneCalled = true; + } + step++; + callbackExecutor.execute(() -> { + onProcess.on(process); + }); + return data; + } + +} diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/internal/ProcessRequestBody.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/ProcessRequestBody.java new file mode 100644 index 00000000..6771ef20 --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/ProcessRequestBody.java @@ -0,0 +1,89 @@ +package com.ejlchina.okhttps.internal; + +import java.io.IOException; +import java.util.concurrent.Executor; + +import com.ejlchina.okhttps.OnCallback; +import com.ejlchina.okhttps.Process; + +import okhttp3.MediaType; +import okhttp3.RequestBody; +import okio.Buffer; +import okio.BufferedSink; +import okio.ForwardingSink; +import okio.Okio; + +public class ProcessRequestBody extends RequestBody { + + private final RequestBody requestBody; + private final OnCallback onProcess; + private final Executor callbackExecutor; + private final RealProcess process; + private final long stepBytes; + private boolean doneCalled = false; + private long step = 0; + + public ProcessRequestBody(RequestBody requestBody, OnCallback onProcess, Executor callbackExecutor, + long contentLength, long stepBytes) { + this.requestBody = requestBody; + this.onProcess = onProcess; + this.callbackExecutor = callbackExecutor; + this.stepBytes = stepBytes; + this.process = new RealProcess(contentLength, 0); + } + + @Override + public long contentLength() { + return process.getTotalBytes(); + } + + @Override + public boolean isDuplex() { + return requestBody.isDuplex(); + } + + @Override + public boolean isOneShot() { + return requestBody.isOneShot(); + } + + @Override + public MediaType contentType() { + return requestBody.contentType(); + } + + private BufferedSink bufferedSink; + + @Override + public void writeTo(BufferedSink sink) throws IOException { + if (bufferedSink == null) { + bufferedSink = Okio.buffer(new ForwardingSink(sink) { + + @Override + public void write(Buffer source, long byteCount) throws IOException { + //这个方法会循环调用，byteCount 是每次调用上传的字节数。 + super.write(source, byteCount); + process.addDoneBytes(byteCount); + if (process.notDoneOrReached(step * stepBytes)) { + return; + } + if (process.isDone()) { + if (doneCalled) { + return; + } + doneCalled = true; + } + step++; + callbackExecutor.execute(() -> onProcess.on(process)); + } + + }); + } + requestBody.writeTo(bufferedSink); + bufferedSink.flush(); + } + + + +} + diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/RealHttpResult.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/RealHttpResult.java similarity index 81% rename from okhttps/src/main/java/cn/zhxu/okhttps/internal/RealHttpResult.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/RealHttpResult.java index a0f86671..166bffc8 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/RealHttpResult.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/RealHttpResult.java @@ -1,10 +1,7 @@ -package cn.zhxu.okhttps.internal; +package com.ejlchina.okhttps.internal; -import cn.zhxu.data.ArrayListMap; -import cn.zhxu.data.ListMap; -import cn.zhxu.okhttps.HttpTask; -import cn.zhxu.okhttps.TaskExecutor; -import cn.zhxu.okhttps.HttpResult; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.HttpTask; import okhttp3.Headers; import okhttp3.Response; @@ -68,10 +65,6 @@ public int getStatus() { @Override public boolean isSuccessful() { if (response != null) { - if (httpTask != null && httpTask.isWebsocket() - && response.code() == 101) { - return true; - } return response.isSuccessful(); } return false; @@ -84,19 +77,7 @@ public Headers getHeaders() { } return null; } - - @Override - public ListMap allHeaders() { - ListMap map = new ArrayListMap<>(); - if (response != null) { - Headers hs = response.headers(); - for (int i = 0, size = hs.size(); i < size; i++) { - map.put(hs.name(i), hs.value(i)); - } - } - return map; - } - + @Override public List getHeaders(String name) { if (response != null) { @@ -127,7 +108,7 @@ public long getContentLength() { @Override public synchronized Body getBody() { if (body == null && response != null) { - body = new ResultBody(this, response, taskExecutor); + body = new ResultBody(httpTask, response, taskExecutor); } return body; } diff --git a/okhttps/src/main/java/com/ejlchina/okhttps/internal/RealProcess.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/RealProcess.java new file mode 100644 index 00000000..633e4c02 --- /dev/null +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/RealProcess.java @@ -0,0 +1,50 @@ +package com.ejlchina.okhttps.internal; + +import com.ejlchina.okhttps.Process; + +public class RealProcess implements Process { + + // 总字节数 + private final long totalBytes; + // 已经完成字节数 + private long doneBytes; + + + public RealProcess(long totalBytes, long doneBytes) { + this.totalBytes = totalBytes; + this.doneBytes = doneBytes; + } + + @Override + public double getRate() { + return (double) doneBytes / totalBytes; + } + + @Override + public long getTotalBytes() { + return totalBytes; + } + + @Override + public long getDoneBytes() { + return doneBytes; + } + + @Override + public boolean isDone() { + return doneBytes >= totalBytes; + } + + public void addDoneBytes(long delt) { + doneBytes += delt; + } + + public void increaseDoneBytes() { + doneBytes++; + } + + public boolean notDoneOrReached(long bytes) { + return doneBytes < bytes && doneBytes < totalBytes; + } + +} diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/ResultBody.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/ResultBody.java similarity index 67% rename from okhttps/src/main/java/cn/zhxu/okhttps/internal/ResultBody.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/ResultBody.java index 65c09095..b2bfc0f4 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/ResultBody.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/ResultBody.java @@ -1,32 +1,36 @@ -package cn.zhxu.okhttps.internal; +package com.ejlchina.okhttps.internal; + +import java.io.*; +import java.net.HttpURLConnection; +import java.net.URLDecoder; + +import com.ejlchina.okhttps.Download; +import com.ejlchina.okhttps.HttpResult.Body; +import com.ejlchina.okhttps.HttpTask; +import com.ejlchina.okhttps.OnCallback; +import com.ejlchina.okhttps.Process; -import cn.zhxu.okhttps.Process; -import cn.zhxu.okhttps.*; import okhttp3.MediaType; import okhttp3.Response; import okhttp3.ResponseBody; import okio.Buffer; import okio.ByteString; -import java.io.*; -import java.net.HttpURLConnection; -import java.util.function.Consumer; - -public class ResultBody extends AbstractBody implements HttpResult.Body { - - private final HttpResult result; +public class ResultBody extends AbstractBody implements Body { + private final Response response; private boolean onIO = false; - private Consumer onProcess; + private OnCallback onProcess; private long stepBytes = 0; private double stepRate = -1; private boolean rangeIgnored = false; + private final HttpTask httpTask; private boolean cached = false; private byte[] data; - ResultBody(HttpResult result, Response response, TaskExecutor taskExecutor) { - super(taskExecutor, result.getTask().charset(response)); - this.result = result; + ResultBody(HttpTask httpTask, Response response, TaskExecutor taskExecutor) { + super(taskExecutor, httpTask.charset(response)); + this.httpTask = httpTask; this.response = response; } @@ -50,13 +54,13 @@ public long getLength() { } @Override - public HttpResult.Body nextOnIO() { + public Body nextOnIO() { onIO = true; return this; } @Override - public HttpResult.Body setOnProcess(Consumer onProcess) { + public Body setOnProcess(OnCallback onProcess) { if (taskExecutor == null) { response.close(); throw new IllegalStateException("没有 taskExecutor，不可设置下载进度回调！"); @@ -70,19 +74,19 @@ public HttpResult.Body setOnProcess(Consumer onProcess) { } @Override - public HttpResult.Body stepBytes(long stepBytes) { + public Body stepBytes(long stepBytes) { this.stepBytes = stepBytes; return this; } @Override - public HttpResult.Body stepRate(double stepRate) { + public Body stepRate(double stepRate) { this.stepRate = stepRate; return this; } @Override - public HttpResult.Body setRangeIgnored() { + public Body setRangeIgnored() { this.rangeIgnored =true; return this; } @@ -159,7 +163,7 @@ public String toString() { } } catch (IOException e) { response.close(); - throw new OkHttpsException("报文体转化字符串出错", e); + throw new HttpException("报文体转化字符串出错", e); } return null; } @@ -194,21 +198,20 @@ public Download toFile(File file) { } } catch (Exception e) { response.close(); - throw new OkHttpsException("文件下载失败", e); + throw new HttpException("文件下载失败", e); } - return taskExecutor.download(result.getTask(), file, toByteStream(), getRangeStart()); + return taskExecutor.download(httpTask, file, toByteStream(), getRangeStart()); } @Override public Download toFolder(String dirPath) { - DownloadHelper helper = result.getTask().httpClient().downloadHelper; - String fileName = helper.resolveFileName(result); - String filePath = helper.resolveFilePath(dirPath, fileName); + String fileName = resolveFileName(); + String filePath = resolveFilePath(dirPath, fileName); int index = 0; File file = new File(filePath); while (file.exists()) { - String indexFileName = helper.indexFileName(fileName, index++); - filePath = helper.resolveFilePath(dirPath, indexFileName); + String indexFileName = indexFileName(fileName, index++); + filePath = resolveFilePath(dirPath, indexFileName); file = new File(filePath); } return toFile(file); @@ -225,13 +228,13 @@ public Download toFolder(File dir) { } } catch (Exception e) { response.close(); - throw new OkHttpsException("目录创建失败", e); + throw new HttpException("目录创建失败", e); } return toFolder(dir.getAbsolutePath()); } @Override - public HttpResult.Body cache() { + public Body cache() { if (onProcess != null) { response.close(); throw new IllegalStateException("设置了下载进度回调，不可再开启缓存！"); @@ -241,7 +244,7 @@ public HttpResult.Body cache() { } @Override - public HttpResult.Body close() { + public Body close() { response.close(); data = null; return this; @@ -261,7 +264,7 @@ private byte[] bodyToBytes() { try (Buffer buffer = new Buffer()) { return buffer.readFrom(toByteStream()).readByteArray(); } catch (IOException e) { - throw new OkHttpsException("报文体转化字节数组出错", e); + throw new HttpException("报文体转化字节数组出错", e); } finally { response.close(); } @@ -272,7 +275,7 @@ private byte[] bodyToBytes() { return body.bytes(); } catch (IOException e) { body.close(); - throw new OkHttpsException("报文体转化字节数组出错", e); + throw new HttpException("报文体转化字节数组出错", e); } } return new byte[0]; @@ -295,5 +298,45 @@ private long getRangeStart() { } return rangeStart; } + + private String resolveFilePath(String dirPath, String fileName) { + if (dirPath.endsWith("\\") || dirPath.endsWith("/")) { + return dirPath + fileName; + } + return dirPath + "\\" + fileName; + } + + private String indexFileName(String fileName, int index) { + int i = fileName.lastIndexOf('.'); + if (i < 0) { + return fileName + "(" + index + ")"; + } + String ext = fileName.substring(i); + if (i > 0) { + String name = fileName.substring(0, i); + return name + "(" + index + ")" + ext; + } + return "(" + index + ")" + ext; + } + + private String resolveFileName() { + String fileName = response.header("Content-Disposition"); + // 通过Content-Disposition获取文件名，这点跟服务器有关，需要灵活变通 + if (fileName == null || fileName.length() < 1) { + fileName = response.request().url().encodedPath(); + fileName = fileName.substring(fileName.lastIndexOf("/") + 1); + } else { + try { + fileName = URLDecoder.decode(fileName.substring( + fileName.indexOf("filename=") + 9), "UTF-8"); + } catch (UnsupportedEncodingException e) { + response.close(); + throw new HttpException("解码文件名失败", e); + } + // 有些文件名会被包含在""里面，所以要去掉，不然无法读取文件后缀 + fileName = fileName.replaceAll("\"", ""); + } + return fileName; + } } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/SHttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/SyncHttpTask.java similarity index 85% rename from okhttps/src/main/java/cn/zhxu/okhttps/SHttpTask.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/SyncHttpTask.java index aa68c5f9..07b4e7a7 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/SHttpTask.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/SyncHttpTask.java @@ -1,13 +1,16 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.HttpResult.State; -import cn.zhxu.okhttps.internal.AbstractHttpClient; -import cn.zhxu.okhttps.internal.RealHttpResult; -import okhttp3.Call; +package com.ejlchina.okhttps.internal; import java.io.IOException; import java.util.concurrent.CountDownLatch; +import com.ejlchina.okhttps.Cancelable; +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.HttpTask; +import com.ejlchina.okhttps.HttpResult.State; + +import okhttp3.Call; + /** * 同步 Http 请求任务 @@ -15,10 +18,10 @@ * @author Troy.Zhou * */ -public class SHttpTask extends HttpTask { +public class SyncHttpTask extends HttpTask { - public SHttpTask(AbstractHttpClient httpImpl, String url) { - super(httpImpl, url); + public SyncHttpTask(HttpClient client, String url) { + super(client, url); } @@ -109,7 +112,7 @@ public HttpResult request(String method) { }, skipPreproc, skipSerialPreproc); boolean timeout = false; if (result.getState() == null) { - timeout = timeoutAwait(latch); + timeout = !timeoutAwait(latch); } // 移除标签任务 removeTagTask(); @@ -121,7 +124,7 @@ public HttpResult request(String method) { State state = result.getState(); if (e != null && state != State.CANCELED && !nothrow) { - throw new OkHttpsException(state, "同步请求异常：" + getUrl(), e); + throw new HttpException(state, "同步请求异常：" + getUrl(), e); } return result; } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/TaskExecutor.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/TaskExecutor.java similarity index 72% rename from okhttps/src/main/java/cn/zhxu/okhttps/TaskExecutor.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/TaskExecutor.java index 72f15e44..b20b529c 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/TaskExecutor.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/TaskExecutor.java @@ -1,18 +1,13 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.HttpResult.State; -import okhttp3.MediaType; -import okhttp3.internal.Util; +package com.ejlchina.okhttps.internal; import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; -import java.util.concurrent.Executor; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; -import java.util.function.Consumer; +import java.util.concurrent.*; + +import com.ejlchina.okhttps.*; +import com.ejlchina.okhttps.HttpResult.State; +import okhttp3.internal.Util; public final class TaskExecutor { @@ -61,53 +56,38 @@ public void execute(Runnable command, boolean onIo) { executor.execute(command); } - public void executeOnResponse(HttpTask task, AHttpTask.OkHttpCall call, Consumer onResponse, HttpResult result, boolean onIo) { - Runnable runnable = () -> { - if (!call.isCanceled()) onResponse.accept(result); - }; + public void executeOnResponse(HttpTask task, OnCallback onResponse, HttpResult result, boolean onIo) { if (responseListener != null) { if (responseListener.listen(task, result) && onResponse != null) { - execute(runnable, onIo); - } else { - call.finish(); + execute(() -> onResponse.on(result), onIo); } } else if (onResponse != null) { - execute(runnable, onIo); + execute(() -> onResponse.on(result), onIo); } else { result.close(); - call.finish(); } } - public boolean executeOnException(HttpTask task, AHttpTask.OkHttpCall call, Consumer onException, IOException error, boolean onIo) { - Runnable runnable = () -> { - if (!call.isCanceled()) { - onException.accept(error); - } - call.finish(); - }; + public boolean executeOnException(HttpTask task, OnCallback onException, IOException error, boolean onIo) { if (exceptionListener != null) { if (exceptionListener.listen(task, error) && onException != null) { - execute(runnable, onIo); - } else { - call.finish(); + execute(() -> onException.on(error), onIo); } } else if (onException != null) { - execute(runnable, onIo); + execute(() -> onException.on(error), onIo); } else { - call.finish(); return false; } return true; } - public void executeOnComplete(HttpTask task, Consumer onComplete, State state, boolean onIo) { + public void executeOnComplete(HttpTask task, OnCallback onComplete, State state, boolean onIo) { if (completeListener != null) { if (completeListener.listen(task, state) && onComplete != null) { - execute(() -> onComplete.accept(state), onIo); + execute(() -> onComplete.on(state), onIo); } } else if (onComplete != null) { - execute(() -> onComplete.accept(state), onIo); + execute(() -> onComplete.on(state), onIo); } } @@ -120,21 +100,13 @@ public interface ConvertFunc { public static class Data { - public final T data; - private final String contentType; + public T data; + public String contentType; public Data(T data, String contentType) { this.data = data; this.contentType = contentType; } - - public MediaType mediaType(Charset charset) { - if (contentType != null) { - return MediaType.parse(contentType.replace("{charset}", charset.name())); - } - return null; - } - } public V doMsgConvert(ConvertFunc callable) { @@ -150,11 +122,11 @@ public Data doMsgConvert(String type, ConvertFunc callable) { continue; } if (callable == null && mediaType != null) { - return new Data<>(null, mediaType(type, mediaType)); + return new Data<>(null, mediaType); } try { assert callable != null; - return new Data<>(callable.apply(convertor), mediaType(type, mediaType)); + return new Data<>(callable.apply(convertor), mediaType); } catch (Exception e) { if (cause != null) { initRootCause(e, cause); @@ -166,9 +138,9 @@ public Data doMsgConvert(String type, ConvertFunc callable) { return new Data<>(null, toContentType(type)); } if (cause != null) { - throw new OkHttpsException("转换失败", cause); + throw new HttpException("转换失败", cause); } - throw new OkHttpsException("没有匹配[" + type + "]类型的转换器！"); + throw new HttpException("没有匹配[" + type + "]类型的转换器！"); } private void initRootCause(Throwable throwable, Throwable cause) { @@ -179,16 +151,9 @@ private void initRootCause(Throwable throwable, Throwable cause) { throwable.initCause(cause); } } - - private String mediaType(String type, String mediaType) { - return type != null && type.contains("/") ? type : mediaType; - } - + private String toContentType(String type) { if (type != null) { - if (type.contains("/")) { - return type; - } for (String contentType : contentTypes) { if (contentType.contains(type)) { return contentType; @@ -260,7 +225,7 @@ public String[] getContentTypes() { return contentTypes; } - public boolean isMulitMsgConvertor() { + boolean isMulitMsgConvertor() { return msgConvertors.length > 1; } diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/internal/WebSocketMsg.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/WebSocketMsg.java similarity index 89% rename from okhttps/src/main/java/cn/zhxu/okhttps/internal/WebSocketMsg.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/WebSocketMsg.java index 5b7fc09c..7dd0101b 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/internal/WebSocketMsg.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/WebSocketMsg.java @@ -1,4 +1,4 @@ -package cn.zhxu.okhttps.internal; +package com.ejlchina.okhttps.internal; import java.io.ByteArrayInputStream; import java.io.InputStream; @@ -8,13 +8,12 @@ import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import cn.zhxu.okhttps.TaskExecutor; -import cn.zhxu.okhttps.WebSocket; +import com.ejlchina.okhttps.WebSocket.Message; import okio.ByteString; -public class WebSocketMsg extends AbstractBody implements WebSocket.Message { +public class WebSocketMsg extends AbstractBody implements Message { private String text; private ByteString bytes; diff --git a/okhttps/src/main/java/cn/zhxu/okhttps/WHttpTask.java b/okhttps/src/main/java/com/ejlchina/okhttps/internal/WebSocketTask.java similarity index 62% rename from okhttps/src/main/java/cn/zhxu/okhttps/WHttpTask.java rename to okhttps/src/main/java/com/ejlchina/okhttps/internal/WebSocketTask.java index 3c24331a..61ea9bdf 100644 --- a/okhttps/src/main/java/cn/zhxu/okhttps/WHttpTask.java +++ b/okhttps/src/main/java/com/ejlchina/okhttps/internal/WebSocketTask.java @@ -1,11 +1,9 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.WebSocket.Close; -import cn.zhxu.okhttps.WebSocket.Listener; -import cn.zhxu.okhttps.WebSocket.Message; -import cn.zhxu.okhttps.internal.AbstractHttpClient; -import cn.zhxu.okhttps.internal.RealHttpResult; -import cn.zhxu.okhttps.internal.WebSocketMsg; +package com.ejlchina.okhttps.internal; + +import com.ejlchina.okhttps.*; +import com.ejlchina.okhttps.WebSocket.Close; +import com.ejlchina.okhttps.WebSocket.Listener; +import com.ejlchina.okhttps.WebSocket.Message; import okhttp3.Request; import okhttp3.Response; import okhttp3.WebSocketListener; @@ -18,11 +16,11 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.function.Supplier; -public class WHttpTask extends HttpTask { +public class WebSocketTask extends HttpTask { + private Listener onOpen; private Listener onException; private Listener onMessage; @@ -41,18 +39,15 @@ public class WHttpTask extends HttpTask { private long lastPongSecs = 0; // 心跳数据提供者 - private Supplier pingSupplier; + private PingSupplier pingSupplier; private WebSocketImpl webSocket; // Ping 的间隔是否灵活可变 private boolean flexiblePing = true; - // 最大关闭时长，即：执行了 OnClosing 回调后，最晚过多少久就会执行 OnClosed 回调 - private int maxClosingSecs = 10; - - public WHttpTask(AbstractHttpClient httpClient, String url) { + public WebSocketTask(HttpClient httpClient, String url) { super(httpClient, url); } @@ -72,16 +67,16 @@ public boolean isWebsocket() { * * 由于 OkHttp 底层并未暴露 websocket 协议里 opcode 的接口，所以该心跳的 opcode 始终是 2，并不是 websocket 协议里定义的 9 * 所以如果服务器要求客户端心跳的 opcode 必须是 9 的话，请使用 OkHttp 的原生心跳： - * https://ok.zhxu.cn/v3/websocket.html#%E5%85%A8%E5%B1%80%E5%BF%83%E8%B7%B3%E9%85%8D%E7%BD%AE + * [http://okhttps.ejlchina.com/v2/websocket.html#%E5%85%A8%E5%B1%80%E5%BF%83%E8%B7%B3%E9%85%8D%E7%BD%AE] * - * 另若需要 可使用 {@link #pingSupplier(Supplier)} 方法指定心跳发送的具体内容 + * 另若需要 可使用 {@link #pingSupplier(PingSupplier)} 方法指定心跳发送的具体内容 * * @since v2.3.0 * @param pingSeconds 客户端心跳间隔秒数（0 表示不需要心跳） * @param pongSeconds 服务器心跳间隔秒数（0 表示不需要心跳） - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask heatbeat(int pingSeconds, int pongSeconds) { + public WebSocketTask heatbeat(int pingSeconds, int pongSeconds) { if (pingSeconds < 0 || pongSeconds < 0) { throw new IllegalArgumentException("pingSeconds and pongSeconds must greater equal than 0!"); } @@ -94,23 +89,23 @@ public WHttpTask heatbeat(int pingSeconds, int pongSeconds) { * 用于兼容某些强制客户端必须以固定的时间间隔发送心跳的服务器 * @since v2.5.0 * @param flexiblePing Ping 的间隔是否灵活可变（默认为 true, 为 false 时客户端 Ping 的间隔固定，普通的消息不做为 Ping） - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask flexiblePing(boolean flexiblePing) { + public WebSocketTask flexiblePing(boolean flexiblePing) { this.flexiblePing = flexiblePing; return this; } /** * @param pingSupplier 心跳数据提供者 - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask pingSupplier(Supplier pingSupplier) { + public WebSocketTask pingSupplier(PingSupplier pingSupplier) { this.pingSupplier = pingSupplier; return this; } - public Supplier pingSupplier() { + public PingSupplier pingSupplier() { return pingSupplier; } @@ -118,11 +113,7 @@ public Supplier pingSupplier() { * 启动 WebSocket 监听 * @return WebSocket */ - public synchronized WebSocket listen() { - if (webSocket != null) { - // 如果连接已建立，直接返回 - return webSocket; - } + public WebSocket listen() { WebSocketImpl socket = new WebSocketImpl(); registeTagTask(socket); httpClient.preprocess(this, () -> { @@ -139,27 +130,11 @@ public synchronized WebSocket listen() { webSocket = socket; return socket; } - - /** - * @since v3.1.0 - * @param code 状态码 - * @param reason 原因 - * @return true: 被关闭, false: 当前尚未建立连接 - */ - public boolean close(int code, String reason) { - WebSocket ws = webSocket; - if (ws != null) { - ws.close(code, reason); - webSocket = null; - return true; - } - return false; - } - - @SuppressWarnings("NullableProblems") + + class MessageListener extends WebSocketListener { - final WebSocketImpl webSocket; + WebSocketImpl webSocket; Charset charset; @@ -173,15 +148,14 @@ public void onOpen(okhttp3.WebSocket webSocket, Response response) { this.webSocket.setCharset(charset); this.webSocket.setWebSocket(webSocket); this.webSocket.setStatus(WebSocket.STATUS_CONNECTED); - TaskListener listener = httpClient.executor().getResponseListener(); - HttpResult result = new RealHttpResult(WHttpTask.this, response, httpClient.executor()); - Listener openListener = onOpen; + TaskListener listener = httpClient.executor.getResponseListener(); + HttpResult result = new RealHttpResult(WebSocketTask.this, response, httpClient.executor); if (listener != null) { - if (listener.listen(WHttpTask.this, result) && openListener != null) { - execute(() -> openListener.on(this.webSocket, result), openOnIO); + if (listener.listen(WebSocketTask.this, result) && onOpen != null) { + execute(() -> onOpen.on(this.webSocket, result), openOnIO); } - } else if (openListener != null) { - execute(() -> openListener.on(this.webSocket, result), openOnIO); + } else if (onOpen != null) { + execute(() -> onOpen.on(this.webSocket, result), openOnIO); } if (pingSeconds > 0) { lastPingSecs = nowSeconds(); @@ -196,60 +170,49 @@ public void onOpen(okhttp3.WebSocket webSocket, Response response) { // 接收文本数据 仅当 websocket 消息中的 opcode == 1 时 @Override public void onMessage(okhttp3.WebSocket webSocket, String text) { - Listener listener = onMessage; - if (listener != null) { - execute(() -> listener.on(this.webSocket, new WebSocketMsg(text, httpClient.executor(), charset)), messageOnIO); + if (onMessage != null) { + execute(() -> onMessage.on(this.webSocket, new WebSocketMsg(text, httpClient.executor, charset)), messageOnIO); } if (pongSeconds > 0) { lastPongSecs = nowSeconds(); + Platform.logInfo("PONG <<< " + text); } } // 接收二进制数据 仅当 websocket 消息中的 opcode == 2 时 @Override public void onMessage(okhttp3.WebSocket webSocket, ByteString bytes) { - Listener listener = onMessage; - if (listener != null) { - execute(() -> listener.on(this.webSocket, new WebSocketMsg(bytes, httpClient.executor(), charset)), messageOnIO); + if (onMessage != null) { + execute(() -> onMessage.on(this.webSocket, new WebSocketMsg(bytes, httpClient.executor, charset)), messageOnIO); } if (pongSeconds > 0) { lastPongSecs = nowSeconds(); + Platform.logInfo("PONG <<< " + bytes.utf8()); } } @Override - public void onClosing(okhttp3.WebSocket ws, int code, String reason) { + public void onClosing(okhttp3.WebSocket webSocket, int code, String reason) { this.webSocket.setStatus(WebSocket.STATUS_DISCONNECTED); - Listener listener = onClosing; - if (listener != null) { - execute(() -> listener.on(this.webSocket, new Close(code, reason)), closingOnIO); + if (onClosing != null) { + execute(() -> onClosing.on(this.webSocket, new Close(code, reason)), closingOnIO); } - httpClient.executor().requireScheduler().schedule(() -> { - doOnClose(HttpResult.State.RESPONSED, code, reason); - }, maxClosingSecs, TimeUnit.SECONDS); } @Override - public void onClosed(okhttp3.WebSocket ws, int code, String reason) { + public void onClosed(okhttp3.WebSocket webSocket, int code, String reason) { doOnClose(HttpResult.State.RESPONSED, code, reason); } private void doOnClose(HttpResult.State state, int code, String reason) { - synchronized(WHttpTask.this) { - if (WHttpTask.this.webSocket == null || this.webSocket != WHttpTask.this.webSocket) { - return; // 回调已经执行过 - } - WHttpTask.this.webSocket = null; - Close close = updateStatus(state, code, reason); - TaskListener listener = httpClient.executor().getCompleteListener(); - Listener closeListener = onClosed; - if (listener != null) { - if (listener.listen(WHttpTask.this, state) && closeListener != null) { - execute(() -> closeListener.on(this.webSocket, close), closedOnIO); - } - } else if (closeListener != null) { - execute(() -> closeListener.on(this.webSocket, close), closedOnIO); + TaskListener listener = httpClient.executor.getCompleteListener(); + Close close = updateStatus(state, code, reason); + if (listener != null) { + if (listener.listen(WebSocketTask.this, state) && onClosed != null) { + execute(() -> onClosed.on(this.webSocket, close), closedOnIO); } + } else if (onClosed != null) { + execute(() -> onClosed.on(this.webSocket, close), closedOnIO); } } @@ -275,19 +238,18 @@ private Close updateStatus(HttpResult.State state, int code, String reason) { } @Override - public void onFailure(okhttp3.WebSocket ws, Throwable t, Response response) { + public void onFailure(okhttp3.WebSocket webSocket, Throwable t, Response response) { IOException e = t instanceof IOException ? (IOException) t : new IOException(t.getMessage(), t); doOnClose(toState(e), 0, t.getMessage()); - TaskListener listener = httpClient.executor().getExceptionListener(); - Listener exceptionListener = onException; + TaskListener listener = httpClient.executor.getExceptionListener(); if (listener != null) { - if (listener.listen(WHttpTask.this, e) && exceptionListener != null) { - execute(() -> exceptionListener.on(this.webSocket, t), exceptionOnIO); + if (listener.listen(WebSocketTask.this, e) && onException != null) { + execute(() -> onException.on(this.webSocket, t), exceptionOnIO); } - } else if (exceptionListener != null) { - execute(() -> exceptionListener.on(this.webSocket, t), exceptionOnIO); + } else if (onException != null) { + execute(() -> onException.on(this.webSocket, t), exceptionOnIO); } else if (!nothrow) { - throw new OkHttpsException("WebSockt 连接异常: " + getUrl(), t); + throw new HttpException("WebSockt 连接异常: " + getUrl(), t); } } @@ -297,8 +259,7 @@ public void onFailure(okhttp3.WebSocket ws, Throwable t, Response response) { * @return 连接是否已建立 */ public boolean isConnected() { - WebSocketImpl ws = webSocket; - return ws != null && ws.status == WebSocket.STATUS_CONNECTED; + return webSocket != null && webSocket.status == WebSocket.STATUS_CONNECTED; } /** @@ -309,13 +270,14 @@ private void schedulePing() { return; } int delay = (int) (pingSeconds + lastPingSecs - nowSeconds()); - httpClient.executor().requireScheduler().schedule(() -> { + httpClient.executor.requireScheduler().schedule(() -> { if (!isConnected()) { return; } - WebSocket ws = webSocket; - if (nowSeconds() - lastPingSecs >= pingSeconds && ws != null) { - ws.send(pingSupplier != null ? pingSupplier.get() : ByteString.EMPTY); + if (nowSeconds() - lastPingSecs >= pingSeconds) { + ByteString ping = pingSupplier != null ? pingSupplier.getPing() : ByteString.EMPTY; + webSocket.send(ping); + Platform.logInfo("PING >>> " + ping.utf8()); lastPingSecs = nowSeconds(); } schedulePing(); @@ -330,17 +292,14 @@ private void schedulePong() { return; } int delay = (int) (pongSeconds + lastPongSecs - nowSeconds()); - httpClient.executor().requireScheduler().schedule(() -> { + httpClient.executor.requireScheduler().schedule(() -> { if (!isConnected()) { return; } long noPongSeconds = nowSeconds() - lastPongSecs; if (noPongSeconds > 3L * pongSeconds) { - WebSocketImpl ws = webSocket; - if (ws != null) { - Exception e = new SocketTimeoutException("Server didn't pong heart-beat on time. Last received at " + noPongSeconds + " seconds ago."); - ((RealWebSocket) ws.webSocket).failWebSocket(e, null); - } + Exception e = new SocketTimeoutException("Server didn't pong heart-beat on time. Last received at " + noPongSeconds + " seconds ago."); + ((RealWebSocket) webSocket.webSocket).failWebSocket(e, null); } else { schedulePong(); } @@ -351,7 +310,7 @@ private void schedulePong() { * @return 当前时间戳（秒） */ private long nowSeconds() { - return System.currentTimeMillis() / 1000; + return System.nanoTime() / 1000_000_000; } class WebSocketImpl implements WebSocket { @@ -460,7 +419,7 @@ boolean send(okhttp3.WebSocket webSocket, Object msg) { if (msg instanceof byte[]) { return webSocket.send(ByteString.of((byte[]) msg)); } - byte[] bytes = httpClient.executor().doMsgConvert(msgType, c -> c.serialize(msg, charset)).data; + byte[] bytes = httpClient.executor.doMsgConvert(msgType, c -> c.serialize(msg, charset)).data; return webSocket.send(new String(bytes, charset)); } @@ -469,9 +428,9 @@ boolean send(okhttp3.WebSocket webSocket, Object msg) { /** * 连接打开监听 * @param onOpen 监听器 - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask setOnOpen(Listener onOpen) { + public WebSocketTask setOnOpen(Listener onOpen) { this.onOpen = onOpen; openOnIO = nextOnIO; nextOnIO = false; @@ -481,9 +440,9 @@ public WHttpTask setOnOpen(Listener onOpen) { /** * 连接异常监听 * @param onException 监听器 - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask setOnException(Listener onException) { + public WebSocketTask setOnException(Listener onException) { this.onException = onException; exceptionOnIO = nextOnIO; nextOnIO = false; @@ -493,9 +452,9 @@ public WHttpTask setOnException(Listener onException) { /** * 消息监听 * @param onMessage 监听器 - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask setOnMessage(Listener onMessage) { + public WebSocketTask setOnMessage(Listener onMessage) { this.onMessage = onMessage; messageOnIO = nextOnIO; nextOnIO = false; @@ -505,9 +464,9 @@ public WHttpTask setOnMessage(Listener onMessage) { /** * 正在关闭监听 * @param onClosing 监听器 - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask setOnClosing(Listener onClosing) { + public WebSocketTask setOnClosing(Listener onClosing) { this.onClosing = onClosing; closingOnIO = nextOnIO; nextOnIO = false; @@ -517,25 +476,15 @@ public WHttpTask setOnClosing(Listener onClosing) { /** * 已关闭监听（当连接被取消或发生异常时，也会走该回调） * @param onClosed 监听器 - * @return WHttpTask + * @return WebSocketTask */ - public WHttpTask setOnClosed(Listener onClosed) { + public WebSocketTask setOnClosed(Listener onClosed) { this.onClosed = onClosed; closedOnIO = nextOnIO; nextOnIO = false; return this; } - /** - * 设置在 OnClosing 回调执行完毕后，OnClosed 回调执行的最晚延迟时间 - * @param maxClosingSecs 最大 Closing 时长（单位：秒，默认：10秒） - * @return WHttpTask - */ - public WHttpTask setMaxClosingSecs(int maxClosingSecs) { - this.maxClosingSecs = maxClosingSecs; - return this; - } - public int pingSeconds() { return pingSeconds; } diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/BodyParaTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/BodyParaTests.java deleted file mode 100644 index 5ec732df..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/BodyParaTests.java +++ /dev/null @@ -1,60 +0,0 @@ -package cn.zhxu.okhttps; - -import okhttp3.mockwebserver.MockResponse; -import okhttp3.mockwebserver.RecordedRequest; -import org.junit.Assert; -import org.junit.Test; - -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; - -public class BodyParaTests extends BaseTest { - - @Test - public void testAddBodyPara() throws InterruptedException, UnsupportedEncodingException { - server.enqueue(new MockResponse().setBody("OK")); - - String resp = http.sync("/") - .addBodyPara("name", "OkHttps") - .addBodyPara("desc", "最好用的网络框架") - .post().getBody().toString(); - - RecordedRequest request = server.takeRequest(); - - Assert.assertEquals("OK", resp); - Assert.assertTrue(request.getHeader("Content-Type").startsWith("application/x-www-form-urlencoded")); - Assert.assertEquals("name=OkHttps&desc=最好用的网络框架", URLDecoder.decode(request.getBody().readUtf8(), "UTF-8")); - } - - @Test - public void testSetBodyParaFormString() throws InterruptedException { - server.enqueue(new MockResponse().setBody("OK")); - - String resp = http.sync("/") - .setBodyPara("name=OkHttps&desc=最好用的网络框架") - .post().getBody().toString(); - - RecordedRequest request = server.takeRequest(); - - Assert.assertEquals("OK", resp); - Assert.assertTrue(request.getHeader("Content-Type").startsWith("application/x-www-form-urlencoded")); - Assert.assertEquals("name=OkHttps&desc=最好用的网络框架", request.getBody().readUtf8()); - } - - @Test - public void testSetBodyParaJsonString() throws InterruptedException { - server.enqueue(new MockResponse().setBody("OK")); - String resp = http.sync(mockUrl) - .bodyType("json") - .setBodyPara("{\"name\":\"OkHttps\"}") - .post() - .getBody() - .toString(); - - RecordedRequest request = server.takeRequest(); - Assert.assertEquals("OK", resp); - Assert.assertTrue(request.getHeader("Content-Type").startsWith("application/json")); - Assert.assertEquals("{\"name\":\"OkHttps\"}", request.getBody().readUtf8()); - } - -} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/CacheTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/CacheTests.java deleted file mode 100644 index 307119ca..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/CacheTests.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.zhxu.okhttps; - -import okhttp3.mockwebserver.MockResponse; -import org.junit.Assert; -import org.junit.Test; - -public class CacheTests extends BaseTest { - - /** - * 启用 cache 示例 - */ - @Test - public void testCache() { - String content = "test cache method"; - server.enqueue(new MockResponse().setBody(content)); - HttpResult.Body body = http.sync("/users").get().getBody() - .cache(); // 启用 cache - // 使用 cache 后，可以多次使用 toXXX() 方法 - Assert.assertEquals(content, body.toString()); - Assert.assertEquals(content, body.toString()); - } - -} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/CancelTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/CancelTests.java deleted file mode 100644 index fe6b602a..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/CancelTests.java +++ /dev/null @@ -1,97 +0,0 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.okhttps.HttpResult.State; -import cn.zhxu.okhttps.internal.AbstractHttpClient; -import org.junit.Test; - -import java.io.IOException; - -/** - * 测试取消 - */ -public class CancelTests extends BaseTest { - - - @Test - public void testCancelByTag() { - new Thread(() -> { - sleep(50); -// http.cancelAll(); -// int count = http.cancel("A"); -// println("count = " + count); - }).start(); - - http.async("/ejlchina/comm/provinces") - .tag("A") - .setOnResponse((HttpResult result) -> { - println("异步：result = " + result); - }) - .setOnComplete((State state) -> { - println("异步：state = " + state); - }) - .get(); - - try { - HttpResult result = http.sync("/ejlchina/comm/provinces") - .tag("A") - .get(); - - println("同步：result = " + result); - } catch (Exception e) { - e.printStackTrace(); - } - sleep(5000); - } - - @Test - public void testCancel() { - http.async("/user/show/1") - .setOnResponse(BaseTest::println) - .setOnException((IOException e) -> { - println("异常捕获：" + e.getMessage()); - }) - .setOnComplete(BaseTest::println) - .tag("A") - .get(); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - http.async("/user/show/2") - .setOnResponse(BaseTest::println) - .tag("A.B") - .get(); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - http.async("/user/show/3") - .setOnResponse(BaseTest::println) - .tag("B.C") - .get(); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - http.async("/user/show/4") - .setOnResponse(BaseTest::println) - .tag("C") - .get(); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - println("标签取消：" + http.cancel("B")); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - sleep(5000); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - sleep(5000); - - println(((AbstractHttpClient) http).getTagTaskCount()); - - sleep(5000); - - println(((AbstractHttpClient) http).getTagTaskCount()); - } - -} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/DownloadTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/DownloadTests.java deleted file mode 100644 index e5cf2ef4..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/DownloadTests.java +++ /dev/null @@ -1,252 +0,0 @@ -package cn.zhxu.okhttps; - -import okhttp3.OkHttpClient; -import org.junit.Test; - -import java.io.*; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.util.concurrent.CountDownLatch; - -public class DownloadTests extends BaseTest { - - - /** - * 分块下载测试 - * @param args - */ - public static void main(String[] args) { - long totalSize = HttpUtils.sync("/download/test.zip").get().getBody() - .close() // 因为这次请求只是为了获得文件大小，不消费报文体，所以直接关闭 - .getLength(); - download(totalSize, 0); // 从第 0 块开始下载 - sleep(50000); // 等待下载完成 - } - - static void download(long totalSize, int index) { - long size = 3 * 1024 * 1024; // 每块下载 3M - long start = index * size; - long end = Math.min(start + size, totalSize); - HttpUtils.sync("/download/test.zip") - .setRange(start, end) // 设置本次下载的范围 - .get().getBody() - .toFile("D:/download/test.zip") // 下载到同一个文件里 - .setAppended() // 开启文件追加模式 - .setOnSuccess((File file) -> { - if (end < totalSize) { // 若未下载完，则继续下载下一块 - download(totalSize, index + 1); - } else { - println("下载完成"); - } - }) - .start(); - } - - @Test - public void testDownload1() { - HTTP http = HTTP.builder().build(); - http.async("https://download.cocos.com/CocosDashboard/v1.0.1/CocosDashboard-v1.0.1-win32-031816.exe") - .setOnResponse((HttpResult result) -> { - System.out.println(result.toString()); - System.out.println("ContentLength = " + result.getContentLength()); - System.out.println(result.getBody().getLength()); - System.out.println("type = " + result.getBody().getType()); - System.out.println("body = " + result.getBody().toString()); - }) - .head(); - sleep(5000); - } - - /** - * 多线程并行下载到同一个文件 - * 这种下载方法不一定高效，因为多线程向同一个文件内写入数据存在竞争，下载时间不一定会变短 - * 例如 文件总大小：82.3 MB (86,336,432 字节)： - * 1 个线程并行下载: 7727 毫秒 - * 2 个线程并行下载: 7842 毫秒 - * 3 个线程并行下载: 8075 毫秒 - * 5 个线程并行下载: 8527 毫秒 - * 9 个线程并行下载: 8024 毫秒 - */ - @Test - public void parallel() throws InterruptedException { - long t0 = System.currentTimeMillis(); - - String url = "https://download.cocos.com/CocosDashboard/v1.0.1/CocosDashboard-v1.0.1-win32-031816.exe"; - - long totalLength = OkHttps.sync(url).head().getContentLength(); - long size = 30 * 1024 * 1024; // 每块最多下载 30 M - - int count = new BigDecimal(totalLength).divide(new BigDecimal(size), RoundingMode.UP).intValue(); - - println("共需下载 " + count + "块"); - - CountDownLatch latch = new CountDownLatch(count); - - for (int i = 0; i < count; i++) { - int index = i; - long start = index * size; - new Thread(() -> { - OkHttps.sync(url) - .setRange(start, start + size) - .get() - .getBody() - .stepRate(0.1) - .setOnProcess(p -> println("下载进度 [" + index + "]: " + p)) - .toFile("D:/CocosDashboard.exe") - .setOnSuccess((f) -> latch.countDown()) - .start(); - println("已开始下载第 " + index + "块"); - }).start(); - } - latch.await(); - - long t1 = System.currentTimeMillis(); - - println("共耗时：" + (t1 - t0) + " 毫秒"); - } - - - @Test - public void testRandomAccessFile() throws IOException { - String inputFile = "G:/1.jpg"; - String outputFile = "G:/2.jpg"; - - FileInputStream input = new FileInputStream(inputFile); - ByteArrayOutputStream output = new ByteArrayOutputStream(); - byte[] buff = new byte[1024]; - int len; - while ((len = input.read(buff)) != -1) { - output.write(buff, 0, len); - } - input.close(); - byte[] data = output.toByteArray(); - output.close(); - System.out.println("data length = " + data.length); - - File outFile = new File(outputFile); - if (!outFile.exists()) { - outFile.createNewFile(); - } - int size = data.length / 3; - - for (int i = 2; i >= 0; i--) { - final int index = i; - new Thread(() -> { - try { - int start = index * size; - RandomAccessFile raf = new RandomAccessFile(outFile, "rw"); - raf.seek(start); - if (index < 2) { - raf.write(data, start, size); - } else { - raf.write(data, start, data.length - start); - } - raf.close(); - } catch (IOException e) { - e.printStackTrace(); - } - System.out.println("第 " + index + " 块写入完成！"); - }).start(); - } - - sleep(5000); - - } - - - - @Test - public void testDownload() { - HTTP http = HTTP.builder() - .config((OkHttpClient.Builder builder) -> { -// builder.readTimeout(300, TimeUnit.MILLISECONDS); - }) - .build(); - - String url = "https://gitee.com/troyzhxu/okhttps/blob/master/README.md"; -// String url = "http://47.100.7.202/ejl-test.zip"; - - long t0 = now(); - -// Ctrl ctrl = - HttpResult result = http.sync(url) -// .setRange(24771214) - .bind(this) - .get(); - - println(result.getHeaders()); - println(); - - result - .getBody() - .setOnProcess((Process process) -> { - println(t0, process.getDoneBytes() + "/" + process.getTotalBytes() + "\t" + process.getRate()); - }) - .stepRate(0.1) - .toFolder("D:/WorkSpace/download/") -// .toFile("D:/WorkSpace/test/README.md") -// .setAppended() // 启用 断点续传 - .nextOnIO() - .setOnSuccess((File file) -> { - println(t0, "下载成功：" + file.getAbsolutePath()); - println(); - }) - .setOnFailure((Download.Failure failure) -> { - println(t0, "下载失败：" + failure.getDoneBytes() + ", path = " + failure.getFile().getAbsolutePath()); - println(); - }) - .start(); - - sleep(10000); - -// ctrl.status(); -// ctrl.pause(); -// println("暂停"); -// sleep(5000); -// -// ctrl.resume(); -// println("继续"); -// sleep(5000); -// -// ctrl.cancel(); -// println("取消"); - - -// - -// -// ctrl.pause(); -// println("暂停"); -// sleep(5000); -// -// ctrl.resume(); -// println("继续"); - sleep(5000); - - } - - - @Test - public void syncHttpExample() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - // 同步请求 - Download download = http.sync("https://gimg2.baidu.com/image_search/src=http%3A%2F%2F01.minipic.eastday.com%2F20170224%2F20170224133956_9b9688ef44943a76c1abcfbc19d3182d_8.jpeg&refer=http%3A%2F%2F01.minipic.eastday.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1633097548&t=9c0530c59afe492fd238e70020ca6786") - .get() - .getBody() - .stepRate(0.2) - .setOnProcess(p -> { - println("下载：" + p.getDoneBytes() + "/" + p.getTotalBytes() + "\t" + p.getRate()); - }) - .toFile("G:\\Download\\2.jpg"); - - long t0 = System.nanoTime(); - download.setOnSuccess(f -> { - long t = System.nanoTime() - t0; - println("下载完成，耗时：" + (t / 1000) + "us"); - latch.countDown(); - }) - .start(); - latch.await(); - } - -} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/ListMapTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/ListMapTests.java deleted file mode 100644 index f880ded6..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/ListMapTests.java +++ /dev/null @@ -1,55 +0,0 @@ -package cn.zhxu.okhttps; - -import cn.zhxu.data.ArrayListMap; -import cn.zhxu.data.LinkedListMap; -import cn.zhxu.data.ListMap; -import org.junit.Test; - -public class ListMapTests { - - @Test - public void map() { - long t0 = System.currentTimeMillis(); - for (int i = 0; i < 10000; i++) { - ListMap map = new ArrayListMap<>(); - map.put("name", "jack"); - map.put("school", "High School"); - map.put("age", 20); - map.put("sex", "Male"); - map.put("height", 170); - map.put("type", 2); - map.put("timestamp", "1234567890"); - map.put("name", "jack"); - map.put("school", "High School"); - map.put("age", 20); - map.put("sex", "Male"); - map.put("height", 170); - map.put("type", 2); - map.put("timestamp", "1234567890"); - map.forEach((key, value) -> { }); - } - long t1 = System.currentTimeMillis(); - for (int i = 0; i < 10000; i++) { - ListMap map = new LinkedListMap<>(); - map.put("name", "jack"); - map.put("school", "High School"); - map.put("age", 20); - map.put("sex", "Male"); - map.put("height", 170); - map.put("type", 2); - map.put("timestamp", "1234567890"); - map.put("name", "jack"); - map.put("school", "High School"); - map.put("age", 20); - map.put("sex", "Male"); - map.put("height", 170); - map.put("type", 2); - map.put("timestamp", "1234567890"); - map.forEach((key, value) -> { }); - } - long t2 = System.currentTimeMillis(); - System.out.println(t1 - t0); - System.out.println(t2 - t1); - } - -} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/SimpleTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/SimpleTests.java deleted file mode 100644 index 956e086d..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/SimpleTests.java +++ /dev/null @@ -1,86 +0,0 @@ -package cn.zhxu.okhttps; - -import okhttp3.mockwebserver.MockResponse; -import org.junit.Assert; -import org.junit.Test; - -public class SimpleTests extends BaseTest { - - @Test - public void testSyncPost() throws InterruptedException { - http.async("/").bodyType(OkHttps.JSON).post(); - Assert.assertEquals(server.takeRequest().getHeader("Content-Type"), "application/json; charset=UTF-8"); - http.async("/").bodyType(OkHttps.FORM).post(); - Assert.assertEquals(server.takeRequest().getHeader("Content-Type"), "application/x-www-form-urlencoded; charset=UTF-8"); - } - - @Test - public void test() { - HttpResult res = HTTP.builder() - .build() - .sync("http://www.baidu.com") - .bodyType("application/x-www-form-urlencoded") - .addBodyPara("name", "Jack") - .addBodyPara("age", 11) - .post() - .close(); - System.out.println(res); - } - - - /** - * 同步请求示例 - * 同步请求直接得到结果，无需设置回调 - */ - @Test - public void testSyncToString() { - server.enqueue(new MockResponse().setBody("Hello World!")); - String hello = http.sync("/users") // http://localhost:8080/users - .get() // GET请求 - .getBody() // 获取响应报文体 - .toString(); // 得到目标数据 - Assert.assertEquals(hello, "Hello World!"); - } - - @Test - public void testUserAgent() throws InterruptedException { - http.async("/user").addHeader("User-Agent", "123456").get(); - String userAgent = server.takeRequest().getHeader("User-Agent"); - Assert.assertEquals("123456", userAgent); - } - -// @Test -// public void testSyncToList() { -// User u1 = new User(1, "Jack"); -// User u2 = new User(2, "Tom"); -// List list = Arrays.asList(u1, u2); -// server.enqueue(new MockResponse().setBody(JSON.toJSONString(list))); -// -// List users = http.sync("/users") // http://localhost:8080/users -// .get() // GET请求 -// .getBody() // 获取响应报文体 -// .toList(User.class); // 得到目标数据 -// -// assertEquals(u1, users.get(0)); -// assertEquals(u2, users.get(1)); -// } -// -// /** -// * 异步请求示例 -// * 异步请求在OnResponse里接收请求结果 -// */ -// @Test -// public void testAsync() { -// http.async("/users/1") // http://api.demo.com/users/1 -// .setOnResponse((HttpResult result) -> { -// // 得到目标数据 -// User user = result.getBody().toBean(User.class); -// System.out.println("user = " + user); -// }) -// .get(); -// sleep(5000); -// } - -} - - diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/UploadTests.java b/okhttps/src/test/java/cn/zhxu/okhttps/UploadTests.java deleted file mode 100644 index 83506cd8..00000000 --- a/okhttps/src/test/java/cn/zhxu/okhttps/UploadTests.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.zhxu.okhttps; - -import okhttp3.mockwebserver.MockResponse; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Random; -import java.util.concurrent.CountDownLatch; - -public class UploadTests extends BaseTest { - - private byte[] randomFileContent(int length) { - Random random = new Random(); - byte[] content = new byte[length]; - for (int i = 0; i < length; i++) { - content[i] = (byte) (random.nextInt() % 256); - } - return content; - } - - @Test - public void testUpload() throws InterruptedException { - CountDownLatch latch = new CountDownLatch(1); - // 512 KB - byte[] content = randomFileContent(5 * 1024); - server.enqueue(new MockResponse().setResponseCode(200).setBody("OK")); - long t0 = System.currentTimeMillis(); - http.async("/upload") - .addBodyPara("path", "123456") - .addFilePara("file", "txt", "222", content) - .stepRate(0.1) - .setOnProcess((Process process) -> println(t0, "上传：" + process.getDoneBytes() + "/" + process.getTotalBytes() + "\t" + process.getRate())) - .setOnResponse(res -> { - String result = res.getBody().toString(); - println(result); - Assert.assertEquals(result, "OK"); - }) - .setOnComplete(state -> latch.countDown()) - .post(); - byte[] uploadData = server.takeRequest().getBody().buffer().readByteArray(); - println("数据长度：" + uploadData.length); - latch.await(); - } - -} diff --git a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/BaseTest.java b/okhttps/src/test/java/com/ejlchina/test/BaseTest.java similarity index 97% rename from okhttps-test/src/main/java/cn/zhxu/okhttps/test/BaseTest.java rename to okhttps/src/test/java/com/ejlchina/test/BaseTest.java index 9b218884..1efe1276 100644 --- a/okhttps-test/src/main/java/cn/zhxu/okhttps/test/BaseTest.java +++ b/okhttps/src/test/java/com/ejlchina/test/BaseTest.java @@ -1,10 +1,10 @@ -package cn.zhxu.okhttps.test; +package com.ejlchina.test; + +import okhttp3.mockwebserver.MockWebServer; import java.text.SimpleDateFormat; import java.util.Date; -import okhttp3.mockwebserver.MockWebServer; - public class BaseTest { protected MockWebServer server = new MockWebServer(); diff --git a/okhttps/src/test/java/com/ejlchina/test/CacheTests.java b/okhttps/src/test/java/com/ejlchina/test/CacheTests.java new file mode 100644 index 00000000..87e690b6 --- /dev/null +++ b/okhttps/src/test/java/com/ejlchina/test/CacheTests.java @@ -0,0 +1,72 @@ +package com.ejlchina.test; + +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.OnCallback; +import com.ejlchina.okhttps.HttpResult.State; + +import org.junit.Test; + +public class CacheTests extends BaseTest { + + @Test + public void testCache() { + HTTP http = HTTP.builder().build(); + + + +// +// +// HttpResult.Body body = http.sync("http://xxx.cdyun.vip/comm/provinces") +// +// .get() +// .getBody() +// .cache(); +// +// println("result = " + body.toString()); +// println("result = " + body.toArray()); +// +// body.close(); +// +// println("result = " + body.toString()); +// println("result = " + body.toArray()); +// +// +// +// +// http.async("") +// .addBodyPara("", "") +// +// +// .setOnResponse((HttpResult res) -> { +// +// Mapper mapper = res.getBody().toMapper(); +// +// }) +// .setOnComplete(state -> { +// +// testCache(); +// }) +// .setOnProcess(process -> { +// +// double rate = process.getRate(); +// +// }) +// .post() +// .cancel() +// ; + + + } + + class OnComplete implements OnCallback { + + @Override + public void on(State date) { + + testCache(); + } + + } + +} diff --git a/okhttps/src/test/java/com/ejlchina/test/CancelTests.java b/okhttps/src/test/java/com/ejlchina/test/CancelTests.java new file mode 100644 index 00000000..c9994a8e --- /dev/null +++ b/okhttps/src/test/java/com/ejlchina/test/CancelTests.java @@ -0,0 +1,133 @@ +package com.ejlchina.test; + +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.HttpResult.State; +import com.ejlchina.okhttps.internal.HttpClient; +import org.junit.Test; + +import java.io.IOException; + +/** + * 测试取消 + */ +public class CancelTests extends BaseTest { + + + @Test + public void testCancelByTag() { + HTTP http = HTTP.builder() + .baseUrl("http://tst-api-mini.cdyun.vip") + .build(); + + new Thread(() -> { + sleep(50); +// http.cancelAll(); +// int count = http.cancel("A"); +// println("count = " + count); + }).start(); + + http.async("/ejlchina/comm/provinces") + .tag("A") + .setOnResponse((HttpResult result) -> { + println("异步：result = " + result); + }) + .setOnComplete((State state) -> { + println("异步：state = " + state); + }) + .get(); + + try { + HttpResult result = http.sync("/ejlchina/comm/provinces") + .tag("A") + .get(); + + println("同步：result = " + result); + } catch (Exception e) { + e.printStackTrace(); + } + sleep(5000); + } + + @Test + public void testCancel() { + + HTTP http = HTTP.builder() + .baseUrl("http://localhost:8080") + .build(); + + http.async("/user/show/1") + .setOnResponse((HttpResult result) -> { + println(result); + }) + .setOnException((IOException e) -> { + println("异常捕获：" + e.getMessage()); + }) + .setOnComplete((HttpResult.State state) -> { + println(state); + }) + .tag("A") + .get(); + + println(((HttpClient) http).getTagTaskCount()); + + http.async("/user/show/2") + .setOnResponse((HttpResult result) -> { + println(result); + }) + .tag("A.B") + .get(); + + println(((HttpClient) http).getTagTaskCount()); + + http.async("/user/show/3") + .setOnResponse((HttpResult result) -> { + println(result); + }) + .tag("B.C") + .get(); + + println(((HttpClient) http).getTagTaskCount()); + + http.async("/user/show/4") + .setOnResponse((HttpResult result) -> { + println(result); + }) + .tag("C") + .get(); + + println(((HttpClient) http).getTagTaskCount()); + + + println("标签取消：" + http.cancel("B")); + + println(((HttpClient) http).getTagTaskCount()); + + sleep(5000); + + println(((HttpClient) http).getTagTaskCount()); + + sleep(5000); + + println(((HttpClient) http).getTagTaskCount()); + + sleep(5000); + + println(((HttpClient) http).getTagTaskCount()); + +// println("isDone = " + call.isDone()); +// println("isCanceled = " + call.isCanceled()); +// +// println("取消结果 = " + call.cancel()); +// +// println("isDone = " + call.isDone()); +// println("isCanceled = " + call.isCanceled()); +// +// sleep(100); +// println("++++++++"); +// +// println("isDone = " + call.isDone()); +// println("isCanceled = " + call.isCanceled()); + } + +} diff --git a/okhttps/src/test/java/com/ejlchina/test/DownloadTests.java b/okhttps/src/test/java/com/ejlchina/test/DownloadTests.java new file mode 100644 index 00000000..81de370d --- /dev/null +++ b/okhttps/src/test/java/com/ejlchina/test/DownloadTests.java @@ -0,0 +1,157 @@ +package com.ejlchina.test; + +import com.ejlchina.okhttps.Process; +import com.ejlchina.okhttps.*; +import okhttp3.OkHttpClient; +import org.junit.Test; + +import java.io.File; + +public class DownloadTests extends BaseTest { + + + /** + * 分块下载测试 + * @param args + */ + public static void main(String[] args) { + long totalSize = HttpUtils.sync("/download/test.zip").get().getBody() + .close() // 因为这次请求只是为了获得文件大小，不消费报文体，所以直接关闭 + .getLength(); + download(totalSize, 0); // 从第 0 块开始下载 + sleep(50000); // 等待下载完成 + } + + static void download(long totalSize, int index) { + long size = 3 * 1024 * 1024; // 每块下载 3M + long start = index * size; + long end = Math.min(start + size, totalSize); + HttpUtils.sync("/download/test.zip") + .setRange(start, end) // 设置本次下载的范围 + .get().getBody() + .toFile("D:/download/test.zip") // 下载到同一个文件里 + .setAppended() // 开启文件追加模式 + .setOnSuccess((File file) -> { + if (end < totalSize) { // 若未下载完，则继续下载下一块 + download(totalSize, index + 1); + } else { + println("下载完成"); + } + }) + .start(); + } + + @Test + public void testDownload1() { + HTTP http = HTTP.builder().build(); + http.async("https://download.cocos.com/CocosDashboard/v1.0.1/CocosDashboard-v1.0.1-win32-031816.exe") + .setOnResponse((HttpResult result) -> { + System.out.println(result.toString()); + System.out.println("ContentLength = " + result.getContentLength()); + System.out.println(result.getBody().getLength()); + System.out.println("type = " + result.getBody().getType()); + System.out.println("body = " + result.getBody().toString()); + }) + .head(); + sleep(5000); + } + + @Test + public void testDownload() { + HTTP http = HTTP.builder() + .config((OkHttpClient.Builder builder) -> { +// builder.readTimeout(300, TimeUnit.MILLISECONDS); + }) + .build(); + + String url = "https://gitee.com/ejlchina-zhxu/okhttps/blob/master/README.md"; +// String url = "http://47.100.7.202/ejl-test.zip"; + + long t0 = now(); + +// Ctrl ctrl = + HttpResult result = http.sync(url) +// .setRange(24771214) + .bind(this) + .get(); + + println(result.getHeaders()); + println(); + + result + .getBody() + .setOnProcess((Process process) -> { + println(t0, process.getDoneBytes() + "/" + process.getTotalBytes() + "\t" + process.getRate()); + }) + .stepRate(0.1) + .toFolder("D:/WorkSpace/download/") +// .toFile("D:/WorkSpace/test/README.md") +// .setAppended() // 启用 断点续传 + .nextOnIO() + .setOnSuccess((File file) -> { + println(t0, "下载成功：" + file.getAbsolutePath()); + println(); + }) + .setOnFailure((Download.Failure failure) -> { + println(t0, "下载失败：" + failure.getDoneBytes() + ", path = " + failure.getFile().getAbsolutePath()); + println(); + }) + .start(); + + sleep(10000); + +// ctrl.status(); +// ctrl.pause(); +// println("暂停"); +// sleep(5000); +// +// ctrl.resume(); +// println("继续"); +// sleep(5000); +// +// ctrl.cancel(); +// println("取消"); + + +// + +// +// ctrl.pause(); +// println("暂停"); +// sleep(5000); +// +// ctrl.resume(); +// println("继续"); + sleep(5000); + + } + + + @Test + public void syncHttpExample() { + + HTTP http = HTTP.builder().build(); + // 同步请求 + HttpResult result = http.sync("https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1584365400942&di=d9e7890f13b7bc4b76080fdd490ed5d5&imgtype=0&src=http%3A%2F%2Ft8.baidu.com%2Fit%2Fu%3D1484500186%2C1503043093%26fm%3D79%26app%3D86%26f%3DJPEG%3Fw%3D1280%26h%3D853") + .get(); + + result.getBody().toFile("E:/3.jpg"); +// // 得到状态码 +// int status = result.getStatus(); +// +// // 得到返回头 +// Headers headers = result.getHeaders(); +// +// User user = result.getBody().toBean(User.class); +// // 得到目标数据 +// +// +// println("status = " + status); +// println("headers = " + headers); +// println("user = " + user); + + println("status = " + result.getStatus()); + + } + +} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/ExceptionTests.java b/okhttps/src/test/java/com/ejlchina/test/ExceptionTests.java similarity index 92% rename from okhttps/src/test/java/cn/zhxu/okhttps/ExceptionTests.java rename to okhttps/src/test/java/com/ejlchina/test/ExceptionTests.java index ae1245d4..c19c3a59 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/ExceptionTests.java +++ b/okhttps/src/test/java/com/ejlchina/test/ExceptionTests.java @@ -1,5 +1,9 @@ -package cn.zhxu.okhttps; +package com.ejlchina.test; +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.internal.HttpException; +import com.ejlchina.test.BaseTest; import okhttp3.OkHttpClient; import org.junit.Test; @@ -28,7 +32,7 @@ public void testSync0() { try { HttpResult result = http.sync("/users/1").get(); System.out.println("请求结果：" + result); - } catch (OkHttpsException e) { + } catch (HttpException e) { Throwable cause = e.getCause(); // 得到异常原因 if (cause instanceof ConnectException) { // 当没网络时，会抛出连接异常 diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/ExecutorTests.java b/okhttps/src/test/java/com/ejlchina/test/ExecutorTests.java similarity index 87% rename from okhttps/src/test/java/cn/zhxu/okhttps/ExecutorTests.java rename to okhttps/src/test/java/com/ejlchina/test/ExecutorTests.java index a598128c..ccbed45f 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/ExecutorTests.java +++ b/okhttps/src/test/java/com/ejlchina/test/ExecutorTests.java @@ -1,5 +1,8 @@ -package cn.zhxu.okhttps; +package com.ejlchina.test; +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.Process; import org.junit.Test; public class ExecutorTests extends BaseTest { diff --git a/okhttps/src/test/java/com/ejlchina/test/FormParaTests.java b/okhttps/src/test/java/com/ejlchina/test/FormParaTests.java new file mode 100644 index 00000000..c588fe23 --- /dev/null +++ b/okhttps/src/test/java/com/ejlchina/test/FormParaTests.java @@ -0,0 +1,93 @@ +package com.ejlchina.test; + +import com.ejlchina.okhttps.HTTP; +import okhttp3.mockwebserver.MockResponse; +import okhttp3.mockwebserver.RecordedRequest; +import org.junit.Assert; +import org.junit.Test; + +import java.math.BigDecimal; + +public class FormParaTests extends BaseTest { + + @Test + public void testSetBodyParaFormString() throws InterruptedException { + HTTP http = HTTP.builder().build(); + + server.enqueue(new MockResponse().setBody("OK")); + + String resp = http.sync(mockUrl) + .setBodyPara("name=OkHttps&desc=最好用的网络框架") + .post().getBody().toString(); + + RecordedRequest request = server.takeRequest(); + + Assert.assertEquals("OK", resp); + Assert.assertTrue(request.getHeader("Content-Type").startsWith("application/x-www-form-urlencoded")); + Assert.assertEquals("name=OkHttps&desc=最好用的网络框架", request.getBody().readUtf8()); + } + + @Test + public void testSetBodyParaJsonString() throws InterruptedException { + HTTP http = HTTP.builder().bodyType("json").build(); + + server.enqueue(new MockResponse().setBody("OK")); + + String resp = http.sync(mockUrl) + .setBodyPara("{\"name\":\"OkHttps\"}") + .post().getBody().toString(); + + RecordedRequest request = server.takeRequest(); + + System.out.println(request.getHeader("Content-Type")); + + System.out.println(request.getBody().readUtf8()); + +// Assert.assertEquals("OK", resp); +// Assert.assertTrue(request.getHeader("Content-Type").startsWith("application/x-www-form-urlencoded")); +// Assert.assertEquals("name=OkHttps&desc=最好用的网络框架", request.getBody().readUtf8()); + } + + + + + class A { + + T a; + + A(T a) { + this.a = a; + } + + void dosomething() { + if (a instanceof String) { + + } + if (a instanceof BigDecimal) { + ((BigDecimal) a).byteValue(); + } + + } + + + + } + + + + + + + + + + + + + + + + + + +} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/ListenerTests.java b/okhttps/src/test/java/com/ejlchina/test/ListenerTests.java similarity index 96% rename from okhttps/src/test/java/cn/zhxu/okhttps/ListenerTests.java rename to okhttps/src/test/java/com/ejlchina/test/ListenerTests.java index 2d38a050..1f69e126 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/ListenerTests.java +++ b/okhttps/src/test/java/com/ejlchina/test/ListenerTests.java @@ -1,5 +1,7 @@ -package cn.zhxu.okhttps; +package com.ejlchina.test; +import com.ejlchina.okhttps.Process; +import com.ejlchina.okhttps.*; import org.junit.Test; import java.io.File; diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/PreprocessorTests.java b/okhttps/src/test/java/com/ejlchina/test/PreprocessorTests.java similarity index 93% rename from okhttps/src/test/java/cn/zhxu/okhttps/PreprocessorTests.java rename to okhttps/src/test/java/com/ejlchina/test/PreprocessorTests.java index bd490cf1..f20fe559 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/PreprocessorTests.java +++ b/okhttps/src/test/java/com/ejlchina/test/PreprocessorTests.java @@ -1,5 +1,7 @@ -package cn.zhxu.okhttps; +package com.ejlchina.test; +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.Preprocessor; import org.junit.Test; public class PreprocessorTests extends BaseTest { diff --git a/okhttps/src/test/java/com/ejlchina/test/SimpleTests.java b/okhttps/src/test/java/com/ejlchina/test/SimpleTests.java new file mode 100644 index 00000000..177b3cab --- /dev/null +++ b/okhttps/src/test/java/com/ejlchina/test/SimpleTests.java @@ -0,0 +1,104 @@ +package com.ejlchina.test; + +import com.ejlchina.okhttps.HTTP; +import okhttp3.mockwebserver.MockWebServer; + +public class SimpleTests extends BaseTest { + + + MockWebServer server = new MockWebServer(); + + HTTP http = HTTP.builder() + .baseUrl("http://" + server.getHostName() + ":" + server.getPort()) + .build(); + + /** + * 同步请求示例 + * 同步请求直接得到结果，无需设置回调 + */ +// @Test +// public void testSyncToBean() { +// server.enqueue(new MockResponse().setBody("Hello World!")); +// +// JsonObj hello = http.sync("/users") // http://localhost:8080/users +// .get() // GET请求 +// .getBody() // 获取响应报文体 +// .toJsonObj(); // 得到目标数据 +// +// System.out.println("hello = " + hello); +// } + + /** + * 同步请求示例 + * 同步请求直接得到结果，无需设置回调 + */ +// @Test +// public void testSyncToList() { +// User u1 = new User(1, "Jack"); +// User u2 = new User(2, "Tom"); +// List list = Arrays.asList(u1, u2); +// server.enqueue(new MockResponse().setBody(JSON.toJSONString(list))); +// +// List users = http.sync("/users") // http://localhost:8080/users +// .get() // GET请求 +// .getBody() // 获取响应报文体 +// .toList(User.class); // 得到目标数据 +// +// assertEquals(u1, users.get(0)); +// assertEquals(u2, users.get(1)); +// } +// +// /** +// * 异步请求示例 +// * 异步请求在OnResponse里接收请求结果 +// */ +// @Test +// public void testAsync() { +// http.async("/users/1") // http://api.demo.com/users/1 +// .setOnResponse((HttpResult result) -> { +// // 得到目标数据 +// User user = result.getBody().toBean(User.class); +// System.out.println("user = " + user); +// }) +// .get(); +// sleep(5000); +// } +// +// +// /** +// * 启用 cache 示例 +// */ +// @Test +// public void testCache() { +// Body body = http.sync("/users").get().getBody() +// .cache(); // 启用 cache +// // 使用 cache 后，可以多次使用 toXXX() 方法 +// System.out.println(body.toString()); +// System.out.println(body.toJsonArray()); +// System.out.println(body.toList(User.class)); +// } +// +// +// /** +// * 获取文件大小示例 +// */ +// @Test +// public void testContentLength() { +// long t = System.currentTimeMillis(); +// +// long size = http.sync("https://download.cocos.com/CocosDashboard/v1.0.1/CocosDashboard-v1.0.1-win32-031816.exe") +// .get().getBody() +// .close() // 只是想获得文件大小，不消费报文体，所以直接关闭 +// .getContentLength(); // 获得待下载文件的大小 +// +// t = System.currentTimeMillis() - t; +// +// // 由于未消费报文体，所以本次请求不会消耗下载报文体的时间和网络流量） +// System.out.println("耗时：" + t + " 毫秒"); +// System.out.println("size = " + (size / 1024) + " KB"); +// } + + +} + + diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/TagTests.java b/okhttps/src/test/java/com/ejlchina/test/TagTests.java similarity index 84% rename from okhttps/src/test/java/cn/zhxu/okhttps/TagTests.java rename to okhttps/src/test/java/com/ejlchina/test/TagTests.java index 2ab0f0e8..485f02df 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/TagTests.java +++ b/okhttps/src/test/java/com/ejlchina/test/TagTests.java @@ -1,6 +1,8 @@ -package cn.zhxu.okhttps; +package com.ejlchina.test; -import cn.zhxu.okhttps.internal.AbstractHttpClient; +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.internal.HttpClient; import okhttp3.OkHttpClient; import org.junit.Test; @@ -10,7 +12,7 @@ public class TagTests extends BaseTest { @Test public void testTag() { - AbstractHttpClient http = (AbstractHttpClient) HTTP.builder() + HttpClient http = (HttpClient) HTTP.builder() .config((OkHttpClient.Builder builder) -> { builder.connectTimeout(1, TimeUnit.SECONDS); builder.writeTimeout(1, TimeUnit.SECONDS); diff --git a/okhttps/src/test/java/com/ejlchina/test/UploadTests.java b/okhttps/src/test/java/com/ejlchina/test/UploadTests.java new file mode 100644 index 00000000..06a8c744 --- /dev/null +++ b/okhttps/src/test/java/com/ejlchina/test/UploadTests.java @@ -0,0 +1,36 @@ +package com.ejlchina.test; + +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.Process; +import org.junit.Test; + +public class UploadTests extends BaseTest { + + @Test + public void testUpload() { + String data = "0123456789abcdefghijklmnopqrstuvwsyz0123456789abcdefghijklmnopqrstuvwsyz0123456789abcdefghijklmnopqrstuvwsyz0123456789abcdefghijklmnopqrstuvwsyz0123456789abcdefghijklmnopqrstuvwsyz"; + + HTTP http = HTTP.builder().build(); + + long t0 = System.currentTimeMillis(); + + String res = http.sync("http://localhost:8080/test/index") + .addBodyPara("data", data) + .addFilePara("file", "D:\\WorkSpace\\download\\CocosDashboard-v1.0.1-win32-031816.exe") + .stepRate(0.01) + .setOnProcess((Process process) -> { + println(t0, "上传：" + process.getDoneBytes() + "/" + process.getTotalBytes() + "\t" + process.getRate()); + }) + .post() + .getBody() + .stepBytes(5) + .setOnProcess((Process process) -> { + println(t0, "下载：" + process.getDoneBytes() + "/" + process.getTotalBytes() + "\t" + process.getRate()); + }) + .toString(); + + println("响应：" + res); + } + + +} diff --git a/okhttps/src/test/java/cn/zhxu/okhttps/WebSocketTests.java b/okhttps/src/test/java/com/ejlchina/test/WebSocketTests.java similarity index 89% rename from okhttps/src/test/java/cn/zhxu/okhttps/WebSocketTests.java rename to okhttps/src/test/java/com/ejlchina/test/WebSocketTests.java index 47a52963..3f1b0c44 100644 --- a/okhttps/src/test/java/cn/zhxu/okhttps/WebSocketTests.java +++ b/okhttps/src/test/java/com/ejlchina/test/WebSocketTests.java @@ -1,9 +1,9 @@ -package cn.zhxu.okhttps; +package com.ejlchina.test; -import cn.zhxu.okhttps.HTTP; -import cn.zhxu.okhttps.HttpResult; -import cn.zhxu.okhttps.WebSocket; -import cn.zhxu.okhttps.WebSocket.Message; +import com.ejlchina.okhttps.HTTP; +import com.ejlchina.okhttps.HttpResult; +import com.ejlchina.okhttps.WebSocket; +import com.ejlchina.okhttps.WebSocket.Message; import org.junit.Test; public class WebSocketTests { diff --git a/pom.xml b/pom.xml index 27ee625c..d2f67e37 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,9 @@ 4.0.0 - cn.zhxu + com.ejlchina okhttps-parent - 4.1.0 + 2.5.0 OkHttps pom @@ -13,21 +13,19 @@ okhttps-stomp okhttps-gson okhttps-jackson - okhttps-jackson-xml - okhttps-jackson-yaml okhttps-fastjson - okhttps-fastjson2 - okhttps-fastjson2-jsonb - okhttps-snack3 + okhttps-xml okhttps-test - 1.8 - 1.6.2 + 2.5.0 + 1.8 3.14.9 - 1.17.6 - 4.13.2 + 2.8.6 + 1.2.75 + 2.11.3 + 4.13.1 UTF-8 https://oss.sonatype.org/content/repositories/snapshots/ @@ -49,10 +47,10 @@ - scm:git://gitee.com/troyzhxu/okhttps.git - scm:http://gitee.com/troyzhxu/okhttps - https://gitee.com/troyzhxu/okhttps - v${project.version} + scm:git://gitee.com/ejlchina-zhxu/okhttps.git + scm:http://gitee.com/ejlchina-zhxu/okhttps + https://gitee.com/ejlchina-zhxu/okhttps + v2.4.2 @@ -63,15 +61,31 @@ test - + + + + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + https://oss.sonatype.org/content/repositories/snapshots + + false + + + true + + + + - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots + sonatype-nexus-snapshots + Sonatype Nexus Snapshots + ${sonatypeOssDistMgmtSnapshotsUrl} - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + sonatype-nexus-staging + Nexus Release Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -81,7 +95,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 2.1 forked-path false @@ -92,34 +106,9 @@ org.apache.maven.plugins maven-compiler-plugin 3.8.1 - - - default-compile - - - 1.8 - - - - - - base-compile - - compile - - - - module-info.java - - - - - - [1.8,17) - - ${java.version} - ${java.version} + ${java-version} + ${java-version} ${project.build.sourceEncoding} true @@ -127,7 +116,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 2.1.2 attach-sources @@ -140,10 +129,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 - - ${project.build.sourceEncoding} - + 2.7 attach-javadocs @@ -156,7 +142,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 1.1 sign-artifacts @@ -170,13 +156,13 @@ - https://gitee.com/troyzhxu/okhttps + https://gitee.com/ejlchina-zhxu/okhttps 比 Retrofit 更好用的网络框架！ OkHttp3 轻量封装 ，开箱即用、Java领域前后端处理 Http问题的新选择。 - zhouxu - https://zhxu.cn/ + 江苏一键联信息科技有限公司 + http://www.ejlchina.com/ - https://gitee.com/troyzhxu/okhttps/issues + https://gitee.com/ejlchina-zhxu/okhttps/issues \ No newline at end of file